diff --git a/.cargo/config b/.cargo/config.toml
similarity index 87%
rename from .cargo/config
rename to .cargo/config.toml
index 004789605a37f..7986592e02998 100644
--- a/.cargo/config
+++ b/.cargo/config.toml
@@ -7,6 +7,7 @@ xclippy = [
     "clippy", "--all-targets", "--all-features", "--",
     "-Wclippy::all",
     "-Wclippy::disallowed_methods",
+    "-Aclippy::unnecessary_get_then_check",
 ]
 xlint = "run --package x --bin x -- lint"
 xtest = "run --package x --bin x -- external-crates-tests"
@@ -22,6 +23,9 @@ move-clippy = [
     "-Aclippy::upper_case_acronyms",
     "-Aclippy::type_complexity",
     "-Aclippy::new_without_default",
+    "-Aclippy::question_mark",
+    "-Aclippy::unnecessary_get_then_check",
+    "-Aclippy::needless_borrows_for_generic_args",
 ]
 
 mysql-clippy = [
@@ -38,6 +42,7 @@ mysql-clippy = [
     "-Aclippy::upper_case_acronyms",
     "-Aclippy::type_complexity",
     "-Aclippy::new_without_default",
+    "-Aclippy::unnecessary_get_then_check",
 ]
 
 [build]
diff --git a/.config/hakari.toml b/.config/hakari.toml
new file mode 100644
index 0000000000000..ae33c8d16be19
--- /dev/null
+++ b/.config/hakari.toml
@@ -0,0 +1,28 @@
+# This file contains settings for `cargo hakari`.
+# See https://docs.rs/cargo-hakari/latest/cargo_hakari/config for a full list of options.
+
+# Right now we're only using hakari in a sort of hybrid manually managed mode
+# to enforce that rocksdb is built only a single time in the workspace
+hakari-package = "typed-store-workspace-hack"
+
+# Format version for hakari's output. Version 4 requires cargo-hakari 0.9.22 or above.
+dep-format-version = "4"
+
+# Setting workspace.resolver = "2" in the root Cargo.toml is HIGHLY recommended.
+# Hakari works much better with the new feature resolver.
+# For more about the new feature resolver, see:
+# https://blog.rust-lang.org/2021/03/25/Rust-1.51.0.html#cargos-new-feature-resolver
+resolver = "2"
+
+# Add triples corresponding to platforms commonly used by developers here.
+# https://doc.rust-lang.org/rustc/platform-support.html
+platforms = [
+    "x86_64-unknown-linux-gnu",
+    "x86_64-apple-darwin",
+    # "x86_64-pc-windows-msvc",
+]
+
+# Write out exact versions rather than a semver range. (Defaults to false.)
+# exact-versions = true
+output-single-feature = true
+unify-target-host = "unify-if-both"
diff --git a/.github/workflows/build-suiop-cli.yml b/.github/workflows/build-suiop-cli.yml
deleted file mode 100644
index 2a4c2bceadf9d..0000000000000
--- a/.github/workflows/build-suiop-cli.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Build suiop-cli binaries
-on:
-  push:
-    paths:
-      - 'crates/suiop-cli/**'
-  pull_request:
-    paths:
-      - 'crates/suiop-cli/**'
-
-# Do not run the same workflow concurrenctly
-# for the same branch.
-concurrency: ${{ github.workflow }}-${{ github.ref }}
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      # Trigger a gh action in MystenLabs/sui-operations
-      - name: Dispatch Build To Operations Repo
-        uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # pin@v3.0.0
-        with:
-          repository: MystenLabs/sui-operations
-          # Using the changeset's token for now,
-          # we could generate a different secret for this
-          # for separation of concerns:
-          token: ${{ secrets.CHANGESETS_DEPLOY_DISPATCH }}
-          event-type: build-suiop-cli-binaries
-          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
diff --git a/.github/workflows/cargo-llvm-cov.yml b/.github/workflows/cargo-llvm-cov.yml
index 73f6cb5057650..dcf9eaf91e6b7 100644
--- a/.github/workflows/cargo-llvm-cov.yml
+++ b/.github/workflows/cargo-llvm-cov.yml
@@ -54,7 +54,7 @@ jobs:
           swap-size-gb: 256
         
       - name: Run code coverage for nextest
-        run: RUSTFLAGS="-C debuginfo=0" SUI_SKIP_SIMTESTS=1 cargo llvm-cov --ignore-run-fail --lcov --output-path lcov.info nextest -vv
+        run: RUSTFLAGS="-C debuginfo=0" SUI_SKIP_SIMTESTS=1 cargo llvm-cov --ignore-run-fail --lcov --output-path lcov.info nextest -vv -E '!package(sui-bridge)'
 
       - name: Upload report to Codecov for nextest
         uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044 # pin v4.0.1
diff --git a/.github/workflows/external.yml b/.github/workflows/external.yml
index 2ded81bc787b3..40faac1020070 100644
--- a/.github/workflows/external.yml
+++ b/.github/workflows/external.yml
@@ -127,4 +127,5 @@ jobs:
     runs-on: [ubuntu-latest]
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11  # Pin v4.1.1
-      - uses: mystenlabs/cargo-deny-action@main
+      - uses: taiki-e/install-action@cargo-deny
+      - run: cargo deny check
diff --git a/.github/workflows/release-notes-generator.yml b/.github/workflows/release-notes-generator.yml
new file mode 100644
index 0000000000000..993efe023436f
--- /dev/null
+++ b/.github/workflows/release-notes-generator.yml
@@ -0,0 +1,71 @@
+name: Create Sui Release with Release Notes
+
+concurrency: ${{ github.workflow }}-${{ inputs.release_tag }}
+
+on:
+  workflow_dispatch:
+    inputs:
+      release_tag:
+        description: 'Sui Release Tag'
+        type: string
+        required: true
+      previous_branch:
+        description: 'Previous Release Branch (Ex: releases/sui-vX.XX.X-release)'
+        type: string
+        required: true
+      current_branch:
+        description: 'Current Release Branch (Ex: releases/sui-vX.XX.X-release)'
+        type: string
+        required: true
+
+env:
+  RELEASE_NOTES_FILE: "./release_notes.txt"
+
+jobs:
+  get-release-notes:
+    name: Get Release Notes for ${{ inputs.release_tag }} release
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Get commits for branches
+        shell: bash
+        working-directory: ./
+        run: |
+          echo "previous_commit=$(curl https://api.github.com/repos/MystenLabs/sui/commits/${{ inputs.previous_branch }} | jq .sha)" >> $GITHUB_ENV
+          echo "current_commit=$(curl https://api.github.com/repos/MystenLabs/sui/commits/${{ inputs.current_branch }} | jq .sha)" >> $GITHUB_ENV
+
+      - name: Checkout main
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
+        with:
+          fetch-depth: 0
+          ref: main
+    
+      - name: Setup Python
+        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # pin@v5.0.0
+        with:
+          python-version: 3.10.10       
+
+      - name: Generate Release Notes
+        shell: bash
+        working-directory: ./
+        run: |
+          GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} python ./scripts/release_notes.py generate ${{ env.previous_commit }} ${{ env.current_commit }} | tee -a ${{ env.RELEASE_NOTES_FILE }}
+          echo "---" >> ${{ env.RELEASE_NOTES_FILE }}
+          echo "#### Full Log: https://github.com/MystenLabs/sui/commits/${{ inputs.release_tag }}" >> ${{ env.RELEASE_NOTES_FILE }}
+
+          if [[ ${{ inputs.release_tag }} == devnet* ]]; then
+            echo "pre_release=true" >> $GITHUB_ENV
+          else
+            echo "pre_release=false" >> $GITHUB_ENV
+          fi
+
+      - name: Create Release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          tag_name: ${{ inputs.release_tag }}
+          release_name: ${{ inputs.release_tag }}
+          body_path: ${{ env.RELEASE_NOTES_FILE }}
+          draft: false
+          prerelease: ${{ env.pre_release }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 259bb70172c6e..82e1dd641408d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,8 +1,9 @@
 name: Attach Sui binaries to a release
+run-name: Attach Sui binaries to a ${{ inputs.sui_tag }} release
 
 on:
   release:
-    types: [ published ]
+    types: [ published, prereleased ]
   workflow_dispatch:
     inputs:
       sui_tag:
@@ -43,10 +44,10 @@ jobs:
       matrix:
         os:
           [
-            ubuntu-ghcloud, # ubuntu-x86_64
-            windows-ghcloud, # windows-x86_64
+            # ubuntu-ghcloud, # ubuntu-x86_64
+            # windows-ghcloud, # windows-x86_64
             macos-latest-xl, # macos-x86_64
-            macos-latest-xlarge # macos-arm64
+            # macos-latest-xlarge # macos-arm64
           ]
       fail-fast: false
     runs-on: ${{ matrix.os }}
@@ -94,7 +95,7 @@ jobs:
         continue-on-error: true
         shell: bash
         run: |
-          echo "s3_archive_exist=$(curl -Is https://sui-releases.s3.us-east-1.amazonaws.com/releases/sui-${{ env.sui_tag }}-${{ env.os_type }}.tgz | head -n 1 | grep '200 OK')" >> $GITHUB_ENV
+          # echo "s3_archive_exist=$(curl -Is https://sui-releases.s3.us-east-1.amazonaws.com/releases/sui-${{ env.sui_tag }}-${{ env.os_type }}.tgz | head -n 1 | grep '200 OK')" >> $GITHUB_ENV
 
       - name: Download archive, if it exists
         if: ${{ env.s3_archive_exist != '' }}
@@ -112,13 +113,6 @@ jobs:
         if: ${{ matrix.os == 'windows-ghcloud' && env.s3_archive_exist == '' }}
         uses: taiki-e/install-action@33022ba120c3f523d134bbbee12278fc11a3df1a # pin@nextest
 
-      - name: Setup protoc (Windows)
-        if: ${{ matrix.os == 'windows-ghcloud' && env.s3_archive_exist == '' }}
-        uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # pin@v3.0.0
-        # this avoids rate-limiting
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Install postgres (Windows)
         if: ${{ matrix.os == 'windows-ghcloud' && env.s3_archive_exist == '' }}
         shell: bash
@@ -130,7 +124,7 @@ jobs:
           echo "PG_DATABASE_URL=postgres://postgres:root@localhost/" >> $GITHUB_ENV
           echo "PG_EXAMPLE_DATABASE_URL=postgres://postgres:root@localhost/diesel_example" >> $GITHUB_ENV
 
-      - name: Install postgres (Mac arm64)
+      - name: Install postgres (MacOS arm64)
         if: ${{ matrix.os == 'macos-latest-xlarge' && env.gcloud_archive_exist == '' }}
         shell: bash
         env:
@@ -141,6 +135,19 @@ jobs:
         run: |
           brew install postgresql
 
+      - name: Remove unused apps (MacOS platform)
+        if: ${{ startsWith(matrix.os, 'macos') && env.gcloud_archive_exist == '' }}
+        continue-on-error: true
+        shell: bash
+        run: |
+          # MacOS arm64 runner only has 14GB avaialble, which is too small for our builds, so removing unused softwared.
+          df -hI /dev/disk3s1s1
+          sudo rm -rf /Applications/Xcode*.app
+          sudo rm -rf ~/Library/Developer/Xcode/DerivedData
+          sudo rm -rf ~/Library/Developer/CoreSimulator/Caches/*
+          sudo rm -rf ~/Library/Developer/Xcode/iOS\ DeviceSupport/*
+          df -hI /dev/disk3s1s1
+
       - name: Cargo build for ${{ matrix.os }} platform
         if: ${{ env.s3_archive_exist == '' }}
         shell: bash
@@ -169,8 +176,7 @@ jobs:
           [[ ${{ env.sui_tag }} == *"testnet"* ]] && aws s3 cp ./tmp/sui-${{ env.sui_tag }}-${{ env.os_type }}.tgz s3://sui-releases/releases/sui-${{ env.sui_tag }}-${{ env.os_type }}.tgz || true
 
       - name: Publish Windows sui binary to Chocolatey
-        if: ${{ matrix.os == 'windows-ghcloud' && contains( env.sui_tag, 'testnet') }}
-        continue-on-error: true
+        if: ${{ matrix.os == 'windows-ghcloud' && contains(env.sui_tag, 'testnet') }}
         shell: bash
         run: |
           choco install checksum
@@ -179,9 +185,9 @@ jobs:
 
           cat <<EOF >>VERIFICATION.txt
           Sui Binary verification steps
-          1. Go to https://github.com/MystenLabs/sui/releases/download/${{ env.sui_tag }}/sui-${{ env.sui_tag }}-windows-x86_64.tgz
-          2. Extract sui-windows-x86_64.exe
-          3. checksum.exe -t sha256 sui-windows-x86_64.exe: ${sui_sha}
+          1. Download https://github.com/MystenLabs/sui/releases/download/${{ env.sui_tag }}/sui-${{ env.sui_tag }}-windows-x86_64.tgz
+          2. Extract sui.exe
+          3. Verify binary: checksum.exe -t sha256 sui.exe: ${sui_sha}
 
           File 'LICENSE.txt' is obtained from: https://github.com/MystenLabs/sui/blob/main/LICENSE
           EOF
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 4d36c3c5d0740..b549b5639e485 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -43,8 +43,6 @@ env:
   RUSTUP_MAX_RETRIES: 10
   # Don't emit giant backtraces in the CI logs.
   RUST_BACKTRACE: short
-  # Some integration tests can produce too much INFO logs that are infeasible to be printed on failure.
-  RUST_LOG: error
   # RUSTFLAGS: -D warnings
   RUSTDOCFLAGS: -D warnings
 
@@ -202,10 +200,6 @@ jobs:
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
       - uses: taiki-e/install-action@nextest
-      - uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # pin@v3.0.0
-        # this avoids rate-limiting
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install postgres (Windows)
         shell: bash
@@ -262,7 +256,7 @@ jobs:
       - uses: taiki-e/install-action@nextest
       - name: Run move tests
         run: |
-          cargo nextest run -p sui-framework-tests -- unit_tests::
+          cargo nextest run -p sui-framework-tests --test move_tests
 
   # # Disabled
   # rosetta-validation:
@@ -345,10 +339,6 @@ jobs:
     if: needs.diff.outputs.isRust == 'true'
     runs-on: [ ubuntu-ghcloud ]
     steps:
-      - uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # pin@v3.0.0
-        # this avoids rate-limiting
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
       - run: rustup component add clippy
       # TODO(bradh): debug and re-enable this; the caching is breaking the clippy build
@@ -385,7 +375,8 @@ jobs:
     runs-on: [ ubuntu-latest ]
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
-      - uses: mystenlabs/cargo-deny-action@main
+      - uses: taiki-e/install-action@cargo-deny
+      - run: cargo deny check
 
   sui-excution-cut:
     name: cutting a new execution layer
diff --git a/Cargo.lock b/Cargo.lock
index 44dd32541a47d..43b41c5fc7206 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -38,11 +38,17 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
 [[package]]
 name = "aead"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c192eb8f11fc081b0fe4259ba5af04217d4e0faddd02417310a927911abd7c8"
+checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
 dependencies = [
  "crypto-common",
  "generic-array",
@@ -50,9 +56,9 @@ dependencies = [
 
 [[package]]
 name = "aes"
-version = "0.8.2"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
 dependencies = [
  "cfg-if",
  "cipher",
@@ -61,9 +67,9 @@ dependencies = [
 
 [[package]]
 name = "aes-gcm"
-version = "0.10.1"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e1366e0c69c9f927b1fa5ce2c7bf9eafc8f9268c0b9800729e8b267612447c"
+checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
 dependencies = [
  "aead",
  "aes",
@@ -75,9 +81,9 @@ dependencies = [
 
 [[package]]
 name = "ahash"
-version = "0.7.6"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
  "getrandom 0.2.15",
  "once_cell",
@@ -100,18 +106,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "1.0.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
@@ -139,9 +136,9 @@ dependencies = [
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.16"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
 
 [[package]]
 name = "android-tzdata"
@@ -177,17 +174,17 @@ dependencies = [
  "quinn",
  "quinn-proto",
  "rand 0.8.5",
- "rcgen 0.13.1",
+ "rcgen",
  "ring 0.17.8",
- "rustls 0.23.12",
- "rustls-webpki 0.102.6",
+ "rustls 0.23.13",
+ "rustls-webpki 0.102.8",
  "serde",
  "serde_json",
- "socket2 0.5.6",
+ "socket2 0.5.7",
  "tap",
  "thiserror",
  "tokio",
- "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.12",
  "tower",
  "tracing",
  "x509-parser",
@@ -211,10 +208,10 @@ name = "anemo-build"
 version = "0.0.0"
 source = "git+https://github.com/mystenlabs/anemo.git?rev=dbb5a074c2d25660525ab5d36d65ff0cb8051949#dbb5a074c2d25660525ab5d36d65ff0cb8051949"
 dependencies = [
- "prettyplease 0.2.17",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "prettyplease",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -248,7 +245,7 @@ dependencies = [
  "tokio",
  "tower",
  "tracing",
- "uuid 1.2.2",
+ "uuid 1.10.0",
 ]
 
 [[package]]
@@ -257,58 +254,50 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "anstream"
-version = "0.6.13"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
+ "is_terminal_polyfill",
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle"
-version = "1.0.6"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.0"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.2"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
 dependencies = [
  "anstyle",
  "windows-sys 0.52.0",
@@ -316,27 +305,27 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.81"
+version = "1.0.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
+checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356"
 dependencies = [
  "backtrace",
 ]
 
 [[package]]
 name = "arbitrary"
-version = "1.3.0"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e"
+checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110"
 dependencies = [
  "derive_arbitrary",
 ]
 
 [[package]]
 name = "arc-swap"
-version = "1.6.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
+checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
 dependencies = [
  "serde",
 ]
@@ -379,14 +368,14 @@ dependencies = [
  "blake2",
  "derivative",
  "digest 0.10.7",
- "sha2 0.10.6",
+ "sha2 0.10.8",
 ]
 
 [[package]]
 name = "ark-ec"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c60370a92f8e1a5f053cad73a862e1b99bc642333cd676fa11c0c39f80f4ac2"
+checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba"
 dependencies = [
  "ark-ff",
  "ark-poly",
@@ -412,7 +401,7 @@ dependencies = [
  "derivative",
  "digest 0.10.7",
  "itertools 0.10.5",
- "num-bigint 0.4.4",
+ "num-bigint 0.4.6",
  "num-traits",
  "paste",
  "rustc_version",
@@ -425,8 +414,8 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348"
 dependencies = [
- "quote 1.0.35",
- "syn 1.0.107",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -435,11 +424,11 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565"
 dependencies = [
- "num-bigint 0.4.4",
+ "num-bigint 0.4.6",
  "num-traits",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -459,9 +448,9 @@ dependencies = [
 
 [[package]]
 name = "ark-poly"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f6ec811462cabe265cfe1b102fcfe3df79d7d2929c2425673648ee9abfd0272"
+checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf"
 dependencies = [
  "ark-ff",
  "ark-serialize",
@@ -501,7 +490,7 @@ dependencies = [
  "ark-serialize-derive",
  "ark-std",
  "digest 0.10.7",
- "num-bigint 0.4.4",
+ "num-bigint 0.4.6",
 ]
 
 [[package]]
@@ -510,9 +499,9 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -539,9 +528,9 @@ dependencies = [
 
 [[package]]
 name = "arrayref"
-version = "0.3.6"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
+checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a"
 
 [[package]]
 name = "arrayvec"
@@ -551,9 +540,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.2"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "arrow"
@@ -587,7 +576,7 @@ dependencies = [
  "arrow-data",
  "arrow-schema",
  "chrono",
- "half 2.4.1",
+ "half",
  "num",
 ]
 
@@ -602,7 +591,7 @@ dependencies = [
  "arrow-data",
  "arrow-schema",
  "chrono",
- "half 2.4.1",
+ "half",
  "hashbrown 0.14.5",
  "num",
 ]
@@ -614,7 +603,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c975484888fc95ec4a632cdc98be39c085b1bb518531b0c80c5d462063e5daa1"
 dependencies = [
  "bytes",
- "half 2.4.1",
+ "half",
  "num",
 ]
 
@@ -632,7 +621,7 @@ dependencies = [
  "atoi",
  "base64 0.22.1",
  "chrono",
- "half 2.4.1",
+ "half",
  "lexical-core",
  "num",
  "ryu",
@@ -665,7 +654,7 @@ checksum = "dd9d6f18c65ef7a2573ab498c374d8ae364b4a4edf67105357491c031f716ca5"
 dependencies = [
  "arrow-buffer",
  "arrow-schema",
- "half 2.4.1",
+ "half",
  "num",
 ]
 
@@ -695,8 +684,8 @@ dependencies = [
  "arrow-data",
  "arrow-schema",
  "chrono",
- "half 2.4.1",
- "indexmap 2.2.6",
+ "half",
+ "indexmap 2.5.0",
  "lexical-core",
  "num",
  "serde",
@@ -714,7 +703,7 @@ dependencies = [
  "arrow-data",
  "arrow-schema",
  "arrow-select",
- "half 2.4.1",
+ "half",
  "num",
 ]
 
@@ -729,7 +718,7 @@ dependencies = [
  "arrow-buffer",
  "arrow-data",
  "arrow-schema",
- "half 2.4.1",
+ "half",
 ]
 
 [[package]]
@@ -769,11 +758,20 @@ dependencies = [
  "regex-syntax 0.8.4",
 ]
 
+[[package]]
+name = "ascii-canvas"
+version = "3.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6"
+dependencies = [
+ "term",
+]
+
 [[package]]
 name = "asn1-rs"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4"
+checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0"
 dependencies = [
  "asn1-rs-derive",
  "asn1-rs-impl",
@@ -791,9 +789,9 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
  "synstructure",
 ]
 
@@ -803,60 +801,50 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "assert_cmd"
-version = "2.0.7"
+version = "2.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa3d466004a8b4cb1bc34044240a2fd29d17607e2e3bd613eb44fd48e8100da3"
+checksum = "dc1835b7f27878de8525dc71410b5a31cdcc5f230aed5ba5df968e09c201b23d"
 dependencies = [
+ "anstyle",
  "bstr",
  "doc-comment",
- "predicates",
+ "libc",
+ "predicates 3.1.2",
  "predicates-core",
  "predicates-tree",
  "wait-timeout",
 ]
 
-[[package]]
-name = "async-compression"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a"
-dependencies = [
- "brotli",
- "flate2",
- "futures-core",
- "memchr",
- "pin-project-lite",
- "tokio",
-]
-
 [[package]]
 name = "async-compression"
 version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa"
 dependencies = [
+ "brotli",
  "flate2",
  "futures-core",
  "memchr",
  "pin-project-lite",
  "tokio",
+ "zstd 0.13.2",
+ "zstd-safe 7.2.1",
 ]
 
 [[package]]
 name = "async-lock"
-version = "2.6.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685"
+checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
 dependencies = [
  "event-listener",
- "futures-lite",
 ]
 
 [[package]]
@@ -872,13 +860,13 @@ dependencies = [
  "nkeys",
  "nuid",
  "once_cell",
- "portable-atomic 1.7.0",
+ "portable-atomic",
  "rand 0.8.5",
  "regex",
  "ring 0.17.8",
- "rustls-native-certs 0.7.1",
- "rustls-pemfile 2.1.2",
- "rustls-webpki 0.102.6",
+ "rustls-native-certs 0.7.3",
+ "rustls-pemfile 2.1.3",
+ "rustls-webpki 0.102.8",
  "serde",
  "serde_json",
  "serde_nanos",
@@ -894,34 +882,35 @@ dependencies = [
 
 [[package]]
 name = "async-recursion"
-version = "1.0.4"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "async-stream"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dad5c83079eae9969be7fadefe640a1c566901f05ff91ab221de4b6f68d9507e"
+checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
 dependencies = [
  "async-stream-impl",
  "futures-core",
+ "pin-project-lite",
 ]
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f203db73a71dfa2fb6dd22763990fa26f3d2625a6da2da900d23b87d26be27"
+checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -931,13 +920,13 @@ source = "git+https://github.com/mystenmark/async-task?rev=4e45b26e11126b191701b
 
 [[package]]
 name = "async-trait"
-version = "0.1.73"
+version = "0.1.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
+checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -993,24 +982,24 @@ checksum = "62af46d040ba9df09edc6528dae9d8e49f5f3e82f55b7d2ec31a733c38dbc49d"
 
 [[package]]
 name = "atomicwrites"
-version = "0.3.1"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb8f2cd6962fa53c0e2a9d3f97eaa7dbd1e3cbbeeb4745403515b42ae07b3ff6"
+checksum = "fc7b2dbe9169059af0f821e811180fddc971fc210c776c133c7819ccd6e478db"
 dependencies = [
+ "rustix",
  "tempfile",
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "auto_impl"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89"
+checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42"
 dependencies = [
- "proc-macro-error",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -1021,18 +1010,9 @@ checksum = "7460f7dd8e100147b82a63afca1a20eb6c231ee36b90ba7272e14951cb58af59"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "autotools"
-version = "0.2.5"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8138adefca3e5d2e73bfba83bd6eeaf904b26a7ac1b4a19892cfe16cc7e1701"
-dependencies = [
- "cc",
-]
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "aws-config"
@@ -1052,10 +1032,10 @@ dependencies = [
  "aws-smithy-types",
  "aws-types",
  "bytes",
- "fastrand 2.0.0",
+ "fastrand",
  "hex",
- "http 0.2.9",
- "hyper 0.14.26",
+ "http 0.2.12",
+ "hyper 0.14.30",
  "ring 0.16.20",
  "time",
  "tokio",
@@ -1072,7 +1052,7 @@ checksum = "70a66ac8ef5fa9cf01c2d999f39d16812e90ec1467bd382cbbb74ba23ea86201"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-types",
- "fastrand 2.0.0",
+ "fastrand",
  "tokio",
  "tracing",
  "zeroize",
@@ -1089,8 +1069,8 @@ dependencies = [
  "aws-smithy-types",
  "aws-types",
  "bytes",
- "http 0.2.9",
- "http-body 0.4.5",
+ "http 0.2.12",
+ "http-body 0.4.6",
  "lazy_static",
  "percent-encoding",
  "pin-project-lite",
@@ -1112,11 +1092,11 @@ dependencies = [
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "aws-types",
- "fastrand 2.0.0",
- "http 0.2.9",
+ "fastrand",
+ "http 0.2.12",
  "percent-encoding",
  "tracing",
- "uuid 1.2.2",
+ "uuid 1.10.0",
 ]
 
 [[package]]
@@ -1137,8 +1117,8 @@ dependencies = [
  "aws-smithy-types",
  "aws-types",
  "bytes",
- "fastrand 2.0.0",
- "http 0.2.9",
+ "fastrand",
+ "http 0.2.12",
  "regex",
  "tokio-stream",
  "tracing",
@@ -1163,8 +1143,8 @@ dependencies = [
  "aws-smithy-types",
  "aws-smithy-xml",
  "aws-types",
- "fastrand 2.0.0",
- "http 0.2.9",
+ "fastrand",
+ "http 0.2.12",
  "regex",
  "tokio-stream",
  "tracing",
@@ -1192,8 +1172,8 @@ dependencies = [
  "aws-smithy-xml",
  "aws-types",
  "bytes",
- "http 0.2.9",
- "http-body 0.4.5",
+ "http 0.2.12",
+ "http-body 0.4.6",
  "once_cell",
  "percent-encoding",
  "regex",
@@ -1220,7 +1200,7 @@ dependencies = [
  "aws-smithy-types",
  "aws-types",
  "bytes",
- "http 0.2.9",
+ "http 0.2.12",
  "regex",
  "tokio-stream",
  "tracing",
@@ -1245,7 +1225,7 @@ dependencies = [
  "aws-smithy-types",
  "aws-smithy-xml",
  "aws-types",
- "http 0.2.9",
+ "http 0.2.12",
  "regex",
  "tracing",
 ]
@@ -1262,11 +1242,11 @@ dependencies = [
  "form_urlencoded",
  "hex",
  "hmac 0.12.1",
- "http 0.2.9",
+ "http 0.2.12",
  "once_cell",
  "percent-encoding",
  "regex",
- "sha2 0.10.6",
+ "sha2 0.10.8",
  "time",
  "tracing",
 ]
@@ -1295,12 +1275,12 @@ dependencies = [
  "crc32c",
  "crc32fast",
  "hex",
- "http 0.2.9",
- "http-body 0.4.5",
+ "http 0.2.12",
+ "http-body 0.4.6",
  "md-5 0.10.6",
  "pin-project-lite",
  "sha1",
- "sha2 0.10.6",
+ "sha2 0.10.8",
  "tracing",
 ]
 
@@ -1315,11 +1295,11 @@ dependencies = [
  "aws-smithy-http-tower",
  "aws-smithy-types",
  "bytes",
- "fastrand 2.0.0",
- "http 0.2.9",
- "http-body 0.4.5",
- "hyper 0.14.26",
- "hyper-rustls 0.24.0",
+ "fastrand",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "hyper 0.14.30",
+ "hyper-rustls 0.24.2",
  "lazy_static",
  "pin-project-lite",
  "rustls 0.21.12",
@@ -1350,15 +1330,15 @@ dependencies = [
  "bytes",
  "bytes-utils",
  "futures-core",
- "http 0.2.9",
- "http-body 0.4.5",
- "hyper 0.14.26",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "hyper 0.14.30",
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
  "pin-utils",
  "tokio",
- "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.12",
  "tracing",
 ]
 
@@ -1371,8 +1351,8 @@ dependencies = [
  "aws-smithy-http",
  "aws-smithy-types",
  "bytes",
- "http 0.2.9",
- "http-body 0.4.5",
+ "http 0.2.12",
+ "http-body 0.4.6",
  "pin-project-lite",
  "tower",
  "tracing",
@@ -1409,9 +1389,9 @@ dependencies = [
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "bytes",
- "fastrand 2.0.0",
- "http 0.2.9",
- "http-body 0.4.5",
+ "fastrand",
+ "http 0.2.12",
+ "http-body 0.4.6",
  "once_cell",
  "pin-project-lite",
  "pin-utils",
@@ -1429,7 +1409,7 @@ dependencies = [
  "aws-smithy-http",
  "aws-smithy-types",
  "bytes",
- "http 0.2.9",
+ "http 0.2.12",
  "tokio",
  "tracing",
 ]
@@ -1468,7 +1448,7 @@ dependencies = [
  "aws-smithy-client",
  "aws-smithy-http",
  "aws-smithy-types",
- "http 0.2.9",
+ "http 0.2.12",
  "rustc_version",
  "tracing",
 ]
@@ -1480,17 +1460,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
 dependencies = [
  "async-trait",
- "axum-core",
- "base64 0.21.2",
+ "axum-core 0.3.4",
  "bitflags 1.3.2",
  "bytes",
  "futures-util",
- "headers",
- "http 0.2.9",
- "http-body 0.4.5",
- "hyper 0.14.26",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "hyper 0.14.30",
+ "itoa",
+ "matchit 0.7.3",
+ "memchr",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustversion",
+ "serde",
+ "sync_wrapper 0.1.2",
+ "tower",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "axum"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf"
+dependencies = [
+ "async-trait",
+ "axum-core 0.4.3",
+ "base64 0.21.7",
+ "bytes",
+ "futures-util",
+ "http 1.1.0",
+ "http-body 1.0.1",
+ "http-body-util",
+ "hyper 1.4.1",
+ "hyper-util",
  "itoa",
- "matchit 0.7.0",
+ "matchit 0.7.3",
  "memchr",
  "mime",
  "percent-encoding",
@@ -1501,9 +1509,9 @@ dependencies = [
  "serde_path_to_error",
  "serde_urlencoded",
  "sha1",
- "sync_wrapper",
+ "sync_wrapper 1.0.1",
  "tokio",
- "tokio-tungstenite",
+ "tokio-tungstenite 0.21.0",
  "tower",
  "tower-layer",
  "tower-service",
@@ -1518,50 +1526,78 @@ dependencies = [
  "async-trait",
  "bytes",
  "futures-util",
- "http 0.2.9",
- "http-body 0.4.5",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "mime",
+ "rustversion",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "axum-core"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "futures-util",
+ "http 1.1.0",
+ "http-body 1.0.1",
+ "http-body-util",
  "mime",
+ "pin-project-lite",
  "rustversion",
+ "sync_wrapper 0.1.2",
  "tower-layer",
  "tower-service",
+ "tracing",
 ]
 
 [[package]]
 name = "axum-extra"
-version = "0.4.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a320103719de37b7b4da4c8eb629d4573f6bcfd3dfe80d3208806895ccf81d"
+checksum = "0be6ea09c9b96cb5076af0de2e383bd2bc0c18f827cf1967bdd353e0b910d733"
 dependencies = [
- "axum",
+ "axum 0.7.5",
+ "axum-core 0.4.3",
  "bytes",
  "futures-util",
- "http 0.2.9",
+ "headers",
+ "http 1.1.0",
+ "http-body 1.0.1",
+ "http-body-util",
  "mime",
  "pin-project-lite",
- "tokio",
+ "serde",
  "tower",
- "tower-http",
  "tower-layer",
  "tower-service",
+ "tracing",
 ]
 
 [[package]]
 name = "axum-server"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447f28c85900215cc1bea282f32d4a2f22d55c5a300afdfbc661c8d6a632e063"
+version = "0.6.1"
+source = "git+https://github.com/bmwill/axum-server.git?rev=f44323e271afdd1365fd0c8b0a4c0bbdf4956cb7#f44323e271afdd1365fd0c8b0a4c0bbdf4956cb7"
 dependencies = [
  "arc-swap",
  "bytes",
  "futures-util",
- "http 0.2.9",
- "http-body 0.4.5",
- "hyper 0.14.26",
+ "http 1.1.0",
+ "http-body 1.0.1",
+ "http-body-util",
+ "hyper 1.4.1",
+ "hyper-util",
  "pin-project-lite",
- "rustls 0.21.12",
- "rustls-pemfile 1.0.2",
+ "rustls 0.23.13",
+ "rustls-pemfile 2.1.3",
+ "rustls-pki-types",
  "tokio",
- "tokio-rustls 0.24.0",
+ "tokio-rustls 0.26.0",
+ "tower",
  "tower-service",
 ]
 
@@ -1581,15 +1617,15 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.69"
+version = "0.3.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
 dependencies = [
  "addr2line",
  "cc",
  "cfg-if",
  "libc",
- "miniz_oxide",
+ "miniz_oxide 0.7.4",
  "object",
  "rustc-demangle",
 ]
@@ -1629,9 +1665,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.2"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "base64"
@@ -1651,11 +1687,11 @@ dependencies = [
 
 [[package]]
 name = "base64-url"
-version = "2.0.0"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c5b0a88aa36e9f095ee2e2b13fb8c5e4313e022783aedacc123328c0084916d"
+checksum = "fb9fb9fb058cc3063b5fc88d9a21eefa2735871498a04e1650da76ed511c8569"
 dependencies = [
- "base64 0.21.2",
+ "base64 0.21.7",
 ]
 
 [[package]]
@@ -1671,8 +1707,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6aeac2e1fe888769f34f05ac343bbef98b14d1ffb292ab69d4608b3abc86f2a2"
 dependencies = [
  "blowfish",
- "pbkdf2 0.12.1",
- "sha2 0.10.6",
+ "pbkdf2 0.12.2",
+ "sha2 0.10.8",
 ]
 
 [[package]]
@@ -1702,9 +1738,9 @@ dependencies = [
 
 [[package]]
 name = "bellpepper"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b89c91b2463f99a3a527a16a5b6862f257ee8188d3cf1fbc53af06fb61c09f4f"
+checksum = "9ae286c2cb403324ab644c7cc68dceb25fe52ca9429908a726d7ed272c1edf7b"
 dependencies = [
  "bellpepper-core",
  "byteorder",
@@ -1739,9 +1775,9 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3deeecb812ca5300b7d3f66f730cc2ebd3511c3d36c691dd79c165d5b19a26e3"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -1752,7 +1788,7 @@ checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7"
 
 [[package]]
 name = "bin-version"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "const-str",
  "git-version",
@@ -1779,13 +1815,13 @@ dependencies = [
  "lazy_static",
  "lazycell",
  "peeking_take_while",
- "prettyplease 0.2.17",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "prettyplease",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
  "regex",
  "rustc-hash 1.1.0",
  "shlex",
- "syn 2.0.48",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -1801,7 +1837,7 @@ dependencies = [
  "pbkdf2 0.11.0",
  "rand_core 0.6.4",
  "ripemd",
- "sha2 0.10.6",
+ "sha2 0.10.8",
  "subtle",
  "zeroize",
 ]
@@ -1837,9 +1873,9 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a539389a13af092cd345a2b47ae7dec12deb306d660b2223d25cd3419b253ebe"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -1865,9 +1901,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.1"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 dependencies = [
  "serde",
 ]
@@ -1921,8 +1957,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.2",
- "constant_time_eq",
+ "arrayvec 0.7.6",
+ "constant_time_eq 0.3.1",
 ]
 
 [[package]]
@@ -1932,8 +1968,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae"
 dependencies = [
  "arrayref",
- "arrayvec 0.7.2",
- "constant_time_eq",
+ "arrayvec 0.7.6",
+ "constant_time_eq 0.3.1",
 ]
 
 [[package]]
@@ -1948,9 +1984,9 @@ dependencies = [
 
 [[package]]
 name = "block-buffer"
-version = "0.10.3"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 dependencies = [
  "generic-array",
 ]
@@ -1963,9 +1999,9 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
 
 [[package]]
 name = "block-padding"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a90ec2df9600c28a01c56c4784c9207a96d2451833aeceb8cc97e4c9548bb78"
+checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
 dependencies = [
  "generic-array",
 ]
@@ -1982,9 +2018,9 @@ dependencies = [
 
 [[package]]
 name = "blst"
-version = "0.3.11"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c94087b935a822949d3291a9989ad2b2051ea141eda0fd4e478a75f6aa3e604b"
+checksum = "4378725facc195f1a538864863f6de233b500a8862747e7f165078a419d5e874"
 dependencies = [
  "cc",
  "glob",
@@ -2010,15 +2046,15 @@ dependencies = [
 
 [[package]]
 name = "bnum"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56953345e39537a3e18bdaeba4cb0c58a78c1f61f361dc0fa7c5c7340ae87c5f"
+checksum = "3e31ea183f6ee62ac8b8a8cf7feddd766317adfb13ff469de57ce033efd6a790"
 
 [[package]]
 name = "brotli"
-version = "3.3.4"
+version = "6.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68"
+checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -2027,9 +2063,9 @@ dependencies = [
 
 [[package]]
 name = "brotli-decompressor"
-version = "2.3.2"
+version = "4.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80"
+checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362"
 dependencies = [
  "alloc-no-stdlib",
  "alloc-stdlib",
@@ -2046,31 +2082,30 @@ dependencies = [
 
 [[package]]
 name = "bs58"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896"
+checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4"
 dependencies = [
- "sha2 0.10.6",
+ "sha2 0.10.8",
  "tinyvec",
 ]
 
 [[package]]
 name = "bstr"
-version = "1.1.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b"
+checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
 dependencies = [
  "memchr",
- "once_cell",
- "regex-automata 0.1.10",
+ "regex-automata 0.4.7",
  "serde",
 ]
 
 [[package]]
 name = "bumpalo"
-version = "3.11.1"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "byte-slice-cast"
@@ -2080,15 +2115,15 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
 
 [[package]]
 name = "bytecount"
-version = "0.6.3"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c"
+checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce"
 
 [[package]]
 name = "bytemuck"
-version = "1.16.0"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5"
+checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
 
 [[package]]
 name = "byteorder"
@@ -2098,18 +2133,18 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.5.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "bytes-utils"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e47d3a8076e283f3acd27400535992edb3ba4b5bb72f8891ad8fbe7932a7d4b9"
+checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35"
 dependencies = [
  "bytes",
  "either",
@@ -2124,6 +2159,16 @@ dependencies = [
  "bytes",
 ]
 
+[[package]]
+name = "bzip2"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8"
+dependencies = [
+ "bzip2-sys",
+ "libc",
+]
+
 [[package]]
 name = "bzip2-sys"
 version = "0.1.11+1.0.8"
@@ -2161,58 +2206,59 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e10ca87c81aaa3a949dbbe2b5e6c2c45dbc94ba4897e45ea31ff9ec5087be3dc"
 dependencies = [
  "cached_proc_macro_types",
- "darling 0.14.2",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "darling 0.14.4",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "cached_proc_macro_types"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a4f925191b4367301851c6d99b09890311d74b0d43f274c0b34c86d308a3663"
+checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0"
 
 [[package]]
 name = "camino"
-version = "1.1.7"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239"
+checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cargo-platform"
-version = "0.1.2"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27"
+checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cargo_metadata"
-version = "0.14.2"
+version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa"
+checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
 dependencies = [
  "camino",
  "cargo-platform",
- "semver 1.0.16",
+ "semver",
  "serde",
  "serde_json",
+ "thiserror",
 ]
 
 [[package]]
 name = "cargo_metadata"
-version = "0.15.4"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
+checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
 dependencies = [
  "camino",
  "cargo-platform",
- "semver 1.0.16",
+ "semver",
  "serde",
  "serde_json",
  "thiserror",
@@ -2241,12 +2287,13 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.94"
+version = "1.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7"
+checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
 dependencies = [
  "jobserver",
  "libc",
+ "shlex",
 ]
 
 [[package]]
@@ -2260,9 +2307,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-expr"
-version = "0.15.8"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
+checksum = "d0890061c4d3223e7267f3bad2ec40b997d64faac1c2815a4a9d95018e2b9e9c"
 dependencies = [
  "smallvec",
  "target-lexicon",
@@ -2297,14 +2344,14 @@ dependencies = [
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-targets 0.52.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "ciborium"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f"
+checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
 dependencies = [
  "ciborium-io",
  "ciborium-ll",
@@ -2313,18 +2360,18 @@ dependencies = [
 
 [[package]]
 name = "ciborium-io"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369"
+checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
 
 [[package]]
 name = "ciborium-ll"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b"
+checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
 dependencies = [
  "ciborium-io",
- "half 1.8.2",
+ "half",
 ]
 
 [[package]]
@@ -2339,9 +2386,9 @@ dependencies = [
 
 [[package]]
 name = "clang-sys"
-version = "1.4.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
 dependencies = [
  "glob",
  "libc",
@@ -2350,9 +2397,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.4"
+version = "4.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
+checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -2360,9 +2407,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.2"
+version = "4.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
 dependencies = [
  "anstream",
  "anstyle",
@@ -2373,21 +2420,21 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.4"
+version = "4.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
+checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
 dependencies = [
  "heck 0.5.0",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
 
 [[package]]
 name = "clipboard-win"
@@ -2427,13 +2474,13 @@ version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b6be4a5df2098cd811f3194f64ddb96c267606bffd9689ac7b0160097b01ad3"
 dependencies = [
- "bs58 0.5.0",
+ "bs58 0.5.1",
  "coins-core",
  "digest 0.10.7",
  "hmac 0.12.1",
- "k256 0.13.1",
+ "k256 0.13.3",
  "serde",
- "sha2 0.10.6",
+ "sha2 0.10.8",
  "thiserror",
 ]
 
@@ -2447,9 +2494,9 @@ dependencies = [
  "coins-bip32",
  "hmac 0.12.1",
  "once_cell",
- "pbkdf2 0.12.1",
+ "pbkdf2 0.12.2",
  "rand 0.8.5",
- "sha2 0.10.6",
+ "sha2 0.10.8",
  "thiserror",
 ]
 
@@ -2459,17 +2506,17 @@ version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5286a0843c21f8367f7be734f89df9b822e0321d8bcce8d6e735aadff7d74979"
 dependencies = [
- "base64 0.21.2",
+ "base64 0.21.7",
  "bech32",
- "bs58 0.5.0",
+ "bs58 0.5.1",
  "digest 0.10.7",
  "generic-array",
  "hex",
  "ripemd",
  "serde",
  "serde_derive",
- "sha2 0.10.6",
- "sha3 0.10.6",
+ "sha2 0.10.8",
+ "sha3 0.10.8",
  "thiserror",
 ]
 
@@ -2508,37 +2555,25 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
 
 [[package]]
 name = "colored"
-version = "2.0.4"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6"
+checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8"
 dependencies = [
- "is-terminal",
  "lazy_static",
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "colored-diff"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "410208eb08c3f3ad44b95b51c4fc0d5993cbcc9dd39cfadb4214b9115a97dcb5"
-dependencies = [
- "ansi_term",
- "dissimilar",
- "itertools 0.10.5",
-]
-
 [[package]]
 name = "combine"
-version = "4.6.6"
+version = "4.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
 dependencies = [
  "bytes",
  "memchr",
@@ -2578,7 +2613,7 @@ dependencies = [
  "anyhow",
  "arc-swap",
  "async-trait",
- "base64 0.21.2",
+ "base64 0.21.7",
  "bcs",
  "bytes",
  "cfg-if",
@@ -2587,22 +2622,23 @@ dependencies = [
  "enum_dispatch",
  "fastcrypto",
  "futures",
- "http 0.2.9",
- "hyper 0.14.26",
- "hyper-rustls 0.24.0",
+ "http 1.1.0",
+ "hyper 1.4.1",
+ "hyper-rustls 0.27.3",
+ "hyper-util",
  "itertools 0.10.5",
  "mockall",
  "mysten-common",
  "mysten-metrics",
  "mysten-network",
  "nom",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "prometheus",
- "prost 0.12.3",
+ "prost 0.13.2",
  "quinn-proto",
  "rand 0.8.5",
  "rstest",
- "rustls 0.21.12",
+ "rustls 0.23.13",
  "serde",
  "shared-crypto",
  "strum_macros 0.24.3",
@@ -2614,10 +2650,10 @@ dependencies = [
  "tempfile",
  "thiserror",
  "tokio",
- "tokio-rustls 0.24.0",
+ "tokio-rustls 0.26.0",
  "tokio-stream",
- "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "tonic 0.11.0",
+ "tokio-util 0.7.12",
+ "tonic 0.12.2",
  "tonic-build",
  "tower",
  "tower-http",
@@ -2627,15 +2663,15 @@ dependencies = [
 
 [[package]]
 name = "console"
-version = "0.15.4"
+version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9b6515d269224923b26b5febea2ed42b2d5f2ce37284a4dd670fedd6cb8347a"
+checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
 dependencies = [
  "encode_unicode 0.3.6",
  "lazy_static",
  "libc",
  "unicode-width",
- "windows-sys 0.42.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2645,9 +2681,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787"
 dependencies = [
  "futures-core",
- "prost 0.12.3",
- "prost-types",
- "tonic 0.10.0",
+ "prost 0.12.6",
+ "prost-types 0.12.6",
+ "tonic 0.10.2",
  "tracing-core",
 ]
 
@@ -2663,23 +2699,36 @@ dependencies = [
  "futures-task",
  "hdrhistogram",
  "humantime",
- "prost-types",
+ "prost-types 0.12.6",
  "serde",
  "serde_json",
  "thread_local",
  "tokio",
  "tokio-stream",
- "tonic 0.10.0",
+ "tonic 0.10.2",
  "tracing",
  "tracing-core",
  "tracing-subscriber",
 ]
 
+[[package]]
+name = "const-hex"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94fb8a24a26d37e1ffd45343323dc9fe6654ceea44c12f2fcb3d7ac29e610bc6"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "hex",
+ "proptest",
+ "serde",
+]
+
 [[package]]
 name = "const-oid"
-version = "0.9.2"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
 [[package]]
 name = "const-random"
@@ -2703,18 +2752,24 @@ dependencies = [
 
 [[package]]
 name = "const-str"
-version = "0.5.6"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aca749d3d3f5b87a0d6100509879f9cf486ab510803a4a4e1001da1ff61c2bd6"
+checksum = "3618cccc083bb987a415d85c02ca6c9994ea5b44731ec28b9ecf09658655fba9"
 
 [[package]]
 name = "constant_time_eq"
-version = "0.3.0"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
 
 [[package]]
-name = "containers-api"
+name = "constant_time_eq"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
+
+[[package]]
+name = "containers-api"
 version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56082e32f18a6d60f06c736b49e234deffb93b13cb87091a39e0dec053d03819"
@@ -2722,8 +2777,8 @@ dependencies = [
  "chrono",
  "flate2",
  "futures-util",
- "http 0.2.9",
- "hyper 0.14.26",
+ "http 0.2.12",
+ "hyper 0.14.30",
  "hyperlocal",
  "log",
  "mime",
@@ -2743,20 +2798,11 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
 
-[[package]]
-name = "convert_case"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
-dependencies = [
- "unicode-segmentation",
-]
-
 [[package]]
 name = "core-foundation"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -2764,9 +2810,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.3"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "core2"
@@ -2779,9 +2825,9 @@ dependencies = [
 
 [[package]]
 name = "coset"
-version = "0.3.4"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c765a4e852cef25c69a48e9fcd60995a7fecabf0134a0021e7181452c4a60f95"
+checksum = "f4c8cc80f631f8307b887faca24dcc3abc427cd0367f6eb6188f6e8f5b7ad8fb"
 dependencies = [
  "ciborium",
  "ciborium-io",
@@ -2797,38 +2843,47 @@ dependencies = [
  "siphasher",
 ]
 
+[[package]]
+name = "counter"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d458e66999348f56fd3ffcfbb7f7951542075ca8359687c703de6500c1ddccd"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "cpp_demangle"
-version = "0.4.0"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b446fd40bcc17eddd6a4a78f24315eb90afdb3334999ddfd4909985c47722442"
+checksum = "96e58d342ad113c2b878f16d5d034c03be492ae460cdbc02b7f0f2284d310c7d"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.9"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
+checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "crc32c"
-version = "0.6.4"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8f48d60e5b4d2c53d5c2b1d8a58c849a70ae5e5509b08a48d047e3b65714a74"
+checksum = "3a47af21622d091a8f0fb295b88bc886ac74efcc613efc19f5d0b21de5c89e47"
 dependencies = [
  "rustc_version",
 ]
 
 [[package]]
 name = "crc32fast"
-version = "1.3.2"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
  "cfg-if",
 ]
@@ -2947,8 +3002,8 @@ dependencies = [
  "bitflags 1.3.2",
  "crossterm_winapi",
  "libc",
- "mio",
- "parking_lot 0.12.1",
+ "mio 0.8.11",
+ "parking_lot 0.12.3",
  "signal-hook",
  "signal-hook-mio",
  "winapi",
@@ -2963,8 +3018,8 @@ dependencies = [
  "bitflags 1.3.2",
  "crossterm_winapi",
  "libc",
- "mio",
- "parking_lot 0.12.1",
+ "mio 0.8.11",
+ "parking_lot 0.12.3",
  "signal-hook",
  "signal-hook-mio",
  "winapi",
@@ -2972,9 +3027,9 @@ dependencies = [
 
 [[package]]
 name = "crossterm_winapi"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c"
+checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
 dependencies = [
  "winapi",
 ]
@@ -2999,9 +3054,9 @@ dependencies = [
 
 [[package]]
 name = "crypto-bigint"
-version = "0.5.1"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c2538c4e68e52548bacb3e83ac549f903d44f011ac9d5abb5e132e67d0808f7"
+checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
  "generic-array",
  "rand_core 0.6.4",
@@ -3032,9 +3087,9 @@ dependencies = [
 
 [[package]]
 name = "csv"
-version = "1.2.1"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad"
+checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
 dependencies = [
  "csv-core",
  "itoa",
@@ -3044,23 +3099,13 @@ dependencies = [
 
 [[package]]
 name = "csv-core"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
+checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"
 dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "ctor"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
-dependencies = [
- "quote 1.0.35",
- "syn 1.0.107",
-]
-
 [[package]]
 name = "ctr"
 version = "0.9.2"
@@ -3092,9 +3137,9 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -3111,47 +3156,59 @@ dependencies = [
 ]
 
 [[package]]
-name = "cxx"
-version = "1.0.86"
+name = "cynic"
+version = "3.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579"
+checksum = "478c02b53607e3f21c374f024c2cfc2154e554905bba478e8e09409f10ce3726"
 dependencies = [
- "cc",
- "cxxbridge-flags",
- "cxxbridge-macro",
- "link-cplusplus",
+ "cynic-proc-macros",
+ "ref-cast",
+ "reqwest 0.12.7",
+ "serde",
+ "serde_json",
+ "static_assertions",
+ "thiserror",
 ]
 
 [[package]]
-name = "cxx-build"
-version = "1.0.86"
+name = "cynic-codegen"
+version = "3.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70"
+checksum = "7c0ec86f960a00ce087e96ff6f073f6ff28b6876d69ce8caa06c03fb4143981c"
 dependencies = [
- "cc",
- "codespan-reporting",
+ "counter",
+ "cynic-parser",
+ "darling 0.20.10",
  "once_cell",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "scratch",
- "syn 1.0.107",
+ "ouroboros 0.18.4",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "strsim 0.10.0",
+ "syn 2.0.77",
+ "thiserror",
 ]
 
 [[package]]
-name = "cxxbridge-flags"
-version = "1.0.86"
+name = "cynic-parser"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c"
+checksum = "718f6cd8c54ae5249fd42b0c86639df0100b8a86eea2e5f1b915cde2e1481453"
+dependencies = [
+ "indexmap 2.5.0",
+ "lalrpop-util",
+ "logos",
+]
 
 [[package]]
-name = "cxxbridge-macro"
-version = "1.0.86"
+name = "cynic-proc-macros"
+version = "3.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5"
+checksum = "25a69ecdf4aa110fed1c0c8de290bc8ccb2835388733cf2f418f0abdf6ff3899"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "cynic-codegen",
+ "darling 0.20.10",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -3166,12 +3223,12 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.14.2"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa"
+checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
 dependencies = [
- "darling_core 0.14.2",
- "darling_macro 0.14.2",
+ "darling_core 0.14.4",
+ "darling_macro 0.14.4",
 ]
 
 [[package]]
@@ -3192,24 +3249,24 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
 dependencies = [
  "fnv",
  "ident_case",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
  "strsim 0.10.0",
- "syn 1.0.107",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "darling_core"
-version = "0.14.2"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f"
+checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
 dependencies = [
  "fnv",
  "ident_case",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
  "strsim 0.10.0",
- "syn 1.0.107",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -3220,10 +3277,10 @@ checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
 dependencies = [
  "fnv",
  "ident_case",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
  "strsim 0.11.1",
- "syn 2.0.48",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -3233,19 +3290,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
 dependencies = [
  "darling_core 0.13.4",
- "quote 1.0.35",
- "syn 1.0.107",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.14.2"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e"
+checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
 dependencies = [
- "darling_core 0.14.2",
- "quote 1.0.35",
- "syn 1.0.107",
+ "darling_core 0.14.4",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -3255,8 +3312,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core 0.20.10",
- "quote 1.0.35",
- "syn 2.0.48",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -3269,20 +3326,20 @@ dependencies = [
  "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
- "parking_lot_core 0.9.9",
+ "parking_lot_core 0.9.10",
 ]
 
 [[package]]
 name = "data-encoding"
-version = "2.3.3"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb"
+checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
 
 [[package]]
 name = "data-encoding-macro"
-version = "0.1.12"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86927b7cd2fe88fa698b87404b287ab98d1a0063a34071d92e575b72d3029aca"
+checksum = "f1559b6cba622276d6d63706db152618eeb15b89b3e4041446b05876e352e639"
 dependencies = [
  "data-encoding",
  "data-encoding-macro-internal",
@@ -3290,12 +3347,12 @@ dependencies = [
 
 [[package]]
 name = "data-encoding-macro-internal"
-version = "0.1.10"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db"
+checksum = "332d754c0af53bc87c108fed664d121ecf59207ec4196041f04d6ab9002ad33f"
 dependencies = [
  "data-encoding",
- "syn 1.0.107",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -3320,7 +3377,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef552e6f588e446098f6ba40d89ac146c8c7b64aade83c051ee00bb5d2bc18d"
 dependencies = [
- "uuid 1.2.2",
+ "uuid 1.10.0",
 ]
 
 [[package]]
@@ -3336,9 +3393,9 @@ dependencies = [
 
 [[package]]
 name = "der"
-version = "0.7.5"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05e58dffcdcc8ee7b22f0c1f71a69243d7c2d9ad87b5a14361f2424a1565c219"
+checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
 dependencies = [
  "const-oid",
  "pem-rfc7468 0.7.0",
@@ -3347,14 +3404,14 @@ dependencies = [
 
 [[package]]
 name = "der-parser"
-version = "8.1.0"
+version = "8.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42d4bc9b0db0a0df9ae64634ac5bdefb7afcb534e182275ca0beadbe486701c1"
+checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e"
 dependencies = [
  "asn1-rs",
  "displaydoc",
  "nom",
- "num-bigint 0.4.4",
+ "num-bigint 0.4.6",
  "num-traits",
  "rusticata-macros",
 ]
@@ -3375,9 +3432,9 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -3386,20 +3443,20 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e79116f119dd1dba1abf1f3405f03b9b0e79a27a3883864bfebded8a3dc768cd"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "derive_arbitrary"
-version = "1.3.0"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cdeb9ec472d588e539a818b2dee436825730da08ad0017c4b1a17676bdc8b7"
+checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -3417,10 +3474,10 @@ version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f"
 dependencies = [
- "darling 0.14.2",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "darling 0.14.4",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -3430,34 +3487,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e"
 dependencies = [
  "derive_builder_core",
- "syn 1.0.107",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "derive_more"
-version = "0.99.17"
+version = "0.99.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
 dependencies = [
- "convert_case 0.4.0",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "convert_case",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
  "rustc_version",
- "syn 1.0.107",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "determinator"
-version = "0.10.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c644b91adb5bcc66d3533607b6d3ee5c1c2d858d2d95e41dd6aae673e29e0509"
+checksum = "bf14b901cdfba3f731d01c4c184100e85f586a272d38874824175b845dbaeaf9"
 dependencies = [
  "camino",
  "globset",
  "guppy",
  "guppy-workspace-hack",
  "once_cell",
- "petgraph 0.6.2",
+ "petgraph 0.6.5",
  "rayon",
  "serde",
  "toml 0.5.11",
@@ -3465,11 +3522,11 @@ dependencies = [
 
 [[package]]
 name = "diesel"
-version = "2.1.4"
+version = "2.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62c6fcf842f17f8c78ecf7c81d75c5ce84436b41ee07e03f490fbb5f5a8731d8"
+checksum = "158fe8e2e68695bd615d7e4f3227c0727b151330d3e253b525086c348d055d5e"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "byteorder",
  "chrono",
  "diesel_derives",
@@ -3484,33 +3541,34 @@ dependencies = [
 
 [[package]]
 name = "diesel-derive-enum"
-version = "2.0.1"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b10c03b954333d05bfd5be1d8a74eae2c9ca77b86e0f1c3a1ea29c49da1d6c2"
+checksum = "81c5131a2895ef64741dad1d483f358c2a229a3a2d1b256778cdc5e146db64d4"
 dependencies = [
  "heck 0.4.1",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "diesel_derives"
-version = "2.1.2"
+version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef8337737574f55a468005a83499da720f20c65586241ffea339db9ecdfd2b44"
+checksum = "e7f2c3de51e2ba6bf2a648285696137aaf0f5f487bcbea93972fe8a364e131a4"
 dependencies = [
  "diesel_table_macro_syntax",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "dsl_auto_type",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "diesel_migrations"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6036b3f0120c5961381b570ee20a02432d7e2d27ea60de9578799cf9156914ac"
+checksum = "8a73ce704bad4231f001bff3314d91dce4aba0770cee8b233991859abc15c1f6"
 dependencies = [
  "diesel",
  "migrations_internals",
@@ -3519,11 +3577,11 @@ dependencies = [
 
 [[package]]
 name = "diesel_table_macro_syntax"
-version = "0.1.0"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc5557efc453706fed5e4fa85006fe9817c224c3f480a34c7e5959fd700921c5"
+checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25"
 dependencies = [
- "syn 2.0.48",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -3559,7 +3617,16 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e616e59155c92257e84970156f506287853355f58cd4a6eb167385722c32b790"
 dependencies = [
- "nu-ansi-term",
+ "nu-ansi-term 0.46.0",
+]
+
+[[package]]
+name = "diffy"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d3041965b7a63e70447ec818a46b1e5297f7fcae3058356d226c02750c4e6cb"
+dependencies = [
+ "nu-ansi-term 0.50.1",
 ]
 
 [[package]]
@@ -3577,7 +3644,7 @@ version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
- "block-buffer 0.10.3",
+ "block-buffer 0.10.4",
  "const-oid",
  "crypto-common",
  "subtle",
@@ -3647,20 +3714,20 @@ dependencies = [
 
 [[package]]
 name = "displaydoc"
-version = "0.2.3"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "dissimilar"
-version = "1.0.5"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd5f0c7e4bd266b8ab2550e6238d2e74977c23c15536ac7be45e9c95e2e3fbbb"
+checksum = "59f8e79d1fbf76bdfbde321e902714bf6c49df88a7dda6fc682fc2979226962d"
 
 [[package]]
 name = "doc-comment"
@@ -3682,8 +3749,8 @@ dependencies = [
  "containers-api",
  "docker-api-stubs",
  "futures-util",
- "http 0.2.9",
- "hyper 0.14.26",
+ "http 0.2.12",
+ "hyper 0.14.30",
  "log",
  "paste",
  "serde",
@@ -3702,7 +3769,7 @@ dependencies = [
  "chrono",
  "serde",
  "serde_json",
- "serde_with 2.1.0",
+ "serde_with 2.3.3",
 ]
 
 [[package]]
@@ -3719,15 +3786,29 @@ checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
 
 [[package]]
 name = "downcast-rs"
-version = "1.2.0"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
+
+[[package]]
+name = "dsl_auto_type"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
+checksum = "c5d9abe6314103864cc2d8901b7ae224e0ab1a103a0a416661b4097b0779b607"
+dependencies = [
+ "darling 0.20.10",
+ "either",
+ "heck 0.5.0",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
+]
 
 [[package]]
 name = "dunce"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
+checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
 
 [[package]]
 name = "duration-str"
@@ -3745,9 +3826,9 @@ dependencies = [
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d"
+checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
 [[package]]
 name = "ecdsa"
@@ -3763,15 +3844,16 @@ dependencies = [
 
 [[package]]
 name = "ecdsa"
-version = "0.16.6"
+version = "0.16.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a48e5d537b8a30c0b023116d981b16334be1485af7ca68db3a2b7024cbc957fd"
+checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca"
 dependencies = [
- "der 0.7.5",
+ "der 0.7.9",
  "digest 0.10.7",
- "elliptic-curve 0.13.4",
+ "elliptic-curve 0.13.8",
  "rfc6979 0.4.0",
- "signature 2.0.0",
+ "signature 2.2.0",
+ "spki 0.7.3",
 ]
 
 [[package]]
@@ -3792,7 +3874,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
 dependencies = [
  "pkcs8 0.10.2",
- "signature 2.0.0",
+ "signature 2.2.0",
 ]
 
 [[package]]
@@ -3820,17 +3902,17 @@ dependencies = [
  "ed25519 2.2.3",
  "rand_core 0.6.4",
  "serde",
- "sha2 0.10.6",
- "signature 2.0.0",
+ "sha2 0.10.8",
+ "signature 2.2.0",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
 name = "either"
-version = "1.8.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "elliptic-curve"
@@ -3853,13 +3935,13 @@ dependencies = [
 
 [[package]]
 name = "elliptic-curve"
-version = "0.13.4"
+version = "0.13.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75c71eaa367f2e5d556414a8eea812bc62985c879748d6403edabd9cb03f16e7"
+checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47"
 dependencies = [
  "base16ct 0.2.0",
  "base64ct",
- "crypto-bigint 0.5.1",
+ "crypto-bigint 0.5.5",
  "digest 0.10.7",
  "ff 0.13.0",
  "generic-array",
@@ -3867,13 +3949,22 @@ dependencies = [
  "pem-rfc7468 0.7.0",
  "pkcs8 0.10.2",
  "rand_core 0.6.4",
- "sec1 0.7.1",
+ "sec1 0.7.3",
  "serde_json",
  "serdect",
  "subtle",
  "zeroize",
 ]
 
+[[package]]
+name = "ena"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d248bdd43ce613d87415282f69b9bb99d947d290b10962dd6c56233312c2ad5"
+dependencies = [
+ "log",
+]
+
 [[package]]
 name = "encode_unicode"
 version = "0.3.6"
@@ -3888,9 +3979,9 @@ checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.31"
+version = "0.8.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
+checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
 dependencies = [
  "cfg-if",
 ]
@@ -3903,39 +3994,51 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
 
 [[package]]
 name = "enr"
-version = "0.8.1"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf56acd72bb22d2824e66ae8e9e5ada4d0de17a69c7fd35569dde2ada8ec9116"
+checksum = "2a3d8dc56e02f954cac8eb489772c552c473346fc34f67412bb6244fd647f7e4"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.21.7",
  "bytes",
  "hex",
- "k256 0.13.1",
+ "k256 0.13.3",
  "log",
  "rand 0.8.5",
  "rlp",
  "serde",
- "sha3 0.10.6",
+ "sha3 0.10.8",
  "zeroize",
 ]
 
+[[package]]
+name = "enum-as-inner"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
+]
+
 [[package]]
 name = "enum-compat-util"
 version = "0.1.0"
 dependencies = [
- "serde_yaml",
+ "serde_yaml 0.8.26",
 ]
 
 [[package]]
 name = "enum_dispatch"
-version = "0.3.9"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1693044dcf452888dd3a6a6a0dab67f0652094e3920dfe029a54d2f37d9b7394"
+checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd"
 dependencies = [
  "once_cell",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -3988,23 +4091,14 @@ dependencies = [
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "error-chain"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc"
-dependencies = [
- "version_check",
-]
-
 [[package]]
 name = "error-code"
 version = "2.3.1"
@@ -4031,8 +4125,8 @@ dependencies = [
  "scrypt",
  "serde",
  "serde_json",
- "sha2 0.10.6",
- "sha3 0.10.6",
+ "sha2 0.10.8",
+ "sha3 0.10.8",
  "thiserror",
  "uuid 0.8.2",
 ]
@@ -4049,7 +4143,7 @@ dependencies = [
  "regex",
  "serde",
  "serde_json",
- "sha3 0.10.6",
+ "sha3 0.10.8",
  "thiserror",
  "uint",
 ]
@@ -4087,9 +4181,9 @@ dependencies = [
 
 [[package]]
 name = "ethers"
-version = "2.0.0"
+version = "2.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "839a392641e746a1ff365ef7c901238410b5c6285d240cf2409ffaaa7df9a78a"
+checksum = "816841ea989f0c69e459af1cf23a6b0033b19a55424a1ea3a30099becdb8dec0"
 dependencies = [
  "ethers-addressbook",
  "ethers-contract",
@@ -4098,13 +4192,14 @@ dependencies = [
  "ethers-middleware",
  "ethers-providers",
  "ethers-signers",
+ "ethers-solc",
 ]
 
 [[package]]
 name = "ethers-addressbook"
-version = "2.0.2"
+version = "2.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0b603812e5e4d63521c691cbc1f34743879e96a1ee96c6594639d7fa0cf6fbc"
+checksum = "5495afd16b4faa556c3bba1f21b98b4983e53c1755022377051a975c3b021759"
 dependencies = [
  "ethers-core",
  "once_cell",
@@ -4114,16 +4209,16 @@ dependencies = [
 
 [[package]]
 name = "ethers-contract"
-version = "2.0.2"
+version = "2.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4e8ed7c2b2a22e07b65ae0eb426c948a7448f1be15c66e4813e02c423751fc9"
+checksum = "6fceafa3578c836eeb874af87abacfb041f92b4da0a78a5edd042564b8ecdaaa"
 dependencies = [
+ "const-hex",
  "ethers-contract-abigen",
  "ethers-contract-derive",
  "ethers-core",
  "ethers-providers",
  "futures-util",
- "hex",
  "once_cell",
  "pin-project",
  "serde",
@@ -4133,88 +4228,84 @@ dependencies = [
 
 [[package]]
 name = "ethers-contract-abigen"
-version = "2.0.2"
+version = "2.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf0984f4ec4e267fd27b7c9fa2f73e72c5c98491a73f777290654154d104f723"
+checksum = "04ba01fbc2331a38c429eb95d4a570166781f14290ef9fdb144278a90b5a739b"
 dependencies = [
  "Inflector",
+ "const-hex",
  "dunce",
  "ethers-core",
  "ethers-etherscan",
  "eyre",
- "getrandom 0.2.15",
- "hex",
- "prettyplease 0.1.25",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "prettyplease",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
  "regex",
- "reqwest 0.11.20",
+ "reqwest 0.11.27",
  "serde",
  "serde_json",
- "syn 1.0.107",
- "tokio",
- "toml 0.7.4",
- "url",
+ "syn 2.0.77",
+ "toml 0.8.19",
  "walkdir",
 ]
 
 [[package]]
 name = "ethers-contract-derive"
-version = "2.0.2"
+version = "2.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "914e9211077a1b590af1ee6b8dfbd54515c808119546c95da69479908dc3d4de"
+checksum = "87689dcabc0051cde10caaade298f9e9093d65f6125c14575db3fd8c669a168f"
 dependencies = [
+ "Inflector",
+ "const-hex",
  "ethers-contract-abigen",
  "ethers-core",
- "hex",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "serde_json",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "ethers-core"
-version = "2.0.2"
+version = "2.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40bf114f1017ace0f622f1652f59c2c5e1abfe7d88891cca0c43da979b351de0"
+checksum = "82d80cc6ad30b14a48ab786523af33b37f28a8623fc06afd55324816ef18fb1f"
 dependencies = [
- "arrayvec 0.7.2",
+ "arrayvec 0.7.6",
  "bytes",
- "cargo_metadata 0.15.4",
+ "cargo_metadata 0.18.1",
  "chrono",
- "convert_case 0.6.0",
- "elliptic-curve 0.13.4",
+ "const-hex",
+ "elliptic-curve 0.13.8",
  "ethabi",
  "generic-array",
- "getrandom 0.2.15",
- "hex",
- "k256 0.13.1",
- "num_enum 0.5.11",
+ "k256 0.13.3",
+ "num_enum 0.7.3",
  "once_cell",
  "open-fastrlp",
- "proc-macro2 1.0.78",
  "rand 0.8.5",
  "rlp",
  "serde",
  "serde_json",
- "strum 0.24.1",
- "syn 1.0.107",
+ "strum 0.26.3",
+ "syn 2.0.77",
  "tempfile",
  "thiserror",
  "tiny-keccak",
- "unicode-xid 0.2.4",
+ "unicode-xid 0.2.5",
 ]
 
 [[package]]
 name = "ethers-etherscan"
-version = "2.0.2"
+version = "2.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8920b59cf81e357df2c8102d6a9dc81c2d68f7409543ff3b6868851ecf007807"
+checksum = "e79e5973c26d4baf0ce55520bd732314328cabe53193286671b47144145b9649"
 dependencies = [
+ "chrono",
  "ethers-core",
- "getrandom 0.2.15",
- "reqwest 0.11.20",
- "semver 1.0.16",
+ "reqwest 0.11.27",
+ "semver",
  "serde",
  "serde_json",
  "thiserror",
@@ -4223,9 +4314,9 @@ dependencies = [
 
 [[package]]
 name = "ethers-middleware"
-version = "2.0.2"
+version = "2.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c54b30f67c1883ed68bd38aedbdd321831382c12e1b95089c8261c79bb85e4da"
+checksum = "48f9fdf09aec667c099909d91908d5eaf9be1bd0e2500ba4172c1d28bfaa43de"
 dependencies = [
  "async-trait",
  "auto_impl",
@@ -4238,7 +4329,7 @@ dependencies = [
  "futures-locks",
  "futures-util",
  "instant",
- "reqwest 0.11.20",
+ "reqwest 0.11.27",
  "serde",
  "serde_json",
  "thiserror",
@@ -4250,31 +4341,33 @@ dependencies = [
 
 [[package]]
 name = "ethers-providers"
-version = "2.0.2"
+version = "2.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2fa0857eaad0c1678f982a2f4cfbe33ebd51d273cc93de0182b7c693f2a84a1"
+checksum = "6434c9a33891f1effc9c75472e12666db2fa5a0fec4b29af6221680a6fe83ab2"
 dependencies = [
  "async-trait",
  "auto_impl",
- "base64 0.21.2",
+ "base64 0.21.7",
  "bytes",
+ "const-hex",
  "enr",
  "ethers-core",
+ "futures-channel",
  "futures-core",
  "futures-timer",
  "futures-util",
- "getrandom 0.2.15",
  "hashers",
- "hex",
- "http 0.2.9",
+ "http 0.2.12",
  "instant",
+ "jsonwebtoken 8.3.0",
  "once_cell",
  "pin-project",
- "reqwest 0.11.20",
+ "reqwest 0.11.27",
  "serde",
  "serde_json",
  "thiserror",
  "tokio",
+ "tokio-tungstenite 0.20.1",
  "tracing",
  "tracing-futures",
  "url",
@@ -4286,28 +4379,60 @@ dependencies = [
 
 [[package]]
 name = "ethers-signers"
-version = "2.0.2"
+version = "2.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5caa7cad4f444931d0ed45818e609847781582399eff0be5c089e8666475c7fb"
+checksum = "228875491c782ad851773b652dd8ecac62cda8571d3bc32a5853644dd26766c2"
 dependencies = [
  "async-trait",
  "coins-bip32",
  "coins-bip39",
- "elliptic-curve 0.13.4",
+ "const-hex",
+ "elliptic-curve 0.13.8",
  "eth-keystore",
  "ethers-core",
- "hex",
  "rand 0.8.5",
- "sha2 0.10.6",
+ "sha2 0.10.8",
+ "thiserror",
+ "tracing",
+]
+
+[[package]]
+name = "ethers-solc"
+version = "2.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66244a771d9163282646dbeffe0e6eca4dda4146b6498644e678ac6089b11edd"
+dependencies = [
+ "cfg-if",
+ "const-hex",
+ "dirs 5.0.1",
+ "dunce",
+ "ethers-core",
+ "glob",
+ "home",
+ "md-5 0.10.6",
+ "num_cpus",
+ "once_cell",
+ "path-slash",
+ "rayon",
+ "regex",
+ "semver",
+ "serde",
+ "serde_json",
+ "solang-parser",
+ "svm-rs",
  "thiserror",
+ "tiny-keccak",
+ "tokio",
  "tracing",
+ "walkdir",
+ "yansi 0.5.1",
 ]
 
 [[package]]
 name = "ethnum"
-version = "1.3.2"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0198b9d0078e0f30dedc7acbb21c974e838fc8fae3ee170128658a98cb2c1c04"
+checksum = "b90ca2580b73ab6a1f724b76ca11ab632df820fd6040c336200d2c1df7b3c82c"
 
 [[package]]
 name = "event-listener"
@@ -4317,9 +4442,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "expect-test"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d9eafeadd538e68fb28016364c9732d78e420b9ff8853fa5e4058861e9f8d3"
+checksum = "9e0be0a561335815e06dab7c62e50353134c796e7a6155402a64bcff66b6a5e0"
 dependencies = [
  "dissimilar",
  "once_cell",
@@ -4327,9 +4452,9 @@ dependencies = [
 
 [[package]]
 name = "eyre"
-version = "0.6.8"
+version = "0.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
 dependencies = [
  "indenter",
  "once_cell",
@@ -4369,16 +4494,16 @@ dependencies = [
  "curve25519-dalek-ng",
  "derive_more",
  "digest 0.10.7",
- "ecdsa 0.16.6",
+ "ecdsa 0.16.9",
  "ed25519-consensus",
- "elliptic-curve 0.13.4",
+ "elliptic-curve 0.13.8",
  "fastcrypto-derive",
  "generic-array",
  "hex",
  "hex-literal 0.4.1",
  "hkdf",
  "lazy_static",
- "num-bigint 0.4.4",
+ "num-bigint 0.4.6",
  "once_cell",
  "p256",
  "rand 0.8.5",
@@ -4389,10 +4514,10 @@ dependencies = [
  "secp256k1",
  "serde",
  "serde_json",
- "serde_with 3.8.1",
- "sha2 0.10.6",
- "sha3 0.10.6",
- "signature 2.0.0",
+ "serde_with 3.9.0",
+ "sha2 0.10.8",
+ "sha3 0.10.8",
+ "signature 2.2.0",
  "static_assertions",
  "thiserror",
  "tokio",
@@ -4405,8 +4530,8 @@ name = "fastcrypto-derive"
 version = "0.1.3"
 source = "git+https://github.com/MystenLabs/fastcrypto?rev=5f2c63266a065996d53f98156f0412782b468597#5f2c63266a065996d53f98156f0412782b468597"
 dependencies = [
- "quote 1.0.35",
- "syn 1.0.107",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -4421,7 +4546,7 @@ dependencies = [
  "itertools 0.10.5",
  "rand 0.8.5",
  "serde",
- "sha3 0.10.6",
+ "sha3 0.10.8",
  "tap",
  "tracing",
  "typenum",
@@ -4436,7 +4561,7 @@ dependencies = [
  "bcs",
  "fastcrypto",
  "lazy_static",
- "num-bigint 0.4.4",
+ "num-bigint 0.4.6",
  "num-integer",
  "num-prime",
  "num-traits",
@@ -4464,13 +4589,13 @@ dependencies = [
  "fastcrypto",
  "ff 0.13.0",
  "im",
- "itertools 0.12.0",
+ "itertools 0.12.1",
  "lazy_static",
  "neptune",
- "num-bigint 0.4.4",
+ "num-bigint 0.4.6",
  "once_cell",
  "regex",
- "reqwest 0.12.4",
+ "reqwest 0.12.7",
  "schemars",
  "serde",
  "serde_json",
@@ -4479,18 +4604,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
-dependencies = [
- "instant",
-]
-
-[[package]]
-name = "fastrand"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
 
 [[package]]
 name = "fcm"
@@ -4501,7 +4617,7 @@ dependencies = [
  "chrono",
  "erased-serde",
  "log",
- "reqwest 0.11.20",
+ "reqwest 0.11.27",
  "serde",
  "serde_json",
 ]
@@ -4513,7 +4629,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5"
 dependencies = [
  "cfg-if",
- "rustix 0.38.34",
+ "rustix",
  "windows-sys 0.48.0",
 ]
 
@@ -4560,9 +4676,9 @@ dependencies = [
  "num-bigint 0.3.3",
  "num-integer",
  "num-traits",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -4578,21 +4694,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cca4fdab1b9b7e274e7de51202e37f9cfa542b28c77f8d09b817d77a726b4807"
 dependencies = [
  "darling 0.13.4",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "filetime"
-version = "0.2.22"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.3.5",
- "windows-sys 0.48.0",
+ "libredox",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -4613,7 +4729,7 @@ version = "0.1.0"
 source = "git+ssh://git@github.com/nightly-labs/alexandria.git?rev=bd401bc3807bba5bb5203f42cc7b8cf836be83f5#bd401bc3807bba5bb5203f42cc7b8cf836be83f5"
 dependencies = [
  "fcm",
- "reqwest 0.12.4",
+ "reqwest 0.12.7",
  "serde",
  "serde_json",
  "structs",
@@ -4668,12 +4784,12 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.28"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
 dependencies = [
  "crc32fast",
- "miniz_oxide",
+ "miniz_oxide 0.8.0",
 ]
 
 [[package]]
@@ -4708,9 +4824,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.1.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
 dependencies = [
  "percent-encoding",
 ]
@@ -4721,6 +4837,16 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 
+[[package]]
+name = "fs2"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "fs_extra"
 version = "1.3.0"
@@ -4750,9 +4876,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -4765,9 +4891,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -4775,15 +4901,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -4792,24 +4918,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
-
-[[package]]
-name = "futures-lite"
-version = "1.12.0"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
-dependencies = [
- "fastrand 1.8.0",
- "futures-core",
- "futures-io",
- "memchr",
- "parking",
- "pin-project-lite",
- "waker-fn",
-]
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
 [[package]]
 name = "futures-locks"
@@ -4823,32 +4934,32 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
 
 [[package]]
 name = "futures-task"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-timer"
-version = "3.0.2"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
+checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
 dependencies = [
  "gloo-timers",
  "send_wrapper 0.4.0",
@@ -4856,9 +4967,9 @@ dependencies = [
 
 [[package]]
 name = "futures-util"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -4919,9 +5030,9 @@ dependencies = [
 
 [[package]]
 name = "ghash"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40"
+checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1"
 dependencies = [
  "opaque-debug",
  "polyval",
@@ -4935,24 +5046,22 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "git-version"
-version = "0.3.5"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6b0decc02f4636b9ccad390dcbe77b722a77efedfa393caf8379a51d5c61899"
+checksum = "1ad568aa3db0fcbc81f2f116137f263d7304f512a1209b35b85150d3ef88ad19"
 dependencies = [
  "git-version-macro",
- "proc-macro-hack",
 ]
 
 [[package]]
 name = "git-version-macro"
-version = "0.3.5"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe69f1cbdb6e28af2bac214e943b99ce8a0a06b447d15d3e61161b0423139f3f"
+checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0"
 dependencies = [
- "proc-macro-hack",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -4963,15 +5072,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
 [[package]]
 name = "globset"
-version = "0.4.10"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
+checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19"
 dependencies = [
- "aho-corasick 0.7.20",
+ "aho-corasick",
  "bstr",
- "fnv",
  "log",
- "regex",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
@@ -4988,9 +5097,9 @@ dependencies = [
 
 [[package]]
 name = "governor"
-version = "0.6.0"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "821239e5672ff23e2a7060901fa622950bbd80b649cdaadd78d1c1767ed14eb4"
+checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b"
 dependencies = [
  "cfg-if",
  "dashmap",
@@ -4998,10 +5107,12 @@ dependencies = [
  "futures-timer",
  "no-std-compat",
  "nonzero_ext",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
+ "portable-atomic",
  "quanta",
  "rand 0.8.5",
  "smallvec",
+ "spinning_top",
 ]
 
 [[package]]
@@ -5030,25 +5141,26 @@ dependencies = [
 
 [[package]]
 name = "guppy"
-version = "0.15.2"
+version = "0.17.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f822a2716041492e071691606474f5a7e4fa7c2acbfd7da7b29884fb448291c7"
+checksum = "3bff2f6a9d515cf6453282af93363f93bdf570792a6f4f619756e46696d773fa"
 dependencies = [
+ "ahash 0.8.11",
  "camino",
- "cargo_metadata 0.15.4",
+ "cargo_metadata 0.18.1",
  "cfg-if",
  "debug-ignore",
  "fixedbitset 0.4.2",
  "guppy-summaries",
  "guppy-workspace-hack",
- "indexmap 1.9.3",
- "itertools 0.10.5",
+ "indexmap 2.5.0",
+ "itertools 0.13.0",
  "nested",
  "once_cell",
  "pathdiff",
- "petgraph 0.6.2",
+ "petgraph 0.6.5",
  "rayon",
- "semver 1.0.16",
+ "semver",
  "serde",
  "serde_json",
  "smallvec",
@@ -5067,7 +5179,7 @@ dependencies = [
  "cfg-if",
  "diffus",
  "guppy-workspace-hack",
- "semver 1.0.16",
+ "semver",
  "serde",
  "toml 0.5.11",
 ]
@@ -5089,19 +5201,19 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "futures-util",
- "http 0.2.9",
- "indexmap 2.2.6",
+ "http 0.2.12",
+ "indexmap 2.5.0",
  "slab",
  "tokio",
- "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.12",
  "tracing",
 ]
 
 [[package]]
 name = "h2"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
+checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
 dependencies = [
  "atomic-waker",
  "bytes",
@@ -5109,30 +5221,31 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http 1.1.0",
- "indexmap 2.2.6",
+ "indexmap 2.5.0",
  "slab",
  "tokio",
- "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.12",
  "tracing",
 ]
 
 [[package]]
 name = "hakari"
-version = "0.13.2"
+version = "0.17.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2af0223111b69beda15417ad6a960bffb093c916f0eaa559036c7036efa2d199"
+checksum = "f3db4569d65cb4bc06dbcd78e4dd9771e266e75e27de868fa369e995fbb8c267"
 dependencies = [
+ "ahash 0.8.11",
  "atomicwrites",
  "bimap",
  "camino",
  "cfg-if",
  "debug-ignore",
- "diffy",
+ "diffy 0.4.0",
  "guppy",
  "guppy-workspace-hack",
  "include_dir",
  "indenter",
- "itertools 0.10.5",
+ "itertools 0.13.0",
  "owo-colors 3.5.0",
  "pathdiff",
  "rayon",
@@ -5144,12 +5257,6 @@ dependencies = [
  "twox-hash",
 ]
 
-[[package]]
-name = "half"
-version = "1.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
-
 [[package]]
 name = "half"
 version = "2.4.1"
@@ -5167,7 +5274,7 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.7.8",
 ]
 
 [[package]]
@@ -5200,11 +5307,11 @@ dependencies = [
 
 [[package]]
 name = "hdrhistogram"
-version = "7.5.2"
+version = "7.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f19b9f54f7c7f55e31401bb647626ce0cf0f67b0004982ce815b3ee72a02aa8"
+checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.21.7",
  "byteorder",
  "crossbeam-channel",
  "flate2",
@@ -5214,15 +5321,14 @@ dependencies = [
 
 [[package]]
 name = "headers"
-version = "0.3.8"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584"
+checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9"
 dependencies = [
- "base64 0.13.1",
- "bitflags 1.3.2",
+ "base64 0.21.7",
  "bytes",
  "headers-core",
- "http 0.2.9",
+ "http 1.1.0",
  "httpdate",
  "mime",
  "sha1",
@@ -5230,11 +5336,11 @@ dependencies = [
 
 [[package]]
 name = "headers-core"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429"
+checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4"
 dependencies = [
- "http 0.2.9",
+ "http 1.1.0",
 ]
 
 [[package]]
@@ -5251,18 +5357,15 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hermit-abi"
-version = "0.2.6"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.2"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
 
 [[package]]
 name = "hex"
@@ -5287,9 +5390,9 @@ checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
 [[package]]
 name = "hkdf"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
+checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7"
 dependencies = [
  "hmac 0.12.1",
 ]
@@ -5321,18 +5424,18 @@ checksum = "77e806677ce663d0a199541030c816847b36e8dc095f70dae4a4f4ad63da5383"
 
 [[package]]
 name = "home"
-version = "0.5.4"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "747309b4b440c06d57b0b25f2aee03ee9b5e5397d288c60e21fc709bb98a7408"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
 dependencies = [
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "http"
-version = "0.2.9"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
 dependencies = [
  "bytes",
  "fnv",
@@ -5352,12 +5455,12 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
  "bytes",
- "http 0.2.9",
+ "http 0.2.12",
  "pin-project-lite",
 ]
 
@@ -5386,21 +5489,21 @@ dependencies = [
 
 [[package]]
 name = "http-range-header"
-version = "0.3.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29"
+checksum = "08a397c49fec283e3d6211adbe480be95aae5f304cfb923e9970e08956d5168a"
 
 [[package]]
 name = "httparse"
-version = "1.8.0"
+version = "1.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
 
 [[package]]
 name = "httpdate"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "humantime"
@@ -5410,22 +5513,22 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.26"
+version = "0.14.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4"
+checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
  "h2 0.3.26",
- "http 0.2.9",
- "http-body 0.4.5",
+ "http 0.2.12",
+ "http-body 0.4.6",
  "httparse",
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.9",
+ "socket2 0.5.7",
  "tokio",
  "tower-service",
  "tracing",
@@ -5441,10 +5544,11 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "h2 0.4.5",
+ "h2 0.4.6",
  "http 1.1.0",
  "http-body 1.0.1",
  "httparse",
+ "httpdate",
  "itoa",
  "pin-project-lite",
  "smallvec",
@@ -5458,11 +5562,11 @@ version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c"
 dependencies = [
- "http 0.2.9",
- "hyper 0.14.26",
+ "http 0.2.12",
+ "hyper 0.14.30",
  "log",
- "rustls 0.20.7",
- "rustls-native-certs 0.6.2",
+ "rustls 0.20.9",
+ "rustls-native-certs 0.6.3",
  "tokio",
  "tokio-rustls 0.23.4",
  "webpki-roots 0.22.6",
@@ -5470,35 +5574,37 @@ dependencies = [
 
 [[package]]
 name = "hyper-rustls"
-version = "0.24.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7"
+checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
 dependencies = [
- "http 0.2.9",
- "hyper 0.14.26",
+ "futures-util",
+ "http 0.2.12",
+ "hyper 0.14.30",
  "log",
  "rustls 0.21.12",
- "rustls-native-certs 0.6.2",
+ "rustls-native-certs 0.6.3",
  "tokio",
- "tokio-rustls 0.24.0",
- "webpki-roots 0.23.1",
+ "tokio-rustls 0.24.1",
 ]
 
 [[package]]
 name = "hyper-rustls"
-version = "0.26.0"
+version = "0.27.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c"
+checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
 dependencies = [
  "futures-util",
  "http 1.1.0",
  "hyper 1.4.1",
  "hyper-util",
- "rustls 0.22.4",
+ "rustls 0.23.13",
+ "rustls-native-certs 0.8.0",
  "rustls-pki-types",
  "tokio",
- "tokio-rustls 0.25.0",
+ "tokio-rustls 0.26.0",
  "tower-service",
+ "webpki-roots 0.26.5",
 ]
 
 [[package]]
@@ -5507,12 +5613,25 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
 dependencies = [
- "hyper 0.14.26",
+ "hyper 0.14.30",
  "pin-project-lite",
  "tokio",
  "tokio-io-timeout",
 ]
 
+[[package]]
+name = "hyper-timeout"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793"
+dependencies = [
+ "hyper 1.4.1",
+ "hyper-util",
+ "pin-project-lite",
+ "tokio",
+ "tower-service",
+]
+
 [[package]]
 name = "hyper-tls"
 version = "0.5.0"
@@ -5520,7 +5639,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes",
- "hyper 0.14.26",
+ "hyper 0.14.30",
  "native-tls",
  "tokio",
  "tokio-native-tls",
@@ -5544,9 +5663,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -5555,7 +5674,7 @@ dependencies = [
  "http-body 1.0.1",
  "hyper 1.4.1",
  "pin-project-lite",
- "socket2 0.5.6",
+ "socket2 0.5.7",
  "tokio",
  "tower",
  "tower-service",
@@ -5570,33 +5689,32 @@ checksum = "0fafdf7b2b2de7c9784f76e02c0935e65a8117ec3b768644379983ab333ac98c"
 dependencies = [
  "futures-util",
  "hex",
- "hyper 0.14.26",
+ "hyper 0.14.30",
  "pin-project",
  "tokio",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.53"
+version = "0.1.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
- "winapi",
+ "windows-core",
 ]
 
 [[package]]
 name = "iana-time-zone-haiku"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
 dependencies = [
- "cxx",
- "cxx-build",
+ "cc",
 ]
 
 [[package]]
@@ -5605,16 +5723,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
-[[package]]
-name = "idna"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
 [[package]]
 name = "idna"
 version = "0.5.0"
@@ -5660,7 +5768,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f"
 dependencies = [
- "parity-scale-codec 3.6.5",
+ "parity-scale-codec 3.6.12",
 ]
 
 [[package]]
@@ -5696,9 +5804,9 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -5717,8 +5825,8 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
 ]
 
 [[package]]
@@ -5740,9 +5848,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.5",
@@ -5751,13 +5859,14 @@ dependencies = [
 
 [[package]]
 name = "indicatif"
-version = "0.17.2"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4295cbb7573c16d310e99e713cf9e75101eb190ab31fccd35f2d2691b4352b19"
+checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
 dependencies = [
  "console",
+ "instant",
  "number_prefix",
- "portable-atomic 0.3.19",
+ "portable-atomic",
  "unicode-width",
 ]
 
@@ -5787,7 +5896,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
 dependencies = [
- "block-padding 0.3.2",
+ "block-padding 0.3.3",
  "generic-array",
 ]
 
@@ -5809,9 +5918,9 @@ dependencies = [
 
 [[package]]
 name = "insta"
-version = "1.26.0"
+version = "1.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6f0f08b46e4379744de2ab67aa8f7de3ffd1da3e275adc41fcc82053ede46ff"
+checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60"
 dependencies = [
  "console",
  "lazy_static",
@@ -5820,14 +5929,13 @@ dependencies = [
  "pest_derive",
  "serde",
  "similar",
- "yaml-rust",
 ]
 
 [[package]]
 name = "instant"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -5841,21 +5949,11 @@ version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02"
 
-[[package]]
-name = "io-lifetimes"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
-dependencies = [
- "libc",
- "windows-sys 0.42.0",
-]
-
 [[package]]
 name = "ipnet"
-version = "2.7.1"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"
+checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"
 
 [[package]]
 name = "ipnetwork"
@@ -5868,11 +5966,12 @@ dependencies = [
 
 [[package]]
 name = "iri-string"
-version = "0.4.1"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f0f7638c1e223529f1bfdc48c8b133b9e0b434094d1d28473161ee48b235f78"
+checksum = "3e0f755bd3806e06ad4f366f92639415d99a339a2c7ecf8c26ccea2097c11cb6"
 dependencies = [
- "nom",
+ "memchr",
+ "serde",
 ]
 
 [[package]]
@@ -5886,14 +5985,13 @@ dependencies = [
 
 [[package]]
 name = "is-terminal"
-version = "0.4.7"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
+checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
 dependencies = [
- "hermit-abi 0.3.2",
- "io-lifetimes",
- "rustix 0.37.7",
- "windows-sys 0.48.0",
+ "hermit-abi 0.4.0",
+ "libc",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5912,6 +6010,12 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45"
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -5932,9 +6036,9 @@ dependencies = [
 
 [[package]]
 name = "itertools"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
 dependencies = [
  "either",
 ]
@@ -5950,15 +6054,15 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.5"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "jemalloc-ctl"
-version = "0.5.0"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1891c671f3db85d8ea8525dd43ab147f9977041911d24a03e5a36187a7bfde9"
+checksum = "7cffc705424a344c054e135d12ee591402f4539245e8bbd64e6c9eaa9458b63c"
 dependencies = [
  "jemalloc-sys",
  "libc",
@@ -5967,29 +6071,28 @@ dependencies = [
 
 [[package]]
 name = "jemalloc-sys"
-version = "0.5.2+5.3.0-patched"
+version = "0.5.4+5.3.0-patched"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134163979b6eed9564c98637b710b40979939ba351f59952708234ea11b5f3f8"
+checksum = "ac6c1946e1cea1788cbfde01c993b52a10e2da07f4bac608228d1bed20bfebf2"
 dependencies = [
  "cc",
- "fs_extra",
  "libc",
 ]
 
 [[package]]
 name = "jobserver"
-version = "0.1.25"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.64"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -6040,16 +6143,16 @@ version = "0.16.2"
 source = "git+https://github.com/wlmyng/jsonrpsee.git?rev=b1b300784795f6a64d0fcdf8f03081a9bc38bde8#b1b300784795f6a64d0fcdf8f03081a9bc38bde8"
 dependencies = [
  "futures-util",
- "http 0.2.9",
+ "http 0.2.12",
  "jsonrpsee-core",
  "jsonrpsee-types",
  "pin-project",
- "rustls-native-certs 0.6.2",
+ "rustls-native-certs 0.6.3",
  "soketto",
  "thiserror",
  "tokio",
  "tokio-rustls 0.23.4",
- "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.12",
  "tracing",
  "webpki-roots 0.22.6",
 ]
@@ -6060,7 +6163,7 @@ version = "0.16.2"
 source = "git+https://github.com/wlmyng/jsonrpsee.git?rev=b1b300784795f6a64d0fcdf8f03081a9bc38bde8#b1b300784795f6a64d0fcdf8f03081a9bc38bde8"
 dependencies = [
  "anyhow",
- "arrayvec 0.7.2",
+ "arrayvec 0.7.6",
  "async-lock",
  "async-trait",
  "beef",
@@ -6068,9 +6171,9 @@ dependencies = [
  "futures-timer",
  "futures-util",
  "globset",
- "hyper 0.14.26",
+ "hyper 0.14.30",
  "jsonrpsee-types",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "rand 0.8.5",
  "rustc-hash 1.1.0",
  "serde",
@@ -6087,7 +6190,7 @@ version = "0.16.2"
 source = "git+https://github.com/wlmyng/jsonrpsee.git?rev=b1b300784795f6a64d0fcdf8f03081a9bc38bde8#b1b300784795f6a64d0fcdf8f03081a9bc38bde8"
 dependencies = [
  "async-trait",
- "hyper 0.14.26",
+ "hyper 0.14.30",
  "hyper-rustls 0.23.2",
  "jsonrpsee-core",
  "jsonrpsee-types",
@@ -6105,10 +6208,10 @@ version = "0.16.2"
 source = "git+https://github.com/wlmyng/jsonrpsee.git?rev=b1b300784795f6a64d0fcdf8f03081a9bc38bde8#b1b300784795f6a64d0fcdf8f03081a9bc38bde8"
 dependencies = [
  "heck 0.4.1",
- "proc-macro-crate",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro-crate 1.1.3",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -6118,8 +6221,8 @@ source = "git+https://github.com/wlmyng/jsonrpsee.git?rev=b1b300784795f6a64d0fcd
 dependencies = [
  "futures-channel",
  "futures-util",
- "http 0.2.9",
- "hyper 0.14.26",
+ "http 0.2.12",
+ "hyper 0.14.30",
  "jsonrpsee-core",
  "jsonrpsee-types",
  "serde",
@@ -6127,7 +6230,7 @@ dependencies = [
  "soketto",
  "tokio",
  "tokio-stream",
- "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.12",
  "tower",
  "tracing",
 ]
@@ -6150,19 +6253,33 @@ name = "jsonrpsee-ws-client"
 version = "0.16.2"
 source = "git+https://github.com/wlmyng/jsonrpsee.git?rev=b1b300784795f6a64d0fcdf8f03081a9bc38bde8#b1b300784795f6a64d0fcdf8f03081a9bc38bde8"
 dependencies = [
- "http 0.2.9",
+ "http 0.2.12",
  "jsonrpsee-client-transport",
  "jsonrpsee-core",
  "jsonrpsee-types",
 ]
 
+[[package]]
+name = "jsonwebtoken"
+version = "8.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378"
+dependencies = [
+ "base64 0.21.7",
+ "pem 1.1.1",
+ "ring 0.16.20",
+ "serde",
+ "serde_json",
+ "simple_asn1",
+]
+
 [[package]]
 name = "jsonwebtoken"
 version = "9.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9ae10193d25051e74945f1ea2d0b42e03cc3b890f7e4cc5faa44997d808193f"
 dependencies = [
- "base64 0.21.2",
+ "base64 0.21.7",
  "js-sys",
  "pem 3.0.4",
  "ring 0.17.8",
@@ -6180,29 +6297,29 @@ dependencies = [
  "cfg-if",
  "ecdsa 0.14.8",
  "elliptic-curve 0.12.3",
- "sha2 0.10.6",
- "sha3 0.10.6",
+ "sha2 0.10.8",
+ "sha3 0.10.8",
 ]
 
 [[package]]
 name = "k256"
-version = "0.13.1"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc"
+checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b"
 dependencies = [
  "cfg-if",
- "ecdsa 0.16.6",
- "elliptic-curve 0.13.4",
+ "ecdsa 0.16.9",
+ "elliptic-curve 0.13.8",
  "once_cell",
- "sha2 0.10.6",
- "signature 2.0.0",
+ "sha2 0.10.8",
+ "signature 2.2.0",
 ]
 
 [[package]]
 name = "keccak"
-version = "0.1.3"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768"
+checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654"
 dependencies = [
  "cpufeatures",
 ]
@@ -6227,13 +6344,43 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "lalrpop"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55cb077ad656299f160924eb2912aa147d7339ea7d69e1b5517326fdcec3c1ca"
+dependencies = [
+ "ascii-canvas",
+ "bit-set",
+ "ena",
+ "itertools 0.11.0",
+ "lalrpop-util",
+ "petgraph 0.6.5",
+ "regex",
+ "regex-syntax 0.8.4",
+ "string_cache",
+ "term",
+ "tiny-keccak",
+ "unicode-xid 0.2.5",
+ "walkdir",
+]
+
+[[package]]
+name = "lalrpop-util"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553"
+dependencies = [
+ "regex-automata 0.4.7",
+]
+
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 dependencies = [
- "spin 0.5.2",
+ "spin 0.9.8",
 ]
 
 [[package]]
@@ -6314,25 +6461,36 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.158"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
 
 [[package]]
 name = "libloading"
-version = "0.7.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
- "winapi",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "libm"
-version = "0.2.6"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+
+[[package]]
+name = "libredox"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.6.0",
+ "libc",
+ "redox_syscall 0.5.4",
+]
 
 [[package]]
 name = "librocksdb-sys"
@@ -6363,24 +6521,15 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.8"
+version = "1.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf"
+checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472"
 dependencies = [
  "cc",
  "pkg-config",
  "vcpkg",
 ]
 
-[[package]]
-name = "link-cplusplus"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "linked-hash-map"
 version = "0.5.6"
@@ -6389,21 +6538,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.12"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "lock_api"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -6411,36 +6554,69 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "logos"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff1ceb190eb9bdeecdd8f1ad6a71d6d632a50905948771718741b5461fb01e13"
+dependencies = [
+ "logos-derive",
+]
+
+[[package]]
+name = "logos-codegen"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90be66cb7bd40cb5cc2e9cfaf2d1133b04a3d93b72344267715010a466e0915a"
+dependencies = [
+ "beef",
+ "fnv",
+ "lazy_static",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "regex-syntax 0.8.4",
+ "syn 2.0.77",
+]
+
+[[package]]
+name = "logos-derive"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45154231e8e96586b39494029e58f12f8ffcb5ecf80333a603a13aa205ea8cbd"
+dependencies = [
+ "logos-codegen",
+]
+
 [[package]]
 name = "lru"
-version = "0.10.0"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03f1160296536f10c833a82dca22267d5486734230d47bf00bf435885814ba1e"
+checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670"
 dependencies = [
  "hashbrown 0.13.2",
 ]
 
 [[package]]
 name = "lru"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc"
+checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904"
 dependencies = [
  "hashbrown 0.14.5",
 ]
 
 [[package]]
 name = "lsp-server"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248f65b78f6db5d8e1b1604b4098a28b43d21a8eb1deeca22b1c421b276c7095"
+checksum = "550446e84739dcaf6d48a4a093973850669e13e8a34d8f8d64851041be267cd9"
 dependencies = [
  "crossbeam-channel",
  "log",
@@ -6463,23 +6639,14 @@ dependencies = [
 
 [[package]]
 name = "lz4-sys"
-version = "1.9.4"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900"
+checksum = "109de74d5d2353660401699a4174a4ff23fcc649caf553df71933c7fb45ad868"
 dependencies = [
  "cc",
  "libc",
 ]
 
-[[package]]
-name = "mach2"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "maplit"
 version = "1.0.2"
@@ -6509,9 +6676,9 @@ checksum = "73cbba799671b762df5a175adf59ce145165747bb891505c43d09aefbbf38beb"
 
 [[package]]
 name = "matchit"
-version = "0.7.0"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40"
+checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
 
 [[package]]
 name = "md-5"
@@ -6548,9 +6715,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memmap2"
-version = "0.5.8"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc"
+checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
 dependencies = [
  "libc",
 ]
@@ -6574,7 +6741,7 @@ dependencies = [
  "backtrace-ext",
  "cfg-if",
  "miette-derive",
- "owo-colors 4.0.0",
+ "owo-colors 4.1.0",
  "supports-color",
  "supports-hyperlinks",
  "supports-unicode",
@@ -6590,30 +6757,30 @@ version = "7.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "migrations_internals"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f23f71580015254b020e856feac3df5878c2c7a8812297edd6c0a485ac9dada"
+checksum = "fd01039851e82f8799046eabbb354056283fb265c8ec0996af940f4e85a380ff"
 dependencies = [
  "serde",
- "toml 0.7.4",
+ "toml 0.8.19",
 ]
 
 [[package]]
 name = "migrations_macros"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cce3325ac70e67bbab5bd837a31cae01f1a6db64e0e744a33cb03a543469ef08"
+checksum = "ffb161cc72176cb37aa47f1fc520d3ef02263d67d661f44f05d05a079e1237fd"
 dependencies = [
  "migrations_internals",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
 ]
 
 [[package]]
@@ -6624,9 +6791,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "mime_guess"
-version = "2.0.4"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
+checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
 dependencies = [
  "mime",
  "unicase",
@@ -6640,13 +6807,22 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.1"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
 dependencies = [
  "adler",
 ]
 
+[[package]]
+name = "miniz_oxide"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+dependencies = [
+ "adler2",
+]
+
 [[package]]
 name = "mio"
 version = "0.8.11"
@@ -6659,6 +6835,18 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "mio"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
+dependencies = [
+ "hermit-abi 0.3.9",
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "mockall"
 version = "0.11.4"
@@ -6670,7 +6858,7 @@ dependencies = [
  "fragile",
  "lazy_static",
  "mockall_derive",
- "predicates",
+ "predicates 2.1.5",
  "predicates-tree",
 ]
 
@@ -6681,29 +6869,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb"
 dependencies = [
  "cfg-if",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "moka"
-version = "0.12.5"
+version = "0.12.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1911e88d5831f748a4097a43862d129e3c6fca831eecac9b8db6d01d93c9de2"
+checksum = "32cf62eb4dd975d2dde76432fb1075c49e3ee2331cf36f1f8fd4b66550d32b6f"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-epoch",
  "crossbeam-utils",
  "once_cell",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "rustc_version",
- "skeptic",
  "smallvec",
  "tagptr",
  "thiserror",
  "triomphe",
- "uuid 1.2.2",
+ "uuid 1.10.0",
 ]
 
 [[package]]
@@ -6751,6 +6938,7 @@ dependencies = [
  "move-ir-types",
  "move-package",
  "move-symbol-pool",
+ "once_cell",
  "serde",
  "serde_json",
  "sha2 0.9.9",
@@ -6910,7 +7098,7 @@ dependencies = [
  "move-vm-runtime",
  "move-vm-test-utils",
  "move-vm-types",
- "serde_yaml",
+ "serde_yaml 0.8.26",
  "tempfile",
  "toml_edit 0.14.4",
  "walkdir",
@@ -6927,7 +7115,7 @@ dependencies = [
  "hex",
  "move-binary-format",
  "move-core-types",
- "num-bigint 0.4.4",
+ "num-bigint 0.4.6",
  "once_cell",
  "serde",
  "sha2 0.9.9",
@@ -7061,7 +7249,7 @@ dependencies = [
  "move-ir-to-bytecode-syntax",
  "move-ir-types",
  "move-symbol-pool",
- "ouroboros",
+ "ouroboros 0.17.2",
 ]
 
 [[package]]
@@ -7133,7 +7321,7 @@ dependencies = [
  "petgraph 0.5.1",
  "regex",
  "serde",
- "serde_yaml",
+ "serde_yaml 0.8.26",
  "sha2 0.9.9",
  "tempfile",
  "toml 0.5.11",
@@ -7149,8 +7337,8 @@ name = "move-proc-macros"
 version = "0.1.0"
 dependencies = [
  "enum-compat-util",
- "quote 1.0.35",
- "syn 2.0.48",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -7426,9 +7614,9 @@ dependencies = [
 [[package]]
 name = "msim"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=220f52a15804a768610ac0ae3b8da7de4a5c4d2b#220f52a15804a768610ac0ae3b8da7de4a5c4d2b"
+source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=b320996d8dfb99b273fe31c0222c659332283c99#b320996d8dfb99b273fe31c0222c659332283c99"
 dependencies = [
- "ahash 0.7.6",
+ "ahash 0.7.8",
  "async-task",
  "bincode",
  "bytes",
@@ -7444,9 +7632,9 @@ dependencies = [
  "rand 0.8.5",
  "real_tokio",
  "serde",
- "socket2 0.4.9",
+ "socket2 0.4.10",
  "tap",
- "tokio-util 0.7.10 (git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=e47aafebf98e9c1734a8848a1876d5946c44bdd1)",
+ "tokio-util 0.7.10",
  "toml 0.5.11",
  "tracing",
  "tracing-subscriber",
@@ -7455,23 +7643,24 @@ dependencies = [
 [[package]]
 name = "msim-macros"
 version = "0.1.0"
-source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=220f52a15804a768610ac0ae3b8da7de4a5c4d2b#220f52a15804a768610ac0ae3b8da7de4a5c4d2b"
+source = "git+https://github.com/MystenLabs/mysten-sim.git?rev=b320996d8dfb99b273fe31c0222c659332283c99#b320996d8dfb99b273fe31c0222c659332283c99"
 dependencies = [
- "darling 0.14.2",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "darling 0.14.4",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "multiaddr"
-version = "0.17.0"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b53e0cc5907a5c216ba6584bf74be8ab47d6d6289f72793b2dddbf15dc3bf8c"
+checksum = "2b36f567c7099511fa8612bbbb52dda2419ce0bdbacf31714e3a5ffdb766d3bd"
 dependencies = [
  "arrayref",
  "byteorder",
  "data-encoding",
+ "log",
  "multibase",
  "multihash",
  "percent-encoding",
@@ -7509,25 +7698,25 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d6d4752e6230d8ef7adf7bd5d8c4b1f6561c1014c5ba9a37445ccefe18aa1db"
 dependencies = [
- "proc-macro-crate",
+ "proc-macro-crate 1.1.3",
  "proc-macro-error",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
  "synstructure",
 ]
 
 [[package]]
 name = "multimap"
-version = "0.8.3"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
+checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"
 
 [[package]]
 name = "mysqlclient-sys"
-version = "0.2.5"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f61b381528ba293005c42a409dd73d034508e273bf90481f17ec2e964a6e969b"
+checksum = "478e2040dbc35c73927b77a2be91a496de19deab376a6982ed61e89592434619"
 dependencies = [
  "pkg-config",
  "vcpkg",
@@ -7538,7 +7727,7 @@ name = "mysten-common"
 version = "0.1.0"
 dependencies = [
  "futures",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "tokio",
 ]
 
@@ -7547,18 +7736,19 @@ name = "mysten-metrics"
 version = "0.7.0"
 dependencies = [
  "async-trait",
- "axum",
+ "axum 0.7.5",
  "dashmap",
  "futures",
  "once_cell",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "prometheus",
  "prometheus-closure-metric",
  "scopeguard",
+ "simple-server-timing-header",
  "tap",
  "tokio",
  "tracing",
- "uuid 1.2.2",
+ "uuid 1.10.0",
 ]
 
 [[package]]
@@ -7570,14 +7760,14 @@ dependencies = [
  "bytes",
  "eyre",
  "futures",
- "http 0.2.9",
+ "http 1.1.0",
  "multiaddr",
  "pin-project-lite",
  "serde",
  "snap",
  "tokio",
  "tokio-stream",
- "tonic 0.11.0",
+ "tonic 0.12.2",
  "tonic-health",
  "tower",
  "tower-http",
@@ -7589,11 +7779,12 @@ name = "mysten-service"
 version = "0.0.1"
 dependencies = [
  "anyhow",
- "axum",
+ "axum 0.7.5",
  "mysten-metrics",
  "prometheus",
  "serde",
  "serde_json",
+ "simple-server-timing-header",
  "telemetry-subscribers",
  "tokio",
  "tower",
@@ -7610,10 +7801,10 @@ dependencies = [
  "fastcrypto-tbls",
  "hashbrown 0.12.3",
  "impl-trait-for-tuples",
- "indexmap 2.2.6",
+ "indexmap 2.5.0",
  "mysten-util-mem-derive",
  "once_cell",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "roaring",
  "smallvec",
 ]
@@ -7622,8 +7813,8 @@ dependencies = [
 name = "mysten-util-mem-derive"
 version = "0.1.0"
 dependencies = [
- "proc-macro2 1.0.78",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "syn 1.0.109",
  "synstructure",
 ]
 
@@ -7641,7 +7832,7 @@ checksum = "40a3eb6b7c682b65d1f631ec3176829d72ab450b3aacdd3f719bf220822e59ac"
 dependencies = [
  "libc",
  "once_cell",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "thiserror",
  "widestring",
  "winapi",
@@ -7693,7 +7884,7 @@ dependencies = [
  "bytes",
  "fastcrypto",
  "futures",
- "indexmap 2.2.6",
+ "indexmap 2.5.0",
  "mockall",
  "mysten-metrics",
  "narwhal-config",
@@ -7711,7 +7902,7 @@ dependencies = [
  "tempfile",
  "thiserror",
  "tokio",
- "tonic 0.11.0",
+ "tonic 0.12.2",
  "tracing",
  "typed-store",
 ]
@@ -7724,8 +7915,7 @@ dependencies = [
  "anemo-tower",
  "anyhow",
  "async-trait",
- "axum",
- "axum-server",
+ "axum 0.7.5",
  "backoff",
  "bincode",
  "bytes",
@@ -7736,7 +7926,7 @@ dependencies = [
  "narwhal-crypto",
  "narwhal-test-utils",
  "narwhal-types",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "prometheus",
  "quinn-proto",
  "rand 0.8.5",
@@ -7753,7 +7943,7 @@ dependencies = [
  "anemo",
  "arc-swap",
  "async-trait",
- "axum",
+ "axum 0.7.5",
  "bytes",
  "cfg-if",
  "clap",
@@ -7774,9 +7964,9 @@ dependencies = [
  "pretty_assertions",
  "prometheus",
  "rand 0.8.5",
- "reqwest 0.12.4",
+ "reqwest 0.12.7",
  "serde-reflection",
- "serde_yaml",
+ "serde_yaml 0.8.26",
  "sui-keys",
  "sui-protocol-config",
  "sui-types",
@@ -7808,7 +7998,7 @@ dependencies = [
  "fastcrypto",
  "futures",
  "governor",
- "indexmap 2.2.6",
+ "indexmap 2.5.0",
  "itertools 0.10.5",
  "mockall",
  "mysten-common",
@@ -7824,11 +8014,11 @@ dependencies = [
  "narwhal-types",
  "narwhal-worker",
  "once_cell",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "prometheus",
  "proptest",
  "rand 0.8.5",
- "reqwest 0.12.4",
+ "reqwest 0.12.7",
  "sui-macros",
  "sui-protocol-config",
  "tap",
@@ -7849,13 +8039,13 @@ dependencies = [
  "fastcrypto",
  "fastcrypto-tbls",
  "futures",
- "lru 0.10.0",
+ "lru 0.10.1",
  "mysten-common",
  "mysten-metrics",
  "narwhal-config",
  "narwhal-test-utils",
  "narwhal-types",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "prometheus",
  "sui-macros",
  "tap",
@@ -7872,7 +8062,7 @@ dependencies = [
  "anemo",
  "fastcrypto",
  "fdlimit",
- "indexmap 2.2.6",
+ "indexmap 2.5.0",
  "itertools 0.10.5",
  "mysten-metrics",
  "mysten-network",
@@ -7892,7 +8082,7 @@ dependencies = [
  "telemetry-subscribers",
  "tempfile",
  "tokio",
- "tonic 0.11.0",
+ "tonic 0.12.2",
  "tracing",
  "typed-store",
 ]
@@ -7904,7 +8094,7 @@ dependencies = [
  "anemo",
  "anemo-build",
  "anyhow",
- "base64 0.21.2",
+ "base64 0.21.7",
  "bcs",
  "bytes",
  "criterion",
@@ -7912,7 +8102,7 @@ dependencies = [
  "enum_dispatch",
  "fastcrypto",
  "futures",
- "indexmap 2.2.6",
+ "indexmap 2.5.0",
  "mockall",
  "mysten-common",
  "mysten-metrics",
@@ -7925,19 +8115,16 @@ dependencies = [
  "prometheus",
  "proptest",
  "proptest-derive",
- "prost 0.12.3",
- "prost-build",
- "protobuf-src",
+ "prost 0.13.2",
  "rand 0.8.5",
  "roaring",
- "rustversion",
  "serde",
  "serde_test",
- "serde_with 3.8.1",
+ "serde_with 3.9.0",
  "sui-protocol-config",
  "thiserror",
  "tokio",
- "tonic 0.11.0",
+ "tonic 0.12.2",
  "tonic-build",
  "tracing",
  "typed-store",
@@ -7971,14 +8158,14 @@ dependencies = [
  "narwhal-types",
  "prometheus",
  "rand 0.8.5",
- "reqwest 0.12.4",
+ "reqwest 0.12.7",
  "sui-protocol-config",
  "tap",
  "telemetry-subscribers",
  "tempfile",
  "thiserror",
  "tokio",
- "tonic 0.11.0",
+ "tonic 0.12.2",
  "tower",
  "tracing",
  "typed-store",
@@ -8026,6 +8213,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca2b420f638f07fe83056b55ea190bb815f609ec5a35e7017884a10f78839c9e"
 
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
+
 [[package]]
 name = "newline-converter"
 version = "0.2.2"
@@ -8038,7 +8231,7 @@ dependencies = [
 [[package]]
 name = "nexlint"
 version = "0.1.0"
-source = "git+https://github.com/nextest-rs/nexlint.git?rev=94da5c787636dad779c340affa65219134d127f5#94da5c787636dad779c340affa65219134d127f5"
+source = "git+https://github.com/nextest-rs/nexlint.git?rev=7ce56bd591242a57660ed05f14ca2483c37d895b#7ce56bd591242a57660ed05f14ca2483c37d895b"
 dependencies = [
  "camino",
  "debug-ignore",
@@ -8053,11 +8246,11 @@ dependencies = [
 [[package]]
 name = "nexlint-lints"
 version = "0.1.0"
-source = "git+https://github.com/nextest-rs/nexlint.git?rev=94da5c787636dad779c340affa65219134d127f5#94da5c787636dad779c340affa65219134d127f5"
+source = "git+https://github.com/nextest-rs/nexlint.git?rev=7ce56bd591242a57660ed05f14ca2483c37d895b#7ce56bd591242a57660ed05f14ca2483c37d895b"
 dependencies = [
  "anyhow",
  "camino",
- "colored-diff",
+ "diffy 0.3.0",
  "globset",
  "guppy",
  "nexlint",
@@ -8090,9 +8283,9 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.24.3"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
 dependencies = [
  "bitflags 1.3.2",
  "cfg-if",
@@ -8163,7 +8356,7 @@ version = "6.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "crossbeam-channel",
  "filetime",
  "fsevent-sys",
@@ -8171,7 +8364,7 @@ dependencies = [
  "kqueue",
  "libc",
  "log",
- "mio",
+ "mio 0.8.11",
  "walkdir",
  "windows-sys 0.48.0",
 ]
@@ -8187,9 +8380,9 @@ dependencies = [
 
 [[package]]
 name = "ntest"
-version = "0.9.0"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da8ec6d2b73d45307e926f5af46809768581044384637af6b3f3fe7c3c88f512"
+checksum = "fb183f0a1da7a937f672e5ee7b7edb727bf52b8a52d531374ba8ebb9345c0330"
 dependencies = [
  "ntest_test_cases",
  "ntest_timeout",
@@ -8197,25 +8390,25 @@ dependencies = [
 
 [[package]]
 name = "ntest_test_cases"
-version = "0.9.0"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be7d33be719c6f4d09e64e27c1ef4e73485dc4cc1f4d22201f89860a7fe22e22"
+checksum = "16d0d3f2a488592e5368ebbe996e7f1d44aa13156efad201f5b4d84e150eaa93"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "ntest_timeout"
-version = "0.9.0"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "066b468120587a402f0b47d8f80035c921f6a46f8209efd0632a89a16f5188a4"
+checksum = "fcc7c92f190c97f79b4a332f5e81dcf68c8420af2045c936c9be0bc9de6f63b5"
 dependencies = [
- "proc-macro-crate",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro-crate 3.2.0",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -8228,6 +8421,15 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "nu-ansi-term"
+version = "0.50.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "nuid"
 version = "0.5.0"
@@ -8239,11 +8441,11 @@ dependencies = [
 
 [[package]]
 name = "num"
-version = "0.4.1"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af"
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
 dependencies = [
- "num-bigint 0.4.4",
+ "num-bigint 0.4.6",
  "num-complex",
  "num-integer",
  "num-iter",
@@ -8264,11 +8466,10 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
- "autocfg",
  "num-integer",
  "num-traits",
  "rand 0.8.5",
@@ -8276,9 +8477,9 @@ dependencies = [
 
 [[package]]
 name = "num-bigint-dig"
-version = "0.8.2"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2399c9463abc5f909349d8aa9ba080e0b88b3ce2885389b60b993f39b1a56905"
+checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
 dependencies = [
  "byteorder",
  "lazy_static",
@@ -8293,39 +8494,44 @@ dependencies = [
 
 [[package]]
 name = "num-complex"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
 dependencies = [
  "num-traits",
 ]
 
 [[package]]
-name = "num-derive"
-version = "0.3.3"
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-derive"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "num-integer"
-version = "0.1.45"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
 dependencies = [
- "autocfg",
  "num-traits",
 ]
 
 [[package]]
 name = "num-iter"
-version = "0.1.43"
+version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -8338,7 +8544,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64a5fe11d4135c3bcdf3a95b18b194afa9608a5f6ff034f5d857bc9a27fb0119"
 dependencies = [
- "num-bigint 0.4.4",
+ "num-bigint 0.4.6",
  "num-integer",
  "num-traits",
 ]
@@ -8351,8 +8557,8 @@ checksum = "e238432a7881ec7164503ccc516c014bf009be7984cde1ba56837862543bdec3"
 dependencies = [
  "bitvec 1.0.1",
  "either",
- "lru 0.12.3",
- "num-bigint 0.4.4",
+ "lru 0.12.4",
+ "num-bigint 0.4.6",
  "num-integer",
  "num-modular",
  "num-traits",
@@ -8361,21 +8567,20 @@ dependencies = [
 
 [[package]]
 name = "num-rational"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
 dependencies = [
- "autocfg",
- "num-bigint 0.4.4",
+ "num-bigint 0.4.6",
  "num-integer",
  "num-traits",
 ]
 
 [[package]]
 name = "num-traits"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
  "libm",
@@ -8383,54 +8588,54 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.2.6",
+ "hermit-abi 0.3.9",
  "libc",
 ]
 
 [[package]]
 name = "num_enum"
-version = "0.5.11"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
+checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
 dependencies = [
- "num_enum_derive 0.5.11",
+ "num_enum_derive 0.6.1",
 ]
 
 [[package]]
 name = "num_enum"
-version = "0.6.1"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
+checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
 dependencies = [
- "num_enum_derive 0.6.1",
+ "num_enum_derive 0.7.3",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.5.11"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
+checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
 dependencies = [
- "proc-macro-crate",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro-crate 1.1.3",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.6.1"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
+checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
 dependencies = [
- "proc-macro-crate",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro-crate 3.2.0",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -8463,11 +8668,11 @@ dependencies = [
  "hyper 1.4.1",
  "itertools 0.13.0",
  "md-5 0.10.6",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "percent-encoding",
  "quick-xml",
  "rand 0.8.5",
- "reqwest 0.12.4",
+ "reqwest 0.12.7",
  "ring 0.17.8",
  "serde",
  "serde_json",
@@ -8489,7 +8694,7 @@ dependencies = [
  "futures",
  "serde",
  "serde_json",
- "serde_with 3.8.1",
+ "serde_with 3.9.0",
  "structs",
  "tokio",
  "tracing",
@@ -8513,15 +8718,15 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "oorandom"
-version = "11.1.3"
+version = "11.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
+checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
 
 [[package]]
 name = "opaque-debug"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "open"
@@ -8540,7 +8745,7 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "786393f80485445794f6043fd3138854dd109cc6c4bd1a6383db304c9ce9b9ce"
 dependencies = [
- "arrayvec 0.7.2",
+ "arrayvec 0.7.6",
  "auto_impl",
  "bytes",
  "ethereum-types",
@@ -8554,9 +8759,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "003b2be5c6c53c1cfeb0a238b8a1c3915cd410feb684457a36c10038f764bb1c"
 dependencies = [
  "bytes",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -8564,7 +8769,7 @@ name = "openapiv3"
 version = "2.0.0"
 source = "git+https://github.com/bmwill/openapiv3.git?rev=ca4b4845b7c159a39f5c68ad8f7f76cb6f4d6963#ca4b4845b7c159a39f5c68ad8f7f76cb6f4d6963"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.5.0",
  "schemars",
  "serde",
  "serde_json",
@@ -8576,7 +8781,7 @@ version = "0.10.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -8591,9 +8796,9 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -8632,7 +8837,7 @@ checksum = "7e5e5a5c4135864099f3faafbe939eb4d7f9b80ebf68a8448da961b32a7c1275"
 dependencies = [
  "async-trait",
  "futures-core",
- "http 0.2.9",
+ "http 0.2.12",
  "opentelemetry-proto",
  "opentelemetry-semantic-conventions",
  "opentelemetry_api",
@@ -8711,9 +8916,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
 [[package]]
 name = "ordered-float"
-version = "3.9.1"
+version = "3.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06"
+checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc"
 dependencies = [
  "num-traits",
 ]
@@ -8725,7 +8930,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2ba07320d39dfea882faa70554b4bd342a5f273ed59ba7c1c6b4c840492c954"
 dependencies = [
  "aliasable",
- "ouroboros_macro",
+ "ouroboros_macro 0.17.2",
+ "static_assertions",
+]
+
+[[package]]
+name = "ouroboros"
+version = "0.18.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "944fa20996a25aded6b4795c6d63f10014a7a83f8be9828a11860b08c5fc4a67"
+dependencies = [
+ "aliasable",
+ "ouroboros_macro 0.18.4",
  "static_assertions",
 ]
 
@@ -8737,18 +8953,23 @@ checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8"
 dependencies = [
  "heck 0.4.1",
  "proc-macro-error",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
-name = "output_vt100"
-version = "0.1.3"
+name = "ouroboros_macro"
+version = "0.18.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66"
+checksum = "39b0deead1528fd0e5947a8546a9642a9777c25f6e1e26f34c97b204bbb465bd"
 dependencies = [
- "winapi",
+ "heck 0.4.1",
+ "itertools 0.12.1",
+ "proc-macro2 1.0.86",
+ "proc-macro2-diagnostics",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -8771,9 +8992,9 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
 
 [[package]]
 name = "owo-colors"
-version = "4.0.0"
+version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f"
+checksum = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56"
 
 [[package]]
 name = "p256"
@@ -8781,10 +9002,10 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
 dependencies = [
- "ecdsa 0.16.6",
- "elliptic-curve 0.13.4",
+ "ecdsa 0.16.9",
+ "elliptic-curve 0.13.8",
  "primeorder",
- "sha2 0.10.6",
+ "sha2 0.10.8",
 ]
 
 [[package]]
@@ -8813,7 +9034,7 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909"
 dependencies = [
- "arrayvec 0.7.2",
+ "arrayvec 0.7.6",
  "bitvec 0.20.4",
  "byte-slice-cast",
  "impl-trait-for-tuples",
@@ -8823,15 +9044,15 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec"
-version = "3.6.5"
+version = "3.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb"
+checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee"
 dependencies = [
- "arrayvec 0.7.2",
+ "arrayvec 0.7.6",
  "bitvec 1.0.1",
  "byte-slice-cast",
  "impl-trait-for-tuples",
- "parity-scale-codec-derive 3.6.5",
+ "parity-scale-codec-derive 3.6.12",
  "serde",
 ]
 
@@ -8841,30 +9062,24 @@ version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27"
 dependencies = [
- "proc-macro-crate",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro-crate 1.1.3",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "3.6.5"
+version = "3.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260"
+checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c"
 dependencies = [
- "proc-macro-crate",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro-crate 3.2.0",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
-[[package]]
-name = "parking"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
-
 [[package]]
 name = "parking_lot"
 version = "0.11.2"
@@ -8878,12 +9093,12 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.9",
+ "parking_lot_core 0.9.10",
 ]
 
 [[package]]
@@ -8902,15 +9117,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.9"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.4.1",
+ "redox_syscall 0.5.4",
  "smallvec",
- "windows-targets 0.48.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -8935,7 +9150,7 @@ checksum = "f14d42b14749cc7927add34a9932b3b3cc5349a633384850baa67183061439dd"
 dependencies = [
  "ciborium",
  "coset",
- "idna 0.5.0",
+ "idna",
  "passkey-authenticator",
  "passkey-types",
  "public-suffix",
@@ -8951,15 +9166,15 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "499cff8432e71c5f8784d9645aac0f9fca604d67f59b68a606170b5e229c6538"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "ciborium",
  "coset",
  "data-encoding",
- "indexmap 2.2.6",
+ "indexmap 2.5.0",
  "rand 0.8.5",
  "serde",
  "serde_json",
- "sha2 0.10.6",
+ "sha2 0.10.8",
  "strum 0.25.0",
  "typeshare",
 ]
@@ -8994,9 +9209,15 @@ dependencies = [
 
 [[package]]
 name = "paste"
-version = "1.0.11"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
+[[package]]
+name = "path-slash"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
+checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42"
 
 [[package]]
 name = "pathdiff"
@@ -9016,14 +9237,14 @@ dependencies = [
  "digest 0.10.7",
  "hmac 0.12.1",
  "password-hash",
- "sha2 0.10.6",
+ "sha2 0.10.8",
 ]
 
 [[package]]
 name = "pbkdf2"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0ca0b5a68607598bf3bad68f32227a8164f6254833f84eafaac409cd6746c31"
+checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
 dependencies = [
  "digest 0.10.7",
  "hmac 0.12.1",
@@ -9037,9 +9258,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 
 [[package]]
 name = "pem"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4"
+checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8"
 dependencies = [
  "base64 0.13.1",
 ]
@@ -9074,15 +9295,15 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.2.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.7.11"
+version = "2.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95"
+checksum = "9c73c26c01b8c87956cea613c907c9d6ecffd8d18a2a5908e5de0adfaa185cea"
 dependencies = [
  "memchr",
  "thiserror",
@@ -9091,9 +9312,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.5.2"
+version = "2.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96504449aa860c8dcde14f9fba5c58dc6658688ca1fe363589d6327b8662c603"
+checksum = "664d22978e2815783adbdd2c588b455b1bd625299ce36b2a99881ac9627e6d8d"
 dependencies = [
  "pest",
  "pest_generator",
@@ -9101,26 +9322,26 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.5.2"
+version = "2.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "798e0220d1111ae63d66cb66a5dcb3fc2d986d520b98e49e1852bfdb11d7c5e7"
+checksum = "a2d5487022d5d33f4c30d91c22afa240ce2a644e87fe08caad974d4eab6badbe"
 dependencies = [
  "pest",
  "pest_meta",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.5.2"
+version = "2.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "984298b75898e30a843e278a9f2452c31e349a073a0ce6fd950a12a74464e065"
+checksum = "0091754bbd0ea592c4deb3a122ce8ecbb0753b738aa82bc055fcc2eccc8d8174"
 dependencies = [
  "once_cell",
  "pest",
- "sha1",
+ "sha2 0.10.8",
 ]
 
 [[package]]
@@ -9135,12 +9356,12 @@ dependencies = [
 
 [[package]]
 name = "petgraph"
-version = "0.6.2"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset 0.4.2",
- "indexmap 1.9.3",
+ "indexmap 2.5.0",
 ]
 
 [[package]]
@@ -9155,71 +9376,80 @@ dependencies = [
 
 [[package]]
 name = "phf"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c"
+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
 dependencies = [
  "phf_macros",
- "phf_shared",
+ "phf_shared 0.11.2",
 ]
 
 [[package]]
 name = "phf_generator"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf"
+checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
 dependencies = [
- "phf_shared",
+ "phf_shared 0.11.2",
  "rand 0.8.5",
 ]
 
 [[package]]
 name = "phf_macros"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66"
+checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
 dependencies = [
  "phf_generator",
- "phf_shared",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "phf_shared 0.11.2",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "phf_shared"
-version = "0.11.1"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676"
+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
 dependencies = [
  "siphasher",
 ]
 
 [[package]]
 name = "pin-project"
-version = "1.0.12"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
+checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.0.12"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
+checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
 [[package]]
 name = "pin-utils"
@@ -9245,9 +9475,9 @@ version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
 dependencies = [
- "der 0.7.5",
+ "der 0.7.9",
  "pkcs8 0.10.2",
- "spki 0.7.1",
+ "spki 0.7.3",
 ]
 
 [[package]]
@@ -9266,21 +9496,21 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
 dependencies = [
- "der 0.7.5",
- "spki 0.7.1",
+ "der 0.7.9",
+ "spki 0.7.3",
 ]
 
 [[package]]
 name = "pkg-config"
-version = "0.3.26"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "plotters"
-version = "0.3.4"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2538b639e642295546c50fcd545198c9d64ee2a38620a628724a3b266d5fbf97"
+checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
 dependencies = [
  "num-traits",
  "plotters-backend",
@@ -9291,15 +9521,15 @@ dependencies = [
 
 [[package]]
 name = "plotters-backend"
-version = "0.3.4"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "193228616381fecdc1224c62e96946dfbc73ff4384fba576e052ff8c1bea8142"
+checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
 
 [[package]]
 name = "plotters-svg"
-version = "0.3.3"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a81d2759aae1dae668f783c308bc5c8ebd191ff4184aaa1b37f65a6ae5a56f"
+checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
 dependencies = [
  "plotters-backend",
 ]
@@ -9317,9 +9547,9 @@ dependencies = [
 
 [[package]]
 name = "polyval"
-version = "0.6.0"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef234e08c11dfcb2e56f79fd70f6f2eb7f025c0ce2333e82f4f0518ecad30c6"
+checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -9327,12 +9557,6 @@ dependencies = [
  "universal-hash",
 ]
 
-[[package]]
-name = "portable-atomic"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26f6a7b87c2e435a3241addceeeff740ff8b7e76b74c13bf9acb17fa454ea00b"
-
 [[package]]
 name = "portable-atomic"
 version = "1.7.0"
@@ -9347,18 +9571,18 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "pprof"
-version = "0.11.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e20150f965e0e4c925982b9356da71c84bcd56cb66ef4e894825837cbcf6613e"
+checksum = "ef5c97c51bd34c7e742402e216abdeb44d415fbe6ae41d56b114723e953711cb"
 dependencies = [
  "backtrace",
  "cfg-if",
  "findshlibs",
  "libc",
  "log",
- "nix 0.24.3",
+ "nix 0.26.4",
  "once_cell",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "smallvec",
  "symbolic-demangle",
  "tempfile",
@@ -9367,19 +9591,28 @@ dependencies = [
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "pq-sys"
-version = "0.4.7"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b845d6d8ec554f972a2c5298aad68953fd64e7441e846075450b44656a016d1"
+checksum = "a92c30dd81695321846d4dfe348da67b1752ebb61cd1549d203a7b57e323c435"
 dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "precomputed-hash"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
+
 [[package]]
 name = "predicates"
 version = "2.1.5"
@@ -9394,17 +9627,28 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "predicates"
+version = "3.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97"
+dependencies = [
+ "anstyle",
+ "difflib",
+ "predicates-core",
+]
+
 [[package]]
 name = "predicates-core"
-version = "1.0.5"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72f883590242d3c6fc5bf50299011695fa6590c2c70eac95ee1bdb9a733ad1a2"
+checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931"
 
 [[package]]
 name = "predicates-tree"
-version = "1.0.7"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54ff541861505aabf6ea722d2131ee980b8276e10a1297b94e896dd8b621850d"
+checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13"
 dependencies = [
  "predicates-core",
  "termtree",
@@ -9412,34 +9656,22 @@ dependencies = [
 
 [[package]]
 name = "pretty_assertions"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755"
+checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
 dependencies = [
- "ctor",
  "diff",
- "output_vt100",
- "yansi",
-]
-
-[[package]]
-name = "prettyplease"
-version = "0.1.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
-dependencies = [
- "proc-macro2 1.0.78",
- "syn 1.0.107",
+ "yansi 0.5.1",
 ]
 
 [[package]]
 name = "prettyplease"
-version = "0.2.17"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7"
+checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
 dependencies = [
- "proc-macro2 1.0.78",
- "syn 2.0.48",
+ "proc-macro2 1.0.86",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -9458,11 +9690,11 @@ dependencies = [
 
 [[package]]
 name = "primeorder"
-version = "0.13.0"
+version = "0.13.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7613fdcc0831c10060fa69833ea8fa2caa94b6456f51e25356a885b530a2e3d0"
+checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6"
 dependencies = [
- "elliptic-curve 0.13.4",
+ "elliptic-curve 0.13.8",
 ]
 
 [[package]]
@@ -9501,6 +9733,15 @@ dependencies = [
  "toml 0.5.11",
 ]
 
+[[package]]
+name = "proc-macro-crate"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
+dependencies = [
+ "toml_edit 0.22.20",
+]
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -9508,9 +9749,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
 dependencies = [
  "proc-macro-error-attr",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
  "version_check",
 ]
 
@@ -9520,17 +9761,11 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
  "version_check",
 ]
 
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.20+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
-
 [[package]]
 name = "proc-macro2"
 version = "0.4.30"
@@ -9542,24 +9777,37 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "proc-macro2-diagnostics"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
+dependencies = [
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
+ "version_check",
+ "yansi 1.0.1",
+]
+
 [[package]]
 name = "prometheus"
-version = "0.13.3"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c"
+checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1"
 dependencies = [
  "cfg-if",
  "fnv",
  "lazy_static",
  "memchr",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "protobuf",
  "thiserror",
 ]
@@ -9573,6 +9821,20 @@ dependencies = [
  "protobuf",
 ]
 
+[[package]]
+name = "prometheus-http-query"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fcebfa99f03ae51220778316b37d24981e36322c82c24848f48c5bd0f64cbdb"
+dependencies = [
+ "enum-as-inner",
+ "mime",
+ "reqwest 0.12.7",
+ "serde",
+ "time",
+ "url",
+]
+
 [[package]]
 name = "prometheus-parse"
 version = "0.2.3"
@@ -9586,20 +9848,19 @@ dependencies = [
 
 [[package]]
 name = "proptest"
-version = "1.1.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29f1b898011ce9595050a68e60f90bad083ff2987a695a42357134c8381fba70"
+checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d"
 dependencies = [
  "bit-set",
- "bitflags 1.3.2",
- "byteorder",
+ "bit-vec",
+ "bitflags 2.6.0",
  "lazy_static",
  "num-traits",
- "quick-error 2.0.1",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rand_xorshift",
- "regex-syntax 0.6.28",
+ "regex-syntax 0.8.4",
  "rusty-fork",
  "tempfile",
  "unarray",
@@ -9628,34 +9889,43 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.12.3"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
+dependencies = [
+ "bytes",
+ "prost-derive 0.12.6",
+]
+
+[[package]]
+name = "prost"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a"
+checksum = "3b2ecbe40f08db5c006b5764a2645f7f3f141ce756412ac9e1dd6087e6d32995"
 dependencies = [
  "bytes",
- "prost-derive 0.12.3",
+ "prost-derive 0.13.2",
 ]
 
 [[package]]
 name = "prost-build"
-version = "0.12.3"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2"
+checksum = "f8650aabb6c35b860610e9cff5dc1af886c9e25073b7b1712a68972af4281302"
 dependencies = [
  "bytes",
- "heck 0.4.1",
- "itertools 0.11.0",
+ "heck 0.5.0",
+ "itertools 0.13.0",
  "log",
  "multimap",
  "once_cell",
- "petgraph 0.6.2",
- "prettyplease 0.2.17",
- "prost 0.12.3",
- "prost-types",
+ "petgraph 0.6.5",
+ "prettyplease",
+ "prost 0.13.2",
+ "prost-types 0.13.2",
  "regex",
- "syn 2.0.48",
+ "syn 2.0.77",
  "tempfile",
- "which",
 ]
 
 [[package]]
@@ -9666,56 +9936,69 @@ checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
 dependencies = [
  "anyhow",
  "itertools 0.10.5",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "prost-derive"
-version = "0.12.3"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e"
+checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
 dependencies = [
  "anyhow",
- "itertools 0.11.0",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "itertools 0.12.1",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac"
+dependencies = [
+ "anyhow",
+ "itertools 0.13.0",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "prost-types"
-version = "0.12.3"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e"
+checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0"
 dependencies = [
- "prost 0.12.3",
+ "prost 0.12.6",
 ]
 
 [[package]]
-name = "protobuf"
-version = "2.28.0"
+name = "prost-types"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
+checksum = "60caa6738c7369b940c3d49246a8d1749323674c65cb13010134f5c9bad5b519"
 dependencies = [
- "bytes",
+ "prost 0.13.2",
 ]
 
 [[package]]
-name = "protobuf-src"
-version = "1.1.0+21.5"
+name = "protobuf"
+version = "2.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7ac8852baeb3cc6fb83b93646fb93c0ffe5d14bf138c945ceb4b9948ee0e3c1"
+checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
 dependencies = [
- "autotools",
+ "bytes",
 ]
 
 [[package]]
 name = "psm"
-version = "0.1.21"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
+checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205"
 dependencies = [
  "cc",
 ]
@@ -9726,26 +10009,14 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ca346b8ff0739660876c8d96a6f9de5cd9b4cd87500bb0ce92485318c674afe"
 
-[[package]]
-name = "pulldown-cmark"
-version = "0.9.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b"
-dependencies = [
- "bitflags 2.4.1",
- "memchr",
- "unicase",
-]
-
 [[package]]
 name = "quanta"
-version = "0.11.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab"
+checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5"
 dependencies = [
  "crossbeam-utils",
  "libc",
- "mach2",
  "once_cell",
  "raw-cpuid",
  "wasi 0.11.0+wasi-snapshot-preview1",
@@ -9759,12 +10030,6 @@ version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
-[[package]]
-name = "quick-error"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
-
 [[package]]
 name = "quick-xml"
 version = "0.36.1"
@@ -9777,9 +10042,9 @@ dependencies = [
 
 [[package]]
 name = "quinn"
-version = "0.11.3"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156"
+checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684"
 dependencies = [
  "bytes",
  "futures-io",
@@ -9787,8 +10052,8 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash 2.0.0",
- "rustls 0.23.12",
- "socket2 0.5.6",
+ "rustls 0.23.13",
+ "socket2 0.5.7",
  "thiserror",
  "tokio",
  "tracing",
@@ -9796,14 +10061,15 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.3"
-source = "git+https://github.com/quinn-rs/quinn.git?rev=f0fa66f871b80b9d2d7075d76967c649aecc0b77#f0fa66f871b80b9d2d7075d76967c649aecc0b77"
+version = "0.11.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6"
 dependencies = [
  "bytes",
  "rand 0.8.5",
  "ring 0.17.8",
  "rustc-hash 2.0.0",
- "rustls 0.23.12",
+ "rustls 0.23.13",
  "slab",
  "thiserror",
  "tinyvec",
@@ -9812,15 +10078,15 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.4"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285"
+checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b"
 dependencies = [
  "libc",
  "once_cell",
- "socket2 0.5.6",
+ "socket2 0.5.7",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -9834,11 +10100,11 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
- "proc-macro2 1.0.78",
+ "proc-macro2 1.0.86",
 ]
 
 [[package]]
@@ -9848,7 +10114,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93"
 dependencies = [
  "log",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "scheduled-thread-pool",
 ]
 
@@ -9965,11 +10231,11 @@ dependencies = [
 
 [[package]]
 name = "raw-cpuid"
-version = "10.6.0"
+version = "11.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6823ea29436221176fe662da99998ad3b4db2c7f31e7b6f5fe43adccd6320bb"
+checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -9992,18 +10258,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "rcgen"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd"
-dependencies = [
- "pem 1.1.0",
- "ring 0.16.20",
- "time",
- "yasna",
-]
-
 [[package]]
 name = "rcgen"
 version = "0.13.1"
@@ -10019,13 +10273,13 @@ dependencies = [
 
 [[package]]
 name = "readonly"
-version = "0.2.3"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d78725e4e53781014168628ef49b2dc2fc6ae8d01a08769a5064685d34ee116c"
+checksum = "a25d631e41bfb5fdcde1d4e2215f62f7f0afa3ff11e26563765bd6ea1d229aeb"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -10036,13 +10290,13 @@ dependencies = [
  "backtrace",
  "bytes",
  "libc",
- "mio",
+ "mio 0.8.11",
  "num_cpus",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.6",
- "tokio-macros 2.2.0 (git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=e47aafebf98e9c1734a8848a1876d5946c44bdd1)",
+ "socket2 0.5.7",
+ "tokio-macros 2.2.0",
  "windows-sys 0.48.0",
 ]
 
@@ -10057,63 +10311,54 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.4.1"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.4.3"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
  "getrandom 0.2.15",
- "redox_syscall 0.2.16",
+ "libredox",
  "thiserror",
 ]
 
 [[package]]
 name = "ref-cast"
-version = "1.0.14"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c78fb8c9293bcd48ef6fce7b4ca950ceaf21210de6e105a883ee280c0f7b9ed"
+checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931"
 dependencies = [
  "ref-cast-impl",
 ]
 
 [[package]]
 name = "ref-cast-impl"
-version = "1.0.14"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f"
+checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "regex"
-version = "1.9.4"
+version = "1.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
 dependencies = [
- "aho-corasick 1.0.2",
+ "aho-corasick",
  "memchr",
- "regex-automata 0.3.7",
- "regex-syntax 0.7.5",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
@@ -10122,25 +10367,25 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
 dependencies = [
- "regex-syntax 0.6.28",
+ "regex-syntax 0.6.29",
 ]
 
 [[package]]
 name = "regex-automata"
-version = "0.3.7"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
- "aho-corasick 1.0.2",
+ "aho-corasick",
  "memchr",
- "regex-syntax 0.7.5",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.28"
+version = "0.6.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
@@ -10156,19 +10401,20 @@ checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "reqwest"
-version = "0.11.20"
+version = "0.11.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1"
+checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
 dependencies = [
- "base64 0.21.2",
+ "base64 0.21.7",
  "bytes",
  "encoding_rs",
  "futures-core",
  "futures-util",
  "h2 0.3.26",
- "http 0.2.9",
- "http-body 0.4.5",
- "hyper 0.14.26",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "hyper 0.14.30",
+ "hyper-rustls 0.24.2",
  "hyper-tls 0.5.0",
  "ipnet",
  "js-sys",
@@ -10178,38 +10424,44 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
+ "rustls 0.21.12",
+ "rustls-pemfile 1.0.4",
  "serde",
  "serde_json",
  "serde_urlencoded",
+ "sync_wrapper 0.1.2",
+ "system-configuration 0.5.1",
  "tokio",
  "tokio-native-tls",
+ "tokio-rustls 0.24.1",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "winreg 0.50.0",
+ "webpki-roots 0.25.4",
+ "winreg",
 ]
 
 [[package]]
 name = "reqwest"
-version = "0.12.4"
+version = "0.12.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
+checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
 dependencies = [
- "async-compression 0.4.12",
+ "async-compression",
  "base64 0.22.1",
  "bytes",
  "encoding_rs",
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.4.5",
+ "h2 0.4.6",
  "http 1.1.0",
  "http-body 1.0.1",
  "http-body-util",
  "hyper 1.4.1",
- "hyper-rustls 0.26.0",
+ "hyper-rustls 0.27.3",
  "hyper-tls 0.6.0",
  "hyper-util",
  "ipnet",
@@ -10220,27 +10472,28 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls 0.22.4",
- "rustls-native-certs 0.7.1",
- "rustls-pemfile 2.1.2",
+ "quinn",
+ "rustls 0.23.13",
+ "rustls-native-certs 0.7.3",
+ "rustls-pemfile 2.1.3",
  "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper",
- "system-configuration",
+ "sync_wrapper 1.0.1",
+ "system-configuration 0.6.1",
  "tokio",
  "tokio-native-tls",
- "tokio-rustls 0.25.0",
- "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-rustls 0.26.0",
+ "tokio-util 0.7.12",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-streams",
  "web-sys",
- "webpki-roots 0.26.3",
- "winreg 0.52.0",
+ "webpki-roots 0.26.5",
+ "windows-registry",
 ]
 
 [[package]]
@@ -10252,7 +10505,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "http 1.1.0",
- "reqwest 0.12.4",
+ "reqwest 0.12.7",
  "serde",
  "thiserror",
  "tower-service",
@@ -10272,7 +10525,7 @@ dependencies = [
  "http 1.1.0",
  "hyper 1.4.1",
  "parking_lot 0.11.2",
- "reqwest 0.12.4",
+ "reqwest 0.12.7",
  "reqwest-middleware",
  "retry-policies",
  "tokio",
@@ -10368,16 +10621,16 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e33d7b2abe0c340d8797fe2907d3f20d3b5ea5908683618bfe80df7f621f672a"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "roaring"
-version = "0.10.3"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1c77081a55300e016cb86f2864415b7518741879db925b8d488a0ee0d2da6bf"
+checksum = "8f4b84ba6e838ceb47b41de5194a60244fac43d9fe03b71dbe8c5a201081d6d1"
 dependencies = [
  "bytemuck",
  "byteorder",
@@ -10399,8 +10652,8 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
 dependencies = [
- "base64 0.21.2",
- "bitflags 2.4.1",
+ "base64 0.21.7",
+ "bitflags 2.6.0",
  "serde",
  "serde_derive",
 ]
@@ -10420,29 +10673,28 @@ dependencies = [
  "pkcs1 0.4.1",
  "pkcs8 0.9.0",
  "rand_core 0.6.4",
- "sha2 0.10.6",
- "signature 2.0.0",
+ "sha2 0.10.8",
+ "signature 2.2.0",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
 name = "rsa"
-version = "0.9.1"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72f1471dbb4be5de45050e8ef7040625298ccb9efe941419ac2697088715925f"
+checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc"
 dependencies = [
- "byteorder",
  "const-oid",
  "digest 0.10.7",
  "num-bigint-dig",
  "num-integer",
- "num-iter",
  "num-traits",
  "pkcs1 0.7.5",
  "pkcs8 0.10.2",
  "rand_core 0.6.4",
- "signature 2.0.0",
+ "signature 2.2.0",
+ "spki 0.7.3",
  "subtle",
  "zeroize",
 ]
@@ -10466,10 +10718,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7229b505ae0706e64f37ffc54a9c163e11022a6636d58fe1f3f52018257ff9f7"
 dependencies = [
  "cfg-if",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
  "rustc_version",
- "syn 1.0.107",
+ "syn 1.0.109",
  "unicode-ident",
 ]
 
@@ -10484,8 +10736,8 @@ dependencies = [
  "bytes",
  "crc32fast",
  "futures",
- "http 0.2.9",
- "hyper 0.14.26",
+ "http 0.2.12",
+ "hyper 0.14.30",
  "hyper-rustls 0.23.2",
  "lazy_static",
  "log",
@@ -10508,7 +10760,7 @@ dependencies = [
  "chrono",
  "dirs-next",
  "futures",
- "hyper 0.14.26",
+ "hyper 0.14.30",
  "serde",
  "serde_json",
  "shlex",
@@ -10543,8 +10795,8 @@ dependencies = [
  "futures",
  "hex",
  "hmac 0.11.0",
- "http 0.2.9",
- "hyper 0.14.26",
+ "http 0.2.12",
+ "hyper 0.14.30",
  "log",
  "md-5 0.9.1",
  "percent-encoding",
@@ -10565,7 +10817,7 @@ dependencies = [
  "aes",
  "aes-gcm",
  "async-trait",
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "byteorder",
  "chacha20",
  "ctr",
@@ -10577,18 +10829,18 @@ dependencies = [
  "hex-literal 0.4.1",
  "hmac 0.12.1",
  "log",
- "num-bigint 0.4.4",
+ "num-bigint 0.4.6",
  "once_cell",
  "poly1305",
  "rand 0.8.5",
  "russh-cryptovec",
  "russh-keys",
  "sha1",
- "sha2 0.10.6",
+ "sha2 0.10.8",
  "subtle",
  "thiserror",
  "tokio",
- "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.12",
 ]
 
 [[package]]
@@ -10611,7 +10863,7 @@ dependencies = [
  "async-trait",
  "bcrypt-pbkdf",
  "bit-vec",
- "block-padding 0.3.2",
+ "block-padding 0.3.3",
  "byteorder",
  "cbc",
  "ctr",
@@ -10623,14 +10875,14 @@ dependencies = [
  "inout",
  "log",
  "md5",
- "num-bigint 0.4.4",
+ "num-bigint 0.4.6",
  "num-integer",
  "pbkdf2 0.11.0",
  "rand 0.7.3",
  "rand_core 0.6.4",
  "russh-cryptovec",
  "serde",
- "sha2 0.10.6",
+ "sha2 0.10.8",
  "thiserror",
  "tokio",
  "tokio-stream",
@@ -10639,19 +10891,19 @@ dependencies = [
 
 [[package]]
 name = "rust_decimal"
-version = "1.35.0"
+version = "1.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a"
+checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555"
 dependencies = [
- "arrayvec 0.7.2",
+ "arrayvec 0.7.6",
  "num-traits",
 ]
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.21"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
@@ -10673,11 +10925,11 @@ checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
 
 [[package]]
 name = "rustc_version"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
- "semver 1.0.16",
+ "semver",
 ]
 
 [[package]]
@@ -10691,36 +10943,22 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.37.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aae838e49b3d63e9274e1c01833cc8139d3fec468c3b84688c628f44b1ae11d"
-dependencies = [
- "bitflags 1.3.2",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys 0.3.1",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "rustix"
-version = "0.38.34"
+version = "0.38.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.6.0",
  "errno",
  "libc",
- "linux-raw-sys 0.4.12",
+ "linux-raw-sys",
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.20.7"
+version = "0.20.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c"
+checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99"
 dependencies = [
  "log",
  "ring 0.16.20",
@@ -10742,53 +10980,52 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.22.4"
+version = "0.23.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
+checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
 dependencies = [
  "log",
+ "once_cell",
  "ring 0.17.8",
  "rustls-pki-types",
- "rustls-webpki 0.102.6",
+ "rustls-webpki 0.102.8",
  "subtle",
  "zeroize",
 ]
 
 [[package]]
-name = "rustls"
-version = "0.23.12"
+name = "rustls-native-certs"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044"
+checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
 dependencies = [
- "log",
- "once_cell",
- "ring 0.17.8",
- "rustls-pki-types",
- "rustls-webpki 0.102.6",
- "subtle",
- "zeroize",
+ "openssl-probe",
+ "rustls-pemfile 1.0.4",
+ "schannel",
+ "security-framework",
 ]
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.6.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50"
+checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile 1.0.2",
+ "rustls-pemfile 2.1.3",
+ "rustls-pki-types",
  "schannel",
  "security-framework",
 ]
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.7.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba"
+checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile 2.1.2",
+ "rustls-pemfile 2.1.3",
  "rustls-pki-types",
  "schannel",
  "security-framework",
@@ -10796,18 +11033,18 @@ dependencies = [
 
 [[package]]
 name = "rustls-pemfile"
-version = "1.0.2"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b"
+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
 dependencies = [
- "base64 0.21.2",
+ "base64 0.21.7",
 ]
 
 [[package]]
 name = "rustls-pemfile"
-version = "2.1.2"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
+checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425"
 dependencies = [
  "base64 0.22.1",
  "rustls-pki-types",
@@ -10815,19 +11052,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
-
-[[package]]
-name = "rustls-webpki"
-version = "0.100.3"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3"
-dependencies = [
- "ring 0.16.20",
- "untrusted 0.7.1",
-]
+checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0"
 
 [[package]]
 name = "rustls-webpki"
@@ -10841,9 +11068,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.6"
+version = "0.102.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
+checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
 dependencies = [
  "ring 0.17.8",
  "rustls-pki-types",
@@ -10852,9 +11079,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.11"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"
+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
 
 [[package]]
 name = "rusty-fork"
@@ -10863,7 +11090,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
 dependencies = [
  "fnv",
- "quick-error 1.2.3",
+ "quick-error",
  "tempfile",
  "wait-timeout",
 ]
@@ -10898,9 +11125,9 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "107c3d5d7f370ac09efa62a78375f94d94b8a33c61d8c278b96683fb4dbf2d8d"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -10929,44 +11156,44 @@ dependencies = [
 
 [[package]]
 name = "scale-info"
-version = "2.10.0"
+version = "2.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60"
+checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024"
 dependencies = [
  "cfg-if",
  "derive_more",
- "parity-scale-codec 3.6.5",
+ "parity-scale-codec 3.6.12",
  "scale-info-derive",
 ]
 
 [[package]]
 name = "scale-info-derive"
-version = "2.10.0"
+version = "2.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19"
+checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62"
 dependencies = [
- "proc-macro-crate",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro-crate 3.2.0",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "schannel"
-version = "0.1.21"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
+checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
 dependencies = [
- "windows-sys 0.42.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "scheduled-thread-pool"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "977a7519bff143a44f842fd07e80ad1329295bd71686457f18e496736f4bf9bf"
+checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19"
 dependencies = [
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
 ]
 
 [[package]]
@@ -10988,23 +11215,17 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1eee588578aff73f856ab961cd2f79e36bc45d7ded33a7562adba4667aecc0e"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
  "serde_derive_internals",
- "syn 2.0.48",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "scratch"
-version = "1.0.3"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "scrypt"
@@ -11015,17 +11236,17 @@ dependencies = [
  "hmac 0.12.1",
  "pbkdf2 0.11.0",
  "salsa20",
- "sha2 0.10.6",
+ "sha2 0.10.8",
 ]
 
 [[package]]
 name = "sct"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
 dependencies = [
- "ring 0.16.20",
- "untrusted 0.7.1",
+ "ring 0.17.8",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
@@ -11043,12 +11264,12 @@ dependencies = [
 
 [[package]]
 name = "sec1"
-version = "0.7.1"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
 dependencies = [
  "base16ct 0.2.0",
- "der 0.7.5",
+ "der 0.7.9",
  "generic-array",
  "pkcs8 0.10.2",
  "serdect",
@@ -11087,11 +11308,11 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.7.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bc1bb97804af6631813c55739f771071e0f2ed33ee20b68c86ec505d906356c"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -11100,9 +11321,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.6.1"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556"
+checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -11110,31 +11331,13 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.16"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "semver-parser"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
-dependencies = [
- "pest",
-]
-
 [[package]]
 name = "send_wrapper"
 version = "0.4.0"
@@ -11149,9 +11352,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
 
 [[package]]
 name = "serde"
-version = "1.0.202"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
  "serde_derive",
 ]
@@ -11179,22 +11382,22 @@ dependencies = [
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.9"
+version = "0.11.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294"
+checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.202"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -11203,19 +11406,20 @@ version = "0.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.120"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.5.0",
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
@@ -11231,10 +11435,11 @@ dependencies = [
 
 [[package]]
 name = "serde_path_to_error"
-version = "0.1.9"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b04f22b563c91331a10074bda3dd5492e3cc39d56bd557e91c0af42b6c7341"
+checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6"
 dependencies = [
+ "itoa",
  "serde",
 ]
 
@@ -11244,25 +11449,25 @@ version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.2"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d"
+checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde_test"
-version = "1.0.152"
+version = "1.0.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3611210d2d67e3513204742004d6ac6f589e521861dabb0f649b070eea8bed9e"
+checksum = "7f901ee573cab6b3060453d2d5f0bae4e6d628c23c0a962ff9b5f1d7c8d4f1ed"
 dependencies = [
  "serde",
 ]
@@ -11281,9 +11486,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "2.1.0"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25bf4a5a814902cd1014dbccfa4d4560fb8432c779471e96e035602519f82eef"
+checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe"
 dependencies = [
  "base64 0.13.1",
  "chrono",
@@ -11291,50 +11496,50 @@ dependencies = [
  "indexmap 1.9.3",
  "serde",
  "serde_json",
- "serde_with_macros 2.1.0",
+ "serde_with_macros 2.3.3",
  "time",
 ]
 
 [[package]]
 name = "serde_with"
-version = "3.8.1"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20"
+checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.2.6",
+ "indexmap 2.5.0",
  "serde",
  "serde_derive",
  "serde_json",
- "serde_with_macros 3.8.1",
+ "serde_with_macros 3.9.0",
  "time",
 ]
 
 [[package]]
 name = "serde_with_macros"
-version = "2.1.0"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3452b4c0f6c1e357f73fdb87cd1efabaa12acf328c7a528e252893baeb3f4aa"
+checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f"
 dependencies = [
- "darling 0.14.2",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "darling 0.20.10",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "serde_with_macros"
-version = "3.8.1"
+version = "3.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"
+checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
 dependencies = [
  "darling 0.20.10",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -11349,6 +11554,19 @@ dependencies = [
  "yaml-rust",
 ]
 
+[[package]]
+name = "serde_yaml"
+version = "0.9.34+deprecated"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
+dependencies = [
+ "indexmap 2.5.0",
+ "itoa",
+ "ryu",
+ "serde",
+ "unsafe-libyaml",
+]
+
 [[package]]
 name = "serdect"
 version = "0.2.0"
@@ -11385,9 +11603,9 @@ dependencies = [
 
 [[package]]
 name = "sha1"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -11409,9 +11627,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.6"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -11432,9 +11650,9 @@ dependencies = [
 
 [[package]]
 name = "sha3"
-version = "0.10.6"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9"
+checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
 dependencies = [
  "digest 0.10.7",
  "keccak",
@@ -11442,9 +11660,9 @@ dependencies = [
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.4"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
 dependencies = [
  "lazy_static",
 ]
@@ -11472,7 +11690,7 @@ version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b"
 dependencies = [
- "dirs 4.0.0",
+ "dirs 5.0.1",
 ]
 
 [[package]]
@@ -11483,9 +11701,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook"
-version = "0.3.14"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d"
+checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
 dependencies = [
  "libc",
  "signal-hook-registry",
@@ -11493,20 +11711,20 @@ dependencies = [
 
 [[package]]
 name = "signal-hook-mio"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
+checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
 dependencies = [
  "libc",
- "mio",
+ "mio 0.8.11",
  "signal-hook",
 ]
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.0"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
 dependencies = [
  "libc",
 ]
@@ -11519,7 +11737,7 @@ checksum = "c1e303f8205714074f6068773f0e29527e0453937fe837c9717d066635b65f31"
 dependencies = [
  "pkcs8 0.10.2",
  "rand_core 0.6.4",
- "signature 2.0.0",
+ "signature 2.2.0",
  "zeroize",
 ]
 
@@ -11535,9 +11753,9 @@ dependencies = [
 
 [[package]]
 name = "signature"
-version = "2.0.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
 dependencies = [
  "digest 0.10.7",
  "rand_core 0.6.4",
@@ -11545,9 +11763,15 @@ dependencies = [
 
 [[package]]
 name = "similar"
-version = "2.4.0"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e"
+
+[[package]]
+name = "simple-server-timing-header"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32fea41aca09ee824cc9724996433064c89f7777e60762749a4170a14abbfa21"
+checksum = "16e78919e05c9b8e123d435a4ad104b488ad1585631830e413830985c214086e"
 
 [[package]]
 name = "simple_asn1"
@@ -11555,7 +11779,7 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085"
 dependencies = [
- "num-bigint 0.4.4",
+ "num-bigint 0.4.6",
  "num-traits",
  "thiserror",
  "time",
@@ -11604,9 +11828,9 @@ dependencies = [
 
 [[package]]
 name = "siphasher"
-version = "0.3.10"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
 
 [[package]]
 name = "sized-chunks"
@@ -11618,26 +11842,11 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "skeptic"
-version = "0.13.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16d23b015676c90a0f01c197bfdc786c20342c73a0afdda9025adb0bc42940a8"
-dependencies = [
- "bytecount",
- "cargo_metadata 0.14.2",
- "error-chain",
- "glob",
- "pulldown-cmark",
- "tempfile",
- "walkdir",
-]
-
 [[package]]
 name = "slab"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
 dependencies = [
  "autocfg",
 ]
@@ -11665,9 +11874,9 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
 
 [[package]]
 name = "snafu"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0656e7e3ffb70f6c39b3c2a86332bb74aa3c679da781642590f3c1118c5045"
+checksum = "e4de37ad025c587a29e8f3f5605c00f70b98715ef90b9061a815b9e59e9042d6"
 dependencies = [
  "doc-comment",
  "snafu-derive",
@@ -11675,21 +11884,21 @@ dependencies = [
 
 [[package]]
 name = "snafu-derive"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "475b3bbe5245c26f2d8a6f62d67c1f30eb9fffeccee721c45d162c3ebbdf81b2"
+checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf"
 dependencies = [
  "heck 0.4.1",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "snap"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831"
+checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b"
 
 [[package]]
 name = "snowflake-api"
@@ -11706,7 +11915,7 @@ dependencies = [
  "log",
  "object_store",
  "regex",
- "reqwest 0.12.4",
+ "reqwest 0.12.7",
  "reqwest-middleware",
  "reqwest-retry",
  "serde",
@@ -11715,7 +11924,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "url",
- "uuid 1.2.2",
+ "uuid 1.10.0",
 ]
 
 [[package]]
@@ -11725,19 +11934,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2f1c0c8818bb7400e821b166075ec771c8e8a012af41a8982b34eefaad4739fd"
 dependencies = [
  "base64 0.22.1",
- "jsonwebtoken",
- "rsa 0.9.1",
+ "jsonwebtoken 9.3.0",
+ "rsa 0.9.6",
  "serde",
- "sha2 0.10.6",
+ "sha2 0.10.8",
  "thiserror",
  "time",
 ]
 
 [[package]]
 name = "socket2"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
 dependencies = [
  "libc",
  "winapi",
@@ -11745,9 +11954,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.6"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -11762,13 +11971,27 @@ dependencies = [
  "base64 0.13.1",
  "bytes",
  "futures",
- "http 0.2.9",
+ "http 0.2.12",
  "httparse",
  "log",
  "rand 0.8.5",
  "sha-1 0.9.8",
 ]
 
+[[package]]
+name = "solang-parser"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c425ce1c59f4b154717592f0bdf4715c3a1d55058883622d3157e1f0908a5b26"
+dependencies = [
+ "itertools 0.11.0",
+ "lalrpop",
+ "lalrpop-util",
+ "phf",
+ "thiserror",
+ "unicode-xid 0.2.5",
+]
+
 [[package]]
 name = "spin"
 version = "0.5.2"
@@ -11792,6 +12015,15 @@ dependencies = [
  "strum 0.24.1",
 ]
 
+[[package]]
+name = "spinning_top"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300"
+dependencies = [
+ "lock_api",
+]
+
 [[package]]
 name = "spki"
 version = "0.6.0"
@@ -11804,12 +12036,12 @@ dependencies = [
 
 [[package]]
 name = "spki"
-version = "0.7.1"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37a5be806ab6f127c3da44b7378837ebf01dadca8510a0e572460216b228bd0e"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
 dependencies = [
  "base64ct",
- "der 0.7.5",
+ "der 0.7.9",
 ]
 
 [[package]]
@@ -11820,15 +12052,15 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
 name = "stacker"
-version = "0.1.15"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce"
+checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b"
 dependencies = [
  "cc",
  "cfg-if",
  "libc",
  "psm",
- "winapi",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -11843,6 +12075,19 @@ version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0"
 
+[[package]]
+name = "string_cache"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
+dependencies = [
+ "new_debug_unreachable",
+ "once_cell",
+ "parking_lot 0.12.3",
+ "phf_shared 0.10.0",
+ "precomputed-hash",
+]
+
 [[package]]
 name = "strip-ansi-escapes"
 version = "0.1.1"
@@ -11875,7 +12120,7 @@ dependencies = [
  "rayon",
  "serde",
  "serde_json",
- "serde_with 3.8.1",
+ "serde_with 3.9.0",
  "strum 0.26.3",
  "typeshare",
 ]
@@ -11895,7 +12140,7 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
 dependencies = [
- "strum_macros 0.25.2",
+ "strum_macros 0.25.3",
 ]
 
 [[package]]
@@ -11914,23 +12159,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
 dependencies = [
  "heck 0.4.1",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
  "rustversion",
- "syn 1.0.107",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "strum_macros"
-version = "0.25.2"
+version = "0.25.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059"
+checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
 dependencies = [
  "heck 0.4.1",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
  "rustversion",
- "syn 2.0.48",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -11940,10 +12185,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
 dependencies = [
  "heck 0.5.0",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
  "rustversion",
- "syn 2.0.48",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -11958,9 +12203,9 @@ dependencies = [
 
 [[package]]
 name = "subtle"
-version = "2.5.0"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "subtle-ng"
@@ -11970,14 +12215,14 @@ checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142"
 
 [[package]]
 name = "sui"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "anemo",
  "anyhow",
  "assert_cmd",
  "async-recursion",
  "async-trait",
- "axum",
+ "axum 0.7.5",
  "bcs",
  "bin-version",
  "bip32",
@@ -11992,7 +12237,7 @@ dependencies = [
  "fastcrypto-zkp",
  "fs_extra",
  "futures",
- "http 0.2.9",
+ "http 1.1.0",
  "im",
  "inquire",
  "insta",
@@ -12008,18 +12253,18 @@ dependencies = [
  "move-vm-config",
  "move-vm-profiler",
  "msim",
- "num-bigint 0.4.4",
+ "num-bigint 0.4.6",
  "prometheus",
  "rand 0.8.5",
  "regex",
- "reqwest 0.12.4",
+ "reqwest 0.12.7",
  "rusoto_core",
  "rusoto_kms",
  "rustyline",
  "rustyline-derive",
  "serde",
  "serde_json",
- "serde_yaml",
+ "serde_yaml 0.8.26",
  "shared-crypto",
  "shell-words",
  "shlex",
@@ -12039,7 +12284,7 @@ dependencies = [
  "sui-package-management",
  "sui-protocol-config",
  "sui-replay",
- "sui-sdk 1.30.1",
+ "sui-sdk 1.32.3",
  "sui-simulator",
  "sui-source-validation",
  "sui-swarm",
@@ -12054,13 +12299,13 @@ dependencies = [
  "test-cluster",
  "thiserror",
  "tokio",
- "toml 0.7.4",
+ "toml 0.7.8",
  "tower",
  "tower-http",
  "tracing",
  "unescape",
  "url",
- "uuid 1.2.2",
+ "uuid 1.10.0",
 ]
 
 [[package]]
@@ -12081,7 +12326,7 @@ dependencies = [
  "move-vm-runtime",
  "move-vm-types",
  "mysten-metrics",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "serde",
  "sui-macros",
  "sui-move-natives-latest",
@@ -12109,7 +12354,7 @@ dependencies = [
  "move-vm-runtime-v0",
  "move-vm-types",
  "once_cell",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "serde",
  "sui-macros",
  "sui-move-natives-v0",
@@ -12136,7 +12381,7 @@ dependencies = [
  "move-vm-profiler",
  "move-vm-runtime-v1",
  "move-vm-types",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "serde",
  "sui-macros",
  "sui-move-natives-v1",
@@ -12163,7 +12408,7 @@ dependencies = [
  "move-vm-profiler",
  "move-vm-runtime-v2",
  "move-vm-types",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "serde",
  "sui-macros",
  "sui-move-natives-v2",
@@ -12175,7 +12420,7 @@ dependencies = [
 
 [[package]]
 name = "sui-archival"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "anyhow",
  "byteorder",
@@ -12235,7 +12480,7 @@ dependencies = [
  "narwhal-config",
  "prettytable-rs",
  "prometheus-parse",
- "reqwest 0.12.4",
+ "reqwest 0.12.7",
  "russh",
  "russh-keys",
  "serde",
@@ -12283,7 +12528,7 @@ dependencies = [
  "sui-macros",
  "sui-network",
  "sui-protocol-config",
- "sui-sdk 1.30.1",
+ "sui-sdk 1.32.3",
  "sui-simulator",
  "sui-storage",
  "sui-surfer",
@@ -12294,19 +12539,19 @@ dependencies = [
  "telemetry-subscribers",
  "test-cluster",
  "tokio",
- "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.12",
  "tracing",
  "typed-store",
 ]
 
 [[package]]
 name = "sui-bridge"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "anyhow",
  "arc-swap",
  "async-trait",
- "axum",
+ "axum 0.7.5",
  "backoff",
  "bcs",
  "bin-version",
@@ -12317,7 +12562,7 @@ dependencies = [
  "fastcrypto",
  "futures",
  "hex-literal 0.3.4",
- "lru 0.10.0",
+ "lru 0.10.1",
  "maplit",
  "move-core-types",
  "mysten-metrics",
@@ -12325,18 +12570,17 @@ dependencies = [
  "once_cell",
  "prometheus",
  "rand 0.8.5",
- "reqwest 0.12.4",
- "rocksdb",
+ "reqwest 0.12.7",
  "serde",
  "serde_json",
- "serde_with 3.8.1",
+ "serde_with 3.9.0",
  "shared-crypto",
  "sui-authority-aggregation",
  "sui-config",
  "sui-json-rpc-api",
  "sui-json-rpc-types",
  "sui-keys",
- "sui-sdk 1.30.1",
+ "sui-sdk 1.32.3",
  "sui-test-transaction-builder",
  "sui-types",
  "tap",
@@ -12346,13 +12590,12 @@ dependencies = [
  "tokio",
  "tracing",
  "typed-store",
- "typed-store-derive",
  "url",
 ]
 
 [[package]]
 name = "sui-bridge-cli"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "anyhow",
  "clap",
@@ -12360,16 +12603,16 @@ dependencies = [
  "fastcrypto",
  "futures",
  "move-core-types",
- "reqwest 0.12.4",
+ "reqwest 0.12.7",
  "serde",
  "serde_json",
- "serde_with 3.8.1",
+ "serde_with 3.9.0",
  "shared-crypto",
  "sui-bridge",
  "sui-config",
  "sui-json-rpc-types",
  "sui-keys",
- "sui-sdk 1.30.1",
+ "sui-sdk 1.32.3",
  "sui-types",
  "telemetry-subscribers",
  "tokio",
@@ -12392,13 +12635,15 @@ dependencies = [
  "hex-literal 0.3.4",
  "mysten-metrics",
  "prometheus",
+ "rayon",
  "serde",
- "serde_yaml",
+ "serde_yaml 0.8.26",
  "sui-bridge",
  "sui-config",
  "sui-data-ingestion-core",
+ "sui-indexer-builder",
  "sui-json-rpc-types",
- "sui-sdk 1.30.1",
+ "sui-sdk 1.32.3",
  "sui-test-transaction-builder",
  "sui-types",
  "tap",
@@ -12426,10 +12671,10 @@ dependencies = [
  "once_cell",
  "prometheus",
  "rand 0.8.5",
- "reqwest 0.12.4",
+ "reqwest 0.12.7",
  "serde",
- "serde_with 3.8.1",
- "serde_yaml",
+ "serde_with 3.9.0",
+ "serde_yaml 0.8.26",
  "sui-keys",
  "sui-protocol-config",
  "sui-types",
@@ -12445,7 +12690,7 @@ dependencies = [
  "anyhow",
  "arc-swap",
  "async-trait",
- "axum",
+ "axum 0.7.5",
  "bcs",
  "bytes",
  "chrono",
@@ -12455,7 +12700,7 @@ dependencies = [
  "count-min-sketch",
  "criterion",
  "dashmap",
- "diffy",
+ "diffy 0.3.0",
  "either",
  "enum_dispatch",
  "expect-test",
@@ -12466,10 +12711,10 @@ dependencies = [
  "fs_extra",
  "futures",
  "im",
- "indexmap 2.2.6",
+ "indexmap 2.5.0",
  "itertools 0.10.5",
  "jsonrpsee",
- "lru 0.10.0",
+ "lru 0.10.1",
  "mockall",
  "moka",
  "more-asserts",
@@ -12490,26 +12735,25 @@ dependencies = [
  "narwhal-types",
  "narwhal-worker",
  "nonempty",
- "num-bigint 0.4.4",
+ "num-bigint 0.4.6",
  "num_cpus",
  "object_store",
  "once_cell",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "pprof",
  "pretty_assertions",
  "prometheus",
  "rand 0.8.5",
  "rayon",
- "reqwest 0.12.4",
+ "reqwest 0.12.7",
  "roaring",
- "rocksdb",
  "rstest",
  "scopeguard",
  "serde",
  "serde-reflection",
  "serde_json",
- "serde_with 3.8.1",
- "serde_yaml",
+ "serde_with 3.9.0",
+ "serde_yaml 0.8.26",
  "shared-crypto",
  "signature 1.6.4",
  "static_assertions",
@@ -12525,7 +12769,6 @@ dependencies = [
  "sui-move-build",
  "sui-network",
  "sui-protocol-config",
- "sui-rest-api",
  "sui-simulator",
  "sui-storage",
  "sui-swarm-config",
@@ -12543,7 +12786,6 @@ dependencies = [
  "tracing",
  "twox-hash",
  "typed-store",
- "typed-store-derive",
  "zeroize",
 ]
 
@@ -12571,7 +12813,7 @@ dependencies = [
 
 [[package]]
 name = "sui-data-ingestion"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -12591,7 +12833,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "serde_json",
- "serde_yaml",
+ "serde_yaml 0.8.26",
  "sui-archival",
  "sui-data-ingestion-core",
  "sui-storage",
@@ -12634,7 +12876,7 @@ dependencies = [
 
 [[package]]
 name = "sui-e2e-tests"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -12647,7 +12889,7 @@ dependencies = [
  "fastcrypto-zkp",
  "fs_extra",
  "futures",
- "indexmap 2.2.6",
+ "indexmap 2.5.0",
  "insta",
  "jsonrpsee",
  "move-binary-format",
@@ -12678,7 +12920,7 @@ dependencies = [
  "sui-node",
  "sui-protocol-config",
  "sui-rest-api",
- "sui-sdk 1.30.1",
+ "sui-sdk 1.32.3",
  "sui-simulator",
  "sui-storage",
  "sui-swarm",
@@ -12698,7 +12940,7 @@ dependencies = [
 name = "sui-enum-compat-util"
 version = "0.1.0"
 dependencies = [
- "serde_yaml",
+ "serde_yaml 0.8.26",
 ]
 
 [[package]]
@@ -12745,33 +12987,32 @@ dependencies = [
  "expect-test",
  "tempfile",
  "thiserror",
- "toml 0.7.4",
- "toml_edit 0.19.10",
+ "toml 0.7.8",
+ "toml_edit 0.19.15",
 ]
 
 [[package]]
 name = "sui-faucet"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "anyhow",
  "async-recursion",
  "async-trait",
- "axum",
+ "axum 0.7.5",
  "clap",
  "eyre",
  "futures",
- "http 0.2.9",
+ "http 1.1.0",
  "mysten-metrics",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "prometheus",
- "rocksdb",
  "scopeguard",
  "serde",
  "shared-crypto",
  "sui-config",
  "sui-json-rpc-types",
  "sui-keys",
- "sui-sdk 1.30.1",
+ "sui-sdk 1.32.3",
  "sui-types",
  "tap",
  "telemetry-subscribers",
@@ -12784,8 +13025,7 @@ dependencies = [
  "tracing",
  "ttl_cache",
  "typed-store",
- "typed-store-derive",
- "uuid 1.2.2",
+ "uuid 1.10.0",
 ]
 
 [[package]]
@@ -12809,7 +13049,7 @@ dependencies = [
 
 [[package]]
 name = "sui-framework-snapshot"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "anyhow",
  "bcs",
@@ -12826,6 +13066,7 @@ dependencies = [
 name = "sui-framework-tests"
 version = "0.1.0"
 dependencies = [
+ "datatest-stable",
  "move-bytecode-verifier",
  "move-bytecode-verifier-meter",
  "move-cli",
@@ -12855,8 +13096,8 @@ dependencies = [
  "prometheus",
  "rand 0.8.5",
  "serde",
- "serde_with 3.8.1",
- "serde_yaml",
+ "serde_with 3.9.0",
+ "serde_yaml 0.8.26",
  "shared-crypto",
  "sui-config",
  "sui-execution",
@@ -12871,11 +13112,11 @@ dependencies = [
 
 [[package]]
 name = "sui-indexer"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "anyhow",
  "async-trait",
- "axum",
+ "axum 0.7.5",
  "backoff",
  "bcs",
  "cached",
@@ -12902,7 +13143,7 @@ dependencies = [
  "secrecy",
  "serde",
  "serde_json",
- "serde_with 3.8.1",
+ "serde_with 3.9.0",
  "simulacrum",
  "sui-data-ingestion-core",
  "sui-json",
@@ -12915,7 +13156,7 @@ dependencies = [
  "sui-package-resolver",
  "sui-protocol-config",
  "sui-rest-api",
- "sui-sdk 1.30.1",
+ "sui-sdk 1.32.3",
  "sui-test-transaction-builder",
  "sui-transaction-builder",
  "sui-types",
@@ -12925,11 +13166,26 @@ dependencies = [
  "test-cluster",
  "thiserror",
  "tokio",
- "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.12",
  "tracing",
  "url",
 ]
 
+[[package]]
+name = "sui-indexer-builder"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "mysten-metrics",
+ "prometheus",
+ "sui-data-ingestion-core",
+ "sui-types",
+ "telemetry-subscribers",
+ "tokio",
+ "tracing",
+]
+
 [[package]]
 name = "sui-json"
 version = "0.0.0"
@@ -12956,7 +13212,7 @@ dependencies = [
  "anyhow",
  "arc-swap",
  "async-trait",
- "axum",
+ "axum 0.7.5",
  "bcs",
  "cached",
  "chrono",
@@ -12964,8 +13220,9 @@ dependencies = [
  "eyre",
  "fastcrypto",
  "futures",
- "hyper 0.14.26",
- "indexmap 2.2.6",
+ "http-body 0.4.6",
+ "hyper 1.4.1",
+ "indexmap 2.5.0",
  "itertools 0.10.5",
  "jsonrpsee",
  "mockall",
@@ -12974,6 +13231,7 @@ dependencies = [
  "move-core-types",
  "move-package",
  "mysten-metrics",
+ "mysten-service",
  "odin",
  "once_cell",
  "prometheus",
@@ -12997,7 +13255,7 @@ dependencies = [
  "telemetry-subscribers",
  "thiserror",
  "tokio",
- "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.12",
  "tower",
  "tower-http",
  "tracing",
@@ -13030,13 +13288,13 @@ dependencies = [
  "anyhow",
  "async-trait",
  "bcs",
- "hyper 0.14.26",
+ "hyper 1.4.1",
  "jsonrpsee",
  "move-core-types",
  "move-package",
  "prometheus",
  "rand 0.8.5",
- "reqwest 0.12.4",
+ "reqwest 0.12.7",
  "sui-config",
  "sui-core",
  "sui-json",
@@ -13049,7 +13307,7 @@ dependencies = [
  "sui-open-rpc",
  "sui-open-rpc-macros",
  "sui-protocol-config",
- "sui-sdk 1.30.1",
+ "sui-sdk 1.32.3",
  "sui-simulator",
  "sui-swarm-config",
  "sui-test-transaction-builder",
@@ -13078,7 +13336,7 @@ dependencies = [
  "schemars",
  "serde",
  "serde_json",
- "serde_with 3.8.1",
+ "serde_with 3.9.0",
  "sui-enum-compat-util",
  "sui-json",
  "sui-macros",
@@ -13110,7 +13368,7 @@ dependencies = [
 
 [[package]]
 name = "sui-light-client"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -13121,13 +13379,13 @@ dependencies = [
  "move-core-types",
  "serde",
  "serde_json",
- "serde_yaml",
+ "serde_yaml 0.8.26",
  "sui-config",
  "sui-json",
  "sui-json-rpc-types",
  "sui-package-resolver",
  "sui-rest-api",
- "sui-sdk 1.30.1",
+ "sui-sdk 1.32.3",
  "sui-types",
  "tokio",
 ]
@@ -13142,9 +13400,30 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "sui-metric-checker"
+version = "1.32.3"
+dependencies = [
+ "anyhow",
+ "backoff",
+ "base64 0.21.7",
+ "chrono",
+ "clap",
+ "humantime",
+ "once_cell",
+ "prometheus-http-query",
+ "reqwest 0.12.7",
+ "serde",
+ "serde_yaml 0.9.34+deprecated",
+ "strum_macros 0.24.3",
+ "telemetry-subscribers",
+ "tokio",
+ "tracing",
+]
+
 [[package]]
 name = "sui-move"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -13169,7 +13448,7 @@ dependencies = [
  "prometheus",
  "rand 0.8.5",
  "serde_json",
- "serde_yaml",
+ "serde_yaml 0.8.26",
  "sui-core",
  "sui-macros",
  "sui-move-build",
@@ -13186,7 +13465,7 @@ dependencies = [
 
 [[package]]
 name = "sui-move-build"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "anyhow",
  "datatest-stable",
@@ -13210,7 +13489,7 @@ dependencies = [
 
 [[package]]
 name = "sui-move-lsp"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "bin-version",
  "clap",
@@ -13227,7 +13506,7 @@ dependencies = [
  "fastcrypto",
  "fastcrypto-vdf",
  "fastcrypto-zkp",
- "indexmap 2.2.6",
+ "indexmap 2.5.0",
  "move-binary-format",
  "move-core-types",
  "move-stdlib-natives",
@@ -13288,7 +13567,7 @@ dependencies = [
  "better_any",
  "fastcrypto",
  "fastcrypto-zkp",
- "indexmap 2.2.6",
+ "indexmap 2.5.0",
  "move-binary-format",
  "move-core-types",
  "move-stdlib-natives-v2",
@@ -13332,7 +13611,7 @@ dependencies = [
  "telemetry-subscribers",
  "tempfile",
  "tokio",
- "tonic 0.11.0",
+ "tonic 0.12.2",
  "tonic-build",
  "tower",
  "tracing",
@@ -13340,14 +13619,14 @@ dependencies = [
 
 [[package]]
 name = "sui-node"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "anemo",
  "anemo-tower",
  "anyhow",
  "arc-swap",
- "axum",
- "base64 0.21.2",
+ "axum 0.7.5",
+ "base64 0.21.7",
  "bcs",
  "bin-version",
  "clap",
@@ -13359,10 +13638,12 @@ dependencies = [
  "mysten-common",
  "mysten-metrics",
  "mysten-network",
+ "mysten-service",
  "narwhal-network",
  "narwhal-worker",
+ "parking_lot 0.12.3",
  "prometheus",
- "reqwest 0.12.4",
+ "reqwest 0.12.7",
  "serde",
  "snap",
  "sui-archival",
@@ -13391,7 +13672,7 @@ dependencies = [
 
 [[package]]
 name = "sui-open-rpc"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "anyhow",
  "bcs",
@@ -13419,15 +13700,15 @@ version = "0.1.0"
 dependencies = [
  "derive-syn-parse",
  "itertools 0.10.5",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
  "unescape",
 ]
 
 [[package]]
 name = "sui-oracle"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "anyhow",
  "bcs",
@@ -13439,7 +13720,7 @@ dependencies = [
  "once_cell",
  "prometheus",
  "rand 0.8.5",
- "reqwest 0.12.4",
+ "reqwest 0.12.7",
  "serde",
  "serde_json",
  "shared-crypto",
@@ -13447,7 +13728,7 @@ dependencies = [
  "sui-json-rpc-types",
  "sui-keys",
  "sui-move-build",
- "sui-sdk 1.30.1",
+ "sui-sdk 1.32.3",
  "sui-types",
  "tap",
  "telemetry-subscribers",
@@ -13455,17 +13736,35 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "sui-package-dump"
+version = "1.32.3"
+dependencies = [
+ "anyhow",
+ "bcs",
+ "cynic",
+ "cynic-codegen",
+ "fastcrypto",
+ "move-core-types",
+ "reqwest 0.12.7",
+ "serde",
+ "serde_json",
+ "sui-types",
+ "tracing",
+]
+
 [[package]]
 name = "sui-package-management"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "anyhow",
  "move-core-types",
  "move-package",
  "move-symbol-pool",
  "sui-json-rpc-types",
- "sui-sdk 1.30.1",
+ "sui-sdk 1.32.3",
  "sui-types",
+ "thiserror",
  "tracing",
 ]
 
@@ -13476,9 +13775,9 @@ dependencies = [
  "async-trait",
  "bcs",
  "eyre",
- "hyper 0.14.26",
+ "hyper 1.4.1",
  "insta",
- "lru 0.10.0",
+ "lru 0.10.1",
  "move-binary-format",
  "move-command-line-common",
  "move-compiler",
@@ -13498,10 +13797,10 @@ name = "sui-proc-macros"
 version = "0.7.0"
 dependencies = [
  "msim-macros",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
  "sui-enum-compat-util",
- "syn 2.0.48",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -13513,7 +13812,7 @@ dependencies = [
  "move-vm-config",
  "schemars",
  "serde",
- "serde_with 3.8.1",
+ "serde_with 3.9.0",
  "sui-protocol-config-macros",
  "tracing",
 ]
@@ -13522,9 +13821,9 @@ dependencies = [
 name = "sui-protocol-config-macros"
 version = "0.1.0"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -13532,7 +13831,8 @@ name = "sui-proxy"
 version = "0.0.2"
 dependencies = [
  "anyhow",
- "axum",
+ "axum 0.7.5",
+ "axum-extra",
  "axum-server",
  "bin-version",
  "bytes",
@@ -13540,8 +13840,7 @@ dependencies = [
  "const-str",
  "fastcrypto",
  "hex",
- "http-body 0.4.5",
- "hyper 0.14.26",
+ "hyper 1.4.1",
  "ipnetwork",
  "itertools 0.10.5",
  "mime",
@@ -13549,17 +13848,17 @@ dependencies = [
  "mysten-metrics",
  "once_cell",
  "prometheus",
- "prost 0.12.3",
+ "prost 0.13.2",
  "prost-build",
  "protobuf",
  "rand 0.8.5",
- "reqwest 0.12.4",
- "rustls 0.21.12",
- "rustls-pemfile 1.0.2",
+ "reqwest 0.12.7",
+ "rustls 0.23.13",
+ "rustls-pemfile 2.1.3",
  "serde",
  "serde_json",
- "serde_with 3.8.1",
- "serde_yaml",
+ "serde_with 3.9.0",
+ "serde_yaml 0.8.26",
  "snap",
  "sui-tls",
  "sui-types",
@@ -13580,21 +13879,21 @@ dependencies = [
  "bcs",
  "clap",
  "futures",
- "http 0.2.9",
+ "http 1.1.0",
  "jsonrpsee",
- "lru 0.10.0",
+ "lru 0.10.1",
  "move-binary-format",
  "move-bytecode-utils",
  "move-core-types",
  "move-vm-config",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "prometheus",
  "rand 0.8.5",
  "regex",
  "serde",
  "serde_json",
- "serde_with 3.8.1",
- "serde_yaml",
+ "serde_with 3.9.0",
+ "serde_yaml 0.8.26",
  "shared-crypto",
  "shellexpand",
  "similar",
@@ -13606,7 +13905,7 @@ dependencies = [
  "sui-json-rpc-api",
  "sui-json-rpc-types",
  "sui-protocol-config",
- "sui-sdk 1.30.1",
+ "sui-sdk 1.32.3",
  "sui-storage",
  "sui-transaction-checks",
  "sui-types",
@@ -13614,7 +13913,7 @@ dependencies = [
  "tempfile",
  "thiserror",
  "tokio",
- "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.12",
  "tracing",
 ]
 
@@ -13624,9 +13923,9 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "axum",
+ "axum 0.7.5",
  "bcs",
- "diffy",
+ "diffy 0.3.0",
  "fastcrypto",
  "itertools 0.10.5",
  "mime",
@@ -13634,39 +13933,40 @@ dependencies = [
  "openapiv3",
  "prometheus",
  "rand 0.8.5",
- "reqwest 0.12.4",
+ "reqwest 0.12.7",
  "schemars",
  "serde",
  "serde_json",
- "serde_with 3.8.1",
- "serde_yaml",
+ "serde_with 3.9.0",
+ "serde_yaml 0.8.26",
  "sui-protocol-config",
  "sui-sdk 0.0.0",
  "sui-types",
  "tap",
  "thiserror",
  "tokio",
+ "url",
 ]
 
 [[package]]
 name = "sui-rosetta"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "anyhow",
  "async-trait",
- "axum",
+ "axum 0.7.5",
  "axum-extra",
  "bcs",
  "clap",
  "eyre",
  "fastcrypto",
  "futures",
- "hyper 0.14.26",
+ "hyper 1.4.1",
  "move-core-types",
  "mysten-metrics",
  "once_cell",
  "rand 0.8.5",
- "reqwest 0.12.4",
+ "reqwest 0.12.7",
  "serde",
  "serde_json",
  "shared-crypto",
@@ -13678,7 +13978,7 @@ dependencies = [
  "sui-keys",
  "sui-move-build",
  "sui-node",
- "sui-sdk 1.30.1",
+ "sui-sdk 1.32.3",
  "sui-swarm-config",
  "sui-types",
  "telemetry-subscribers",
@@ -13692,7 +13992,7 @@ dependencies = [
 
 [[package]]
 name = "sui-rpc-loadgen"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -13710,43 +14010,43 @@ dependencies = [
  "sui-json-rpc",
  "sui-json-rpc-types",
  "sui-keys",
- "sui-sdk 1.30.1",
+ "sui-sdk 1.32.3",
  "sui-types",
  "telemetry-subscribers",
  "test-cluster",
  "tokio",
- "tonic 0.11.0",
+ "tonic 0.12.2",
  "tracing",
 ]
 
 [[package]]
 name = "sui-sdk"
 version = "0.0.0"
-source = "git+https://github.com/mystenlabs/sui-rust-sdk.git?rev=9a125ed5764fb5bcc1acb6074064bc8f9ea85b38#9a125ed5764fb5bcc1acb6074064bc8f9ea85b38"
+source = "git+https://github.com/mystenlabs/sui-rust-sdk.git?rev=bd233b6879b917fb95e17f21927c198e7a60c924#bd233b6879b917fb95e17f21927c198e7a60c924"
 dependencies = [
  "base64ct",
  "bcs",
  "blake2",
  "bnum",
- "bs58 0.5.0",
+ "bs58 0.5.1",
  "hex",
  "roaring",
  "schemars",
  "serde",
  "serde_derive",
  "serde_json",
- "serde_with 3.8.1",
- "winnow 0.6.9",
+ "serde_with 3.9.0",
+ "winnow 0.6.18",
 ]
 
 [[package]]
 name = "sui-sdk"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "anyhow",
  "async-recursion",
  "async-trait",
- "base64 0.21.2",
+ "base64 0.21.7",
  "bcs",
  "clap",
  "colored",
@@ -13757,10 +14057,10 @@ dependencies = [
  "jsonrpsee",
  "move-core-types",
  "rand 0.8.5",
- "reqwest 0.12.4",
+ "reqwest 0.12.7",
  "serde",
  "serde_json",
- "serde_with 3.8.1",
+ "serde_with 3.9.0",
  "shared-crypto",
  "sui-config",
  "sui-json",
@@ -13777,7 +14077,7 @@ dependencies = [
 
 [[package]]
 name = "sui-security-watchdog"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "anyhow",
  "arrow-array",
@@ -13788,7 +14088,7 @@ dependencies = [
  "lexical-util",
  "mysten-metrics",
  "prometheus",
- "reqwest 0.12.4",
+ "reqwest 0.12.7",
  "serde",
  "serde_json",
  "snowflake-api",
@@ -13796,7 +14096,7 @@ dependencies = [
  "tokio",
  "tokio-cron-scheduler",
  "tracing",
- "uuid 1.2.2",
+ "uuid 1.10.0",
 ]
 
 [[package]]
@@ -13807,7 +14107,7 @@ dependencies = [
  "anemo-tower",
  "bcs",
  "fastcrypto",
- "lru 0.10.0",
+ "lru 0.10.1",
  "move-package",
  "msim",
  "narwhal-network",
@@ -13824,7 +14124,7 @@ dependencies = [
 
 [[package]]
 name = "sui-single-node-benchmark"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "async-trait",
  "bcs",
@@ -13835,6 +14135,7 @@ dependencies = [
  "move-bytecode-utils",
  "move-core-types",
  "move-package",
+ "move-symbol-pool",
  "once_cell",
  "prometheus",
  "serde",
@@ -13886,7 +14187,7 @@ dependencies = [
 
 [[package]]
 name = "sui-source-validation"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "anyhow",
  "colored",
@@ -13903,7 +14204,8 @@ dependencies = [
  "rand 0.8.5",
  "sui-json-rpc-types",
  "sui-move-build",
- "sui-sdk 1.30.1",
+ "sui-package-management",
+ "sui-sdk 1.32.3",
  "sui-test-transaction-builder",
  "sui-types",
  "tar",
@@ -13920,12 +14222,12 @@ name = "sui-source-validation-service"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "axum",
+ "axum 0.7.5",
  "bin-version",
  "clap",
  "expect-test",
  "fs_extra",
- "hyper 0.14.26",
+ "hyper 1.4.1",
  "jsonrpsee",
  "move-compiler",
  "move-core-types",
@@ -13933,19 +14235,19 @@ dependencies = [
  "move-symbol-pool",
  "mysten-metrics",
  "prometheus",
- "reqwest 0.12.4",
+ "reqwest 0.12.7",
  "serde",
  "sui",
  "sui-json-rpc-types",
  "sui-move",
  "sui-move-build",
- "sui-sdk 1.30.1",
+ "sui-sdk 1.32.3",
  "sui-source-validation",
  "telemetry-subscribers",
  "tempfile",
  "test-cluster",
  "tokio",
- "toml 0.7.4",
+ "toml 0.7.8",
  "tower",
  "tower-http",
  "tracing",
@@ -13958,6 +14260,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-trait",
+ "axum 0.7.5",
  "backoff",
  "base64-url",
  "bcs",
@@ -13969,12 +14272,12 @@ dependencies = [
  "eyre",
  "fastcrypto",
  "futures",
- "hyper 0.14.26",
- "hyper-rustls 0.24.0",
+ "hyper 1.4.1",
+ "hyper-rustls 0.27.3",
  "indicatif",
  "integer-encoding",
  "itertools 0.10.5",
- "lru 0.10.0",
+ "lru 0.10.1",
  "move-binary-format",
  "move-bytecode-utils",
  "move-core-types",
@@ -13983,12 +14286,11 @@ dependencies = [
  "num_enum 0.6.1",
  "object_store",
  "once_cell",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "percent-encoding",
  "pretty_assertions",
  "prometheus",
- "reqwest 0.12.4",
- "rocksdb",
+ "reqwest 0.12.7",
  "serde",
  "serde_json",
  "sui-config",
@@ -14004,20 +14306,19 @@ dependencies = [
  "tokio",
  "tracing",
  "typed-store",
- "typed-store-derive",
  "url",
- "zstd",
+ "zstd 0.12.4",
 ]
 
 [[package]]
 name = "sui-surfer"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "async-trait",
  "bcs",
  "clap",
  "futures",
- "indexmap 2.2.6",
+ "indexmap 2.5.0",
  "move-binary-format",
  "move-core-types",
  "move-package",
@@ -14076,8 +14377,8 @@ dependencies = [
  "prometheus",
  "rand 0.8.5",
  "serde",
- "serde_with 3.8.1",
- "serde_yaml",
+ "serde_with 3.9.0",
+ "serde_yaml 0.8.26",
  "shared-crypto",
  "sui-config",
  "sui-execution",
@@ -14094,7 +14395,7 @@ dependencies = [
 name = "sui-telemetry"
 version = "0.1.0"
 dependencies = [
- "reqwest 0.12.4",
+ "reqwest 0.12.7",
  "serde",
  "sui-core",
  "tracing",
@@ -14109,38 +14410,38 @@ dependencies = [
  "shared-crypto",
  "sui-genesis-builder",
  "sui-move-build",
- "sui-sdk 1.30.1",
+ "sui-sdk 1.32.3",
  "sui-types",
 ]
 
 [[package]]
 name = "sui-test-validator"
-version = "1.30.1"
+version = "1.32.3"
 
 [[package]]
 name = "sui-tls"
 version = "0.0.0"
 dependencies = [
  "anyhow",
- "axum",
+ "axum 0.7.5",
  "axum-server",
  "ed25519 1.5.3",
  "fastcrypto",
  "pkcs8 0.9.0",
  "rand 0.8.5",
- "rcgen 0.9.3",
- "reqwest 0.12.4",
- "rustls 0.21.12",
- "rustls-webpki 0.101.7",
+ "rcgen",
+ "reqwest 0.12.7",
+ "rustls 0.23.13",
+ "rustls-webpki 0.102.8",
  "tokio",
- "tokio-rustls 0.24.0",
+ "tokio-rustls 0.26.0",
  "tower-layer",
  "x509-parser",
 ]
 
 [[package]]
 name = "sui-tool"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "anemo",
  "anemo-cli",
@@ -14150,7 +14451,6 @@ dependencies = [
  "clap",
  "colored",
  "comfy-table",
- "diesel",
  "eyre",
  "fastcrypto",
  "futures",
@@ -14163,7 +14463,6 @@ dependencies = [
  "num_cpus",
  "object_store",
  "prometheus",
- "rocksdb",
  "ron",
  "serde",
  "serde_json",
@@ -14172,11 +14471,11 @@ dependencies = [
  "sui-archival",
  "sui-config",
  "sui-core",
- "sui-indexer",
  "sui-network",
+ "sui-package-dump",
  "sui-protocol-config",
  "sui-replay",
- "sui-sdk 1.30.1",
+ "sui-sdk 1.32.3",
  "sui-snapshot",
  "sui-storage",
  "sui-types",
@@ -14241,10 +14540,10 @@ dependencies = [
  "fastcrypto-tbls",
  "fastcrypto-zkp",
  "im",
- "indexmap 2.2.6",
+ "indexmap 2.5.0",
  "itertools 0.10.5",
  "jsonrpsee",
- "lru 0.10.0",
+ "lru 0.10.1",
  "move-binary-format",
  "move-bytecode-utils",
  "move-command-line-common",
@@ -14259,13 +14558,13 @@ dependencies = [
  "narwhal-config",
  "narwhal-crypto",
  "nonempty",
- "num-bigint 0.4.4",
+ "num-bigint 0.4.6",
  "num-traits",
  "num_enum 0.6.1",
  "odin",
  "once_cell",
  "p256",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "passkey-authenticator",
  "passkey-client",
  "passkey-types",
@@ -14278,8 +14577,8 @@ dependencies = [
  "serde",
  "serde-name",
  "serde_json",
- "serde_with 3.8.1",
- "serde_yaml",
+ "serde_with 3.9.0",
+ "serde_yaml 0.8.26",
  "shared-crypto",
  "signature 1.6.4",
  "static_assertions",
@@ -14292,7 +14591,7 @@ dependencies = [
  "tap",
  "thiserror",
  "tokio",
- "tonic 0.11.0",
+ "tonic 0.12.2",
  "tracing",
  "typed-store-error",
  "url",
@@ -14329,7 +14628,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "sui-verifier-v0"
+name = "sui-verifier-transactional-tests"
+version = "0.1.0"
+dependencies = [
+ "datatest-stable",
+]
+
+[[package]]
+name = "sui-verifier-v0"
 version = "0.1.0"
 dependencies = [
  "move-abstract-stack",
@@ -14374,7 +14680,7 @@ dependencies = [
 
 [[package]]
 name = "suins-indexer"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -14394,7 +14700,7 @@ dependencies = [
  "rand 0.8.5",
  "serde",
  "serde_json",
- "serde_yaml",
+ "serde_yaml 0.8.26",
  "sui-data-ingestion-core",
  "sui-json-rpc",
  "sui-storage",
@@ -14408,11 +14714,11 @@ dependencies = [
 
 [[package]]
 name = "suiop-cli"
-version = "0.2.5"
+version = "1.32.3"
 dependencies = [
  "anyhow",
- "axum",
- "base64 0.21.2",
+ "axum 0.7.5",
+ "base64 0.21.7",
  "chrono",
  "clap",
  "colored",
@@ -14425,27 +14731,27 @@ dependencies = [
  "prettytable-rs",
  "rand 0.8.5",
  "regex",
- "reqwest 0.12.4",
- "semver 1.0.16",
+ "reqwest 0.12.7",
+ "semver",
  "serde",
  "serde_json",
- "serde_yaml",
- "sha2 0.10.6",
+ "serde_yaml 0.8.26",
+ "sha2 0.10.8",
  "spinners",
  "strum 0.24.1",
  "tabled",
  "tempfile",
  "tokio",
- "toml_edit 0.19.10",
+ "toml_edit 0.19.15",
  "tracing",
  "tracing-subscriber",
 ]
 
 [[package]]
 name = "supports-color"
-version = "3.0.0"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9829b314621dfc575df4e409e79f9d6a66a3bd707ab73f23cb4aa3a854ac854f"
+checksum = "8775305acf21c96926c900ad056abeef436701108518cf890020387236ac5a77"
 dependencies = [
  "is_ci",
 ]
@@ -14462,23 +14768,43 @@ version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7401a30af6cb5818bb64852270bb722533397edcfc7344954a38f420819ece2"
 
+[[package]]
+name = "svm-rs"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11297baafe5fa0c99d5722458eac6a5e25c01eb1b8e5cd137f54079093daa7a4"
+dependencies = [
+ "dirs 5.0.1",
+ "fs2",
+ "hex",
+ "once_cell",
+ "reqwest 0.11.27",
+ "semver",
+ "serde",
+ "serde_json",
+ "sha2 0.10.8",
+ "thiserror",
+ "url",
+ "zip",
+]
+
 [[package]]
 name = "symbolic-common"
-version = "10.2.1"
+version = "12.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b55cdc318ede251d0957f07afe5fed912119b8c1bc5a7804151826db999e737"
+checksum = "9c1db5ac243c7d7f8439eb3b8f0357888b37cf3732957e91383b0ad61756374e"
 dependencies = [
  "debugid",
  "memmap2",
  "stable_deref_trait",
- "uuid 1.2.2",
+ "uuid 1.10.0",
 ]
 
 [[package]]
 name = "symbolic-demangle"
-version = "10.2.1"
+version = "12.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79be897be8a483a81fff6a3a4e195b4ac838ef73ca42d348b3f722da9902e489"
+checksum = "ea26e430c27d4a8a5dea4c4b81440606c7c1a415bd611451ef6af8c81416afc3"
 dependencies = [
  "cpp_demangle",
  "rustc-demangle",
@@ -14498,23 +14824,23 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.107"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
  "unicode-ident",
 ]
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
  "unicode-ident",
 ]
 
@@ -14524,16 +14850,25 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 
+[[package]]
+name = "sync_wrapper"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394"
+dependencies = [
+ "futures-core",
+]
+
 [[package]]
 name = "synstructure"
 version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
- "unicode-xid 0.2.4",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
+ "unicode-xid 0.2.5",
 ]
 
 [[package]]
@@ -14559,7 +14894,18 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation",
- "system-configuration-sys",
+ "system-configuration-sys 0.5.0",
+]
+
+[[package]]
+name = "system-configuration"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
+dependencies = [
+ "bitflags 2.6.0",
+ "core-foundation",
+ "system-configuration-sys 0.6.0",
 ]
 
 [[package]]
@@ -14572,6 +14918,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "system-configuration-sys"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
 [[package]]
 name = "tabled"
 version = "0.12.2"
@@ -14591,9 +14947,9 @@ checksum = "99f688a08b54f4f02f0a3c382aefdb7884d3d69609f785bd253dc033243e3fe4"
 dependencies = [
  "heck 0.4.1",
  "proc-macro-error",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -14637,14 +14993,15 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "target-spec"
-version = "1.4.0"
+version = "3.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf4306559bd50cb358e7af5692694d6f6fad95cf2c0bea2571dd419f5298e12"
+checksum = "4c5743abbf7bc7d5296ae61368b50cd218ac09432281cb5d48b97308d5c27909"
 dependencies = [
  "cfg-expr",
  "guppy-workspace-hack",
  "serde",
  "target-lexicon",
+ "unicode-ident",
 ]
 
 [[package]]
@@ -14676,15 +15033,15 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.8.0"
+version = "3.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
+checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
 dependencies = [
  "cfg-if",
- "fastrand 2.0.0",
- "redox_syscall 0.3.5",
- "rustix 0.38.34",
- "windows-sys 0.48.0",
+ "fastrand",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -14713,15 +15070,15 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
 dependencies = [
- "rustix 0.38.34",
+ "rustix",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "termtree"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8"
+checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
 [[package]]
 name = "test-cluster"
@@ -14747,7 +15104,7 @@ dependencies = [
  "sui-macros",
  "sui-node",
  "sui-protocol-config",
- "sui-sdk 1.30.1",
+ "sui-sdk 1.32.3",
  "sui-simulator",
  "sui-swarm",
  "sui-swarm-config",
@@ -14759,9 +15116,9 @@ dependencies = [
 
 [[package]]
 name = "test-fuzz"
-version = "3.0.5"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd4a3a7f00909d5a1d1f83b86b65d91e4c94f80b0c2d0ae37e2ef44da7b7a0a0"
+checksum = "857e884d611b1f26e63f00559975d348491e66b1271a8144a9806c9bd4a791cf"
 dependencies = [
  "serde",
  "test-fuzz-internal",
@@ -14771,40 +15128,40 @@ dependencies = [
 
 [[package]]
 name = "test-fuzz-internal"
-version = "3.0.5"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9186daca5c58cb307d09731e0ba06b13fd6c036c90672b9bfc31cecf76cf689"
+checksum = "48db3bbc562408b2111f3a0c96ec416ffa3ab66f8a6ab42579b608b9f74744e1"
 dependencies = [
  "cargo_metadata 0.15.4",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
  "serde",
  "strum_macros 0.24.3",
 ]
 
 [[package]]
 name = "test-fuzz-macro"
-version = "3.0.5"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d187b450bfb5b7939f82f9747dc1ebb15a7a9c4a93cd304a41aece7149608b"
+checksum = "e17cd05c077c7b9c5d0045c539f9c5e911187bf65cd1b407d28239efc7b54880"
 dependencies = [
- "darling 0.14.2",
+ "darling 0.20.10",
  "if_chain",
+ "itertools 0.10.5",
  "lazy_static",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
  "subprocess",
- "syn 1.0.107",
+ "syn 2.0.77",
  "test-fuzz-internal",
  "toolchain_find",
- "unzip-n",
 ]
 
 [[package]]
 name = "test-fuzz-runtime"
-version = "3.0.5"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a0d69068569b9b7311095823fe0e49eedfd05ad4277eb64fc334cf1a5bc5116"
+checksum = "53d68728ca22d1a96a71645fd2327e37821b8979a7e75e44ad24a72e8051513d"
 dependencies = [
  "bincode",
  "hex",
@@ -14827,30 +15184,31 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.56"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.56"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.4"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
+ "cfg-if",
  "once_cell",
 ]
 
@@ -14865,12 +15223,13 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.31"
+version = "0.3.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
  "deranged",
  "itoa",
+ "num-conv",
  "powerfmt",
  "serde",
  "time-core",
@@ -14885,10 +15244,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.16"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
 dependencies = [
+ "num-conv",
  "time-core",
 ]
 
@@ -14904,7 +15264,7 @@ dependencies = [
  "pbkdf2 0.11.0",
  "rand 0.8.5",
  "rustc-hash 1.1.0",
- "sha2 0.10.6",
+ "sha2 0.10.8",
  "thiserror",
  "unicode-normalization",
  "wasm-bindgen",
@@ -14932,37 +15292,36 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.6.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
 dependencies = [
  "tinyvec_macros",
 ]
 
 [[package]]
 name = "tinyvec_macros"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.36.0"
+version = "1.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
+checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
- "mio",
- "num_cpus",
- "parking_lot 0.12.1",
+ "mio 1.0.2",
+ "parking_lot 0.12.3",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.6",
- "tokio-macros 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "socket2 0.5.7",
+ "tokio-macros 2.4.0",
  "tracing",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -14977,7 +15336,7 @@ dependencies = [
  "num-traits",
  "tokio",
  "tracing",
- "uuid 1.2.2",
+ "uuid 1.10.0",
 ]
 
 [[package]]
@@ -14993,22 +15352,22 @@ dependencies = [
 [[package]]
 name = "tokio-macros"
 version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+source = "git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=e47aafebf98e9c1734a8848a1876d5946c44bdd1#e47aafebf98e9c1734a8848a1876d5946c44bdd1"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.2.0"
-source = "git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=e47aafebf98e9c1734a8848a1876d5946c44bdd1#e47aafebf98e9c1734a8848a1876d5946c44bdd1"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -15038,53 +15397,42 @@ version = "0.23.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
 dependencies = [
- "rustls 0.20.7",
+ "rustls 0.20.9",
  "tokio",
  "webpki",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.24.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5"
+checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
 dependencies = [
  "rustls 0.21.12",
  "tokio",
 ]
 
-[[package]]
-name = "tokio-rustls"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
-dependencies = [
- "rustls 0.22.4",
- "rustls-pki-types",
- "tokio",
-]
-
 [[package]]
 name = "tokio-rustls"
 version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
- "rustls 0.23.12",
+ "rustls 0.23.13",
  "rustls-pki-types",
  "tokio",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.14"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
 dependencies = [
  "futures-core",
  "pin-project-lite",
  "tokio",
- "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.12",
 ]
 
 [[package]]
@@ -15095,15 +15443,29 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
 dependencies = [
  "futures-util",
  "log",
+ "rustls 0.21.12",
  "tokio",
- "tungstenite",
+ "tokio-rustls 0.24.1",
+ "tungstenite 0.20.1",
+ "webpki-roots 0.25.4",
+]
+
+[[package]]
+name = "tokio-tungstenite"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38"
+dependencies = [
+ "futures-util",
+ "log",
+ "tokio",
+ "tungstenite 0.21.0",
 ]
 
 [[package]]
 name = "tokio-util"
 version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
+source = "git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=e47aafebf98e9c1734a8848a1876d5946c44bdd1#e47aafebf98e9c1734a8848a1876d5946c44bdd1"
 dependencies = [
  "bytes",
  "futures-core",
@@ -15112,14 +15474,16 @@ dependencies = [
  "futures-util",
  "hashbrown 0.14.5",
  "pin-project-lite",
- "tokio",
+ "real_tokio",
+ "slab",
  "tracing",
 ]
 
 [[package]]
 name = "tokio-util"
-version = "0.7.10"
-source = "git+https://github.com/mystenmark/tokio-madsim-fork.git?rev=e47aafebf98e9c1734a8848a1876d5946c44bdd1#e47aafebf98e9c1734a8848a1876d5946c44bdd1"
+version = "0.7.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
 dependencies = [
  "bytes",
  "futures-core",
@@ -15128,9 +15492,7 @@ dependencies = [
  "futures-util",
  "hashbrown 0.14.5",
  "pin-project-lite",
- "real_tokio",
- "slab",
- "tracing",
+ "tokio",
 ]
 
 [[package]]
@@ -15145,15 +15507,27 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.7.4"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec"
+checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
+dependencies = [
+ "indexmap 2.5.0",
+ "serde",
+ "serde_spanned",
+ "toml_datetime 0.6.8",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
 dependencies = [
- "indexmap 1.9.3",
  "serde",
  "serde_spanned",
- "toml_datetime 0.6.2",
- "toml_edit 0.19.10",
+ "toml_datetime 0.6.8",
+ "toml_edit 0.22.20",
 ]
 
 [[package]]
@@ -15164,9 +15538,9 @@ checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5"
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.2"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 dependencies = [
  "serde",
 ]
@@ -15197,15 +15571,28 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.19.10"
+version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 1.9.3",
+ "indexmap 2.5.0",
  "serde",
  "serde_spanned",
- "toml_datetime 0.6.2",
- "winnow 0.4.6",
+ "toml_datetime 0.6.8",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+dependencies = [
+ "indexmap 2.5.0",
+ "serde",
+ "serde_spanned",
+ "toml_datetime 0.6.8",
+ "winnow 0.6.18",
 ]
 
 [[package]]
@@ -15215,16 +15602,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a"
 dependencies = [
  "async-trait",
- "axum",
- "base64 0.21.2",
+ "axum 0.6.20",
+ "base64 0.21.7",
  "bytes",
  "futures-core",
  "futures-util",
  "h2 0.3.26",
- "http 0.2.9",
- "http-body 0.4.5",
- "hyper 0.14.26",
- "hyper-timeout",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "hyper 0.14.30",
+ "hyper-timeout 0.4.1",
  "percent-encoding",
  "pin-project",
  "prost 0.11.9",
@@ -15238,23 +15625,23 @@ dependencies = [
 
 [[package]]
 name = "tonic"
-version = "0.10.0"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5469afaf78a11265c343a88969045c1568aa8ecc6c787dbf756e92e70f199861"
+checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e"
 dependencies = [
  "async-stream",
  "async-trait",
- "axum",
- "base64 0.21.2",
+ "axum 0.6.20",
+ "base64 0.21.7",
  "bytes",
  "h2 0.3.26",
- "http 0.2.9",
- "http-body 0.4.5",
- "hyper 0.14.26",
- "hyper-timeout",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "hyper 0.14.30",
+ "hyper-timeout 0.4.1",
  "percent-encoding",
  "pin-project",
- "prost 0.12.3",
+ "prost 0.12.6",
  "tokio",
  "tokio-stream",
  "tower",
@@ -15265,23 +15652,26 @@ dependencies = [
 
 [[package]]
 name = "tonic"
-version = "0.11.0"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13"
+checksum = "c6f6ba989e4b2c58ae83d862d3a3e27690b6e3ae630d0deb59f3697f32aa88ad"
 dependencies = [
  "async-stream",
  "async-trait",
- "axum",
- "base64 0.21.2",
+ "axum 0.7.5",
+ "base64 0.22.1",
  "bytes",
- "h2 0.3.26",
- "http 0.2.9",
- "http-body 0.4.5",
- "hyper 0.14.26",
- "hyper-timeout",
+ "h2 0.4.6",
+ "http 1.1.0",
+ "http-body 1.0.1",
+ "http-body-util",
+ "hyper 1.4.1",
+ "hyper-timeout 0.5.1",
+ "hyper-util",
  "percent-encoding",
  "pin-project",
- "prost 0.12.3",
+ "prost 0.13.2",
+ "socket2 0.5.7",
  "tokio",
  "tokio-stream",
  "tower",
@@ -15292,40 +15682,40 @@ dependencies = [
 
 [[package]]
 name = "tonic-build"
-version = "0.11.0"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4ef6dd70a610078cb4e338a0f79d06bc759ff1b22d2120c2ff02ae264ba9c2"
+checksum = "fe4ee8877250136bd7e3d2331632810a4df4ea5e004656990d8d66d2f5ee8a67"
 dependencies = [
- "prettyplease 0.2.17",
- "proc-macro2 1.0.78",
+ "prettyplease",
+ "proc-macro2 1.0.86",
  "prost-build",
- "quote 1.0.35",
- "syn 2.0.48",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "tonic-health"
-version = "0.11.0"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cef6e24bc96871001a7e48e820ab240b3de2201e59b517cf52835df2f1d2350"
+checksum = "ec0a34e6f706bae26b2b490e1da5c3f6a6ff87cae442bcbc7c881bab9631b5a7"
 dependencies = [
  "async-stream",
- "prost 0.12.3",
+ "prost 0.13.2",
  "tokio",
  "tokio-stream",
- "tonic 0.11.0",
+ "tonic 0.12.2",
 ]
 
 [[package]]
 name = "toolchain_find"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e85654a10e7a07a47c6f19d93818f3f343e22927f2fa280c84f7c8042743413"
+checksum = "fa8c746c4e8d786ff304a6a73d7b406420d9a7c7d8292e090979dc85213113ed"
 dependencies = [
  "home",
- "lazy_static",
+ "once_cell",
  "regex",
- "semver 0.11.0",
+ "semver",
  "walkdir",
 ]
 
@@ -15344,7 +15734,7 @@ dependencies = [
  "rand 0.8.5",
  "slab",
  "tokio",
- "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.12",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -15352,18 +15742,19 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.3.5"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858"
+checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
 dependencies = [
- "async-compression 0.3.15",
- "base64 0.13.1",
- "bitflags 1.3.2",
+ "async-compression",
+ "base64 0.21.7",
+ "bitflags 2.6.0",
  "bytes",
  "futures-core",
  "futures-util",
- "http 0.2.9",
- "http-body 0.4.5",
+ "http 1.1.0",
+ "http-body 1.0.1",
+ "http-body-util",
  "http-range-header",
  "httpdate",
  "iri-string",
@@ -15372,25 +15763,25 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "tokio",
- "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-util 0.7.12",
  "tower",
  "tower-layer",
  "tower-service",
  "tracing",
- "uuid 1.2.2",
+ "uuid 1.10.0",
 ]
 
 [[package]]
 name = "tower-layer"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
 
 [[package]]
 name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
@@ -15406,11 +15797,12 @@ dependencies = [
 
 [[package]]
 name = "tracing-appender"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e"
+checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf"
 dependencies = [
  "crossbeam-channel",
+ "thiserror",
  "time",
  "tracing-subscriber",
 ]
@@ -15421,9 +15813,9 @@ version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
@@ -15458,12 +15850,23 @@ dependencies = [
 
 [[package]]
 name = "tracing-log"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
 dependencies = [
- "lazy_static",
  "log",
+ "once_cell",
  "tracing-core",
 ]
 
@@ -15479,7 +15882,7 @@ dependencies = [
  "smallvec",
  "tracing",
  "tracing-core",
- "tracing-log",
+ "tracing-log 0.1.4",
  "tracing-subscriber",
 ]
 
@@ -15495,12 +15898,12 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
 dependencies = [
  "matchers",
- "nu-ansi-term",
+ "nu-ansi-term 0.46.0",
  "once_cell",
  "regex",
  "serde",
@@ -15511,7 +15914,7 @@ dependencies = [
  "time",
  "tracing",
  "tracing-core",
- "tracing-log",
+ "tracing-log 0.2.0",
  "tracing-serde",
 ]
 
@@ -15521,9 +15924,9 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b79e2e9c9ab44c6d7c20d5976961b47e8f49ac199154daa514b77cd1ab536625"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -15557,9 +15960,9 @@ checksum = "859eb650cfee7434994602c3a68b25d77ad9e68c8a6cd491616ef86661382eb3"
 
 [[package]]
 name = "try-lock"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "tryhard"
@@ -15603,7 +16006,27 @@ dependencies = [
  "byteorder",
  "bytes",
  "data-encoding",
- "http 0.2.9",
+ "http 0.2.12",
+ "httparse",
+ "log",
+ "rand 0.8.5",
+ "rustls 0.21.12",
+ "sha1",
+ "thiserror",
+ "url",
+ "utf-8",
+]
+
+[[package]]
+name = "tungstenite"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1"
+dependencies = [
+ "byteorder",
+ "bytes",
+ "data-encoding",
+ "http 1.1.0",
  "httparse",
  "log",
  "rand 0.8.5",
@@ -15638,16 +16061,16 @@ dependencies = [
  "itertools 0.10.5",
  "msim",
  "once_cell",
- "ouroboros",
- "proc-macro2 1.0.78",
+ "ouroboros 0.17.2",
+ "proc-macro2 1.0.86",
  "prometheus",
- "quote 1.0.35",
+ "quote 1.0.37",
  "rand 0.8.5",
  "rocksdb",
  "rstest",
  "serde",
  "sui-macros",
- "syn 1.0.107",
+ "syn 1.0.109",
  "tap",
  "tempfile",
  "thiserror",
@@ -15655,6 +16078,7 @@ dependencies = [
  "tracing",
  "typed-store-derive",
  "typed-store-error",
+ "typed-store-workspace-hack",
  "uint",
 ]
 
@@ -15662,15 +16086,10 @@ dependencies = [
 name = "typed-store-derive"
 version = "0.3.0"
 dependencies = [
- "eyre",
  "itertools 0.10.5",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "rocksdb",
- "syn 1.0.107",
- "tempfile",
- "tokio",
- "typed-store",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -15681,11 +16100,28 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "typed-store-workspace-hack"
+version = "0.0.0"
+dependencies = [
+ "cc",
+ "lazy_static",
+ "libc",
+ "memchr",
+ "nom",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "regex",
+ "regex-syntax 0.7.5",
+ "syn 2.0.77",
+ "zstd-sys",
+]
+
 [[package]]
 name = "typenum"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "typeshare"
@@ -15705,15 +16141,15 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a615d6c2764852a2e88a4f16e9ce1ea49bb776b5872956309e170d63a042a34f"
 dependencies = [
- "quote 1.0.35",
- "syn 2.0.48",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
+checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
 
 [[package]]
 name = "uint"
@@ -15741,9 +16177,9 @@ checksum = "ccb97dac3243214f8d8507998906ca3e2e0b900bf9bf4870477f125b82e68f6e"
 
 [[package]]
 name = "unicase"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
+checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
 dependencies = [
  "version_check",
 ]
@@ -15756,9 +16192,9 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.6"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unicode-linebreak"
@@ -15768,24 +16204,24 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.11"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
 
 [[package]]
 name = "unicode-xid"
@@ -15795,9 +16231,9 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a"
 
 [[package]]
 name = "universal-hash"
@@ -15809,11 +16245,17 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861"
+
 [[package]]
 name = "unsigned-varint"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d86a8dc7f45e4c1b0d30e43038c38f274e77af056aa5f74b93c2cf9eb3c1c836"
+checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105"
 
 [[package]]
 name = "untrusted"
@@ -15827,17 +16269,6 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
-[[package]]
-name = "unzip-n"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2e7e85a0596447f0f2ac090e16bc4c516c6fe91771fb0c0ccf7fa3dae896b9c"
-dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
-]
-
 [[package]]
 name = "ureq"
 version = "2.10.1"
@@ -15848,29 +16279,29 @@ dependencies = [
  "flate2",
  "log",
  "once_cell",
- "rustls 0.23.12",
+ "rustls 0.23.13",
  "rustls-pki-types",
  "url",
- "webpki-roots 0.26.3",
+ "webpki-roots 0.26.5",
 ]
 
 [[package]]
 name = "url"
-version = "2.3.1"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
 dependencies = [
  "form_urlencoded",
- "idna 0.3.0",
+ "idna",
  "percent-encoding",
  "serde",
 ]
 
 [[package]]
 name = "urlencoding"
-version = "2.1.2"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9"
+checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
 
 [[package]]
 name = "utf-8"
@@ -15880,9 +16311,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
 [[package]]
 name = "utf8parse"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
@@ -15896,9 +16327,9 @@ dependencies = [
 
 [[package]]
 name = "uuid"
-version = "1.2.2"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c"
+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
 dependencies = [
  "getrandom 0.2.15",
  "rand 0.8.5",
@@ -15916,8 +16347,8 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aae2faf80ac463422992abf4de234731279c058aaf33171ca70277c98406b124"
 dependencies = [
- "quote 1.0.35",
- "syn 1.0.107",
+ "quote 1.0.37",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -15928,9 +16359,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "versions"
@@ -15971,8 +16402,8 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
 ]
 
 [[package]]
@@ -15984,30 +16415,22 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "waker-fn"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
-
 [[package]]
 name = "walkdir"
-version = "2.3.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 dependencies = [
  "same-file",
- "winapi",
  "winapi-util",
 ]
 
 [[package]]
 name = "want"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
 dependencies = [
- "log",
  "try-lock",
 ]
 
@@ -16031,34 +16454,35 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.87"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
 dependencies = [
  "cfg-if",
+ "once_cell",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.87"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.37"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
+checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -16068,32 +16492,32 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.87"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
 dependencies = [
- "quote 1.0.35",
+ "quote 1.0.37",
  "wasm-bindgen-macro-support",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.87"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.87"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
 
 [[package]]
 name = "wasm-streams"
@@ -16125,9 +16549,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.64"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
+checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -16135,12 +16559,12 @@ dependencies = [
 
 [[package]]
 name = "webpki"
-version = "0.22.0"
+version = "0.22.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
+checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53"
 dependencies = [
- "ring 0.16.20",
- "untrusted 0.7.1",
+ "ring 0.17.8",
+ "untrusted 0.9.0",
 ]
 
 [[package]]
@@ -16154,40 +16578,26 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.23.1"
+version = "0.25.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338"
-dependencies = [
- "rustls-webpki 0.100.3",
-]
+checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.3"
+version = "0.26.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd"
+checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a"
 dependencies = [
  "rustls-pki-types",
 ]
 
-[[package]]
-name = "which"
-version = "4.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b"
-dependencies = [
- "either",
- "libc",
- "once_cell",
-]
-
 [[package]]
 name = "whoami"
-version = "1.5.0"
+version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fec781d48b41f8163426ed18e8fc2864c12937df9ce54c88ede7bd47270893e"
+checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
 dependencies = [
- "redox_syscall 0.4.1",
+ "redox_syscall 0.5.4",
  "wasite",
  "web-sys",
 ]
@@ -16216,11 +16626,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "winapi",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -16230,27 +16640,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
-name = "windows-sys"
-version = "0.42.0"
+name = "windows-core"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
-name = "windows-sys"
-version = "0.45.0"
+name = "windows-registry"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+dependencies = [
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
 dependencies = [
- "windows-targets 0.42.2",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
+dependencies = [
+ "windows-result",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -16259,7 +16684,7 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets 0.48.0",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -16268,194 +16693,153 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.0",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
-name = "windows-targets"
-version = "0.42.2"
+name = "windows-sys"
+version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.0",
- "windows_aarch64_msvc 0.48.0",
- "windows_i686_gnu 0.48.0",
- "windows_i686_msvc 0.48.0",
- "windows_x86_64_gnu 0.48.0",
- "windows_x86_64_gnullvm 0.48.0",
- "windows_x86_64_msvc 0.48.0",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.0",
- "windows_aarch64_msvc 0.52.0",
- "windows_i686_gnu 0.52.0",
- "windows_i686_msvc 0.52.0",
- "windows_x86_64_gnu 0.52.0",
- "windows_x86_64_gnullvm 0.52.0",
- "windows_x86_64_msvc 0.52.0",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.2"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
+name = "windows_i686_gnullvm"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.2"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.2"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.2"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.4.6"
+version = "0.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "winnow"
-version = "0.6.9"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86c949fede1d13936a99f14fafd3e76fd642b556dd2ce96287fbe2e0151bfac6"
+checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
 dependencies = [
  "memchr",
 ]
@@ -16470,16 +16854,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "winreg"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "ws_stream_wasm"
 version = "0.7.4"
@@ -16516,7 +16890,7 @@ dependencies = [
 
 [[package]]
 name = "x"
-version = "1.30.1"
+version = "1.32.3"
 dependencies = [
  "anyhow",
  "camino",
@@ -16550,21 +16924,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
 dependencies = [
  "libc",
- "linux-raw-sys 0.4.12",
- "rustix 0.38.34",
+ "linux-raw-sys",
+ "rustix",
 ]
 
 [[package]]
 name = "xml-rs"
-version = "0.8.21"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601"
+checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26"
 
 [[package]]
 name = "xmlparser"
-version = "0.13.5"
+version = "0.13.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd"
+checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
 
 [[package]]
 name = "yaml-rust"
@@ -16581,6 +16955,12 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
 
+[[package]]
+name = "yansi"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+
 [[package]]
 name = "yasna"
 version = "0.5.2"
@@ -16588,7 +16968,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd"
 dependencies = [
  "bit-vec",
- "num-bigint 0.4.4",
+ "num-bigint 0.4.6",
  "time",
 ]
 
@@ -16598,6 +16978,7 @@ version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
+ "byteorder",
  "zerocopy-derive",
 ]
 
@@ -16607,51 +16988,107 @@ version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 2.0.48",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.7.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 dependencies = [
  "zeroize_derive",
 ]
 
 [[package]]
 name = "zeroize_derive"
-version = "1.3.3"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44bf07cb3e50ea2003396695d58bf46bc9887a1f362260446fad6bc4e79bd36c"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
- "proc-macro2 1.0.78",
- "quote 1.0.35",
- "syn 1.0.107",
- "synstructure",
+ "proc-macro2 1.0.86",
+ "quote 1.0.37",
+ "syn 2.0.77",
+]
+
+[[package]]
+name = "zip"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261"
+dependencies = [
+ "aes",
+ "byteorder",
+ "bzip2",
+ "constant_time_eq 0.1.5",
+ "crc32fast",
+ "crossbeam-utils",
+ "flate2",
+ "hmac 0.12.1",
+ "pbkdf2 0.11.0",
+ "sha1",
+ "time",
+ "zstd 0.11.2+zstd.1.5.2",
+]
+
+[[package]]
+name = "zstd"
+version = "0.11.2+zstd.1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
+dependencies = [
+ "zstd-safe 5.0.2+zstd.1.5.2",
 ]
 
 [[package]]
 name = "zstd"
-version = "0.12.3+zstd.1.5.2"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806"
+checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c"
 dependencies = [
- "zstd-safe",
+ "zstd-safe 6.0.6",
+]
+
+[[package]]
+name = "zstd"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9"
+dependencies = [
+ "zstd-safe 7.2.1",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "6.0.5+zstd.1.5.4"
+version = "5.0.2+zstd.1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b"
+checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
 dependencies = [
  "libc",
  "zstd-sys",
 ]
 
+[[package]]
+name = "zstd-safe"
+version = "6.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581"
+dependencies = [
+ "libc",
+ "zstd-sys",
+]
+
+[[package]]
+name = "zstd-safe"
+version = "7.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059"
+dependencies = [
+ "zstd-sys",
+]
+
 [[package]]
 name = "zstd-sys"
 version = "2.0.12+zstd.1.5.6"
diff --git a/Cargo.toml b/Cargo.toml
index 6c02cfcd7dfcc..3256120421a86 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,203 +2,206 @@
 resolver = "2"
 
 exclude = [
-  "examples/tic-tac-toe/cli",
-  "external-crates/move/crates/bytecode-interpreter-crypto",
-  "external-crates/move/crates/bytecode-verifier-libfuzzer",
-  "external-crates/move/crates/bytecode-verifier-tests",
-  "external-crates/move/crates/bytecode-verifier-prop-tests",
-  "external-crates/move/crates/bytecode-verifier-transactional-tests",
-  "external-crates/move/crates/enum-compat-util",
-  "external-crates/move/crates/invalid-mutations",
-  "external-crates/move/crates/language-benchmarks",
-  "external-crates/move/crates/module-generation",
-  "external-crates/move/crates/move-abstract-interpreter",
-  "external-crates/move/crates/move-abstract-stack",
-  "external-crates/move/crates/move-analyzer",
-  "external-crates/move/crates/move-binary-format",
-  "external-crates/move/crates/move-borrow-graph",
-  "external-crates/move/crates/move-bytecode-source-map",
-  "external-crates/move/crates/move-bytecode-utils",
-  "external-crates/move/crates/move-bytecode-verifier",
-  "external-crates/move/crates/move-bytecode-verifier-meter",
-  "external-crates/move/crates/move-bytecode-viewer",
-  "external-crates/move/crates/move-cli",
-  "external-crates/move/crates/move-command-line-common",
-  "external-crates/move/crates/move-compiler",
-  "external-crates/move/crates/move-compiler-transactional-tests",
-  "external-crates/move/crates/move-core-types",
-  "external-crates/move/crates/move-coverage",
-  "external-crates/move/crates/move-disassembler",
-  "external-crates/move/crates/move-docgen",
-  "external-crates/move/crates/move-ir-compiler",
-  "external-crates/move/crates/move-ir-compiler-transactional-tests",
-  "external-crates/move/crates/move-ir-to-bytecode",
-  "external-crates/move/crates/move-ir-to-bytecode-syntax",
-  "external-crates/move/crates/move-ir-types",
-  "external-crates/move/crates/move-model",
-  "external-crates/move/crates/move-package",
-  "external-crates/move/crates/move-proc-macros",
-  "external-crates/move/crates/move-prover",
-  "external-crates/move/crates/move-prover-test-utils",
-  "external-crates/move/crates/move-stackless-bytecode",
-  "external-crates/move/crates/move-stdlib",
-  "external-crates/move/crates/move-stdlib-natives",
-  "external-crates/move/crates/move-symbol-pool",
-  "external-crates/move/crates/move-transactional-test-runner",
-  "external-crates/move/crates/move-unit-test",
-  "external-crates/move/crates/move-vm-config",
-  "external-crates/move/crates/move-vm-integration-tests",
-  "external-crates/move/crates/move-vm-profiler",
-  "external-crates/move/crates/move-vm-runtime",
-  "external-crates/move/crates/move-vm-test-utils",
-  "external-crates/move/crates/move-vm-transactional-tests",
-  "external-crates/move/crates/move-vm-types",
-  "external-crates/move/crates/serializer-tests",
-  "external-crates/move/crates/test-generation",
-  "external-crates/move/move-execution/v0/crates/move-bytecode-verifier",
-  "external-crates/move/move-execution/v0/crates/move-stdlib-natives",
-  "external-crates/move/move-execution/v0/crates/move-vm-runtime",
-  "external-crates/move/move-execution/v1/crates/move-bytecode-verifier",
-  "external-crates/move/move-execution/v1/crates/move-stdlib-natives",
-  "external-crates/move/move-execution/v1/crates/move-vm-runtime",
-  "external-crates/move/move-execution/v2/crates/move-abstract-interpreter",
-  "external-crates/move/move-execution/v2/crates/move-bytecode-verifier",
-  "external-crates/move/move-execution/v2/crates/move-stdlib-natives",
-  "external-crates/move/move-execution/v2/crates/move-vm-runtime",
-  "sdk/move-bytecode-template",
+    "examples/tic-tac-toe/cli",
+    "external-crates/move/crates/bytecode-interpreter-crypto",
+    "external-crates/move/crates/bytecode-verifier-libfuzzer",
+    "external-crates/move/crates/bytecode-verifier-tests",
+    "external-crates/move/crates/bytecode-verifier-prop-tests",
+    "external-crates/move/crates/bytecode-verifier-transactional-tests",
+    "external-crates/move/crates/enum-compat-util",
+    "external-crates/move/crates/invalid-mutations",
+    "external-crates/move/crates/language-benchmarks",
+    "external-crates/move/crates/module-generation",
+    "external-crates/move/crates/move-abstract-interpreter",
+    "external-crates/move/crates/move-abstract-stack",
+    "external-crates/move/crates/move-analyzer",
+    "external-crates/move/crates/move-binary-format",
+    "external-crates/move/crates/move-borrow-graph",
+    "external-crates/move/crates/move-bytecode-source-map",
+    "external-crates/move/crates/move-bytecode-utils",
+    "external-crates/move/crates/move-bytecode-verifier",
+    "external-crates/move/crates/move-bytecode-verifier-meter",
+    "external-crates/move/crates/move-bytecode-viewer",
+    "external-crates/move/crates/move-cli",
+    "external-crates/move/crates/move-command-line-common",
+    "external-crates/move/crates/move-compiler",
+    "external-crates/move/crates/move-compiler-transactional-tests",
+    "external-crates/move/crates/move-core-types",
+    "external-crates/move/crates/move-coverage",
+    "external-crates/move/crates/move-disassembler",
+    "external-crates/move/crates/move-docgen",
+    "external-crates/move/crates/move-ir-compiler",
+    "external-crates/move/crates/move-ir-compiler-transactional-tests",
+    "external-crates/move/crates/move-ir-to-bytecode",
+    "external-crates/move/crates/move-ir-to-bytecode-syntax",
+    "external-crates/move/crates/move-ir-types",
+    "external-crates/move/crates/move-model",
+    "external-crates/move/crates/move-package",
+    "external-crates/move/crates/move-proc-macros",
+    "external-crates/move/crates/move-prover",
+    "external-crates/move/crates/move-prover-test-utils",
+    "external-crates/move/crates/move-stackless-bytecode",
+    "external-crates/move/crates/move-stdlib",
+    "external-crates/move/crates/move-stdlib-natives",
+    "external-crates/move/crates/move-symbol-pool",
+    "external-crates/move/crates/move-transactional-test-runner",
+    "external-crates/move/crates/move-unit-test",
+    "external-crates/move/crates/move-vm-config",
+    "external-crates/move/crates/move-vm-integration-tests",
+    "external-crates/move/crates/move-vm-profiler",
+    "external-crates/move/crates/move-vm-runtime",
+    "external-crates/move/crates/move-vm-test-utils",
+    "external-crates/move/crates/move-vm-transactional-tests",
+    "external-crates/move/crates/move-vm-types",
+    "external-crates/move/crates/serializer-tests",
+    "external-crates/move/crates/test-generation",
+    "external-crates/move/move-execution/v0/crates/move-bytecode-verifier",
+    "external-crates/move/move-execution/v0/crates/move-stdlib-natives",
+    "external-crates/move/move-execution/v0/crates/move-vm-runtime",
+    "external-crates/move/move-execution/v1/crates/move-bytecode-verifier",
+    "external-crates/move/move-execution/v1/crates/move-stdlib-natives",
+    "external-crates/move/move-execution/v1/crates/move-vm-runtime",
+    "external-crates/move/move-execution/v2/crates/move-abstract-interpreter",
+    "external-crates/move/move-execution/v2/crates/move-bytecode-verifier",
+    "external-crates/move/move-execution/v2/crates/move-stdlib-natives",
+    "external-crates/move/move-execution/v2/crates/move-vm-runtime",
+    "sdk/move-bytecode-template",
 ]
 
 members = [
-  "consensus/config",
-  "consensus/core",
-  "crates/anemo-benchmark",
-  "crates/bin-version",
-  "crates/mysten-common",
-  "crates/mysten-metrics",
-  "crates/mysten-network",
-  "crates/mysten-service",
-  "crates/mysten-util-mem",
-  "crates/mysten-util-mem-derive",
-  "crates/prometheus-closure-metric",
-  "crates/shared-crypto",
-  "crates/simulacrum",
-  "crates/sui",
-  # "crates/sui-adapter-transactional-tests",
-  # "crates/sui-analytics-indexer",
-  # "crates/sui-analytics-indexer-derive",
-  "crates/sui-archival",
-  "crates/sui-authority-aggregation",
-  "crates/sui-aws-orchestrator",
-  "crates/sui-benchmark",
-  "crates/sui-bridge",
-  "crates/sui-bridge-cli",
-  "crates/sui-bridge-indexer",
-  # "crates/sui-cluster-test",
-  "crates/sui-config",
-  "crates/sui-core",
-  "crates/sui-cost",
-  "crates/sui-data-ingestion",
-  "crates/sui-data-ingestion-core",
-  "crates/sui-e2e-tests",
-  "crates/sui-enum-compat-util",
-  "crates/sui-faucet",
-  "crates/sui-framework",
-  "crates/sui-framework-snapshot",
-  "crates/sui-framework-tests",
-  "crates/sui-genesis-builder",
-  # "crates/sui-graphql-config",
-  # "crates/sui-graphql-e2e-tests",
-  # "crates/sui-graphql-rpc",
-  # "crates/sui-graphql-rpc-client",
-  # "crates/sui-graphql-rpc-headers",
-  "crates/sui-indexer",
-  "crates/sui-json",
-  "crates/sui-json-rpc",
-  "crates/sui-json-rpc-api",
-  "crates/sui-json-rpc-tests",
-  "crates/sui-json-rpc-types",
-  "crates/sui-keys",
-  "crates/sui-light-client",
-  "crates/sui-macros",
-  # "crates/sui-metric-checker",
-  "crates/sui-move",
-  "crates/sui-move-build",
-  "crates/sui-move-lsp",
-  "crates/sui-network",
-  "crates/sui-node",
-  "crates/sui-open-rpc",
-  "crates/sui-open-rpc-macros",
-  "crates/sui-oracle",
-  "crates/sui-package-management",
-  "crates/sui-package-resolver",
-  "crates/sui-proc-macros",
-  "crates/sui-protocol-config",
-  "crates/sui-protocol-config-macros",
-  "crates/sui-proxy",
-  "crates/sui-replay",
-  "crates/sui-rest-api",
-  "crates/sui-rosetta",
-  "crates/sui-rpc-loadgen",
-  "crates/sui-sdk",
-  "crates/sui-security-watchdog",
-  "crates/sui-simulator",
-  "crates/sui-single-node-benchmark",
-  "crates/sui-snapshot",
-  "crates/sui-source-validation",
-  "crates/sui-source-validation-service",
-  "crates/sui-storage",
-  "crates/sui-surfer",
-  "crates/sui-swarm",
-  "crates/sui-swarm-config",
-  "crates/sui-telemetry",
-  "crates/sui-test-transaction-builder",
-  "crates/sui-test-validator",
-  "crates/sui-tls",
-  "crates/sui-tool",
-  "crates/sui-transaction-builder",
-  "crates/sui-transaction-checks",
-  # "crates/sui-transactional-test-runner",
-  "crates/sui-types",
-  "crates/sui-upgrade-compatibility-transactional-tests",
-  # "crates/sui-verifier-transactional-tests",
-  "crates/suins-indexer",
-  "crates/suiop-cli",
-  "crates/telemetry-subscribers",
-  "crates/test-cluster",
-  "crates/transaction-fuzzer",
-  "crates/typed-store",
-  "crates/typed-store-derive",
-  "crates/typed-store-error",
-  "crates/x",
-  "narwhal/config",
-  "narwhal/crypto",
-  "narwhal/executor",
-  "narwhal/network",
-  "narwhal/node",
-  "narwhal/primary",
-  "narwhal/storage",
-  "narwhal/test-utils",
-  "narwhal/types",
-  "narwhal/worker",
-  "sui-execution",
-  "sui-execution/cut",
-  "sui-execution/latest/sui-adapter",
-  "sui-execution/latest/sui-move-natives",
-  "sui-execution/latest/sui-verifier",
-  "sui-execution/v0/sui-adapter",
-  "sui-execution/v0/sui-move-natives",
-  "sui-execution/v0/sui-verifier",
-  "sui-execution/v1/sui-adapter",
-  "sui-execution/v1/sui-move-natives",
-  "sui-execution/v1/sui-verifier",
-  "sui-execution/v2/sui-adapter",
-  "sui-execution/v2/sui-move-natives",
-  "sui-execution/v2/sui-verifier",
+    "consensus/config",
+    "consensus/core",
+    "crates/anemo-benchmark",
+    "crates/bin-version",
+    "crates/mysten-common",
+    "crates/mysten-metrics",
+    "crates/mysten-network",
+    "crates/mysten-service",
+    "crates/mysten-util-mem",
+    "crates/mysten-util-mem-derive",
+    "crates/prometheus-closure-metric",
+    "crates/shared-crypto",
+    "crates/simulacrum",
+    "crates/sui",
+    # "crates/sui-adapter-transactional-tests",
+    # "crates/sui-analytics-indexer",
+    # "crates/sui-analytics-indexer-derive",
+    "crates/sui-archival",
+    "crates/sui-authority-aggregation",
+    "crates/sui-aws-orchestrator",
+    "crates/sui-benchmark",
+    "crates/sui-bridge",
+    "crates/sui-bridge-cli",
+    "crates/sui-bridge-indexer",
+    # "crates/sui-cluster-test",
+    "crates/sui-config",
+    "crates/sui-core",
+    "crates/sui-cost",
+    "crates/sui-data-ingestion",
+    "crates/sui-data-ingestion-core",
+    "crates/sui-e2e-tests",
+    "crates/sui-enum-compat-util",
+    "crates/sui-faucet",
+    "crates/sui-framework",
+    "crates/sui-framework-snapshot",
+    "crates/sui-framework-tests",
+    "crates/sui-genesis-builder",
+    # "crates/sui-graphql-config",
+    # "crates/sui-graphql-e2e-tests",
+    # "crates/sui-graphql-rpc",
+    # "crates/sui-graphql-rpc-client",
+    # "crates/sui-graphql-rpc-headers",
+    "crates/sui-indexer",
+    "crates/sui-indexer-builder",
+    "crates/sui-json",
+    "crates/sui-json-rpc",
+    "crates/sui-json-rpc-api",
+    "crates/sui-json-rpc-tests",
+    "crates/sui-json-rpc-types",
+    "crates/sui-keys",
+    "crates/sui-light-client",
+    "crates/sui-macros",
+    "crates/sui-metric-checker",
+    "crates/sui-move",
+    "crates/sui-move-build",
+    "crates/sui-move-lsp",
+    "crates/sui-network",
+    "crates/sui-node",
+    "crates/sui-open-rpc",
+    "crates/sui-open-rpc-macros",
+    "crates/sui-oracle",
+    "crates/sui-package-dump",
+    "crates/sui-package-management",
+    "crates/sui-package-resolver",
+    "crates/sui-proc-macros",
+    "crates/sui-protocol-config",
+    "crates/sui-protocol-config-macros",
+    "crates/sui-proxy",
+    "crates/sui-replay",
+    "crates/sui-rest-api",
+    "crates/sui-rosetta",
+    "crates/sui-rpc-loadgen",
+    "crates/sui-sdk",
+    "crates/sui-security-watchdog",
+    "crates/sui-simulator",
+    "crates/sui-single-node-benchmark",
+    "crates/sui-snapshot",
+    "crates/sui-source-validation",
+    "crates/sui-source-validation-service",
+    "crates/sui-storage",
+    "crates/sui-surfer",
+    "crates/sui-swarm",
+    "crates/sui-swarm-config",
+    "crates/sui-telemetry",
+    "crates/sui-test-transaction-builder",
+    "crates/sui-test-validator",
+    "crates/sui-tls",
+    "crates/sui-tool",
+    "crates/sui-transaction-builder",
+    "crates/sui-transaction-checks",
+    # "crates/sui-transactional-test-runner",
+    "crates/sui-types",
+    "crates/sui-upgrade-compatibility-transactional-tests",
+    "crates/sui-verifier-transactional-tests",
+    "crates/suins-indexer",
+    "crates/suiop-cli",
+    "crates/telemetry-subscribers",
+    "crates/test-cluster",
+    "crates/transaction-fuzzer",
+    "crates/typed-store",
+    "crates/typed-store-derive",
+    "crates/typed-store-error",
+    "crates/typed-store-workspace-hack",
+    "crates/x",
+    "narwhal/config",
+    "narwhal/crypto",
+    "narwhal/executor",
+    "narwhal/network",
+    "narwhal/node",
+    "narwhal/primary",
+    "narwhal/storage",
+    "narwhal/test-utils",
+    "narwhal/types",
+    "narwhal/worker",
+    "sui-execution",
+    "sui-execution/cut",
+    "sui-execution/latest/sui-adapter",
+    "sui-execution/latest/sui-move-natives",
+    "sui-execution/latest/sui-verifier",
+    "sui-execution/v0/sui-adapter",
+    "sui-execution/v0/sui-move-natives",
+    "sui-execution/v0/sui-verifier",
+    "sui-execution/v1/sui-adapter",
+    "sui-execution/v1/sui-move-natives",
+    "sui-execution/v1/sui-verifier",
+    "sui-execution/v2/sui-adapter",
+    "sui-execution/v2/sui-move-natives",
+    "sui-execution/v2/sui-verifier",
 ]
 
 [workspace.package]
 # This version string will be inherited by sui-core, sui-faucet, sui-node, sui-tools, sui-sdk, sui-move-build, and sui crates.
-version = "1.30.1"
+version = "1.32.3"
 
 [profile.release]
 # debug = 1 means line charts only, which is minimum needed for good stack traces
@@ -240,6 +243,12 @@ overflow-checks = true
 # opt-level 1 gives >5x speedup for simulator tests without slowing down build times very much.
 opt-level = 1
 
+[workspace.lints.rust]
+unexpected_cfgs = { level = "warn", check-cfg = [
+    'cfg(msim)',
+    'cfg(fail_points)',
+] }
+
 # Dependencies that should be kept in sync through the whole workspace
 [workspace.dependencies]
 anyhow = "1.0.71"
@@ -247,9 +256,9 @@ arrow = "52"
 arrow-array = "52"
 arc-swap = { version = "1.5.1", features = ["serde"] }
 assert_cmd = "2.0.6"
-async-graphql = "6.0.7"
-async-graphql-axum = "6.0.7"
-async-graphql-value = "6.0.7"
+async-graphql = "=7.0.1"
+async-graphql-axum = "=7.0.1"
+async-graphql-value = "=7.0.1"
 async-recursion = "1.0.4"
 async-trait = "0.1.61"
 atomic_float = "0.1"
@@ -259,28 +268,27 @@ aws-sdk-dynamodb = "0.29.0"
 aws-sdk-s3 = "0.29.0"
 aws-smithy-http = "0.56"
 aws-smithy-runtime-api = "0.56"
-axum = { version = "0.6.6", default-features = false, features = [
-  "headers",
-  "tokio",
-  "http1",
-  "http2",
-  "json",
-  "matched-path",
-  "original-uri",
-  "form",
-  "query",
-  "ws",
+axum = { version = "0.7", default-features = false, features = [
+    "tokio",
+    "http1",
+    "http2",
+    "json",
+    "matched-path",
+    "original-uri",
+    "form",
+    "query",
+    "ws",
 ] }
-axum-extra = "0.4.2"
-axum-server = { version = "0.5.1", default-features = false, features = [
-  "tls-rustls",
+axum-extra = { version = "0.9", features = ["typed-header"] }
+axum-server = { git = "https://github.com/bmwill/axum-server.git", rev = "f44323e271afdd1365fd0c8b0a4c0bbdf4956cb7", version = "0.6", default-features = false, features = [
+    "tls-rustls",
 ] }
 backoff = { version = "0.4.0", features = [
-  "futures",
-  "futures-core",
-  "pin-project-lite",
-  "tokio",
-  "tokio_1",
+    "futures",
+    "futures-core",
+    "pin-project-lite",
+    "tokio",
+    "tokio_1",
 ] }
 base64 = "0.21.2"
 base64-url = "2"
@@ -304,25 +312,28 @@ console-subscriber = "0.2"
 const-str = "0.5.3"
 count-min-sketch = "0.1.7"
 criterion = { version = "0.5.0", features = [
-  "async",
-  "async_tokio",
-  "html_reports",
+    "async",
+    "async_tokio",
+    "html_reports",
 ] }
 crossterm = "0.25.0"
 csv = "1.2.1"
+cynic = { version = "3.7.3", features = ["http-reqwest"] }
+cynic-codegen = "= 3.7.3"
 dashmap = "5.5.3"
 # datatest-stable = "0.1.2"
+
 datatest-stable = { git = "https://github.com/nextest-rs/datatest-stable.git", rev = "72db7f6d1bbe36a5407e96b9488a581f763e106f" }
 derivative = "2.2.0"
 derive-syn-parse = "0.1.5"
 derive_builder = "0.12.0"
 derive_more = "0.99.17"
 diesel = { version = "2.1.0", features = [
-  "chrono",
-  "r2d2",
-  "serde_json",
-  "64-column-tables",
-  "i-implement-a-third-party-backend-and-opt-into-breaking-changes",
+    "chrono",
+    "r2d2",
+    "serde_json",
+    "64-column-tables",
+    "i-implement-a-third-party-backend-and-opt-into-breaking-changes",
 ] }
 diesel-derive-enum = { version = "2.0.1" }
 diesel_migrations = { version = "2.0.0" }
@@ -347,12 +358,17 @@ hashbrown = "0.12"
 hdrhistogram = "7.5.1"
 hex = "0.4.3"
 hex-literal = "0.3.4"
-highlight = "0.0.3"
-http = "0.2.8"
-http-body = "0.4.5"
+http = "1"
+http-body = "1"
 humantime = "2.1.0"
-hyper = "0.14.20"
-hyper-rustls = { version = "0.24", features = ["webpki-roots", "http2"] }
+hyper = "1"
+hyper-util = "0.1.6"
+hyper-rustls = { version = "0.27", default-features = false, features = [
+    "webpki-roots",
+    "http2",
+    "ring",
+    "tls12",
+] }
 im = "15"
 impl-trait-for-tuples = "0.2.0"
 indexmap = { version = "2.1.0", features = ["serde"] }
@@ -364,30 +380,29 @@ ipnetwork = "0.20.0"
 itertools = "0.10.5"
 jemalloc-ctl = "^0.5"
 jsonrpsee = { git = "https://github.com/wlmyng/jsonrpsee.git", rev = "b1b300784795f6a64d0fcdf8f03081a9bc38bde8", features = [
-  "server",
-  "macros",
-  "ws-client",
-  "http-client",
-  "jsonrpsee-core",
+    "server",
+    "macros",
+    "ws-client",
+    "http-client",
+    "jsonrpsee-core",
 ] }
 json_to_table = { git = "https://github.com/zhiburt/tabled/", rev = "e449317a1c02eb6b29e409ad6617e5d9eb7b3bd4" }
 leb128 = "0.2.5"
 lru = "0.10"
-markdown-gen = "1.2.1"
 match_opt = "0.1.2"
 miette = { version = "7", features = ["fancy"] }
 mime = "0.3"
 mockall = "0.11.4"
 moka = { version = "0.12", default-features = false, features = [
-  "sync",
-  "atomic64",
+    "sync",
+    "atomic64",
 ] }
 more-asserts = "0.3.1"
-msim = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "220f52a15804a768610ac0ae3b8da7de4a5c4d2b", package = "msim" }
-msim-macros = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "220f52a15804a768610ac0ae3b8da7de4a5c4d2b", package = "msim-macros" }
+msim = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "b320996d8dfb99b273fe31c0222c659332283c99", package = "msim" }
+msim-macros = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "b320996d8dfb99b273fe31c0222c659332283c99", package = "msim-macros" }
 multiaddr = "0.17.0"
-nexlint = { git = "https://github.com/nextest-rs/nexlint.git", rev = "94da5c787636dad779c340affa65219134d127f5" }
-nexlint-lints = { git = "https://github.com/nextest-rs/nexlint.git", rev = "94da5c787636dad779c340affa65219134d127f5" }
+nexlint = { git = "https://github.com/nextest-rs/nexlint.git", rev = "7ce56bd591242a57660ed05f14ca2483c37d895b" }
+nexlint-lints = { git = "https://github.com/nextest-rs/nexlint.git", rev = "7ce56bd591242a57660ed05f14ca2483c37d895b" }
 nonempty = "0.9.0"
 notify = "6.1.1"
 ntest = "0.9.0"
@@ -400,53 +415,49 @@ ouroboros = "0.17"
 parking_lot = "0.12.1"
 parquet = "52"
 pkcs8 = { version = "0.9.0", features = ["std"] }
-pprof = { version = "0.11.0", features = ["cpp", "frame-pointer"] }
+pprof = { version = "0.13.0", features = ["cpp", "frame-pointer"] }
 pretty_assertions = "1.3.0"
 prettytable-rs = "0.10.0"
 proc-macro2 = "1.0.47"
 prometheus = "0.13.3"
-prometheus-http-query = { version = "0.8", default_features = false, features = [
-  "rustls-tls",
+prometheus-http-query = { version = "0.8", default-features = false, features = [
+    "rustls-tls",
 ] }
 prometheus-parse = { git = "https://github.com/asonnino/prometheus-parser.git", rev = "75334db" }
 proptest = "1.1.0"
 proptest-derive = "0.3.0"
-prost = "0.12.3"
-prost-build = "0.12.3"
+prost = "0.13"
+prost-build = "0.13"
 protobuf = { version = "2.28", features = ["with-bytes"] }
-protobuf-src = "1.1.0"
-quinn-proto = "0.11"
+quinn-proto = "0.11.6"
 quote = "1.0.23"
 rand = "0.8.5"
 rayon = "1.5.3"
-rcgen = "0.9.2"
+rcgen = "0.13"
 regex = "1.7.1"
-reqwest = { version = "0.12", default_features = false, features = [
-  "blocking",
-  "json",
-  "rustls-tls",
+reqwest = { version = "0.12", default-features = false, features = [
+    "http2",
+    "json",
+    "rustls-tls",
 ] }
-roaring = "=0.10.3"
-rocksdb = { version = "0.21.0", features = [
-  "snappy",
-  "lz4",
-  "zstd",
-  "zlib",
-  "multi-threaded-cf",
-], default-features = false }
+roaring = "0.10.6"
 ron = "0.8.0"
 rstest = "0.16.0"
-rusoto_core = { version = "0.48.0", default_features = false, features = [
-  "rustls",
+rusoto_core = { version = "0.48.0", default-features = false, features = [
+    "rustls",
 ] }
-rusoto_kms = { version = "0.48.0", default_features = false, features = [
-  "rustls",
+rusoto_kms = { version = "0.48.0", default-features = false, features = [
+    "rustls",
 ] }
 russh = "0.38.0"
 russh-keys = "0.38.0"
 rust-version = "1.56.1"
-rustls = { version = "0.21.12", features = ["dangerous_configuration"] }
-rustls-pemfile = "1.0.2"
+rustls = { version = "0.23", default-features = false, features = [
+    "std",
+    "tls12",
+    "ring",
+] }
+rustls-pemfile = "2"
 rustversion = "1.0.9"
 rustyline = "9.1.2"
 rustyline-derive = "0.7.0"
@@ -456,10 +467,7 @@ serial_test = "2.0.0"
 serde = { version = "1.0.144", features = ["derive", "rc"] }
 serde-name = "0.2.1"
 serde-reflection = "0.3.6"
-serde_json = { version = "1.0.95", features = [
-  "preserve_order",
-  "arbitrary_precision",
-] }
+serde_json = { version = "1.0.95", features = ["preserve_order"] }
 serde_repr = "0.1"
 serde_test = "1.0.147"
 serde_with = "3.8"
@@ -469,6 +477,7 @@ shell-words = "1.1.0"
 shellexpand = "3.1.0"
 signature = "1.6.0"
 similar = "2.4.0"
+simple-server-timing-header = "0.1.1"
 slip10_ed25519 = "0.1.3"
 smallvec = "1.10.0"
 snap = "1.1.0"
@@ -489,7 +498,10 @@ thiserror = "1.0.40"
 tiny-bip39 = "1.0.0"
 tokio = "1.36.0"
 tokio-retry = "0.3"
-tokio-rustls = "0.24"
+tokio-rustls = { version = "0.26", default-features = false, features = [
+    "tls12",
+    "ring",
+] }
 tokio-stream = { version = "0.1.14", features = ["sync", "net"] }
 tokio-util = "0.7.10"
 toml = { version = "0.7.4", features = ["preserve_order"] }
@@ -497,36 +509,36 @@ toml_edit = { version = "0.19.10" }
 # NOTE: do not enable the `tls` feature on tonic. It will break custom TLS handling
 # for self signed certificates. Unit tests under consensus/core and other integration
 # tests will fail.
-tonic = { version = "0.11", features = ["transport"] }
-tonic-build = { version = "0.11", features = ["prost", "transport"] }
-tonic-health = "0.11"
+tonic = { version = "0.12", features = ["transport"] }
+tonic-build = { version = "0.12", features = ["prost", "transport"] }
+tonic-health = "0.12"
 tower = { version = "0.4.12", features = [
-  "full",
-  "util",
-  "timeout",
-  "load-shed",
-  "limit",
+    "full",
+    "util",
+    "timeout",
+    "load-shed",
+    "limit",
 ] }
-tower-http = { version = "0.3.4", features = [
-  "cors",
-  "full",
-  "trace",
-  "set-header",
-  "propagate-header",
+tower-http = { version = "0.5", features = [
+    "cors",
+    "full",
+    "trace",
+    "set-header",
+    "propagate-header",
 ] }
 tower-layer = "0.3.2"
 twox-hash = "1.6.3"
 tracing = "0.1.37"
 tracing-appender = "0.2.2"
 tracing-subscriber = { version = "0.3.15", default-features = false, features = [
-  "std",
-  "smallvec",
-  "fmt",
-  "ansi",
-  "time",
-  "json",
-  "registry",
-  "env-filter",
+    "std",
+    "smallvec",
+    "fmt",
+    "ansi",
+    "time",
+    "json",
+    "registry",
+    "env-filter",
 ] }
 ttl_cache = "0.5.1"
 uint = "0.9.4"
@@ -534,9 +546,9 @@ unescape = "0.1.0"
 ureq = "2.9.1"
 url = "2.3.1"
 uuid = { version = "1.1.2", features = ["v4", "fast-rng"] }
-webpki = { version = "0.101.0", package = "rustls-webpki", features = [
-  "alloc",
-  "std",
+webpki = { version = "0.102", package = "rustls-webpki", features = [
+    "alloc",
+    "std",
 ] }
 x509-parser = "0.14.0"
 zstd = "0.12.3"
@@ -558,7 +570,7 @@ move-package = { path = "external-crates/move/crates/move-package" }
 move-unit-test = { path = "external-crates/move/crates/move-unit-test" }
 move-vm-config = { path = "external-crates/move/crates/move-vm-config" }
 move-vm-test-utils = { path = "external-crates/move/crates/move-vm-test-utils/", features = [
-  "tiered-gas",
+    "tiered-gas",
 ] }
 move-vm-types = { path = "external-crates/move/crates/move-vm-types" }
 move-vm-profiler = { path = "external-crates/move/crates/move-vm-profiler" }
@@ -576,7 +588,7 @@ fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "5f2c6326
 fastcrypto-tbls = { git = "https://github.com/MystenLabs/fastcrypto", rev = "5f2c63266a065996d53f98156f0412782b468597" }
 fastcrypto-zkp = { git = "https://github.com/MystenLabs/fastcrypto", rev = "5f2c63266a065996d53f98156f0412782b468597", package = "fastcrypto-zkp" }
 fastcrypto-vdf = { git = "https://github.com/MystenLabs/fastcrypto", rev = "5f2c63266a065996d53f98156f0412782b468597", features = [
-  "experimental",
+    "experimental",
 ] }
 passkey-types = { version = "0.2.0" }
 passkey-client = { version = "0.2.0" }
@@ -590,13 +602,13 @@ anemo-build = { git = "https://github.com/mystenlabs/anemo.git", rev = "dbb5a074
 anemo-cli = { git = "https://github.com/mystenlabs/anemo.git", rev = "dbb5a074c2d25660525ab5d36d65ff0cb8051949" }
 anemo-tower = { git = "https://github.com/mystenlabs/anemo.git", rev = "dbb5a074c2d25660525ab5d36d65ff0cb8051949" }
 
+
 # core-types with json format for REST api
-sui-sdk2 = { package = "sui-sdk", git = "https://github.com/mystenlabs/sui-rust-sdk.git", rev = "9a125ed5764fb5bcc1acb6074064bc8f9ea85b38", features = [
-  "hash",
-  "serde",
-  "schemars",
+sui-sdk2 = { package = "sui-sdk", git = "https://github.com/mystenlabs/sui-rust-sdk.git", rev = "bd233b6879b917fb95e17f21927c198e7a60c924", features = [
+    "hash",
+    "serde",
+    "schemars",
 ] }
-
 ### Workspace Members ###
 anemo-benchmark = { path = "crates/anemo-benchmark" }
 bin-version = { path = "crates/bin-version" }
@@ -635,6 +647,7 @@ sui-framework-tests = { path = "crates/sui-framework-tests" }
 # sui-graphql-rpc-headers = { path = "crates/sui-graphql-rpc-headers" }
 sui-genesis-builder = { path = "crates/sui-genesis-builder" }
 sui-indexer = { path = "crates/sui-indexer" }
+sui-indexer-builder = { path = "crates/sui-indexer-builder" }
 sui-json = { path = "crates/sui-json" }
 sui-json-rpc = { path = "crates/sui-json-rpc" }
 sui-json-rpc-api = { path = "crates/sui-json-rpc-api" }
@@ -649,6 +662,7 @@ sui-network = { path = "crates/sui-network" }
 sui-node = { path = "crates/sui-node" }
 sui-open-rpc = { path = "crates/sui-open-rpc" }
 sui-open-rpc-macros = { path = "crates/sui-open-rpc-macros" }
+sui-package-dump = { path = "crates/sui-package-dump" }
 sui-package-management = { path = "crates/sui-package-management" }
 sui-package-resolver = { path = "crates/sui-package-resolver" }
 sui-proc-macros = { path = "crates/sui-proc-macros" }
@@ -683,7 +697,6 @@ telemetry-subscribers = { path = "crates/telemetry-subscribers" }
 test-cluster = { path = "crates/test-cluster" }
 transaction-fuzzer = { path = "crates/transaction-fuzzer" }
 typed-store = { path = "crates/typed-store" }
-typed-store-derive = { path = "crates/typed-store-derive" }
 typed-store-error = { path = "crates/typed-store-error" }
 x = { path = "crates/x" }
 
@@ -719,4 +732,3 @@ include_dir = "0.7.3"
 odin = { git = "ssh://git@github.com/nightly-labs/alexandria.git", rev = "bd401bc3807bba5bb5203f42cc7b8cf836be83f5", package = "odin" }
 
 [patch.crates-io]
-quinn-proto = { git = "https://github.com/quinn-rs/quinn.git", rev = "f0fa66f871b80b9d2d7075d76967c649aecc0b77" }
diff --git a/apps/wallet/src/background/accounts/zklogin/utils.ts b/apps/wallet/src/background/accounts/zklogin/utils.ts
index 1b937090ed32d..e4234f6334f98 100644
--- a/apps/wallet/src/background/accounts/zklogin/utils.ts
+++ b/apps/wallet/src/background/accounts/zklogin/utils.ts
@@ -34,7 +34,7 @@ export function prepareZkLogin(currentEpoch: number) {
 const forceSilentGetProviders: ZkLoginProvider[] = ['twitch'];
 
 /**
- * This method does a get request to the authorize url and is used as a workarround
+ * This method does a get request to the authorize url and is used as a workaround
  * for `forceSilentGetProviders` that they do the silent login/token refresh using
  * html directives or js code to redirect to the redirect_url (instead of response headers) and that forces the launchWebAuthFlow
  * to open and close quickly a new window. Which closes the popup window when open but also creates a weird flickering effect.
diff --git a/apps/wallet/src/dapp-interface/WalletStandardInterface.ts b/apps/wallet/src/dapp-interface/WalletStandardInterface.ts
index 3c74b905dd490..739507c8b94c7 100644
--- a/apps/wallet/src/dapp-interface/WalletStandardInterface.ts
+++ b/apps/wallet/src/dapp-interface/WalletStandardInterface.ts
@@ -109,7 +109,7 @@ export class SuiWallet implements Wallet {
 	}
 
 	get icon() {
-		return 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNzIiIGhlaWdodD0iNzIiIHZpZXdCb3g9IjAgMCA3MiA3MiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHJlY3Qgd2lkdGg9IjcyIiBoZWlnaHQ9IjcyIiByeD0iMTYiIGZpbGw9IiM2RkJDRjAiLz4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0yMC40MjEzIDUyLjc4MzhDMjMuNjQ5NiA1OC4zNzYgMjkuNDMyMSA2MS43MTQyIDM1Ljg4ODggNjEuNzE0MkM0Mi4zNDU1IDYxLjcxNDIgNDguMTI3IDU4LjM3NiA1MS4zNTY0IDUyLjc4MzhDNTQuNTg0OCA0Ny4xOTI2IDU0LjU4NDggNDAuNTE2MyA1MS4zNTY0IDM0LjkyNEwzNy43NTI0IDExLjM2MTVDMzYuOTI0MSA5LjkyNzAxIDM0Ljg1MzUgOS45MjcwMSAzNC4wMjUzIDExLjM2MTVMMjAuNDIxMyAzNC45MjRDMTcuMTkyOSA0MC41MTUyIDE3LjE5MjkgNDcuMTkxNSAyMC40MjEzIDUyLjc4MzhaTTMyLjA1NjYgMjIuNTcxM0wzNC45NTcxIDE3LjU0NzRDMzUuMzcxMiAxNi44MzAxIDM2LjQwNjUgMTYuODMwMSAzNi44MjA2IDE3LjU0NzRMNDcuOTc5MSAzNi44NzQ4QzUwLjAyOTEgNDAuNDI1NCA1MC40MTM5IDQ0LjUzNSA0OS4xMzM1IDQ4LjI5NTRDNDkuMDAwMiA0Ny42ODE5IDQ4LjgxMzggNDcuMDU0MiA0OC41NjI2IDQ2LjQyMDFDNDcuMDIxMyA0Mi41MzA0IDQzLjUzNjMgMzkuNTI4OSAzOC4yMDIzIDM3LjQ5ODJDMzQuNTM1MSAzNi4xMDcxIDMyLjE5NDMgMzQuMDYxMyAzMS4yNDMxIDMxLjQxNzFDMzAuMDE4IDI4LjAwODkgMzEuMjk3NiAyNC4yOTI0IDMyLjA1NjYgMjIuNTcxM1pNMjcuMTEwNyAzMS4xMzc5TDIzLjc5ODYgMzYuODc0OEMyMS4yNzQ4IDQxLjI0NTkgMjEuMjc0OCA0Ni40NjQxIDIzLjc5ODYgNTAuODM1M0MyNi4zMjIzIDU1LjIwNjQgMzAuODQxMyA1Ny44MTUgMzUuODg4OCA1Ny44MTVDMzkuMjQxMyA1Ny44MTUgNDIuMzYxNSA1Ni42NjMzIDQ0LjgxODQgNTQuNjA4OEM0NS4xMzg4IDUzLjgwMjEgNDYuMTMxIDUwLjg0OTIgNDQuOTA1MiA0Ny44MDU4QzQzLjc3MyA0NC45OTU0IDQxLjA0ODIgNDIuNzUxOSAzNi44MDYxIDQxLjEzNkMzMi4wMTEgMzkuMzE3MSAyOC44OTU4IDM2LjQ3NzQgMjcuNTQ4NiAzMi42OTg0QzI3LjM2MzEgMzIuMTc4MSAyNy4yMTg5IDMxLjY1NjggMjcuMTEwNyAzMS4xMzc5WiIgZmlsbD0id2hpdGUiLz4KPC9zdmc+' as const;
+		return 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjgiIGhlaWdodD0iMjgiIHZpZXdCb3g9IjAgMCAyOCAyOCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KICAgIDxyZWN0IHdpZHRoPSIyOCIgaGVpZ2h0PSIyOCIgZmlsbD0iIzRDQTNGRiIvPgogICAgPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0xOC44MzI3IDEyLjM0MTNWMTIuMzQyMkMxOS42NDgyIDEzLjM2NTMgMjAuMTM2IDE0LjY2MTMgMjAuMTM2IDE2LjA3MDVDMjAuMTM2IDE3LjQ3OTggMTkuNjMzNyAxOC44MTQzIDE4Ljc5NTcgMTkuODQ0M0wxOC43MjM1IDE5LjkzM0wxOC43MDQ1IDE5LjgyMDNDMTguNjg4MiAxOS43MjQ1IDE4LjY2OSAxOS42Mjc1IDE4LjY0NyAxOS41M0MxOC4yMjc3IDE3LjY4NzUgMTYuODYxMiAxNi4xMDc1IDE0LjYxMjUgMTQuODI4MkMxMy4wOTQgMTMuOTY2OCAxMi4yMjQ3IDEyLjkyOTIgMTEuOTk2NSAxMS43NTA4QzExLjg0OSAxMC45ODg1IDExLjk1ODcgMTAuMjIzIDEyLjE3MDUgOS41NjcyNUMxMi4zODIyIDguOTExNzUgMTIuNjk3MiA4LjM2MjUgMTIuOTY0NyA4LjAzMkwxMy44Mzk1IDYuOTYyMjVDMTMuOTkzIDYuNzc0NzUgMTQuMjggNi43NzQ3NSAxNC40MzM1IDYuOTYyMjVMMTguODMzIDEyLjM0MTVMMTguODMyNyAxMi4zNDEzWk0yMC4yMTY1IDExLjI3MjVWMTEuMjcyTDE0LjM1MyA0LjEwMjc1QzE0LjI0MSAzLjk2NTc1IDE0LjAzMTUgMy45NjU3NSAxMy45MTk1IDQuMTAyNzVMOC4wNTYgMTEuMjcyM1YxMS4yNzI4TDguMDM3IDExLjI5NjVDNi45NTgyNSAxMi42MzUzIDYuMzEyNSAxNC4zMzY4IDYuMzEyNSAxNi4xODlDNi4zMTI1IDIwLjUwMjggOS44MTUyNSAyNCAxNC4xMzYzIDI0QzE4LjQ1NzIgMjQgMjEuOTYgMjAuNTAyOCAyMS45NiAxNi4xODlDMjEuOTYgMTQuMzM2OCAyMS4zMTQyIDEyLjYzNTMgMjAuMjM1MiAxMS4yOTYzTDIwLjIxNiAxMS4yNzI1SDIwLjIxNjVaTTkuNDU5MjUgMTIuMzE4TDkuOTgzNzUgMTEuNjc2NUw5Ljk5OTUgMTEuNzk1QzEwLjAxMiAxMS44ODg3IDEwLjAyNzIgMTEuOTgzIDEwLjA0NTIgMTIuMDc3OEMxMC4zODQ1IDEzLjg1ODIgMTEuNTk2NyAxNS4zNDI4IDEzLjYyMzUgMTYuNDkyNUMxNS4zODUyIDE3LjQ5NSAxNi40MTEgMTguNjQ4IDE2LjcwNjUgMTkuOTEyNUMxNi44Mjk4IDIwLjQ0MDMgMTYuODUxNyAyMC45NTk1IDE2Ljc5ODUgMjEuNDEzNUwxNi43OTUyIDIxLjQ0MTVMMTYuNzY5NyAyMS40NTRDMTUuOTc0NyAyMS44NDI1IDE1LjA4MDcgMjIuMDYwNSAxNC4xMzYgMjIuMDYwNUMxMC44MjI1IDIyLjA2MDUgOC4xMzYyNSAxOS4zNzg4IDguMTM2MjUgMTYuMDcwNUM4LjEzNjI1IDE0LjY1MDMgOC42MzE1IDEzLjM0NSA5LjQ1OSAxMi4zMTgzTDkuNDU5MjUgMTIuMzE4WiIgZmlsbD0id2hpdGUiLz4KPC9zdmc+Cg==' as const;
 	}
 
 	get chains() {
diff --git a/apps/wallet/src/ui/app/components/address-input/index.tsx b/apps/wallet/src/ui/app/components/address-input/index.tsx
index b4aa1cc01ed0d..115ee0195919a 100644
--- a/apps/wallet/src/ui/app/components/address-input/index.tsx
+++ b/apps/wallet/src/ui/app/components/address-input/index.tsx
@@ -72,7 +72,7 @@ export function AddressInput({
 		refetchInterval: false,
 	});
 
-	const { isSubmitting, setFieldValue } = useFormikContext();
+	const { isSubmitting, setFieldValue, isValidating } = useFormikContext();
 	const suiAddressValidation = useSuiAddressValidation();
 
 	const disabled = forcedDisabled !== undefined ? forcedDisabled : isSubmitting;
@@ -92,7 +92,7 @@ export function AddressInput({
 		setFieldValue('to', '');
 	}, [setFieldValue]);
 
-	const hasWarningOrError = meta.touched && (meta.error || warningData);
+	const hasWarningOrError = meta.touched && (meta.error || warningData) && !isValidating;
 
 	return (
 		<>
@@ -132,7 +132,7 @@ export function AddressInput({
 				</div>
 			</div>
 
-			{meta.touched ? (
+			{meta.touched && !isValidating ? (
 				<div className="mt-2.5 w-full">
 					<Alert noBorder rounded="lg" mode={meta.error || warningData ? 'issue' : 'success'}>
 						{warningData === RecipientWarningType.OBJECT ? (
diff --git a/apps/wallet/src/ui/app/components/address-input/validation.ts b/apps/wallet/src/ui/app/components/address-input/validation.ts
index 4c4a133a79d28..26b28ef6b9b30 100644
--- a/apps/wallet/src/ui/app/components/address-input/validation.ts
+++ b/apps/wallet/src/ui/app/components/address-input/validation.ts
@@ -8,9 +8,12 @@ import { isValidSuiAddress, isValidSuiNSName } from '@mysten/sui/utils';
 import { useMemo } from 'react';
 import * as Yup from 'yup';
 
+const CACHE_EXPIRY_TIME = 60 * 1000; // 1 minute in milliseconds
+
 export function createSuiAddressValidation(client: SuiClient, suiNSEnabled: boolean) {
-	const resolveCache = new Map<string, boolean>();
+	const resolveCache = new Map<string, { valid: boolean; expiry: number }>();
 
+	const currentTime = Date.now();
 	return Yup.string()
 		.ensure()
 		.trim()
@@ -18,14 +21,22 @@ export function createSuiAddressValidation(client: SuiClient, suiNSEnabled: bool
 		.test('is-sui-address', 'Invalid address. Please check again.', async (value) => {
 			if (suiNSEnabled && isValidSuiNSName(value)) {
 				if (resolveCache.has(value)) {
-					return resolveCache.get(value)!;
+					const cachedEntry = resolveCache.get(value)!;
+					if (currentTime < cachedEntry.expiry) {
+						return cachedEntry.valid;
+					} else {
+						resolveCache.delete(value); // Remove expired entry
+					}
 				}
 
 				const address = await client.resolveNameServiceAddress({
 					name: value,
 				});
 
-				resolveCache.set(value, !!address);
+				resolveCache.set(value, {
+					valid: !!address,
+					expiry: currentTime + CACHE_EXPIRY_TIME,
+				});
 
 				return !!address;
 			}
diff --git a/apps/wallet/src/ui/app/components/sui-apps/Banner.tsx b/apps/wallet/src/ui/app/components/sui-apps/Banner.tsx
index 423ea49c33961..e7bd0bc026872 100644
--- a/apps/wallet/src/ui/app/components/sui-apps/Banner.tsx
+++ b/apps/wallet/src/ui/app/components/sui-apps/Banner.tsx
@@ -27,7 +27,11 @@ export function AppsPageBanner() {
 					href={AppsBannerConfig.value?.bannerUrl}
 					onClick={() => ampli.clickedBullsharkQuestsCta({ sourceFlow: 'Banner - Apps tab' })}
 				>
-					<img className="w-full" src={AppsBannerConfig.value?.imageUrl} alt="Apps Banner" />
+					<img
+						className="w-full rounded-xl"
+						src={AppsBannerConfig.value?.imageUrl}
+						alt="Apps Banner"
+					/>
 				</ExternalLink>
 			)}
 		</div>
diff --git a/apps/wallet/src/ui/app/pages/accounts/manage/AccountGroup.tsx b/apps/wallet/src/ui/app/pages/accounts/manage/AccountGroup.tsx
index f6f251f2b1fd6..c788e69745594 100644
--- a/apps/wallet/src/ui/app/pages/accounts/manage/AccountGroup.tsx
+++ b/apps/wallet/src/ui/app/pages/accounts/manage/AccountGroup.tsx
@@ -52,7 +52,7 @@ export function getGroupTitle(aGroupAccount: SerializedUIAccount) {
 		: accountTypeToLabel[aGroupAccount?.type] || '';
 }
 
-// todo: we probbaly have some duplication here with the various FooterLink / ButtonOrLink
+// todo: we probably have some duplication here with the various FooterLink / ButtonOrLink
 // components - we should look to add these to base components somewhere
 const FooterLink = forwardRef<HTMLAnchorElement | HTMLButtonElement, ButtonOrLinkProps>(
 	({ children, to, ...props }, ref) => {
diff --git a/apps/wallet/src/ui/app/pages/home/interstitial/index.tsx b/apps/wallet/src/ui/app/pages/home/interstitial/index.tsx
index 912cdd9ddeb9f..409a878474f70 100644
--- a/apps/wallet/src/ui/app/pages/home/interstitial/index.tsx
+++ b/apps/wallet/src/ui/app/pages/home/interstitial/index.tsx
@@ -1,8 +1,10 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+import { ButtonOrLink } from '_app/shared/utils/ButtonOrLink';
 import { ampli } from '_src/shared/analytics/ampli';
 import ExternalLink from '_src/ui/app/components/external-link';
+import { Text } from '_src/ui/app/shared/text';
 import { X32 } from '@mysten/icons';
 import { useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
@@ -13,7 +15,7 @@ export type InterstitialConfig = {
 	enabled: boolean;
 	dismissKey?: string;
 	imageUrl?: string;
-
+	buttonText?: string;
 	bannerUrl?: string;
 };
 
@@ -23,7 +25,14 @@ interface InterstitialProps extends InterstitialConfig {
 
 const setInterstitialDismissed = (dismissKey: string) => localStorage.setItem(dismissKey, 'true');
 
-function Interstitial({ enabled, dismissKey, imageUrl, bannerUrl, onClose }: InterstitialProps) {
+function Interstitial({
+	enabled,
+	dismissKey,
+	imageUrl,
+	bannerUrl,
+	buttonText,
+	onClose,
+}: InterstitialProps) {
 	const navigate = useNavigate();
 
 	useEffect(() => {
@@ -39,32 +48,41 @@ function Interstitial({ enabled, dismissKey, imageUrl, bannerUrl, onClose }: Int
 		navigate('/apps');
 	};
 
+	const onClick = () => {
+		ampli.clickedBullsharkQuestsCta({ sourceFlow: 'Interstitial' });
+		closeInterstitial();
+	};
+
 	if (!enabled) {
 		return null;
 	}
 
 	return (
 		<Portal containerId="overlay-portal-container">
-			<div className="flex flex-col justify-center flex-nowrap items-center rounded-lg z-50 overflow-hidden absolute top-0 bottom-0 left-0 right-0 backdrop-blur-sm">
-				{bannerUrl && (
-					<ExternalLink
-						href={bannerUrl}
-						onClick={() => {
-							ampli.clickedBullsharkQuestsCta({ sourceFlow: 'Interstitial' });
-							closeInterstitial();
-						}}
-						className="w-full h-full"
-					>
-						<img src={imageUrl} alt="interstitial-banner" />
-					</ExternalLink>
-				)}
+			<div className="flex flex-col flex-nowrap items-center rounded-lg z-50 overflow-hidden absolute top-0 bottom-0 left-0 right-0 backdrop-blur-sm bg-[rgba(17,35,55,.56)] py-8 justify-between h-full">
 				<button
 					data-testid="bullshark-dismiss"
-					className="appearance-none bg-transparent border-none cursor-pointer absolute bottom-0 pb-5 w-full"
+					className="appearance-none bg-transparent border-none cursor-pointer w-full"
 					onClick={() => closeInterstitial(dismissKey)}
 				>
-					<X32 className="text-black h-8 w-8" />
+					<X32 className="text-white h-8 w-8" />
 				</button>
+				{bannerUrl && (
+					<ExternalLink href={bannerUrl} onClick={onClick} className="w-full text-center">
+						<img className="rounded-2xl" src={imageUrl} alt="interstitial-banner" />
+					</ExternalLink>
+				)}
+				<ButtonOrLink
+					className="flex appearance-none border-none rounded-full bg-[#4CA2FF] h-10 px-6 cursor-pointer items-center no-underline"
+					onClick={onClick}
+					to={bannerUrl}
+					target="_blank"
+					rel="noreferrer noopener"
+				>
+					<Text variant="body" weight="semibold" color="white">
+						{buttonText || 'Join for a chance to win'}
+					</Text>
+				</ButtonOrLink>
 			</div>
 		</Portal>
 	);
diff --git a/apps/wallet/src/ui/app/pages/home/nfts/VisualAssets.tsx b/apps/wallet/src/ui/app/pages/home/nfts/VisualAssets.tsx
index 6d68b2990c426..ccc3cba329863 100644
--- a/apps/wallet/src/ui/app/pages/home/nfts/VisualAssets.tsx
+++ b/apps/wallet/src/ui/app/pages/home/nfts/VisualAssets.tsx
@@ -44,7 +44,7 @@ export default function VisualAssets({ items }: { items: SuiObjectData[] }) {
 					<div className="group">
 						<div className="w-full h-full justify-center z-10 absolute pointer-events-auto text-gray-60 transition-colors duration-200 p-0">
 							{!isKioskOwnerToken(kioskClient.network, object) &&
-							!bnl.some((item) => item?.objectType !== object.type) ? (
+							!bnl.some((item) => item?.objectType === object.type) ? (
 								<div className="absolute top-2 right-3 rounded-md h-8 w-8 opacity-0 group-hover:opacity-100">
 									<Button
 										variant="hidden"
@@ -65,7 +65,7 @@ export default function VisualAssets({ items }: { items: SuiObjectData[] }) {
 						</div>
 						<ErrorBoundary>
 							<NFTDisplayCard
-								hideLabel={bnl.some((item) => item?.objectType === object.type)}
+								hideLabel
 								objectId={object.objectId}
 								size="lg"
 								animateHover
diff --git a/apps/wallet/vitest.config.ts b/apps/wallet/vitest.config.ts
index 9623017969816..22ecf350712f4 100644
--- a/apps/wallet/vitest.config.ts
+++ b/apps/wallet/vitest.config.ts
@@ -10,7 +10,6 @@ export default defineConfig({
 		exclude: [...configDefaults.exclude, 'tests/**'],
 		// TODO: Create custom extension environment.
 		environment: 'happy-dom',
-		minThreads: 1,
 		setupFiles: ['./testSetup.ts'],
 		restoreMocks: true,
 	},
diff --git a/binary-build-list.json b/binary-build-list.json
index 344be336436a8..36a6264486a0e 100644
--- a/binary-build-list.json
+++ b/binary-build-list.json
@@ -15,6 +15,7 @@
         "sui-proxy",
         "sui-metric-checker",
         "sui-analytics-indexer",
-        "sui-security-watchdog"
-    ]
+        "sui-security-watchdog",
+		"suiop"
+	]
 }
diff --git a/bridge/evm/script/deploy_bridge.s.sol b/bridge/evm/script/deploy_bridge.s.sol
index 4df43f5384a52..dfb5c6609c15a 100644
--- a/bridge/evm/script/deploy_bridge.s.sol
+++ b/bridge/evm/script/deploy_bridge.s.sol
@@ -44,6 +44,8 @@ contract DeployBridge is Script {
             MockWBTC wBTC = new MockWBTC();
             MockUSDC USDC = new MockUSDC();
             MockUSDT USDT = new MockUSDT();
+            MockKA KA = new MockKA();
+            console.log("[Deployed] KA:", address(KA));
 
             // update deployConfig with mock addresses
             deployConfig.supportedTokens = new address[](5);
diff --git a/bridge/evm/test/mocks/MockTokens.sol b/bridge/evm/test/mocks/MockTokens.sol
index 3a1bfbd059f39..05f463b36781e 100644
--- a/bridge/evm/test/mocks/MockTokens.sol
+++ b/bridge/evm/test/mocks/MockTokens.sol
@@ -57,6 +57,24 @@ contract MockUSDT is ERC20 {
     function testSkip() public {}
 }
 
+contract MockKA is ERC20 {
+    constructor() ERC20("Ka Coin", "KA") {}
+
+    function mint(address to, uint256 amount) public virtual {
+        _mint(to, amount);
+    }
+
+    function burn(address form, uint256 amount) public virtual {
+        _burn(form, amount);
+    }
+
+    function decimals() public view virtual override returns (uint8) {
+        return 9;
+    }
+
+    function testSkip() public {}
+}
+
 contract WETH {
     string public name = "Wrapped Ether";
     string public symbol = "WETH";
diff --git a/chocolatey/sui.nuspec b/chocolatey/sui.nuspec
index 6d649bbe60e09..843f5bf90f3c9 100644
--- a/chocolatey/sui.nuspec
+++ b/chocolatey/sui.nuspec
@@ -5,7 +5,7 @@ enclosed in quotation marks, you should use an editor that supports UTF-8, not t
 	<metadata>
 		<id>sui</id>
 		<version>$version$</version>
-		<owners>sui</owners>
+		<owners>Sui Foundation</owners>
 		<title>Main Sui Binary</title>
 		<authors>sui</authors>
 		<projectUrl>https://sui.io/</projectUrl>
@@ -15,12 +15,12 @@ enclosed in quotation marks, you should use an editor that supports UTF-8, not t
 		<bugTrackerUrl>https://github.com/MystenLabs/sui/issues</bugTrackerUrl>
 		<tags>sui</tags>
 		<packageSourceUrl>https://community.chocolatey.org/packages/sui.portable</packageSourceUrl>
-		<summary>Run a local sui binary</summary>
+		<summary>Sui delivers the benefits of Web3 with the ease of Web2</summary>
 		<description>Sui is the first internet-scale programmable blockchain platform</description>
-		<releaseNotes>https://github.com/MystenLabs/sui/releases/tag/mainnet-v$version$</releaseNotes>
+		<releaseNotes>See https://github.com/MystenLabs/sui/releases/tag/testnet-v$version$</releaseNotes>
 	</metadata>
 	<files>
-		<file src="./tmp/release/sui.exe" target="bin/sui.exe" />
+		<file src="../tmp/release/sui.exe" target="bin/sui.exe" />
 		<file src="../LICENSE" target="bin/LICENSE.txt" />
 		<file src="./VERIFICATION.txt" target="bin/VERIFICATION.txt" />
 	</files>
diff --git a/consensus/config/Cargo.toml b/consensus/config/Cargo.toml
index aeb3978f12301..48697e2f7e91b 100644
--- a/consensus/config/Cargo.toml
+++ b/consensus/config/Cargo.toml
@@ -6,6 +6,9 @@ authors = ["Mysten Labs <build@mystenlabs.com>"]
 edition = "2021"
 publish = false
 
+[lints]
+workspace = true
+
 [dependencies]
 fastcrypto.workspace = true
 mysten-network.workspace = true
diff --git a/consensus/config/src/parameters.rs b/consensus/config/src/parameters.rs
index 4b3a85906c19a..6df7da3cb21e0 100644
--- a/consensus/config/src/parameters.rs
+++ b/consensus/config/src/parameters.rs
@@ -57,8 +57,8 @@ pub struct Parameters {
     #[serde(default = "Parameters::default_commit_sync_batch_size")]
     pub commit_sync_batch_size: u32,
 
-    // Maximum number of commit batches being fetched, before throttling
-    // of outgoing commit fetches starts.
+    // This affects the maximum number of commit batches being fetched, and those fetched but not
+    // processed as consensus output, before throttling of outgoing commit fetches starts.
     #[serde(default = "Parameters::default_commit_sync_batches_ahead")]
     pub commit_sync_batches_ahead: usize,
 
@@ -73,8 +73,8 @@ pub struct Parameters {
     /// Time to wait during node start up until the node has synced the last proposed block via the
     /// network peers. When set to `0` the sync mechanism is disabled. This property is meant to be
     /// used for amnesia recovery.
-    #[serde(default = "Parameters::default_sync_last_proposed_block_timeout")]
-    pub sync_last_proposed_block_timeout: Duration,
+    #[serde(default = "Parameters::default_sync_last_known_own_block_timeout")]
+    pub sync_last_known_own_block_timeout: Duration,
 }
 
 impl Parameters {
@@ -129,15 +129,19 @@ impl Parameters {
     }
 
     pub(crate) fn default_commit_sync_batches_ahead() -> usize {
-        200
+        // This is set to be a multiple of default commit_sync_parallel_fetches to allow fetching ahead,
+        // while keeping the total number of inflight fetches and unprocessed fetched commits limited.
+        80
     }
 
-    pub(crate) fn default_sync_last_proposed_block_timeout() -> Duration {
-        Duration::ZERO
-    }
-
-    pub fn is_sync_last_proposed_block_enabled(&self) -> bool {
-        !self.sync_last_proposed_block_timeout.is_zero()
+    pub(crate) fn default_sync_last_known_own_block_timeout() -> Duration {
+        if cfg!(msim) {
+            Duration::from_millis(500)
+        } else {
+            // Here we prioritise liveness over the complete de-risking of block equivocation. 5 seconds
+            // in the majority of cases should be good enough for this given a healthy network.
+            Duration::from_secs(5)
+        }
     }
 }
 
@@ -150,8 +154,8 @@ impl Default for Parameters {
             max_forward_time_drift: Parameters::default_max_forward_time_drift(),
             dag_state_cached_rounds: Parameters::default_dag_state_cached_rounds(),
             max_blocks_per_fetch: Parameters::default_max_blocks_per_fetch(),
-            sync_last_proposed_block_timeout: Parameters::default_sync_last_proposed_block_timeout(
-            ),
+            sync_last_known_own_block_timeout:
+                Parameters::default_sync_last_known_own_block_timeout(),
             commit_sync_parallel_fetches: Parameters::default_commit_sync_parallel_fetches(),
             commit_sync_batch_size: Parameters::default_commit_sync_batch_size(),
             commit_sync_batches_ahead: Parameters::default_commit_sync_batches_ahead(),
diff --git a/consensus/config/tests/snapshots/parameters_test__parameters.snap b/consensus/config/tests/snapshots/parameters_test__parameters.snap
index b764571ffe0a2..60ed151ba6303 100644
--- a/consensus/config/tests/snapshots/parameters_test__parameters.snap
+++ b/consensus/config/tests/snapshots/parameters_test__parameters.snap
@@ -15,7 +15,7 @@ max_blocks_per_fetch: 1000
 dag_state_cached_rounds: 500
 commit_sync_parallel_fetches: 20
 commit_sync_batch_size: 100
-commit_sync_batches_ahead: 200
+commit_sync_batches_ahead: 80
 anemo:
   excessive_message_size: 8388608
 tonic:
@@ -25,6 +25,6 @@ tonic:
   connection_buffer_size: 33554432
   excessive_message_size: 16777216
   message_size_limit: 67108864
-sync_last_proposed_block_timeout:
-  secs: 0
+sync_last_known_own_block_timeout:
+  secs: 5
   nanos: 0
diff --git a/consensus/core/Cargo.toml b/consensus/core/Cargo.toml
index c37c0be3415d2..2cb277834c9b2 100644
--- a/consensus/core/Cargo.toml
+++ b/consensus/core/Cargo.toml
@@ -6,6 +6,9 @@ authors = ["Mysten Labs <build@mystenlabs.com>"]
 edition = "2021"
 publish = false
 
+[lints]
+workspace = true
+
 [dependencies]
 anemo.workspace = true
 anemo-tower.workspace = true
@@ -23,6 +26,7 @@ fastcrypto.workspace = true
 futures.workspace = true
 http.workspace = true
 hyper.workspace = true
+hyper-util.workspace = true
 hyper-rustls.workspace = true
 itertools.workspace = true
 quinn-proto.workspace = true
diff --git a/consensus/core/src/authority_node.rs b/consensus/core/src/authority_node.rs
index 06e57b10c0846..f896dc1a0bd89 100644
--- a/consensus/core/src/authority_node.rs
+++ b/consensus/core/src/authority_node.rs
@@ -7,7 +7,7 @@ use consensus_config::{AuthorityIndex, Committee, NetworkKeyPair, Parameters, Pr
 use parking_lot::RwLock;
 use prometheus::Registry;
 use sui_protocol_config::{ConsensusNetwork, ProtocolConfig};
-use tracing::info;
+use tracing::{info, warn};
 
 use crate::{
     authority_service::AuthorityService,
@@ -15,7 +15,8 @@ use crate::{
     block_verifier::SignedBlockVerifier,
     broadcaster::Broadcaster,
     commit_observer::CommitObserver,
-    commit_syncer::{CommitSyncer, CommitVoteMonitor},
+    commit_syncer::{CommitSyncer, CommitSyncerHandle},
+    commit_vote_monitor::CommitVoteMonitor,
     context::{Clock, Context},
     core::{Core, CoreSignals},
     core_thread::{ChannelCoreThreadDispatcher, CoreThreadHandle},
@@ -54,6 +55,11 @@ impl ConsensusAuthority {
         transaction_verifier: Arc<dyn TransactionVerifier>,
         commit_consumer: CommitConsumer,
         registry: Registry,
+        // A counter that keeps track of how many times the authority node has been booted while the binary
+        // or the component that is calling the `ConsensusAuthority` has been running. It's mostly useful to
+        // make decisions on whether amnesia recovery should run or not. When `boot_counter` is 0, then `ConsensusAuthority`
+        // will initiate the process of amnesia recovery if that's enabled in the parameters.
+        boot_counter: u64,
     ) -> Self {
         match network_type {
             ConsensusNetwork::Anemo => {
@@ -67,6 +73,7 @@ impl ConsensusAuthority {
                     transaction_verifier,
                     commit_consumer,
                     registry,
+                    boot_counter,
                 )
                 .await;
                 Self::WithAnemo(authority)
@@ -82,6 +89,7 @@ impl ConsensusAuthority {
                     transaction_verifier,
                     commit_consumer,
                     registry,
+                    boot_counter,
                 )
                 .await;
                 Self::WithTonic(authority)
@@ -110,6 +118,14 @@ impl ConsensusAuthority {
             Self::WithTonic(authority) => &authority.context,
         }
     }
+
+    #[allow(unused)]
+    fn sync_last_known_own_block_enabled(&self) -> bool {
+        match self {
+            Self::WithAnemo(authority) => authority.sync_last_known_own_block,
+            Self::WithTonic(authority) => authority.sync_last_known_own_block,
+        }
+    }
 }
 
 pub(crate) struct AuthorityNode<N>
@@ -120,7 +136,7 @@ where
     start_time: Instant,
     transaction_client: Arc<TransactionClient>,
     synchronizer: Arc<SynchronizerHandle>,
-    commit_syncer: CommitSyncer<N::Client>,
+    commit_syncer_handle: CommitSyncerHandle,
     leader_timeout_handle: LeaderTimeoutTaskHandle,
     core_thread_handle: CoreThreadHandle,
     // Only one of broadcaster and subscriber gets created, depending on
@@ -128,6 +144,7 @@ where
     broadcaster: Option<Broadcaster>,
     subscriber: Option<Subscriber<N::Client, AuthorityService<ChannelCoreThreadDispatcher>>>,
     network_manager: N,
+    sync_last_known_own_block: bool,
 }
 
 impl<N> AuthorityNode<N>
@@ -146,10 +163,11 @@ where
         transaction_verifier: Arc<dyn TransactionVerifier>,
         commit_consumer: CommitConsumer,
         registry: Registry,
+        boot_counter: u64,
     ) -> Self {
         info!(
-            "Starting consensus authority {}\n{:#?}\n{:#?}\n{:?}",
-            own_index, committee, parameters, protocol_config.version
+            "Starting consensus authority {}\n{:#?}\n{:#?}\n{:?}\nBoot counter: {}",
+            own_index, committee, parameters, protocol_config.version, boot_counter
         );
         assert!(committee.is_valid_index(own_index));
         let context = Arc::new(Context::new(
@@ -163,7 +181,7 @@ where
         let start_time = Instant::now();
 
         let (tx_client, tx_receiver) = TransactionClient::new(context.clone());
-        let tx_consumer = TransactionConsumer::new(tx_receiver, context.clone(), None);
+        let tx_consumer = TransactionConsumer::new(tx_receiver, context.clone());
 
         let (core_signals, signals_receivers) = CoreSignals::new(context.clone());
 
@@ -185,6 +203,13 @@ where
         let store_path = context.parameters.db_path.as_path().to_str().unwrap();
         let store = Arc::new(RocksDBStore::new(store_path));
         let dag_state = Arc::new(RwLock::new(DagState::new(context.clone(), store.clone())));
+        let sync_last_known_own_block = boot_counter == 0
+            && dag_state.read().highest_accepted_round() == 0
+            && !context
+                .parameters
+                .sync_last_known_own_block_timeout
+                .is_zero();
+        info!("Sync last known own block: {sync_last_known_own_block}");
 
         let block_verifier = Arc::new(SignedBlockVerifier::new(
             context.clone(),
@@ -209,6 +234,7 @@ where
             ))
         };
 
+        let commit_consumer_monitor = commit_consumer.monitor();
         let commit_observer = CommitObserver::new(
             context.clone(),
             commit_consumer,
@@ -229,6 +255,7 @@ where
             core_signals,
             protocol_keypair,
             dag_state.clone(),
+            sync_last_known_own_block,
         );
 
         let (core_dispatcher, core_thread_handle) =
@@ -238,6 +265,7 @@ where
             LeaderTimeoutTask::start(core_dispatcher.clone(), &signals_receivers, context.clone());
 
         let commit_vote_monitor = Arc::new(CommitVoteMonitor::new(context.clone()));
+
         let synchronizer = Synchronizer::start(
             network_client.clone(),
             context.clone(),
@@ -245,16 +273,19 @@ where
             commit_vote_monitor.clone(),
             block_verifier.clone(),
             dag_state.clone(),
+            sync_last_known_own_block,
         );
 
-        let commit_syncer = CommitSyncer::new(
+        let commit_syncer_handle = CommitSyncer::new(
             context.clone(),
             core_dispatcher.clone(),
             commit_vote_monitor.clone(),
+            commit_consumer_monitor,
             network_client.clone(),
             block_verifier.clone(),
             dag_state.clone(),
-        );
+        )
+        .start();
 
         let network_service = Arc::new(AuthorityService::new(
             context.clone(),
@@ -296,12 +327,13 @@ where
             start_time,
             transaction_client: Arc::new(tx_client),
             synchronizer,
-            commit_syncer,
+            commit_syncer_handle,
             leader_timeout_handle,
             core_thread_handle,
             broadcaster,
             subscriber,
             network_manager,
+            sync_last_known_own_block,
         }
     }
 
@@ -312,8 +344,16 @@ where
         );
 
         // First shutdown components calling into Core.
-        self.synchronizer.stop().await.ok();
-        self.commit_syncer.stop().await;
+        if let Err(e) = self.synchronizer.stop().await {
+            if e.is_panic() {
+                std::panic::resume_unwind(e.into_panic());
+            }
+            warn!(
+                "Failed to stop synchronizer when shutting down consensus: {:?}",
+                e
+            );
+        };
+        self.commit_syncer_handle.stop().await;
         self.leader_timeout_handle.stop().await;
         // Shutdown Core to stop block productions and broadcast.
         // When using streaming, all subscribers to broadcasted blocks stop after this.
@@ -343,7 +383,7 @@ where
 mod tests {
     #![allow(non_snake_case)]
 
-    use std::sync::Mutex;
+    use std::collections::BTreeMap;
     use std::{collections::BTreeSet, sync::Arc, time::Duration};
 
     use consensus_config::{local_committee_and_keys, Parameters};
@@ -352,10 +392,11 @@ mod tests {
     use rstest::rstest;
     use sui_protocol_config::ProtocolConfig;
     use tempfile::TempDir;
-    use tokio::time::sleep;
+    use tokio::time::{sleep, timeout};
     use typed_store::DBMetrics;
 
     use super::*;
+    use crate::block::GENESIS_ROUND;
     use crate::{block::BlockAPI as _, transaction::NoopTransactionVerifier, CommittedSubDag};
 
     #[rstest]
@@ -378,7 +419,7 @@ mod tests {
         let network_keypair = keypairs[own_index].0.clone();
 
         let (sender, _receiver) = unbounded_channel("consensus_output");
-        let commit_consumer = CommitConsumer::new(sender, 0, 0);
+        let commit_consumer = CommitConsumer::new(sender, 0);
 
         let authority = ConsensusAuthority::start(
             network_type,
@@ -391,6 +432,7 @@ mod tests {
             Arc::new(txn_verifier),
             commit_consumer,
             registry,
+            0,
         )
         .await;
 
@@ -410,11 +452,15 @@ mod tests {
         let db_registry = Registry::new();
         DBMetrics::init(&db_registry);
 
-        let (committee, keypairs) = local_committee_and_keys(0, vec![1, 1, 1, 1]);
-        let temp_dirs = (0..4).map(|_| TempDir::new().unwrap()).collect::<Vec<_>>();
+        const NUM_OF_AUTHORITIES: usize = 4;
+        let (committee, keypairs) = local_committee_and_keys(0, [1; NUM_OF_AUTHORITIES].to_vec());
+        let temp_dirs = (0..NUM_OF_AUTHORITIES)
+            .map(|_| TempDir::new().unwrap())
+            .collect::<Vec<_>>();
 
         let mut output_receivers = Vec::with_capacity(committee.size());
         let mut authorities = Vec::with_capacity(committee.size());
+        let mut boot_counters = [0; NUM_OF_AUTHORITIES];
 
         for (index, _authority_info) in committee.authorities() {
             let (authority, receiver) = make_authority(
@@ -423,8 +469,10 @@ mod tests {
                 committee.clone(),
                 keypairs.clone(),
                 network_type,
+                boot_counters[index],
             )
             .await;
+            boot_counters[index] += 1;
             output_receivers.push(receiver);
             authorities.push(authority);
         }
@@ -468,7 +516,7 @@ mod tests {
         // Stop authority 1.
         let index = committee.to_authority_index(1).unwrap();
         authorities.remove(index.value()).stop().await;
-        sleep(Duration::from_secs(15)).await;
+        sleep(Duration::from_secs(10)).await;
 
         // Restart authority 1 and let it run.
         let (authority, receiver) = make_authority(
@@ -477,11 +525,13 @@ mod tests {
             committee.clone(),
             keypairs.clone(),
             network_type,
+            boot_counters[index],
         )
         .await;
+        boot_counters[index] += 1;
         output_receivers[index] = receiver;
         authorities.insert(index.value(), authority);
-        sleep(Duration::from_secs(15)).await;
+        sleep(Duration::from_secs(10)).await;
 
         // Stop all authorities and exit.
         for authority in authorities {
@@ -491,166 +541,120 @@ mod tests {
 
     #[rstest]
     #[tokio::test(flavor = "current_thread")]
-    async fn test_amnesia_success(
+    async fn test_amnesia_recovery_success(
         #[values(ConsensusNetwork::Anemo, ConsensusNetwork::Tonic)] network_type: ConsensusNetwork,
     ) {
         telemetry_subscribers::init_for_testing();
         let db_registry = Registry::new();
         DBMetrics::init(&db_registry);
 
-        let (committee, keypairs) = local_committee_and_keys(0, vec![1, 1, 1, 1]);
+        const NUM_OF_AUTHORITIES: usize = 4;
+        let (committee, keypairs) = local_committee_and_keys(0, [1; NUM_OF_AUTHORITIES].to_vec());
         let mut output_receivers = vec![];
-        let mut authorities = vec![];
+        let mut authorities = BTreeMap::new();
+        let mut temp_dirs = BTreeMap::new();
+        let mut boot_counters = [0; NUM_OF_AUTHORITIES];
 
         for (index, _authority_info) in committee.authorities() {
+            let dir = TempDir::new().unwrap();
             let (authority, receiver) = make_authority(
                 index,
-                &TempDir::new().unwrap(),
+                &dir,
                 committee.clone(),
                 keypairs.clone(),
                 network_type,
+                boot_counters[index],
             )
             .await;
+            assert!(authority.sync_last_known_own_block_enabled(), "Expected syncing of last known own block to be enabled as all authorities are of empty db and boot for first time.");
+            boot_counters[index] += 1;
             output_receivers.push(receiver);
-            authorities.push(authority);
+            authorities.insert(index, authority);
+            temp_dirs.insert(index, dir);
         }
 
-        const NUM_TRANSACTIONS: u8 = 15;
-        let mut submitted_transactions = BTreeSet::<Vec<u8>>::new();
-        for i in 0..NUM_TRANSACTIONS {
-            let txn = vec![i; 16];
-            submitted_transactions.insert(txn.clone());
-            authorities[i as usize % authorities.len()]
-                .transaction_client()
-                .submit(vec![txn])
+        // Now we take the receiver of authority 1 and we wait until we see at least one block committed from this authority
+        // We wait until we see at least one committed block authored from this authority. That way we'll be 100% sure that
+        // at least one block has been proposed and successfully received by a quorum of nodes.
+        let index_1 = committee.to_authority_index(1).unwrap();
+        'outer: while let Some(result) =
+            timeout(Duration::from_secs(10), output_receivers[index_1].recv())
                 .await
-                .unwrap();
-        }
-
-        for receiver in &mut output_receivers {
-            let mut expected_transactions = submitted_transactions.clone();
-            loop {
-                let committed_subdag =
-                    tokio::time::timeout(Duration::from_secs(1), receiver.recv())
-                        .await
-                        .unwrap()
-                        .unwrap();
-                for b in committed_subdag.blocks {
-                    for txn in b.transactions().iter().map(|t| t.data().to_vec()) {
-                        assert!(
-                            expected_transactions.remove(&txn),
-                            "Transaction not submitted or already seen: {:?}",
-                            txn
-                        );
-                    }
-                }
-                assert_eq!(committed_subdag.reputation_scores_desc, vec![]);
-                if expected_transactions.is_empty() {
-                    break;
+                .expect("Timed out while waiting for at least one committed block from authority 1")
+        {
+            for block in result.blocks {
+                if block.round() > GENESIS_ROUND && block.author() == index_1 {
+                    break 'outer;
                 }
             }
         }
 
-        // Stop authority 1.
-        let index = committee.to_authority_index(1).unwrap();
-        authorities.remove(index.value()).stop().await;
+        // Stop authority 1 & 2.
+        // * Authority 1 will be used to wipe out their DB and practically "force" the amnesia recovery.
+        // * Authority 2 is stopped in order to simulate less than f+1 availability which will
+        // make authority 1 retry during amnesia recovery until it has finally managed to successfully get back f+1 responses.
+        // once authority 2 is up and running again.
+        authorities.remove(&index_1).unwrap().stop().await;
+        let index_2 = committee.to_authority_index(2).unwrap();
+        authorities.remove(&index_2).unwrap().stop().await;
         sleep(Duration::from_secs(5)).await;
 
-        // now create a new directory to simulate amnesia. The node will start having participated previously
-        // to consensus but now will attempt to synchronize the last own block and recover from there.
+        // Authority 1: create a new directory to simulate amnesia. The node will start having participated previously
+        // to consensus but now will attempt to synchronize the last own block and recover from there. It won't be able
+        // to do that successfully as authority 2 is still down.
+        let dir = TempDir::new().unwrap();
+        // We do reset the boot counter for this one to simulate a "binary" restart
+        boot_counters[index_1] = 0;
         let (authority, mut receiver) = make_authority(
-            index,
-            &TempDir::new().unwrap(),
+            index_1,
+            &dir,
+            committee.clone(),
+            keypairs.clone(),
+            network_type,
+            boot_counters[index_1],
+        )
+        .await;
+        assert!(
+            authority.sync_last_known_own_block_enabled(),
+            "Authority should have the sync of last own block enabled"
+        );
+        boot_counters[index_1] += 1;
+        authorities.insert(index_1, authority);
+        temp_dirs.insert(index_1, dir);
+        sleep(Duration::from_secs(5)).await;
+
+        // Now spin up authority 2 using its earlier directly - so no amnesia recovery should be forced here.
+        // Authority 1 should be able to recover from amnesia successfully.
+        let (authority, _receiver) = make_authority(
+            index_2,
+            &temp_dirs[&index_2],
             committee.clone(),
             keypairs,
             network_type,
+            boot_counters[index_2],
         )
         .await;
-        authorities.insert(index.value(), authority);
+        assert!(
+            !authority.sync_last_known_own_block_enabled(),
+            "Authority should not have attempted to sync the last own block"
+        );
+        boot_counters[index_2] += 1;
+        authorities.insert(index_2, authority);
         sleep(Duration::from_secs(5)).await;
 
         // We wait until we see at least one committed block authored from this authority
         'outer: while let Some(result) = receiver.recv().await {
             for block in result.blocks {
-                if block.author() == index {
+                if block.round() > GENESIS_ROUND && block.author() == index_1 {
                     break 'outer;
                 }
             }
         }
 
         // Stop all authorities and exit.
-        for authority in authorities {
-            authority.stop().await;
-        }
-    }
-
-    #[rstest]
-    #[tokio::test]
-    async fn test_amnesia_failure(
-        #[values(ConsensusNetwork::Anemo, ConsensusNetwork::Tonic)] network_type: ConsensusNetwork,
-    ) {
-        telemetry_subscribers::init_for_testing();
-
-        let occurred_panic = Arc::new(Mutex::new(None));
-        let occurred_panic_cloned = occurred_panic.clone();
-
-        let default_panic_handler = std::panic::take_hook();
-        std::panic::set_hook(Box::new(move |panic| {
-            let mut l = occurred_panic_cloned.lock().unwrap();
-            *l = Some(panic.to_string());
-            default_panic_handler(panic);
-        }));
-
-        let db_registry = Registry::new();
-        DBMetrics::init(&db_registry);
-
-        let (committee, keypairs) = local_committee_and_keys(0, vec![1, 1, 1, 1]);
-        let mut output_receivers = vec![];
-        let mut authorities = vec![];
-
-        for (index, _authority_info) in committee.authorities() {
-            let (authority, receiver) = make_authority(
-                index,
-                &TempDir::new().unwrap(),
-                committee.clone(),
-                keypairs.clone(),
-                network_type,
-            )
-            .await;
-            output_receivers.push(receiver);
-            authorities.push(authority);
-        }
-
-        // Let the network run for a few seconds
-        sleep(Duration::from_secs(5)).await;
-
-        // Stop all authorities
-        while let Some(authority) = authorities.pop() {
+        for (_, authority) in authorities {
             authority.stop().await;
         }
-
-        sleep(Duration::from_secs(2)).await;
-
-        let index = AuthorityIndex::new_for_test(0);
-        let (_authority, _receiver) = make_authority(
-            index,
-            &TempDir::new().unwrap(),
-            committee,
-            keypairs,
-            network_type,
-        )
-        .await;
-        sleep(Duration::from_secs(5)).await;
-
-        // Now reset the panic hook
-        let _default_panic_handler = std::panic::take_hook();
-
-        // We expect this test to panic as all the other peers are down and the node that tries to
-        // recover its last produced block fails.
-        let panic_info = occurred_panic.lock().unwrap().take().unwrap();
-        assert!(panic_info.contains(
-            "No peer has returned any acceptable result, can not safely update min round"
-        ));
     }
 
     // TODO: create a fixture
@@ -660,6 +664,7 @@ mod tests {
         committee: Committee,
         keypairs: Vec<(NetworkKeyPair, ProtocolKeyPair)>,
         network_type: ConsensusNetwork,
+        boot_counter: u64,
     ) -> (ConsensusAuthority, UnboundedReceiver<CommittedSubDag>) {
         let registry = Registry::new();
 
@@ -669,7 +674,7 @@ mod tests {
             dag_state_cached_rounds: 5,
             commit_sync_parallel_fetches: 3,
             commit_sync_batch_size: 3,
-            sync_last_proposed_block_timeout: Duration::from_millis(2_000),
+            sync_last_known_own_block_timeout: Duration::from_millis(2_000),
             ..Default::default()
         };
         let txn_verifier = NoopTransactionVerifier {};
@@ -678,7 +683,7 @@ mod tests {
         let network_keypair = keypairs[index].0.clone();
 
         let (sender, receiver) = unbounded_channel("consensus_output");
-        let commit_consumer = CommitConsumer::new(sender, 0, 0);
+        let commit_consumer = CommitConsumer::new(sender, 0);
 
         let authority = ConsensusAuthority::start(
             network_type,
@@ -691,8 +696,10 @@ mod tests {
             Arc::new(txn_verifier),
             commit_consumer,
             registry,
+            boot_counter,
         )
         .await;
+
         (authority, receiver)
     }
 }
diff --git a/consensus/core/src/authority_service.rs b/consensus/core/src/authority_service.rs
index feac2741570cc..94fa311e01a6b 100644
--- a/consensus/core/src/authority_service.rs
+++ b/consensus/core/src/authority_service.rs
@@ -17,7 +17,7 @@ use crate::{
     block::{BlockAPI as _, BlockRef, SignedBlock, VerifiedBlock, GENESIS_ROUND},
     block_verifier::BlockVerifier,
     commit::{CommitAPI as _, CommitRange, TrustedCommit},
-    commit_syncer::CommitVoteMonitor,
+    commit_vote_monitor::CommitVoteMonitor,
     context::Context,
     core_thread::CoreThreadDispatcher,
     dag_state::DagState,
@@ -133,7 +133,7 @@ impl<C: CoreThreadDispatcher> NetworkService for AuthorityService<C> {
                 .metrics
                 .node_metrics
                 .rejected_future_blocks
-                .with_label_values(&[&peer_hostname])
+                .with_label_values(&[peer_hostname])
                 .inc();
             debug!(
                 "Block {:?} timestamp ({} > {}) is too far in the future, rejected.",
@@ -157,7 +157,7 @@ impl<C: CoreThreadDispatcher> NetworkService for AuthorityService<C> {
                 .metrics
                 .node_metrics
                 .block_timestamp_drift_wait_ms
-                .with_label_values(&[peer_hostname, &"handle_send_block"])
+                .with_label_values(&[peer_hostname, "handle_send_block"])
                 .inc_by(forward_time_drift.as_millis() as u64);
             debug!(
                 "Block {:?} timestamp ({} > {}) is in the future, waiting for {}ms",
@@ -171,7 +171,7 @@ impl<C: CoreThreadDispatcher> NetworkService for AuthorityService<C> {
 
         // Observe the block for the commit votes. When local commit is lagging too much,
         // commit sync loop will trigger fetching.
-        self.commit_vote_monitor.observe(&verified_block);
+        self.commit_vote_monitor.observe_block(&verified_block);
 
         // Reject blocks when local commit index is lagging too far from quorum commit index.
         //
@@ -192,7 +192,7 @@ impl<C: CoreThreadDispatcher> NetworkService for AuthorityService<C> {
                 .metrics
                 .node_metrics
                 .rejected_blocks
-                .with_label_values(&[&"commit_lagging"])
+                .with_label_values(&["commit_lagging"])
                 .inc();
             debug!(
                 "Block {:?} is rejected because last commit index is lagging quorum commit index too much ({} < {})",
@@ -213,7 +213,7 @@ impl<C: CoreThreadDispatcher> NetworkService for AuthorityService<C> {
             .metrics
             .node_metrics
             .verified_blocks
-            .with_label_values(&[&peer_hostname])
+            .with_label_values(&[peer_hostname])
             .inc();
 
         let missing_ancestors = self
@@ -567,7 +567,7 @@ mod tests {
         authority_service::AuthorityService,
         block::BlockAPI,
         block::{BlockRef, SignedBlock, TestBlock, VerifiedBlock},
-        commit_syncer::CommitVoteMonitor,
+        commit_vote_monitor::CommitVoteMonitor,
         context::Context,
         core_thread::{CoreError, CoreThreadDispatcher},
         dag_state::DagState,
@@ -689,24 +689,25 @@ mod tests {
         let (context, _keys) = Context::new_for_test(4);
         let context = Arc::new(context);
         let block_verifier = Arc::new(crate::block_verifier::NoopBlockVerifier {});
+        let commit_vote_monitor = Arc::new(CommitVoteMonitor::new(context.clone()));
         let core_dispatcher = Arc::new(FakeCoreThreadDispatcher::new());
         let (_tx_block_broadcast, rx_block_broadcast) = broadcast::channel(100);
         let network_client = Arc::new(FakeNetworkClient::default());
         let store = Arc::new(MemStore::new());
         let dag_state = Arc::new(RwLock::new(DagState::new(context.clone(), store.clone())));
-        let commit_vote_monitor = Arc::new(CommitVoteMonitor::new(context.clone()));
         let synchronizer = Synchronizer::start(
             network_client,
             context.clone(),
             core_dispatcher.clone(),
-            commit_vote_monitor,
+            commit_vote_monitor.clone(),
             block_verifier.clone(),
             dag_state.clone(),
+            false,
         );
         let authority_service = Arc::new(AuthorityService::new(
             context.clone(),
             block_verifier,
-            Arc::new(CommitVoteMonitor::new(context.clone())),
+            commit_vote_monitor,
             synchronizer,
             core_dispatcher.clone(),
             rx_block_broadcast,
@@ -747,24 +748,25 @@ mod tests {
         let (context, _keys) = Context::new_for_test(4);
         let context = Arc::new(context);
         let block_verifier = Arc::new(crate::block_verifier::NoopBlockVerifier {});
+        let commit_vote_monitor = Arc::new(CommitVoteMonitor::new(context.clone()));
         let core_dispatcher = Arc::new(FakeCoreThreadDispatcher::new());
         let (_tx_block_broadcast, rx_block_broadcast) = broadcast::channel(100);
         let network_client = Arc::new(FakeNetworkClient::default());
         let store = Arc::new(MemStore::new());
         let dag_state = Arc::new(RwLock::new(DagState::new(context.clone(), store.clone())));
-        let commit_vote_monitor = Arc::new(CommitVoteMonitor::new(context.clone()));
         let synchronizer = Synchronizer::start(
             network_client,
             context.clone(),
             core_dispatcher.clone(),
-            commit_vote_monitor,
+            commit_vote_monitor.clone(),
             block_verifier.clone(),
             dag_state.clone(),
+            true,
         );
         let authority_service = Arc::new(AuthorityService::new(
             context.clone(),
             block_verifier,
-            Arc::new(CommitVoteMonitor::new(context.clone())),
+            commit_vote_monitor,
             synchronizer,
             core_dispatcher.clone(),
             rx_block_broadcast,
diff --git a/consensus/core/src/block_verifier.rs b/consensus/core/src/block_verifier.rs
index 7c04605ddb0f5..2e876e9130f0b 100644
--- a/consensus/core/src/block_verifier.rs
+++ b/consensus/core/src/block_verifier.rs
@@ -142,8 +142,43 @@ impl BlockVerifier for SignedBlockVerifier {
             });
         }
 
-        // TODO: check transaction size, total size and count.
         let batch: Vec<_> = block.transactions().iter().map(|t| t.data()).collect();
+
+        let max_transaction_size_limit =
+            self.context
+                .protocol_config
+                .consensus_max_transaction_size_bytes() as usize;
+        for t in &batch {
+            if t.len() > max_transaction_size_limit && max_transaction_size_limit > 0 {
+                return Err(ConsensusError::TransactionTooLarge {
+                    size: t.len(),
+                    limit: max_transaction_size_limit,
+                });
+            }
+        }
+
+        let max_num_transactions_limit =
+            self.context.protocol_config.max_num_transactions_in_block() as usize;
+        if batch.len() > max_num_transactions_limit && max_num_transactions_limit > 0 {
+            return Err(ConsensusError::TooManyTransactions {
+                count: batch.len(),
+                limit: max_num_transactions_limit,
+            });
+        }
+
+        let total_transactions_size_limit =
+            self.context
+                .protocol_config
+                .consensus_max_transactions_in_block_bytes() as usize;
+        if batch.iter().map(|t| t.len()).sum::<usize>() > total_transactions_size_limit
+            && total_transactions_size_limit > 0
+        {
+            return Err(ConsensusError::TooManyTransactionBytes {
+                size: batch.len(),
+                limit: total_transactions_size_limit,
+            });
+        }
+
         self.transaction_verifier
             .verify_batch(&self.context.protocol_config, &batch)
             .map_err(|e| ConsensusError::InvalidTransaction(format!("{e:?}")))
@@ -171,6 +206,7 @@ impl BlockVerifier for SignedBlockVerifier {
     }
 }
 
+#[allow(unused)]
 pub(crate) struct NoopBlockVerifier;
 
 impl BlockVerifier for NoopBlockVerifier {
@@ -445,6 +481,49 @@ mod test {
                 Err(ConsensusError::InvalidTransaction(_))
             ));
         }
+
+        // Block with transaction too large.
+        {
+            let block = test_block
+                .clone()
+                .set_transactions(vec![Transaction::new(vec![4; 257 * 1024])])
+                .build();
+            let signed_block = SignedBlock::new(block, authority_2_protocol_keypair).unwrap();
+            assert!(matches!(
+                verifier.verify(&signed_block),
+                Err(ConsensusError::TransactionTooLarge { size: _, limit: _ })
+            ));
+        }
+
+        // Block with too many transactions.
+        {
+            let block = test_block
+                .clone()
+                .set_transactions((0..1000).map(|_| Transaction::new(vec![4; 8])).collect())
+                .build();
+            let signed_block = SignedBlock::new(block, authority_2_protocol_keypair).unwrap();
+            assert!(matches!(
+                verifier.verify(&signed_block),
+                Err(ConsensusError::TooManyTransactions { count: _, limit: _ })
+            ));
+        }
+
+        // Block with too many transaction bytes.
+        {
+            let block = test_block
+                .clone()
+                .set_transactions(
+                    (0..100)
+                        .map(|_| Transaction::new(vec![4; 8 * 1024]))
+                        .collect(),
+                )
+                .build();
+            let signed_block = SignedBlock::new(block, authority_2_protocol_keypair).unwrap();
+            assert!(matches!(
+                verifier.verify(&signed_block),
+                Err(ConsensusError::TooManyTransactionBytes { size: _, limit: _ })
+            ));
+        }
     }
 
     #[tokio::test]
diff --git a/consensus/core/src/commit.rs b/consensus/core/src/commit.rs
index 810fd9eb43b9d..f50d5ba469b89 100644
--- a/consensus/core/src/commit.rs
+++ b/consensus/core/src/commit.rs
@@ -13,7 +13,6 @@ use bytes::Bytes;
 use consensus_config::{AuthorityIndex, DefaultHashFunction, DIGEST_LENGTH};
 use enum_dispatch::enum_dispatch;
 use fastcrypto::hash::{Digest, HashFunction as _};
-use mysten_metrics::monitored_mpsc::UnboundedSender;
 use serde::{Deserialize, Serialize};
 
 use crate::{
@@ -398,32 +397,6 @@ pub fn load_committed_subdag_from_store(
     )
 }
 
-pub struct CommitConsumer {
-    // A channel to send the committed sub dags through
-    pub sender: UnboundedSender<CommittedSubDag>,
-    // Leader round of the last commit that the consumer has processed.
-    pub last_processed_commit_round: Round,
-    // Index of the last commit that the consumer has processed. This is useful for
-    // crash/recovery so mysticeti can replay the commits from the next index.
-    // First commit in the replayed sequence will have index last_processed_commit_index + 1.
-    // Set 0 to replay from the start (as generated commit sequence starts at index = 1).
-    pub last_processed_commit_index: CommitIndex,
-}
-
-impl CommitConsumer {
-    pub fn new(
-        sender: UnboundedSender<CommittedSubDag>,
-        last_processed_commit_round: Round,
-        last_processed_commit_index: CommitIndex,
-    ) -> Self {
-        Self {
-            sender,
-            last_processed_commit_round,
-            last_processed_commit_index,
-        }
-    }
-}
-
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]
 pub(crate) enum Decision {
     Direct,
diff --git a/consensus/core/src/commit_consumer.rs b/consensus/core/src/commit_consumer.rs
new file mode 100644
index 0000000000000..47a96d80f0e2a
--- /dev/null
+++ b/consensus/core/src/commit_consumer.rs
@@ -0,0 +1,74 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use std::sync::{atomic::AtomicU32, Arc};
+
+use mysten_metrics::monitored_mpsc::UnboundedSender;
+
+use crate::{CommitIndex, CommittedSubDag};
+
+pub struct CommitConsumer {
+    // A channel to send the committed sub dags through
+    pub(crate) sender: UnboundedSender<CommittedSubDag>,
+    // Index of the last commit that the consumer has processed. This is useful for
+    // crash/recovery so mysticeti can replay the commits from the next index.
+    // First commit in the replayed sequence will have index last_processed_commit_index + 1.
+    // Set 0 to replay from the start (as generated commit sequence starts at index = 1).
+    pub(crate) last_processed_commit_index: CommitIndex,
+    // Allows the commit consumer to report its progress.
+    monitor: Arc<CommitConsumerMonitor>,
+}
+
+impl CommitConsumer {
+    pub fn new(
+        sender: UnboundedSender<CommittedSubDag>,
+        last_processed_commit_index: CommitIndex,
+    ) -> Self {
+        let monitor = Arc::new(CommitConsumerMonitor::new(last_processed_commit_index));
+        Self {
+            sender,
+            last_processed_commit_index,
+            monitor,
+        }
+    }
+
+    pub fn monitor(&self) -> Arc<CommitConsumerMonitor> {
+        self.monitor.clone()
+    }
+}
+
+pub struct CommitConsumerMonitor {
+    highest_handled_commit: AtomicU32,
+}
+
+impl CommitConsumerMonitor {
+    pub(crate) fn new(last_handled_commit: CommitIndex) -> Self {
+        Self {
+            highest_handled_commit: AtomicU32::new(last_handled_commit),
+        }
+    }
+
+    pub(crate) fn highest_handled_commit(&self) -> CommitIndex {
+        self.highest_handled_commit
+            .load(std::sync::atomic::Ordering::Acquire)
+    }
+
+    pub fn set_highest_handled_commit(&self, highest_handled_commit: CommitIndex) {
+        self.highest_handled_commit
+            .store(highest_handled_commit, std::sync::atomic::Ordering::Release);
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::CommitConsumerMonitor;
+
+    #[test]
+    fn test_commit_consumer_monitor() {
+        let monitor = CommitConsumerMonitor::new(10);
+        assert_eq!(monitor.highest_handled_commit(), 10);
+
+        monitor.set_highest_handled_commit(100);
+        assert_eq!(monitor.highest_handled_commit(), 100);
+    }
+}
diff --git a/consensus/core/src/commit_observer.rs b/consensus/core/src/commit_observer.rs
index 34cf4871234f0..a25113de387fb 100644
--- a/consensus/core/src/commit_observer.rs
+++ b/consensus/core/src/commit_observer.rs
@@ -23,14 +23,16 @@ use crate::{
 /// Role of CommitObserver
 /// - Called by core when try_commit() returns newly committed leaders.
 /// - The newly committed leaders are sent to commit observer and then commit observer
-/// gets subdags for each leader via the commit interpreter (linearizer)
+///     gets subdags for each leader via the commit interpreter (linearizer)
 /// - The committed subdags are sent as consensus output via an unbounded tokio channel.
+///
 /// No back pressure mechanism is needed as backpressure is handled as input into
 /// consenus.
+///
 /// - Commit metadata including index is persisted in store, before the CommittedSubDag
-/// is sent to the consumer.
+///     is sent to the consumer.
 /// - When CommitObserver is initialized a last processed commit index can be used
-/// to ensure any missing commits are re-sent.
+///     to ensure any missing commits are re-sent.
 pub(crate) struct CommitObserver {
     context: Arc<Context>,
     /// Component to deterministically collect subdags for committed leaders.
@@ -210,11 +212,7 @@ mod tests {
 
     use super::*;
     use crate::{
-        block::{BlockRef, Round},
-        commit::DEFAULT_WAVE_LENGTH,
-        context::Context,
-        dag_state::DagState,
-        storage::mem_store::MemStore,
+        block::BlockRef, context::Context, dag_state::DagState, storage::mem_store::MemStore,
         test_dag_builder::DagBuilder,
     };
 
@@ -228,7 +226,6 @@ mod tests {
             context.clone(),
             mem_store.clone(),
         )));
-        let last_processed_commit_round = 0;
         let last_processed_commit_index = 0;
         let (sender, mut receiver) = unbounded_channel("consensus_output");
 
@@ -239,11 +236,7 @@ mod tests {
 
         let mut observer = CommitObserver::new(
             context.clone(),
-            CommitConsumer::new(
-                sender,
-                last_processed_commit_round,
-                last_processed_commit_index,
-            ),
+            CommitConsumer::new(sender, last_processed_commit_index),
             dag_state.clone(),
             mem_store.clone(),
             leader_schedule,
@@ -332,7 +325,6 @@ mod tests {
             context.clone(),
             mem_store.clone(),
         )));
-        let last_processed_commit_round = 0;
         let last_processed_commit_index = 0;
         let (sender, mut receiver) = unbounded_channel("consensus_output");
 
@@ -343,11 +335,7 @@ mod tests {
 
         let mut observer = CommitObserver::new(
             context.clone(),
-            CommitConsumer::new(
-                sender.clone(),
-                last_processed_commit_round,
-                last_processed_commit_index,
-            ),
+            CommitConsumer::new(sender.clone(), last_processed_commit_index),
             dag_state.clone(),
             mem_store.clone(),
             leader_schedule.clone(),
@@ -370,8 +358,6 @@ mod tests {
         // Commit first batch of leaders (2) and "receive" the subdags as the
         // consumer of the consensus output channel.
         let expected_last_processed_index: usize = 2;
-        let expected_last_processed_round =
-            expected_last_processed_index as u32 * DEFAULT_WAVE_LENGTH;
         let mut commits = observer
             .handle_commit(
                 leaders
@@ -443,11 +429,7 @@ mod tests {
         // last processed index from the consumer over consensus output channel
         let _observer = CommitObserver::new(
             context.clone(),
-            CommitConsumer::new(
-                sender,
-                expected_last_processed_round as Round,
-                expected_last_processed_index as CommitIndex,
-            ),
+            CommitConsumer::new(sender, expected_last_processed_index as CommitIndex),
             dag_state.clone(),
             mem_store.clone(),
             leader_schedule,
@@ -480,7 +462,6 @@ mod tests {
             context.clone(),
             mem_store.clone(),
         )));
-        let last_processed_commit_round = 0;
         let last_processed_commit_index = 0;
         let (sender, mut receiver) = unbounded_channel("consensus_output");
 
@@ -491,11 +472,7 @@ mod tests {
 
         let mut observer = CommitObserver::new(
             context.clone(),
-            CommitConsumer::new(
-                sender.clone(),
-                last_processed_commit_round,
-                last_processed_commit_index,
-            ),
+            CommitConsumer::new(sender.clone(), last_processed_commit_index),
             dag_state.clone(),
             mem_store.clone(),
             leader_schedule.clone(),
@@ -518,8 +495,6 @@ mod tests {
         // Commit all of the leaders and "receive" the subdags as the consumer of
         // the consensus output channel.
         let expected_last_processed_index: usize = 10;
-        let expected_last_processed_round =
-            expected_last_processed_index as u32 * DEFAULT_WAVE_LENGTH;
         let commits = observer.handle_commit(leaders.clone()).unwrap();
 
         // Check commits sent over consensus output channel is accurate
@@ -548,11 +523,7 @@ mod tests {
         // last processed index from the consumer over consensus output channel
         let _observer = CommitObserver::new(
             context.clone(),
-            CommitConsumer::new(
-                sender,
-                expected_last_processed_round as Round,
-                expected_last_processed_index as CommitIndex,
-            ),
+            CommitConsumer::new(sender, expected_last_processed_index as CommitIndex),
             dag_state.clone(),
             mem_store.clone(),
             leader_schedule,
diff --git a/consensus/core/src/commit_syncer.rs b/consensus/core/src/commit_syncer.rs
index 6737561786168..f4ecf4fa2f951 100644
--- a/consensus/core/src/commit_syncer.rs
+++ b/consensus/core/src/commit_syncer.rs
@@ -47,23 +47,60 @@ use tracing::{debug, info, warn};
 use crate::{
     block::{BlockAPI, BlockRef, SignedBlock, VerifiedBlock},
     block_verifier::BlockVerifier,
-    commit::{
-        Commit, CommitAPI as _, CommitDigest, CommitRange, CommitRef, TrustedCommit,
-        GENESIS_COMMIT_INDEX,
-    },
+    commit::{Commit, CommitAPI as _, CommitDigest, CommitRange, CommitRef, TrustedCommit},
+    commit_vote_monitor::CommitVoteMonitor,
     context::Context,
     core_thread::CoreThreadDispatcher,
     dag_state::DagState,
     error::{ConsensusError, ConsensusResult},
     network::NetworkClient,
     stake_aggregator::{QuorumThreshold, StakeAggregator},
-    CommitIndex,
+    CommitConsumerMonitor, CommitIndex,
 };
 
-pub(crate) struct CommitSyncer<C: NetworkClient> {
+// Handle to stop the CommitSyncer loop.
+pub(crate) struct CommitSyncerHandle {
     schedule_task: JoinHandle<()>,
     tx_shutdown: oneshot::Sender<()>,
-    _phantom: std::marker::PhantomData<C>,
+}
+
+impl CommitSyncerHandle {
+    pub(crate) async fn stop(self) {
+        let _ = self.tx_shutdown.send(());
+        // Do not abort schedule task, which waits for fetches to shut down.
+        if let Err(e) = self.schedule_task.await {
+            if e.is_panic() {
+                std::panic::resume_unwind(e.into_panic());
+            }
+        }
+    }
+}
+
+pub(crate) struct CommitSyncer<C: NetworkClient> {
+    // States shared by scheduler and fetch tasks.
+
+    // Shared components wrapper.
+    inner: Arc<Inner<C>>,
+    // State of peers shared by fetch tasks, to determine the next peer to fetch against.
+    peer_state: Arc<Mutex<PeerState>>,
+
+    // States only used by the scheduler.
+
+    // Inflight requests to fetch commits from different authorities.
+    inflight_fetches: JoinSet<(u32, Vec<TrustedCommit>, Vec<VerifiedBlock>)>,
+    // Additional ranges of commits to fetch.
+    pending_fetches: BTreeSet<CommitRange>,
+    // Fetched commits and blocks by commit range.
+    fetched_ranges: BTreeMap<CommitRange, Vec<VerifiedBlock>>,
+    // Highest commit index among inflight and pending fetches.
+    // Used to determine the start of new ranges to be fetched.
+    highest_scheduled_index: Option<CommitIndex>,
+    // Highest index among fetched commits, after commits and blocks are verified.
+    // Used for metrics.
+    highest_fetched_commit_index: CommitIndex,
+    // The commit index that is the max of highest local commit index and commit index inflight to Core.
+    // Used to determine if fetched blocks can be sent to Core without gaps.
+    synced_commit_index: CommitIndex,
 }
 
 impl<C: NetworkClient> CommitSyncer<C> {
@@ -71,219 +108,269 @@ impl<C: NetworkClient> CommitSyncer<C> {
         context: Arc<Context>,
         core_thread_dispatcher: Arc<dyn CoreThreadDispatcher>,
         commit_vote_monitor: Arc<CommitVoteMonitor>,
+        commit_consumer_monitor: Arc<CommitConsumerMonitor>,
         network_client: Arc<C>,
         block_verifier: Arc<dyn BlockVerifier>,
         dag_state: Arc<RwLock<DagState>>,
     ) -> Self {
-        let fetch_state = Arc::new(Mutex::new(FetchState::new(&context)));
+        let peer_state = Arc::new(Mutex::new(PeerState::new(&context)));
         let inner = Arc::new(Inner {
             context,
             core_thread_dispatcher,
             commit_vote_monitor,
+            commit_consumer_monitor,
             network_client,
             block_verifier,
             dag_state,
         });
-        let (tx_shutdown, rx_shutdown) = oneshot::channel();
-        let schedule_task =
-            spawn_logged_monitored_task!(Self::schedule_loop(inner, fetch_state, rx_shutdown));
+        let synced_commit_index = inner.dag_state.read().last_commit_index();
         CommitSyncer {
-            schedule_task,
-            tx_shutdown,
-            _phantom: Default::default(),
+            inner,
+            peer_state,
+            inflight_fetches: JoinSet::new(),
+            pending_fetches: BTreeSet::new(),
+            fetched_ranges: BTreeMap::new(),
+            highest_scheduled_index: None,
+            highest_fetched_commit_index: 0,
+            synced_commit_index,
         }
     }
 
-    pub(crate) async fn stop(self) {
-        let _ = self.tx_shutdown.send(());
-        // Do not abort schedule task, which waits for fetches to shut down.
-        let _ = self.schedule_task.await;
+    pub(crate) fn start(self) -> CommitSyncerHandle {
+        let (tx_shutdown, rx_shutdown) = oneshot::channel();
+        let schedule_task = spawn_logged_monitored_task!(self.schedule_loop(rx_shutdown,));
+        CommitSyncerHandle {
+            schedule_task,
+            tx_shutdown,
+        }
     }
 
-    async fn schedule_loop(
-        inner: Arc<Inner<C>>,
-        fetch_state: Arc<Mutex<FetchState>>,
-        mut rx_shutdown: oneshot::Receiver<()>,
-    ) {
+    async fn schedule_loop(mut self, mut rx_shutdown: oneshot::Receiver<()>) {
         let mut interval = tokio::time::interval(Duration::from_secs(2));
         interval.set_missed_tick_behavior(MissedTickBehavior::Skip);
-        // Inflight requests to fetch commits from different authorities.
-        let mut inflight_fetches = JoinSet::new();
-        // Additional ranges (inclusive start and end) of commits to fetch.
-        let mut pending_fetches = BTreeSet::<CommitRange>::new();
-        // Fetched commits and blocks by commit indices.
-        let mut fetched_blocks = BTreeMap::<CommitRange, Vec<VerifiedBlock>>::new();
-        // Highest end index among inflight and pending fetches.
-        // Used to determine if and which new ranges to fetch.
-        let mut highest_scheduled_index = Option::<CommitIndex>::None;
-        // The commit index that is the max of local last commit index and highest commit index of blocks sent to Core.
-        // Used to determine if fetched blocks can be sent to Core without gaps.
-        let mut synced_commit_index = inner.dag_state.read().last_commit_index();
-        let mut highest_fetched_commit_index = 0;
 
         loop {
             tokio::select! {
                 // Periodically, schedule new fetches if the node is falling behind.
                 _ = interval.tick() => {
-                    let quorum_commit_index = inner.commit_vote_monitor.quorum_commit_index();
-                    let local_commit_index = inner.dag_state.read().last_commit_index();
-                    let metrics = &inner.context.metrics.node_metrics;
-                    metrics.commit_sync_quorum_index.set(quorum_commit_index as i64);
-                    metrics.commit_sync_local_index.set(local_commit_index as i64);
-                    // Update synced_commit_index periodically to make sure it is not smaller than
-                    // local commit index.
-                    synced_commit_index = synced_commit_index.max(local_commit_index);
-                    info!(
-                        "Checking to schedule fetches: synced_commit_index={}, highest_scheduled_index={}, quorum_commit_index={}",
-                        synced_commit_index, highest_scheduled_index.unwrap_or(0), quorum_commit_index,
-                    );
-                    // TODO: pause commit sync when execution of commits is lagging behind, maybe through Core.
-                    // TODO: cleanup inflight fetches that are no longer needed.
-                    let fetch_after_index = synced_commit_index.max(highest_scheduled_index.unwrap_or(0));
-                    // When the node is falling behind, schedule pending fetches which will be executed on later.
-                    'pending: for prev_end in (fetch_after_index..=quorum_commit_index).step_by(inner.context.parameters.commit_sync_batch_size as usize) {
-                        // Create range with inclusive start and end.
-                        let range_start = prev_end + 1;
-                        let range_end = prev_end + inner.context.parameters.commit_sync_batch_size;
-                        // When the condition below is true, [range_start, range_end] contains less number of commits
-                        // than the target batch size. Not creating the smaller batch is intentional, to avoid the
-                        // cost of processing more and smaller batches.
-                        // Block broadcast, subscription and synchronization will help the node catchup.
-                        if range_end > quorum_commit_index {
-                            break 'pending;
-                        }
-                        pending_fetches.insert((range_start..=range_end).into());
-                        // quorum_commit_index should be non-decreasing, so highest_scheduled_index should not
-                        // decrease either.
-                        highest_scheduled_index = Some(range_end);
-                    }
+                    self.try_schedule_once();
                 }
-
-                // Processed fetched blocks.
-                Some(result) = inflight_fetches.join_next(), if !inflight_fetches.is_empty() => {
+                // Handles results from fetch tasks.
+                Some(result) = self.inflight_fetches.join_next(), if !self.inflight_fetches.is_empty() => {
                     if let Err(e) = result {
-                        warn!("Fetch cancelled or panicked, CommitSyncer shutting down: {}", e);
+                        if e.is_panic() {
+                            std::panic::resume_unwind(e.into_panic());
+                        }
+                        warn!("Fetch cancelled. CommitSyncer shutting down: {}", e);
                         // If any fetch is cancelled or panicked, try to shutdown and exit the loop.
-                        inflight_fetches.shutdown().await;
+                        self.inflight_fetches.shutdown().await;
                         return;
                     }
-                    let (target_end, commits, blocks): (CommitIndex, Vec<TrustedCommit>, Vec<VerifiedBlock>) = result.unwrap();
-                    assert!(!commits.is_empty());
-                    let metrics = &inner.context.metrics.node_metrics;
-                    metrics.commit_sync_fetched_commits.inc_by(commits.len() as u64);
-                    metrics.commit_sync_fetched_blocks.inc_by(blocks.len() as u64);
-                    metrics.commit_sync_total_fetched_blocks_size.inc_by(
-                        blocks.iter().map(|b| b.serialized().len() as u64).sum::<u64>()
-                    );
-
-                    let (commit_start, commit_end) = (commits.first().unwrap().index(), commits.last().unwrap().index());
-
-                    highest_fetched_commit_index = highest_fetched_commit_index.max(commit_end);
-                    metrics.commit_sync_highest_fetched_index.set(highest_fetched_commit_index.into());
-
-                    // Allow returning partial results, and try fetching the rest separately.
-                    if commit_end < target_end {
-                        pending_fetches.insert((commit_end + 1..=target_end).into());
-                    }
-                    // Make sure synced_commit_index is up to date.
-                    synced_commit_index = synced_commit_index.max(inner.dag_state.read().last_commit_index());
-                    // Only add new blocks if at least some of them are not already synced.
-                    if synced_commit_index < commit_end {
-                        fetched_blocks.insert((commit_start..=commit_end).into(), blocks);
-                    }
-                    // Try to process as many fetched blocks as possible.
-                    'fetched: while let Some((fetched_commit_range, _blocks)) = fetched_blocks.first_key_value() {
-                        // Only pop fetched_blocks if there is no gap with blocks already synced.
-                        // Note: start, end and synced_commit_index are all inclusive.
-                        let (fetched_commit_range, blocks) = if fetched_commit_range.start() <= synced_commit_index + 1 {
-                            fetched_blocks.pop_first().unwrap()
-                        } else {
-                            // Found gap between earliest fetched block and latest synced block,
-                            // so not sending additional blocks to Core.
-                            metrics.commit_sync_gap_on_processing.inc();
-                            break 'fetched;
-                        };
-                        // Avoid sending to Core a whole batch of already synced blocks.
-                        if fetched_commit_range.end() <= synced_commit_index {
-                            continue 'fetched;
-                        }
-                        debug!(
-                            "Fetched certified blocks: {}",
-                            blocks
-                                .iter()
-                                .map(|b| b.reference().to_string())
-                                .join(","),
-                        );
-                        // If core thread cannot handle the incoming blocks, it is ok to block here.
-                        // Also it is possible to have missing ancestors because an equivocating validator
-                        // may produce blocks that are not included in commits but are ancestors to other blocks.
-                        // Synchronizer is needed to fill in the missing ancestors in this case.
-                        match inner.core_thread_dispatcher.add_blocks(blocks).await {
-                            Ok(missing) => {
-                                if !missing.is_empty() {
-                                    warn!("Fetched blocks have missing ancestors: {:?}", missing);
-                                }
-                            }
-                            Err(e) => {
-                                info!("Failed to add blocks, shutting down: {}", e);
-                                return;
-                            }
-                        };
-                        // Once commits and blocks are sent to Core, ratchet up synced_commit_index
-                        synced_commit_index = synced_commit_index.max(fetched_commit_range.end());
-                    }
+                    let (target_end, commits, blocks) = result.unwrap();
+                    self.handle_fetch_result(target_end, commits, blocks).await;
                 }
-
                 _ = &mut rx_shutdown => {
                     // Shutdown requested.
                     info!("CommitSyncer shutting down ...");
-                    inflight_fetches.shutdown().await;
+                    self.inflight_fetches.shutdown().await;
                     return;
                 }
             }
 
-            // Cap parallel fetches based on configured limit and committee size, to avoid overloading the network.
-            // Also when there are too many fetched blocks that cannot be sent to Core before an earlier fetch
-            // has not finished, reduce parallelism so the earlier fetch can retry on a better host and succeed.
-            let target_parallel_fetches = inner
-                .context
-                .parameters
-                .commit_sync_parallel_fetches
-                .min(inner.context.committee.size() * 2 / 3)
-                .min(
-                    inner
-                        .context
-                        .parameters
-                        .commit_sync_batches_ahead
-                        .saturating_sub(fetched_blocks.len()),
-                )
-                .max(1);
-            // Start new fetches if there are pending batches and available slots.
-            loop {
-                if inflight_fetches.len() >= target_parallel_fetches {
-                    break;
-                }
-                let Some(commit_range) = pending_fetches.pop_first() else {
+            self.try_start_fetches();
+        }
+    }
+
+    fn try_schedule_once(&mut self) {
+        let quorum_commit_index = self.inner.commit_vote_monitor.quorum_commit_index();
+        let local_commit_index = self.inner.dag_state.read().last_commit_index();
+        let metrics = &self.inner.context.metrics.node_metrics;
+        metrics
+            .commit_sync_quorum_index
+            .set(quorum_commit_index as i64);
+        metrics
+            .commit_sync_local_index
+            .set(local_commit_index as i64);
+        let highest_handled_index = self.inner.commit_consumer_monitor.highest_handled_commit();
+        let highest_scheduled_index = self.highest_scheduled_index.unwrap_or(0);
+        // Update synced_commit_index periodically to make sure it is no smaller than
+        // local commit index.
+        self.synced_commit_index = self.synced_commit_index.max(local_commit_index);
+        let unhandled_commits_threshold = self.unhandled_commits_threshold();
+        info!(
+            "Checking to schedule fetches: synced_commit_index={}, highest_handled_index={}, highest_scheduled_index={}, quorum_commit_index={}, unhandled_commits_threshold={}",
+            self.synced_commit_index, highest_handled_index, highest_scheduled_index, quorum_commit_index, unhandled_commits_threshold,
+        );
+
+        // TODO: cleanup inflight fetches that are no longer needed.
+        let fetch_after_index = self
+            .synced_commit_index
+            .max(self.highest_scheduled_index.unwrap_or(0));
+        // When the node is falling behind, schedule pending fetches which will be executed on later.
+        for prev_end in (fetch_after_index..=quorum_commit_index)
+            .step_by(self.inner.context.parameters.commit_sync_batch_size as usize)
+        {
+            // Create range with inclusive start and end.
+            let range_start = prev_end + 1;
+            let range_end = prev_end + self.inner.context.parameters.commit_sync_batch_size;
+            // Commit range is not fetched when [range_start, range_end] contains less number of commits
+            // than the target batch size. This is to avoid the cost of processing more and smaller batches.
+            // Block broadcast, subscription and synchronization will help the node catchup.
+            if quorum_commit_index < range_end {
+                break;
+            }
+            // Pause scheduling new fetches when handling of commits is lagging.
+            if highest_handled_index + unhandled_commits_threshold < range_end {
+                warn!("Skip scheduling new commit fetches: consensus handler is lagging. highest_handled_index={}, highest_scheduled_index={}", highest_handled_index, highest_scheduled_index);
+                break;
+            }
+            self.pending_fetches
+                .insert((range_start..=range_end).into());
+            // quorum_commit_index should be non-decreasing, so highest_scheduled_index should not
+            // decrease either.
+            self.highest_scheduled_index = Some(range_end);
+        }
+    }
+
+    async fn handle_fetch_result(
+        &mut self,
+        target_end: CommitIndex,
+        commits: Vec<TrustedCommit>,
+        blocks: Vec<VerifiedBlock>,
+    ) {
+        assert!(!commits.is_empty());
+        let metrics = &self.inner.context.metrics.node_metrics;
+        metrics
+            .commit_sync_fetched_commits
+            .inc_by(commits.len() as u64);
+        metrics
+            .commit_sync_fetched_blocks
+            .inc_by(blocks.len() as u64);
+        metrics.commit_sync_total_fetched_blocks_size.inc_by(
+            blocks
+                .iter()
+                .map(|b| b.serialized().len() as u64)
+                .sum::<u64>(),
+        );
+
+        let (commit_start, commit_end) = (
+            commits.first().unwrap().index(),
+            commits.last().unwrap().index(),
+        );
+        self.highest_fetched_commit_index = self.highest_fetched_commit_index.max(commit_end);
+        metrics
+            .commit_sync_highest_fetched_index
+            .set(self.highest_fetched_commit_index as i64);
+
+        // Allow returning partial results, and try fetching the rest separately.
+        if commit_end < target_end {
+            self.pending_fetches
+                .insert((commit_end + 1..=target_end).into());
+        }
+        // Make sure synced_commit_index is up to date.
+        self.synced_commit_index = self
+            .synced_commit_index
+            .max(self.inner.dag_state.read().last_commit_index());
+        // Only add new blocks if at least some of them are not already synced.
+        if self.synced_commit_index < commit_end {
+            self.fetched_ranges
+                .insert((commit_start..=commit_end).into(), blocks);
+        }
+        // Try to process as many fetched blocks as possible.
+        while let Some((fetched_commit_range, _blocks)) = self.fetched_ranges.first_key_value() {
+            // Only pop fetched_ranges if there is no gap with blocks already synced.
+            // Note: start, end and synced_commit_index are all inclusive.
+            let (fetched_commit_range, blocks) =
+                if fetched_commit_range.start() <= self.synced_commit_index + 1 {
+                    self.fetched_ranges.pop_first().unwrap()
+                } else {
+                    // Found gap between earliest fetched block and latest synced block,
+                    // so not sending additional blocks to Core.
+                    metrics.commit_sync_gap_on_processing.inc();
                     break;
                 };
-                inflight_fetches.spawn(Self::fetch_loop(
-                    inner.clone(),
-                    fetch_state.clone(),
-                    commit_range,
-                ));
+            // Avoid sending to Core a whole batch of already synced blocks.
+            if fetched_commit_range.end() <= self.synced_commit_index {
+                continue;
             }
 
-            let metrics = &inner.context.metrics.node_metrics;
-            metrics
-                .commit_sync_inflight_fetches
-                .set(inflight_fetches.len() as i64);
-            metrics
-                .commit_sync_pending_fetches
-                .set(pending_fetches.len() as i64);
-            metrics
-                .commit_sync_highest_synced_index
-                .set(synced_commit_index as i64);
+            debug!(
+                "Fetched certified blocks: {}",
+                blocks.iter().map(|b| b.reference().to_string()).join(","),
+            );
+            // If core thread cannot handle the incoming blocks, it is ok to block here.
+            // Also it is possible to have missing ancestors because an equivocating validator
+            // may produce blocks that are not included in commits but are ancestors to other blocks.
+            // Synchronizer is needed to fill in the missing ancestors in this case.
+            match self.inner.core_thread_dispatcher.add_blocks(blocks).await {
+                Ok(missing) => {
+                    if !missing.is_empty() {
+                        warn!("Fetched blocks have missing ancestors: {:?}", missing);
+                    }
+                }
+                Err(e) => {
+                    info!("Failed to add blocks, shutting down: {}", e);
+                    return;
+                }
+            };
+            // Once commits and blocks are sent to Core, ratchet up synced_commit_index
+            self.synced_commit_index = self.synced_commit_index.max(fetched_commit_range.end());
+        }
+
+        metrics
+            .commit_sync_inflight_fetches
+            .set(self.inflight_fetches.len() as i64);
+        metrics
+            .commit_sync_pending_fetches
+            .set(self.pending_fetches.len() as i64);
+        metrics
+            .commit_sync_highest_synced_index
+            .set(self.synced_commit_index as i64);
+    }
+
+    fn try_start_fetches(&mut self) {
+        // Cap parallel fetches based on configured limit and committee size, to avoid overloading the network.
+        // Also when there are too many fetched blocks that cannot be sent to Core before an earlier fetch
+        // has not finished, reduce parallelism so the earlier fetch can retry on a better host and succeed.
+        let target_parallel_fetches = self
+            .inner
+            .context
+            .parameters
+            .commit_sync_parallel_fetches
+            .min(self.inner.context.committee.size() * 2 / 3)
+            .min(
+                self.inner
+                    .context
+                    .parameters
+                    .commit_sync_batches_ahead
+                    .saturating_sub(self.fetched_ranges.len()),
+            )
+            .max(1);
+        // Start new fetches if there are pending batches and available slots.
+        loop {
+            if self.inflight_fetches.len() >= target_parallel_fetches {
+                break;
+            }
+            let Some(commit_range) = self.pending_fetches.pop_first() else {
+                break;
+            };
+            self.inflight_fetches.spawn(Self::fetch_loop(
+                self.inner.clone(),
+                self.peer_state.clone(),
+                commit_range,
+            ));
         }
+
+        let metrics = &self.inner.context.metrics.node_metrics;
+        metrics
+            .commit_sync_inflight_fetches
+            .set(self.inflight_fetches.len() as i64);
+        metrics
+            .commit_sync_pending_fetches
+            .set(self.pending_fetches.len() as i64);
+        metrics
+            .commit_sync_highest_synced_index
+            .set(self.synced_commit_index as i64);
     }
 
     // Retries fetching commits and blocks from available authorities, until a request succeeds
@@ -291,7 +378,7 @@ impl<C: NetworkClient> CommitSyncer<C> {
     // Returns the fetched commits and blocks referenced by the commits.
     async fn fetch_loop(
         inner: Arc<Inner<C>>,
-        fetch_state: Arc<Mutex<FetchState>>,
+        peer_state: Arc<Mutex<PeerState>>,
         commit_range: CommitRange,
     ) -> (CommitIndex, Vec<TrustedCommit>, Vec<VerifiedBlock>) {
         let _timer = inner
@@ -302,7 +389,7 @@ impl<C: NetworkClient> CommitSyncer<C> {
             .start_timer();
         info!("Starting to fetch commits in {commit_range:?} ...",);
         loop {
-            match Self::fetch_once(inner.clone(), fetch_state.clone(), commit_range.clone()).await {
+            match Self::fetch_once(inner.clone(), peer_state.clone(), commit_range.clone()).await {
                 Ok((commits, blocks)) => {
                     info!("Finished fetching commits in {commit_range:?}",);
                     return (commit_range.end(), commits, blocks);
@@ -327,7 +414,7 @@ impl<C: NetworkClient> CommitSyncer<C> {
     // and sent to Core for processing.
     async fn fetch_once(
         inner: Arc<Inner<C>>,
-        fetch_state: Arc<Mutex<FetchState>>,
+        peer_state: Arc<Mutex<PeerState>>,
         commit_range: CommitRange,
     ) -> ConsensusResult<(Vec<TrustedCommit>, Vec<VerifiedBlock>)> {
         const FETCH_COMMITS_TIMEOUT: Duration = Duration::from_secs(30);
@@ -346,7 +433,7 @@ impl<C: NetworkClient> CommitSyncer<C> {
         // 1. Find an available authority to fetch commits and blocks from, and wait
         // if it is not yet ready.
         let Some((available_time, retries, target_authority)) =
-            fetch_state.lock().available_authorities.pop_first()
+            peer_state.lock().available_authorities.pop_first()
         else {
             sleep(MAX_RETRY_INTERVAL).await;
             return Err(ConsensusError::NoAvailableAuthorityToFetchCommits);
@@ -367,17 +454,17 @@ impl<C: NetworkClient> CommitSyncer<C> {
             .await
         {
             Ok(result) => {
-                let mut fetch_state = fetch_state.lock();
+                let mut peer_state = peer_state.lock();
                 let now = Instant::now();
-                fetch_state
+                peer_state
                     .available_authorities
                     .insert((now, 0, target_authority));
                 result
             }
             Err(e) => {
-                let mut fetch_state = fetch_state.lock();
+                let mut peer_state = peer_state.lock();
                 let now = Instant::now();
-                fetch_state.available_authorities.insert((
+                peer_state.available_authorities.insert((
                     now + FETCH_RETRY_BASE_INTERVAL * retries.min(FETCH_RETRY_INTERVAL_LIMIT),
                     retries.saturating_add(1),
                     target_authority,
@@ -480,7 +567,7 @@ impl<C: NetworkClient> CommitSyncer<C> {
                 .metrics
                 .node_metrics
                 .block_timestamp_drift_wait_ms
-                .with_label_values(&[peer_hostname, &"commit_syncer"])
+                .with_label_values(&[peer_hostname, "commit_syncer"])
                 .inc_by(forward_drift);
             let forward_drift = Duration::from_millis(forward_drift);
             if forward_drift >= inner.context.parameters.max_forward_time_drift {
@@ -495,56 +582,35 @@ impl<C: NetworkClient> CommitSyncer<C> {
 
         Ok((commits, fetched_blocks))
     }
-}
 
-/// Monitors commit votes from received and verified blocks,
-/// and keeps track of the highest commit voted by each authority and certified by a quorum.
-pub(crate) struct CommitVoteMonitor {
-    context: Arc<Context>,
-    // Highest commit index voted by each authority.
-    highest_voted_commits: Mutex<Vec<CommitIndex>>,
-}
+    fn unhandled_commits_threshold(&self) -> CommitIndex {
+        self.inner.context.parameters.commit_sync_batch_size
+            * (self.inner.context.parameters.commit_sync_batches_ahead as u32)
+    }
 
-impl CommitVoteMonitor {
-    pub(crate) fn new(context: Arc<Context>) -> Self {
-        let highest_voted_commits = Mutex::new(vec![0; context.committee.size()]);
-        Self {
-            context,
-            highest_voted_commits,
-        }
+    #[cfg(test)]
+    fn pending_fetches(&self) -> BTreeSet<CommitRange> {
+        self.pending_fetches.clone()
     }
 
-    // Records the highest commit index voted in each block.
-    pub(crate) fn observe(&self, block: &VerifiedBlock) {
-        let mut highest_voted_commits = self.highest_voted_commits.lock();
-        for vote in block.commit_votes() {
-            if vote.index > highest_voted_commits[block.author()] {
-                highest_voted_commits[block.author()] = vote.index;
-            }
-        }
+    #[cfg(test)]
+    fn fetched_ranges(&self) -> BTreeMap<CommitRange, Vec<VerifiedBlock>> {
+        self.fetched_ranges.clone()
     }
 
-    // Finds the highest commit index certified by a quorum.
-    // When an authority votes for commit index S, it is also voting for all commit indices 1 <= i < S.
-    // So the quorum commit index is the smallest index S such that the sum of stakes of authorities
-    // voting for commit indices >= S passes the quorum threshold.
-    pub(crate) fn quorum_commit_index(&self) -> CommitIndex {
-        let highest_voted_commits = self.highest_voted_commits.lock();
-        let mut highest_voted_commits = highest_voted_commits
-            .iter()
-            .zip(self.context.committee.authorities())
-            .map(|(commit_index, (_, a))| (*commit_index, a.stake))
-            .collect::<Vec<_>>();
-        // Sort by commit index then stake, in descending order.
-        highest_voted_commits.sort_by(|a, b| a.cmp(b).reverse());
-        let mut total_stake = 0;
-        for (commit_index, stake) in highest_voted_commits {
-            total_stake += stake;
-            if total_stake >= self.context.committee.quorum_threshold() {
-                return commit_index;
-            }
-        }
-        GENESIS_COMMIT_INDEX
+    #[cfg(test)]
+    fn highest_scheduled_index(&self) -> Option<CommitIndex> {
+        self.highest_scheduled_index
+    }
+
+    #[cfg(test)]
+    fn highest_fetched_commit_index(&self) -> CommitIndex {
+        self.highest_fetched_commit_index
+    }
+
+    #[cfg(test)]
+    fn synced_commit_index(&self) -> CommitIndex {
+        self.synced_commit_index
     }
 }
 
@@ -552,6 +618,7 @@ struct Inner<C: NetworkClient> {
     context: Arc<Context>,
     core_thread_dispatcher: Arc<dyn CoreThreadDispatcher>,
     commit_vote_monitor: Arc<CommitVoteMonitor>,
+    commit_consumer_monitor: Arc<CommitConsumerMonitor>,
     network_client: Arc<C>,
     block_verifier: Arc<dyn BlockVerifier>,
     dag_state: Arc<RwLock<DagState>>,
@@ -636,7 +703,7 @@ impl<C: NetworkClient> Inner<C> {
     }
 }
 
-struct FetchState {
+struct PeerState {
     // The value is a tuple of
     // - the next available time for the authority to fetch from,
     // - count of current consecutive failures fetching from the authority, reset on success,
@@ -646,7 +713,7 @@ struct FetchState {
     available_authorities: BTreeSet<(Instant, u32, AuthorityIndex)>,
 }
 
-impl FetchState {
+impl PeerState {
     fn new(context: &Context) -> Self {
         // Randomize the initial order of authorities.
         let mut shuffled_authority_indices: Vec<_> = context
@@ -670,58 +737,174 @@ impl FetchState {
     }
 }
 
-// TODO: add more unit and integration tests.
 #[cfg(test)]
-mod test {
-    use std::sync::Arc;
+mod tests {
+    use std::{sync::Arc, time::Duration};
+
+    use bytes::Bytes;
+    use consensus_config::{AuthorityIndex, Parameters};
+    use parking_lot::RwLock;
 
-    use super::CommitVoteMonitor;
     use crate::{
-        block::{TestBlock, VerifiedBlock},
-        commit::{CommitDigest, CommitRef},
+        block::{BlockRef, TestBlock, VerifiedBlock},
+        block_verifier::NoopBlockVerifier,
+        commit::CommitRange,
+        commit_syncer::CommitSyncer,
+        commit_vote_monitor::CommitVoteMonitor,
         context::Context,
+        core_thread::MockCoreThreadDispatcher,
+        dag_state::DagState,
+        error::ConsensusResult,
+        network::{BlockStream, NetworkClient},
+        storage::mem_store::MemStore,
+        CommitConsumerMonitor, CommitDigest, CommitRef, Round,
     };
 
-    #[tokio::test]
-    async fn test_commit_vote_monitor() {
-        let context = Arc::new(Context::new_for_test(4).0);
-        let monitor = CommitVoteMonitor::new(context.clone());
-
-        // Observe commit votes for indices 5, 6, 7, 8 from blocks.
-        let blocks = (0..4)
-            .map(|i| {
-                VerifiedBlock::new_for_test(
-                    TestBlock::new(10, i)
-                        .set_commit_votes(vec![CommitRef::new(5 + i, CommitDigest::MIN)])
-                        .build(),
-                )
-            })
-            .collect::<Vec<_>>();
-        for b in blocks {
-            monitor.observe(&b);
+    #[derive(Default)]
+    struct FakeNetworkClient {}
+
+    #[async_trait::async_trait]
+    impl NetworkClient for FakeNetworkClient {
+        const SUPPORT_STREAMING: bool = true;
+
+        async fn send_block(
+            &self,
+            _peer: AuthorityIndex,
+            _serialized_block: &VerifiedBlock,
+            _timeout: Duration,
+        ) -> ConsensusResult<()> {
+            unimplemented!("Unimplemented")
         }
 
-        // CommitIndex 6 is the highest index supported by a quorum.
-        assert_eq!(monitor.quorum_commit_index(), 6);
-
-        // Observe new blocks with new votes from authority 0 and 1.
-        let blocks = (0..2)
-            .map(|i| {
-                VerifiedBlock::new_for_test(
-                    TestBlock::new(11, i)
-                        .set_commit_votes(vec![
-                            CommitRef::new(6 + i, CommitDigest::MIN),
-                            CommitRef::new(7 + i, CommitDigest::MIN),
-                        ])
-                        .build(),
-                )
-            })
-            .collect::<Vec<_>>();
-        for b in blocks {
-            monitor.observe(&b);
+        async fn subscribe_blocks(
+            &self,
+            _peer: AuthorityIndex,
+            _last_received: Round,
+            _timeout: Duration,
+        ) -> ConsensusResult<BlockStream> {
+            unimplemented!("Unimplemented")
         }
 
-        // Highest commit index per authority should be 7, 8, 7, 8 now.
-        assert_eq!(monitor.quorum_commit_index(), 7);
+        async fn fetch_blocks(
+            &self,
+            _peer: AuthorityIndex,
+            _block_refs: Vec<BlockRef>,
+            _highest_accepted_rounds: Vec<Round>,
+            _timeout: Duration,
+        ) -> ConsensusResult<Vec<Bytes>> {
+            unimplemented!("Unimplemented")
+        }
+
+        async fn fetch_commits(
+            &self,
+            _peer: AuthorityIndex,
+            _commit_range: CommitRange,
+            _timeout: Duration,
+        ) -> ConsensusResult<(Vec<Bytes>, Vec<Bytes>)> {
+            unimplemented!("Unimplemented")
+        }
+
+        async fn fetch_latest_blocks(
+            &self,
+            _peer: AuthorityIndex,
+            _authorities: Vec<AuthorityIndex>,
+            _timeout: Duration,
+        ) -> ConsensusResult<Vec<Bytes>> {
+            unimplemented!("Unimplemented")
+        }
+    }
+
+    #[tokio::test(flavor = "current_thread", start_paused = true)]
+    async fn commit_syncer_start_and_pause_scheduling() {
+        // SETUP
+        let (context, _) = Context::new_for_test(4);
+        // Use smaller batches and fetch limits for testing.
+        let context = Context {
+            own_index: AuthorityIndex::new_for_test(3),
+            parameters: Parameters {
+                commit_sync_batch_size: 5,
+                commit_sync_batches_ahead: 5,
+                commit_sync_parallel_fetches: 5,
+                max_blocks_per_fetch: 5,
+                ..context.parameters
+            },
+            ..context
+        };
+        let context = Arc::new(context);
+        let block_verifier = Arc::new(NoopBlockVerifier {});
+        let core_thread_dispatcher = Arc::new(MockCoreThreadDispatcher::default());
+        let network_client = Arc::new(FakeNetworkClient::default());
+        let store = Arc::new(MemStore::new());
+        let dag_state = Arc::new(RwLock::new(DagState::new(context.clone(), store)));
+        let commit_vote_monitor = Arc::new(CommitVoteMonitor::new(context.clone()));
+        let commit_consumer_monitor = Arc::new(CommitConsumerMonitor::new(0));
+        let mut commit_syncer = CommitSyncer::new(
+            context,
+            core_thread_dispatcher,
+            commit_vote_monitor.clone(),
+            commit_consumer_monitor.clone(),
+            network_client,
+            block_verifier,
+            dag_state,
+        );
+
+        // Check initial state.
+        assert!(commit_syncer.pending_fetches().is_empty());
+        assert!(commit_syncer.fetched_ranges().is_empty());
+        assert!(commit_syncer.highest_scheduled_index().is_none());
+        assert_eq!(commit_syncer.highest_fetched_commit_index(), 0);
+        assert_eq!(commit_syncer.synced_commit_index(), 0);
+
+        // Observe round 15 blocks voting for commit 10 from authorities 0 to 2 in CommitVoteMonitor
+        for i in 0..3 {
+            let test_block = TestBlock::new(15, i)
+                .set_commit_votes(vec![CommitRef::new(10, CommitDigest::MIN)])
+                .build();
+            let block = VerifiedBlock::new_for_test(test_block);
+            commit_vote_monitor.observe_block(&block);
+        }
+
+        // Fetches should be scheduled after seeing progress of other validators.
+        commit_syncer.try_schedule_once();
+
+        // Verify state.
+        assert_eq!(commit_syncer.pending_fetches().len(), 2);
+        assert!(commit_syncer.fetched_ranges().is_empty());
+        assert_eq!(commit_syncer.highest_scheduled_index(), Some(10));
+        assert_eq!(commit_syncer.highest_fetched_commit_index(), 0);
+        assert_eq!(commit_syncer.synced_commit_index(), 0);
+
+        // Observe round 40 blocks voting for commit 35 from authorities 0 to 2 in CommitVoteMonitor
+        for i in 0..3 {
+            let test_block = TestBlock::new(40, i)
+                .set_commit_votes(vec![CommitRef::new(35, CommitDigest::MIN)])
+                .build();
+            let block = VerifiedBlock::new_for_test(test_block);
+            commit_vote_monitor.observe_block(&block);
+        }
+
+        // Fetches should be scheduled until the unhandled commits threshold.
+        commit_syncer.try_schedule_once();
+
+        // Verify commit syncer is paused after scheduling 15 commits to index 25.
+        assert_eq!(commit_syncer.unhandled_commits_threshold(), 25);
+        assert_eq!(commit_syncer.highest_scheduled_index(), Some(25));
+        let pending_fetches = commit_syncer.pending_fetches();
+        assert_eq!(pending_fetches.len(), 5);
+
+        // Indicate commit index 25 is consumed, and try to schedule again.
+        commit_consumer_monitor.set_highest_handled_commit(25);
+        commit_syncer.try_schedule_once();
+
+        // Verify commit syncer schedules fetches up to index 35.
+        assert_eq!(commit_syncer.highest_scheduled_index(), Some(35));
+        let pending_fetches = commit_syncer.pending_fetches();
+        assert_eq!(pending_fetches.len(), 7);
+
+        // Verify contiguous ranges are scheduled.
+        for (range, start) in pending_fetches.iter().zip((1..35).step_by(5)) {
+            assert_eq!(range.start(), start);
+            assert_eq!(range.end(), start + 4);
+        }
     }
 }
diff --git a/consensus/core/src/commit_vote_monitor.rs b/consensus/core/src/commit_vote_monitor.rs
new file mode 100644
index 0000000000000..654260661da4f
--- /dev/null
+++ b/consensus/core/src/commit_vote_monitor.rs
@@ -0,0 +1,118 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use std::sync::Arc;
+
+use parking_lot::Mutex;
+
+use crate::{
+    block::{BlockAPI as _, VerifiedBlock},
+    commit::GENESIS_COMMIT_INDEX,
+    context::Context,
+    CommitIndex,
+};
+
+/// Monitors the progress of consensus commits across the network.
+pub(crate) struct CommitVoteMonitor {
+    context: Arc<Context>,
+    // Highest commit index voted by each authority.
+    highest_voted_commits: Mutex<Vec<CommitIndex>>,
+}
+
+impl CommitVoteMonitor {
+    pub(crate) fn new(context: Arc<Context>) -> Self {
+        let highest_voted_commits = Mutex::new(vec![0; context.committee.size()]);
+        Self {
+            context,
+            highest_voted_commits,
+        }
+    }
+
+    /// Keeps track of the highest commit voted by each authority.
+    pub(crate) fn observe_block(&self, block: &VerifiedBlock) {
+        let mut highest_voted_commits = self.highest_voted_commits.lock();
+        for vote in block.commit_votes() {
+            if vote.index > highest_voted_commits[block.author()] {
+                highest_voted_commits[block.author()] = vote.index;
+            }
+        }
+    }
+
+    // Finds the highest commit index certified by a quorum.
+    // When an authority votes for commit index S, it is also voting for all commit indices 1 <= i < S.
+    // So the quorum commit index is the smallest index S such that the sum of stakes of authorities
+    // voting for commit indices >= S passes the quorum threshold.
+    pub(crate) fn quorum_commit_index(&self) -> CommitIndex {
+        let highest_voted_commits = self.highest_voted_commits.lock();
+        let mut highest_voted_commits = highest_voted_commits
+            .iter()
+            .zip(self.context.committee.authorities())
+            .map(|(commit_index, (_, a))| (*commit_index, a.stake))
+            .collect::<Vec<_>>();
+        // Sort by commit index then stake, in descending order.
+        highest_voted_commits.sort_by(|a, b| a.cmp(b).reverse());
+        let mut total_stake = 0;
+        for (commit_index, stake) in highest_voted_commits {
+            total_stake += stake;
+            if total_stake >= self.context.committee.quorum_threshold() {
+                return commit_index;
+            }
+        }
+        GENESIS_COMMIT_INDEX
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use std::sync::Arc;
+
+    use super::CommitVoteMonitor;
+    use crate::{
+        block::{TestBlock, VerifiedBlock},
+        commit::{CommitDigest, CommitRef},
+        context::Context,
+    };
+
+    #[tokio::test]
+    async fn test_commit_vote_monitor() {
+        let context = Arc::new(Context::new_for_test(4).0);
+        let monitor = CommitVoteMonitor::new(context.clone());
+
+        // Observe commit votes for indices 5, 6, 7, 8 from blocks.
+        let blocks = (0..4)
+            .map(|i| {
+                VerifiedBlock::new_for_test(
+                    TestBlock::new(10, i)
+                        .set_commit_votes(vec![CommitRef::new(5 + i, CommitDigest::MIN)])
+                        .build(),
+                )
+            })
+            .collect::<Vec<_>>();
+        for b in blocks {
+            monitor.observe_block(&b);
+        }
+
+        // CommitIndex 6 is the highest index supported by a quorum.
+        assert_eq!(monitor.quorum_commit_index(), 6);
+
+        // Observe new blocks with new votes from authority 0 and 1.
+        let blocks = (0..2)
+            .map(|i| {
+                VerifiedBlock::new_for_test(
+                    TestBlock::new(11, i)
+                        .set_commit_votes(vec![
+                            CommitRef::new(6 + i, CommitDigest::MIN),
+                            CommitRef::new(7 + i, CommitDigest::MIN),
+                        ])
+                        .build(),
+                )
+            })
+            .collect::<Vec<_>>();
+        for b in blocks {
+            monitor.observe_block(&b);
+        }
+
+        // Highest commit index per authority should be 7, 8, 7, 8 now.
+        assert_eq!(monitor.quorum_commit_index(), 7);
+    }
+}
diff --git a/consensus/core/src/context.rs b/consensus/core/src/context.rs
index 64467cf72ca73..440a63a9b1e75 100644
--- a/consensus/core/src/context.rs
+++ b/consensus/core/src/context.rs
@@ -96,34 +96,50 @@ impl Context {
     }
 }
 
-/// A clock that allows to derive the current UNIX system timestamp while guaranteeing that
-/// timestamp will be monotonically incremented having tolerance to ntp and system clock changes and corrections.
+/// A clock that allows to derive the current UNIX system timestamp while guaranteeing that timestamp
+/// will be monotonically incremented, tolerating ntp and system clock changes and corrections.
 /// Explicitly avoid to make `[Clock]` cloneable to ensure that a single instance is shared behind an `[Arc]`
 /// wherever is needed in order to make sure that consecutive calls to receive the system timestamp
 /// will remain monotonically increasing.
 pub(crate) struct Clock {
-    unix_epoch_instant: Instant,
+    initial_instant: Instant,
+    initial_system_time: SystemTime,
 }
 
 impl Clock {
     pub fn new() -> Self {
-        let now = Instant::now();
-        let duration_since_unix_epoch =
-            match SystemTime::now().duration_since(SystemTime::UNIX_EPOCH) {
-                Ok(d) => d,
-                Err(e) => panic!("SystemTime before UNIX EPOCH! {e}"),
-            };
-        let unix_epoch_instant = now.checked_sub(duration_since_unix_epoch).unwrap();
-
-        Self { unix_epoch_instant }
+        Self {
+            initial_instant: Instant::now(),
+            initial_system_time: SystemTime::now(),
+        }
     }
 
     // Returns the current time expressed as UNIX timestamp in milliseconds.
-    // Calculated with Rust Instant to ensure monotonicity.
+    // Calculated with Tokio Instant to ensure monotonicity,
+    // and to allow testing with tokio clock.
     pub(crate) fn timestamp_utc_ms(&self) -> BlockTimestampMs {
-        Instant::now()
-            .checked_duration_since(self.unix_epoch_instant)
-            .unwrap()
+        let now: Instant = Instant::now();
+        let monotonic_system_time = self
+            .initial_system_time
+            .checked_add(
+                now.checked_duration_since(self.initial_instant)
+                    .unwrap_or_else(|| {
+                        panic!(
+                            "current instant ({:?}) < initial instant ({:?})",
+                            now, self.initial_instant
+                        )
+                    }),
+            )
+            .expect("Computing system time should not overflow");
+        monotonic_system_time
+            .duration_since(SystemTime::UNIX_EPOCH)
+            .unwrap_or_else(|_| {
+                panic!(
+                    "system time ({:?}) < UNIX_EPOCH ({:?})",
+                    monotonic_system_time,
+                    SystemTime::UNIX_EPOCH,
+                )
+            })
             .as_millis() as BlockTimestampMs
     }
 }
diff --git a/consensus/core/src/core.rs b/consensus/core/src/core.rs
index f2c59a9a9f447..f9d5f2041b0aa 100644
--- a/consensus/core/src/core.rs
+++ b/consensus/core/src/core.rs
@@ -100,6 +100,7 @@ impl Core {
         signals: CoreSignals,
         block_signer: ProtocolKeyPair,
         dag_state: Arc<RwLock<DagState>>,
+        sync_last_known_own_block: bool,
     ) -> Self {
         let last_decided_leader = dag_state.read().last_commit_leader();
         let number_of_leaders = context
@@ -133,7 +134,7 @@ impl Core {
             last_included_ancestors[ancestor.author] = Some(*ancestor);
         }
 
-        let min_propose_round = if context.parameters.is_sync_last_proposed_block_enabled() {
+        let min_propose_round = if sync_last_known_own_block {
             None
         } else {
             // if the sync is disabled then we practically don't want to impose any restriction.
@@ -305,16 +306,9 @@ impl Core {
     /// `> last_known_proposed_round`. At the moment is allowed to call the method only once leading to a panic
     /// if attempt to do multiple times.
     pub(crate) fn set_last_known_proposed_round(&mut self, round: Round) {
-        assert!(
-            self.context
-                .parameters
-                .is_sync_last_proposed_block_enabled(),
-            "Should not attempt to set the last known proposed round if that has been already set"
-        );
-        assert!(
-            self.last_known_proposed_round.is_none(),
-            "Attempted to set the last known proposed round more than once"
-        );
+        if self.last_known_proposed_round.is_some() {
+            panic!("Should not attempt to set the last known proposed round if that has been already set");
+        }
         self.last_known_proposed_round = Some(round);
         info!("Set last known proposed round to {round}");
     }
@@ -390,7 +384,6 @@ impl Core {
                     .saturating_duration_since(self.threshold_clock.get_quorum_ts())
                     .as_millis() as u64,
             );
-
         self.context
             .metrics
             .node_metrics
@@ -409,14 +402,14 @@ impl Core {
         self.context
             .metrics
             .node_metrics
-            .block_ancestors
+            .proposed_block_ancestors
             .observe(ancestors.len() as f64);
         for ancestor in &ancestors {
             let authority = &self.context.committee.authority(ancestor.author()).hostname;
             self.context
                 .metrics
                 .node_metrics
-                .block_ancestors_depth
+                .proposed_block_ancestors_depth
                 .with_label_values(&[authority])
                 .observe(clock_round.saturating_sub(ancestor.round()).into());
         }
@@ -435,6 +428,11 @@ impl Core {
         // Consume the next transactions to be included. Do not drop the guards yet as this would acknowledge
         // the inclusion of transactions. Just let this be done in the end of the method.
         let (transactions, ack_transactions) = self.transaction_consumer.next();
+        self.context
+            .metrics
+            .node_metrics
+            .proposed_block_transactions
+            .observe(transactions.len() as f64);
 
         // Consume the commit votes to be included.
         let commit_votes = self
@@ -461,7 +459,7 @@ impl Core {
         self.context
             .metrics
             .node_metrics
-            .block_size
+            .proposed_block_size
             .observe(serialized.len() as f64);
         // Unnecessary to verify own blocks.
         let verified_block = VerifiedBlock::new_verified(signed_block, serialized);
@@ -864,7 +862,7 @@ impl CoreTextFixture {
                 .with_num_commits_per_schedule(10),
         );
         let (_transaction_client, tx_receiver) = TransactionClient::new(context.clone());
-        let transaction_consumer = TransactionConsumer::new(tx_receiver, context.clone(), None);
+        let transaction_consumer = TransactionConsumer::new(tx_receiver, context.clone());
         let (signals, signal_receivers) = CoreSignals::new(context.clone());
         // Need at least one subscriber to the block broadcast channel.
         let block_receiver = signal_receivers.block_broadcast_receiver();
@@ -872,7 +870,7 @@ impl CoreTextFixture {
         let (commit_sender, commit_receiver) = unbounded_channel("consensus_output");
         let commit_observer = CommitObserver::new(
             context.clone(),
-            CommitConsumer::new(commit_sender.clone(), 0, 0),
+            CommitConsumer::new(commit_sender.clone(), 0),
             dag_state.clone(),
             store.clone(),
             leader_schedule.clone(),
@@ -890,6 +888,7 @@ impl CoreTextFixture {
             signals,
             block_signer,
             dag_state,
+            false,
         );
 
         Self {
@@ -931,7 +930,7 @@ mod test {
         let context = Arc::new(context);
         let store = Arc::new(MemStore::new());
         let (_transaction_client, tx_receiver) = TransactionClient::new(context.clone());
-        let transaction_consumer = TransactionConsumer::new(tx_receiver, context.clone(), None);
+        let transaction_consumer = TransactionConsumer::new(tx_receiver, context.clone());
 
         // Create test blocks for all the authorities for 4 rounds and populate them in store
         let mut last_round_blocks = genesis_blocks(context.clone());
@@ -970,7 +969,7 @@ mod test {
         let (sender, _receiver) = unbounded_channel("consensus_output");
         let commit_observer = CommitObserver::new(
             context.clone(),
-            CommitConsumer::new(sender.clone(), 0, 0),
+            CommitConsumer::new(sender.clone(), 0),
             dag_state.clone(),
             store.clone(),
             leader_schedule.clone(),
@@ -995,6 +994,7 @@ mod test {
             signals,
             key_pairs.remove(context.own_index.value()).1,
             dag_state.clone(),
+            false,
         );
 
         // New round should be 5
@@ -1041,7 +1041,7 @@ mod test {
         let context = Arc::new(context);
         let store = Arc::new(MemStore::new());
         let (_transaction_client, tx_receiver) = TransactionClient::new(context.clone());
-        let transaction_consumer = TransactionConsumer::new(tx_receiver, context.clone(), None);
+        let transaction_consumer = TransactionConsumer::new(tx_receiver, context.clone());
 
         // Create test blocks for all authorities except our's (index = 0).
         let mut last_round_blocks = genesis_blocks(context.clone());
@@ -1087,7 +1087,7 @@ mod test {
         let (sender, _receiver) = unbounded_channel("consensus_output");
         let commit_observer = CommitObserver::new(
             context.clone(),
-            CommitConsumer::new(sender.clone(), 0, 0),
+            CommitConsumer::new(sender.clone(), 0),
             dag_state.clone(),
             store.clone(),
             leader_schedule.clone(),
@@ -1112,6 +1112,7 @@ mod test {
             signals,
             key_pairs.remove(context.own_index.value()).1,
             dag_state.clone(),
+            false,
         );
 
         // New round should be 4
@@ -1171,7 +1172,7 @@ mod test {
             Arc::new(NoopBlockVerifier),
         );
         let (transaction_client, tx_receiver) = TransactionClient::new(context.clone());
-        let transaction_consumer = TransactionConsumer::new(tx_receiver, context.clone(), None);
+        let transaction_consumer = TransactionConsumer::new(tx_receiver, context.clone());
         let (signals, signal_receivers) = CoreSignals::new(context.clone());
         // Need at least one subscriber to the block broadcast channel.
         let mut block_receiver = signal_receivers.block_broadcast_receiver();
@@ -1183,7 +1184,7 @@ mod test {
         let (sender, _receiver) = unbounded_channel("consensus_output");
         let commit_observer = CommitObserver::new(
             context.clone(),
-            CommitConsumer::new(sender.clone(), 0, 0),
+            CommitConsumer::new(sender.clone(), 0),
             dag_state.clone(),
             store.clone(),
             leader_schedule.clone(),
@@ -1199,6 +1200,7 @@ mod test {
             signals,
             key_pairs.remove(context.own_index.value()).1,
             dag_state.clone(),
+            false,
         );
 
         // Send some transactions
@@ -1284,7 +1286,7 @@ mod test {
         ));
 
         let (_transaction_client, tx_receiver) = TransactionClient::new(context.clone());
-        let transaction_consumer = TransactionConsumer::new(tx_receiver, context.clone(), None);
+        let transaction_consumer = TransactionConsumer::new(tx_receiver, context.clone());
         let (signals, signal_receivers) = CoreSignals::new(context.clone());
         // Need at least one subscriber to the block broadcast channel.
         let _block_receiver = signal_receivers.block_broadcast_receiver();
@@ -1292,7 +1294,7 @@ mod test {
         let (sender, _receiver) = unbounded_channel("consensus_output");
         let commit_observer = CommitObserver::new(
             context.clone(),
-            CommitConsumer::new(sender.clone(), 0, 0),
+            CommitConsumer::new(sender.clone(), 0),
             dag_state.clone(),
             store.clone(),
             leader_schedule.clone(),
@@ -1308,6 +1310,7 @@ mod test {
             signals,
             key_pairs.remove(context.own_index.value()).1,
             dag_state.clone(),
+            false,
         );
 
         let mut expected_ancestors = BTreeSet::new();
@@ -1354,7 +1357,7 @@ mod test {
         telemetry_subscribers::init_for_testing();
         let (context, mut key_pairs) = Context::new_for_test(4);
         let context = Arc::new(context.with_parameters(Parameters {
-            sync_last_proposed_block_timeout: Duration::from_millis(2_000),
+            sync_last_known_own_block_timeout: Duration::from_millis(2_000),
             ..Default::default()
         }));
 
@@ -1372,7 +1375,7 @@ mod test {
         ));
 
         let (_transaction_client, tx_receiver) = TransactionClient::new(context.clone());
-        let transaction_consumer = TransactionConsumer::new(tx_receiver, context.clone(), None);
+        let transaction_consumer = TransactionConsumer::new(tx_receiver, context.clone());
         let (signals, signal_receivers) = CoreSignals::new(context.clone());
         // Need at least one subscriber to the block broadcast channel.
         let _block_receiver = signal_receivers.block_broadcast_receiver();
@@ -1380,7 +1383,7 @@ mod test {
         let (sender, _receiver) = unbounded_channel("consensus_output");
         let commit_observer = CommitObserver::new(
             context.clone(),
-            CommitConsumer::new(sender.clone(), 0, 0),
+            CommitConsumer::new(sender.clone(), 0),
             dag_state.clone(),
             store.clone(),
             leader_schedule.clone(),
@@ -1396,6 +1399,7 @@ mod test {
             signals,
             key_pairs.remove(context.own_index.value()).1,
             dag_state.clone(),
+            true,
         );
 
         // No new block should have been produced
@@ -1559,7 +1563,7 @@ mod test {
         ));
 
         let (_transaction_client, tx_receiver) = TransactionClient::new(context.clone());
-        let transaction_consumer = TransactionConsumer::new(tx_receiver, context.clone(), None);
+        let transaction_consumer = TransactionConsumer::new(tx_receiver, context.clone());
         let (signals, signal_receivers) = CoreSignals::new(context.clone());
         // Need at least one subscriber to the block broadcast channel.
         let _block_receiver = signal_receivers.block_broadcast_receiver();
@@ -1567,7 +1571,7 @@ mod test {
         let (sender, _receiver) = unbounded_channel("consensus_output");
         let commit_observer = CommitObserver::new(
             context.clone(),
-            CommitConsumer::new(sender.clone(), 0, 0),
+            CommitConsumer::new(sender.clone(), 0),
             dag_state.clone(),
             store.clone(),
             leader_schedule.clone(),
@@ -1583,6 +1587,7 @@ mod test {
             signals,
             key_pairs.remove(context.own_index.value()).1,
             dag_state.clone(),
+            false,
         );
 
         // No proposal during recovery.
diff --git a/consensus/core/src/core_thread.rs b/consensus/core/src/core_thread.rs
index fca3406dd8d64..8c39d6059746f 100644
--- a/consensus/core/src/core_thread.rs
+++ b/consensus/core/src/core_thread.rs
@@ -8,6 +8,7 @@ use mysten_metrics::{
     monitored_mpsc::{channel, Receiver, Sender, WeakSender},
     monitored_scope, spawn_logged_monitored_task,
 };
+use parking_lot::Mutex;
 use thiserror::Error;
 use tokio::sync::{oneshot, watch};
 use tracing::warn;
@@ -231,6 +232,67 @@ impl CoreThreadDispatcher for ChannelCoreThreadDispatcher {
     }
 }
 
+// TODO: complete the Mock for thread dispatcher to be used from several tests
+#[derive(Default)]
+pub(crate) struct MockCoreThreadDispatcher {
+    add_blocks: Mutex<Vec<VerifiedBlock>>,
+    missing_blocks: Mutex<BTreeSet<BlockRef>>,
+    last_known_proposed_round: Mutex<Vec<Round>>,
+}
+
+impl MockCoreThreadDispatcher {
+    #[cfg(test)]
+    pub(crate) async fn get_add_blocks(&self) -> Vec<VerifiedBlock> {
+        let mut add_blocks = self.add_blocks.lock();
+        add_blocks.drain(0..).collect()
+    }
+
+    #[cfg(test)]
+    pub(crate) async fn stub_missing_blocks(&self, block_refs: BTreeSet<BlockRef>) {
+        let mut missing_blocks = self.missing_blocks.lock();
+        missing_blocks.extend(block_refs);
+    }
+
+    #[cfg(test)]
+    pub(crate) async fn get_last_own_proposed_round(&self) -> Vec<Round> {
+        let last_known_proposed_round = self.last_known_proposed_round.lock();
+        last_known_proposed_round.clone()
+    }
+}
+
+#[async_trait]
+impl CoreThreadDispatcher for MockCoreThreadDispatcher {
+    async fn add_blocks(
+        &self,
+        blocks: Vec<VerifiedBlock>,
+    ) -> Result<BTreeSet<BlockRef>, CoreError> {
+        let mut add_blocks = self.add_blocks.lock();
+        add_blocks.extend(blocks);
+        Ok(BTreeSet::new())
+    }
+
+    async fn new_block(&self, _round: Round, _force: bool) -> Result<(), CoreError> {
+        Ok(())
+    }
+
+    async fn get_missing_blocks(&self) -> Result<BTreeSet<BlockRef>, CoreError> {
+        let mut missing_blocks = self.missing_blocks.lock();
+        let result = missing_blocks.clone();
+        missing_blocks.clear();
+        Ok(result)
+    }
+
+    fn set_consumer_availability(&self, _available: bool) -> Result<(), CoreError> {
+        todo!()
+    }
+
+    fn set_last_known_proposed_round(&self, round: Round) -> Result<(), CoreError> {
+        let mut last_known_proposed_round = self.last_known_proposed_round.lock();
+        last_known_proposed_round.push(round);
+        Ok(())
+    }
+}
+
 #[cfg(test)]
 mod test {
     use mysten_metrics::monitored_mpsc::unbounded_channel;
@@ -263,7 +325,7 @@ mod test {
             Arc::new(NoopBlockVerifier),
         );
         let (_transaction_client, tx_receiver) = TransactionClient::new(context.clone());
-        let transaction_consumer = TransactionConsumer::new(tx_receiver, context.clone(), None);
+        let transaction_consumer = TransactionConsumer::new(tx_receiver, context.clone());
         let (signals, signal_receivers) = CoreSignals::new(context.clone());
         let _block_receiver = signal_receivers.block_broadcast_receiver();
         let (sender, _receiver) = unbounded_channel("consensus_output");
@@ -273,7 +335,7 @@ mod test {
         ));
         let commit_observer = CommitObserver::new(
             context.clone(),
-            CommitConsumer::new(sender.clone(), 0, 0),
+            CommitConsumer::new(sender.clone(), 0),
             dag_state.clone(),
             store,
             leader_schedule.clone(),
@@ -292,6 +354,7 @@ mod test {
             signals,
             key_pairs.remove(context.own_index.value()).1,
             dag_state,
+            false,
         );
 
         let (core_dispatcher, handle) = ChannelCoreThreadDispatcher::start(core, context);
diff --git a/consensus/core/src/dag_state.rs b/consensus/core/src/dag_state.rs
index 5ebac04a585a1..aa7f3ca718f28 100644
--- a/consensus/core/src/dag_state.rs
+++ b/consensus/core/src/dag_state.rs
@@ -307,7 +307,7 @@ impl DagState {
             .metrics
             .node_metrics
             .dag_state_store_read_count
-            .with_label_values(&[&"get_blocks"])
+            .with_label_values(&["get_blocks"])
             .inc();
 
         for ((index, _), result) in missing.into_iter().zip(store_results.into_iter()) {
@@ -556,7 +556,7 @@ impl DagState {
             .metrics
             .node_metrics
             .dag_state_store_read_count
-            .with_label_values(&[&"contains_blocks"])
+            .with_label_values(&["contains_blocks"])
             .inc();
 
         for ((index, _), result) in missing.into_iter().zip(store_results.into_iter()) {
diff --git a/consensus/core/src/error.rs b/consensus/core/src/error.rs
index d9fdb99e37ed0..9dadc6c84da06 100644
--- a/consensus/core/src/error.rs
+++ b/consensus/core/src/error.rs
@@ -24,6 +24,15 @@ pub(crate) enum ConsensusError {
     #[error("Error serializing: {0}")]
     SerializationFailure(bcs::Error),
 
+    #[error("Block contains a transaction that is too large: {size} > {limit}")]
+    TransactionTooLarge { size: usize, limit: usize },
+
+    #[error("Block contains too many transactions: {count} > {limit}")]
+    TooManyTransactions { count: usize, limit: usize },
+
+    #[error("Block contains too many transaction bytes: {size} > {limit}")]
+    TooManyTransactionBytes { size: usize, limit: usize },
+
     #[error("Unexpected block authority {0} from peer {1}")]
     UnexpectedAuthority(AuthorityIndex, AuthorityIndex),
 
diff --git a/consensus/core/src/leader_scoring.rs b/consensus/core/src/leader_scoring.rs
index eaafbcc439e00..380003debd37d 100644
--- a/consensus/core/src/leader_scoring.rs
+++ b/consensus/core/src/leader_scoring.rs
@@ -41,7 +41,7 @@ pub(crate) struct ReputationScoreCalculator<'a> {
 impl<'a> ReputationScoreCalculator<'a> {
     pub(crate) fn new(
         context: Arc<Context>,
-        unscored_subdags: &Vec<CommittedSubDag>,
+        unscored_subdags: &[CommittedSubDag],
         scoring_strategy: &'a dyn ScoringStrategy,
     ) -> Self {
         let num_authorities = context.committee.size();
diff --git a/consensus/core/src/leader_scoring_strategy.rs b/consensus/core/src/leader_scoring_strategy.rs
index b635f5f474cd0..640e3667cd71c 100644
--- a/consensus/core/src/leader_scoring_strategy.rs
+++ b/consensus/core/src/leader_scoring_strategy.rs
@@ -10,6 +10,7 @@ use crate::{
     stake_aggregator::{QuorumThreshold, StakeAggregator},
 };
 
+#[allow(unused)]
 pub(crate) trait ScoringStrategy: Send + Sync {
     fn calculate_scores_for_leader(&self, subdag: &UnscoredSubdag, leader_slot: Slot) -> Vec<u64>;
 
diff --git a/consensus/core/src/lib.rs b/consensus/core/src/lib.rs
index ba428b1eb7bc4..729fe63c18153 100644
--- a/consensus/core/src/lib.rs
+++ b/consensus/core/src/lib.rs
@@ -31,6 +31,8 @@ mod threshold_clock;
 mod transaction;
 mod universal_committer;
 
+mod commit_consumer;
+mod commit_vote_monitor;
 #[cfg(test)]
 mod test_dag;
 #[cfg(test)]
@@ -40,8 +42,9 @@ mod test_dag_parser;
 
 pub use authority_node::ConsensusAuthority;
 pub use block::{BlockAPI, Round};
-pub use commit::{CommitConsumer, CommitDigest, CommitIndex, CommitRef, CommittedSubDag};
-pub use transaction::{TransactionClient, TransactionVerifier, ValidationError};
+pub use commit::{CommitDigest, CommitIndex, CommitRef, CommittedSubDag};
+pub use commit_consumer::{CommitConsumer, CommitConsumerMonitor};
+pub use transaction::{ClientError, TransactionClient, TransactionVerifier, ValidationError};
 
 #[cfg(test)]
 #[path = "tests/randomized_tests.rs"]
diff --git a/consensus/core/src/metrics.rs b/consensus/core/src/metrics.rs
index f6b2e470c0eea..8d9f60b179b6b 100644
--- a/consensus/core/src/metrics.rs
+++ b/consensus/core/src/metrics.rs
@@ -19,7 +19,7 @@ const FINE_GRAINED_LATENCY_SEC_BUCKETS: &[f64] = &[
     4.0, 4.5, 5.0, 5.5, 6.0, 6.5, 7.0, 7.5, 8.0, 8.5, 9.0, 9.5, 10.,
 ];
 
-const NUM_BLOCKS_BUCKETS: &[f64] = &[
+const NUM_BUCKETS: &[f64] = &[
     1.0,
     2.0,
     4.0,
@@ -99,9 +99,10 @@ pub(crate) fn test_metrics() -> Arc<Metrics> {
 pub(crate) struct NodeMetrics {
     pub(crate) block_commit_latency: Histogram,
     pub(crate) proposed_blocks: IntCounterVec,
-    pub(crate) block_size: Histogram,
-    pub(crate) block_ancestors: Histogram,
-    pub(crate) block_ancestors_depth: HistogramVec,
+    pub(crate) proposed_block_size: Histogram,
+    pub(crate) proposed_block_transactions: Histogram,
+    pub(crate) proposed_block_ancestors: Histogram,
+    pub(crate) proposed_block_ancestors_depth: HistogramVec,
     pub(crate) highest_verified_authority_round: IntGaugeVec,
     pub(crate) lowest_verified_authority_round: IntGaugeVec,
     pub(crate) block_proposal_leader_wait_ms: IntCounterVec,
@@ -133,6 +134,7 @@ pub(crate) struct NodeMetrics {
     pub(crate) last_committed_leader_round: IntGauge,
     pub(crate) last_commit_index: IntGauge,
     pub(crate) last_known_own_block_round: IntGauge,
+    pub(crate) sync_last_known_own_block_retries: IntCounter,
     pub(crate) commit_round_advancement_interval: Histogram,
     pub(crate) last_decided_leader_round: IntGauge,
     pub(crate) leader_timeout_total: IntCounterVec,
@@ -184,20 +186,26 @@ impl NodeMetrics {
                 &["force"],
                 registry,
             ).unwrap(),
-            block_size: register_histogram_with_registry!(
-                "block_size",
+            proposed_block_size: register_histogram_with_registry!(
+                "proposed_block_size",
                 "The size (in bytes) of proposed blocks",
                 SIZE_BUCKETS.to_vec(),
                 registry
             ).unwrap(),
-            block_ancestors: register_histogram_with_registry!(
-                "block_ancestors",
+            proposed_block_transactions: register_histogram_with_registry!(
+                "proposed_block_transactions",
+                "# of transactions contained in proposed blocks",
+                NUM_BUCKETS.to_vec(),
+                registry
+            ).unwrap(),
+            proposed_block_ancestors: register_histogram_with_registry!(
+                "proposed_block_ancestors",
                 "Number of ancestors in proposed blocks",
                 exponential_buckets(1.0, 1.4, 20).unwrap(),
                 registry,
             ).unwrap(),
-            block_ancestors_depth: register_histogram_vec_with_registry!(
-                "block_ancestors_depth",
+            proposed_block_ancestors_depth: register_histogram_vec_with_registry!(
+                "proposed_block_ancestors_depth",
                 "The depth in rounds of ancestors included in newly proposed blocks",
                 &["authority"],
                 exponential_buckets(1.0, 2.0, 14).unwrap(),
@@ -236,7 +244,7 @@ impl NodeMetrics {
             blocks_per_commit_count: register_histogram_with_registry!(
                 "blocks_per_commit_count",
                 "The number of blocks per commit.",
-                NUM_BLOCKS_BUCKETS.to_vec(),
+                NUM_BUCKETS.to_vec(),
                 registry,
             ).unwrap(),
             broadcaster_rtt_estimate_ms: register_int_gauge_vec_with_registry!(
@@ -248,7 +256,7 @@ impl NodeMetrics {
             core_add_blocks_batch_size: register_histogram_with_registry!(
                 "core_add_blocks_batch_size",
                 "The number of blocks received from Core for processing on a single batch",
-                NUM_BLOCKS_BUCKETS.to_vec(),
+                NUM_BUCKETS.to_vec(),
                 registry,
             ).unwrap(),
             core_lock_dequeued: register_int_counter_with_registry!(
@@ -327,6 +335,11 @@ impl NodeMetrics {
                 "The highest round of our own block as this has been synced from peers during an amnesia recovery",
                 registry,
             ).unwrap(),
+            sync_last_known_own_block_retries: register_int_counter_with_registry!(
+                "sync_last_known_own_block_retries",
+                "Number of times this node tried to fetch the last own block from peers",
+                registry,
+            ).unwrap(),
             // TODO: add a short status label.
             invalid_blocks: register_int_counter_vec_with_registry!(
                 "invalid_blocks",
diff --git a/consensus/core/src/network/anemo_network.rs b/consensus/core/src/network/anemo_network.rs
index 54ffff9c15d16..6a156691cd375 100644
--- a/consensus/core/src/network/anemo_network.rs
+++ b/consensus/core/src/network/anemo_network.rs
@@ -22,7 +22,6 @@ use anemo_tower::{
 use arc_swap::ArcSwapOption;
 use async_trait::async_trait;
 use bytes::Bytes;
-use cfg_if::cfg_if;
 use consensus_config::{AuthorityIndex, NetworkKeyPair};
 use serde::{Deserialize, Serialize};
 use tokio::sync::broadcast::error::RecvError;
@@ -452,16 +451,13 @@ impl<S: NetworkService> NetworkManager<S> for AnemoManager {
 
         let server = ConsensusRpcServer::new(AnemoServiceProxy::new(self.context.clone(), service));
         let authority = self.context.committee.authority(self.context.own_index);
-        // Bind to localhost in unit tests since only local networking is needed.
-        // Bind to the unspecified address to allow the actual address to be assigned,
-        // in simtest and production.
-        cfg_if!(
-            if #[cfg(test)] {
-                let own_address = authority.address.with_localhost_ip();
-            } else {
-                let own_address = authority.address.with_zero_ip();
-            }
-        );
+        // By default, bind to the unspecified address to allow the actual address to be assigned.
+        // But bind to localhost if it is requested.
+        let own_address = if authority.address.is_localhost_ip() {
+            authority.address.clone()
+        } else {
+            authority.address.with_zero_ip()
+        };
         let epoch_string: String = self.context.committee.epoch().to_string();
         let inbound_network_metrics = self.context.metrics.network_metrics.inbound.clone();
         let outbound_network_metrics = self.context.metrics.network_metrics.outbound.clone();
diff --git a/consensus/core/src/network/network_tests.rs b/consensus/core/src/network/network_tests.rs
index d8113befb6b3a..cef1ff8530c54 100644
--- a/consensus/core/src/network/network_tests.rs
+++ b/consensus/core/src/network/network_tests.rs
@@ -31,7 +31,11 @@ trait ManagerBuilder {
 struct AnemoManagerBuilder {}
 
 impl ManagerBuilder for AnemoManagerBuilder {
-    fn build(&self, context: Arc<Context>, network_keypair: NetworkKeyPair) -> AnemoManager {
+    fn build(
+        &self,
+        context: Arc<Context>,
+        network_keypair: NetworkKeyPair,
+    ) -> impl NetworkManager<Mutex<TestService>> {
         AnemoManager::new(context, network_keypair)
     }
 }
@@ -39,7 +43,11 @@ impl ManagerBuilder for AnemoManagerBuilder {
 struct TonicManagerBuilder {}
 
 impl ManagerBuilder for TonicManagerBuilder {
-    fn build(&self, context: Arc<Context>, network_keypair: NetworkKeyPair) -> TonicManager {
+    fn build(
+        &self,
+        context: Arc<Context>,
+        network_keypair: NetworkKeyPair,
+    ) -> impl NetworkManager<Mutex<TestService>> {
         TonicManager::new(context, network_keypair)
     }
 }
diff --git a/consensus/core/src/network/tonic_network.rs b/consensus/core/src/network/tonic_network.rs
index b6c184c069e65..656813aca6f18 100644
--- a/consensus/core/src/network/tonic_network.rs
+++ b/consensus/core/src/network/tonic_network.rs
@@ -14,7 +14,8 @@ use bytes::Bytes;
 use cfg_if::cfg_if;
 use consensus_config::{AuthorityIndex, NetworkKeyPair, NetworkPublicKey};
 use futures::{stream, Stream, StreamExt as _};
-use hyper::server::conn::Http;
+use hyper_util::rt::tokio::TokioIo;
+use hyper_util::service::TowerToHyperService;
 use mysten_common::sync::notify_once::NotifyOnce;
 use mysten_metrics::monitored_future;
 use mysten_network::{
@@ -144,15 +145,18 @@ impl NetworkClient for TonicClient {
         let response = client.subscribe_blocks(request).await.map_err(|e| {
             ConsensusError::NetworkRequest(format!("subscribe_blocks failed: {e:?}"))
         })?;
-        let stream = response.into_inner().filter_map(move |b| async move {
-            match b {
-                Ok(response) => Some(response.block),
-                Err(e) => {
-                    debug!("Network error received from {}: {e:?}", peer);
-                    None
+        let stream = response
+            .into_inner()
+            .take_while(|b| futures::future::ready(b.is_ok()))
+            .filter_map(move |b| async move {
+                match b {
+                    Ok(response) => Some(response.block),
+                    Err(e) => {
+                        debug!("Network error received from {}: {e:?}", peer);
+                        None
+                    }
                 }
-            }
-        });
+            });
         let rate_limited_stream =
             tokio_stream::StreamExt::throttle(stream, self.context.parameters.min_round_delay / 2)
                 .boxed();
@@ -662,16 +666,13 @@ impl<S: NetworkService> NetworkManager<S> for TonicManager {
         info!("Starting tonic service");
 
         let authority = self.context.committee.authority(self.context.own_index);
-        // Bind to localhost in unit tests since only local networking is needed.
-        // Bind to the unspecified address to allow the actual address to be assigned,
-        // in simtest and production.
-        cfg_if!(
-            if #[cfg(test)] {
-                let own_address = authority.address.with_localhost_ip();
-            } else {
-                let own_address = authority.address.with_zero_ip();
-            }
-        );
+        // By default, bind to the unspecified address to allow the actual address to be assigned.
+        // But bind to localhost if it is requested.
+        let own_address = if authority.address.is_localhost_ip() {
+            authority.address.clone()
+        } else {
+            authority.address.with_zero_ip()
+        };
         let own_address = to_socket_addr(&own_address).unwrap();
         let service = TonicServiceProxy::new(self.context.clone(), service);
         let config = &self.context.parameters.tonic;
@@ -692,13 +693,14 @@ impl<S: NetworkService> NetworkManager<S> for TonicManager {
                     .max_encoding_message_size(config.message_size_limit)
                     .max_decoding_message_size(config.message_size_limit),
             )
-            .into_service();
+            .into_router();
 
         let inbound_metrics = self.context.metrics.network_metrics.inbound.clone();
         let excessive_message_size = self.context.parameters.tonic.excessive_message_size;
 
-        let mut http = Http::new();
-        http.http2_only(true);
+        let http =
+            hyper_util::server::conn::auto::Builder::new(hyper_util::rt::TokioExecutor::new())
+                .http2_only();
         let http = Arc::new(http);
 
         let tls_server_config =
@@ -875,7 +877,7 @@ impl<S: NetworkService> NetworkManager<S> for TonicManager {
                         .service(consensus_service.clone());
 
                     pin! {
-                        let connection = http.serve_connection(tls_stream, svc);
+                        let connection = http.serve_connection(TokioIo::new(tls_stream), TowerToHyperService::new(svc));
                     }
                     trace!("Connection ready. Starting to serve requests for {peer_addr:?}");
 
diff --git a/consensus/core/src/network/tonic_tls.rs b/consensus/core/src/network/tonic_tls.rs
index 1b5587ba459eb..88a40f88c4103 100644
--- a/consensus/core/src/network/tonic_tls.rs
+++ b/consensus/core/src/network/tonic_tls.rs
@@ -57,6 +57,7 @@ pub(crate) fn create_rustls_client_config(
 }
 
 // Checks if the public key from a TLS certificate belongs to one of the validators.
+#[derive(Debug)]
 struct AllowedPublicKeys {
     // TODO: refactor to use key bytes
     keys: BTreeSet<Ed25519PublicKey>,
diff --git a/consensus/core/src/stake_aggregator.rs b/consensus/core/src/stake_aggregator.rs
index 7e907dee1fcb8..11501319e64e9 100644
--- a/consensus/core/src/stake_aggregator.rs
+++ b/consensus/core/src/stake_aggregator.rs
@@ -11,6 +11,7 @@ pub(crate) trait CommitteeThreshold {
 
 pub(crate) struct QuorumThreshold;
 
+#[allow(unused)]
 pub(crate) struct ValidityThreshold;
 
 impl CommitteeThreshold for QuorumThreshold {
diff --git a/consensus/core/src/storage/mem_store.rs b/consensus/core/src/storage/mem_store.rs
index 2a88fc5bd71ad..ad23cd3652cee 100644
--- a/consensus/core/src/storage/mem_store.rs
+++ b/consensus/core/src/storage/mem_store.rs
@@ -20,10 +20,12 @@ use crate::{
 };
 
 /// In-memory storage for testing.
+#[allow(unused)]
 pub(crate) struct MemStore {
     inner: RwLock<Inner>,
 }
 
+#[allow(unused)]
 struct Inner {
     blocks: BTreeMap<(Round, AuthorityIndex, BlockDigest), VerifiedBlock>,
     digests_by_authorities: BTreeSet<(AuthorityIndex, Round, BlockDigest)>,
diff --git a/consensus/core/src/storage/mod.rs b/consensus/core/src/storage/mod.rs
index 5c524be30318e..38258c87e8420 100644
--- a/consensus/core/src/storage/mod.rs
+++ b/consensus/core/src/storage/mod.rs
@@ -17,6 +17,7 @@ use crate::{
 };
 
 /// A common interface for consensus storage.
+#[allow(unused)]
 pub(crate) trait Store: Send + Sync {
     /// Writes blocks, consensus commits and other data to store atomically.
     fn write(&self, write_batch: WriteBatch) -> ConsensusResult<()>;
diff --git a/consensus/core/src/subscriber.rs b/consensus/core/src/subscriber.rs
index bce04247c7a1d..7b350debf313c 100644
--- a/consensus/core/src/subscriber.rs
+++ b/consensus/core/src/subscriber.rs
@@ -152,7 +152,7 @@ impl<C: NetworkClient, S: NetworkService> Subscriber<C, S> {
                         .metrics
                         .node_metrics
                         .subscriber_connection_attempts
-                        .with_label_values(&[&peer_hostname, "success"])
+                        .with_label_values(&[peer_hostname, "success"])
                         .inc();
                     blocks
                 }
@@ -162,7 +162,7 @@ impl<C: NetworkClient, S: NetworkService> Subscriber<C, S> {
                         .metrics
                         .node_metrics
                         .subscriber_connection_attempts
-                        .with_label_values(&[&peer_hostname, "failure"])
+                        .with_label_values(&[peer_hostname, "failure"])
                         .inc();
                     continue 'subscription;
                 }
@@ -184,7 +184,7 @@ impl<C: NetworkClient, S: NetworkService> Subscriber<C, S> {
                             .metrics
                             .node_metrics
                             .subscribed_blocks
-                            .with_label_values(&[&peer_hostname])
+                            .with_label_values(&[peer_hostname])
                             .inc();
                         let result = authority_service
                             .handle_send_block(peer, block.clone())
diff --git a/consensus/core/src/synchronizer.rs b/consensus/core/src/synchronizer.rs
index 504cd63249b6e..09193b7d06742 100644
--- a/consensus/core/src/synchronizer.rs
+++ b/consensus/core/src/synchronizer.rs
@@ -27,13 +27,12 @@ use tokio::{
 };
 use tracing::{debug, error, info, trace, warn};
 
-use crate::authority_service::COMMIT_LAG_MULTIPLIER;
-use crate::commit_syncer::CommitVoteMonitor;
+use crate::{authority_service::COMMIT_LAG_MULTIPLIER, core_thread::CoreThreadDispatcher};
 use crate::{
     block::{BlockRef, SignedBlock, VerifiedBlock},
     block_verifier::BlockVerifier,
+    commit_vote_monitor::CommitVoteMonitor,
     context::Context,
-    core_thread::CoreThreadDispatcher,
     dag_state::DagState,
     error::{ConsensusError, ConsensusResult},
     network::NetworkClient,
@@ -245,6 +244,7 @@ impl<C: NetworkClient, V: BlockVerifier, D: CoreThreadDispatcher> Synchronizer<C
         commit_vote_monitor: Arc<CommitVoteMonitor>,
         block_verifier: Arc<V>,
         dag_state: Arc<RwLock<DagState>>,
+        sync_last_known_own_block: bool,
     ) -> Arc<SynchronizerHandle> {
         let (commands_sender, commands_receiver) =
             channel("consensus_synchronizer_commands", 1_000);
@@ -259,29 +259,24 @@ impl<C: NetworkClient, V: BlockVerifier, D: CoreThreadDispatcher> Synchronizer<C
             }
             let (sender, receiver) =
                 channel("consensus_synchronizer_fetches", FETCH_BLOCKS_CONCURRENCY);
-            let context_cloned = context.clone();
-            let network_cloned = network_client.clone();
-            let block_verified_cloned = block_verifier.clone();
-            let core_thread_dispatcher_cloned = core_dispatcher.clone();
-            let dag_state_cloned = dag_state.clone();
-            let command_sender_cloned = commands_sender.clone();
-
-            tasks.spawn(monitored_future!(Self::fetch_blocks_from_authority(
+            let fetch_blocks_from_authority_async = Self::fetch_blocks_from_authority(
                 index,
-                network_cloned,
-                block_verified_cloned,
-                context_cloned,
-                core_thread_dispatcher_cloned,
-                dag_state_cloned,
+                network_client.clone(),
+                block_verifier.clone(),
+                commit_vote_monitor.clone(),
+                context.clone(),
+                core_dispatcher.clone(),
+                dag_state.clone(),
                 receiver,
-                command_sender_cloned,
-            )));
+                commands_sender.clone(),
+            );
+            tasks.spawn(monitored_future!(fetch_blocks_from_authority_async));
             fetch_block_senders.insert(index, sender);
         }
 
         let commands_sender_clone = commands_sender.clone();
 
-        if context.parameters.is_sync_last_proposed_block_enabled() {
+        if sync_last_known_own_block {
             commands_sender
                 .try_send(Command::FetchOwnLastBlock)
                 .expect("Failed to sync our last block");
@@ -294,6 +289,7 @@ impl<C: NetworkClient, V: BlockVerifier, D: CoreThreadDispatcher> Synchronizer<C
                 commands_receiver,
                 fetch_block_senders,
                 core_dispatcher,
+                commit_vote_monitor,
                 fetch_blocks_scheduler_task: JoinSet::new(),
                 fetch_own_last_block_task: JoinSet::new(),
                 network_client,
@@ -301,7 +297,6 @@ impl<C: NetworkClient, V: BlockVerifier, D: CoreThreadDispatcher> Synchronizer<C
                 inflight_blocks_map,
                 commands_sender: commands_sender_clone,
                 dag_state,
-                commit_vote_monitor,
             };
             s.run().await;
         }));
@@ -427,6 +422,7 @@ impl<C: NetworkClient, V: BlockVerifier, D: CoreThreadDispatcher> Synchronizer<C
         peer_index: AuthorityIndex,
         network_client: Arc<C>,
         block_verifier: Arc<V>,
+        commit_vote_monitor: Arc<CommitVoteMonitor>,
         context: Arc<Context>,
         core_dispatcher: Arc<D>,
         dag_state: Arc<RwLock<DagState>>,
@@ -453,6 +449,7 @@ impl<C: NetworkClient, V: BlockVerifier, D: CoreThreadDispatcher> Synchronizer<C
                                 blocks_guard,
                                 core_dispatcher.clone(),
                                 block_verifier.clone(),
+                                commit_vote_monitor.clone(),
                                 context.clone(),
                                 commands_sender.clone(),
                                 "live"
@@ -487,6 +484,7 @@ impl<C: NetworkClient, V: BlockVerifier, D: CoreThreadDispatcher> Synchronizer<C
         requested_blocks_guard: BlocksGuard,
         core_dispatcher: Arc<D>,
         block_verifier: Arc<V>,
+        commit_vote_monitor: Arc<CommitVoteMonitor>,
         context: Arc<Context>,
         commands_sender: Sender<Command>,
         sync_method: &str,
@@ -530,17 +528,22 @@ impl<C: NetworkClient, V: BlockVerifier, D: CoreThreadDispatcher> Synchronizer<C
             }
         }
 
+        // Record commit votes from the verified blocks.
+        for block in &blocks {
+            commit_vote_monitor.observe_block(block);
+        }
+
         let metrics = &context.metrics.node_metrics;
         let peer_hostname = &context.committee.authority(peer_index).hostname;
         metrics
             .synchronizer_fetched_blocks_by_peer
-            .with_label_values(&[peer_hostname, &sync_method])
+            .with_label_values(&[peer_hostname, sync_method])
             .inc_by(blocks.len() as u64);
         for block in &blocks {
             let block_hostname = &context.committee.authority(block.author()).hostname;
             metrics
                 .synchronizer_fetched_blocks_by_authority
-                .with_label_values(&[block_hostname, &sync_method])
+                .with_label_values(&[block_hostname, sync_method])
                 .inc();
         }
 
@@ -692,6 +695,7 @@ impl<C: NetworkClient, V: BlockVerifier, D: CoreThreadDispatcher> Synchronizer<C
 
     fn start_fetch_own_last_block_task(&mut self) {
         const FETCH_OWN_BLOCK_RETRY_DELAY: Duration = Duration::from_millis(1_000);
+        const MAX_RETRY_DELAY_STEP: Duration = Duration::from_millis(4_000);
 
         let context = self.context.clone();
         let network_client = self.network_client.clone();
@@ -702,30 +706,16 @@ impl<C: NetworkClient, V: BlockVerifier, D: CoreThreadDispatcher> Synchronizer<C
             .spawn(monitored_future!(async move {
                 let _scope = monitored_scope("FetchOwnLastBlockTask");
 
-                // Ask all the other peers about our last block
-                let mut results = FuturesUnordered::new();
-
                 let fetch_own_block = |authority_index: AuthorityIndex, fetch_own_block_delay: Duration| {
                     let network_client_cloned = network_client.clone();
-                    let context_cloned = context.clone();
+                    let own_index = context.own_index;
                     async move {
                         sleep(fetch_own_block_delay).await;
-                        let r = network_client_cloned.fetch_latest_blocks(authority_index, vec![context_cloned.own_index], FETCH_REQUEST_TIMEOUT).await;
+                        let r = network_client_cloned.fetch_latest_blocks(authority_index, vec![own_index], FETCH_REQUEST_TIMEOUT).await;
                         (r, authority_index)
                     }
                 };
 
-                for (authority_index, _authority) in context.committee.authorities() {
-                    if authority_index != context.own_index {
-                        results.push(fetch_own_block(authority_index, Duration::from_millis(0)));
-                    }
-                }
-
-                // Gather the results but wait to timeout as well
-                let timer = sleep_until(Instant::now() + context.parameters.sync_last_proposed_block_timeout);
-
-                tokio::pin!(timer);
-
                 let process_blocks = |blocks: Vec<Bytes>, authority_index: AuthorityIndex| -> ConsensusResult<Vec<VerifiedBlock>> {
                                     let mut result = Vec::new();
                                     for serialized_block in blocks {
@@ -749,50 +739,80 @@ impl<C: NetworkClient, V: BlockVerifier, D: CoreThreadDispatcher> Synchronizer<C
                                     Ok(result)
                 };
 
-                // Get the highest of all the results
-                let mut total_stake = 0;
-                let mut highest_round = 0;
-                loop {
-                    tokio::select! {
-                        result = results.next() => {
-                            let Some((result, authority_index)) = result else {
-                                break;
-                            };
-                            match result {
-                                Ok(result) => {
-                                    match process_blocks(result, authority_index) {
-                                        Ok(blocks) => {
-                                            let max_round = blocks.into_iter().map(|b|b.round()).max().unwrap_or(0);
-                                            highest_round = highest_round.max(max_round);
-
-                                            total_stake += context.committee.stake(authority_index);
-                                        },
-                                        Err(err) => {
-                                            warn!("Invalid result returned from {authority_index} while fetching last own block: {err}");
+                // Get the highest of all the results. Retry until at least `f+1` results have been gathered.
+                let mut total_stake;
+                let mut highest_round;
+                let mut retries = 0;
+                let mut retry_delay_step = Duration::from_millis(500);
+                'main:loop {
+                    total_stake = 0;
+                    highest_round = 0;
+
+                    // Ask all the other peers about our last block
+                    let mut results = FuturesUnordered::new();
+
+                    for (authority_index, _authority) in context.committee.authorities() {
+                        if authority_index != context.own_index {
+                            results.push(fetch_own_block(authority_index, Duration::from_millis(0)));
+                        }
+                    }
+
+                    // Gather the results but wait to timeout as well
+                    let timer = sleep_until(Instant::now() + context.parameters.sync_last_known_own_block_timeout);
+                    tokio::pin!(timer);
+
+                    'inner: loop {
+                        tokio::select! {
+                            result = results.next() => {
+                                let Some((result, authority_index)) = result else {
+                                    break 'inner;
+                                };
+                                match result {
+                                    Ok(result) => {
+                                        match process_blocks(result, authority_index) {
+                                            Ok(blocks) => {
+                                                let max_round = blocks.into_iter().map(|b|b.round()).max().unwrap_or(0);
+                                                highest_round = highest_round.max(max_round);
+
+                                                total_stake += context.committee.stake(authority_index);
+                                            },
+                                            Err(err) => {
+                                                warn!("Invalid result returned from {authority_index} while fetching last own block: {err}");
+                                            }
                                         }
+                                    },
+                                    Err(err) => {
+                                        warn!("Error {err} while fetching our own block from peer {authority_index}. Will retry.");
+                                        results.push(fetch_own_block(authority_index, FETCH_OWN_BLOCK_RETRY_DELAY));
                                     }
-                                },
-                                Err(err) => {
-                                    warn!("Error {err} while fetching our own block from peer {authority_index}. Will retry.");
-                                    results.push(fetch_own_block(authority_index, FETCH_OWN_BLOCK_RETRY_DELAY));
                                 }
+                            },
+                            () = &mut timer => {
+                                info!("Timeout while trying to sync our own last block from peers");
+                                break 'inner;
                             }
-                        },
-                        () = &mut timer => {
-                            info!("Timeout while trying to sync our own last block from peers");
-                            break;
                         }
                     }
-                }
 
-                // Update the Core with the highest detected round
-                if total_stake == 0 {
-                    panic!("No peer has returned any acceptable result, can not safely update min round");
+                    // Request at least f+1 stake to have replied back.
+                    if context.committee.reached_validity(total_stake) {
+                        info!("{} out of {} total stake returned acceptable results for our own last block with highest round {}, with {retries} retries.", total_stake, context.committee.total_stake(), highest_round);
+                        break 'main;
+                    } else {
+                        retries += 1;
+                        context.metrics.node_metrics.sync_last_known_own_block_retries.inc();
+                        warn!("Not enough stake: {} out of {} total stake returned acceptable results for our own last block with highest round {}. Will now retry {retries}.", total_stake, context.committee.total_stake(), highest_round);
+
+                        sleep(retry_delay_step).await;
+
+                        retry_delay_step = Duration::from_secs_f64(retry_delay_step.as_secs_f64() * 1.5);
+                        retry_delay_step = retry_delay_step.min(MAX_RETRY_DELAY_STEP);
+                    }
                 }
 
+                // Update the Core with the highest detected round
                 context.metrics.node_metrics.last_known_own_block_round.set(highest_round as i64);
 
-                info!("{} out of {} total stake returned acceptable results for our own last block with highest round {}", total_stake, context.committee.total_stake(), highest_round);
                 if let Err(err) = core_dispatcher.set_last_known_proposed_round(highest_round) {
                     warn!("Error received while calling dispatcher, probably dispatcher is shutting down, will now exit: {err:?}");
                 }
@@ -826,6 +846,7 @@ impl<C: NetworkClient, V: BlockVerifier, D: CoreThreadDispatcher> Synchronizer<C
         let context = self.context.clone();
         let network_client = self.network_client.clone();
         let block_verifier = self.block_verifier.clone();
+        let commit_vote_monitor = self.commit_vote_monitor.clone();
         let core_dispatcher = self.core_dispatcher.clone();
         let blocks_to_fetch = self.inflight_blocks_map.clone();
         let commands_sender = self.commands_sender.clone();
@@ -851,7 +872,7 @@ impl<C: NetworkClient, V: BlockVerifier, D: CoreThreadDispatcher> Synchronizer<C
                 for (blocks_guard, fetched_blocks, peer) in results {
                     total_fetched += fetched_blocks.len();
 
-                    if let Err(err) = Self::process_fetched_blocks(fetched_blocks, peer, blocks_guard, core_dispatcher.clone(), block_verifier.clone(), context.clone(), commands_sender.clone(), "periodic").await {
+                    if let Err(err) = Self::process_fetched_blocks(fetched_blocks, peer, blocks_guard, core_dispatcher.clone(), block_verifier.clone(), commit_vote_monitor.clone(), context.clone(), commands_sender.clone(), "periodic").await {
                         warn!("Error occurred while processing fetched blocks from peer {peer}: {err}");
                     }
                 }
@@ -996,15 +1017,15 @@ mod tests {
     use parking_lot::RwLock;
     use tokio::{sync::Mutex, time::sleep};
 
-    use crate::authority_service::COMMIT_LAG_MULTIPLIER;
     use crate::commit::{CommitVote, TrustedCommit};
-    use crate::commit_syncer::CommitVoteMonitor;
+    use crate::{authority_service::COMMIT_LAG_MULTIPLIER, core_thread::MockCoreThreadDispatcher};
     use crate::{
         block::{BlockDigest, BlockRef, Round, TestBlock, VerifiedBlock},
         block_verifier::NoopBlockVerifier,
         commit::CommitRange,
+        commit_vote_monitor::CommitVoteMonitor,
         context::Context,
-        core_thread::{CoreError, CoreThreadDispatcher},
+        core_thread::CoreThreadDispatcher,
         dag_state::DagState,
         error::{ConsensusError, ConsensusResult},
         network::{BlockStream, NetworkClient},
@@ -1015,64 +1036,6 @@ mod tests {
         CommitDigest, CommitIndex,
     };
 
-    // TODO: create a complete Mock for thread dispatcher to be used from several tests
-    #[derive(Default)]
-    struct MockCoreThreadDispatcher {
-        add_blocks: Mutex<Vec<VerifiedBlock>>,
-        missing_blocks: Mutex<BTreeSet<BlockRef>>,
-        last_known_proposed_round: parking_lot::Mutex<Vec<Round>>,
-    }
-
-    impl MockCoreThreadDispatcher {
-        async fn get_add_blocks(&self) -> Vec<VerifiedBlock> {
-            let mut lock = self.add_blocks.lock().await;
-            lock.drain(0..).collect()
-        }
-
-        async fn stub_missing_blocks(&self, block_refs: BTreeSet<BlockRef>) {
-            let mut lock = self.missing_blocks.lock().await;
-            lock.extend(block_refs);
-        }
-
-        async fn get_last_own_proposed_round(&self) -> Vec<Round> {
-            let lock = self.last_known_proposed_round.lock();
-            lock.clone()
-        }
-    }
-
-    #[async_trait]
-    impl CoreThreadDispatcher for MockCoreThreadDispatcher {
-        async fn add_blocks(
-            &self,
-            blocks: Vec<VerifiedBlock>,
-        ) -> Result<BTreeSet<BlockRef>, CoreError> {
-            let mut lock = self.add_blocks.lock().await;
-            lock.extend(blocks);
-            Ok(BTreeSet::new())
-        }
-
-        async fn new_block(&self, _round: Round, _force: bool) -> Result<(), CoreError> {
-            Ok(())
-        }
-
-        async fn get_missing_blocks(&self) -> Result<BTreeSet<BlockRef>, CoreError> {
-            let mut lock = self.missing_blocks.lock().await;
-            let result = lock.clone();
-            lock.clear();
-            Ok(result)
-        }
-
-        fn set_consumer_availability(&self, _available: bool) -> Result<(), CoreError> {
-            todo!()
-        }
-
-        fn set_last_known_proposed_round(&self, round: Round) -> Result<(), CoreError> {
-            let mut lock = self.last_known_proposed_round.lock();
-            lock.push(round);
-            Ok(())
-        }
-    }
-
     type FetchRequestKey = (Vec<BlockRef>, AuthorityIndex);
     type FetchRequestResponse = (Vec<VerifiedBlock>, Option<Duration>);
     type FetchLatestBlockKey = (AuthorityIndex, Vec<AuthorityIndex>);
@@ -1082,7 +1045,7 @@ mod tests {
     struct MockNetworkClient {
         fetch_blocks_requests: Mutex<BTreeMap<FetchRequestKey, FetchRequestResponse>>,
         fetch_latest_blocks_requests:
-            Mutex<BTreeMap<FetchLatestBlockKey, FetchLatestBlockResponse>>,
+            Mutex<BTreeMap<FetchLatestBlockKey, Vec<FetchLatestBlockResponse>>>,
     }
 
     impl MockNetworkClient {
@@ -1108,7 +1071,14 @@ mod tests {
             latency: Option<Duration>,
         ) {
             let mut lock = self.fetch_latest_blocks_requests.lock().await;
-            lock.insert((peer, authorities), (blocks, latency));
+            lock.entry((peer, authorities))
+                .or_default()
+                .push((blocks, latency));
+        }
+
+        async fn fetch_latest_blocks_pending_calls(&self) -> usize {
+            let lock = self.fetch_latest_blocks_requests.lock().await;
+            lock.len()
         }
     }
 
@@ -1177,22 +1147,27 @@ mod tests {
             _timeout: Duration,
         ) -> ConsensusResult<Vec<Bytes>> {
             let mut lock = self.fetch_latest_blocks_requests.lock().await;
-            let response = lock
-                .remove(&(peer, authorities))
+            let mut responses = lock
+                .remove(&(peer, authorities.clone()))
                 .expect("Unexpected fetch blocks request made");
 
+            let response = responses.remove(0);
             let serialised = response
                 .0
                 .into_iter()
                 .map(|block| block.serialized().clone())
                 .collect::<Vec<_>>();
 
-            if let Some(latency) = response.1 {
-                sleep(latency).await;
+            if !responses.is_empty() {
+                lock.insert((peer, authorities), responses);
             }
 
             drop(lock);
 
+            if let Some(latency) = response.1 {
+                sleep(latency).await;
+            }
+
             Ok(serialised)
         }
     }
@@ -1272,10 +1247,10 @@ mod tests {
         let context = Arc::new(context);
         let block_verifier = Arc::new(NoopBlockVerifier {});
         let core_dispatcher = Arc::new(MockCoreThreadDispatcher::default());
+        let commit_vote_monitor = Arc::new(CommitVoteMonitor::new(context.clone()));
         let network_client = Arc::new(MockNetworkClient::default());
         let store = Arc::new(MemStore::new());
         let dag_state = Arc::new(RwLock::new(DagState::new(context.clone(), store)));
-        let commit_vote_monitor = Arc::new(CommitVoteMonitor::new(context.clone()));
 
         let handle = Synchronizer::start(
             network_client.clone(),
@@ -1284,6 +1259,7 @@ mod tests {
             commit_vote_monitor,
             block_verifier,
             dag_state,
+            false,
         );
 
         // Create some test blocks
@@ -1318,11 +1294,11 @@ mod tests {
         let (context, _) = Context::new_for_test(4);
         let context = Arc::new(context);
         let block_verifier = Arc::new(NoopBlockVerifier {});
+        let commit_vote_monitor = Arc::new(CommitVoteMonitor::new(context.clone()));
         let core_dispatcher = Arc::new(MockCoreThreadDispatcher::default());
         let network_client = Arc::new(MockNetworkClient::default());
         let store = Arc::new(MemStore::new());
         let dag_state = Arc::new(RwLock::new(DagState::new(context.clone(), store)));
-        let commit_vote_monitor = Arc::new(CommitVoteMonitor::new(context.clone()));
 
         let handle = Synchronizer::start(
             network_client.clone(),
@@ -1331,6 +1307,7 @@ mod tests {
             commit_vote_monitor,
             block_verifier,
             dag_state,
+            false,
         );
 
         // Create some test blocks
@@ -1376,11 +1353,11 @@ mod tests {
         let (context, _) = Context::new_for_test(4);
         let context = Arc::new(context);
         let block_verifier = Arc::new(NoopBlockVerifier {});
+        let commit_vote_monitor = Arc::new(CommitVoteMonitor::new(context.clone()));
         let core_dispatcher = Arc::new(MockCoreThreadDispatcher::default());
         let network_client = Arc::new(MockNetworkClient::default());
         let store = Arc::new(MemStore::new());
         let dag_state = Arc::new(RwLock::new(DagState::new(context.clone(), store)));
-        let commit_vote_monitor = Arc::new(CommitVoteMonitor::new(context.clone()));
 
         // Create some test blocks
         let expected_blocks = (0..10)
@@ -1422,6 +1399,7 @@ mod tests {
             commit_vote_monitor,
             block_verifier,
             dag_state,
+            false,
         );
 
         sleep(2 * FETCH_REQUEST_TIMEOUT).await;
@@ -1497,7 +1475,7 @@ mod tests {
         // Pass them through the commit vote monitor - so now there will be a big commit lag to prevent
         // the scheduled synchronizer from running
         for block in blocks {
-            commit_vote_monitor.observe(&block);
+            commit_vote_monitor.observe_block(&block);
         }
 
         // WHEN start the synchronizer and wait for a couple of seconds where normally the synchronizer should have kicked in.
@@ -1508,6 +1486,7 @@ mod tests {
             commit_vote_monitor.clone(),
             block_verifier,
             dag_state.clone(),
+            false,
         );
 
         sleep(4 * FETCH_REQUEST_TIMEOUT).await;
@@ -1546,7 +1525,7 @@ mod tests {
         // GIVEN
         let (context, _) = Context::new_for_test(4);
         let context = Arc::new(context.with_parameters(Parameters {
-            sync_last_proposed_block_timeout: Duration::from_millis(2_000),
+            sync_last_known_own_block_timeout: Duration::from_millis(2_000),
             ..Default::default()
         }));
         let block_verifier = Arc::new(NoopBlockVerifier {});
@@ -1564,9 +1543,18 @@ mod tests {
 
         // Now set different latest blocks for the peers
         // For peer 1 we give the block of round 10 (highest)
+        let block_1 = expected_blocks.pop().unwrap();
         network_client
             .stub_fetch_latest_blocks(
-                vec![expected_blocks.pop().unwrap()],
+                vec![block_1.clone()],
+                AuthorityIndex::new_for_test(1),
+                vec![our_index],
+                None,
+            )
+            .await;
+        network_client
+            .stub_fetch_latest_blocks(
+                vec![block_1],
                 AuthorityIndex::new_for_test(1),
                 vec![our_index],
                 None,
@@ -1574,9 +1562,18 @@ mod tests {
             .await;
 
         // For peer 2 we give the block of round 9
+        let block_2 = expected_blocks.pop().unwrap();
         network_client
             .stub_fetch_latest_blocks(
-                vec![expected_blocks.pop().unwrap()],
+                vec![block_2.clone()],
+                AuthorityIndex::new_for_test(2),
+                vec![our_index],
+                Some(Duration::from_secs(10)),
+            )
+            .await;
+        network_client
+            .stub_fetch_latest_blocks(
+                vec![block_2],
                 AuthorityIndex::new_for_test(2),
                 vec![our_index],
                 None,
@@ -1584,6 +1581,14 @@ mod tests {
             .await;
 
         // For peer 3 we don't give any block - and it should return an empty vector
+        network_client
+            .stub_fetch_latest_blocks(
+                vec![],
+                AuthorityIndex::new_for_test(3),
+                vec![our_index],
+                Some(Duration::from_secs(10)),
+            )
+            .await;
         network_client
             .stub_fetch_latest_blocks(
                 vec![],
@@ -1601,10 +1606,11 @@ mod tests {
             commit_vote_monitor,
             block_verifier,
             dag_state,
+            true,
         );
 
         // Wait at least for the timeout time
-        sleep(context.parameters.sync_last_proposed_block_timeout * 2).await;
+        sleep(context.parameters.sync_last_known_own_block_timeout * 2).await;
 
         // Assert that core has been called to set the min propose round
         assert_eq!(
@@ -1612,6 +1618,19 @@ mod tests {
             vec![10]
         );
 
+        // Ensure that all the requests have been called
+        assert_eq!(network_client.fetch_latest_blocks_pending_calls().await, 0);
+
+        // And we got one retry
+        assert_eq!(
+            context
+                .metrics
+                .node_metrics
+                .sync_last_known_own_block_retries
+                .get(),
+            1
+        );
+
         // Ensure that no panic occurred
         if let Err(err) = handle.stop().await {
             if err.is_panic() {
diff --git a/consensus/core/src/test_dag_parser.rs b/consensus/core/src/test_dag_parser.rs
index 721766f7d4f1e..8ceda4b8e6d13 100644
--- a/consensus/core/src/test_dag_parser.rs
+++ b/consensus/core/src/test_dag_parser.rs
@@ -425,7 +425,7 @@ mod tests {
         let (_, (round, connections)) = result.unwrap();
 
         let skipped_slot = Slot::new_for_test(0, 0); // A0
-        let mut expected_references = vec![
+        let mut expected_references = [
             dag_builder.last_ancestors.clone(),
             dag_builder.last_ancestors.clone(),
             dag_builder
diff --git a/consensus/core/src/transaction.rs b/consensus/core/src/transaction.rs
index 2184f8c1e0c72..590e922e5eca0 100644
--- a/consensus/core/src/transaction.rs
+++ b/consensus/core/src/transaction.rs
@@ -18,8 +18,6 @@ use crate::{
 /// The maximum number of transactions pending to the queue to be pulled for block proposal
 const MAX_PENDING_TRANSACTIONS: usize = 2_000;
 
-const MAX_CONSUMED_TRANSACTIONS_PER_REQUEST: u64 = 5_000;
-
 /// The guard acts as an acknowledgment mechanism for the inclusion of the transactions to a block.
 /// When its last transaction is included to a block then `included_in_block_ack` will be signalled.
 /// If the guard is dropped without getting acknowledged that means the transactions have not been
@@ -43,18 +41,15 @@ pub(crate) struct TransactionConsumer {
 }
 
 impl TransactionConsumer {
-    pub(crate) fn new(
-        tx_receiver: Receiver<TransactionsGuard>,
-        context: Arc<Context>,
-        max_consumed_transactions_per_request: Option<u64>,
-    ) -> Self {
+    pub(crate) fn new(tx_receiver: Receiver<TransactionsGuard>, context: Arc<Context>) -> Self {
         Self {
             tx_receiver,
             max_consumed_bytes_per_request: context
                 .protocol_config
                 .consensus_max_transactions_in_block_bytes(),
-            max_consumed_transactions_per_request: max_consumed_transactions_per_request
-                .unwrap_or(MAX_CONSUMED_TRANSACTIONS_PER_REQUEST),
+            max_consumed_transactions_per_request: context
+                .protocol_config
+                .max_num_transactions_in_block(),
             pending_transactions: None,
         }
     }
@@ -72,7 +67,6 @@ impl TransactionConsumer {
         // Handle one batch of incoming transactions from TransactionGuard.
         // Returns the remaining txs as a new TransactionGuard, if the batch breaks any limit.
         let mut handle_txs = |t: TransactionsGuard| -> Option<TransactionsGuard> {
-            // Here we assume that a transaction can always fit in `max_fetched_bytes_per_request`
             let remaining_txs: Vec<_> = t
                 .transactions
                 .into_iter()
@@ -235,6 +229,7 @@ pub enum ValidationError {
 }
 
 /// `NoopTransactionVerifier` accepts all transactions.
+#[allow(unused)]
 pub(crate) struct NoopTransactionVerifier;
 
 impl TransactionVerifier for NoopTransactionVerifier {
@@ -271,7 +266,7 @@ mod tests {
 
         let context = Arc::new(Context::new_for_test(4).0);
         let (client, tx_receiver) = TransactionClient::new(context.clone());
-        let mut consumer = TransactionConsumer::new(tx_receiver, context.clone(), None);
+        let mut consumer = TransactionConsumer::new(tx_receiver, context.clone());
 
         // submit asynchronously the transactions and keep the waiters
         let mut included_in_block_waiters = FuturesUnordered::new();
@@ -323,7 +318,7 @@ mod tests {
 
         let context = Arc::new(Context::new_for_test(4).0);
         let (client, tx_receiver) = TransactionClient::new(context.clone());
-        let mut consumer = TransactionConsumer::new(tx_receiver, context.clone(), None);
+        let mut consumer = TransactionConsumer::new(tx_receiver, context.clone());
 
         // submit some transactions
         for i in 0..10 {
@@ -391,7 +386,7 @@ mod tests {
 
         let context = Arc::new(Context::new_for_test(4).0);
         let (client, tx_receiver) = TransactionClient::new(context.clone());
-        let mut consumer = TransactionConsumer::new(tx_receiver, context.clone(), None);
+        let mut consumer = TransactionConsumer::new(tx_receiver, context.clone());
         let mut all_receivers = Vec::new();
         // submit a few transactions individually.
         for i in 0..10 {
diff --git a/crates/mysten-metrics/Cargo.toml b/crates/mysten-metrics/Cargo.toml
index 2a26c989a9451..26045107d68c7 100644
--- a/crates/mysten-metrics/Cargo.toml
+++ b/crates/mysten-metrics/Cargo.toml
@@ -6,6 +6,9 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 axum.workspace = true
 tracing.workspace = true
@@ -20,3 +23,4 @@ parking_lot.workspace = true
 futures.workspace = true
 async-trait.workspace = true
 prometheus-closure-metric.workspace = true
+simple-server-timing-header.workspace = true
diff --git a/crates/mysten-metrics/src/lib.rs b/crates/mysten-metrics/src/lib.rs
index 4a2c01c97f01a..a55e36632af7f 100644
--- a/crates/mysten-metrics/src/lib.rs
+++ b/crates/mysten-metrics/src/lib.rs
@@ -3,6 +3,8 @@
 
 use axum::{extract::Extension, http::StatusCode, routing::get, Router};
 use dashmap::DashMap;
+use parking_lot::Mutex;
+use simple_server_timing_header::Timer;
 use std::future::Future;
 use std::net::SocketAddr;
 use std::pin::Pin;
@@ -132,6 +134,60 @@ pub fn get_metrics() -> Option<&'static Metrics> {
     METRICS.get()
 }
 
+tokio::task_local! {
+    static SERVER_TIMING: Arc<Mutex<Timer>>;
+}
+
+/// Create a new task-local ServerTiming context and run the provided future within it.
+/// Should be used at the top-most level of a request handler. Can be added to an axum router
+/// as a layer by using mysten_service::server_timing_middleware.
+pub async fn with_new_server_timing<T>(fut: impl Future<Output = T> + Send + 'static) -> T {
+    let timer = Arc::new(Mutex::new(Timer::new()));
+
+    let mut ret = None;
+    SERVER_TIMING
+        .scope(timer, async {
+            ret = Some(fut.await);
+        })
+        .await;
+
+    ret.unwrap()
+}
+
+/// Create a new task-local ServerTiming context and run the provided future within it.
+/// Only intended for use by macros within this module.
+pub async fn with_server_timing<T>(
+    timer: Arc<Mutex<Timer>>,
+    fut: impl Future<Output = T> + Send + 'static,
+) -> T {
+    let mut ret = None;
+    SERVER_TIMING
+        .scope(timer, async {
+            ret = Some(fut.await);
+        })
+        .await;
+
+    ret.unwrap()
+}
+
+/// Get the currently active ServerTiming context. Only intended for use by macros within this module.
+pub fn get_server_timing() -> Option<Arc<Mutex<Timer>>> {
+    SERVER_TIMING.try_with(|timer| timer.clone()).ok()
+}
+
+/// Add a new entry to the ServerTiming header.
+/// If the caller is not currently in a ServerTiming context (created with `with_new_server_timing`),
+/// an error is logged.
+pub fn add_server_timing(name: &str) {
+    let res = SERVER_TIMING.try_with(|timer| {
+        timer.lock().add(name);
+    });
+
+    if res.is_err() {
+        tracing::error!("Server timing context not found");
+    }
+}
+
 #[macro_export]
 macro_rules! monitored_future {
     ($fut: expr) => {{
@@ -181,25 +237,42 @@ macro_rules! monitored_future {
     }};
 }
 
+#[macro_export]
+macro_rules! forward_server_timing_and_spawn {
+    ($fut: expr) => {
+        if let Some(timing) = $crate::get_server_timing() {
+            tokio::task::spawn(async move { $crate::with_server_timing(timing, $fut).await })
+        } else {
+            tokio::task::spawn($fut)
+        }
+    };
+}
+
 #[macro_export]
 macro_rules! spawn_monitored_task {
     ($fut: expr) => {
-        tokio::task::spawn($crate::monitored_future!(tasks, $fut, "", INFO, false))
+        $crate::forward_server_timing_and_spawn!($crate::monitored_future!(
+            tasks, $fut, "", INFO, false
+        ))
     };
 }
 
 #[macro_export]
 macro_rules! spawn_logged_monitored_task {
     ($fut: expr) => {
-        tokio::task::spawn($crate::monitored_future!(tasks, $fut, "", INFO, true))
+        $crate::forward_server_timing_and_spawn!($crate::monitored_future!(
+            tasks, $fut, "", INFO, true
+        ))
     };
 
     ($fut: expr, $name: expr) => {
-        tokio::task::spawn($crate::monitored_future!(tasks, $fut, $name, INFO, true))
+        $crate::forward_server_timing_and_spawn!($crate::monitored_future!(
+            tasks, $fut, $name, INFO, true
+        ))
     };
 
     ($fut: expr, $name: expr, $logging_level: ident) => {
-        tokio::task::spawn($crate::monitored_future!(
+        $crate::forward_server_timing_and_spawn!($crate::monitored_future!(
             tasks,
             $fut,
             $name,
@@ -460,8 +533,8 @@ pub fn start_prometheus_server(addr: SocketAddr) -> RegistryService {
         .layer(Extension(registry_service.clone()));
 
     tokio::spawn(async move {
-        axum::Server::bind(&addr)
-            .serve(app.into_make_service())
+        let listener = tokio::net::TcpListener::bind(&addr).await.unwrap();
+        axum::serve(listener, app.into_make_service())
             .await
             .unwrap();
     });
diff --git a/crates/mysten-network/src/multiaddr.rs b/crates/mysten-network/src/multiaddr.rs
index 181ec0deb0031..0fbb1f7fd68c5 100644
--- a/crates/mysten-network/src/multiaddr.rs
+++ b/crates/mysten-network/src/multiaddr.rs
@@ -168,6 +168,18 @@ impl Multiaddr {
         Self(new_address)
     }
 
+    pub fn is_localhost_ip(&self) -> bool {
+        let Some(protocol) = self.0.iter().next() else {
+            error!("Multiaddr is empty");
+            return false;
+        };
+        match protocol {
+            multiaddr::Protocol::Ip4(addr) => addr == Ipv4Addr::LOCALHOST,
+            multiaddr::Protocol::Ip6(addr) => addr == Ipv6Addr::LOCALHOST,
+            _ => false,
+        }
+    }
+
     pub fn hostname(&self) -> Option<String> {
         for component in self.iter() {
             match component {
diff --git a/crates/mysten-network/src/server.rs b/crates/mysten-network/src/server.rs
index 0a0d4ac70a7bc..4bac6fe61ae52 100644
--- a/crates/mysten-network/src/server.rs
+++ b/crates/mysten-network/src/server.rs
@@ -22,7 +22,7 @@ use tonic::{
         BoxFuture,
     },
     server::NamedService,
-    transport::{server::Router, Body},
+    transport::server::Router,
 };
 use tower::{
     layer::util::{Identity, Stack},
@@ -41,7 +41,7 @@ pub struct ServerBuilder<M: MetricsCallbackProvider = DefaultMetricsCallbackProv
     health_reporter: tonic_health::server::HealthReporter,
 }
 
-type AddPathToHeaderFunction = fn(&Request<Body>) -> Option<HeaderValue>;
+type AddPathToHeaderFunction = fn(&Request<BoxBody>) -> Option<HeaderValue>;
 
 type WrapperService<M> = Stack<
     Stack<
@@ -103,7 +103,7 @@ impl<M: MetricsCallbackProvider> ServerBuilder<M> {
             .global_concurrency_limit
             .map(tower::limit::GlobalConcurrencyLimitLayer::new);
 
-        fn add_path_to_request_header(request: &Request<Body>) -> Option<HeaderValue> {
+        fn add_path_to_request_header(request: &Request<BoxBody>) -> Option<HeaderValue> {
             let path = request.uri().path();
             Some(HeaderValue::from_str(path).unwrap())
         }
@@ -144,7 +144,7 @@ impl<M: MetricsCallbackProvider> ServerBuilder<M> {
     /// Add a new service to this Server.
     pub fn add_service<S>(mut self, svc: S) -> Self
     where
-        S: Service<Request<Body>, Response = Response<BoxBody>, Error = Infallible>
+        S: Service<Request<BoxBody>, Response = Response<BoxBody>, Error = Infallible>
             + NamedService
             + Clone
             + Send
diff --git a/crates/mysten-service-boilerplate/Cargo-ext.toml b/crates/mysten-service-boilerplate/Cargo-ext.toml
index 58014f8a08f47..fe577700f9b31 100644
--- a/crates/mysten-service-boilerplate/Cargo-ext.toml
+++ b/crates/mysten-service-boilerplate/Cargo-ext.toml
@@ -8,7 +8,7 @@ publish = false
 
 [dependencies]
 anyhow = "1.0.79"
-axum = { version = "0.6.6", features = ["macros"] }
+axum = { version = "0.7", features = ["macros"] }
 mysten-service = { git = "https://github.com/mystenlabs/sui.git", branch = "main", package = "mysten-service" }
 prometheus = "0.13.3"
 tracing = "0.1.40"
diff --git a/crates/mysten-service/Cargo.toml b/crates/mysten-service/Cargo.toml
index 0432f5f80d5b5..08e3a72a48395 100644
--- a/crates/mysten-service/Cargo.toml
+++ b/crates/mysten-service/Cargo.toml
@@ -12,6 +12,7 @@ axum.workspace = true
 tokio.workspace = true
 serde.workspace = true
 prometheus.workspace = true
+simple-server-timing-header.workspace = true
 mysten-metrics.workspace = true
 telemetry-subscribers.workspace = true
 tracing.workspace = true
diff --git a/crates/mysten-service/src/lib.rs b/crates/mysten-service/src/lib.rs
index 5af492b3ac48a..fc06357e5eee0 100644
--- a/crates/mysten-service/src/lib.rs
+++ b/crates/mysten-service/src/lib.rs
@@ -4,6 +4,7 @@
 mod health;
 pub mod logging;
 pub mod metrics;
+pub mod server_timing;
 mod service;
 
 pub use service::get_mysten_service;
diff --git a/crates/mysten-service/src/server_timing.rs b/crates/mysten-service/src/server_timing.rs
new file mode 100644
index 0000000000000..9cdff1d13c571
--- /dev/null
+++ b/crates/mysten-service/src/server_timing.rs
@@ -0,0 +1,28 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use axum::extract::Request;
+use axum::middleware::Next;
+use axum::response::Response;
+use mysten_metrics::{add_server_timing, get_server_timing, with_new_server_timing};
+use simple_server_timing_header::Timer;
+
+pub async fn server_timing_middleware(request: Request, next: Next) -> Response {
+    with_new_server_timing(async move {
+        let mut response = next.run(request).await;
+        add_server_timing("finish_request");
+
+        if let Ok(header_value) = get_server_timing()
+            .expect("server timing not set")
+            .lock()
+            .header_value()
+            .try_into()
+        {
+            response
+                .headers_mut()
+                .insert(Timer::header_key(), header_value);
+        }
+        response
+    })
+    .await
+}
diff --git a/crates/mysten-service/src/service.rs b/crates/mysten-service/src/service.rs
index 599796b1f4578..f6ba299b48d7b 100644
--- a/crates/mysten-service/src/service.rs
+++ b/crates/mysten-service/src/service.rs
@@ -23,8 +23,10 @@ where
 pub async fn serve(app: Router) -> Result<()> {
     // run it with hyper on localhost:3000
     debug!("listening on http://localhost:{}", DEFAULT_PORT);
-    axum::Server::bind(&format!("0.0.0.0:{}", DEFAULT_PORT).parse()?)
-        .serve(app.into_make_service())
-        .await?;
+
+    let listener = tokio::net::TcpListener::bind(&format!("0.0.0.0:{}", DEFAULT_PORT))
+        .await
+        .unwrap();
+    axum::serve(listener, app).await?;
     Ok(())
 }
diff --git a/crates/mysten-service/tests/integration_test.rs b/crates/mysten-service/tests/integration_test.rs
index f661be895e228..5ad9cd7f47a3d 100644
--- a/crates/mysten-service/tests/integration_test.rs
+++ b/crates/mysten-service/tests/integration_test.rs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use axum::body::Body;
-use axum::body::HttpBody;
 use axum::http::Request;
 use tower::ServiceExt;
 
@@ -21,8 +20,8 @@ async fn test_mysten_service() {
         .unwrap();
     assert_eq!(res.status(), 200);
 
-    let mut body = res.into_body();
-    let body_data = body.data().await.unwrap().unwrap();
+    let body = res.into_body();
+    let body_data = axum::body::to_bytes(body, usize::MAX).await.unwrap();
     println!("{}", std::str::from_utf8(&body_data).unwrap());
     assert_eq!(
         &body_data[..],
diff --git a/crates/mysten-util-mem/src/malloc_size.rs b/crates/mysten-util-mem/src/malloc_size.rs
index 2668bb13e7152..9b6e9e1d61cdf 100644
--- a/crates/mysten-util-mem/src/malloc_size.rs
+++ b/crates/mysten-util-mem/src/malloc_size.rs
@@ -39,8 +39,6 @@
 //! - If an `Rc` or `Arc` is known to be a "primary" reference and can always
 //!   be measured, it should be measured via the `MallocUnconditionalSizeOf`
 //!   trait.
-//! - If an `Rc` or `Arc` should be measured only if it hasn't been seen
-//!   before, it should be measured via the `MallocConditionalSizeOf` trait.
 //! - Using universal function call syntax is a good idea when measuring boxed
 //!   fields in structs, because it makes it clear that the Box is being
 //!   measured as well as the thing it points to. E.g.
@@ -207,22 +205,6 @@ pub trait MallocUnconditionalShallowSizeOf {
     fn unconditional_shallow_size_of(&self, ops: &mut MallocSizeOfOps) -> usize;
 }
 
-/// Like `MallocSizeOf`, but only measures if the value hasn't already been
-/// measured. For use with types like `Rc` and `Arc` when appropriate (e.g.
-/// when there is no "primary" reference).
-pub trait MallocConditionalSizeOf {
-    /// Measure the heap usage of all heap-allocated descendant structures, but
-    /// not the space taken up by the value itself, and only if that heap usage
-    /// hasn't already been measured.
-    fn conditional_size_of(&self, ops: &mut MallocSizeOfOps) -> usize;
-}
-
-/// `MallocConditionalSizeOf` combined with `MallocShallowSizeOf`.
-pub trait MallocConditionalShallowSizeOf {
-    /// `conditional_size_of` combined with `shallow_size_of`.
-    fn conditional_shallow_size_of(&self, ops: &mut MallocSizeOfOps) -> usize;
-}
-
 impl<'a, T: ?Sized> MallocSizeOf for &'a T {
     fn size_of(&self, _ops: &mut MallocSizeOfOps) -> usize {
         // Zero makes sense for a non-owning reference.
@@ -510,11 +492,6 @@ where
 // impl<T> !MallocSizeOf for Arc<T> { }
 // impl<T> !MallocShallowSizeOf for Arc<T> { }
 
-#[cfg(feature = "std")]
-fn arc_ptr<T>(s: &Arc<T>) -> *const T {
-    &(**s) as *const T
-}
-
 #[cfg(feature = "std")]
 impl<T: MallocSizeOf> MallocUnconditionalSizeOf for Arc<T> {
     fn unconditional_size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
@@ -522,28 +499,6 @@ impl<T: MallocSizeOf> MallocUnconditionalSizeOf for Arc<T> {
     }
 }
 
-#[cfg(feature = "std")]
-impl<T> MallocConditionalShallowSizeOf for Arc<T> {
-    fn conditional_shallow_size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
-        if ops.have_seen_ptr(arc_ptr(self)) {
-            0
-        } else {
-            self.unconditional_shallow_size_of(ops)
-        }
-    }
-}
-
-#[cfg(feature = "std")]
-impl<T: MallocSizeOf> MallocConditionalSizeOf for Arc<T> {
-    fn conditional_size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
-        if ops.have_seen_ptr(arc_ptr(self)) {
-            0
-        } else {
-            self.unconditional_size_of(ops)
-        }
-    }
-}
-
 /// If a mutex is stored directly as a member of a data type that is being measured,
 /// it is the unique owner of its contents and deserves to be measured.
 ///
@@ -724,26 +679,6 @@ where
     }
 }
 
-#[cfg(feature = "lru")]
-impl<K, V, S> MallocSizeOf for lru::LruCache<K, V, S>
-where
-    K: MallocSizeOf + rstd::cmp::Eq + rstd::hash::Hash,
-    V: MallocSizeOf,
-    S: rstd::hash::BuildHasher,
-{
-    fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
-        let mut n = 0;
-        if let (Some(k), Some(v)) = (K::constant_size(), V::constant_size()) {
-            n += self.len() * (k + v)
-        } else {
-            n = self
-                .iter()
-                .fold(n, |acc, (k, v)| acc + k.size_of(ops) + v.size_of(ops))
-        }
-        n
-    }
-}
-
 malloc_size_of_is_0!(
     [u8; 1], [u8; 2], [u8; 3], [u8; 4], [u8; 5], [u8; 6], [u8; 7], [u8; 8], [u8; 9], [u8; 10],
     [u8; 11], [u8; 12], [u8; 13], [u8; 14], [u8; 15], [u8; 16], [u8; 17], [u8; 18], [u8; 19],
diff --git a/crates/mysten-util-mem/tests/derive.rs b/crates/mysten-util-mem/tests/derive.rs
index 0beeb6fb11c47..ed4b0196b1978 100644
--- a/crates/mysten-util-mem/tests/derive.rs
+++ b/crates/mysten-util-mem/tests/derive.rs
@@ -55,27 +55,6 @@ fn derive_ignore() {
     assert!(t.malloc_size_of() < 3000);
 }
 
-#[test]
-#[cfg(all(feature = "lru", feature = "hashbrown"))]
-fn derive_morecomplex() {
-    #[derive(MallocSizeOf)]
-    struct Trivia {
-        hm: hashbrown::HashMap<u64, Vec<u8>>,
-        cache: lru::LruCache<u128, Vec<u8>>,
-    }
-
-    let mut t = Trivia {
-        hm: hashbrown::HashMap::new(),
-        cache: lru::LruCache::unbounded(),
-    };
-
-    t.hm.insert(1, vec![0u8; 2048]);
-    t.cache.put(1, vec![0u8; 2048]);
-    t.cache.put(2, vec![0u8; 4096]);
-
-    assert!(t.malloc_size_of() > 8000);
-}
-
 #[test]
 fn derive_tuple() {
     #[derive(MallocSizeOf)]
diff --git a/crates/sui-adapter-transactional-tests/Cargo.toml b/crates/sui-adapter-transactional-tests/Cargo.toml
index 25538480c9d2e..2b1797440573e 100644
--- a/crates/sui-adapter-transactional-tests/Cargo.toml
+++ b/crates/sui-adapter-transactional-tests/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 
 [dev-dependencies]
 datatest-stable.workspace = true
-sui-transactional-test-runner.workspace = true
+# sui-transactional-test-runner.workspace = true
 
 [[test]]
 name = "tests"
diff --git a/crates/sui-adapter-transactional-tests/tests/deny_list_v2/coin_deny_multiple_coin_types.exp b/crates/sui-adapter-transactional-tests/tests/deny_list_v2/coin_deny_multiple_coin_types.exp
new file mode 100644
index 0000000000000..be2fe6b845377
--- /dev/null
+++ b/crates/sui-adapter-transactional-tests/tests/deny_list_v2/coin_deny_multiple_coin_types.exp
@@ -0,0 +1,53 @@
+processed 6 tasks
+
+init:
+A: object(0,0)
+
+task 1, lines 11-60:
+//# publish --sender A
+created: object(1,0), object(1,1), object(1,2), object(1,3), object(1,4), object(1,5), object(1,6), object(1,7), object(1,8), object(1,9), object(1,10)
+mutated: object(0,0)
+unchanged_shared: 0x0000000000000000000000000000000000000000000000000000000000000403
+gas summary: computation_cost: 1000000, storage_cost: 34260800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 2, lines 61-63:
+//# view-object 1,1
+Owner: Account Address ( A )
+Version: 2
+Contents: sui::coin::Coin<test::regulated_coin1::REGULATED_COIN1> {
+    id: sui::object::UID {
+        id: sui::object::ID {
+            bytes: fake(1,1),
+        },
+    },
+    balance: sui::balance::Balance<test::regulated_coin1::REGULATED_COIN1> {
+        value: 10000u64,
+    },
+}
+
+task 3, lines 64-66:
+//# view-object 1,2
+Owner: Account Address ( A )
+Version: 2
+Contents: sui::coin::Coin<test::regulated_coin2::REGULATED_COIN2> {
+    id: sui::object::UID {
+        id: sui::object::ID {
+            bytes: fake(1,2),
+        },
+    },
+    balance: sui::balance::Balance<test::regulated_coin2::REGULATED_COIN2> {
+        value: 10000u64,
+    },
+}
+
+task 4, line 67:
+//# run sui::coin::deny_list_v2_add --args object(0x403) object(1,6) @A --type-args test::regulated_coin2::REGULATED_COIN2 --sender A
+events: Event { package_id: sui, transaction_module: Identifier("coin"), sender: A, type_: StructTag { address: sui, module: Identifier("deny_list"), name: Identifier("PerTypeConfigCreated"), type_params: [] }, contents: [0, 0, 0, 0, 0, 0, 0, 0, 98, 101, 100, 100, 50, 98, 100, 54, 51, 99, 50, 51, 102, 99, 52, 54, 52, 55, 102, 51, 101, 99, 101, 57, 48, 55, 57, 57, 49, 51, 102, 53, 99, 49, 98, 52, 98, 55, 97, 101, 101, 52, 56, 51, 50, 51, 55, 50, 97, 102, 52, 48, 99, 100, 48, 51, 49, 57, 50, 101, 97, 48, 52, 51, 97, 58, 58, 114, 101, 103, 117, 108, 97, 116, 101, 100, 95, 99, 111, 105, 110, 50, 58, 58, 82, 69, 71, 85, 76, 65, 84, 69, 68, 95, 67, 79, 73, 78, 50, 157, 35, 217, 228, 182, 26, 20, 142, 175, 244, 33, 216, 213, 187, 161, 23, 168, 25, 82, 72, 79, 110, 47, 210, 76, 90, 37, 190, 166, 158, 5, 16] }
+created: object(4,0), object(4,1), object(4,2)
+mutated: 0x0000000000000000000000000000000000000000000000000000000000000403, object(0,0), object(1,6)
+gas summary: computation_cost: 1000000, storage_cost: 12220800,  storage_rebate: 2761308, non_refundable_storage_fee: 27892
+
+task 5, lines 69-70:
+//# programmable --sender A --inputs object(1,1) object(1,2) @A
+//> TransferObjects([Input(0), Input(1)], Input(2))
+Error: Error checking transaction input objects: AddressDeniedForCoin { address: @A, coin_type: "object(1,0)::regulated_coin2::REGULATED_COIN2" }
diff --git a/crates/sui-adapter-transactional-tests/tests/deny_list_v2/coin_deny_multiple_coin_types.move b/crates/sui-adapter-transactional-tests/tests/deny_list_v2/coin_deny_multiple_coin_types.move
new file mode 100644
index 0000000000000..1ed5f26f09769
--- /dev/null
+++ b/crates/sui-adapter-transactional-tests/tests/deny_list_v2/coin_deny_multiple_coin_types.move
@@ -0,0 +1,70 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+// This test verifies when sending two objects of different coin types in the same transaction,
+// if one is denied but not the other, the transaction check should still fail.
+// More importantly, if the second type is denied but not the first, the fact that
+// the first type doesn't even have a denylist entry should not matter.
+
+//# init --accounts A --addresses test=0x0
+
+//# publish --sender A
+module test::regulated_coin1 {
+    use sui::coin;
+
+    public struct REGULATED_COIN1 has drop {}
+
+    fun init(otw: REGULATED_COIN1, ctx: &mut TxContext) {
+        let (mut treasury_cap, deny_cap, metadata) = coin::create_regulated_currency_v2(
+            otw,
+            9,
+            b"RC",
+            b"REGULATED_COIN",
+            b"A new regulated coin",
+            option::none(),
+            false,
+            ctx
+        );
+        let coin = coin::mint(&mut treasury_cap, 10000, ctx);
+        transfer::public_transfer(coin, tx_context::sender(ctx));
+        transfer::public_transfer(deny_cap, tx_context::sender(ctx));
+        transfer::public_freeze_object(treasury_cap);
+        transfer::public_freeze_object(metadata);
+    }
+}
+
+module test::regulated_coin2 {
+    use sui::coin;
+
+    public struct REGULATED_COIN2 has drop {}
+
+    fun init(otw: REGULATED_COIN2, ctx: &mut TxContext) {
+        let (mut treasury_cap, deny_cap, metadata) = coin::create_regulated_currency_v2(
+            otw,
+            9,
+            b"RC",
+            b"REGULATED_COIN",
+            b"A new regulated coin",
+            option::none(),
+            false,
+            ctx
+        );
+        let coin = coin::mint(&mut treasury_cap, 10000, ctx);
+        transfer::public_transfer(coin, tx_context::sender(ctx));
+        transfer::public_transfer(deny_cap, tx_context::sender(ctx));
+        transfer::public_freeze_object(treasury_cap);
+        transfer::public_freeze_object(metadata);
+    }
+}
+
+// Coin1
+//# view-object 1,1
+
+// Coin2
+//# view-object 1,2
+
+// Deny account A for coin2.
+//# run sui::coin::deny_list_v2_add --args object(0x403) object(1,6) @A --type-args test::regulated_coin2::REGULATED_COIN2 --sender A
+
+//# programmable --sender A --inputs object(1,1) object(1,2) @A
+//> TransferObjects([Input(0), Input(1)], Input(2))
diff --git a/crates/sui-adapter-transactional-tests/tests/entry_points/large_enum.exp b/crates/sui-adapter-transactional-tests/tests/entry_points/large_enum.exp
new file mode 100644
index 0000000000000..4c3435ef46f66
--- /dev/null
+++ b/crates/sui-adapter-transactional-tests/tests/entry_points/large_enum.exp
@@ -0,0 +1,22 @@
+processed 4 tasks
+
+init:
+A: object(0,0)
+
+task 1, lines 8-35:
+//# publish
+created: object(1,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 6452400,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 2, lines 37-38:
+//# programmable --sender A
+//> test::m::x1()
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 988000,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 3, lines 40-41:
+//# programmable --sender A
+//> test::m::x3()
+Error: Transaction Effects Status: Move Bytecode Verification Error. Please run the Bytecode Verifier for more information.
+Execution Error: ExecutionError: ExecutionError { inner: ExecutionErrorInner { kind: VMVerificationOrDeserializationError, source: Some(VMError { major_status: TOO_MANY_TYPE_NODES, sub_status: None, message: None, exec_state: None, location: Undefined, indices: [], offsets: [] }), command: Some(0) } }
diff --git a/crates/sui-adapter-transactional-tests/tests/entry_points/large_enum.move b/crates/sui-adapter-transactional-tests/tests/entry_points/large_enum.move
new file mode 100644
index 0000000000000..da3a8468d81b6
--- /dev/null
+++ b/crates/sui-adapter-transactional-tests/tests/entry_points/large_enum.move
@@ -0,0 +1,41 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+// tests error after serializing a large enum return value
+
+//# init --addresses test=0x0 --accounts A
+
+//# publish
+
+module test::m {
+
+public enum X1 has drop  {
+    Big1(u8, u8, u8, u8, u8, u8, u8, u8, u8, u8, u8, u8, u8, u8, u8, u8),
+}
+
+public enum X2 has drop  {
+    V1(X1, X1, X1),
+    V2(X1, X1, X1),
+    V3(X1, X1, X1),
+}
+
+public enum X3 has drop {
+    X2(X2, X2, X2),
+    U64(u64),
+}
+
+entry fun x1(): X1 {
+    X1::Big1(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+}
+
+entry fun x3(): X3 {
+    X3::U64(0)
+}
+
+}
+
+//# programmable --sender A
+//> test::m::x1()
+
+//# programmable --sender A
+//> test::m::x3()
diff --git a/crates/sui-analytics-indexer/Cargo.toml b/crates/sui-analytics-indexer/Cargo.toml
index af30cd0811d6b..7a21cc191b6ec 100644
--- a/crates/sui-analytics-indexer/Cargo.toml
+++ b/crates/sui-analytics-indexer/Cargo.toml
@@ -34,18 +34,16 @@ parquet.workspace = true
 arrow-array.workspace = true
 fastcrypto = { workspace = true, features = ["copy_key"] }
 mysten-metrics.workspace = true
-sui-analytics-indexer-derive.workspace = true
+# sui-analytics-indexer-derive.workspace = true
 sui-data-ingestion-core.workspace = true
 sui-indexer.workspace = true
 eyre.workspace = true
-rocksdb.workspace = true
 tempfile.workspace = true
 sui-types.workspace = true
 telemetry-subscribers.workspace = true
 sui-rest-api.workspace = true
 sui-storage.workspace = true
 sui-config.workspace = true
-typed-store-derive.workspace = true
 typed-store.workspace = true
 move-binary-format.workspace = true
 move-bytecode-utils.workspace = true
@@ -53,7 +51,7 @@ sui-json-rpc-types.workspace = true
 sui-package-resolver.workspace = true
 simulacrum.workspace = true
 arrow.workspace = true
-gcp-bigquery-client = "0.18.0"
+# gcp-bigquery-client = "0.18.0"
 snowflake-api.workspace = true
 tap.workspace = true
 
diff --git a/crates/sui-analytics-indexer/src/package_store.rs b/crates/sui-analytics-indexer/src/package_store.rs
index 26fefbeeaf5fa..94199a6353009 100644
--- a/crates/sui-analytics-indexer/src/package_store.rs
+++ b/crates/sui-analytics-indexer/src/package_store.rs
@@ -16,8 +16,8 @@ use thiserror::Error;
 use typed_store::rocks::{DBMap, MetricConf};
 use typed_store::traits::TableSummary;
 use typed_store::traits::TypedStoreDebug;
+use typed_store::DBMapUtils;
 use typed_store::{Map, TypedStoreError};
-use typed_store_derive::DBMapUtils;
 
 const STORE: &str = "RocksDB";
 
@@ -74,10 +74,9 @@ pub struct LocalDBPackageStore {
 
 impl LocalDBPackageStore {
     pub fn new(path: &Path, rest_url: &str) -> Self {
-        let rest_api_url = format!("{}/rest", rest_url);
         Self {
             package_store_tables: PackageStoreTables::new(path),
-            fallback_client: Client::new(rest_api_url),
+            fallback_client: Client::new(rest_url),
         }
     }
 
diff --git a/crates/sui-archival/src/lib.rs b/crates/sui-archival/src/lib.rs
index 1dbcd632c254d..bdc5b6b3ab18a 100644
--- a/crates/sui-archival/src/lib.rs
+++ b/crates/sui-archival/src/lib.rs
@@ -61,6 +61,7 @@ use tracing::{error, info};
 ///     - epoch_1/
 ///        - 101000.chk
 ///        - ...
+///
 /// Blob File Disk Format
 ///┌──────────────────────────────┐
 ///│       magic <4 byte>         │
diff --git a/crates/sui-aws-orchestrator/src/settings.rs b/crates/sui-aws-orchestrator/src/settings.rs
index 8eaca609aa3a8..be4b17d3ca10e 100644
--- a/crates/sui-aws-orchestrator/src/settings.rs
+++ b/crates/sui-aws-orchestrator/src/settings.rs
@@ -121,7 +121,6 @@ impl Settings {
             .path_segments()
             .expect("Url should already be checked when loading settings")
             .collect::<Vec<_>>()[1]
-            .to_string()
             .split('.')
             .next()
             .unwrap()
diff --git a/crates/sui-benchmark/Cargo.toml b/crates/sui-benchmark/Cargo.toml
index 54a9362e4675b..daad4d2158c51 100644
--- a/crates/sui-benchmark/Cargo.toml
+++ b/crates/sui-benchmark/Cargo.toml
@@ -6,6 +6,9 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 async-trait.workspace = true
 anyhow = { workspace = true, features = ["backtrace"] }
diff --git a/crates/sui-benchmark/src/embedded_reconfig_observer.rs b/crates/sui-benchmark/src/embedded_reconfig_observer.rs
index 9976491327bfd..42df82d81ce3b 100644
--- a/crates/sui-benchmark/src/embedded_reconfig_observer.rs
+++ b/crates/sui-benchmark/src/embedded_reconfig_observer.rs
@@ -23,6 +23,7 @@ use tracing::{error, info, trace};
 ///    and we happen to have a big committee rotation, it may
 ///    fail to get quorum on the latest committee info from
 ///    demissioned validators and then stop working.
+///
 /// Background: this is a temporary solution for stress before
 /// we see fullnode reconfiguration stabilizes.
 #[derive(Clone, Default)]
diff --git a/crates/sui-benchmark/tests/simtest.rs b/crates/sui-benchmark/tests/simtest.rs
index b1698066da3b2..b7d2e189da3a2 100644
--- a/crates/sui-benchmark/tests/simtest.rs
+++ b/crates/sui-benchmark/tests/simtest.rs
@@ -35,7 +35,7 @@ mod test {
     use sui_simulator::{configs::*, SimConfig};
     use sui_storage::blob::Blob;
     use sui_surfer::surf_strategy::SurfStrategy;
-    use sui_types::base_types::{ObjectID, SequenceNumber};
+    use sui_types::base_types::{ConciseableName, ObjectID, SequenceNumber};
     use sui_types::digests::TransactionDigest;
     use sui_types::full_checkpoint_content::CheckpointData;
     use sui_types::messages_checkpoint::VerifiedCheckpoint;
@@ -143,6 +143,29 @@ mod test {
         test_simulated_load(test_cluster, 120).await;
     }
 
+    #[sim_test(config = "test_config()")]
+    async fn test_simulated_load_rolling_restarts_all_validators() {
+        sui_protocol_config::ProtocolConfig::poison_get_for_min_version();
+        let test_cluster = build_test_cluster(4, 330_000).await;
+
+        let validators = test_cluster.get_validator_pubkeys();
+        let test_cluster_clone = test_cluster.clone();
+        let restarter_task = tokio::task::spawn(async move {
+            for _ in 0..4 {
+                for validator in validators.iter() {
+                    info!("Killing validator {:?}", validator.concise());
+                    test_cluster_clone.stop_node(validator);
+                    tokio::time::sleep(Duration::from_secs(20)).await;
+                    info!("Starting validator {:?}", validator.concise());
+                    test_cluster_clone.start_node(validator).await;
+                }
+            }
+        });
+        test_simulated_load(test_cluster.clone(), 330).await;
+        restarter_task.await.unwrap();
+        test_cluster.wait_for_epoch_all_nodes(1).await;
+    }
+
     #[ignore("Disabled due to flakiness - re-enable when failure is fixed")]
     #[sim_test(config = "test_config()")]
     async fn test_simulated_load_reconfig_restarts() {
@@ -527,7 +550,7 @@ mod test {
                 .build()
                 .await,
         );
-        test_simulated_load(test_cluster, 10).await;
+        test_simulated_load(test_cluster, 30).await;
 
         let checkpoint_files = std::fs::read_dir(path)
             .map(|entries| {
diff --git a/crates/sui-bridge-cli/src/lib.rs b/crates/sui-bridge-cli/src/lib.rs
index 3cafe745d4c9b..eacd3ca431f2c 100644
--- a/crates/sui-bridge-cli/src/lib.rs
+++ b/crates/sui-bridge-cli/src/lib.rs
@@ -313,7 +313,7 @@ pub fn make_action(chain_id: BridgeChainId, cmd: &GovernanceClientCommands) -> B
     }
 }
 
-fn encode_call_data(function_selector: &str, params: &Vec<String>) -> Vec<u8> {
+fn encode_call_data(function_selector: &str, params: &[String]) -> Vec<u8> {
     let left = function_selector
         .find('(')
         .expect("Invalid function selector, no left parentheses");
diff --git a/crates/sui-bridge-indexer/Cargo.toml b/crates/sui-bridge-indexer/Cargo.toml
index 6ff142d4e09ef..7ddb11e1bc5ed 100644
--- a/crates/sui-bridge-indexer/Cargo.toml
+++ b/crates/sui-bridge-indexer/Cargo.toml
@@ -10,7 +10,8 @@ edition = "2021"
 serde.workspace = true
 tap.workspace = true
 diesel = { version = "2.1.4", features = ["postgres", "r2d2", "serde_json"] }
-ethers = "2.0"
+ethers = { version = "2.0", features = ["rustls", "ws"] }
+rayon = "1.10.0"
 tokio = { workspace = true, features = ["full"] }
 anyhow.workspace = true
 futures.workspace = true
@@ -30,6 +31,7 @@ telemetry-subscribers.workspace = true
 tracing.workspace = true
 backoff.workspace = true
 sui-config.workspace = true
+sui-indexer-builder.workspace = true
 
 [dev-dependencies]
 sui-types = { workspace = true, features = ["test-utils"] }
diff --git a/crates/sui-bridge-indexer/src/config.rs b/crates/sui-bridge-indexer/src/config.rs
index 8b1bf56640546..fe2eba36f1e9f 100644
--- a/crates/sui-bridge-indexer/src/config.rs
+++ b/crates/sui-bridge-indexer/src/config.rs
@@ -11,6 +11,7 @@ pub struct IndexerConfig {
     pub eth_rpc_url: String,
     #[serde(default = "default_db_url")]
     pub db_url: String,
+    pub eth_ws_url: String,
     pub checkpoints_path: String,
     pub concurrency: u64,
     pub bridge_genesis_checkpoint: u64,
diff --git a/crates/sui-bridge-indexer/src/eth_bridge_indexer.rs b/crates/sui-bridge-indexer/src/eth_bridge_indexer.rs
new file mode 100644
index 0000000000000..f3f951952c6a2
--- /dev/null
+++ b/crates/sui-bridge-indexer/src/eth_bridge_indexer.rs
@@ -0,0 +1,321 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use std::collections::{HashMap, HashSet};
+use std::str::FromStr;
+use std::sync::Arc;
+use std::time::Duration;
+
+use anyhow::Error;
+use async_trait::async_trait;
+use ethers::prelude::Transaction;
+use ethers::providers::{Http, Middleware, Provider, StreamExt, Ws};
+use ethers::types::{Address as EthAddress, Block, Filter, H256};
+use sui_bridge::error::BridgeError;
+use sui_bridge::eth_client::EthClient;
+use sui_bridge::metered_eth_provider::MeteredEthHttpProvier;
+use sui_bridge::retry_with_max_elapsed_time;
+use tokio::task::JoinHandle;
+use tracing::info;
+
+use mysten_metrics::spawn_monitored_task;
+use sui_bridge::abi::{EthBridgeEvent, EthSuiBridgeEvents};
+
+use crate::metrics::BridgeIndexerMetrics;
+use sui_bridge::metrics::BridgeMetrics;
+use sui_bridge::types::{EthEvent, RawEthLog};
+use sui_indexer_builder::indexer_builder::{DataMapper, DataSender, Datasource};
+
+use crate::{
+    BridgeDataSource, ProcessedTxnData, TokenTransfer, TokenTransferData, TokenTransferStatus,
+};
+
+type RawEthData = (RawEthLog, Block<H256>, Transaction);
+
+pub struct EthSubscriptionDatasource {
+    bridge_address: EthAddress,
+    eth_ws_url: String,
+    indexer_metrics: BridgeIndexerMetrics,
+}
+
+impl EthSubscriptionDatasource {
+    pub fn new(
+        eth_sui_bridge_contract_address: String,
+        eth_ws_url: String,
+        indexer_metrics: BridgeIndexerMetrics,
+    ) -> Result<Self, anyhow::Error> {
+        let bridge_address = EthAddress::from_str(&eth_sui_bridge_contract_address)?;
+        Ok(Self {
+            bridge_address,
+            eth_ws_url,
+            indexer_metrics,
+        })
+    }
+}
+#[async_trait]
+impl Datasource<RawEthData> for EthSubscriptionDatasource {
+    async fn start_data_retrieval(
+        &self,
+        starting_checkpoint: u64,
+        target_checkpoint: u64,
+        data_sender: DataSender<RawEthData>,
+    ) -> Result<JoinHandle<Result<(), Error>>, Error> {
+        let filter = Filter::new()
+            .address(self.bridge_address)
+            .from_block(starting_checkpoint)
+            .to_block(target_checkpoint);
+
+        let eth_ws_url = self.eth_ws_url.clone();
+        let indexer_metrics: BridgeIndexerMetrics = self.indexer_metrics.clone();
+
+        let handle = spawn_monitored_task!(async move {
+            let eth_ws_client = Provider::<Ws>::connect(&eth_ws_url).await?;
+
+            let mut cached_blocks: HashMap<u64, Block<H256>> = HashMap::new();
+
+            let mut stream = eth_ws_client.subscribe_logs(&filter).await?;
+            while let Some(log) = stream.next().await {
+                let raw_log = RawEthLog {
+                    block_number: log
+                        .block_number
+                        .ok_or(BridgeError::ProviderError(
+                            "Provider returns log without block_number".into(),
+                        ))
+                        .unwrap()
+                        .as_u64(),
+                    tx_hash: log
+                        .transaction_hash
+                        .ok_or(BridgeError::ProviderError(
+                            "Provider returns log without transaction_hash".into(),
+                        ))
+                        .unwrap(),
+                    log,
+                };
+
+                let block_number = raw_log.block_number();
+
+                let block = if let Some(cached_block) = cached_blocks.get(&block_number) {
+                    cached_block.clone()
+                } else {
+                    let Ok(Ok(Some(block))) = retry_with_max_elapsed_time!(
+                        eth_ws_client.get_block(block_number),
+                        Duration::from_secs(30000)
+                    ) else {
+                        panic!("Unable to get block from provider");
+                    };
+
+                    cached_blocks.insert(block_number, block.clone());
+                    block
+                };
+
+                let Ok(Ok(Some(transaction))) = retry_with_max_elapsed_time!(
+                    eth_ws_client.get_transaction(raw_log.tx_hash),
+                    Duration::from_secs(30000)
+                ) else {
+                    panic!("Unable to get transaction from provider");
+                };
+
+                data_sender
+                    .send((block_number, vec![(raw_log, block, transaction)]))
+                    .await?;
+
+                indexer_metrics
+                    .latest_committed_eth_block
+                    .set(block_number as i64);
+            }
+
+            Ok::<_, Error>(())
+        });
+        Ok(handle)
+    }
+}
+
+pub struct EthSyncDatasource {
+    bridge_address: EthAddress,
+    eth_http_url: String,
+    indexer_metrics: BridgeIndexerMetrics,
+    bridge_metrics: Arc<BridgeMetrics>,
+}
+
+impl EthSyncDatasource {
+    pub fn new(
+        eth_sui_bridge_contract_address: String,
+        eth_http_url: String,
+        indexer_metrics: BridgeIndexerMetrics,
+        bridge_metrics: Arc<BridgeMetrics>,
+    ) -> Result<Self, anyhow::Error> {
+        let bridge_address = EthAddress::from_str(&eth_sui_bridge_contract_address)?;
+        Ok(Self {
+            bridge_address,
+            eth_http_url,
+            indexer_metrics,
+            bridge_metrics,
+        })
+    }
+}
+#[async_trait]
+impl Datasource<RawEthData> for EthSyncDatasource {
+    async fn start_data_retrieval(
+        &self,
+        starting_checkpoint: u64,
+        target_checkpoint: u64,
+        data_sender: DataSender<RawEthData>,
+    ) -> Result<JoinHandle<Result<(), Error>>, Error> {
+        let client: Arc<EthClient<MeteredEthHttpProvier>> = Arc::new(
+            EthClient::<MeteredEthHttpProvier>::new(
+                &self.eth_http_url,
+                HashSet::from_iter(vec![self.bridge_address]),
+                self.bridge_metrics.clone(),
+            )
+            .await?,
+        );
+
+        let provider = Arc::new(
+            Provider::<Http>::try_from(&self.eth_http_url)?
+                .interval(std::time::Duration::from_millis(2000)),
+        );
+
+        let bridge_address = self.bridge_address;
+        let indexer_metrics: BridgeIndexerMetrics = self.indexer_metrics.clone();
+        let client = Arc::clone(&client);
+        let provider = Arc::clone(&provider);
+
+        let handle = spawn_monitored_task!(async move {
+            let mut cached_blocks: HashMap<u64, Block<H256>> = HashMap::new();
+
+            let Ok(Ok(logs)) = retry_with_max_elapsed_time!(
+                client.get_raw_events_in_range(
+                    bridge_address,
+                    starting_checkpoint,
+                    target_checkpoint
+                ),
+                Duration::from_secs(30000)
+            ) else {
+                panic!("Unable to get logs from provider");
+            };
+
+            let mut data = Vec::new();
+            let mut first_block = 0;
+
+            for log in logs {
+                let block = if let Some(cached_block) = cached_blocks.get(&log.block_number) {
+                    cached_block.clone()
+                } else {
+                    let Ok(Ok(Some(block))) = retry_with_max_elapsed_time!(
+                        provider.get_block(log.block_number),
+                        Duration::from_secs(30000)
+                    ) else {
+                        panic!("Unable to get block from provider");
+                    };
+
+                    cached_blocks.insert(log.block_number, block.clone());
+                    block
+                };
+
+                if first_block == 0 {
+                    first_block = log.block_number;
+                }
+
+                let Ok(Ok(Some(transaction))) = retry_with_max_elapsed_time!(
+                    provider.get_transaction(log.tx_hash),
+                    Duration::from_secs(30000)
+                ) else {
+                    panic!("Unable to get transaction from provider");
+                };
+
+                data.push((log, block, transaction));
+            }
+
+            data_sender.send((target_checkpoint, data)).await?;
+
+            indexer_metrics
+                .last_synced_eth_block
+                .set(first_block as i64);
+
+            Ok::<_, Error>(())
+        });
+
+        Ok(handle)
+    }
+}
+
+#[derive(Clone)]
+pub struct EthDataMapper {
+    pub metrics: BridgeIndexerMetrics,
+}
+
+impl<E: EthEvent> DataMapper<(E, Block<H256>, Transaction), ProcessedTxnData> for EthDataMapper {
+    fn map(
+        &self,
+        (log, block, transaction): (E, Block<H256>, Transaction),
+    ) -> Result<Vec<ProcessedTxnData>, Error> {
+        let eth_bridge_event = EthBridgeEvent::try_from_log(log.log());
+        if eth_bridge_event.is_none() {
+            return Ok(vec![]);
+        }
+        self.metrics.total_eth_bridge_transactions.inc();
+        let bridge_event = eth_bridge_event.unwrap();
+        let timestamp_ms = block.timestamp.as_u64() * 1000;
+        let gas = transaction.gas;
+
+        let transfer = match bridge_event {
+            EthBridgeEvent::EthSuiBridgeEvents(bridge_event) => match bridge_event {
+                EthSuiBridgeEvents::TokensDepositedFilter(bridge_event) => {
+                    info!("Observed Eth Deposit at block: {}", log.block_number());
+                    self.metrics.total_eth_token_deposited.inc();
+                    ProcessedTxnData::TokenTransfer(TokenTransfer {
+                        chain_id: bridge_event.source_chain_id,
+                        nonce: bridge_event.nonce,
+                        block_height: log.block_number(),
+                        timestamp_ms,
+                        txn_hash: transaction.hash.as_bytes().to_vec(),
+                        txn_sender: bridge_event.sender_address.as_bytes().to_vec(),
+                        status: TokenTransferStatus::Deposited,
+                        gas_usage: gas.as_u64() as i64,
+                        data_source: BridgeDataSource::Eth,
+                        data: Some(TokenTransferData {
+                            sender_address: bridge_event.sender_address.as_bytes().to_vec(),
+                            destination_chain: bridge_event.destination_chain_id,
+                            recipient_address: bridge_event.recipient_address.to_vec(),
+                            token_id: bridge_event.token_id,
+                            amount: bridge_event.sui_adjusted_amount,
+                        }),
+                    })
+                }
+                EthSuiBridgeEvents::TokensClaimedFilter(bridge_event) => {
+                    info!("Observed Eth Claim at block: {}", log.block_number());
+                    self.metrics.total_eth_token_transfer_claimed.inc();
+                    ProcessedTxnData::TokenTransfer(TokenTransfer {
+                        chain_id: bridge_event.source_chain_id,
+                        nonce: bridge_event.nonce,
+                        block_height: log.block_number(),
+                        timestamp_ms,
+                        txn_hash: transaction.hash.as_bytes().to_vec(),
+                        txn_sender: bridge_event.sender_address.to_vec(),
+                        status: TokenTransferStatus::Claimed,
+                        gas_usage: gas.as_u64() as i64,
+                        data_source: BridgeDataSource::Eth,
+                        data: None,
+                    })
+                }
+                EthSuiBridgeEvents::PausedFilter(_)
+                | EthSuiBridgeEvents::UnpausedFilter(_)
+                | EthSuiBridgeEvents::UpgradedFilter(_)
+                | EthSuiBridgeEvents::InitializedFilter(_) => {
+                    // TODO: handle these events
+                    self.metrics.total_eth_bridge_txn_other.inc();
+                    return Ok(vec![]);
+                }
+            },
+            EthBridgeEvent::EthBridgeCommitteeEvents(_)
+            | EthBridgeEvent::EthBridgeLimiterEvents(_)
+            | EthBridgeEvent::EthBridgeConfigEvents(_)
+            | EthBridgeEvent::EthCommitteeUpgradeableContractEvents(_) => {
+                // TODO: handle these events
+                self.metrics.total_eth_bridge_txn_other.inc();
+                return Ok(vec![]);
+            }
+        };
+        Ok(vec![transfer])
+    }
+}
diff --git a/crates/sui-bridge-indexer/src/eth_worker.rs b/crates/sui-bridge-indexer/src/eth_worker.rs
deleted file mode 100644
index d07327ff238da..0000000000000
--- a/crates/sui-bridge-indexer/src/eth_worker.rs
+++ /dev/null
@@ -1,262 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::config::IndexerConfig;
-use crate::latest_eth_syncer::LatestEthSyncer;
-use crate::metrics::BridgeIndexerMetrics;
-use crate::postgres_manager::get_latest_eth_token_transfer;
-use crate::postgres_manager::{write, PgPool};
-use crate::{
-    BridgeDataSource, ProcessedTxnData, TokenTransfer, TokenTransferData, TokenTransferStatus,
-};
-use anyhow::{anyhow, Result};
-use ethers::providers::Provider;
-use ethers::providers::{Http, Middleware};
-use ethers::types::Address as EthAddress;
-use mysten_metrics::spawn_logged_monitored_task;
-use std::collections::HashMap;
-use std::str::FromStr;
-use std::sync::Arc;
-use sui_bridge::abi::{EthBridgeEvent, EthSuiBridgeEvents};
-use sui_bridge::metrics::BridgeMetrics;
-use sui_bridge::types::EthEvent;
-use sui_bridge::{eth_client::EthClient, eth_syncer::EthSyncer};
-use tokio::task::JoinHandle;
-use tracing::info;
-use tracing::log::error;
-
-#[derive(Clone)]
-pub struct EthBridgeWorker {
-    provider: Arc<Provider<Http>>,
-    pg_pool: PgPool,
-    bridge_metrics: Arc<BridgeMetrics>,
-    metrics: BridgeIndexerMetrics,
-    bridge_address: EthAddress,
-    config: IndexerConfig,
-}
-
-impl EthBridgeWorker {
-    pub fn new(
-        pg_pool: PgPool,
-        bridge_metrics: Arc<BridgeMetrics>,
-        metrics: BridgeIndexerMetrics,
-        config: IndexerConfig,
-    ) -> Result<Self, anyhow::Error> {
-        let bridge_address = EthAddress::from_str(&config.eth_sui_bridge_contract_address)?;
-
-        let provider = Arc::new(
-            Provider::<Http>::try_from(&config.eth_rpc_url)?
-                .interval(std::time::Duration::from_millis(2000)),
-        );
-
-        Ok(Self {
-            provider,
-            pg_pool,
-            bridge_metrics,
-            metrics,
-            bridge_address,
-            config,
-        })
-    }
-
-    pub async fn start_indexing_finalized_events(
-        &self,
-        eth_client: Arc<EthClient<ethers::providers::Http>>,
-    ) -> Result<JoinHandle<()>> {
-        let newest_finalized_block = match get_latest_eth_token_transfer(&self.pg_pool, true)? {
-            Some(transfer) => transfer.block_height as u64,
-            None => self.config.start_block,
-        };
-
-        info!("Starting from finalized block: {}", newest_finalized_block);
-
-        let finalized_contract_addresses =
-            HashMap::from_iter(vec![(self.bridge_address, newest_finalized_block)]);
-
-        let (_task_handles, eth_events_rx, _) =
-            EthSyncer::new(eth_client, finalized_contract_addresses)
-                .run(self.bridge_metrics.clone())
-                .await
-                .map_err(|e| anyhow!(format!("{e:?}")))?;
-
-        let provider_clone = self.provider.clone();
-        let pg_pool_clone = self.pg_pool.clone();
-        let metrics_clone = self.metrics.clone();
-
-        Ok(spawn_logged_monitored_task!(
-            process_eth_events(
-                provider_clone,
-                pg_pool_clone,
-                metrics_clone,
-                eth_events_rx,
-                true
-            ),
-            "finalized indexer handler"
-        ))
-    }
-
-    pub async fn start_indexing_unfinalized_events(
-        &self,
-        eth_client: Arc<EthClient<ethers::providers::Http>>,
-    ) -> Result<JoinHandle<()>> {
-        let newest_unfinalized_block_recorded =
-            match get_latest_eth_token_transfer(&self.pg_pool, false)? {
-                Some(transfer) => transfer.block_height as u64,
-                None => self.config.start_block,
-            };
-
-        info!(
-            "Starting from unfinalized block: {}",
-            newest_unfinalized_block_recorded
-        );
-
-        let unfinalized_contract_addresses = HashMap::from_iter(vec![(
-            self.bridge_address,
-            newest_unfinalized_block_recorded,
-        )]);
-
-        let (_task_handles, eth_events_rx) = LatestEthSyncer::new(
-            eth_client,
-            self.provider.clone(),
-            unfinalized_contract_addresses.clone(),
-        )
-        .run(self.metrics.clone())
-        .await
-        .map_err(|e| anyhow!(format!("{e:?}")))?;
-
-        let provider_clone = self.provider.clone();
-        let pg_pool_clone = self.pg_pool.clone();
-        let metrics_clone = self.metrics.clone();
-
-        Ok(spawn_logged_monitored_task!(
-            process_eth_events(
-                provider_clone,
-                pg_pool_clone,
-                metrics_clone,
-                eth_events_rx,
-                false
-            ),
-            "unfinalized indexer handler"
-        ))
-    }
-
-    pub fn bridge_address(&self) -> EthAddress {
-        self.bridge_address
-    }
-}
-
-async fn process_eth_events<E: EthEvent>(
-    provider: Arc<Provider<Http>>,
-    pg_pool: PgPool,
-    metrics: BridgeIndexerMetrics,
-    mut eth_events_rx: mysten_metrics::metered_channel::Receiver<(EthAddress, u64, Vec<E>)>,
-    finalized: bool,
-) {
-    let progress_gauge = if finalized {
-        metrics.last_committed_eth_block.clone()
-    } else {
-        metrics.last_committed_unfinalized_eth_block.clone()
-    };
-    while let Some((_, _, logs)) = eth_events_rx.recv().await {
-        // TODO: This for-loop can be optimzied to group tx / block info
-        // and reduce the queries issued to eth full node
-        for log in logs.iter() {
-            let eth_bridge_event = EthBridgeEvent::try_from_log(log.log());
-            if eth_bridge_event.is_none() {
-                continue;
-            }
-            metrics.total_eth_bridge_transactions.inc();
-            let bridge_event = eth_bridge_event.unwrap();
-            let block_number = log.block_number();
-            let block = provider.get_block(block_number).await.unwrap().unwrap();
-            let timestamp = block.timestamp.as_u64() * 1000;
-            let tx_hash = log.tx_hash();
-            let transaction = provider.get_transaction(tx_hash).await.unwrap().unwrap();
-            let gas = transaction.gas;
-
-            let transfer: TokenTransfer = match bridge_event {
-                EthBridgeEvent::EthSuiBridgeEvents(bridge_event) => match bridge_event {
-                    EthSuiBridgeEvents::TokensDepositedFilter(bridge_event) => {
-                        info!(
-                            "Observed {} Eth Deposit at block {}",
-                            if finalized {
-                                "Finalized"
-                            } else {
-                                "Unfinalized"
-                            },
-                            block_number
-                        );
-                        if finalized {
-                            metrics.total_eth_token_deposited.inc();
-                        }
-                        TokenTransfer {
-                            chain_id: bridge_event.source_chain_id,
-                            nonce: bridge_event.nonce,
-                            block_height: block_number,
-                            timestamp_ms: timestamp,
-                            txn_hash: tx_hash.as_bytes().to_vec(),
-                            txn_sender: bridge_event.sender_address.as_bytes().to_vec(),
-                            status: if finalized {
-                                TokenTransferStatus::Deposited
-                            } else {
-                                TokenTransferStatus::DepositedUnfinalized
-                            },
-                            gas_usage: gas.as_u64() as i64,
-                            data_source: BridgeDataSource::Eth,
-                            data: Some(TokenTransferData {
-                                sender_address: bridge_event.sender_address.as_bytes().to_vec(),
-                                destination_chain: bridge_event.destination_chain_id,
-                                recipient_address: bridge_event.recipient_address.to_vec(),
-                                token_id: bridge_event.token_id,
-                                amount: bridge_event.sui_adjusted_amount,
-                            }),
-                        }
-                    }
-                    EthSuiBridgeEvents::TokensClaimedFilter(bridge_event) => {
-                        // Only write unfinalized claims
-                        if finalized {
-                            continue;
-                        }
-                        info!("Observed Unfinalized Eth Claim");
-                        metrics.total_eth_token_transfer_claimed.inc();
-                        TokenTransfer {
-                            chain_id: bridge_event.source_chain_id,
-                            nonce: bridge_event.nonce,
-                            block_height: block_number,
-                            timestamp_ms: timestamp,
-                            txn_hash: tx_hash.as_bytes().to_vec(),
-                            txn_sender: bridge_event.sender_address.to_vec(),
-                            status: TokenTransferStatus::Claimed,
-                            gas_usage: gas.as_u64() as i64,
-                            data_source: BridgeDataSource::Eth,
-                            data: None,
-                        }
-                    }
-                    EthSuiBridgeEvents::PausedFilter(_)
-                    | EthSuiBridgeEvents::UnpausedFilter(_)
-                    | EthSuiBridgeEvents::UpgradedFilter(_)
-                    | EthSuiBridgeEvents::InitializedFilter(_) => {
-                        metrics.total_eth_bridge_txn_other.inc();
-                        continue;
-                    }
-                },
-                EthBridgeEvent::EthBridgeCommitteeEvents(_)
-                | EthBridgeEvent::EthBridgeLimiterEvents(_)
-                | EthBridgeEvent::EthBridgeConfigEvents(_)
-                | EthBridgeEvent::EthCommitteeUpgradeableContractEvents(_) => {
-                    metrics.total_eth_bridge_txn_other.inc();
-                    continue;
-                }
-            };
-
-            // TODO: we either scream here or keep retrying this until we succeed
-            if let Err(e) = write(&pg_pool, vec![ProcessedTxnData::TokenTransfer(transfer)]) {
-                error!("Error writing token transfer to database: {:?}", e);
-            } else {
-                progress_gauge.set(block_number as i64);
-            }
-        }
-    }
-
-    panic!("Eth event stream ended unexpectedly");
-}
diff --git a/crates/sui-bridge-indexer/src/latest_eth_syncer.rs b/crates/sui-bridge-indexer/src/latest_eth_syncer.rs
deleted file mode 100644
index 150353969f736..0000000000000
--- a/crates/sui-bridge-indexer/src/latest_eth_syncer.rs
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-//! The EthSyncer module is responsible for synchronizing Events emitted on Ethereum blockchain from
-//! concerned contracts. Each contract is associated with a start block number, and the syncer will
-//! only query from that block number onwards. The syncer also keeps track of the last
-//! block on Ethereum and will only query for events up to that block number.
-
-use ethers::providers::{Http, JsonRpcClient, Middleware, Provider};
-use ethers::types::Address as EthAddress;
-use mysten_metrics::metered_channel::{channel, Receiver, Sender};
-use mysten_metrics::spawn_logged_monitored_task;
-use std::cmp::min;
-use std::collections::HashMap;
-use std::sync::Arc;
-use std::time::Instant;
-use sui_bridge::error::BridgeResult;
-use sui_bridge::eth_client::EthClient;
-use sui_bridge::retry_with_max_elapsed_time;
-use sui_bridge::types::RawEthLog;
-use tokio::task::JoinHandle;
-use tokio::time::{self, Duration};
-use tracing::{error, info};
-
-use crate::metrics::BridgeIndexerMetrics;
-
-const ETH_LOG_QUERY_MAX_BLOCK_RANGE: u64 = 1000;
-const ETH_EVENTS_CHANNEL_SIZE: usize = 1000;
-const BLOCK_QUERY_INTERVAL: Duration = Duration::from_secs(2);
-
-pub struct LatestEthSyncer<P> {
-    eth_client: Arc<EthClient<P>>,
-    provider: Arc<Provider<Http>>,
-    contract_addresses: EthTargetAddresses,
-}
-
-/// Map from contract address to their start block.
-pub type EthTargetAddresses = HashMap<EthAddress, u64>;
-
-#[allow(clippy::new_without_default)]
-impl<P> LatestEthSyncer<P>
-where
-    P: JsonRpcClient + 'static,
-{
-    pub fn new(
-        eth_client: Arc<EthClient<P>>,
-        provider: Arc<Provider<Http>>,
-        contract_addresses: EthTargetAddresses,
-    ) -> Self {
-        Self {
-            eth_client,
-            provider,
-            contract_addresses,
-        }
-    }
-
-    pub async fn run(
-        self,
-        metrics: BridgeIndexerMetrics,
-    ) -> BridgeResult<(
-        Vec<JoinHandle<()>>,
-        Receiver<(EthAddress, u64, Vec<RawEthLog>)>,
-    )> {
-        let (eth_evnets_tx, eth_events_rx) = channel(
-            ETH_EVENTS_CHANNEL_SIZE,
-            &mysten_metrics::get_metrics()
-                .unwrap()
-                .channel_inflight
-                .with_label_values(&["eth_events_queue"]),
-        );
-
-        let mut task_handles = vec![];
-        for (contract_address, start_block) in self.contract_addresses {
-            let eth_events_tx_clone = eth_evnets_tx.clone();
-            let eth_client_clone = self.eth_client.clone();
-            let provider_clone = self.provider.clone();
-            let metrics_clone = metrics.clone();
-            task_handles.push(spawn_logged_monitored_task!(
-                Self::run_event_listening_task(
-                    contract_address,
-                    start_block,
-                    provider_clone,
-                    eth_events_tx_clone,
-                    eth_client_clone,
-                    metrics_clone,
-                )
-            ));
-        }
-        Ok((task_handles, eth_events_rx))
-    }
-
-    async fn run_event_listening_task(
-        contract_address: EthAddress,
-        mut start_block: u64,
-        provider: Arc<Provider<Http>>,
-        events_sender: Sender<(EthAddress, u64, Vec<RawEthLog>)>,
-        eth_client: Arc<EthClient<P>>,
-        metrics: BridgeIndexerMetrics,
-    ) {
-        info!(contract_address=?contract_address, "Starting eth events listening task from block {start_block}");
-        let mut interval = time::interval(BLOCK_QUERY_INTERVAL);
-        interval.set_missed_tick_behavior(time::MissedTickBehavior::Skip);
-        loop {
-            interval.tick().await;
-            let Ok(Ok(new_block)) =
-                retry_with_max_elapsed_time!(provider.get_block_number(), Duration::from_secs(600))
-            else {
-                error!("Failed to get latest block from eth client after retry");
-                continue;
-            };
-
-            let new_block: u64 = new_block.as_u64();
-
-            if new_block < start_block {
-                info!(
-                    contract_address=?contract_address,
-                    "New block {} is smaller than start block {}, ignore",
-                    new_block,
-                    start_block,
-                );
-                continue;
-            }
-
-            // Each query does at most ETH_LOG_QUERY_MAX_BLOCK_RANGE blocks.
-            let end_block = min(start_block + ETH_LOG_QUERY_MAX_BLOCK_RANGE - 1, new_block);
-            let timer = Instant::now();
-            let Ok(Ok(events)) = retry_with_max_elapsed_time!(
-                eth_client.get_raw_events_in_range(contract_address, start_block, end_block),
-                Duration::from_secs(600)
-            ) else {
-                error!("Failed to get events from eth client after retry");
-                continue;
-            };
-            info!(
-                ?contract_address,
-                start_block,
-                end_block,
-                "Querying eth events took {:?}",
-                timer.elapsed()
-            );
-            let len = events.len();
-            let last_block = events.last().map(|e| e.block_number);
-
-            // Note 1: we always events to the channel even when it is empty. This is because of
-            // how `eth_getLogs` api is designed - we want cursor to move forward continuously.
-
-            // Note 2: it's extremely critical to make sure the Logs we send via this channel
-            // are complete per block height. Namely, we should never send a partial list
-            // of events for a block. Otherwise, we may end up missing events.
-            events_sender
-                .send((contract_address, end_block, events))
-                .await
-                .expect("All Eth event channel receivers are closed");
-            if len != 0 {
-                info!(
-                    ?contract_address,
-                    start_block, end_block, "Observed {len} new Eth events",
-                );
-            }
-            if let Some(last_block) = last_block {
-                metrics
-                    .last_synced_unfinalized_eth_block
-                    .set(last_block as i64);
-            }
-            start_block = end_block + 1;
-        }
-    }
-}
diff --git a/crates/sui-bridge-indexer/src/lib.rs b/crates/sui-bridge-indexer/src/lib.rs
index 2aed0d793e3c2..afd4b461303f8 100644
--- a/crates/sui-bridge-indexer/src/lib.rs
+++ b/crates/sui-bridge-indexer/src/lib.rs
@@ -1,24 +1,25 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::models::TokenTransferData as DBTokenTransferData;
-use crate::models::{SuiErrorTransactions, TokenTransfer as DBTokenTransfer};
 use std::fmt::{Display, Formatter};
+
 use sui_types::base_types::{SuiAddress, TransactionDigest};
 
+use crate::models::TokenTransferData as DBTokenTransferData;
+use crate::models::{SuiErrorTransactions, TokenTransfer as DBTokenTransfer};
+
 pub mod config;
-pub mod eth_worker;
-pub mod latest_eth_syncer;
 pub mod metrics;
 pub mod models;
 pub mod postgres_manager;
 pub mod schema;
-pub mod sui_checkpoint_ingestion;
 pub mod sui_transaction_handler;
 pub mod sui_transaction_queries;
-pub mod sui_worker;
 pub mod types;
 
+pub mod eth_bridge_indexer;
+pub mod sui_bridge_indexer;
+
 #[derive(Clone)]
 pub enum ProcessedTxnData {
     TokenTransfer(TokenTransfer),
@@ -102,7 +103,6 @@ impl SuiTxnError {
 
 #[derive(Clone)]
 pub(crate) enum TokenTransferStatus {
-    DepositedUnfinalized,
     Deposited,
     Approved,
     Claimed,
@@ -111,7 +111,6 @@ pub(crate) enum TokenTransferStatus {
 impl Display for TokenTransferStatus {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         let str = match self {
-            TokenTransferStatus::DepositedUnfinalized => "DepositedUnfinalized",
             TokenTransferStatus::Deposited => "Deposited",
             TokenTransferStatus::Approved => "Approved",
             TokenTransferStatus::Claimed => "Claimed",
diff --git a/crates/sui-bridge-indexer/src/main.rs b/crates/sui-bridge-indexer/src/main.rs
index ae873496f0d9e..25b845ae4abaf 100644
--- a/crates/sui-bridge-indexer/src/main.rs
+++ b/crates/sui-bridge-indexer/src/main.rs
@@ -1,30 +1,36 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+use std::env;
+use std::path::PathBuf;
+use std::sync::Arc;
+
 use anyhow::Result;
 use clap::*;
+use ethers::providers::Http;
+use ethers::providers::Middleware;
+use ethers::providers::Provider;
+use sui_bridge_indexer::eth_bridge_indexer::EthSubscriptionDatasource;
+use sui_bridge_indexer::eth_bridge_indexer::EthSyncDatasource;
+use tokio::task::JoinHandle;
+use tracing::info;
+
+use mysten_metrics::metered_channel::channel;
 use mysten_metrics::spawn_logged_monitored_task;
 use mysten_metrics::start_prometheus_server;
-use std::collections::HashSet;
-use std::env;
-use std::path::PathBuf;
-use std::sync::Arc;
-use sui_bridge::eth_client::EthClient;
 use sui_bridge::metrics::BridgeMetrics;
-use sui_bridge_indexer::eth_worker::EthBridgeWorker;
+use sui_bridge_indexer::config::IndexerConfig;
+use sui_bridge_indexer::eth_bridge_indexer::EthDataMapper;
 use sui_bridge_indexer::metrics::BridgeIndexerMetrics;
 use sui_bridge_indexer::postgres_manager::{get_connection_pool, read_sui_progress_store};
+use sui_bridge_indexer::sui_bridge_indexer::{PgBridgePersistent, SuiBridgeDataMapper};
 use sui_bridge_indexer::sui_transaction_handler::handle_sui_transactions_loop;
 use sui_bridge_indexer::sui_transaction_queries::start_sui_tx_polling_task;
+use sui_config::Config;
 use sui_data_ingestion_core::DataIngestionMetrics;
+use sui_indexer_builder::indexer_builder::{BackfillStrategy, IndexerBuilder};
+use sui_indexer_builder::sui_datasource::SuiCheckpointDatasource;
 use sui_sdk::SuiClientBuilder;
-use tokio::task::JoinHandle;
-
-use mysten_metrics::metered_channel::channel;
-use sui_bridge_indexer::config::IndexerConfig;
-use sui_bridge_indexer::sui_checkpoint_ingestion::SuiCheckpointSyncer;
-use sui_config::Config;
-use tracing::info;
 
 #[derive(Parser, Clone, Debug)]
 struct Args {
@@ -50,7 +56,6 @@ async fn main() -> Result<()> {
             .join("config.yaml")
     };
     let config = IndexerConfig::load(&config_path)?;
-    let config_clone = config.clone();
 
     // Init metrics server
     let registry_service = start_prometheus_server(
@@ -70,35 +75,56 @@ async fn main() -> Result<()> {
     let ingestion_metrics = DataIngestionMetrics::new(&registry);
     let bridge_metrics = Arc::new(BridgeMetrics::new(&registry));
 
-    // unwrap safe: db_url must be set in `load_config` above
     let db_url = config.db_url.clone();
+    let datastore = PgBridgePersistent::new(get_connection_pool(db_url.clone()));
 
-    // TODO: retry_with_max_elapsed_time
-    let eth_worker = EthBridgeWorker::new(
-        get_connection_pool(db_url.clone()),
-        bridge_metrics.clone(),
-        indexer_meterics.clone(),
-        config.clone(),
-    )?;
-
-    let eth_client = Arc::new(
-        EthClient::<ethers::providers::Http>::new(
-            &config.eth_rpc_url,
-            HashSet::from_iter(vec![eth_worker.bridge_address()]),
-            bridge_metrics.clone(),
-        )
-        .await?,
+    let provider = Arc::new(
+        Provider::<Http>::try_from(config.eth_rpc_url.clone())?
+            .interval(std::time::Duration::from_millis(2000)),
     );
 
-    let unfinalized_handle = eth_worker
-        .start_indexing_unfinalized_events(eth_client.clone())
-        .await?;
-    let finalized_handle = eth_worker
-        .start_indexing_finalized_events(eth_client.clone())
-        .await?;
-    let handles = vec![unfinalized_handle, finalized_handle];
+    let current_block = provider.get_block_number().await?.as_u64();
+    let subscription_end_block = u64::MAX;
+
+    // Start the eth subscription indexer
+
+    let eth_subscription_datasource = EthSubscriptionDatasource::new(
+        config.eth_sui_bridge_contract_address.clone(),
+        config.eth_ws_url.clone(),
+        indexer_meterics.clone(),
+    )?;
+    let eth_subscription_indexer = IndexerBuilder::new(
+        "EthBridgeSubscriptionIndexer",
+        eth_subscription_datasource,
+        EthDataMapper {
+            metrics: indexer_meterics.clone(),
+        },
+    )
+    .with_backfill_strategy(BackfillStrategy::Disabled)
+    .build(current_block, subscription_end_block, datastore.clone());
+    let subscription_indexer_fut = spawn_logged_monitored_task!(eth_subscription_indexer.start());
+
+    // Start the eth sync indexer
+    let eth_sync_datasource = EthSyncDatasource::new(
+        config.eth_sui_bridge_contract_address.clone(),
+        config.eth_rpc_url.clone(),
+        indexer_meterics.clone(),
+        bridge_metrics.clone(),
+    )?;
+    let eth_sync_indexer = IndexerBuilder::new(
+        "EthBridgeSyncIndexer",
+        eth_sync_datasource,
+        EthDataMapper {
+            metrics: indexer_meterics.clone(),
+        },
+    )
+    .with_backfill_strategy(BackfillStrategy::Partitioned { task_size: 1000 })
+    .disable_live_task()
+    .build(current_block, config.start_block, datastore.clone());
+    let sync_indexer_fut = spawn_logged_monitored_task!(eth_sync_indexer.start());
 
     if let Some(sui_rpc_url) = config.sui_rpc_url.clone() {
+        // Todo: impl datasource for sui RPC datasource
         start_processing_sui_checkpoints_by_querying_txns(
             sui_rpc_url,
             db_url.clone(),
@@ -107,13 +133,30 @@ async fn main() -> Result<()> {
         )
         .await?;
     } else {
-        let pg_pool = get_connection_pool(db_url.clone());
-        SuiCheckpointSyncer::new(pg_pool, config.bridge_genesis_checkpoint)
-            .start(&config_clone, indexer_meterics, ingestion_metrics)
-            .await?;
+        let sui_checkpoint_datasource = SuiCheckpointDatasource::new(
+            config.remote_store_url,
+            config.concurrency as usize,
+            config.checkpoints_path.clone().into(),
+            ingestion_metrics.clone(),
+        );
+        let indexer = IndexerBuilder::new(
+            "SuiBridgeIndexer",
+            sui_checkpoint_datasource,
+            SuiBridgeDataMapper {
+                metrics: indexer_meterics.clone(),
+            },
+        )
+        .build(
+            config
+                .resume_from_checkpoint
+                .unwrap_or(config.bridge_genesis_checkpoint),
+            config.bridge_genesis_checkpoint,
+            datastore,
+        );
+        indexer.start().await?;
     }
     // We are not waiting for the sui tasks to finish here, which is ok.
-    futures::future::join_all(handles).await;
+    futures::future::join_all(vec![subscription_indexer_fut, sync_indexer_fut]).await;
 
     Ok(())
 }
diff --git a/crates/sui-bridge-indexer/src/metrics.rs b/crates/sui-bridge-indexer/src/metrics.rs
index f4ccf5dfbedfc..b57a3121f4ae3 100644
--- a/crates/sui-bridge-indexer/src/metrics.rs
+++ b/crates/sui-bridge-indexer/src/metrics.rs
@@ -18,9 +18,8 @@ pub struct BridgeIndexerMetrics {
     pub(crate) total_eth_token_transfer_claimed: IntCounter,
     pub(crate) total_eth_bridge_txn_other: IntCounter,
     pub(crate) last_committed_sui_checkpoint: IntGauge,
-    pub(crate) last_committed_eth_block: IntGauge,
-    pub(crate) last_synced_unfinalized_eth_block: IntGauge,
-    pub(crate) last_committed_unfinalized_eth_block: IntGauge,
+    pub(crate) latest_committed_eth_block: IntGauge,
+    pub(crate) last_synced_eth_block: IntGauge,
 }
 
 impl BridgeIndexerMetrics {
@@ -86,21 +85,15 @@ impl BridgeIndexerMetrics {
                 registry,
             )
             .unwrap(),
-            last_committed_eth_block: register_int_gauge_with_registry!(
+            latest_committed_eth_block: register_int_gauge_with_registry!(
                 "last_committed_eth_block",
                 "The latest eth block that indexer committed to DB",
                 registry,
             )
             .unwrap(),
-            last_synced_unfinalized_eth_block: register_int_gauge_with_registry!(
-                "last_synced_unfinalized_eth_block",
-                "The latest unfinalized block that indexer synced",
-                registry,
-            )
-            .unwrap(),
-            last_committed_unfinalized_eth_block: register_int_gauge_with_registry!(
-                "last_committed_unfinalized_eth_block",
-                "The latest unfinalized block that indexer comitted to DB",
+            last_synced_eth_block: register_int_gauge_with_registry!(
+                "last_synced_eth_block",
+                "The last eth block that indexer committed to DB",
                 registry,
             )
             .unwrap(),
diff --git a/crates/sui-bridge-indexer/src/models.rs b/crates/sui-bridge-indexer/src/models.rs
index e005dca186d6f..90435cd60c154 100644
--- a/crates/sui-bridge-indexer/src/models.rs
+++ b/crates/sui-bridge-indexer/src/models.rs
@@ -1,11 +1,14 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+use diesel::data_types::PgTimestamp;
+use diesel::{Identifiable, Insertable, Queryable, Selectable};
+
+use sui_indexer_builder::Task;
+
 use crate::schema::{
     progress_store, sui_error_transactions, sui_progress_store, token_transfer, token_transfer_data,
 };
-use diesel::data_types::PgTimestamp;
-use diesel::{Identifiable, Insertable, Queryable, Selectable};
 
 #[derive(Queryable, Selectable, Insertable, Identifiable, Debug)]
 #[diesel(table_name = progress_store, primary_key(task_name))]
@@ -16,6 +19,18 @@ pub struct ProgressStore {
     pub timestamp: Option<PgTimestamp>,
 }
 
+impl From<ProgressStore> for Task {
+    fn from(value: ProgressStore) -> Self {
+        Self {
+            task_name: value.task_name,
+            checkpoint: value.checkpoint as u64,
+            target_checkpoint: value.target_checkpoint as u64,
+            // Ok to unwrap, timestamp is defaulted to now() in database
+            timestamp: value.timestamp.expect("Timestamp not set").0 as u64,
+        }
+    }
+}
+
 #[derive(Queryable, Selectable, Insertable, Identifiable, Debug)]
 #[diesel(table_name = sui_progress_store, primary_key(txn_digest))]
 pub struct SuiProgressStore {
diff --git a/crates/sui-bridge-indexer/src/sui_bridge_indexer.rs b/crates/sui-bridge-indexer/src/sui_bridge_indexer.rs
new file mode 100644
index 0000000000000..d0e5c46f8375c
--- /dev/null
+++ b/crates/sui-bridge-indexer/src/sui_bridge_indexer.rs
@@ -0,0 +1,293 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{anyhow, Error};
+use async_trait::async_trait;
+use diesel::dsl::now;
+use diesel::{Connection, OptionalExtension, QueryDsl, RunQueryDsl, SelectableHelper};
+use diesel::{ExpressionMethods, TextExpressionMethods};
+use tracing::info;
+
+use sui_bridge::events::{
+    MoveTokenDepositedEvent, MoveTokenTransferApproved, MoveTokenTransferClaimed,
+};
+use sui_indexer_builder::indexer_builder::{DataMapper, IndexerProgressStore, Persistent};
+use sui_indexer_builder::sui_datasource::CheckpointTxnData;
+use sui_indexer_builder::Task;
+use sui_types::effects::TransactionEffectsAPI;
+use sui_types::event::Event;
+use sui_types::execution_status::ExecutionStatus;
+use sui_types::full_checkpoint_content::CheckpointTransaction;
+use sui_types::{BRIDGE_ADDRESS, SUI_BRIDGE_OBJECT_ID};
+
+use crate::metrics::BridgeIndexerMetrics;
+use crate::postgres_manager::PgPool;
+use crate::schema::progress_store::{columns, dsl};
+use crate::schema::{sui_error_transactions, token_transfer, token_transfer_data};
+use crate::{
+    models, schema, BridgeDataSource, ProcessedTxnData, SuiTxnError, TokenTransfer,
+    TokenTransferData, TokenTransferStatus,
+};
+
+/// Persistent layer impl
+#[derive(Clone)]
+pub struct PgBridgePersistent {
+    pool: PgPool,
+}
+
+impl PgBridgePersistent {
+    pub fn new(pool: PgPool) -> Self {
+        Self { pool }
+    }
+}
+
+// TODO: this is shared between SUI and ETH, move to different file.
+#[async_trait]
+impl Persistent<ProcessedTxnData> for PgBridgePersistent {
+    async fn write(&self, data: Vec<ProcessedTxnData>) -> Result<(), Error> {
+        if data.is_empty() {
+            return Ok(());
+        }
+        let connection = &mut self.pool.get()?;
+        connection.transaction(|conn| {
+            for d in data {
+                match d {
+                    ProcessedTxnData::TokenTransfer(t) => {
+                        diesel::insert_into(token_transfer::table)
+                            .values(&t.to_db())
+                            .on_conflict_do_nothing()
+                            .execute(conn)?;
+
+                        if let Some(d) = t.to_data_maybe() {
+                            diesel::insert_into(token_transfer_data::table)
+                                .values(&d)
+                                .on_conflict_do_nothing()
+                                .execute(conn)?;
+                        }
+                    }
+                    ProcessedTxnData::Error(e) => {
+                        diesel::insert_into(sui_error_transactions::table)
+                            .values(&e.to_db())
+                            .on_conflict_do_nothing()
+                            .execute(conn)?;
+                    }
+                }
+            }
+            Ok(())
+        })
+    }
+}
+
+#[async_trait]
+impl IndexerProgressStore for PgBridgePersistent {
+    async fn load_progress(&self, task_name: String) -> anyhow::Result<u64> {
+        let mut conn = self.pool.get()?;
+        let cp: Option<models::ProgressStore> = dsl::progress_store
+            .find(&task_name)
+            .select(models::ProgressStore::as_select())
+            .first(&mut conn)
+            .optional()?;
+        Ok(cp
+            .ok_or(anyhow!("Cannot found progress for task {task_name}"))?
+            .checkpoint as u64)
+    }
+
+    async fn save_progress(
+        &mut self,
+        task_name: String,
+        checkpoint_number: u64,
+    ) -> anyhow::Result<()> {
+        let mut conn = self.pool.get()?;
+        diesel::insert_into(schema::progress_store::table)
+            .values(&models::ProgressStore {
+                task_name,
+                checkpoint: checkpoint_number as i64,
+                // Target checkpoint and timestamp will only be written for new entries
+                target_checkpoint: i64::MAX,
+                // Timestamp is defaulted to current time in DB if None
+                timestamp: None,
+            })
+            .on_conflict(dsl::task_name)
+            .do_update()
+            .set((
+                columns::checkpoint.eq(checkpoint_number as i64),
+                columns::timestamp.eq(now),
+            ))
+            .execute(&mut conn)?;
+        Ok(())
+    }
+
+    async fn tasks(&self, prefix: &str) -> Result<Vec<Task>, anyhow::Error> {
+        let mut conn = self.pool.get()?;
+        // get all unfinished tasks
+        let cp: Vec<models::ProgressStore> = dsl::progress_store
+            // TODO: using like could be error prone, change the progress store schema to stare the task name properly.
+            .filter(columns::task_name.like(format!("{prefix} - %")))
+            .filter(columns::checkpoint.lt(columns::target_checkpoint))
+            .order_by(columns::target_checkpoint.desc())
+            .load(&mut conn)?;
+        Ok(cp.into_iter().map(|d| d.into()).collect())
+    }
+
+    async fn register_task(
+        &mut self,
+        task_name: String,
+        checkpoint: u64,
+        target_checkpoint: u64,
+    ) -> Result<(), anyhow::Error> {
+        let mut conn = self.pool.get()?;
+        diesel::insert_into(schema::progress_store::table)
+            .values(models::ProgressStore {
+                task_name,
+                checkpoint: checkpoint as i64,
+                target_checkpoint: target_checkpoint as i64,
+                // Timestamp is defaulted to current time in DB if None
+                timestamp: None,
+            })
+            .execute(&mut conn)?;
+        Ok(())
+    }
+
+    async fn update_task(&mut self, task: Task) -> Result<(), anyhow::Error> {
+        let mut conn = self.pool.get()?;
+        diesel::update(dsl::progress_store.filter(columns::task_name.eq(task.task_name)))
+            .set((
+                columns::checkpoint.eq(task.checkpoint as i64),
+                columns::target_checkpoint.eq(task.target_checkpoint as i64),
+                columns::timestamp.eq(now),
+            ))
+            .execute(&mut conn)?;
+        Ok(())
+    }
+}
+
+/// Data mapper impl
+#[derive(Clone)]
+pub struct SuiBridgeDataMapper {
+    pub metrics: BridgeIndexerMetrics,
+}
+
+impl DataMapper<CheckpointTxnData, ProcessedTxnData> for SuiBridgeDataMapper {
+    fn map(
+        &self,
+        (data, checkpoint_num, timestamp_ms): CheckpointTxnData,
+    ) -> Result<Vec<ProcessedTxnData>, Error> {
+        self.metrics.total_sui_bridge_transactions.inc();
+        if !data
+            .input_objects
+            .iter()
+            .any(|obj| obj.id() == SUI_BRIDGE_OBJECT_ID)
+        {
+            return Ok(vec![]);
+        }
+
+        match &data.events {
+            Some(events) => {
+                let token_transfers = events.data.iter().try_fold(vec![], |mut result, ev| {
+                    if let Some(data) = process_sui_event(ev, &data, checkpoint_num, timestamp_ms)?
+                    {
+                        result.push(data);
+                    }
+                    Ok::<_, anyhow::Error>(result)
+                })?;
+
+                if !token_transfers.is_empty() {
+                    info!(
+                        "SUI: Extracted {} bridge token transfer data entries for tx {}.",
+                        token_transfers.len(),
+                        data.transaction.digest()
+                    );
+                }
+                Ok(token_transfers)
+            }
+            None => {
+                if let ExecutionStatus::Failure { error, command } = data.effects.status() {
+                    Ok(vec![ProcessedTxnData::Error(SuiTxnError {
+                        tx_digest: *data.transaction.digest(),
+                        sender: data.transaction.sender_address(),
+                        timestamp_ms,
+                        failure_status: error.to_string(),
+                        cmd_idx: command.map(|idx| idx as u64),
+                    })])
+                } else {
+                    Ok(vec![])
+                }
+            }
+        }
+    }
+}
+
+fn process_sui_event(
+    ev: &Event,
+    tx: &CheckpointTransaction,
+    checkpoint: u64,
+    timestamp_ms: u64,
+) -> Result<Option<ProcessedTxnData>, anyhow::Error> {
+    Ok(if ev.type_.address == BRIDGE_ADDRESS {
+        match ev.type_.name.as_str() {
+            "TokenDepositedEvent" => {
+                info!("Observed Sui Deposit {:?}", ev);
+                // todo: metrics.total_sui_token_deposited.inc();
+                let move_event: MoveTokenDepositedEvent = bcs::from_bytes(&ev.contents)?;
+                Some(ProcessedTxnData::TokenTransfer(TokenTransfer {
+                    chain_id: move_event.source_chain,
+                    nonce: move_event.seq_num,
+                    block_height: checkpoint,
+                    timestamp_ms,
+                    txn_hash: tx.transaction.digest().inner().to_vec(),
+                    txn_sender: ev.sender.to_vec(),
+                    status: TokenTransferStatus::Deposited,
+                    gas_usage: tx.effects.gas_cost_summary().net_gas_usage(),
+                    data_source: BridgeDataSource::Sui,
+                    data: Some(TokenTransferData {
+                        destination_chain: move_event.target_chain,
+                        sender_address: move_event.sender_address.clone(),
+                        recipient_address: move_event.target_address.clone(),
+                        token_id: move_event.token_type,
+                        amount: move_event.amount_sui_adjusted,
+                    }),
+                }))
+            }
+            "TokenTransferApproved" => {
+                info!("Observed Sui Approval {:?}", ev);
+                // todo: metrics.total_sui_token_transfer_approved.inc();
+                let event: MoveTokenTransferApproved = bcs::from_bytes(&ev.contents)?;
+                Some(ProcessedTxnData::TokenTransfer(TokenTransfer {
+                    chain_id: event.message_key.source_chain,
+                    nonce: event.message_key.bridge_seq_num,
+                    block_height: checkpoint,
+                    timestamp_ms,
+                    txn_hash: tx.transaction.digest().inner().to_vec(),
+                    txn_sender: ev.sender.to_vec(),
+                    status: TokenTransferStatus::Approved,
+                    gas_usage: tx.effects.gas_cost_summary().net_gas_usage(),
+                    data_source: BridgeDataSource::Sui,
+                    data: None,
+                }))
+            }
+            "TokenTransferClaimed" => {
+                info!("Observed Sui Claim {:?}", ev);
+                // todo: metrics.total_sui_token_transfer_claimed.inc();
+                let event: MoveTokenTransferClaimed = bcs::from_bytes(&ev.contents)?;
+                Some(ProcessedTxnData::TokenTransfer(TokenTransfer {
+                    chain_id: event.message_key.source_chain,
+                    nonce: event.message_key.bridge_seq_num,
+                    block_height: checkpoint,
+                    timestamp_ms,
+                    txn_hash: tx.transaction.digest().inner().to_vec(),
+                    txn_sender: ev.sender.to_vec(),
+                    status: TokenTransferStatus::Claimed,
+                    gas_usage: tx.effects.gas_cost_summary().net_gas_usage(),
+                    data_source: BridgeDataSource::Sui,
+                    data: None,
+                }))
+            }
+            _ => {
+                // todo: metrics.total_sui_bridge_txn_other.inc();
+                None
+            }
+        }
+    } else {
+        None
+    })
+}
diff --git a/crates/sui-bridge-indexer/src/sui_checkpoint_ingestion.rs b/crates/sui-bridge-indexer/src/sui_checkpoint_ingestion.rs
deleted file mode 100644
index 53d1d701f6694..0000000000000
--- a/crates/sui-bridge-indexer/src/sui_checkpoint_ingestion.rs
+++ /dev/null
@@ -1,302 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::config::IndexerConfig;
-use crate::metrics::BridgeIndexerMetrics;
-use crate::postgres_manager::PgPool;
-use crate::schema::progress_store::{columns, dsl};
-use crate::sui_worker::SuiBridgeWorker;
-use crate::{models, schema};
-use async_trait::async_trait;
-use diesel::dsl::now;
-use diesel::{
-    delete, ExpressionMethods, OptionalExtension, QueryDsl, RunQueryDsl, SelectableHelper,
-};
-use mysten_metrics::spawn_monitored_task;
-use std::cmp::min;
-use sui_data_ingestion_core::{
-    DataIngestionMetrics, IndexerExecutor, ProgressStore, ReaderOptions, WorkerPool,
-};
-use sui_types::base_types::TransactionDigest;
-use sui_types::messages_checkpoint::CheckpointSequenceNumber;
-use tokio::sync::oneshot;
-use tokio::sync::oneshot::Sender;
-
-pub struct SuiCheckpointSyncer {
-    pool: PgPool,
-    bridge_genesis_checkpoint: u64,
-}
-
-impl SuiCheckpointSyncer {
-    pub fn new(pool: PgPool, bridge_genesis_checkpoint: u64) -> Self {
-        // read all task from db
-        SuiCheckpointSyncer {
-            pool: pool.clone(),
-            bridge_genesis_checkpoint,
-        }
-    }
-    pub async fn start(
-        self,
-        config: &IndexerConfig,
-        indexer_meterics: BridgeIndexerMetrics,
-        ingestion_metrics: DataIngestionMetrics,
-    ) -> anyhow::Result<(), anyhow::Error> {
-        // Update tasks first
-        let tasks = self.tasks()?;
-        // checkpoint workers
-        match tasks.latest_checkpoint_task() {
-            None => {
-                // No task in database, start latest checkpoint task and backfill tasks
-                // if resume_from_checkpoint, use it for the latest task, if not set, use bridge_genesis_checkpoint
-                let start_from_cp = config
-                    .resume_from_checkpoint
-                    .unwrap_or(self.bridge_genesis_checkpoint);
-                self.register_task(new_task_name(), start_from_cp, i64::MAX)?;
-
-                // Create backfill tasks
-                if start_from_cp != config.bridge_genesis_checkpoint {
-                    let mut current_cp = self.bridge_genesis_checkpoint;
-                    while current_cp < start_from_cp {
-                        let target_cp = min(current_cp + config.back_fill_lot_size, start_from_cp);
-                        self.register_task(new_task_name(), current_cp, target_cp as i64)?;
-                        current_cp = target_cp;
-                    }
-                }
-            }
-            Some(mut task) => {
-                match config.resume_from_checkpoint {
-                    Some(cp) if task.checkpoint < cp => {
-                        // Scenario 1: resume_from_checkpoint is set, and it's > current checkpoint
-                        // create new task from resume_from_checkpoint to u64::MAX
-                        // Update old task to finish at resume_from_checkpoint
-                        let mut target_cp = cp;
-                        while target_cp - task.checkpoint > config.back_fill_lot_size {
-                            self.register_task(
-                                new_task_name(),
-                                target_cp - config.back_fill_lot_size,
-                                target_cp as i64,
-                            )?;
-                            target_cp -= config.back_fill_lot_size;
-                        }
-                        task.target_checkpoint = target_cp;
-                        self.update_task(task)?;
-                        self.register_task(new_task_name(), cp, i64::MAX)?;
-                    }
-                    _ => {
-                        // Scenario 2: resume_from_checkpoint is set, but it's < current checkpoint or not set
-                        // ignore resume_from_checkpoint, resume all task as it is.
-                    }
-                }
-            }
-        }
-
-        // get updated tasks and start workers
-        let updated_tasks = self.tasks()?;
-        // Start latest checkpoint worker
-        // Tasks are ordered in checkpoint descending order, realtime update task always come first
-        // tasks won't be empty here, ok to unwrap.
-        let (realtime_task, backfill_tasks) = updated_tasks.split_first().unwrap();
-        let realtime_task_future = Self::start_executor(
-            self.pool.clone(),
-            self.bridge_genesis_checkpoint,
-            ingestion_metrics.clone(),
-            indexer_meterics.clone(),
-            config,
-            realtime_task,
-        );
-
-        let backfill_tasks = backfill_tasks.to_vec();
-        let config_clone = config.clone();
-        let pool_clone = self.pool.clone();
-        let bridge_genesis_checkpoint = self.bridge_genesis_checkpoint;
-        let handle = spawn_monitored_task!(async {
-            for backfill_task in backfill_tasks {
-                Self::start_executor(
-                    pool_clone.clone(),
-                    bridge_genesis_checkpoint,
-                    ingestion_metrics.clone(),
-                    indexer_meterics.clone(),
-                    &config_clone,
-                    &backfill_task,
-                )
-                .await
-                .expect("Backfill task failed");
-            }
-        });
-        realtime_task_future.await?;
-        tokio::try_join!(handle)?;
-        Ok(())
-    }
-
-    pub fn tasks(&self) -> Result<Vec<Task>, anyhow::Error> {
-        let mut conn = self.pool.get()?;
-        // clean up completed task
-        delete(dsl::progress_store.filter(columns::checkpoint.ge(columns::target_checkpoint)))
-            .execute(&mut conn)?;
-        // get all unfinished tasks
-        let cp: Vec<models::ProgressStore> = dsl::progress_store
-            .order_by(columns::checkpoint.desc())
-            .load(&mut conn)?;
-        Ok(cp.into_iter().map(|d| d.into()).collect())
-    }
-
-    pub fn register_task(
-        &self,
-        task_name: String,
-        checkpoint: u64,
-        target_checkpoint: i64,
-    ) -> Result<(), anyhow::Error> {
-        let mut conn = self.pool.get()?;
-        diesel::insert_into(schema::progress_store::table)
-            .values(models::ProgressStore {
-                task_name,
-                checkpoint: checkpoint as i64,
-                target_checkpoint,
-                timestamp: None,
-            })
-            .execute(&mut conn)?;
-        Ok(())
-    }
-
-    pub fn update_task(&self, task: Task) -> Result<(), anyhow::Error> {
-        let mut conn = self.pool.get()?;
-        diesel::update(dsl::progress_store.filter(columns::task_name.eq(task.task_name)))
-            .set((
-                columns::checkpoint.eq(task.checkpoint as i64),
-                columns::target_checkpoint.eq(task.target_checkpoint as i64),
-                columns::timestamp.eq(now),
-            ))
-            .execute(&mut conn)?;
-        Ok(())
-    }
-
-    async fn start_executor(
-        pool: PgPool,
-        bridge_genesis_checkpoint: u64,
-        ingestion_metrics: DataIngestionMetrics,
-        indexer_meterics: BridgeIndexerMetrics,
-        config: &IndexerConfig,
-        task: &Task,
-    ) -> anyhow::Result<()> {
-        let (exit_sender, exit_receiver) = oneshot::channel();
-
-        let progress_store = PgProgressStore {
-            pool: pool.clone(),
-            bridge_genesis_checkpoint,
-            exit_checkpoint: task.target_checkpoint,
-            exit_sender: Some(exit_sender),
-        };
-
-        let mut executor = IndexerExecutor::new(
-            progress_store,
-            1, /* workflow types */
-            ingestion_metrics,
-        );
-
-        let indexer_metrics_cloned = indexer_meterics.clone();
-
-        let worker = SuiBridgeWorker::new(vec![], pool, indexer_metrics_cloned);
-        let worker_pool =
-            WorkerPool::new(worker, task.task_name.clone(), config.concurrency as usize);
-        executor.register(worker_pool).await?;
-        executor
-            .run(
-                config.checkpoints_path.clone().into(),
-                Some(config.remote_store_url.clone()),
-                vec![], // optional remote store access options
-                ReaderOptions::default(),
-                exit_receiver,
-            )
-            .await?;
-
-        Ok(())
-    }
-}
-
-#[derive(Clone)]
-pub struct Task {
-    pub task_name: String,
-    pub checkpoint: u64,
-    pub target_checkpoint: u64,
-    pub timestamp: u64,
-}
-
-impl From<models::ProgressStore> for Task {
-    fn from(value: models::ProgressStore) -> Self {
-        Self {
-            task_name: value.task_name,
-            checkpoint: value.checkpoint as u64,
-            target_checkpoint: value.target_checkpoint as u64,
-            // Ok to unwrap, timestamp is defaulted to now() in database
-            timestamp: value.timestamp.expect("Timestamp not set").0 as u64,
-        }
-    }
-}
-
-pub trait Tasks {
-    fn latest_checkpoint_task(&self) -> Option<Task>;
-}
-
-impl Tasks for Vec<Task> {
-    fn latest_checkpoint_task(&self) -> Option<Task> {
-        self.iter().fold(None, |result, other_task| match &result {
-            Some(task) if task.checkpoint < other_task.checkpoint => Some(other_task.clone()),
-            None => Some(other_task.clone()),
-            _ => result,
-        })
-    }
-}
-
-pub struct PgProgressStore {
-    pool: PgPool,
-    bridge_genesis_checkpoint: u64,
-    exit_checkpoint: u64,
-    exit_sender: Option<Sender<()>>,
-}
-
-#[async_trait]
-impl ProgressStore for PgProgressStore {
-    async fn load(&mut self, task_name: String) -> anyhow::Result<CheckpointSequenceNumber> {
-        let mut conn = self.pool.get()?;
-        let cp: Option<models::ProgressStore> = dsl::progress_store
-            .find(task_name)
-            .select(models::ProgressStore::as_select())
-            .first(&mut conn)
-            .optional()?;
-        Ok(cp
-            .map(|d| d.checkpoint as u64)
-            .unwrap_or(self.bridge_genesis_checkpoint))
-    }
-
-    async fn save(
-        &mut self,
-        task_name: String,
-        checkpoint_number: CheckpointSequenceNumber,
-    ) -> anyhow::Result<()> {
-        if checkpoint_number >= self.exit_checkpoint {
-            if let Some(sender) = self.exit_sender.take() {
-                let _ = sender.send(());
-            }
-        }
-        let mut conn = self.pool.get()?;
-        diesel::insert_into(schema::progress_store::table)
-            .values(&models::ProgressStore {
-                task_name,
-                checkpoint: checkpoint_number as i64,
-                target_checkpoint: i64::MAX,
-                timestamp: None,
-            })
-            .on_conflict(dsl::task_name)
-            .do_update()
-            .set((
-                columns::checkpoint.eq(checkpoint_number as i64),
-                columns::timestamp.eq(now),
-            ))
-            .execute(&mut conn)?;
-        Ok(())
-    }
-}
-
-fn new_task_name() -> String {
-    format!("bridge worker - {}", TransactionDigest::random())
-}
diff --git a/crates/sui-bridge-indexer/src/sui_worker.rs b/crates/sui-bridge-indexer/src/sui_worker.rs
deleted file mode 100644
index 673140a4bc8fe..0000000000000
--- a/crates/sui-bridge-indexer/src/sui_worker.rs
+++ /dev/null
@@ -1,212 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::postgres_manager::{write, PgPool};
-use crate::{
-    metrics::BridgeIndexerMetrics, BridgeDataSource, ProcessedTxnData, SuiTxnError, TokenTransfer,
-    TokenTransferData, TokenTransferStatus,
-};
-use anyhow::Result;
-use async_trait::async_trait;
-use std::collections::BTreeSet;
-use sui_bridge::events::{
-    MoveTokenDepositedEvent, MoveTokenTransferApproved, MoveTokenTransferClaimed,
-};
-use sui_data_ingestion_core::Worker;
-use sui_types::event::Event;
-use sui_types::execution_status::ExecutionStatus;
-use sui_types::{
-    base_types::ObjectID,
-    effects::TransactionEffectsAPI,
-    full_checkpoint_content::{CheckpointData, CheckpointTransaction},
-    transaction::{TransactionDataAPI, TransactionKind},
-    BRIDGE_ADDRESS, SUI_BRIDGE_OBJECT_ID,
-};
-use tap::tap::TapFallible;
-use tracing::info;
-
-pub struct SuiBridgeWorker {
-    bridge_object_ids: BTreeSet<ObjectID>,
-    pg_pool: PgPool,
-    metrics: BridgeIndexerMetrics,
-}
-
-impl SuiBridgeWorker {
-    pub fn new(
-        bridge_object_ids: Vec<ObjectID>,
-        pg_pool: PgPool,
-        metrics: BridgeIndexerMetrics,
-    ) -> Self {
-        let mut bridge_object_ids = bridge_object_ids.into_iter().collect::<BTreeSet<_>>();
-        bridge_object_ids.insert(SUI_BRIDGE_OBJECT_ID);
-        Self {
-            bridge_object_ids,
-            pg_pool,
-            metrics,
-        }
-    }
-
-    // Return true if the transaction relates to the bridge and is of interest.
-    fn is_bridge_transaction(&self, tx: &CheckpointTransaction) -> bool {
-        // TODO: right now this returns true for programmable transactions that
-        //       have the bridge object as input. We can extend later to cover other cases
-        let txn_data = tx.transaction.transaction_data();
-        if let TransactionKind::ProgrammableTransaction(_) = txn_data.kind() {
-            return tx
-                .input_objects
-                .iter()
-                .any(|obj| self.bridge_object_ids.contains(&obj.id()));
-        };
-        false
-    }
-
-    // Process a transaction that has been identified as a bridge transaction.
-    fn process_transaction(
-        &self,
-        tx: &CheckpointTransaction,
-        checkpoint: u64,
-        timestamp_ms: u64,
-    ) -> Result<Vec<ProcessedTxnData>> {
-        self.metrics.total_sui_bridge_transactions.inc();
-        match &tx.events {
-            Some(events) => {
-                let token_transfers = events.data.iter().try_fold(vec![], |mut result, ev| {
-                    if let Some(data) =
-                        Self::process_sui_event(ev, tx, checkpoint, timestamp_ms, &self.metrics)?
-                    {
-                        result.push(data);
-                    }
-                    Ok::<_, anyhow::Error>(result)
-                })?;
-
-                if !token_transfers.is_empty() {
-                    info!(
-                        "SUI: Extracted {} bridge token transfer data entries for tx {}.",
-                        token_transfers.len(),
-                        tx.transaction.digest()
-                    );
-                }
-                Ok(token_transfers)
-            }
-            None => {
-                if let ExecutionStatus::Failure { error, command } = tx.effects.status() {
-                    Ok(vec![ProcessedTxnData::Error(SuiTxnError {
-                        tx_digest: *tx.transaction.digest(),
-                        sender: tx.transaction.sender_address(),
-                        timestamp_ms,
-                        failure_status: error.to_string(),
-                        cmd_idx: command.map(|idx| idx as u64),
-                    })])
-                } else {
-                    Ok(vec![])
-                }
-            }
-        }
-    }
-
-    fn process_sui_event(
-        ev: &Event,
-        tx: &CheckpointTransaction,
-        checkpoint: u64,
-        timestamp_ms: u64,
-        metrics: &BridgeIndexerMetrics,
-    ) -> Result<Option<ProcessedTxnData>> {
-        Ok(if ev.type_.address == BRIDGE_ADDRESS {
-            match ev.type_.name.as_str() {
-                "TokenDepositedEvent" => {
-                    info!("Observed Sui Deposit {:?}", ev);
-                    metrics.total_sui_token_deposited.inc();
-                    let move_event: MoveTokenDepositedEvent = bcs::from_bytes(&ev.contents)?;
-                    Some(ProcessedTxnData::TokenTransfer(TokenTransfer {
-                        chain_id: move_event.source_chain,
-                        nonce: move_event.seq_num,
-                        block_height: checkpoint,
-                        timestamp_ms,
-                        txn_hash: tx.transaction.digest().inner().to_vec(),
-                        txn_sender: ev.sender.to_vec(),
-                        status: TokenTransferStatus::Deposited,
-                        gas_usage: tx.effects.gas_cost_summary().net_gas_usage(),
-                        data_source: BridgeDataSource::Sui,
-                        data: Some(TokenTransferData {
-                            destination_chain: move_event.target_chain,
-                            sender_address: move_event.sender_address.clone(),
-                            recipient_address: move_event.target_address.clone(),
-                            token_id: move_event.token_type,
-                            amount: move_event.amount_sui_adjusted,
-                        }),
-                    }))
-                }
-                "TokenTransferApproved" => {
-                    info!("Observed Sui Approval {:?}", ev);
-                    metrics.total_sui_token_transfer_approved.inc();
-                    let event: MoveTokenTransferApproved = bcs::from_bytes(&ev.contents)?;
-                    Some(ProcessedTxnData::TokenTransfer(TokenTransfer {
-                        chain_id: event.message_key.source_chain,
-                        nonce: event.message_key.bridge_seq_num,
-                        block_height: checkpoint,
-                        timestamp_ms,
-                        txn_hash: tx.transaction.digest().inner().to_vec(),
-                        txn_sender: ev.sender.to_vec(),
-                        status: TokenTransferStatus::Approved,
-                        gas_usage: tx.effects.gas_cost_summary().net_gas_usage(),
-                        data_source: BridgeDataSource::Sui,
-                        data: None,
-                    }))
-                }
-                "TokenTransferClaimed" => {
-                    info!("Observed Sui Claim {:?}", ev);
-                    metrics.total_sui_token_transfer_claimed.inc();
-                    let event: MoveTokenTransferClaimed = bcs::from_bytes(&ev.contents)?;
-                    Some(ProcessedTxnData::TokenTransfer(TokenTransfer {
-                        chain_id: event.message_key.source_chain,
-                        nonce: event.message_key.bridge_seq_num,
-                        block_height: checkpoint,
-                        timestamp_ms,
-                        txn_hash: tx.transaction.digest().inner().to_vec(),
-                        txn_sender: ev.sender.to_vec(),
-                        status: TokenTransferStatus::Claimed,
-                        gas_usage: tx.effects.gas_cost_summary().net_gas_usage(),
-                        data_source: BridgeDataSource::Sui,
-                        data: None,
-                    }))
-                }
-                _ => {
-                    metrics.total_sui_bridge_txn_other.inc();
-                    None
-                }
-            }
-        } else {
-            None
-        })
-    }
-}
-
-#[async_trait]
-impl Worker for SuiBridgeWorker {
-    async fn process_checkpoint(&self, checkpoint: CheckpointData) -> Result<()> {
-        info!(
-            "Processing checkpoint [{}] {}: {}",
-            checkpoint.checkpoint_summary.epoch,
-            checkpoint.checkpoint_summary.sequence_number,
-            checkpoint.transactions.len(),
-        );
-        let checkpoint_num = checkpoint.checkpoint_summary.sequence_number;
-        let timestamp_ms = checkpoint.checkpoint_summary.timestamp_ms;
-
-        let bridge_data = checkpoint
-            .transactions
-            .iter()
-            .filter(|txn| self.is_bridge_transaction(txn))
-            .try_fold(vec![], |mut result, txn| {
-                result.append(&mut self.process_transaction(txn, checkpoint_num, timestamp_ms)?);
-                Ok::<_, anyhow::Error>(result)
-            })?;
-
-        write(&self.pg_pool, bridge_data).tap_ok(|_| {
-            info!("Processed checkpoint [{}] successfully", checkpoint_num,);
-            self.metrics
-                .last_committed_sui_checkpoint
-                .set(checkpoint_num as i64);
-        })
-    }
-}
diff --git a/crates/sui-bridge/Cargo.toml b/crates/sui-bridge/Cargo.toml
index bab3b760dabb9..f17d75df676a9 100644
--- a/crates/sui-bridge/Cargo.toml
+++ b/crates/sui-bridge/Cargo.toml
@@ -20,8 +20,6 @@ once_cell.workspace = true
 telemetry-subscribers.workspace = true
 prometheus.workspace = true
 async-trait.workspace = true
-typed-store-derive.workspace = true
-rocksdb.workspace = true
 typed-store.workspace = true
 mysten-metrics.workspace = true
 sui-sdk.workspace = true
diff --git a/crates/sui-bridge/abi/erc20.json b/crates/sui-bridge/abi/erc20.json
new file mode 100644
index 0000000000000..5829d4b2816e5
--- /dev/null
+++ b/crates/sui-bridge/abi/erc20.json
@@ -0,0 +1,358 @@
+[
+    {
+      "inputs": [],
+      "stateMutability": "nonpayable",
+      "type": "constructor"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "spender",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "allowance",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "needed",
+          "type": "uint256"
+        }
+      ],
+      "name": "ERC20InsufficientAllowance",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "sender",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "balance",
+          "type": "uint256"
+        },
+        {
+          "internalType": "uint256",
+          "name": "needed",
+          "type": "uint256"
+        }
+      ],
+      "name": "ERC20InsufficientBalance",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "approver",
+          "type": "address"
+        }
+      ],
+      "name": "ERC20InvalidApprover",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "receiver",
+          "type": "address"
+        }
+      ],
+      "name": "ERC20InvalidReceiver",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "sender",
+          "type": "address"
+        }
+      ],
+      "name": "ERC20InvalidSender",
+      "type": "error"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "spender",
+          "type": "address"
+        }
+      ],
+      "name": "ERC20InvalidSpender",
+      "type": "error"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "owner",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "spender",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "Approval",
+      "type": "event"
+    },
+    {
+      "anonymous": false,
+      "inputs": [
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "from",
+          "type": "address"
+        },
+        {
+          "indexed": true,
+          "internalType": "address",
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "indexed": false,
+          "internalType": "uint256",
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "Transfer",
+      "type": "event"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "owner",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "spender",
+          "type": "address"
+        }
+      ],
+      "name": "allowance",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "spender",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "approve",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "account",
+          "type": "address"
+        }
+      ],
+      "name": "balanceOf",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "form",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        }
+      ],
+      "name": "burn",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "decimals",
+      "outputs": [
+        {
+          "internalType": "uint8",
+          "name": "",
+          "type": "uint8"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "amount",
+          "type": "uint256"
+        }
+      ],
+      "name": "mint",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "name",
+      "outputs": [
+        {
+          "internalType": "string",
+          "name": "",
+          "type": "string"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "symbol",
+      "outputs": [
+        {
+          "internalType": "string",
+          "name": "",
+          "type": "string"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "testSkip",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "totalSupply",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "transfer",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "from",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "to",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "value",
+          "type": "uint256"
+        }
+      ],
+      "name": "transferFrom",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    }
+]
diff --git a/crates/sui-bridge/src/abi.rs b/crates/sui-bridge/src/abi.rs
index e60d119877936..d1b844402be70 100644
--- a/crates/sui-bridge/src/abi.rs
+++ b/crates/sui-bridge/src/abi.rs
@@ -88,6 +88,12 @@ gen_eth_events!(
 
 gen_eth_events!(EthBridgeVault, "abi/bridge_vault.json");
 
+abigen!(
+    EthERC20,
+    "abi/erc20.json",
+    event_derives(serde::Deserialize, serde::Serialize)
+);
+
 impl EthBridgeEvent {
     pub fn try_into_bridge_action(
         self,
diff --git a/crates/sui-bridge/src/action_executor.rs b/crates/sui-bridge/src/action_executor.rs
index ea53a7e02ad8f..113838ab32df7 100644
--- a/crates/sui-bridge/src/action_executor.rs
+++ b/crates/sui-bridge/src/action_executor.rs
@@ -5,6 +5,7 @@
 //! collects bridge authority signatures and submit signatures on chain.
 
 use crate::retry_with_max_elapsed_time;
+use crate::types::IsBridgePaused;
 use arc_swap::ArcSwap;
 use mysten_metrics::spawn_logged_monitored_task;
 use shared_crypto::intent::{Intent, IntentMessage};
@@ -77,7 +78,8 @@ pub struct BridgeActionExecutor<C> {
     gas_object_id: ObjectID,
     store: Arc<BridgeOrchestratorTables>,
     bridge_object_arg: ObjectArg,
-    token_config_rx: tokio::sync::watch::Receiver<HashMap<u8, TypeTag>>,
+    sui_token_type_tags: Arc<ArcSwap<HashMap<u8, TypeTag>>>,
+    bridge_pause_rx: tokio::sync::watch::Receiver<IsBridgePaused>,
     metrics: Arc<BridgeMetrics>,
 }
 
@@ -107,7 +109,8 @@ where
         key: SuiKeyPair,
         sui_address: SuiAddress,
         gas_object_id: ObjectID,
-        token_config_rx: tokio::sync::watch::Receiver<HashMap<u8, TypeTag>>,
+        sui_token_type_tags: Arc<ArcSwap<HashMap<u8, TypeTag>>>,
+        bridge_pause_rx: tokio::sync::watch::Receiver<IsBridgePaused>,
         metrics: Arc<BridgeMetrics>,
     ) -> Self {
         let bridge_object_arg = sui_client
@@ -121,7 +124,8 @@ where
             gas_object_id,
             sui_address,
             bridge_object_arg,
-            token_config_rx,
+            sui_token_type_tags,
+            bridge_pause_rx,
             metrics,
         }
     }
@@ -180,7 +184,8 @@ where
                 execution_tx_clone,
                 execution_rx,
                 self.bridge_object_arg,
-                self.token_config_rx,
+                self.sui_token_type_tags,
+                self.bridge_pause_rx,
                 metrics,
             )
         ));
@@ -402,49 +407,37 @@ where
             CertifiedBridgeActionExecutionWrapper,
         >,
         bridge_object_arg: ObjectArg,
-        mut token_config_rx: tokio::sync::watch::Receiver<HashMap<u8, TypeTag>>,
+        sui_token_type_tags: Arc<ArcSwap<HashMap<u8, TypeTag>>>,
+        bridge_pause_rx: tokio::sync::watch::Receiver<IsBridgePaused>,
         metrics: Arc<BridgeMetrics>,
     ) {
         info!("Starting run_onchain_execution_loop");
-        let sui_token_type_tags =
-            ArcSwap::new(Arc::new(token_config_rx.borrow_and_update().clone()));
-
-        loop {
-            tokio::select! {
-                result = token_config_rx.changed() => {
-                    match result {
-                        Ok(()) => {
-                            sui_token_type_tags.store(Arc::new(token_config_rx.borrow_and_update().clone()));
-                        }
-                        Err(_) => {
-                            panic!("Token config watch channel closed unexpectedly");
-                        }
-                    }
-                },
-                certificate_wrapper = execution_queue_receiver.recv() => {
-                    match certificate_wrapper {
-                        Some(certificate_wrapper) => {
-                            Self::handle_execution_task(
-                                certificate_wrapper,
-                                &sui_client,
-                                &sui_key,
-                                &sui_address,
-                                gas_object_id,
-                                &store,
-                                &execution_queue_sender,
-                                &bridge_object_arg,
-                                &sui_token_type_tags,
-                                &metrics,
-                            )
-                            .await;
-                        },
-                        None => {
-                            panic!("Execution queue closed unexpectedly");
-                        }
-                    }
-                }
+        while let Some(certificate_wrapper) = execution_queue_receiver.recv().await {
+            // When bridge is paused, skip execution.
+            // Skipped actions will be picked up upon node restarting
+            // if bridge is unpaused.
+            if *bridge_pause_rx.borrow() {
+                warn!("Bridge is paused, skipping execution");
+                metrics
+                    .action_executor_execution_queue_skipped_actions_due_to_pausing
+                    .inc();
+                continue;
             }
+            Self::handle_execution_task(
+                certificate_wrapper,
+                &sui_client,
+                &sui_key,
+                &sui_address,
+                gas_object_id,
+                &store,
+                &execution_queue_sender,
+                &bridge_object_arg,
+                &sui_token_type_tags,
+                &metrics,
+            )
+            .await;
         }
+        panic!("Execution queue closed unexpectedly");
     }
 
     #[instrument(level = "error", skip_all, fields(action_key=?certificate_wrapper.0.data().key(), attempt_times=?certificate_wrapper.1))]
@@ -656,9 +649,11 @@ pub async fn submit_to_executor(
 mod tests {
     use crate::events::init_all_struct_tags;
     use crate::test_utils::DUMMY_MUTALBE_BRIDGE_OBJECT_ARG;
+    use crate::types::BRIDGE_PAUSED;
     use fastcrypto::traits::KeyPair;
     use prometheus::Registry;
     use std::collections::{BTreeMap, HashMap};
+    use std::str::FromStr;
     use sui_json_rpc_types::SuiTransactionBlockEffects;
     use sui_json_rpc_types::SuiTransactionBlockEvents;
     use sui_json_rpc_types::{SuiEvent, SuiTransactionBlockResponse};
@@ -675,8 +670,8 @@ mod tests {
         server::mock_handler::BridgeRequestMockHandler,
         sui_mock_client::SuiMockClient,
         test_utils::{
-            get_test_authorities_and_run_mock_bridge_server, get_test_sui_to_eth_bridge_action,
-            sign_action_with_key,
+            get_test_authorities_and_run_mock_bridge_server, get_test_eth_to_sui_bridge_action,
+            get_test_sui_to_eth_bridge_action, sign_action_with_key,
         },
         types::{BridgeCommittee, BridgeCommitteeValiditySignInfo, CertifiedBridgeAction},
     };
@@ -700,14 +695,17 @@ mod tests {
             _handles,
             gas_object_ref,
             sui_address,
-            token_tx,
+            sui_token_type_tags,
+            _bridge_pause_tx,
         ) = setup().await;
         let (action_certificate, _, _) = get_bridge_authority_approved_action(
             vec![&mock0, &mock1, &mock2, &mock3],
             vec![&secrets[0], &secrets[1], &secrets[2], &secrets[3]],
+            None,
+            true,
         );
         let action = action_certificate.data().clone();
-        let id_token_map = token_tx.borrow();
+        let id_token_map = (*sui_token_type_tags.load().clone()).clone();
         let tx_data = build_sui_transaction(
             sui_address,
             &gas_object_ref,
@@ -761,6 +759,8 @@ mod tests {
         let (action_certificate, _, _) = get_bridge_authority_approved_action(
             vec![&mock0, &mock1, &mock2, &mock3],
             vec![&secrets[0], &secrets[1], &secrets[2], &secrets[3]],
+            None,
+            true,
         );
 
         let action = action_certificate.data().clone();
@@ -813,6 +813,8 @@ mod tests {
         let (action_certificate, _, _) = get_bridge_authority_approved_action(
             vec![&mock0, &mock1, &mock2, &mock3],
             vec![&secrets[0], &secrets[1], &secrets[2], &secrets[3]],
+            None,
+            true,
         );
 
         let action = action_certificate.data().clone();
@@ -891,13 +893,16 @@ mod tests {
             _handles,
             gas_object_ref,
             sui_address,
-            token_tx,
+            sui_token_type_tags,
+            _bridge_pause_tx,
         ) = setup().await;
-        let id_token_map = token_tx.borrow();
+        let id_token_map = (*sui_token_type_tags.load().clone()).clone();
         let (action_certificate, sui_tx_digest, sui_tx_event_index) =
             get_bridge_authority_approved_action(
                 vec![&mock0, &mock1, &mock2, &mock3],
                 vec![&secrets[0], &secrets[1], &secrets[2], &secrets[3]],
+                None,
+                true,
             );
         let action = action_certificate.data().clone();
         mock_bridge_authority_signing_errors(
@@ -1011,7 +1016,8 @@ mod tests {
             _handles,
             _gas_object_ref,
             _sui_address,
-            _token_tx,
+            _sui_token_type_tags,
+            _bridge_pause_tx,
         ) = setup().await;
 
         let sui_tx_digest = TransactionDigest::random();
@@ -1078,12 +1084,15 @@ mod tests {
             _handles,
             gas_object_ref,
             sui_address,
-            token_tx,
+            sui_token_type_tags,
+            _bridge_pause_tx,
         ) = setup().await;
-        let id_token_map = token_tx.borrow();
+        let id_token_map = (*sui_token_type_tags.load().clone()).clone();
         let (action_certificate, _, _) = get_bridge_authority_approved_action(
             vec![&mock0, &mock1, &mock2, &mock3],
             vec![&secrets[0], &secrets[1], &secrets[2], &secrets[3]],
+            None,
+            true,
         );
 
         let action = action_certificate.data().clone();
@@ -1143,6 +1152,198 @@ mod tests {
         }
     }
 
+    #[tokio::test]
+    async fn test_skip_tx_submission_if_bridge_is_paused() {
+        let (
+            _signing_tx,
+            execution_tx,
+            sui_client_mock,
+            mut tx_subscription,
+            store,
+            secrets,
+            dummy_sui_key,
+            mock0,
+            mock1,
+            mock2,
+            mock3,
+            _handles,
+            gas_object_ref,
+            sui_address,
+            sui_token_type_tags,
+            bridge_pause_tx,
+        ) = setup().await;
+        let id_token_map: HashMap<u8, TypeTag> = (*sui_token_type_tags.load().clone()).clone();
+        let (action_certificate, _, _) = get_bridge_authority_approved_action(
+            vec![&mock0, &mock1, &mock2, &mock3],
+            vec![&secrets[0], &secrets[1], &secrets[2], &secrets[3]],
+            None,
+            true,
+        );
+
+        let action = action_certificate.data().clone();
+        let arg = DUMMY_MUTALBE_BRIDGE_OBJECT_ARG;
+        let tx_data = build_sui_transaction(
+            sui_address,
+            &gas_object_ref,
+            action_certificate.clone(),
+            arg,
+            &id_token_map,
+            1000,
+        )
+        .unwrap();
+        let tx_digest = get_tx_digest(tx_data, &dummy_sui_key);
+        mock_transaction_error(
+            &sui_client_mock,
+            tx_digest,
+            BridgeError::Generic("some random error".to_string()),
+            true,
+        );
+
+        let gas_coin = GasCoin::new_for_testing(1_000_000_000_000); // dummy gas coin
+        sui_client_mock.add_gas_object_info(
+            gas_coin.clone(),
+            gas_object_ref,
+            Owner::AddressOwner(sui_address),
+        );
+        let action_digest = action.digest();
+        sui_client_mock.set_action_onchain_status(&action, BridgeActionStatus::Pending);
+
+        // assert bridge is unpaused now
+        assert!(!*bridge_pause_tx.borrow());
+
+        store.insert_pending_actions(&[action.clone()]).unwrap();
+        assert_eq!(
+            store.get_all_pending_actions()[&action.digest()],
+            action.clone()
+        );
+
+        // Kick it (send to the execution queue, skipping the signing queue)
+        execution_tx
+            .send(CertifiedBridgeActionExecutionWrapper(
+                action_certificate.clone(),
+                0,
+            ))
+            .await
+            .unwrap();
+
+        // Some requests come in
+        tx_subscription.recv().await.unwrap();
+
+        // Pause the bridge
+        bridge_pause_tx.send(BRIDGE_PAUSED).unwrap();
+
+        // Kick it again
+        execution_tx
+            .send(CertifiedBridgeActionExecutionWrapper(action_certificate, 0))
+            .await
+            .unwrap();
+
+        tokio::time::sleep(tokio::time::Duration::from_millis(1000)).await;
+        // Nothing is sent to execute
+        assert_eq!(
+            tx_subscription.try_recv().unwrap_err(),
+            tokio::sync::broadcast::error::TryRecvError::Empty
+        );
+        // Still in WAL
+        assert_eq!(
+            store.get_all_pending_actions()[&action_digest],
+            action.clone()
+        );
+    }
+
+    #[tokio::test]
+    async fn test_action_executor_handle_new_token() {
+        let new_token_id = 255u8; // token id that does not exist
+        let new_type_tag = TypeTag::from_str("0xbeef::beef::BEEF").unwrap();
+        let (
+            _signing_tx,
+            execution_tx,
+            sui_client_mock,
+            mut tx_subscription,
+            _store,
+            secrets,
+            dummy_sui_key,
+            mock0,
+            mock1,
+            mock2,
+            mock3,
+            _handles,
+            gas_object_ref,
+            sui_address,
+            sui_token_type_tags,
+            _bridge_pause_tx,
+        ) = setup().await;
+        let mut id_token_map: HashMap<u8, TypeTag> = (*sui_token_type_tags.load().clone()).clone();
+        let (action_certificate, _, _) = get_bridge_authority_approved_action(
+            vec![&mock0, &mock1, &mock2, &mock3],
+            vec![&secrets[0], &secrets[1], &secrets[2], &secrets[3]],
+            Some(new_token_id),
+            false, // we need an eth -> sui action that entails the new token type tag in transaction building
+        );
+
+        let action = action_certificate.data().clone();
+        let arg = DUMMY_MUTALBE_BRIDGE_OBJECT_ARG;
+        let tx_data = build_sui_transaction(
+            sui_address,
+            &gas_object_ref,
+            action_certificate.clone(),
+            arg,
+            &maplit::hashmap! {
+                new_token_id => new_type_tag.clone()
+            },
+            1000,
+        )
+        .unwrap();
+        let tx_digest = get_tx_digest(tx_data, &dummy_sui_key);
+        mock_transaction_error(
+            &sui_client_mock,
+            tx_digest,
+            BridgeError::Generic("some random error".to_string()),
+            true,
+        );
+
+        let gas_coin = GasCoin::new_for_testing(1_000_000_000_000); // dummy gas coin
+        sui_client_mock.add_gas_object_info(
+            gas_coin.clone(),
+            gas_object_ref,
+            Owner::AddressOwner(sui_address),
+        );
+        sui_client_mock.set_action_onchain_status(&action, BridgeActionStatus::Pending);
+
+        // Kick it (send to the execution queue, skipping the signing queue)
+        execution_tx
+            .send(CertifiedBridgeActionExecutionWrapper(
+                action_certificate.clone(),
+                0,
+            ))
+            .await
+            .unwrap();
+
+        tokio::time::sleep(tokio::time::Duration::from_millis(1000)).await;
+        // Nothing is sent to execute, because the token id does not exist yet
+        assert_eq!(
+            tx_subscription.try_recv().unwrap_err(),
+            tokio::sync::broadcast::error::TryRecvError::Empty
+        );
+
+        // Now insert the new token id
+        id_token_map.insert(new_token_id, new_type_tag);
+        sui_token_type_tags.store(Arc::new(id_token_map));
+
+        // Kick it again
+        execution_tx
+            .send(CertifiedBridgeActionExecutionWrapper(
+                action_certificate.clone(),
+                0,
+            ))
+            .await
+            .unwrap();
+
+        tokio::time::sleep(tokio::time::Duration::from_millis(1000)).await;
+        // The action is sent to execution
+        assert_eq!(tx_subscription.recv().await.unwrap(), tx_digest);
+    }
+
     fn mock_bridge_authority_sigs(
         mocks: Vec<&BridgeRequestMockHandler>,
         action: &BridgeAction,
@@ -1182,18 +1383,24 @@ mod tests {
     fn get_bridge_authority_approved_action(
         mocks: Vec<&BridgeRequestMockHandler>,
         secrets: Vec<&BridgeAuthorityKeyPair>,
+        token_id: Option<u8>,
+        sui_to_eth: bool,
     ) -> (VerifiedCertifiedBridgeAction, TransactionDigest, u16) {
         let sui_tx_digest = TransactionDigest::random();
         let sui_tx_event_index = 1;
-        let action = get_test_sui_to_eth_bridge_action(
-            Some(sui_tx_digest),
-            Some(sui_tx_event_index),
-            None,
-            None,
-            None,
-            None,
-            None,
-        );
+        let action = if sui_to_eth {
+            get_test_sui_to_eth_bridge_action(
+                Some(sui_tx_digest),
+                Some(sui_tx_event_index),
+                None,
+                None,
+                None,
+                None,
+                token_id,
+            )
+        } else {
+            get_test_eth_to_sui_bridge_action(None, None, None, token_id)
+        };
 
         let sigs =
             mock_bridge_authority_sigs(mocks, &action, secrets, sui_tx_digest, sui_tx_event_index);
@@ -1269,7 +1476,8 @@ mod tests {
         Vec<tokio::task::JoinHandle<()>>,
         ObjectRef,
         SuiAddress,
-        tokio::sync::watch::Sender<HashMap<u8, TypeTag>>,
+        Arc<ArcSwap<HashMap<u8, TypeTag>>>,
+        tokio::sync::watch::Sender<IsBridgePaused>,
     ) {
         telemetry_subscribers::init_for_testing();
         let registry = Registry::new();
@@ -1307,8 +1515,8 @@ mod tests {
         ))));
         let metrics = Arc::new(BridgeMetrics::new(&registry));
         let sui_token_type_tags = sui_client.get_token_id_map().await.unwrap();
-        let (token_type_tags_tx, token_type_tags_rx) =
-            tokio::sync::watch::channel(sui_token_type_tags);
+        let sui_token_type_tags = Arc::new(ArcSwap::new(Arc::new(sui_token_type_tags)));
+        let (bridge_pause_tx, bridge_pause_rx) = tokio::sync::watch::channel(false);
         let executor = BridgeActionExecutor::new(
             sui_client.clone(),
             agg.clone(),
@@ -1316,7 +1524,8 @@ mod tests {
             sui_key,
             sui_address,
             gas_object_ref.0,
-            token_type_tags_rx,
+            sui_token_type_tags.clone(),
+            bridge_pause_rx,
             metrics,
         )
         .await;
@@ -1339,7 +1548,8 @@ mod tests {
             handles,
             gas_object_ref,
             sui_address,
-            token_type_tags_tx,
+            sui_token_type_tags,
+            bridge_pause_tx,
         )
     }
 }
diff --git a/crates/sui-bridge/src/client/bridge_authority_aggregator.rs b/crates/sui-bridge/src/client/bridge_authority_aggregator.rs
index e4e7947622198..882e689f341f2 100644
--- a/crates/sui-bridge/src/client/bridge_authority_aggregator.rs
+++ b/crates/sui-bridge/src/client/bridge_authority_aggregator.rs
@@ -31,7 +31,7 @@ pub struct BridgeAuthorityAggregator {
 
 impl BridgeAuthorityAggregator {
     pub fn new(committee: Arc<BridgeCommittee>) -> Self {
-        let clients = committee
+        let clients: BTreeMap<BridgeAuthorityPublicKeyBytes, Arc<BridgeClient>> = committee
             .members()
             .iter()
             .filter_map(|(name, authority)| {
diff --git a/crates/sui-bridge/src/config.rs b/crates/sui-bridge/src/config.rs
index 57d738bf56ddf..f2f982d3503ef 100644
--- a/crates/sui-bridge/src/config.rs
+++ b/crates/sui-bridge/src/config.rs
@@ -5,6 +5,8 @@ use crate::abi::EthBridgeConfig;
 use crate::crypto::BridgeAuthorityKeyPair;
 use crate::error::BridgeError;
 use crate::eth_client::EthClient;
+use crate::metered_eth_provider::new_metered_eth_provider;
+use crate::metered_eth_provider::MeteredEthHttpProvier;
 use crate::metrics::BridgeMetrics;
 use crate::sui_client::SuiClient;
 use crate::types::{is_route_valid, BridgeAction};
@@ -221,10 +223,10 @@ impl BridgeNodeConfig {
     async fn prepare_for_eth(
         &self,
         metrics: Arc<BridgeMetrics>,
-    ) -> anyhow::Result<(Arc<EthClient<ethers::providers::Http>>, Vec<EthAddress>)> {
+    ) -> anyhow::Result<(Arc<EthClient<MeteredEthHttpProvier>>, Vec<EthAddress>)> {
         let bridge_proxy_address = EthAddress::from_str(&self.eth.eth_bridge_proxy_address)?;
         let provider = Arc::new(
-            ethers::prelude::Provider::<ethers::providers::Http>::try_from(&self.eth.eth_rpc_url)
+            new_metered_eth_provider(&self.eth.eth_rpc_url, metrics.clone())
                 .unwrap()
                 .interval(std::time::Duration::from_millis(2000)),
         );
@@ -268,7 +270,7 @@ impl BridgeNodeConfig {
         );
 
         let eth_client = Arc::new(
-            EthClient::<ethers::providers::Http>::new(
+            EthClient::<MeteredEthHttpProvier>::new(
                 &self.eth.eth_rpc_url,
                 HashSet::from_iter(vec![
                     bridge_proxy_address,
@@ -366,7 +368,7 @@ pub struct BridgeServerConfig {
     pub server_listen_port: u16,
     pub metrics_port: u16,
     pub sui_client: Arc<SuiClient<SuiSdkClient>>,
-    pub eth_client: Arc<EthClient<ethers::providers::Http>>,
+    pub eth_client: Arc<EthClient<MeteredEthHttpProvier>>,
     /// A list of approved governance actions. Action in this list will be signed when requested by client.
     pub approved_governance_actions: Vec<BridgeAction>,
 }
@@ -378,7 +380,7 @@ pub struct BridgeClientConfig {
     pub gas_object_ref: ObjectRef,
     pub metrics_port: u16,
     pub sui_client: Arc<SuiClient<SuiSdkClient>>,
-    pub eth_client: Arc<EthClient<ethers::providers::Http>>,
+    pub eth_client: Arc<EthClient<MeteredEthHttpProvier>>,
     pub db_path: PathBuf,
     pub eth_contracts: Vec<EthAddress>,
     // See `BridgeNodeConfig` for the explanation of following two fields.
diff --git a/crates/sui-bridge/src/e2e_tests/basic.rs b/crates/sui-bridge/src/e2e_tests/basic.rs
index b56e322cd585e..fd730708ae559 100644
--- a/crates/sui-bridge/src/e2e_tests/basic.rs
+++ b/crates/sui-bridge/src/e2e_tests/basic.rs
@@ -1,16 +1,19 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::abi::{eth_sui_bridge, EthBridgeEvent, EthSuiBridge};
+use crate::abi::{eth_sui_bridge, EthBridgeEvent, EthERC20, EthSuiBridge};
 use crate::client::bridge_authority_aggregator::BridgeAuthorityAggregator;
 use crate::e2e_tests::test_utils::BridgeTestCluster;
-use crate::e2e_tests::test_utils::{get_signatures, BridgeTestClusterBuilder};
+use crate::e2e_tests::test_utils::{
+    get_signatures, send_eth_tx_and_get_tx_receipt, BridgeTestClusterBuilder,
+};
+use crate::eth_transaction_builder::build_eth_transaction;
 use crate::events::{
     SuiBridgeEvent, SuiToEthTokenBridgeV1, TokenTransferApproved, TokenTransferClaimed,
 };
 use crate::sui_client::SuiBridgeClient;
 use crate::sui_transaction_builder::build_add_tokens_on_sui_transaction;
-use crate::types::{BridgeAction, BridgeActionStatus, SuiToEthBridgeAction};
+use crate::types::{AddTokensOnEvmAction, BridgeAction, BridgeActionStatus, SuiToEthBridgeAction};
 use crate::utils::publish_and_register_coins_return_add_coins_on_sui_action;
 use crate::utils::EthSigner;
 use eth_sui_bridge::EthSuiBridgeEvents;
@@ -58,7 +61,7 @@ async fn test_bridge_from_eth_to_sui_to_eth() {
     let amount = 42;
     let sui_amount = amount * 100_000_000;
 
-    initiate_bridge_eth_to_sui(&bridge_test_cluster, amount, sui_amount, TOKEN_ID_ETH, 0)
+    initiate_bridge_eth_to_sui(&bridge_test_cluster, amount, 0)
         .await
         .unwrap();
     let events = bridge_test_cluster
@@ -85,6 +88,7 @@ async fn test_bridge_from_eth_to_sui_to_eth() {
         .expect("Recipient should have received ETH coin now")
         .clone();
     assert_eq!(eth_coin.balance, sui_amount);
+    info!("Eth to sui bridge transfer finished");
 
     // Now let the recipient send the coin back to ETH
     let eth_address_1 = EthAddress::random();
@@ -140,8 +144,9 @@ async fn test_bridge_from_eth_to_sui_to_eth() {
         bridge_test_cluster.contracts().sui_bridge,
         eth_signer.clone().into(),
     );
-    let tx = eth_sui_bridge.transfer_bridged_tokens_with_signatures(signatures, message);
-    let _eth_claim_tx_receipt = tx.send().await.unwrap().await.unwrap().unwrap();
+    let call = eth_sui_bridge.transfer_bridged_tokens_with_signatures(signatures, message);
+    let eth_claim_tx_receipt = send_eth_tx_and_get_tx_receipt(call).await;
+    assert_eq!(eth_claim_tx_receipt.status.unwrap().as_u64(), 1);
     info!("Sui to Eth bridge transfer claimed");
     // Assert eth_address_1 has received ETH
     assert_eq!(
@@ -150,23 +155,27 @@ async fn test_bridge_from_eth_to_sui_to_eth() {
     );
 }
 
+// Test add new coins on both Sui and Eth
+// Also test bridge ndoe handling `NewTokenEvent``
 #[tokio::test(flavor = "multi_thread", worker_threads = 8)]
-async fn test_add_new_coins_on_sui() {
+async fn test_add_new_coins_on_sui_and_eth() {
     telemetry_subscribers::init_for_testing();
     let mut bridge_test_cluster = BridgeTestClusterBuilder::new()
         .with_eth_env(true)
         .with_bridge_cluster(false)
+        .with_num_validators(3)
         .build()
         .await;
 
     let bridge_arg = bridge_test_cluster.get_mut_bridge_arg().await.unwrap();
 
-    // Register tokens
-    let token_id = 42;
+    // Register tokens on Sui
+    let token_id = 5;
+    let token_sui_decimal = 9; // this needs to match ka.move
     let token_price = 10000;
     let sender = bridge_test_cluster.sui_user_address();
     info!("Published new token");
-    let action = publish_and_register_coins_return_add_coins_on_sui_action(
+    let sui_action = publish_and_register_coins_return_add_coins_on_sui_action(
         bridge_test_cluster.wallet(),
         bridge_arg,
         vec![Path::new("../../bridge/move/tokens/mock/ka").into()],
@@ -175,14 +184,23 @@ async fn test_add_new_coins_on_sui() {
         1, // seq num
     )
     .await;
+    let new_token_erc_address = bridge_test_cluster.contracts().ka;
+    let eth_action = BridgeAction::AddTokensOnEvmAction(AddTokensOnEvmAction {
+        nonce: 0,
+        chain_id: BridgeChainId::EthCustom,
+        native: true,
+        token_ids: vec![token_id],
+        token_addresses: vec![new_token_erc_address],
+        token_sui_decimals: vec![token_sui_decimal],
+        token_prices: vec![token_price],
+    });
 
     info!("Starting bridge cluster");
 
     bridge_test_cluster.set_approved_governance_actions_for_next_start(vec![
-        vec![action.clone()],
-        vec![action.clone()],
-        vec![action.clone()],
-        vec![],
+        vec![sui_action.clone(), eth_action.clone()],
+        vec![sui_action.clone()],
+        vec![eth_action.clone()],
     ]);
     bridge_test_cluster.start_bridge_cluster().await;
     bridge_test_cluster
@@ -198,10 +216,14 @@ async fn test_add_new_coins_on_sui() {
             .expect("Failed to get bridge committee"),
     );
     let agg = BridgeAuthorityAggregator::new(bridge_committee);
-    let certified_action = agg
-        .request_committee_signatures(action)
+    let certified_sui_action = agg
+        .request_committee_signatures(sui_action)
+        .await
+        .expect("Failed to request committee signatures for AddTokensOnSuiAction");
+    let certified_eth_action = agg
+        .request_committee_signatures(eth_action.clone())
         .await
-        .expect("Failed to request committee signatures");
+        .expect("Failed to request committee signatures for AddTokensOnEvmAction");
 
     let tx = build_add_tokens_on_sui_transaction(
         sender,
@@ -211,18 +233,26 @@ async fn test_add_new_coins_on_sui() {
             .await
             .unwrap()
             .unwrap(),
-        certified_action,
+        certified_sui_action,
         bridge_arg,
         1000,
     )
     .unwrap();
 
     let response = bridge_test_cluster.sign_and_execute_transaction(&tx).await;
-    assert_eq!(
-        response.effects.unwrap().status(),
-        &SuiExecutionStatus::Success
-    );
-    info!("Approved new token");
+    let effects = response.effects.unwrap();
+    assert_eq!(effects.status(), &SuiExecutionStatus::Success);
+    assert!(response.events.unwrap().data.iter().any(|e| {
+        let sui_bridge_event = SuiBridgeEvent::try_from_sui_event(e).unwrap().unwrap();
+        match sui_bridge_event {
+            SuiBridgeEvent::NewTokenEvent(e) => {
+                assert_eq!(e.token_id, token_id);
+                true
+            }
+            _ => false,
+        }
+    }));
+    info!("Approved new token on Sui");
 
     // Assert new token is correctly added
     let treasury_summary = bridge_test_cluster
@@ -250,6 +280,34 @@ async fn test_add_new_coins_on_sui() {
             native_token: false,
         }
     );
+
+    // Add new token on EVM
+    let config_address = bridge_test_cluster.contracts().bridge_config;
+    let eth_signer = bridge_test_cluster.get_eth_signer().await;
+    let eth_call = build_eth_transaction(config_address, eth_signer, certified_eth_action)
+        .await
+        .unwrap();
+    let eth_receipt = send_eth_tx_and_get_tx_receipt(eth_call).await;
+    assert_eq!(eth_receipt.status.unwrap().as_u64(), 1);
+
+    // Verify new tokens are added on EVM
+    let (address, dp, price) = bridge_test_cluster
+        .eth_env()
+        .get_supported_token(token_id)
+        .await;
+    assert_eq!(address, new_token_erc_address);
+    assert_eq!(dp, 9);
+    assert_eq!(price, token_price);
+
+    initiate_bridge_erc20_to_sui(
+        &bridge_test_cluster,
+        100,
+        new_token_erc_address,
+        token_id,
+        0,
+    )
+    .await
+    .unwrap();
 }
 
 pub(crate) async fn deposit_native_eth_to_sol_contract(
@@ -312,14 +370,100 @@ async fn deposit_eth_to_sui_package(
     wallet_context.execute_transaction_may_fail(tx).await
 }
 
+pub async fn initiate_bridge_erc20_to_sui(
+    bridge_test_cluster: &BridgeTestCluster,
+    amount_u64: u64,
+    token_address: EthAddress,
+    token_id: u8,
+    nonce: u64,
+) -> Result<(), anyhow::Error> {
+    let (eth_signer, eth_address) = bridge_test_cluster
+        .get_eth_signer_and_address()
+        .await
+        .unwrap();
+
+    // First, mint ERC20 tokens to the signer
+    let contract = EthERC20::new(token_address, eth_signer.clone().into());
+    let decimal = contract.decimals().await? as usize;
+    let amount = U256::from(amount_u64) * U256::exp10(decimal);
+    let sui_amount = amount.as_u64();
+    let mint_call = contract.mint(eth_address, amount);
+    let mint_tx_receipt = send_eth_tx_and_get_tx_receipt(mint_call).await;
+    assert_eq!(mint_tx_receipt.status.unwrap().as_u64(), 1);
+
+    // Second, set allowance
+    let allowance_call = contract.approve(bridge_test_cluster.contracts().sui_bridge, amount);
+    let allowance_tx_receipt = send_eth_tx_and_get_tx_receipt(allowance_call).await;
+    assert_eq!(allowance_tx_receipt.status.unwrap().as_u64(), 1);
+
+    // Third, deposit to bridge
+    let sui_recipient_address = bridge_test_cluster.sui_user_address();
+    let sui_chain_id = bridge_test_cluster.sui_chain_id();
+    let eth_chain_id = bridge_test_cluster.eth_chain_id();
+
+    info!(
+        "Depositing ERC20 (token id:{}, token_address: {}) to Solidity contract",
+        token_id, token_address
+    );
+    let contract = EthSuiBridge::new(
+        bridge_test_cluster.contracts().sui_bridge,
+        eth_signer.clone().into(),
+    );
+    let deposit_call = contract.bridge_erc20(
+        token_id,
+        amount,
+        sui_recipient_address.to_vec().into(),
+        sui_chain_id as u8,
+    );
+    let tx_receipt = send_eth_tx_and_get_tx_receipt(deposit_call).await;
+    let eth_bridge_event = tx_receipt
+        .logs
+        .iter()
+        .find_map(EthBridgeEvent::try_from_log)
+        .unwrap();
+    let EthBridgeEvent::EthSuiBridgeEvents(EthSuiBridgeEvents::TokensDepositedFilter(
+        eth_bridge_event,
+    )) = eth_bridge_event
+    else {
+        unreachable!();
+    };
+    // assert eth log matches
+    assert_eq!(eth_bridge_event.source_chain_id, eth_chain_id as u8);
+    assert_eq!(eth_bridge_event.nonce, nonce);
+    assert_eq!(eth_bridge_event.destination_chain_id, sui_chain_id as u8);
+    assert_eq!(eth_bridge_event.token_id, token_id);
+    assert_eq!(eth_bridge_event.sui_adjusted_amount, sui_amount);
+    assert_eq!(eth_bridge_event.sender_address, eth_address);
+    assert_eq!(
+        eth_bridge_event.recipient_address,
+        sui_recipient_address.to_vec()
+    );
+    info!(
+        "Deposited ERC20 (token id:{}, token_address: {}) to Solidity contract",
+        token_id, token_address
+    );
+
+    wait_for_transfer_action_status(
+        bridge_test_cluster.bridge_client(),
+        eth_chain_id,
+        nonce,
+        BridgeActionStatus::Claimed,
+    )
+    .await
+    .tap_ok(|_| {
+        info!(
+            nonce,
+            token_id, amount_u64, "Eth to Sui bridge transfer claimed"
+        );
+    })
+}
+
 pub async fn initiate_bridge_eth_to_sui(
     bridge_test_cluster: &BridgeTestCluster,
     amount: u64,
-    sui_amount: u64,
-    token_id: u8,
     nonce: u64,
 ) -> Result<(), anyhow::Error> {
-    info!("Depositing Eth to Solidity contract");
+    info!("Depositing native Ether to Solidity contract, nonce: {nonce}, amount: {amount}");
     let (eth_signer, eth_address) = bridge_test_cluster
         .get_eth_signer_and_address()
         .await
@@ -328,6 +472,9 @@ pub async fn initiate_bridge_eth_to_sui(
     let sui_address = bridge_test_cluster.sui_user_address();
     let sui_chain_id = bridge_test_cluster.sui_chain_id();
     let eth_chain_id = bridge_test_cluster.eth_chain_id();
+    let token_id = TOKEN_ID_ETH;
+
+    let sui_amount = (U256::from(amount) * U256::exp10(8)).as_u64(); // DP for Ether on Sui
 
     let eth_tx = deposit_native_eth_to_sol_contract(
         &eth_signer,
@@ -337,8 +484,7 @@ pub async fn initiate_bridge_eth_to_sui(
         amount,
     )
     .await;
-    let pending_tx = eth_tx.send().await.unwrap();
-    let tx_receipt = pending_tx.await.unwrap().unwrap();
+    let tx_receipt = send_eth_tx_and_get_tx_receipt(eth_tx).await;
     let eth_bridge_event = tx_receipt
         .logs
         .iter()
@@ -468,11 +614,26 @@ async fn wait_for_transfer_action_status(
 ) -> Result<(), anyhow::Error> {
     // Wait for the bridge action to be approved
     let now = std::time::Instant::now();
+    info!(
+        "Waiting for onchain status {:?}. chain: {:?}, nonce: {nonce}",
+        status, chain_id as u8
+    );
     loop {
+        let timer = std::time::Instant::now();
         let res = sui_bridge_client
             .get_token_transfer_action_onchain_status_until_success(chain_id as u8, nonce)
             .await;
+        info!(
+            "get_token_transfer_action_onchain_status_until_success took {:?}, status: {:?}",
+            timer.elapsed(),
+            res
+        );
+
         if res == status {
+            info!(
+                "detected on chain status {:?}. chain: {:?}, nonce: {nonce}",
+                status, chain_id as u8
+            );
             return Ok(());
         }
         if now.elapsed().as_secs() > 60 {
diff --git a/crates/sui-bridge/src/e2e_tests/complex.rs b/crates/sui-bridge/src/e2e_tests/complex.rs
index 390ca71b71e27..d822074146ae6 100644
--- a/crates/sui-bridge/src/e2e_tests/complex.rs
+++ b/crates/sui-bridge/src/e2e_tests/complex.rs
@@ -35,13 +35,14 @@ async fn test_sui_bridge_paused() {
     // Setup bridge test env
     let bridge_test_cluster = BridgeTestClusterBuilder::new()
         .with_eth_env(true)
+        .with_bridge_cluster(true)
+        .with_num_validators(4)
         .with_approved_governance_actions(vec![
             vec![pause_action.clone(), unpause_action.clone()],
-            vec![pause_action.clone(), unpause_action.clone()],
-            vec![pause_action.clone(), unpause_action.clone()],
+            vec![unpause_action.clone()],
+            vec![unpause_action.clone()],
             vec![],
         ])
-        .with_bridge_cluster(true)
         .build()
         .await;
 
@@ -53,7 +54,7 @@ async fn test_sui_bridge_paused() {
     assert!(!bridge_client.get_bridge_summary().await.unwrap().is_frozen);
 
     // try bridge from eth and verify it works on sui
-    initiate_bridge_eth_to_sui(&bridge_test_cluster, 10, 10 * 100_000_000, TOKEN_ID_ETH, 0)
+    initiate_bridge_eth_to_sui(&bridge_test_cluster, 10, 0)
         .await
         .unwrap();
     // verify Eth was transferred to Sui address
@@ -106,9 +107,7 @@ async fn test_sui_bridge_paused() {
     assert!(bridge_client.get_bridge_summary().await.unwrap().is_frozen);
 
     // Transfer from eth to sui should fail on Sui
-    let eth_to_sui_bridge_action =
-        initiate_bridge_eth_to_sui(&bridge_test_cluster, 10, 10 * 100_000_000, TOKEN_ID_ETH, 1)
-            .await;
+    let eth_to_sui_bridge_action = initiate_bridge_eth_to_sui(&bridge_test_cluster, 10, 1).await;
     assert!(eth_to_sui_bridge_action.is_err());
     // message should not be recorded on Sui when the bridge is paused
     let res = bridge_test_cluster
diff --git a/crates/sui-bridge/src/e2e_tests/test_utils.rs b/crates/sui-bridge/src/e2e_tests/test_utils.rs
index 1768f16df3d7a..67c3e61b3e295 100644
--- a/crates/sui-bridge/src/e2e_tests/test_utils.rs
+++ b/crates/sui-bridge/src/e2e_tests/test_utils.rs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::abi::EthBridgeCommittee;
+use crate::abi::EthBridgeConfig;
 use crate::crypto::BridgeAuthorityKeyPair;
 use crate::crypto::BridgeAuthorityPublicKeyBytes;
 use crate::events::*;
@@ -24,6 +25,7 @@ use std::path::Path;
 use std::path::PathBuf;
 use std::process::Command;
 use std::str::FromStr;
+use std::sync::Arc;
 use sui_json_rpc_types::SuiEvent;
 use sui_json_rpc_types::SuiTransactionBlockResponse;
 use sui_json_rpc_types::SuiTransactionBlockResponseOptions;
@@ -67,12 +69,14 @@ const BTC_NAME: &str = "BTC";
 const ETH_NAME: &str = "ETH";
 const USDC_NAME: &str = "USDC";
 const USDT_NAME: &str = "USDT";
+const KA_NAME: &str = "KA";
 
 pub const TEST_PK: &str = "0x4bbbf85ce3377467afe5d46f804f221813b2bb87f24d81f60f1fcdbf7cbf4356";
 
 /// A helper struct that holds TestCluster and other Bridge related
 /// structs that are needed for testing.
 pub struct BridgeTestCluster {
+    pub num_validators: usize,
     pub test_cluster: TestCluster,
     bridge_client: SuiBridgeClient,
     eth_environment: EthBridgeEnvironment,
@@ -86,6 +90,7 @@ pub struct BridgeTestCluster {
 pub struct BridgeTestClusterBuilder {
     with_eth_env: bool,
     with_bridge_cluster: bool,
+    num_validators: usize,
     approved_governance_actions: Option<Vec<Vec<BridgeAction>>>,
     eth_chain_id: BridgeChainId,
     sui_chain_id: BridgeChainId,
@@ -102,6 +107,7 @@ impl BridgeTestClusterBuilder {
         BridgeTestClusterBuilder {
             with_eth_env: false,
             with_bridge_cluster: false,
+            num_validators: 4,
             approved_governance_actions: None,
             eth_chain_id: BridgeChainId::EthCustom,
             sui_chain_id: BridgeChainId::SuiCustom,
@@ -118,10 +124,16 @@ impl BridgeTestClusterBuilder {
         self
     }
 
+    pub fn with_num_validators(mut self, num_validators: usize) -> Self {
+        self.num_validators = num_validators;
+        self
+    }
+
     pub fn with_approved_governance_actions(
         mut self,
         approved_governance_actions: Vec<Vec<BridgeAction>>,
     ) -> Self {
+        assert_eq!(approved_governance_actions.len(), self.num_validators);
         self.approved_governance_actions = Some(approved_governance_actions);
         self
     }
@@ -139,15 +151,15 @@ impl BridgeTestClusterBuilder {
     pub async fn build(self) -> BridgeTestCluster {
         init_all_struct_tags();
         std::env::set_var("__TEST_ONLY_CONSENSUS_USE_LONG_MIN_ROUND_DELAY", "1");
-
         let mut bridge_keys = vec![];
         let mut bridge_keys_copy = vec![];
-        for _ in 0..=3 {
+        for _ in 0..self.num_validators {
             let (_, kp): (_, BridgeAuthorityKeyPair) = get_key_pair();
             bridge_keys.push(kp.copy());
             bridge_keys_copy.push(kp);
         }
-        let start_cluster_task = tokio::task::spawn(Self::start_test_cluster(bridge_keys));
+        let start_cluster_task =
+            tokio::task::spawn(Self::start_test_cluster(bridge_keys, self.num_validators));
         let start_eth_env_task = tokio::task::spawn(Self::start_eth_env(bridge_keys_copy));
         let (start_cluster_res, start_eth_env_res) = join!(start_cluster_task, start_eth_env_task);
         let test_cluster = start_cluster_res.unwrap();
@@ -158,7 +170,7 @@ impl BridgeTestClusterBuilder {
             let approved_governace_actions = self
                 .approved_governance_actions
                 .clone()
-                .unwrap_or(vec![vec![], vec![], vec![], vec![]]);
+                .unwrap_or(vec![vec![]; self.num_validators]);
             bridge_node_handles = Some(
                 start_bridge_cluster(&test_cluster, &eth_environment, approved_governace_actions)
                     .await,
@@ -168,6 +180,7 @@ impl BridgeTestClusterBuilder {
             .await
             .unwrap();
         BridgeTestCluster {
+            num_validators: self.num_validators,
             test_cluster,
             bridge_client,
             eth_environment,
@@ -179,8 +192,13 @@ impl BridgeTestClusterBuilder {
         }
     }
 
-    async fn start_test_cluster(bridge_keys: Vec<BridgeAuthorityKeyPair>) -> TestCluster {
+    async fn start_test_cluster(
+        bridge_keys: Vec<BridgeAuthorityKeyPair>,
+        num_validators: usize,
+    ) -> TestCluster {
+        assert_eq!(bridge_keys.len(), num_validators);
         let test_cluster: test_cluster::TestCluster = TestClusterBuilder::new()
+            .with_num_validators(num_validators)
             .with_protocol_version(BRIDGE_ENABLE_PROTOCOL_VERSION.into())
             .build_with_bridge(bridge_keys, true)
             .await;
@@ -223,6 +241,11 @@ impl BridgeTestCluster {
         Ok((eth_signer, eth_address))
     }
 
+    pub async fn get_eth_signer(&self) -> EthSigner {
+        let (eth_signer, _) = self.get_eth_signer_and_private_key().await.unwrap();
+        eth_signer
+    }
+
     pub fn bridge_client(&self) -> &SuiBridgeClient {
         &self.bridge_client
     }
@@ -243,6 +266,10 @@ impl BridgeTestCluster {
         self.eth_chain_id
     }
 
+    pub(crate) fn eth_env(&self) -> &EthBridgeEnvironment {
+        &self.eth_environment
+    }
+
     pub fn contracts(&self) -> &DeployedSolContracts {
         self.eth_environment.contracts()
     }
@@ -303,6 +330,7 @@ impl BridgeTestCluster {
         &mut self,
         approved_governance_actions: Vec<Vec<BridgeAction>>,
     ) {
+        assert_eq!(approved_governance_actions.len(), self.num_validators);
         self.approved_governance_actions_for_next_start = Some(approved_governance_actions);
     }
 
@@ -421,6 +449,7 @@ pub struct DeployedSolContracts {
     pub eth: EthAddress,
     pub usdc: EthAddress,
     pub usdt: EthAddress,
+    pub ka: EthAddress,
 }
 
 impl DeployedSolContracts {
@@ -470,7 +499,9 @@ pub(crate) async fn deploy_sol_contract(
             )
         })
         .collect::<Vec<_>>();
-    let committee_member_stake = vec![stake; node_len];
+    let mut committee_member_stake = vec![stake; node_len];
+    // Adjust it so that the total stake is equal to TOTAL_VOTING_POWER
+    committee_member_stake[node_len - 1] = TOTAL_VOTING_POWER - stake * (node_len as u64 - 1);
     let deploy_config = SolDeployConfig {
         committee_member_stake: committee_member_stake.clone(),
         committee_members: committee_members.clone(),
@@ -572,15 +603,16 @@ pub(crate) async fn deploy_sol_contract(
     }
 
     let contracts = DeployedSolContracts {
-        sui_bridge: *deployed_contracts.get(SUI_BRIDGE_NAME).unwrap(),
-        bridge_committee: *deployed_contracts.get(BRIDGE_COMMITTEE_NAME).unwrap(),
-        bridge_config: *deployed_contracts.get(BRIDGE_CONFIG_NAME).unwrap(),
-        bridge_limiter: *deployed_contracts.get(BRIDGE_LIMITER_NAME).unwrap(),
-        bridge_vault: *deployed_contracts.get(BRIDGE_VAULT_NAME).unwrap(),
-        btc: *deployed_contracts.get(BTC_NAME).unwrap(),
-        eth: *deployed_contracts.get(ETH_NAME).unwrap(),
-        usdc: *deployed_contracts.get(USDC_NAME).unwrap(),
-        usdt: *deployed_contracts.get(USDT_NAME).unwrap(),
+        sui_bridge: deployed_contracts.remove(SUI_BRIDGE_NAME).unwrap(),
+        bridge_committee: deployed_contracts.remove(BRIDGE_COMMITTEE_NAME).unwrap(),
+        bridge_config: deployed_contracts.remove(BRIDGE_CONFIG_NAME).unwrap(),
+        bridge_limiter: deployed_contracts.remove(BRIDGE_LIMITER_NAME).unwrap(),
+        bridge_vault: deployed_contracts.remove(BRIDGE_VAULT_NAME).unwrap(),
+        btc: deployed_contracts.remove(BTC_NAME).unwrap(),
+        eth: deployed_contracts.remove(ETH_NAME).unwrap(),
+        usdc: deployed_contracts.remove(USDC_NAME).unwrap(),
+        usdt: deployed_contracts.remove(USDT_NAME).unwrap(),
+        ka: deployed_contracts.remove(KA_NAME).unwrap(),
     };
     let eth_bridge_committee =
         EthBridgeCommittee::new(contracts.bridge_committee, eth_signer.clone().into());
@@ -610,7 +642,7 @@ pub(crate) async fn deploy_sol_contract(
 }
 
 #[derive(Debug)]
-pub(crate) struct EthBridgeEnvironment {
+pub struct EthBridgeEnvironment {
     pub rpc_url: String,
     process: Child,
     contracts: Option<DeployedSolContracts>,
@@ -647,6 +679,25 @@ impl EthBridgeEnvironment {
     pub(crate) fn contracts(&self) -> &DeployedSolContracts {
         self.contracts.as_ref().unwrap()
     }
+
+    pub(crate) fn get_bridge_config(
+        &self,
+    ) -> EthBridgeConfig<ethers::prelude::Provider<ethers::providers::Http>> {
+        let provider = Arc::new(
+            ethers::prelude::Provider::<ethers::providers::Http>::try_from(&self.rpc_url)
+                .unwrap()
+                .interval(std::time::Duration::from_millis(2000)),
+        );
+        EthBridgeConfig::new(self.contracts().bridge_config, provider.clone())
+    }
+
+    pub(crate) async fn get_supported_token(&self, token_id: u8) -> (EthAddress, u8, u64) {
+        let config = self.get_bridge_config();
+        let token_address = config.token_address_of(token_id).call().await.unwrap();
+        let token_sui_decimal = config.token_sui_decimal_of(token_id).call().await.unwrap();
+        let token_price = config.token_price_of(token_id).call().await.unwrap();
+        (token_address, token_sui_decimal, token_price)
+    }
 }
 
 impl Drop for EthBridgeEnvironment {
@@ -748,6 +799,17 @@ pub(crate) async fn get_signatures(
         .collect()
 }
 
+pub(crate) async fn send_eth_tx_and_get_tx_receipt<B, M, D>(
+    call: FunctionCall<B, M, D>,
+) -> TransactionReceipt
+where
+    M: Middleware,
+    B: std::borrow::Borrow<M>,
+    D: ethers::abi::Detokenize,
+{
+    call.send().await.unwrap().await.unwrap().unwrap()
+}
+
 /// A simple struct to create a temporary directory that
 /// will be removed when it goes out of scope.
 struct TempDir {
diff --git a/crates/sui-bridge/src/eth_client.rs b/crates/sui-bridge/src/eth_client.rs
index f7bed3c4d2e2e..df48b3cd88b4a 100644
--- a/crates/sui-bridge/src/eth_client.rs
+++ b/crates/sui-bridge/src/eth_client.rs
@@ -6,12 +6,13 @@ use std::sync::Arc;
 
 use crate::abi::EthBridgeEvent;
 use crate::error::{BridgeError, BridgeResult};
+use crate::metered_eth_provider::{new_metered_eth_provider, MeteredEthHttpProvier};
 use crate::metrics::BridgeMetrics;
 use crate::types::{BridgeAction, EthLog, RawEthLog};
-use ethers::providers::{Http, JsonRpcClient, Middleware, Provider};
+use ethers::providers::{JsonRpcClient, Middleware, Provider};
 use ethers::types::TxHash;
 use ethers::types::{Block, Filter};
-use tap::{Tap, TapFallible};
+use tap::TapFallible;
 
 #[cfg(test)]
 use crate::eth_mock_provider::EthMockProvider;
@@ -19,20 +20,18 @@ use ethers::types::Address as EthAddress;
 pub struct EthClient<P> {
     provider: Provider<P>,
     contract_addresses: HashSet<EthAddress>,
-    metrics: Arc<BridgeMetrics>,
 }
 
-impl EthClient<Http> {
+impl EthClient<MeteredEthHttpProvier> {
     pub async fn new(
         provider_url: &str,
         contract_addresses: HashSet<EthAddress>,
         metrics: Arc<BridgeMetrics>,
     ) -> anyhow::Result<Self> {
-        let provider = Provider::try_from(provider_url)?;
+        let provider = new_metered_eth_provider(provider_url, metrics)?;
         let self_ = Self {
             provider,
             contract_addresses,
-            metrics,
         };
         self_.describe().await?;
         Ok(self_)
@@ -46,7 +45,6 @@ impl EthClient<EthMockProvider> {
         Self {
             provider,
             contract_addresses,
-            metrics: Arc::new(BridgeMetrics::new_for_testing()),
         }
     }
 }
@@ -77,7 +75,6 @@ where
             .provider
             .get_transaction_receipt(tx_hash)
             .await
-            .tap(|_| self.metrics.eth_provider_queries.inc())
             .map_err(BridgeError::from)?
             .ok_or(BridgeError::TxNotFound)?;
         let receipt_block_num = receipt.block_number.ok_or(BridgeError::ProviderError(
@@ -115,8 +112,7 @@ where
         let block: Result<Option<Block<ethers::types::TxHash>>, ethers::prelude::ProviderError> =
             self.provider
                 .request("eth_getBlockByNumber", ("finalized", false))
-                .await
-                .tap(|_| self.metrics.eth_provider_queries.inc());
+                .await;
         let block = block?.ok_or(BridgeError::TransientProviderError(
             "Provider fails to return last finalized block".into(),
         ))?;
@@ -140,9 +136,9 @@ where
             .address(address);
         let logs = self
             .provider
+            // TODO use get_logs_paginated?
             .get_logs(&filter)
             .await
-            .tap(|_| self.metrics.eth_provider_queries.inc())
             .map_err(BridgeError::from)
             .tap_err(|e| {
                 tracing::error!(
@@ -193,7 +189,6 @@ where
             .provider
             .get_logs(&filter)
             .await
-            .tap(|_| self.metrics.eth_provider_queries.inc())
             .map_err(BridgeError::from)
             .tap_err(|e| {
                 tracing::error!(
@@ -241,7 +236,6 @@ where
             .provider
             .get_transaction_receipt(tx_hash)
             .await
-            .tap(|_| self.metrics.eth_provider_queries.inc())
             .map_err(BridgeError::from)?
             .ok_or(BridgeError::ProviderError(format!(
                 "Provide cannot find eth transaction for log: {:?})",
diff --git a/crates/sui-bridge/src/eth_syncer.rs b/crates/sui-bridge/src/eth_syncer.rs
index e52461fbdbc76..840dab701060d 100644
--- a/crates/sui-bridge/src/eth_syncer.rs
+++ b/crates/sui-bridge/src/eth_syncer.rs
@@ -169,7 +169,7 @@ where
                 error!("Failed to get events from eth client after retry");
                 continue;
             };
-            tracing::info!(
+            tracing::debug!(
                 ?contract_address,
                 start_block,
                 end_block,
diff --git a/crates/sui-bridge/src/events.rs b/crates/sui-bridge/src/events.rs
index 6072f9fd8b23e..93f04efd2570d 100644
--- a/crates/sui-bridge/src/events.rs
+++ b/crates/sui-bridge/src/events.rs
@@ -506,6 +506,7 @@ pub mod tests {
         let mut bridge_test_cluster = BridgeTestClusterBuilder::new()
             .with_eth_env(false)
             .with_bridge_cluster(false)
+            .with_num_validators(2)
             .build()
             .await;
 
diff --git a/crates/sui-bridge/src/lib.rs b/crates/sui-bridge/src/lib.rs
index 0d24936eda2c4..0a138372c50fe 100644
--- a/crates/sui-bridge/src/lib.rs
+++ b/crates/sui-bridge/src/lib.rs
@@ -12,7 +12,9 @@ pub mod eth_client;
 pub mod eth_syncer;
 pub mod eth_transaction_builder;
 pub mod events;
+pub mod metered_eth_provider;
 pub mod metrics;
+pub mod monitor;
 pub mod node;
 pub mod orchestrator;
 pub mod server;
diff --git a/crates/sui-bridge/src/metered_eth_provider.rs b/crates/sui-bridge/src/metered_eth_provider.rs
new file mode 100644
index 0000000000000..5e4ccac1b6ece
--- /dev/null
+++ b/crates/sui-bridge/src/metered_eth_provider.rs
@@ -0,0 +1,102 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::metrics::BridgeMetrics;
+use ethers::providers::{Http, HttpClientError, JsonRpcClient, Provider};
+use serde::{de::DeserializeOwned, Serialize};
+use std::fmt::Debug;
+use std::sync::Arc;
+use url::{ParseError, Url};
+
+#[derive(Debug, Clone)]
+pub struct MeteredEthHttpProvier {
+    inner: Http,
+    metrics: Arc<BridgeMetrics>,
+}
+
+#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
+#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
+impl JsonRpcClient for MeteredEthHttpProvier {
+    type Error = HttpClientError;
+
+    async fn request<T: Serialize + Send + Sync + Debug, R: DeserializeOwned + Send>(
+        &self,
+        method: &str,
+        params: T,
+    ) -> Result<R, HttpClientError> {
+        self.metrics
+            .eth_rpc_queries
+            .with_label_values(&[method])
+            .inc();
+        let _guard = self
+            .metrics
+            .eth_rpc_queries_latency
+            .with_label_values(&[method])
+            .start_timer();
+        self.inner.request(method, params).await
+    }
+}
+
+impl MeteredEthHttpProvier {
+    pub fn new(url: impl Into<Url>, metrics: Arc<BridgeMetrics>) -> Self {
+        let inner = Http::new(url);
+        Self { inner, metrics }
+    }
+}
+
+pub fn new_metered_eth_provider(
+    url: &str,
+    metrics: Arc<BridgeMetrics>,
+) -> Result<Provider<MeteredEthHttpProvier>, ParseError> {
+    let http_provider = MeteredEthHttpProvier::new(Url::parse(url)?, metrics);
+    Ok(Provider::new(http_provider))
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use ethers::providers::Middleware;
+    use prometheus::Registry;
+
+    #[tokio::test]
+    async fn test_metered_eth_provider() {
+        let metrics = Arc::new(BridgeMetrics::new(&Registry::new()));
+        let provider = new_metered_eth_provider("http://localhost:9876", metrics.clone()).unwrap();
+
+        assert_eq!(
+            metrics
+                .eth_rpc_queries
+                .get_metric_with_label_values(&["eth_blockNumber"])
+                .unwrap()
+                .get(),
+            0
+        );
+        assert_eq!(
+            metrics
+                .eth_rpc_queries_latency
+                .get_metric_with_label_values(&["eth_blockNumber"])
+                .unwrap()
+                .get_sample_count(),
+            0
+        );
+
+        provider.get_block_number().await.unwrap_err(); // the rpc cal will fail but we don't care
+
+        assert_eq!(
+            metrics
+                .eth_rpc_queries
+                .get_metric_with_label_values(&["eth_blockNumber"])
+                .unwrap()
+                .get(),
+            1
+        );
+        assert_eq!(
+            metrics
+                .eth_rpc_queries_latency
+                .get_metric_with_label_values(&["eth_blockNumber"])
+                .unwrap()
+                .get_sample_count(),
+            1
+        );
+    }
+}
diff --git a/crates/sui-bridge/src/metrics.rs b/crates/sui-bridge/src/metrics.rs
index 556eb47e20278..3f07ed87a9168 100644
--- a/crates/sui-bridge/src/metrics.rs
+++ b/crates/sui-bridge/src/metrics.rs
@@ -2,12 +2,20 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use prometheus::{
-    register_int_counter_vec_with_registry, register_int_counter_with_registry,
-    register_int_gauge_vec_with_registry, register_int_gauge_with_registry, IntCounter,
-    IntCounterVec, IntGauge, IntGaugeVec, Registry,
+    register_histogram_vec_with_registry, register_int_counter_vec_with_registry,
+    register_int_counter_with_registry, register_int_gauge_vec_with_registry,
+    register_int_gauge_with_registry, HistogramVec, IntCounter, IntCounterVec, IntGauge,
+    IntGaugeVec, Registry,
 };
 
-#[derive(Clone)]
+const FINE_GRAINED_LATENCY_SEC_BUCKETS: &[f64] = &[
+    0.001, 0.005, 0.01, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.6, 0.7, 0.8, 0.9,
+    1.0, 1.2, 1.4, 1.6, 1.8, 2.0, 2.5, 3.0, 3.5, 4.0, 5.0, 6.0, 6.5, 7.0, 7.5, 8.0, 8.5, 9.0, 9.5,
+    10., 15., 20., 25., 30., 35., 40., 45., 50., 60., 70., 80., 90., 100., 120., 140., 160., 180.,
+    200., 250., 300., 350., 400.,
+];
+
+#[derive(Clone, Debug)]
 pub struct BridgeMetrics {
     pub(crate) err_build_sui_transaction: IntCounter,
     pub(crate) err_signature_aggregation: IntCounter,
@@ -33,11 +41,14 @@ pub struct BridgeMetrics {
     pub(crate) action_executor_signing_queue_received_actions: IntCounter,
     pub(crate) action_executor_signing_queue_skipped_actions: IntCounter,
     pub(crate) action_executor_execution_queue_received_actions: IntCounter,
+    pub(crate) action_executor_execution_queue_skipped_actions_due_to_pausing: IntCounter,
 
     pub(crate) signer_with_cache_hit: IntCounterVec,
     pub(crate) signer_with_cache_miss: IntCounterVec,
 
-    pub(crate) eth_provider_queries: IntCounter,
+    pub(crate) eth_rpc_queries: IntCounterVec,
+    pub(crate) eth_rpc_queries_latency: HistogramVec,
+
     pub(crate) gas_coin_balance: IntGauge,
 }
 
@@ -162,15 +173,30 @@ impl BridgeMetrics {
                 registry,
             )
             .unwrap(),
+            action_executor_execution_queue_skipped_actions_due_to_pausing: register_int_counter_with_registry!(
+                "bridge_action_executor_execution_queue_skipped_actions_due_to_pausing",
+                "Total number of skipped actions in action executor execution queue because of pausing",
+                registry,
+            )
+            .unwrap(),
             gas_coin_balance: register_int_gauge_with_registry!(
                 "bridge_gas_coin_balance",
                 "Current balance of gas coin, in mist",
                 registry,
             )
             .unwrap(),
-            eth_provider_queries: register_int_counter_with_registry!(
-                "bridge_eth_provider_queries",
-                "Total number of queries issued to eth provider",
+            eth_rpc_queries: register_int_counter_vec_with_registry!(
+                "bridge_eth_rpc_queries",
+                "Total number of queries issued to eth provider, by request type",
+                &["type"],
+                registry,
+            )
+            .unwrap(),
+            eth_rpc_queries_latency: register_histogram_vec_with_registry!(
+                "bridge_eth_rpc_queries_latency",
+                "Latency of queries issued to eth provider, by request type",
+                &["type"],
+                FINE_GRAINED_LATENCY_SEC_BUCKETS.to_vec(),
                 registry,
             )
             .unwrap(),
diff --git a/crates/sui-bridge/src/monitor.rs b/crates/sui-bridge/src/monitor.rs
new file mode 100644
index 0000000000000..12affd68d0aa7
--- /dev/null
+++ b/crates/sui-bridge/src/monitor.rs
@@ -0,0 +1,955 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+//! `BridgeMonitor` receives all `SuiBridgeEvent` and handles them accordingly.
+
+use crate::client::bridge_authority_aggregator::BridgeAuthorityAggregator;
+use crate::crypto::BridgeAuthorityPublicKeyBytes;
+use crate::events::{BlocklistValidatorEvent, CommitteeMemberUrlUpdateEvent};
+use crate::events::{EmergencyOpEvent, SuiBridgeEvent};
+use crate::retry_with_max_elapsed_time;
+use crate::sui_client::{SuiClient, SuiClientInner};
+use crate::types::{BridgeCommittee, IsBridgePaused};
+use arc_swap::ArcSwap;
+use std::collections::HashMap;
+use std::sync::Arc;
+use sui_types::TypeTag;
+use tokio::time::Duration;
+use tracing::{error, info, warn};
+
+const REFRESH_BRIDGE_RETRY_TIMES: u64 = 3;
+
+pub struct BridgeMonitor<C> {
+    sui_client: Arc<SuiClient<C>>,
+    monitor_rx: mysten_metrics::metered_channel::Receiver<SuiBridgeEvent>,
+    bridge_auth_agg: Arc<ArcSwap<BridgeAuthorityAggregator>>,
+    bridge_paused_watch_tx: tokio::sync::watch::Sender<IsBridgePaused>,
+    sui_token_type_tags: Arc<ArcSwap<HashMap<u8, TypeTag>>>,
+}
+
+impl<C> BridgeMonitor<C>
+where
+    C: SuiClientInner + 'static,
+{
+    pub fn new(
+        sui_client: Arc<SuiClient<C>>,
+        monitor_rx: mysten_metrics::metered_channel::Receiver<SuiBridgeEvent>,
+        bridge_auth_agg: Arc<ArcSwap<BridgeAuthorityAggregator>>,
+        bridge_paused_watch_tx: tokio::sync::watch::Sender<IsBridgePaused>,
+        sui_token_type_tags: Arc<ArcSwap<HashMap<u8, TypeTag>>>,
+    ) -> Self {
+        Self {
+            sui_client,
+            monitor_rx,
+            bridge_auth_agg,
+            bridge_paused_watch_tx,
+            sui_token_type_tags,
+        }
+    }
+
+    pub async fn run(self) {
+        tracing::info!("Starting BridgeMonitor");
+        let Self {
+            sui_client,
+            mut monitor_rx,
+            bridge_auth_agg,
+            bridge_paused_watch_tx,
+            sui_token_type_tags,
+        } = self;
+        let mut latest_token_config = (*sui_token_type_tags.load().clone()).clone();
+
+        while let Some(events) = monitor_rx.recv().await {
+            match events {
+                SuiBridgeEvent::SuiToEthTokenBridgeV1(_) => (),
+                SuiBridgeEvent::TokenTransferApproved(_) => (),
+                SuiBridgeEvent::TokenTransferClaimed(_) => (),
+                SuiBridgeEvent::TokenTransferAlreadyApproved(_) => (),
+                SuiBridgeEvent::TokenTransferAlreadyClaimed(_) => (),
+                SuiBridgeEvent::TokenTransferLimitExceed(_) => {
+                    // TODO
+                }
+
+                SuiBridgeEvent::EmergencyOpEvent(event) => {
+                    info!("Received EmergencyOpEvent: {:?}", event);
+                    let is_paused = get_latest_bridge_pause_status_with_emergency_event(
+                        sui_client.clone(),
+                        event,
+                        Duration::from_secs(10),
+                    )
+                    .await;
+                    bridge_paused_watch_tx
+                        .send(is_paused)
+                        .expect("Bridge pause status watch channel should not be closed");
+                }
+
+                SuiBridgeEvent::CommitteeMemberRegistration(_) => (),
+                SuiBridgeEvent::CommitteeUpdateEvent(_) => (),
+
+                SuiBridgeEvent::CommitteeMemberUrlUpdateEvent(event) => {
+                    info!("Received CommitteeMemberUrlUpdateEvent: {:?}", event);
+                    let new_committee = get_latest_bridge_committee_with_url_update_event(
+                        sui_client.clone(),
+                        event,
+                        Duration::from_secs(10),
+                    )
+                    .await;
+                    bridge_auth_agg.store(Arc::new(BridgeAuthorityAggregator::new(Arc::new(
+                        new_committee,
+                    ))));
+                    info!("Committee updated with CommitteeMemberUrlUpdateEvent");
+                }
+
+                SuiBridgeEvent::BlocklistValidatorEvent(event) => {
+                    info!("Received BlocklistValidatorEvent: {:?}", event);
+                    let new_committee = get_latest_bridge_committee_with_blocklist_event(
+                        sui_client.clone(),
+                        event,
+                        Duration::from_secs(10),
+                    )
+                    .await;
+                    bridge_auth_agg.store(Arc::new(BridgeAuthorityAggregator::new(Arc::new(
+                        new_committee,
+                    ))));
+                    info!("Committee updated with BlocklistValidatorEvent");
+                }
+
+                SuiBridgeEvent::TokenRegistrationEvent(_) => (),
+
+                SuiBridgeEvent::NewTokenEvent(event) => {
+                    if let std::collections::hash_map::Entry::Vacant(entry) =
+                        // We only add new tokens but not remove so it's ok to just insert
+                        latest_token_config.entry(event.token_id)
+                    {
+                        entry.insert(event.type_name.clone());
+                        sui_token_type_tags.store(Arc::new(latest_token_config.clone()));
+                    } else {
+                        // invariant
+                        assert_eq!(event.type_name, latest_token_config[&event.token_id]);
+                    }
+                }
+
+                SuiBridgeEvent::UpdateTokenPriceEvent(_) => (),
+            }
+        }
+
+        panic!("BridgeMonitor channel was closed unexpectedly");
+    }
+}
+
+async fn get_latest_bridge_committee_with_url_update_event<C: SuiClientInner>(
+    sui_client: Arc<SuiClient<C>>,
+    event: CommitteeMemberUrlUpdateEvent,
+    staleness_retry_interval: Duration,
+) -> BridgeCommittee {
+    let mut remaining_retry_times = REFRESH_BRIDGE_RETRY_TIMES;
+    loop {
+        let Ok(Ok(committee)) = retry_with_max_elapsed_time!(
+            sui_client.get_bridge_committee(),
+            Duration::from_secs(600)
+        ) else {
+            error!("Failed to get bridge committee after retry");
+            continue;
+        };
+        let member = committee.member(&BridgeAuthorityPublicKeyBytes::from(&event.member));
+        let Some(member) = member else {
+            // This is possible when a node is processing an older event while the member quitted at a later point, which is fine.
+            // Or fullnode returns a stale committee that the member hasn't joined, which is rare and tricy to handle so we just log it.
+            warn!(
+                "Committee member not found in the committee: {:?}",
+                event.member
+            );
+            return committee;
+        };
+        if member.base_url == event.new_url {
+            return committee;
+        }
+        // If url does not match, it could be:
+        // 1. the query is sent to a stale fullnode that does not have the latest data yet
+        // 2. the node is processing an older message, and the latest url has changed again
+        // In either case, we retry a few times. If it still fails to match, we assume it's the latter case.
+        tokio::time::sleep(staleness_retry_interval).await;
+        remaining_retry_times -= 1;
+        if remaining_retry_times == 0 {
+            warn!(
+                "Committee member url {:?} does not match onchain record {:?} after retry",
+                event.member, member
+            );
+            return committee;
+        }
+    }
+}
+
+async fn get_latest_bridge_committee_with_blocklist_event<C: SuiClientInner>(
+    sui_client: Arc<SuiClient<C>>,
+    event: BlocklistValidatorEvent,
+    staleness_retry_interval: Duration,
+) -> BridgeCommittee {
+    let mut remaining_retry_times = REFRESH_BRIDGE_RETRY_TIMES;
+    loop {
+        let Ok(Ok(committee)) = retry_with_max_elapsed_time!(
+            sui_client.get_bridge_committee(),
+            Duration::from_secs(600)
+        ) else {
+            error!("Failed to get bridge committee after retry");
+            continue;
+        };
+        let mut any_mismatch = false;
+        for pk in &event.public_keys {
+            let member = committee.member(&BridgeAuthorityPublicKeyBytes::from(pk));
+            let Some(member) = member else {
+                // This is possible when a node is processing an older event while the member
+                // quitted at a later point. Or fullnode returns a stale committee that
+                // the member hasn't joined.
+                warn!("Committee member not found in the committee: {:?}", pk);
+                any_mismatch = true;
+                break;
+            };
+            if member.is_blocklisted != event.blocklisted {
+                warn!(
+                    "Committee member blocklist status does not match onchain record: {:?}",
+                    member
+                );
+                any_mismatch = true;
+                break;
+            }
+        }
+        if !any_mismatch {
+            return committee;
+        }
+        // If there is any match, it could be:
+        // 1. the query is sent to a stale fullnode that does not have the latest data yet
+        // 2. the node is processing an older message, and the latest blocklist status has changed again
+        // In either case, we retry a few times. If it still fails to match, we assume it's the latter case.
+        tokio::time::sleep(staleness_retry_interval).await;
+        remaining_retry_times -= 1;
+        if remaining_retry_times == 0 {
+            warn!(
+                "Committee member blocklist status {:?} does not match onchain record after retry",
+                event
+            );
+            return committee;
+        }
+    }
+}
+
+async fn get_latest_bridge_pause_status_with_emergency_event<C: SuiClientInner>(
+    sui_client: Arc<SuiClient<C>>,
+    event: EmergencyOpEvent,
+    staleness_retry_interval: Duration,
+) -> IsBridgePaused {
+    let mut remaining_retry_times = REFRESH_BRIDGE_RETRY_TIMES;
+    loop {
+        let Ok(Ok(summary)) =
+            retry_with_max_elapsed_time!(sui_client.get_bridge_summary(), Duration::from_secs(600))
+        else {
+            error!("Failed to get bridge summary after retry");
+            continue;
+        };
+        if summary.is_frozen == event.frozen {
+            return summary.is_frozen;
+        }
+        // If the onchain status does not match, it could be:
+        // 1. the query is sent to a stale fullnode that does not have the latest data yet
+        // 2. the node is processing an older message, and the latest status has changed again
+        // In either case, we retry a few times. If it still fails to match, we assume it's the latter case.
+        tokio::time::sleep(staleness_retry_interval).await;
+        remaining_retry_times -= 1;
+        if remaining_retry_times == 0 {
+            warn!(
+                "Bridge pause status {:?} does not match onchain record {:?} after retry",
+                event, summary.is_frozen
+            );
+            return summary.is_frozen;
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::str::FromStr;
+
+    use super::*;
+    use crate::events::{init_all_struct_tags, NewTokenEvent};
+    use crate::test_utils::{
+        bridge_committee_to_bridge_committee_summary, get_test_authority_and_key,
+    };
+    use crate::types::{BridgeAuthority, BRIDGE_PAUSED, BRIDGE_UNPAUSED};
+    use fastcrypto::traits::KeyPair;
+    use prometheus::Registry;
+    use sui_types::base_types::SuiAddress;
+    use sui_types::bridge::BridgeCommitteeSummary;
+    use sui_types::bridge::MoveTypeCommitteeMember;
+    use sui_types::crypto::get_key_pair;
+
+    use crate::{sui_mock_client::SuiMockClient, types::BridgeCommittee};
+    use sui_types::crypto::ToFromBytes;
+
+    #[tokio::test]
+    async fn test_get_latest_bridge_committee_with_url_update_event() {
+        telemetry_subscribers::init_for_testing();
+        let sui_client_mock = SuiMockClient::default();
+        let sui_client = Arc::new(SuiClient::new_for_testing(sui_client_mock.clone()));
+        let (_, kp): (_, fastcrypto::secp256k1::Secp256k1KeyPair) = get_key_pair();
+        let pk = kp.public().clone();
+        let pk_as_bytes = BridgeAuthorityPublicKeyBytes::from(&pk);
+        let pk_bytes = pk_as_bytes.as_bytes().to_vec();
+        let event = CommitteeMemberUrlUpdateEvent {
+            member: pk,
+            new_url: "http://new.url".to_string(),
+        };
+        let summary = BridgeCommitteeSummary {
+            members: vec![(
+                pk_bytes.clone(),
+                MoveTypeCommitteeMember {
+                    sui_address: SuiAddress::random_for_testing_only(),
+                    bridge_pubkey_bytes: pk_bytes.clone(),
+                    voting_power: 10000,
+                    http_rest_url: "http://new.url".to_string().as_bytes().to_vec(),
+                    blocklisted: false,
+                },
+            )],
+            member_registration: vec![],
+            last_committee_update_epoch: 0,
+        };
+
+        // Test the regular case, the onchain url matches
+        sui_client_mock.set_bridge_committee(summary.clone());
+        let timer = std::time::Instant::now();
+        let committee = get_latest_bridge_committee_with_url_update_event(
+            sui_client.clone(),
+            event.clone(),
+            Duration::from_secs(2),
+        )
+        .await;
+        assert_eq!(
+            committee.member(&pk_as_bytes).unwrap().base_url,
+            "http://new.url"
+        );
+        assert!(timer.elapsed().as_millis() < 500);
+
+        // Test the case where the onchain url is older. Then update onchain url in 1 second.
+        // Since the retry interval is 2 seconds, it should return the next retry.
+        let old_summary = BridgeCommitteeSummary {
+            members: vec![(
+                pk_bytes.clone(),
+                MoveTypeCommitteeMember {
+                    sui_address: SuiAddress::random_for_testing_only(),
+                    bridge_pubkey_bytes: pk_bytes.clone(),
+                    voting_power: 10000,
+                    http_rest_url: "http://old.url".to_string().as_bytes().to_vec(),
+                    blocklisted: false,
+                },
+            )],
+            member_registration: vec![],
+            last_committee_update_epoch: 0,
+        };
+        sui_client_mock.set_bridge_committee(old_summary.clone());
+        let timer = std::time::Instant::now();
+        // update the url to "http://new.url" in 1 second
+        let sui_client_mock_clone = sui_client_mock.clone();
+        tokio::spawn(async move {
+            tokio::time::sleep(Duration::from_secs(1)).await;
+            sui_client_mock_clone.set_bridge_committee(summary.clone());
+        });
+        let committee = get_latest_bridge_committee_with_url_update_event(
+            sui_client.clone(),
+            event.clone(),
+            Duration::from_secs(2),
+        )
+        .await;
+        assert_eq!(
+            committee.member(&pk_as_bytes).unwrap().base_url,
+            "http://new.url"
+        );
+        let elapsed = timer.elapsed().as_millis();
+        assert!(elapsed > 1000 && elapsed < 3000);
+
+        // Test the case where the onchain url is newer. It should retry up to
+        // REFRESH_BRIDGE_RETRY_TIMES time then return the onchain record.
+        let newer_summary = BridgeCommitteeSummary {
+            members: vec![(
+                pk_bytes.clone(),
+                MoveTypeCommitteeMember {
+                    sui_address: SuiAddress::random_for_testing_only(),
+                    bridge_pubkey_bytes: pk_bytes.clone(),
+                    voting_power: 10000,
+                    http_rest_url: "http://newer.url".to_string().as_bytes().to_vec(),
+                    blocklisted: false,
+                },
+            )],
+            member_registration: vec![],
+            last_committee_update_epoch: 0,
+        };
+        sui_client_mock.set_bridge_committee(newer_summary.clone());
+        let timer = std::time::Instant::now();
+        let committee = get_latest_bridge_committee_with_url_update_event(
+            sui_client.clone(),
+            event.clone(),
+            Duration::from_millis(500),
+        )
+        .await;
+        assert_eq!(
+            committee.member(&pk_as_bytes).unwrap().base_url,
+            "http://newer.url"
+        );
+        let elapsed = timer.elapsed().as_millis();
+        assert!(elapsed > 500 * REFRESH_BRIDGE_RETRY_TIMES as u128);
+
+        // Test the case where the member is not found in the committee
+        // It should return the onchain record.
+        let (_, kp2): (_, fastcrypto::secp256k1::Secp256k1KeyPair) = get_key_pair();
+        let pk2 = kp2.public().clone();
+        let pk_as_bytes2 = BridgeAuthorityPublicKeyBytes::from(&pk2);
+        let pk_bytes2 = pk_as_bytes2.as_bytes().to_vec();
+        let newer_summary = BridgeCommitteeSummary {
+            members: vec![(
+                pk_bytes2.clone(),
+                MoveTypeCommitteeMember {
+                    sui_address: SuiAddress::random_for_testing_only(),
+                    bridge_pubkey_bytes: pk_bytes2.clone(),
+                    voting_power: 10000,
+                    http_rest_url: "http://newer.url".to_string().as_bytes().to_vec(),
+                    blocklisted: false,
+                },
+            )],
+            member_registration: vec![],
+            last_committee_update_epoch: 0,
+        };
+        sui_client_mock.set_bridge_committee(newer_summary.clone());
+        let timer = std::time::Instant::now();
+        let committee = get_latest_bridge_committee_with_url_update_event(
+            sui_client.clone(),
+            event.clone(),
+            Duration::from_secs(1),
+        )
+        .await;
+        assert_eq!(
+            committee.member(&pk_as_bytes2).unwrap().base_url,
+            "http://newer.url"
+        );
+        assert!(committee.member(&pk_as_bytes).is_none());
+        let elapsed = timer.elapsed().as_millis();
+        assert!(elapsed < 1000);
+    }
+
+    #[tokio::test]
+    async fn test_get_latest_bridge_committee_with_blocklist_event() {
+        telemetry_subscribers::init_for_testing();
+        let sui_client_mock = SuiMockClient::default();
+        let sui_client = Arc::new(SuiClient::new_for_testing(sui_client_mock.clone()));
+        let (_, kp): (_, fastcrypto::secp256k1::Secp256k1KeyPair) = get_key_pair();
+        let pk = kp.public().clone();
+        let pk_as_bytes = BridgeAuthorityPublicKeyBytes::from(&pk);
+        let pk_bytes = pk_as_bytes.as_bytes().to_vec();
+
+        // Test the case where the onchain status is the same as the event (blocklisted)
+        let event = BlocklistValidatorEvent {
+            blocklisted: true,
+            public_keys: vec![pk.clone()],
+        };
+        let summary = BridgeCommitteeSummary {
+            members: vec![(
+                pk_bytes.clone(),
+                MoveTypeCommitteeMember {
+                    sui_address: SuiAddress::random_for_testing_only(),
+                    bridge_pubkey_bytes: pk_bytes.clone(),
+                    voting_power: 10000,
+                    http_rest_url: "http://new.url".to_string().as_bytes().to_vec(),
+                    blocklisted: true,
+                },
+            )],
+            member_registration: vec![],
+            last_committee_update_epoch: 0,
+        };
+        sui_client_mock.set_bridge_committee(summary.clone());
+        let timer = std::time::Instant::now();
+        let committee = get_latest_bridge_committee_with_blocklist_event(
+            sui_client.clone(),
+            event.clone(),
+            Duration::from_secs(2),
+        )
+        .await;
+        assert!(committee.member(&pk_as_bytes).unwrap().is_blocklisted);
+        assert!(timer.elapsed().as_millis() < 500);
+
+        // Test the case where the onchain status is the same as the event (unblocklisted)
+        let event = BlocklistValidatorEvent {
+            blocklisted: false,
+            public_keys: vec![pk.clone()],
+        };
+        let summary = BridgeCommitteeSummary {
+            members: vec![(
+                pk_bytes.clone(),
+                MoveTypeCommitteeMember {
+                    sui_address: SuiAddress::random_for_testing_only(),
+                    bridge_pubkey_bytes: pk_bytes.clone(),
+                    voting_power: 10000,
+                    http_rest_url: "http://new.url".to_string().as_bytes().to_vec(),
+                    blocklisted: false,
+                },
+            )],
+            member_registration: vec![],
+            last_committee_update_epoch: 0,
+        };
+        sui_client_mock.set_bridge_committee(summary.clone());
+        let timer = std::time::Instant::now();
+        let committee = get_latest_bridge_committee_with_blocklist_event(
+            sui_client.clone(),
+            event.clone(),
+            Duration::from_secs(2),
+        )
+        .await;
+        assert!(!committee.member(&pk_as_bytes).unwrap().is_blocklisted);
+        assert!(timer.elapsed().as_millis() < 500);
+
+        // Test the case where the onchain status is older. Then update onchain status in 1 second.
+        // Since the retry interval is 2 seconds, it should return the next retry.
+        let old_summary = BridgeCommitteeSummary {
+            members: vec![(
+                pk_bytes.clone(),
+                MoveTypeCommitteeMember {
+                    sui_address: SuiAddress::random_for_testing_only(),
+                    bridge_pubkey_bytes: pk_bytes.clone(),
+                    voting_power: 10000,
+                    http_rest_url: "http://new.url".to_string().as_bytes().to_vec(),
+                    blocklisted: true,
+                },
+            )],
+            member_registration: vec![],
+            last_committee_update_epoch: 0,
+        };
+        sui_client_mock.set_bridge_committee(old_summary.clone());
+        let timer = std::time::Instant::now();
+        // update unblocklisted in 1 second
+        let sui_client_mock_clone = sui_client_mock.clone();
+        tokio::spawn(async move {
+            tokio::time::sleep(Duration::from_secs(1)).await;
+            sui_client_mock_clone.set_bridge_committee(summary.clone());
+        });
+        let committee = get_latest_bridge_committee_with_blocklist_event(
+            sui_client.clone(),
+            event.clone(),
+            Duration::from_secs(2),
+        )
+        .await;
+        assert!(!committee.member(&pk_as_bytes).unwrap().is_blocklisted);
+        let elapsed = timer.elapsed().as_millis();
+        assert!(elapsed > 1000 && elapsed < 3000);
+
+        // Test the case where the onchain url is newer. It should retry up to
+        // REFRESH_BRIDGE_RETRY_TIMES time then return the onchain record.
+        let newer_summary = BridgeCommitteeSummary {
+            members: vec![(
+                pk_bytes.clone(),
+                MoveTypeCommitteeMember {
+                    sui_address: SuiAddress::random_for_testing_only(),
+                    bridge_pubkey_bytes: pk_bytes.clone(),
+                    voting_power: 10000,
+                    http_rest_url: "http://new.url".to_string().as_bytes().to_vec(),
+                    blocklisted: true,
+                },
+            )],
+            member_registration: vec![],
+            last_committee_update_epoch: 0,
+        };
+        sui_client_mock.set_bridge_committee(newer_summary.clone());
+        let timer = std::time::Instant::now();
+        let committee = get_latest_bridge_committee_with_blocklist_event(
+            sui_client.clone(),
+            event.clone(),
+            Duration::from_millis(500),
+        )
+        .await;
+        assert!(committee.member(&pk_as_bytes).unwrap().is_blocklisted);
+        let elapsed = timer.elapsed().as_millis();
+        assert!(elapsed > 500 * REFRESH_BRIDGE_RETRY_TIMES as u128);
+
+        // Test the case where the member onchain url is not found in the committee
+        // It should return the onchain record after retrying a few times.
+        let (_, kp2): (_, fastcrypto::secp256k1::Secp256k1KeyPair) = get_key_pair();
+        let pk2 = kp2.public().clone();
+        let pk_as_bytes2 = BridgeAuthorityPublicKeyBytes::from(&pk2);
+        let pk_bytes2 = pk_as_bytes2.as_bytes().to_vec();
+        let summary = BridgeCommitteeSummary {
+            members: vec![(
+                pk_bytes2.clone(),
+                MoveTypeCommitteeMember {
+                    sui_address: SuiAddress::random_for_testing_only(),
+                    bridge_pubkey_bytes: pk_bytes2.clone(),
+                    voting_power: 10000,
+                    http_rest_url: "http://newer.url".to_string().as_bytes().to_vec(),
+                    blocklisted: false,
+                },
+            )],
+            member_registration: vec![],
+            last_committee_update_epoch: 0,
+        };
+        sui_client_mock.set_bridge_committee(summary.clone());
+        let timer = std::time::Instant::now();
+        let committee = get_latest_bridge_committee_with_blocklist_event(
+            sui_client.clone(),
+            event.clone(),
+            Duration::from_secs(1),
+        )
+        .await;
+        assert_eq!(
+            committee.member(&pk_as_bytes2).unwrap().base_url,
+            "http://newer.url"
+        );
+        assert!(committee.member(&pk_as_bytes).is_none());
+        let elapsed = timer.elapsed().as_millis();
+        assert!(elapsed > 500 * REFRESH_BRIDGE_RETRY_TIMES as u128);
+
+        // Test any mismtach in the blocklist status should retry a few times
+        let event = BlocklistValidatorEvent {
+            blocklisted: true,
+            public_keys: vec![pk, pk2],
+        };
+        let summary = BridgeCommitteeSummary {
+            members: vec![
+                (
+                    pk_bytes.clone(),
+                    MoveTypeCommitteeMember {
+                        sui_address: SuiAddress::random_for_testing_only(),
+                        bridge_pubkey_bytes: pk_bytes.clone(),
+                        voting_power: 5000,
+                        http_rest_url: "http://pk.url".to_string().as_bytes().to_vec(),
+                        blocklisted: true,
+                    },
+                ),
+                (
+                    pk_bytes2.clone(),
+                    MoveTypeCommitteeMember {
+                        sui_address: SuiAddress::random_for_testing_only(),
+                        bridge_pubkey_bytes: pk_bytes2.clone(),
+                        voting_power: 5000,
+                        http_rest_url: "http://pk2.url".to_string().as_bytes().to_vec(),
+                        blocklisted: false,
+                    },
+                ),
+            ],
+            member_registration: vec![],
+            last_committee_update_epoch: 0,
+        };
+        sui_client_mock.set_bridge_committee(summary.clone());
+        let timer = std::time::Instant::now();
+        let committee = get_latest_bridge_committee_with_blocklist_event(
+            sui_client.clone(),
+            event.clone(),
+            Duration::from_millis(500),
+        )
+        .await;
+        assert!(committee.member(&pk_as_bytes).unwrap().is_blocklisted);
+        assert!(!committee.member(&pk_as_bytes2).unwrap().is_blocklisted);
+        let elapsed = timer.elapsed().as_millis();
+        assert!(elapsed > 500 * REFRESH_BRIDGE_RETRY_TIMES as u128);
+    }
+
+    #[tokio::test]
+    async fn test_get_bridge_pause_status_with_emergency_event() {
+        telemetry_subscribers::init_for_testing();
+        let sui_client_mock = SuiMockClient::default();
+        let sui_client = Arc::new(SuiClient::new_for_testing(sui_client_mock.clone()));
+
+        // Test event and onchain status match
+        let event = EmergencyOpEvent { frozen: true };
+        sui_client_mock.set_is_bridge_paused(BRIDGE_PAUSED);
+        let timer = std::time::Instant::now();
+        assert!(
+            get_latest_bridge_pause_status_with_emergency_event(
+                sui_client.clone(),
+                event.clone(),
+                Duration::from_secs(2),
+            )
+            .await
+        );
+        assert!(timer.elapsed().as_millis() < 500);
+
+        let event = EmergencyOpEvent { frozen: false };
+        sui_client_mock.set_is_bridge_paused(BRIDGE_UNPAUSED);
+        let timer = std::time::Instant::now();
+        assert!(
+            !get_latest_bridge_pause_status_with_emergency_event(
+                sui_client.clone(),
+                event.clone(),
+                Duration::from_secs(2),
+            )
+            .await
+        );
+        assert!(timer.elapsed().as_millis() < 500);
+
+        // Test the case where the onchain status (paused) is older. Then update onchain status in 1 second.
+        // Since the retry interval is 2 seconds, it should return the next retry.
+        sui_client_mock.set_is_bridge_paused(BRIDGE_PAUSED);
+        let timer = std::time::Instant::now();
+        // update the bridge to unpaused in 1 second
+        let sui_client_mock_clone = sui_client_mock.clone();
+        tokio::spawn(async move {
+            tokio::time::sleep(Duration::from_secs(1)).await;
+            sui_client_mock_clone.set_is_bridge_paused(BRIDGE_UNPAUSED);
+        });
+        assert!(
+            !get_latest_bridge_pause_status_with_emergency_event(
+                sui_client.clone(),
+                event.clone(),
+                Duration::from_secs(2),
+            )
+            .await
+        );
+        let elapsed = timer.elapsed().as_millis();
+        assert!(elapsed > 1000 && elapsed < 3000, "{}", elapsed);
+
+        // Test the case where the onchain status (paused) is newer. It should retry up to
+        // REFRESH_BRIDGE_RETRY_TIMES time then return the onchain record.
+        sui_client_mock.set_is_bridge_paused(BRIDGE_PAUSED);
+        let timer = std::time::Instant::now();
+        assert!(
+            get_latest_bridge_pause_status_with_emergency_event(
+                sui_client.clone(),
+                event.clone(),
+                Duration::from_secs(2),
+            )
+            .await
+        );
+        let elapsed = timer.elapsed().as_millis();
+        assert!(elapsed > 500 * REFRESH_BRIDGE_RETRY_TIMES as u128);
+    }
+
+    #[tokio::test]
+    async fn test_update_bridge_authority_aggregation_with_url_change_event() {
+        let (
+            monitor_tx,
+            monitor_rx,
+            sui_client_mock,
+            sui_client,
+            bridge_pause_tx,
+            _bridge_pause_rx,
+            mut authorities,
+        ) = setup();
+        let old_committee = BridgeCommittee::new(authorities.clone()).unwrap();
+        let agg = Arc::new(ArcSwap::new(Arc::new(BridgeAuthorityAggregator::new(
+            Arc::new(old_committee),
+        ))));
+        let sui_token_type_tags = Arc::new(ArcSwap::from(Arc::new(HashMap::new())));
+        let _handle = tokio::task::spawn(
+            BridgeMonitor::new(
+                sui_client.clone(),
+                monitor_rx,
+                agg.clone(),
+                bridge_pause_tx,
+                sui_token_type_tags,
+            )
+            .run(),
+        );
+        let new_url = "http://new.url".to_string();
+        authorities[0].base_url = new_url.clone();
+        let new_committee = BridgeCommittee::new(authorities.clone()).unwrap();
+        let new_committee_summary =
+            bridge_committee_to_bridge_committee_summary(new_committee.clone());
+        sui_client_mock.set_bridge_committee(new_committee_summary.clone());
+        monitor_tx
+            .send(SuiBridgeEvent::CommitteeMemberUrlUpdateEvent(
+                CommitteeMemberUrlUpdateEvent {
+                    member: authorities[0].pubkey.clone(),
+                    new_url: new_url.clone(),
+                },
+            ))
+            .await
+            .unwrap();
+        // Wait for the monitor to process the event
+        tokio::time::sleep(Duration::from_secs(1)).await;
+        // Now expect the committee to be updated
+        assert_eq!(
+            agg.load()
+                .committee
+                .member(&BridgeAuthorityPublicKeyBytes::from(&authorities[0].pubkey))
+                .unwrap()
+                .base_url,
+            new_url
+        );
+    }
+
+    #[tokio::test]
+    async fn test_update_bridge_authority_aggregation_with_blocklist_event() {
+        let (
+            monitor_tx,
+            monitor_rx,
+            sui_client_mock,
+            sui_client,
+            bridge_pause_tx,
+            _bridge_pause_rx,
+            mut authorities,
+        ) = setup();
+        let old_committee = BridgeCommittee::new(authorities.clone()).unwrap();
+        let agg = Arc::new(ArcSwap::new(Arc::new(BridgeAuthorityAggregator::new(
+            Arc::new(old_committee),
+        ))));
+        let sui_token_type_tags = Arc::new(ArcSwap::from(Arc::new(HashMap::new())));
+        let _handle = tokio::task::spawn(
+            BridgeMonitor::new(
+                sui_client.clone(),
+                monitor_rx,
+                agg.clone(),
+                bridge_pause_tx,
+                sui_token_type_tags,
+            )
+            .run(),
+        );
+        authorities[0].is_blocklisted = true;
+        let to_blocklist = &authorities[0];
+        let new_committee = BridgeCommittee::new(authorities.clone()).unwrap();
+        let new_committee_summary =
+            bridge_committee_to_bridge_committee_summary(new_committee.clone());
+        sui_client_mock.set_bridge_committee(new_committee_summary.clone());
+        monitor_tx
+            .send(SuiBridgeEvent::BlocklistValidatorEvent(
+                BlocklistValidatorEvent {
+                    public_keys: vec![to_blocklist.pubkey.clone()],
+                    blocklisted: true,
+                },
+            ))
+            .await
+            .unwrap();
+        // Wait for the monitor to process the event
+        tokio::time::sleep(Duration::from_secs(1)).await;
+        assert!(
+            agg.load()
+                .committee
+                .member(&BridgeAuthorityPublicKeyBytes::from(&to_blocklist.pubkey))
+                .unwrap()
+                .is_blocklisted,
+        );
+    }
+
+    #[tokio::test]
+    async fn test_update_bridge_pause_status_with_emergency_event() {
+        let (
+            monitor_tx,
+            monitor_rx,
+            sui_client_mock,
+            sui_client,
+            bridge_pause_tx,
+            bridge_pause_rx,
+            authorities,
+        ) = setup();
+        let event = EmergencyOpEvent {
+            frozen: !*bridge_pause_tx.borrow(), // toggle the bridge pause status
+        };
+        let committee = BridgeCommittee::new(authorities.clone()).unwrap();
+        let agg = Arc::new(ArcSwap::new(Arc::new(BridgeAuthorityAggregator::new(
+            Arc::new(committee),
+        ))));
+        let sui_token_type_tags = Arc::new(ArcSwap::from(Arc::new(HashMap::new())));
+        let _handle = tokio::task::spawn(
+            BridgeMonitor::new(
+                sui_client.clone(),
+                monitor_rx,
+                agg.clone(),
+                bridge_pause_tx,
+                sui_token_type_tags,
+            )
+            .run(),
+        );
+
+        sui_client_mock.set_is_bridge_paused(event.frozen);
+        monitor_tx
+            .send(SuiBridgeEvent::EmergencyOpEvent(event.clone()))
+            .await
+            .unwrap();
+        // Wait for the monitor to process the event
+        tokio::time::sleep(Duration::from_secs(1)).await;
+        // Now expect the committee to be updated
+        assert!(*bridge_pause_rx.borrow() == event.frozen);
+    }
+
+    #[tokio::test]
+    async fn test_update_sui_token_type_tags() {
+        let (
+            monitor_tx,
+            monitor_rx,
+            _sui_client_mock,
+            sui_client,
+            bridge_pause_tx,
+            _bridge_pause_rx,
+            authorities,
+        ) = setup();
+        let event = NewTokenEvent {
+            token_id: 255,
+            type_name: TypeTag::from_str("0xbeef::beef::BEEF").unwrap(),
+            native_token: false,
+            decimal_multiplier: 1000000,
+            notional_value: 100000000,
+        };
+        let committee = BridgeCommittee::new(authorities.clone()).unwrap();
+        let agg = Arc::new(ArcSwap::new(Arc::new(BridgeAuthorityAggregator::new(
+            Arc::new(committee),
+        ))));
+        let sui_token_type_tags = Arc::new(ArcSwap::from(Arc::new(HashMap::new())));
+        let sui_token_type_tags_clone = sui_token_type_tags.clone();
+        let _handle = tokio::task::spawn(
+            BridgeMonitor::new(
+                sui_client.clone(),
+                monitor_rx,
+                agg.clone(),
+                bridge_pause_tx,
+                sui_token_type_tags_clone,
+            )
+            .run(),
+        );
+
+        monitor_tx
+            .send(SuiBridgeEvent::NewTokenEvent(event.clone()))
+            .await
+            .unwrap();
+        // Wait for the monitor to process the event
+        tokio::time::sleep(Duration::from_secs(1)).await;
+        // Now expect new token type tags to appear in sui_token_type_tags
+        sui_token_type_tags
+            .load()
+            .clone()
+            .get(&event.token_id)
+            .unwrap();
+    }
+
+    #[allow(clippy::type_complexity)]
+    fn setup() -> (
+        mysten_metrics::metered_channel::Sender<SuiBridgeEvent>,
+        mysten_metrics::metered_channel::Receiver<SuiBridgeEvent>,
+        SuiMockClient,
+        Arc<SuiClient<SuiMockClient>>,
+        tokio::sync::watch::Sender<IsBridgePaused>,
+        tokio::sync::watch::Receiver<IsBridgePaused>,
+        Vec<BridgeAuthority>,
+    ) {
+        telemetry_subscribers::init_for_testing();
+        let registry = Registry::new();
+        mysten_metrics::init_metrics(&registry);
+        init_all_struct_tags();
+
+        let sui_client_mock = SuiMockClient::default();
+        let sui_client = Arc::new(SuiClient::new_for_testing(sui_client_mock.clone()));
+        let (monitor_tx, monitor_rx) = mysten_metrics::metered_channel::channel(
+            10000,
+            &mysten_metrics::get_metrics()
+                .unwrap()
+                .channel_inflight
+                .with_label_values(&["monitor_queue"]),
+        );
+        let (bridge_pause_tx, bridge_pause_rx) = tokio::sync::watch::channel(false);
+        let authorities = vec![
+            get_test_authority_and_key(2500, 0 /* port, dummy value */).0,
+            get_test_authority_and_key(2500, 0 /* port, dummy value */).0,
+            get_test_authority_and_key(2500, 0 /* port, dummy value */).0,
+            get_test_authority_and_key(2500, 0 /* port, dummy value */).0,
+        ];
+        (
+            monitor_tx,
+            monitor_rx,
+            sui_client_mock,
+            sui_client,
+            bridge_pause_tx,
+            bridge_pause_rx,
+            authorities,
+        )
+    }
+}
diff --git a/crates/sui-bridge/src/node.rs b/crates/sui-bridge/src/node.rs
index 6614941e9b0fc..97a7596cbcb74 100644
--- a/crates/sui-bridge/src/node.rs
+++ b/crates/sui-bridge/src/node.rs
@@ -8,6 +8,7 @@ use crate::{
     eth_syncer::EthSyncer,
     events::init_all_struct_tags,
     metrics::BridgeMetrics,
+    monitor::BridgeMonitor,
     orchestrator::BridgeOrchestrator,
     server::{handler::BridgeRequestHandler, run_server, BridgeNodePublicMetadata},
     storage::BridgeOrchestratorTables,
@@ -15,6 +16,7 @@ use crate::{
 };
 use arc_swap::ArcSwap;
 use ethers::types::Address as EthAddress;
+use mysten_metrics::spawn_logged_monitored_task;
 use std::{
     collections::HashMap,
     net::{IpAddr, Ipv4Addr, SocketAddr},
@@ -22,7 +24,10 @@ use std::{
     time::Duration,
 };
 use sui_types::{
-    bridge::{BRIDGE_COMMITTEE_MODULE_NAME, BRIDGE_MODULE_NAME},
+    bridge::{
+        BRIDGE_COMMITTEE_MODULE_NAME, BRIDGE_LIMITER_MODULE_NAME, BRIDGE_MODULE_NAME,
+        BRIDGE_TREASURY_MODULE_NAME,
+    },
     event::EventID,
     Identifier,
 };
@@ -108,27 +113,48 @@ async fn start_client_components(
     let bridge_auth_agg = Arc::new(ArcSwap::from(Arc::new(BridgeAuthorityAggregator::new(
         committee,
     ))));
+    // TODO: should we use one query instead of two?
     let sui_token_type_tags = sui_client.get_token_id_map().await.unwrap();
-    let (token_type_tags_tx, token_type_tags_rx) = tokio::sync::watch::channel(sui_token_type_tags);
+    let is_bridge_paused = sui_client.is_bridge_paused().await.unwrap();
 
+    let (bridge_pause_tx, bridge_pause_rx) = tokio::sync::watch::channel(is_bridge_paused);
+
+    let (monitor_tx, monitor_rx) = mysten_metrics::metered_channel::channel(
+        10000,
+        &mysten_metrics::get_metrics()
+            .unwrap()
+            .channel_inflight
+            .with_label_values(&["monitor_queue"]),
+    );
+    let sui_token_type_tags = Arc::new(ArcSwap::from(Arc::new(sui_token_type_tags)));
     let bridge_action_executor = BridgeActionExecutor::new(
         sui_client.clone(),
-        bridge_auth_agg,
+        bridge_auth_agg.clone(),
         store.clone(),
         client_config.key,
         client_config.sui_address,
         client_config.gas_object_ref.0,
-        token_type_tags_rx,
+        sui_token_type_tags.clone(),
+        bridge_pause_rx,
         metrics.clone(),
     )
     .await;
 
+    let monitor = BridgeMonitor::new(
+        sui_client.clone(),
+        monitor_rx,
+        bridge_auth_agg.clone(),
+        bridge_pause_tx,
+        sui_token_type_tags,
+    );
+    all_handles.push(spawn_logged_monitored_task!(monitor.run()));
+
     let orchestrator = BridgeOrchestrator::new(
         sui_client,
         sui_events_rx,
         eth_events_rx,
         store.clone(),
-        token_type_tags_tx,
+        monitor_tx,
         metrics,
     );
 
@@ -143,6 +169,8 @@ fn get_sui_modules_to_watch(
     let sui_bridge_modules = vec![
         BRIDGE_MODULE_NAME.to_owned(),
         BRIDGE_COMMITTEE_MODULE_NAME.to_owned(),
+        BRIDGE_TREASURY_MODULE_NAME.to_owned(),
+        BRIDGE_LIMITER_MODULE_NAME.to_owned(),
     ];
     if let Some(cursor) = sui_bridge_module_last_processed_event_id_override {
         info!("Overriding cursor for sui bridge modules to {:?}", cursor);
@@ -292,13 +320,17 @@ mod tests {
         let store = BridgeOrchestratorTables::new(temp_dir.path());
         let bridge_module = BRIDGE_MODULE_NAME.to_owned();
         let committee_module = BRIDGE_COMMITTEE_MODULE_NAME.to_owned();
+        let treasury_module = BRIDGE_TREASURY_MODULE_NAME.to_owned();
+        let limiter_module = BRIDGE_LIMITER_MODULE_NAME.to_owned();
         // No override, no stored watermark, use None
         let sui_modules_to_watch = get_sui_modules_to_watch(&store, None);
         assert_eq!(
             sui_modules_to_watch,
             vec![
                 (bridge_module.clone(), None),
-                (committee_module.clone(), None)
+                (committee_module.clone(), None),
+                (treasury_module.clone(), None),
+                (limiter_module.clone(), None)
             ]
             .into_iter()
             .collect::<HashMap<_, _>>()
@@ -314,7 +346,9 @@ mod tests {
             sui_modules_to_watch,
             vec![
                 (bridge_module.clone(), Some(override_cursor)),
-                (committee_module.clone(), Some(override_cursor))
+                (committee_module.clone(), Some(override_cursor)),
+                (treasury_module.clone(), Some(override_cursor)),
+                (limiter_module.clone(), Some(override_cursor))
             ]
             .into_iter()
             .collect::<HashMap<_, _>>()
@@ -334,7 +368,9 @@ mod tests {
             sui_modules_to_watch,
             vec![
                 (bridge_module.clone(), Some(stored_cursor)),
-                (committee_module.clone(), None)
+                (committee_module.clone(), None),
+                (treasury_module.clone(), None),
+                (limiter_module.clone(), None)
             ]
             .into_iter()
             .collect::<HashMap<_, _>>()
@@ -353,7 +389,9 @@ mod tests {
             sui_modules_to_watch,
             vec![
                 (bridge_module.clone(), Some(override_cursor)),
-                (committee_module.clone(), Some(override_cursor))
+                (committee_module.clone(), Some(override_cursor)),
+                (treasury_module.clone(), Some(override_cursor)),
+                (limiter_module.clone(), Some(override_cursor))
             ]
             .into_iter()
             .collect::<HashMap<_, _>>()
@@ -553,6 +591,7 @@ mod tests {
         BridgeTestClusterBuilder::new()
             .with_eth_env(true)
             .with_bridge_cluster(false)
+            .with_num_validators(2)
             .build()
             .await
     }
diff --git a/crates/sui-bridge/src/orchestrator.rs b/crates/sui-bridge/src/orchestrator.rs
index b519b43573ff5..247f5b13ea425 100644
--- a/crates/sui-bridge/src/orchestrator.rs
+++ b/crates/sui-bridge/src/orchestrator.rs
@@ -18,10 +18,9 @@ use crate::sui_client::{SuiClient, SuiClientInner};
 use crate::types::EthLog;
 use ethers::types::Address as EthAddress;
 use mysten_metrics::spawn_logged_monitored_task;
-use std::collections::HashMap;
 use std::sync::Arc;
 use sui_json_rpc_types::SuiEvent;
-use sui_types::{Identifier, TypeTag};
+use sui_types::Identifier;
 use tokio::task::JoinHandle;
 use tracing::{error, info};
 
@@ -30,7 +29,7 @@ pub struct BridgeOrchestrator<C> {
     sui_events_rx: mysten_metrics::metered_channel::Receiver<(Identifier, Vec<SuiEvent>)>,
     eth_events_rx: mysten_metrics::metered_channel::Receiver<(EthAddress, u64, Vec<EthLog>)>,
     store: Arc<BridgeOrchestratorTables>,
-    token_type_tags_tx: tokio::sync::watch::Sender<HashMap<u8, TypeTag>>,
+    monitor_tx: mysten_metrics::metered_channel::Sender<SuiBridgeEvent>,
     metrics: Arc<BridgeMetrics>,
 }
 
@@ -43,7 +42,7 @@ where
         sui_events_rx: mysten_metrics::metered_channel::Receiver<(Identifier, Vec<SuiEvent>)>,
         eth_events_rx: mysten_metrics::metered_channel::Receiver<(EthAddress, u64, Vec<EthLog>)>,
         store: Arc<BridgeOrchestratorTables>,
-        token_type_tags_tx: tokio::sync::watch::Sender<HashMap<u8, TypeTag>>,
+        monitor_tx: mysten_metrics::metered_channel::Sender<SuiBridgeEvent>,
         metrics: Arc<BridgeMetrics>,
     ) -> Self {
         Self {
@@ -51,7 +50,7 @@ where
             sui_events_rx,
             eth_events_rx,
             store,
-            token_type_tags_tx,
+            monitor_tx,
             metrics,
         }
     }
@@ -73,7 +72,7 @@ where
             store_clone,
             executor_sender_clone,
             self.sui_events_rx,
-            self.token_type_tags_tx,
+            self.monitor_tx,
             metrics_clone,
         )));
         let store_clone = self.store.clone();
@@ -97,7 +96,6 @@ where
             metrics_clone,
         )));
 
-        // TODO: spawn bridge committee change watcher task
         task_handles
     }
 
@@ -105,11 +103,10 @@ where
         store: Arc<BridgeOrchestratorTables>,
         executor_tx: mysten_metrics::metered_channel::Sender<BridgeActionExecutionWrapper>,
         mut sui_events_rx: mysten_metrics::metered_channel::Receiver<(Identifier, Vec<SuiEvent>)>,
-        token_type_tags_tx: tokio::sync::watch::Sender<HashMap<u8, TypeTag>>,
+        monitor_tx: mysten_metrics::metered_channel::Sender<SuiBridgeEvent>,
         metrics: Arc<BridgeMetrics>,
     ) {
         info!("Starting sui watcher task");
-        let mut latest_token_config = token_type_tags_tx.borrow().clone();
         while let Some((identifier, events)) = sui_events_rx.recv().await {
             if events.is_empty() {
                 continue;
@@ -150,29 +147,17 @@ where
                 let bridge_event: SuiBridgeEvent = opt_bridge_event.unwrap();
                 info!("Observed Sui bridge event: {:?}", bridge_event);
 
-                // Handle NewTokenEvent
-                if let SuiBridgeEvent::NewTokenEvent(e) = &bridge_event {
-                    if let std::collections::hash_map::Entry::Vacant(entry) =
-                        latest_token_config.entry(e.token_id)
-                    {
-                        entry.insert(e.type_name.clone());
-                        token_type_tags_tx
-                            .send(latest_token_config.clone())
-                            .expect("Sending token type tag should not fail");
-                    } else {
-                        // invariant
-                        assert_eq!(e.type_name, latest_token_config[&e.token_id]);
-                    }
-                    continue;
-                }
+                // Send event to monitor
+                monitor_tx
+                    .send(bridge_event.clone())
+                    .await
+                    .expect("Sending event to monitor channel should not fail");
 
                 if let Some(action) = bridge_event
                     .try_into_bridge_action(sui_event.id.tx_digest, sui_event.id.event_seq as u16)
                 {
                     actions.push(action);
                 }
-
-                // TODO: handle non Action events
             }
 
             if !actions.is_empty() {
@@ -278,16 +263,12 @@ where
 #[cfg(test)]
 mod tests {
     use crate::{
-        events::NewTokenEvent,
         test_utils::{get_test_eth_to_sui_bridge_action, get_test_log_and_action},
         types::BridgeActionDigest,
     };
     use ethers::types::{Address as EthAddress, TxHash};
-    use maplit::hashmap;
     use prometheus::Registry;
     use std::str::FromStr;
-    use sui_types::digests::TransactionDigest;
-    use tokio::time::Duration;
 
     use super::*;
     use crate::events::init_all_struct_tags;
@@ -299,10 +280,17 @@ mod tests {
         // Note: this test may fail because of the following reasons:
         // the SuiEvent's struct tag does not match the ones in events.rs
 
-        let (sui_events_tx, sui_events_rx, _eth_events_tx, eth_events_rx, sui_client, store) =
-            setup();
+        let (
+            sui_events_tx,
+            sui_events_rx,
+            _eth_events_tx,
+            eth_events_rx,
+            monitor_tx,
+            _monitor_rx,
+            sui_client,
+            store,
+        ) = setup();
         let (executor, mut executor_requested_action_rx) = MockExecutor::new();
-        let (token_type_tags_tx, _token_type_tags_rx) = tokio::sync::watch::channel(HashMap::new());
         // start orchestrator
         let registry = Registry::new();
         let metrics = Arc::new(BridgeMetrics::new(&registry));
@@ -311,7 +299,7 @@ mod tests {
             sui_events_rx,
             eth_events_rx,
             store.clone(),
-            token_type_tags_tx,
+            monitor_tx,
             metrics,
         )
         .run(executor)
@@ -350,77 +338,22 @@ mod tests {
         }
     }
 
-    #[tokio::test]
-    async fn test_sui_watcher_task_add_new_token() {
-        let (sui_events_tx, sui_events_rx, _eth_events_tx, eth_events_rx, sui_client, store) =
-            setup();
-
-        let (executor, _executor_requested_action_rx) = MockExecutor::new();
-        let (token_type_tags_tx, mut token_type_tags_rx) =
-            tokio::sync::watch::channel(HashMap::new());
-        // start orchestrator
-        let registry = Registry::new();
-        let metrics = Arc::new(BridgeMetrics::new(&registry));
-        let _handles = BridgeOrchestrator::new(
-            Arc::new(sui_client),
-            sui_events_rx,
-            eth_events_rx,
-            store.clone(),
-            token_type_tags_tx,
-            metrics,
-        )
-        .run(executor)
-        .await;
-
-        let identifier = Identifier::from_str("test_sui_watcher_task_add_new_token").unwrap();
-        let type_tag = TypeTag::from_str("0xbeef::beef::BEEF").unwrap();
-        let emitted_event = crate::events::MoveNewTokenEvent {
-            token_id: 255,
-            type_name: type_tag.to_canonical_string(false),
-            native_token: false,
-            decimal_multiplier: 1000000,
-            notional_value: 100000000,
-        };
-
-        let sui_event = SuiEvent {
-            type_: NewTokenEvent.get().unwrap().clone(),
-            bcs: bcs::to_bytes(&emitted_event).unwrap(),
-            id: sui_types::event::EventID {
-                tx_digest: TransactionDigest::random(),
-                event_seq: 1,
-            },
-
-            // The following fields do not matter as of writing,
-            // but if tests start to fail, it's worth checking these fields.
-            package_id: sui_types::base_types::ObjectID::ZERO,
-            transaction_module: identifier.clone(),
-            sender: sui_types::base_types::SuiAddress::random_for_testing_only(),
-            parsed_json: serde_json::json!({"test": "test"}),
-            timestamp_ms: None,
-        };
-        sui_events_tx
-            .send((identifier.clone(), vec![sui_event.clone()]))
-            .await
-            .unwrap();
-
-        tokio::time::timeout(Duration::from_secs(3), token_type_tags_rx.changed())
-            .await
-            .unwrap()
-            .unwrap();
-
-        let res = token_type_tags_rx.borrow().clone();
-        assert_eq!(res, hashmap! {255u8 => type_tag});
-    }
-
     #[tokio::test]
     async fn test_eth_watcher_task() {
         // Note: this test may fail beacuse of the following reasons:
         // 1. Log and BridgeAction returned from `get_test_log_and_action` are not in sync
         // 2. Log returned from `get_test_log_and_action` is not parseable log (not abigen!, check abi.rs)
 
-        let (_sui_events_tx, sui_events_rx, eth_events_tx, eth_events_rx, sui_client, store) =
-            setup();
-        let (token_type_tags_tx, _token_type_tags_rx) = tokio::sync::watch::channel(HashMap::new());
+        let (
+            _sui_events_tx,
+            sui_events_rx,
+            eth_events_tx,
+            eth_events_rx,
+            monitor_tx,
+            _monitor_rx,
+            sui_client,
+            store,
+        ) = setup();
         let (executor, mut executor_requested_action_rx) = MockExecutor::new();
         // start orchestrator
         let registry = Registry::new();
@@ -430,7 +363,7 @@ mod tests {
             sui_events_rx,
             eth_events_rx,
             store.clone(),
-            token_type_tags_tx,
+            monitor_tx,
             metrics,
         )
         .run(executor)
@@ -481,10 +414,17 @@ mod tests {
     #[tokio::test]
     /// Test that when orchestrator starts, all pending actions are sent to executor
     async fn test_resume_actions_in_pending_logs() {
-        let (_sui_events_tx, sui_events_rx, _eth_events_tx, eth_events_rx, sui_client, store) =
-            setup();
+        let (
+            _sui_events_tx,
+            sui_events_rx,
+            _eth_events_tx,
+            eth_events_rx,
+            monitor_tx,
+            _monitor_rx,
+            sui_client,
+            store,
+        ) = setup();
         let (executor, mut executor_requested_action_rx) = MockExecutor::new();
-        let (token_type_tags_tx, _token_type_tags_rx) = tokio::sync::watch::channel(HashMap::new());
 
         let action1 = get_test_sui_to_eth_bridge_action(
             None,
@@ -496,7 +436,7 @@ mod tests {
             None,
         );
 
-        let action2 = get_test_eth_to_sui_bridge_action(None, None, None);
+        let action2 = get_test_eth_to_sui_bridge_action(None, None, None, None);
         store
             .insert_pending_actions(&vec![action1.clone(), action2.clone()])
             .unwrap();
@@ -509,7 +449,7 @@ mod tests {
             sui_events_rx,
             eth_events_rx,
             store.clone(),
-            token_type_tags_tx,
+            monitor_tx,
             metrics,
         )
         .run(executor)
@@ -530,6 +470,8 @@ mod tests {
         mysten_metrics::metered_channel::Receiver<(Identifier, Vec<SuiEvent>)>,
         mysten_metrics::metered_channel::Sender<(EthAddress, u64, Vec<EthLog>)>,
         mysten_metrics::metered_channel::Receiver<(EthAddress, u64, Vec<EthLog>)>,
+        mysten_metrics::metered_channel::Sender<SuiBridgeEvent>,
+        mysten_metrics::metered_channel::Receiver<SuiBridgeEvent>,
         SuiClient<SuiMockClient>,
         Arc<BridgeOrchestratorTables>,
     ) {
@@ -560,12 +502,20 @@ mod tests {
                 .channel_inflight
                 .with_label_values(&["unit_test_sui_events_queue"]),
         );
-
+        let (monitor_tx, monitor_rx) = mysten_metrics::metered_channel::channel(
+            10000,
+            &mysten_metrics::get_metrics()
+                .unwrap()
+                .channel_inflight
+                .with_label_values(&["monitor_queue"]),
+        );
         (
             sui_events_tx,
             sui_events_rx,
             eth_events_tx,
             eth_events_rx,
+            monitor_tx,
+            monitor_rx,
             sui_client,
             store,
         )
diff --git a/crates/sui-bridge/src/server/mock_handler.rs b/crates/sui-bridge/src/server/mock_handler.rs
index 980d77123e8ea..f8b5e01fc912c 100644
--- a/crates/sui-bridge/src/server/mock_handler.rs
+++ b/crates/sui-bridge/src/server/mock_handler.rs
@@ -133,13 +133,15 @@ pub fn run_mock_server(
     mock_handler: BridgeRequestMockHandler,
 ) -> tokio::task::JoinHandle<()> {
     tracing::info!("Starting mock server at {}", socket_address);
-    let server = axum::Server::bind(&socket_address).serve(
-        make_router(
+    let listener = std::net::TcpListener::bind(socket_address).unwrap();
+    listener.set_nonblocking(true).unwrap();
+    let listener = tokio::net::TcpListener::from_std(listener).unwrap();
+    tokio::spawn(async move {
+        let router = make_router(
             Arc::new(mock_handler),
             Arc::new(BridgeMetrics::new_for_testing()),
             Arc::new(BridgeNodePublicMetadata::empty_for_testing()),
-        )
-        .into_make_service(),
-    );
-    tokio::spawn(async move { server.await.unwrap() })
+        );
+        axum::serve(listener, router).await.unwrap()
+    })
 }
diff --git a/crates/sui-bridge/src/server/mod.rs b/crates/sui-bridge/src/server/mod.rs
index 6f73472fbe362..9fad0cb0a6d30 100644
--- a/crates/sui-bridge/src/server/mod.rs
+++ b/crates/sui-bridge/src/server/mod.rs
@@ -83,10 +83,15 @@ pub fn run_server(
     metrics: Arc<BridgeMetrics>,
     metadata: Arc<BridgeNodePublicMetadata>,
 ) -> tokio::task::JoinHandle<()> {
-    let service = axum::Server::bind(socket_address)
-        .serve(make_router(Arc::new(handler), metrics, metadata).into_make_service());
+    let socket_address = *socket_address;
     tokio::spawn(async move {
-        service.await.unwrap();
+        let listener = tokio::net::TcpListener::bind(socket_address).await.unwrap();
+        axum::serve(
+            listener,
+            make_router(Arc::new(handler), metrics, metadata).into_make_service(),
+        )
+        .await
+        .unwrap();
     })
 }
 
diff --git a/crates/sui-bridge/src/storage.rs b/crates/sui-bridge/src/storage.rs
index c83ec90eb1365..f43600be5f601 100644
--- a/crates/sui-bridge/src/storage.rs
+++ b/crates/sui-bridge/src/storage.rs
@@ -10,8 +10,8 @@ use sui_types::event::EventID;
 use typed_store::rocks::{DBMap, MetricConf};
 use typed_store::traits::TableSummary;
 use typed_store::traits::TypedStoreDebug;
+use typed_store::DBMapUtils;
 use typed_store::Map;
-use typed_store_derive::DBMapUtils;
 
 use crate::error::{BridgeError, BridgeResult};
 use crate::types::{BridgeAction, BridgeActionDigest};
diff --git a/crates/sui-bridge/src/sui_client.rs b/crates/sui-bridge/src/sui_client.rs
index 97586c3825c5e..56ce77050554c 100644
--- a/crates/sui-bridge/src/sui_client.rs
+++ b/crates/sui-bridge/src/sui_client.rs
@@ -791,7 +791,7 @@ mod tests {
         let id_token_map = sui_client.get_token_id_map().await.unwrap();
 
         // 1. Create a Eth -> Sui Transfer (recipient is sender address), approve with validator secrets and assert its status to be Claimed
-        let action = get_test_eth_to_sui_bridge_action(None, Some(usdc_amount), Some(sender));
+        let action = get_test_eth_to_sui_bridge_action(None, Some(usdc_amount), Some(sender), None);
         let usdc_object_ref = approve_action_with_validator_secrets(
             context,
             bridge_object_arg,
diff --git a/crates/sui-bridge/src/sui_mock_client.rs b/crates/sui-bridge/src/sui_mock_client.rs
index 7f64be20003c4..f3094742d184f 100644
--- a/crates/sui-bridge/src/sui_mock_client.rs
+++ b/crates/sui-bridge/src/sui_mock_client.rs
@@ -12,7 +12,9 @@ use sui_json_rpc_types::SuiTransactionBlockResponse;
 use sui_json_rpc_types::{EventFilter, EventPage, SuiEvent};
 use sui_types::base_types::ObjectID;
 use sui_types::base_types::ObjectRef;
-use sui_types::bridge::{BridgeSummary, MoveTypeParsedTokenTransferMessage};
+use sui_types::bridge::{
+    BridgeCommitteeSummary, BridgeSummary, MoveTypeParsedTokenTransferMessage,
+};
 use sui_types::digests::TransactionDigest;
 use sui_types::event::EventID;
 use sui_types::gas_coin::GasCoin;
@@ -22,7 +24,7 @@ use sui_types::transaction::Transaction;
 use sui_types::Identifier;
 
 use crate::sui_client::SuiClientInner;
-use crate::types::{BridgeAction, BridgeActionStatus};
+use crate::types::{BridgeAction, BridgeActionStatus, IsBridgePaused};
 
 /// Mock client used in test environments.
 #[allow(clippy::type_complexity)]
@@ -40,7 +42,8 @@ pub struct SuiMockClient {
     wildcard_transaction_response: Arc<Mutex<Option<BridgeResult<SuiTransactionBlockResponse>>>>,
     get_object_info: Arc<Mutex<HashMap<ObjectID, (GasCoin, ObjectRef, Owner)>>>,
     onchain_status: Arc<Mutex<HashMap<(u8, u64), BridgeActionStatus>>>,
-
+    bridge_committee_summary: Arc<Mutex<Option<BridgeCommitteeSummary>>>,
+    is_paused: Arc<Mutex<Option<IsBridgePaused>>>,
     requested_transactions_tx: tokio::sync::broadcast::Sender<TransactionDigest>,
 }
 
@@ -56,6 +59,8 @@ impl SuiMockClient {
             wildcard_transaction_response: Default::default(),
             get_object_info: Default::default(),
             onchain_status: Default::default(),
+            bridge_committee_summary: Default::default(),
+            is_paused: Default::default(),
             requested_transactions_tx: tokio::sync::broadcast::channel(10000).0,
         }
     }
@@ -105,6 +110,17 @@ impl SuiMockClient {
             .insert((action.chain_id() as u8, action.seq_number()), status);
     }
 
+    pub fn set_bridge_committee(&self, committee: BridgeCommitteeSummary) {
+        self.bridge_committee_summary
+            .lock()
+            .unwrap()
+            .replace(committee);
+    }
+
+    pub fn set_is_bridge_paused(&self, value: IsBridgePaused) {
+        self.is_paused.lock().unwrap().replace(value);
+    }
+
     pub fn set_wildcard_transaction_response(
         &self,
         response: BridgeResult<SuiTransactionBlockResponse>,
@@ -198,9 +214,14 @@ impl SuiClientInner for SuiMockClient {
             chain_id: 0,
             sequence_nums: vec![],
             bridge_records_id: ObjectID::random(),
-            is_frozen: false,
+            is_frozen: self.is_paused.lock().unwrap().unwrap_or_default(),
             limiter: Default::default(),
-            committee: Default::default(),
+            committee: self
+                .bridge_committee_summary
+                .lock()
+                .unwrap()
+                .clone()
+                .unwrap_or_default(),
             treasury: Default::default(),
         })
     }
diff --git a/crates/sui-bridge/src/sui_transaction_builder.rs b/crates/sui-bridge/src/sui_transaction_builder.rs
index 3b1aab01b6f3d..8eb640b4f50b9 100644
--- a/crates/sui-bridge/src/sui_transaction_builder.rs
+++ b/crates/sui-bridge/src/sui_transaction_builder.rs
@@ -669,7 +669,7 @@ mod tests {
         let id_token_map = sui_client.get_token_id_map().await.unwrap();
 
         // 1. Test Eth -> Sui Transfer approval
-        let action = get_test_eth_to_sui_bridge_action(None, Some(usdc_amount), Some(sender));
+        let action = get_test_eth_to_sui_bridge_action(None, Some(usdc_amount), Some(sender), None);
         // `approve_action_with_validator_secrets` covers transaction building
         let usdc_object_ref = approve_action_with_validator_secrets(
             context,
diff --git a/crates/sui-bridge/src/test_utils.rs b/crates/sui-bridge/src/test_utils.rs
index 64d7b8ba02dc7..1449b87547268 100644
--- a/crates/sui-bridge/src/test_utils.rs
+++ b/crates/sui-bridge/src/test_utils.rs
@@ -7,7 +7,8 @@ use crate::events::SuiBridgeEvent;
 use crate::server::mock_handler::run_mock_server;
 use crate::sui_transaction_builder::build_sui_transaction;
 use crate::types::{
-    BridgeCommitteeValiditySignInfo, CertifiedBridgeAction, VerifiedCertifiedBridgeAction,
+    BridgeCommittee, BridgeCommitteeValiditySignInfo, CertifiedBridgeAction,
+    VerifiedCertifiedBridgeAction,
 };
 use crate::{
     crypto::{BridgeAuthorityKeyPair, BridgeAuthorityPublicKey, BridgeAuthoritySignInfo},
@@ -38,7 +39,9 @@ use sui_sdk::wallet_context::WalletContext;
 use sui_test_transaction_builder::TestTransactionBuilder;
 use sui_types::base_types::ObjectRef;
 use sui_types::base_types::SequenceNumber;
-use sui_types::bridge::{BridgeChainId, TOKEN_ID_USDC};
+use sui_types::bridge::MoveTypeCommitteeMember;
+use sui_types::bridge::{BridgeChainId, BridgeCommitteeSummary, TOKEN_ID_USDC};
+use sui_types::crypto::ToFromBytes;
 use sui_types::object::Owner;
 use sui_types::transaction::{CallArg, ObjectArg};
 use sui_types::{base_types::SuiAddress, crypto::get_key_pair, digests::TransactionDigest};
@@ -100,6 +103,7 @@ pub fn get_test_eth_to_sui_bridge_action(
     nonce: Option<u64>,
     amount: Option<u64>,
     sui_address: Option<SuiAddress>,
+    token_id: Option<u8>,
 ) -> BridgeAction {
     BridgeAction::EthToSuiBridgeAction(EthToSuiBridgeAction {
         eth_tx_hash: TxHash::random(),
@@ -108,7 +112,7 @@ pub fn get_test_eth_to_sui_bridge_action(
             eth_chain_id: BridgeChainId::EthCustom,
             nonce: nonce.unwrap_or_default(),
             sui_chain_id: BridgeChainId::SuiCustom,
-            token_id: TOKEN_ID_USDC,
+            token_id: token_id.unwrap_or(TOKEN_ID_USDC),
             sui_adjusted_amount: amount.unwrap_or(100_000),
             sui_address: sui_address.unwrap_or_else(SuiAddress::random_for_testing_only),
             eth_address: EthAddress::random(),
@@ -392,3 +396,29 @@ pub async fn approve_action_with_validator_secrets(
         expected_token_receiver
     );
 }
+
+pub fn bridge_committee_to_bridge_committee_summary(
+    committee: BridgeCommittee,
+) -> BridgeCommitteeSummary {
+    BridgeCommitteeSummary {
+        members: committee
+            .members()
+            .iter()
+            .map(|(k, v)| {
+                let bytes = k.as_bytes().to_vec();
+                (
+                    bytes.clone(),
+                    MoveTypeCommitteeMember {
+                        sui_address: SuiAddress::random_for_testing_only(),
+                        bridge_pubkey_bytes: bytes,
+                        voting_power: v.voting_power,
+                        http_rest_url: v.base_url.as_bytes().to_vec(),
+                        blocklisted: v.is_blocklisted,
+                    },
+                )
+            })
+            .collect(),
+        member_registration: vec![],
+        last_committee_update_epoch: 0,
+    }
+}
diff --git a/crates/sui-bridge/src/types.rs b/crates/sui-bridge/src/types.rs
index 7bdd6bf92586e..4fb157254a5a4 100644
--- a/crates/sui-bridge/src/types.rs
+++ b/crates/sui-bridge/src/types.rs
@@ -43,6 +43,10 @@ pub const BRIDGE_AUTHORITY_TOTAL_VOTING_POWER: u64 = 10000;
 
 pub const USD_MULTIPLIER: u64 = 10000; // decimal places = 4
 
+pub type IsBridgePaused = bool;
+pub const BRIDGE_PAUSED: bool = true;
+pub const BRIDGE_UNPAUSED: bool = false;
+
 #[derive(Debug, Eq, PartialEq, Clone)]
 pub struct BridgeAuthority {
     pub pubkey: BridgeAuthorityPublicKey,
@@ -350,7 +354,7 @@ impl BridgeAction {
     // Digest of BridgeAction (with Keccak256 hasher)
     pub fn digest(&self) -> BridgeActionDigest {
         let mut hasher = Keccak256::default();
-        hasher.update(&self.to_bytes());
+        hasher.update(self.to_bytes());
         BridgeActionDigest::new(hasher.finalize().into())
     }
 
@@ -660,7 +664,7 @@ mod tests {
         let action = get_test_sui_to_eth_bridge_action(None, None, None, None, None, None, None);
         assert_eq!(action.approval_threshold(), 3334);
 
-        let action = get_test_eth_to_sui_bridge_action(None, None, None);
+        let action = get_test_eth_to_sui_bridge_action(None, None, None, None);
         assert_eq!(action.approval_threshold(), 3334);
 
         let action = BridgeAction::BlocklistCommitteeAction(BlocklistCommitteeAction {
diff --git a/crates/sui-cluster-test/Cargo.toml b/crates/sui-cluster-test/Cargo.toml
index 9186b9ea56db2..ed9b467c1a3ce 100644
--- a/crates/sui-cluster-test/Cargo.toml
+++ b/crates/sui-cluster-test/Cargo.toml
@@ -28,7 +28,7 @@ regex.workspace = true
 
 sui-indexer.workspace = true
 sui-faucet.workspace = true
-sui-graphql-rpc.workspace = true
+# sui-graphql-rpc.workspace = true
 sui-swarm.workspace = true
 sui-swarm-config.workspace = true
 sui-json-rpc-types.workspace = true
diff --git a/crates/sui-cluster-test/src/test_case/coin_index_test.rs b/crates/sui-cluster-test/src/test_case/coin_index_test.rs
index e3977af2602dc..460180d2b8b22 100644
--- a/crates/sui-cluster-test/src/test_case/coin_index_test.rs
+++ b/crates/sui-cluster-test/src/test_case/coin_index_test.rs
@@ -631,7 +631,7 @@ async fn publish_managed_coin_package(
     let compiled_package = compile_managed_coin_package();
     let all_module_bytes =
         compiled_package.get_package_base64(/* with_unpublished_deps */ false);
-    let dependencies = compiled_package.get_dependency_original_package_ids();
+    let dependencies = compiled_package.get_dependency_storage_package_ids();
 
     let params = rpc_params![
         ctx.get_wallet_address(),
diff --git a/crates/sui-cluster-test/src/test_case/fullnode_build_publish_transaction_test.rs b/crates/sui-cluster-test/src/test_case/fullnode_build_publish_transaction_test.rs
index a53c685c46c9b..eef1107892b0f 100644
--- a/crates/sui-cluster-test/src/test_case/fullnode_build_publish_transaction_test.rs
+++ b/crates/sui-cluster-test/src/test_case/fullnode_build_publish_transaction_test.rs
@@ -24,7 +24,7 @@ impl TestCaseImpl for FullNodeBuildPublishTransactionTest {
         let compiled_package = compile_basics_package();
         let all_module_bytes =
             compiled_package.get_package_base64(/* with_unpublished_deps */ false);
-        let dependencies = compiled_package.get_dependency_original_package_ids();
+        let dependencies = compiled_package.get_dependency_storage_package_ids();
 
         let params = rpc_params![
             ctx.get_wallet_address(),
diff --git a/crates/sui-config/Cargo.toml b/crates/sui-config/Cargo.toml
index 87f5ab16a33ad..9704c09230224 100644
--- a/crates/sui-config/Cargo.toml
+++ b/crates/sui-config/Cargo.toml
@@ -6,6 +6,9 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 anemo.workspace = true
 anyhow = { workspace = true, features = ["backtrace"] }
diff --git a/crates/sui-config/src/node.rs b/crates/sui-config/src/node.rs
index 80ae3dd0a6fb1..9637ffe4e2be8 100644
--- a/crates/sui-config/src/node.rs
+++ b/crates/sui-config/src/node.rs
@@ -19,7 +19,6 @@ use std::num::NonZeroUsize;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use std::time::Duration;
-use std::usize;
 use sui_keys::keypair_file::{read_authority_keypair_from_file, read_keypair_from_file};
 use sui_types::base_types::{ObjectID, SuiAddress};
 use sui_types::committee::EpochId;
@@ -228,6 +227,8 @@ fn default_jwk_fetch_interval_seconds() -> u64 {
 
 pub fn default_zklogin_oauth_providers() -> BTreeMap<Chain, BTreeSet<String>> {
     let mut map = BTreeMap::new();
+
+    // providers that are available on devnet only.
     let experimental_providers = BTreeSet::from([
         "Google".to_string(),
         "Facebook".to_string(),
@@ -239,14 +240,19 @@ pub fn default_zklogin_oauth_providers() -> BTreeMap<Chain, BTreeSet<String>> {
         "Microsoft".to_string(),
         "KarrierOne".to_string(),
         "Credenza3".to_string(),
-        "AwsTenant-region:us-east-1-tenant_id:us-east-1_LPSLCkC3A".to_string(),
-        "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8".to_string(),
+        "AwsTenant-region:us-east-1-tenant_id:us-east-1_LPSLCkC3A".to_string(), // test tenant in mysten aws
+        "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8".to_string(), // ambrus, external partner
     ]);
+
+    // providers that are available for mainnet and testnet.
     let providers = BTreeSet::from([
         "Google".to_string(),
         "Facebook".to_string(),
         "Twitch".to_string(),
         "Apple".to_string(),
+        "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8".to_string(),
+        "KarrierOne".to_string(),
+        "Credenza3".to_string(),
     ]);
     map.insert(Chain::Mainnet, providers.clone());
     map.insert(Chain::Testnet, providers);
@@ -412,10 +418,17 @@ pub struct ConsensusConfig {
     // Base consensus DB path for all epochs.
     pub db_path: PathBuf,
 
+    // The number of epochs for which to retain the consensus DBs. Setting it to 0 will make a consensus DB getting
+    // dropped as soon as system is switched to a new epoch.
+    pub db_retention_epochs: Option<u64>,
+
+    // Pruner will run on every epoch change but it will also check periodically on every `db_pruner_period_secs`
+    // seconds to see if there are any epoch DBs to remove.
+    pub db_pruner_period_secs: Option<u64>,
+
     /// Maximum number of pending transactions to submit to consensus, including those
     /// in submission wait.
-    /// Assuming 10_000 txn tps * 10 sec consensus latency = 100_000 inflight consensus txns,
-    /// Default to 100_000.
+    /// Default to 20_000 inflight limit, assuming 20_000 txn tps * 1 sec consensus latency.
     pub max_pending_transactions: Option<usize>,
 
     /// When defined caps the calculated submission position to the max_submit_position. Even if the
@@ -444,7 +457,7 @@ impl ConsensusConfig {
     }
 
     pub fn max_pending_transactions(&self) -> usize {
-        self.max_pending_transactions.unwrap_or(100_000)
+        self.max_pending_transactions.unwrap_or(20_000)
     }
 
     pub fn submit_delay_step_override(&self) -> Option<Duration> {
@@ -455,6 +468,17 @@ impl ConsensusConfig {
     pub fn narwhal_config(&self) -> &NarwhalParameters {
         &self.narwhal_config
     }
+
+    pub fn db_retention_epochs(&self) -> u64 {
+        self.db_retention_epochs.unwrap_or(0)
+    }
+
+    pub fn db_pruner_period(&self) -> Duration {
+        // Default to 1 hour
+        self.db_pruner_period_secs
+            .map(Duration::from_secs)
+            .unwrap_or(Duration::from_secs(3_600))
+    }
 }
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
diff --git a/crates/sui-config/src/p2p.rs b/crates/sui-config/src/p2p.rs
index 4be9e93ddde90..7b7b4ba59198d 100644
--- a/crates/sui-config/src/p2p.rs
+++ b/crates/sui-config/src/p2p.rs
@@ -267,6 +267,7 @@ impl StateSyncConfig {
 /// * If the node marks itself as Private, only nodes that have it in
 ///     their `allowlisted_peers` or `seed_peers` will try to connect to it.
 /// * If not set, defaults to Public.
+///
 /// AccessType is useful when a network of nodes want to stay private. To achieve this,
 /// mark every node in this network as `Private` and allowlist/seed them to each other.
 #[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
diff --git a/crates/sui-core/Cargo.toml b/crates/sui-core/Cargo.toml
index ea3fdb6af1c93..2c596b502a54b 100644
--- a/crates/sui-core/Cargo.toml
+++ b/crates/sui-core/Cargo.toml
@@ -6,6 +6,9 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 anyhow = { workspace = true, features = ["backtrace"] }
 arc-swap.workspace = true
@@ -37,7 +40,6 @@ prometheus.workspace = true
 rand.workspace = true
 roaring.workspace = true
 rayon.workspace = true
-rocksdb.workspace = true
 reqwest.workspace = true
 scopeguard.workspace = true
 serde.workspace = true
@@ -66,7 +68,6 @@ move-symbol-pool.workspace = true
 mysten-common.workspace = true
 mysten-network.workspace = true
 telemetry-subscribers.workspace = true
-typed-store-derive.workspace = true
 typed-store.workspace = true
 
 mysten-metrics.workspace = true
@@ -87,7 +88,6 @@ sui-framework.workspace = true
 sui-swarm-config.workspace = true
 sui-genesis-builder.workspace = true
 sui-json-rpc-types.workspace = true
-sui-rest-api.workspace = true
 sui-macros.workspace = true
 sui-move-build.workspace = true
 sui-network.workspace = true
diff --git a/crates/sui-core/src/authority.rs b/crates/sui-core/src/authority.rs
index c6ec89b460ff7..c94076206a994 100644
--- a/crates/sui-core/src/authority.rs
+++ b/crates/sui-core/src/authority.rs
@@ -865,15 +865,12 @@ impl AuthorityState {
             self.get_backing_package_store().as_ref(),
         )?;
 
-        let (input_objects, receiving_objects) = self
-            .input_loader
-            .read_objects_for_signing(
-                Some(tx_digest),
-                &input_object_kinds,
-                &receiving_objects_refs,
-                epoch_store.epoch(),
-            )
-            .await?;
+        let (input_objects, receiving_objects) = self.input_loader.read_objects_for_signing(
+            Some(tx_digest),
+            &input_object_kinds,
+            &receiving_objects_refs,
+            epoch_store.epoch(),
+        )?;
 
         let (_gas_status, checked_input_objects) = sui_transaction_checks::check_transaction_input(
             epoch_store.protocol_config(),
@@ -1162,9 +1159,7 @@ impl AuthorityState {
         debug!("execute_certificate_internal");
 
         let tx_digest = certificate.digest();
-        let input_objects = self
-            .read_objects_for_execution(certificate, epoch_store)
-            .await?;
+        let input_objects = self.read_objects_for_execution(certificate, epoch_store)?;
 
         if expected_effects_digest.is_none() {
             // We could be re-executing a previously executed but uncommitted transaction, perhaps after
@@ -1191,7 +1186,7 @@ impl AuthorityState {
         .tap_err(|e| info!(?tx_digest, "process_certificate failed: {e}"))
     }
 
-    pub async fn read_objects_for_execution(
+    pub fn read_objects_for_execution(
         &self,
         certificate: &VerifiedExecutableTransaction,
         epoch_store: &Arc<AuthorityPerEpochStore>,
@@ -1202,14 +1197,12 @@ impl AuthorityState {
             .execution_load_input_objects_latency
             .start_timer();
         let input_objects = &certificate.data().transaction_data().input_objects()?;
-        self.input_loader
-            .read_objects_for_execution(
-                epoch_store.as_ref(),
-                &certificate.key(),
-                input_objects,
-                epoch_store.epoch(),
-            )
-            .await
+        self.input_loader.read_objects_for_execution(
+            epoch_store.as_ref(),
+            &certificate.key(),
+            input_objects,
+            epoch_store.epoch(),
+        )
     }
 
     /// Test only wrapper for `try_execute_immediately()` above, useful for checking errors if the
@@ -1736,16 +1729,13 @@ impl AuthorityState {
             self.get_backing_package_store().as_ref(),
         )?;
 
-        let (input_objects, receiving_objects) = self
-            .input_loader
-            .read_objects_for_signing(
-                // We don't want to cache this transaction since it's a dry run.
-                None,
-                &input_object_kinds,
-                &receiving_object_refs,
-                epoch_store.epoch(),
-            )
-            .await?;
+        let (input_objects, receiving_objects) = self.input_loader.read_objects_for_signing(
+            // We don't want to cache this transaction since it's a dry run.
+            None,
+            &input_object_kinds,
+            &receiving_object_refs,
+            epoch_store.epoch(),
+        )?;
 
         // make a gas object if one was not provided
         let mut gas_object_refs = transaction.gas().to_vec();
@@ -1955,16 +1945,13 @@ impl AuthorityState {
             self.get_backing_package_store().as_ref(),
         )?;
 
-        let (mut input_objects, receiving_objects) = self
-            .input_loader
-            .read_objects_for_signing(
-                // We don't want to cache this transaction since it's a dev inspect.
-                None,
-                &input_object_kinds,
-                &receiving_object_refs,
-                epoch_store.epoch(),
-            )
-            .await?;
+        let (mut input_objects, receiving_objects) = self.input_loader.read_objects_for_signing(
+            // We don't want to cache this transaction since it's a dev inspect.
+            None,
+            &input_object_kinds,
+            &receiving_object_refs,
+            epoch_store.epoch(),
+        )?;
 
         // Create and use a dummy gas object if there is no gas object provided.
         let dummy_gas_object = Object::new_gas_with_balance_and_owner_for_testing(
@@ -3664,12 +3651,12 @@ impl AuthorityState {
                     .rev()
                     .skip_while(|d| cursor.is_some() && Some(*d) != cursor)
                     .skip(usize::from(cursor.is_some()));
-                return Ok(iter.take(limit.unwrap_or(usize::max_value())).collect());
+                return Ok(iter.take(limit.unwrap_or(usize::MAX)).collect());
             } else {
                 let iter = iter
                     .skip_while(|d| cursor.is_some() && Some(*d) != cursor)
                     .skip(usize::from(cursor.is_some()));
-                return Ok(iter.take(limit.unwrap_or(usize::max_value())).collect());
+                return Ok(iter.take(limit.unwrap_or(usize::MAX)).collect());
             }
         }
         self.get_indexes()?
@@ -4853,9 +4840,7 @@ impl AuthorityState {
             )
             .await?;
 
-        let input_objects = self
-            .read_objects_for_execution(&executable_tx, epoch_store)
-            .await?;
+        let input_objects = self.read_objects_for_execution(&executable_tx, epoch_store)?;
 
         let (temporary_store, effects, _execution_error_opt) =
             self.prepare_certificate(&execution_guard, &executable_tx, input_objects, epoch_store)?;
@@ -5484,7 +5469,6 @@ impl NodeStateDump {
         Ok(path)
     }
 
-    #[cfg(not(release))]
     pub fn read_from_file(path: &PathBuf) -> Result<Self, anyhow::Error> {
         let file = File::open(path)?;
         serde_json::from_reader(file).map_err(|e| anyhow::anyhow!(e))
diff --git a/crates/sui-core/src/authority/authority_per_epoch_store.rs b/crates/sui-core/src/authority/authority_per_epoch_store.rs
index 9803d29300353..9e922112eff57 100644
--- a/crates/sui-core/src/authority/authority_per_epoch_store.rs
+++ b/crates/sui-core/src/authority/authority_per_epoch_store.rs
@@ -14,7 +14,6 @@ use itertools::{izip, Itertools};
 use narwhal_executor::ExecutionIndices;
 use parking_lot::RwLock;
 use parking_lot::{Mutex, RwLockReadGuard, RwLockWriteGuard};
-use rocksdb::Options;
 use serde::{Deserialize, Serialize};
 use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet, VecDeque};
 use std::future::Future;
@@ -41,6 +40,7 @@ use sui_types::transaction::{
 use tokio::sync::OnceCell;
 use tracing::{debug, error, info, instrument, trace, warn};
 use typed_store::rocks::{read_size_from_env, ReadWriteOptions};
+use typed_store::rocksdb::Options;
 use typed_store::{
     rocks::{default_db_options, DBBatch, DBMap, DBOptions, MetricConf},
     traits::{TableSummary, TypedStoreDebug},
@@ -108,8 +108,8 @@ use sui_types::sui_system_state::epoch_start_sui_system_state::{
 };
 use tap::TapOptional;
 use tokio::time::Instant;
+use typed_store::DBMapUtils;
 use typed_store::{retry_transaction_forever, Map};
-use typed_store_derive::DBMapUtils;
 
 /// The key where the latest consensus index is stored in the database.
 // TODO: Make a single table (e.g., called `variables`) storing all our lonely variables in one place.
@@ -125,8 +125,8 @@ pub(crate) type EncG = bls12381::G2Element;
 // CertLockGuard and CertTxGuard are functionally identical right now, but we retain a distinction
 // anyway. If we need to support distributed object storage, having this distinction will be
 // useful, as we will most likely have to re-implement a retry / write-ahead-log at that point.
-pub struct CertLockGuard(MutexGuard);
-pub struct CertTxGuard(CertLockGuard);
+pub struct CertLockGuard(#[allow(unused)] MutexGuard);
+pub struct CertTxGuard(#[allow(unused)] CertLockGuard);
 
 impl CertTxGuard {
     pub fn release(self) {}
@@ -370,15 +370,15 @@ pub struct AuthorityEpochTables {
     /// The tables below manage shared object locks / versions. There are three ways they can be
     /// updated:
     /// 1. (validators only): Upon receiving a certified transaction from consensus, the authority
-    /// assigns the next version to each shared object of the transaction. The next versions of
-    /// the shared objects are updated as well.
+    ///     assigns the next version to each shared object of the transaction. The next versions of
+    ///     the shared objects are updated as well.
     /// 2. (validators only): Upon receiving a new consensus commit, the authority assigns the
-    /// next version of the randomness state object to an expected future transaction to be
-    /// generated after the next random value is available. The next version of the randomness
-    /// state object is updated as well.
+    ///     next version of the randomness state object to an expected future transaction to be
+    ///     generated after the next random value is available. The next version of the randomness
+    ///     state object is updated as well.
     /// 3. (fullnodes + validators): Upon receiving a certified effect from state sync, or
-    /// transaction orchestrator fast execution path, the node assigns the shared object
-    /// versions from the transaction effect. Next object versions are not updated.
+    ///     transaction orchestrator fast execution path, the node assigns the shared object
+    ///     versions from the transaction effect. Next object versions are not updated.
     ///
     /// REQUIRED: all authorities must assign the same shared object versions for each transaction.
     assigned_shared_object_versions: DBMap<TransactionDigest, Vec<(ObjectID, SequenceNumber)>>,
diff --git a/crates/sui-core/src/authority/authority_store_pruner.rs b/crates/sui-core/src/authority/authority_store_pruner.rs
index 532efa42c33f5..17f34f5755f89 100644
--- a/crates/sui-core/src/authority/authority_store_pruner.rs
+++ b/crates/sui-core/src/authority/authority_store_pruner.rs
@@ -11,7 +11,6 @@ use prometheus::{
     register_int_counter_with_registry, register_int_gauge_with_registry, IntCounter, IntGauge,
     Registry,
 };
-use rocksdb::LiveFile;
 use std::cmp::{max, min};
 use std::collections::{BTreeSet, HashMap};
 use std::sync::Mutex;
@@ -35,6 +34,7 @@ use sui_types::{
 use tokio::sync::oneshot::{self, Sender};
 use tokio::time::Instant;
 use tracing::{debug, error, info, warn};
+use typed_store::rocksdb::LiveFile;
 use typed_store::{Map, TypedStoreError};
 
 use super::authority_store_tables::AuthorityPerpetualTables;
@@ -780,7 +780,7 @@ mod tests {
         let perpetual_db_path = path.join(Path::new("perpetual"));
         let cf_names = AuthorityPerpetualTables::describe_tables();
         let cfs: Vec<&str> = cf_names.keys().map(|x| x.as_str()).collect();
-        let mut db_options = rocksdb::Options::default();
+        let mut db_options = typed_store::rocksdb::Options::default();
         db_options.set_merge_operator(
             "refcount operator",
             reference_count_merge_operator,
@@ -1152,6 +1152,8 @@ mod pprof_tests {
     }
 
     #[tokio::test]
+    // un-ignore once https://github.com/tikv/pprof-rs/issues/250 is fixed
+    #[ignore]
     async fn ensure_no_tombstone_fragmentation_in_stack_frame_with_ignore_tombstones(
     ) -> Result<(), anyhow::Error> {
         // This test writes a bunch of objects to objects table, invokes pruning on it and
@@ -1188,6 +1190,8 @@ mod pprof_tests {
     }
 
     #[tokio::test]
+    // un-ignore once https://github.com/tikv/pprof-rs/issues/250 is fixed
+    #[ignore]
     async fn ensure_no_tombstone_fragmentation_in_stack_frame_after_flush(
     ) -> Result<(), anyhow::Error> {
         // This test writes a bunch of objects to objects table, invokes pruning on it and
diff --git a/crates/sui-core/src/authority/authority_store_tables.rs b/crates/sui-core/src/authority/authority_store_tables.rs
index d22a9f2b99c99..db8394b2de2d5 100644
--- a/crates/sui-core/src/authority/authority_store_tables.rs
+++ b/crates/sui-core/src/authority/authority_store_tables.rs
@@ -3,7 +3,6 @@
 
 use super::*;
 use crate::authority::authority_store::LockDetailsWrapperDeprecated;
-use rocksdb::Options;
 use serde::{Deserialize, Serialize};
 use std::path::Path;
 use sui_types::accumulator::Accumulator;
@@ -16,6 +15,7 @@ use typed_store::rocks::util::{empty_compaction_filter, reference_count_merge_op
 use typed_store::rocks::{
     default_db_options, read_size_from_env, DBBatch, DBMap, DBOptions, MetricConf, ReadWriteOptions,
 };
+use typed_store::rocksdb::Options;
 use typed_store::traits::{Map, TableSummary, TypedStoreDebug};
 
 use crate::authority::authority_store_types::{
@@ -23,7 +23,7 @@ use crate::authority::authority_store_types::{
     StoreMoveObjectWrapper, StoreObject, StoreObjectPair, StoreObjectValue, StoreObjectWrapper,
 };
 use crate::authority::epoch_start_configuration::EpochStartConfiguration;
-use typed_store_derive::DBMapUtils;
+use typed_store::DBMapUtils;
 
 const ENV_VAR_OBJECTS_BLOCK_CACHE_SIZE: &str = "OBJECTS_BLOCK_CACHE_MB";
 pub(crate) const ENV_VAR_LOCKS_BLOCK_CACHE_SIZE: &str = "LOCKS_BLOCK_CACHE_MB";
@@ -71,9 +71,10 @@ pub struct AuthorityPerpetualTables {
     /// A map between the transaction digest of a certificate to the effects of its execution.
     /// We store effects into this table in two different cases:
     /// 1. When a transaction is synced through state_sync, we store the effects here. These effects
-    /// are known to be final in the network, but may not have been executed locally yet.
+    ///     are known to be final in the network, but may not have been executed locally yet.
     /// 2. When the transaction is executed locally on this node, we store the effects here. This means that
-    /// it's possible to store the same effects twice (once for the synced transaction, and once for the executed).
+    ///     it's possible to store the same effects twice (once for the synced transaction, and once for the executed).
+    ///
     /// It's also possible for the effects to be reverted if the transaction didn't make it into the epoch.
     #[default_options_override_fn = "effects_table_default_config"]
     pub(crate) effects: DBMap<TransactionEffectsDigest, TransactionEffects>,
diff --git a/crates/sui-core/src/authority/shared_object_congestion_tracker.rs b/crates/sui-core/src/authority/shared_object_congestion_tracker.rs
index 4732afe4b7399..041e523594074 100644
--- a/crates/sui-core/src/authority/shared_object_congestion_tracker.rs
+++ b/crates/sui-core/src/authority/shared_object_congestion_tracker.rs
@@ -78,9 +78,7 @@ impl SharedObjectCongestionTracker {
         previously_deferred_tx_digests: &HashMap<TransactionDigest, DeferralKey>,
         commit_round: Round,
     ) -> Option<(DeferralKey, Vec<ObjectID>)> {
-        let Some(tx_cost) = self.get_tx_cost(cert) else {
-            return None;
-        };
+        let tx_cost = self.get_tx_cost(cert)?;
 
         let shared_input_objects: Vec<_> = cert.shared_input_objects().collect();
         if shared_input_objects.is_empty() {
diff --git a/crates/sui-core/src/authority/test_authority_builder.rs b/crates/sui-core/src/authority/test_authority_builder.rs
index a1fc9c40020c8..6ba9dd32d4801 100644
--- a/crates/sui-core/src/authority/test_authority_builder.rs
+++ b/crates/sui-core/src/authority/test_authority_builder.rs
@@ -227,10 +227,7 @@ impl<'a> TestAuthorityBuilder<'a> {
             epoch_flags,
         )
         .unwrap();
-        let expensive_safety_checks = match self.expensive_safety_checks {
-            None => ExpensiveSafetyCheckConfig::default(),
-            Some(config) => config,
-        };
+        let expensive_safety_checks = self.expensive_safety_checks.unwrap_or_default();
 
         let cache_traits =
             build_execution_cache(&epoch_start_configuration, &registry, &authority_store);
diff --git a/crates/sui-core/src/authority/transaction_deferral.rs b/crates/sui-core/src/authority/transaction_deferral.rs
index c9912aecd9f78..288ce26013edc 100644
--- a/crates/sui-core/src/authority/transaction_deferral.rs
+++ b/crates/sui-core/src/authority/transaction_deferral.rs
@@ -101,12 +101,12 @@ pub fn transaction_deferral_within_limit(
 #[cfg(test)]
 mod object_cost_tests {
     use super::*;
+    use typed_store::DBMapUtils;
     use typed_store::Map;
     use typed_store::{
         rocks::{DBMap, MetricConf},
         traits::{TableSummary, TypedStoreDebug},
     };
-    use typed_store_derive::DBMapUtils;
 
     #[tokio::test]
     async fn test_deferral_key_sort_order() {
diff --git a/crates/sui-core/src/authority_aggregator.rs b/crates/sui-core/src/authority_aggregator.rs
index 6bc31210d6c51..c5fc1e57d158f 100644
--- a/crates/sui-core/src/authority_aggregator.rs
+++ b/crates/sui-core/src/authority_aggregator.rs
@@ -104,6 +104,7 @@ pub struct AuthAggMetrics {
     pub cert_broadcasting_post_quorum_timeout: IntCounter,
     pub remaining_tasks_when_reaching_cert_quorum: Histogram,
     pub remaining_tasks_when_cert_broadcasting_post_quorum_timeout: Histogram,
+    pub quorum_reached_without_requested_objects: IntCounter,
 }
 
 impl AuthAggMetrics {
@@ -188,7 +189,13 @@ impl AuthAggMetrics {
                 "auth_agg_remaining_tasks_when_cert_broadcasting_post_quorum_timeout",
                 "Number of remaining tasks when post quorum certificate broadcasting times out",
                 registry,
+            ),
+            quorum_reached_without_requested_objects: register_int_counter_with_registry!(
+                "auth_agg_quorum_reached_without_requested_objects",
+                "Number of times quorum was reached without getting the requested objects back from at least 1 validator",
+                registry,
             )
+            .unwrap(),
         }
     }
 
@@ -277,6 +284,7 @@ pub enum AggregatorProcessCertificateError {
 }
 
 pub fn group_errors(errors: Vec<(SuiError, Vec<AuthorityName>, StakeUnit)>) -> GroupedErrors {
+    #[allow(clippy::mutable_key_type)]
     let mut grouped_errors = HashMap::new();
     for (error, names, stake) in errors {
         let entry = grouped_errors.entry(error).or_insert((0, vec![]));
@@ -453,6 +461,7 @@ struct ProcessCertificateState {
     input_objects: Option<Vec<Object>>,
     output_objects: Option<Vec<Object>>,
     auxiliary_data: Option<Vec<u8>>,
+    request: HandleCertificateRequestV3,
 }
 
 #[derive(Debug)]
@@ -1496,16 +1505,17 @@ where
             input_objects: None,
             output_objects: None,
             auxiliary_data: None,
+            request: request.clone(),
         };
 
         // create a set of validators that we should sample to request input/output objects from
         let validators_to_sample =
             if request.include_input_objects || request.include_output_objects {
-                // Always at least ask 1 validator
-                let number_to_sample = std::cmp::max(1, self.committee.num_members() / 2);
+                // Number of validators to request input/output objects from
+                const NUMBER_TO_SAMPLE: usize = 10;
 
                 self.committee
-                    .choose_multiple_weighted_iter(number_to_sample)
+                    .choose_multiple_weighted_iter(NUMBER_TO_SAMPLE)
                     .cloned()
                     .collect()
             } else {
@@ -1546,7 +1556,6 @@ where
                             request_ref
                         } else {
                             HandleCertificateRequestV3 {
-                                include_events: false,
                                 include_input_objects: false,
                                 include_output_objects: false,
                                 include_auxiliary_data: false,
@@ -1582,6 +1591,7 @@ where
                     // and return.
                     match AuthorityAggregator::<A>::handle_process_certificate_response(
                         committee_clone,
+                        &metrics,
                         &tx_digest, &mut state, response, name)
                     {
                         Ok(Some(effects)) => ReduceOutput::Success(effects),
@@ -1694,6 +1704,7 @@ where
 
     fn handle_process_certificate_response(
         committee: Arc<Committee>,
+        metrics: &AuthAggMetrics,
         tx_digest: &TransactionDigest,
         state: &mut ProcessCertificateState,
         response: SuiResult<HandleCertificateResponseV3>,
@@ -1757,6 +1768,15 @@ where
                             signed_effects.into_data(),
                             cert_sig,
                         );
+
+                        if (state.request.include_input_objects && state.input_objects.is_none())
+                            || (state.request.include_output_objects
+                                && state.output_objects.is_none())
+                        {
+                            metrics.quorum_reached_without_requested_objects.inc();
+                            debug!(?tx_digest, "Quorum Reached but requested input/output objects were not returned");
+                        }
+
                         ct.verify(&committee).map(|ct| {
                             debug!(?tx_digest, "Got quorum for validators handle_certificate.");
                             Some(QuorumDriverResponse {
diff --git a/crates/sui-core/src/authority_server.rs b/crates/sui-core/src/authority_server.rs
index 31aec18b6aecc..cb819f18a1a16 100644
--- a/crates/sui-core/src/authority_server.rs
+++ b/crates/sui-core/src/authority_server.rs
@@ -173,6 +173,7 @@ pub struct ValidatorServiceMetrics {
     pub submit_certificate_consensus_latency: MystenHistogram,
     pub handle_certificate_consensus_latency: MystenHistogram,
     pub handle_certificate_non_consensus_latency: MystenHistogram,
+    pub handle_soft_bundle_certificates_consensus_latency: MystenHistogram,
 
     num_rejected_tx_in_epoch_boundary: IntCounter,
     num_rejected_cert_in_epoch_boundary: IntCounter,
@@ -228,6 +229,11 @@ impl ValidatorServiceMetrics {
                 "Latency of handling a non-consensus transaction certificate",
                 registry,
             ),
+            handle_soft_bundle_certificates_consensus_latency: MystenHistogram::new_in_registry(
+                "validator_service_handle_soft_bundle_certificates_consensus_latency",
+                "Latency of handling a consensus soft bundle",
+                registry,
+            ),
             num_rejected_tx_in_epoch_boundary: register_int_counter_with_registry!(
                 "validator_service_num_rejected_tx_in_epoch_boundary",
                 "Number of rejected transaction during epoch transitioning",
@@ -451,24 +457,29 @@ impl ValidatorService {
             SuiError::FullNodeCantHandleCertificate.into()
         );
 
-        let shared_object_tx = certificates[0].contains_shared_object();
+        let shared_object_tx = certificates
+            .iter()
+            .any(|cert| cert.contains_shared_object());
 
-        let _metrics_guard = if wait_for_effects {
-            if shared_object_tx {
-                self.metrics
-                    .handle_certificate_consensus_latency
-                    .start_timer()
+        let metrics = if certificates.len() == 1 {
+            if wait_for_effects {
+                if shared_object_tx {
+                    &self.metrics.handle_certificate_consensus_latency
+                } else {
+                    &self.metrics.handle_certificate_non_consensus_latency
+                }
             } else {
-                self.metrics
-                    .handle_certificate_non_consensus_latency
-                    .start_timer()
+                &self.metrics.submit_certificate_consensus_latency
             }
         } else {
-            self.metrics
-                .submit_certificate_consensus_latency
-                .start_timer()
+            // `soft_bundle_validity_check` ensured that all certificates contain shared objects.
+            &self
+                .metrics
+                .handle_soft_bundle_certificates_consensus_latency
         };
 
+        let _metrics_guard = metrics.start_timer();
+
         // 1) Check if the certificate is already executed.
         //    This is only needed when we have only one certificate (not a soft bundle).
         //    When multiple certificates are provided, we will either submit all of them or none of them to consensus.
@@ -827,6 +838,11 @@ impl ValidatorService {
         request: tonic::Request<HandleSoftBundleCertificatesRequestV3>,
     ) -> WrappedServiceResponse<HandleSoftBundleCertificatesResponseV3> {
         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)
+        } else {
+            self.get_client_ip_addr(&request, self.client_id_source.as_ref().unwrap())
+        };
         let request = request.into_inner();
 
         let certificates = NonEmpty::from_vec(request.certificates)
@@ -840,6 +856,18 @@ impl ValidatorService {
         self.soft_bundle_validity_check(&certificates, &epoch_store)
             .await?;
 
+        info!(
+            "Received Soft Bundle with {} certificates, from {}, tx digests are [{}]",
+            certificates.len(),
+            client_addr
+                .map(|x| x.to_string())
+                .unwrap_or_else(|| "unknown".to_string()),
+            certificates
+                .iter()
+                .map(|x| x.digest().to_string())
+                .collect::<Vec<_>>()
+                .join(", ")
+        );
         let span = error_span!("handle_soft_bundle_certificates_v3");
         self.handle_certificates(
             certificates,
@@ -909,6 +937,98 @@ impl ValidatorService {
         Ok((tonic::Response::new(response), Weight::one()))
     }
 
+    fn get_client_ip_addr<T>(
+        &self,
+        request: &tonic::Request<T>,
+        source: &ClientIdSource,
+    ) -> Option<IpAddr> {
+        match source {
+            ClientIdSource::SocketAddr => {
+                let socket_addr: Option<SocketAddr> = request.remote_addr();
+
+                // We will hit this case if the IO type used does not
+                // implement Connected or when using a unix domain socket.
+                // TODO: once we have confirmed that no legitimate traffic
+                // is hitting this case, we should reject such requests that
+                // hit this case.
+                if let Some(socket_addr) = socket_addr {
+                    Some(socket_addr.ip())
+                } else {
+                    if cfg!(msim) {
+                        // Ignore the error from simtests.
+                    } else if cfg!(test) {
+                        panic!("Failed to get remote address from request");
+                    } else {
+                        self.metrics.connection_ip_not_found.inc();
+                        error!("Failed to get remote address from request");
+                    }
+                    None
+                }
+            }
+            ClientIdSource::XForwardedFor(num_hops) => {
+                let do_header_parse = |op: &MetadataValue<Ascii>| {
+                    match op.to_str() {
+                        Ok(header_val) => {
+                            let header_contents =
+                                header_val.split(',').map(str::trim).collect::<Vec<_>>();
+                            if *num_hops == 0 {
+                                error!(
+                                    "x-forwarded-for: 0 specified. x-forwarded-for contents: {:?}. Please assign nonzero value for \
+                                    number of hops here, or use `socket-addr` client-id-source type if requests are not being proxied \
+                                    to this node. Skipping traffic controller request handling.",
+                                    header_contents,
+                                );
+                                return None;
+                            }
+                            let contents_len = header_contents.len();
+                            let Some(client_ip) = header_contents.get(contents_len - num_hops)
+                            else {
+                                error!(
+                                    "x-forwarded-for header value of {:?} contains {} values, but {} hops were specificed. \
+                                    Expected at least {} values. Skipping traffic controller request handling.",
+                                    header_contents,
+                                    contents_len,
+                                    num_hops,
+                                    contents_len,
+                                );
+                                return None;
+                            };
+                            client_ip.parse::<IpAddr>().ok().or_else(|| {
+                                client_ip.parse::<SocketAddr>().ok().map(|socket_addr| socket_addr.ip()).or_else(|| {
+                                    self.metrics.forwarded_header_parse_error.inc();
+                                    error!(
+                                        "Failed to parse x-forwarded-for header value of {:?} to ip address or socket. \
+                                        Please ensure that your proxy is configured to resolve client domains to an \
+                                        IP address before writing header",
+                                        client_ip,
+                                    );
+                                    None
+                                })
+                            })
+                        }
+                        Err(e) => {
+                            // TODO: once we have confirmed that no legitimate traffic
+                            // is hitting this case, we should reject such requests that
+                            // hit this case.
+                            self.metrics.forwarded_header_invalid.inc();
+                            error!("Invalid UTF-8 in x-forwarded-for header: {:?}", e);
+                            None
+                        }
+                    }
+                };
+                if let Some(op) = request.metadata().get("x-forwarded-for") {
+                    do_header_parse(op)
+                } else if let Some(op) = request.metadata().get("X-Forwarded-For") {
+                    do_header_parse(op)
+                } else {
+                    self.metrics.forwarded_header_not_included.inc();
+                    error!("x-forwarded-for header not present for request despite node configuring x-forwarded-for tracking type");
+                    None
+                }
+            }
+        }
+    }
+
     async fn handle_traffic_req(&self, client: Option<IpAddr>) -> Result<(), tonic::Status> {
         if let Some(traffic_controller) = &self.traffic_controller {
             if !traffic_controller.check(&client, &None).await {
@@ -963,7 +1083,7 @@ fn make_tonic_request_for_testing<T>(message: T) -> tonic::Request<T> {
 
 // TODO: refine error matching here
 fn normalize(err: SuiError) -> Weight {
-    match dbg!(err) {
+    match err {
         SuiError::UserInputError { .. }
         | SuiError::InvalidSignature { .. }
         | SuiError::SignerSignatureAbsent { .. }
@@ -985,89 +1105,7 @@ macro_rules! handle_with_decoration {
             return $self.$func_name($request).await.map(|(result, _)| result);
         }
 
-        let client = match $self.client_id_source.as_ref().unwrap() {
-            ClientIdSource::SocketAddr => {
-                let socket_addr: Option<SocketAddr> = $request.remote_addr();
-
-                // We will hit this case if the IO type used does not
-                // implement Connected or when using a unix domain socket.
-                // TODO: once we have confirmed that no legitimate traffic
-                // is hitting this case, we should reject such requests that
-                // hit this case.
-                if let Some(socket_addr) = socket_addr {
-                    Some(socket_addr.ip())
-                } else {
-                    if cfg!(msim) {
-                        // Ignore the error from simtests.
-                    } else if cfg!(test) {
-                        panic!("Failed to get remote address from request");
-                    } else {
-                        $self.metrics.connection_ip_not_found.inc();
-                        error!("Failed to get remote address from request");
-                    }
-                    None
-                }
-            }
-            ClientIdSource::XForwardedFor(num_hops) => {
-                let do_header_parse = |op: &MetadataValue<Ascii>| {
-                    match op.to_str() {
-                        Ok(header_val) => {
-                            let header_contents = header_val.split(',').map(str::trim).collect::<Vec<_>>();
-                            if *num_hops == 0 {
-                                error!(
-                                    "x-forwarded-for: 0 specified. x-forwarded-for contents: {:?}. Please assign nonzero value for \
-                                    number of hops here, or use `socket-addr` client-id-source type if requests are not being proxied \
-                                    to this node. Skipping traffic controller request handling.",
-                                    header_contents,
-                                );
-                                return None;
-                            }
-                            let contents_len = header_contents.len();
-                            let Some(client_ip) = header_contents.get(contents_len - num_hops) else {
-                                error!(
-                                    "x-forwarded-for header value of {:?} contains {} values, but {} hops were specificed. \
-                                    Expected at least {} values. Skipping traffic controller request handling.",
-                                    header_contents,
-                                    contents_len,
-                                    num_hops,
-                                    contents_len,
-                                );
-                                return None;
-                            };
-                            client_ip.parse::<IpAddr>().ok().or_else(|| {
-                                client_ip.parse::<SocketAddr>().ok().map(|socket_addr| socket_addr.ip()).or_else(|| {
-                                    $self.metrics.forwarded_header_parse_error.inc();
-                                    error!(
-                                        "Failed to parse x-forwarded-for header value of {:?} to ip address or socket. \
-                                        Please ensure that your proxy is configured to resolve client domains to an \
-                                        IP address before writing header",
-                                        client_ip,
-                                    );
-                                    None
-                                })
-                            })
-                        }
-                        Err(e) => {
-                            // TODO: once we have confirmed that no legitimate traffic
-                            // is hitting this case, we should reject such requests that
-                            // hit this case.
-                            $self.metrics.forwarded_header_invalid.inc();
-                            error!("Invalid UTF-8 in x-forwarded-for header: {:?}", e);
-                            None
-                        }
-                    }
-                };
-                if let Some(op) = $request.metadata().get("x-forwarded-for") {
-                    do_header_parse(op)
-                } else if let Some(op) = $request.metadata().get("X-Forwarded-For") {
-                    do_header_parse(op)
-                } else {
-                    $self.metrics.forwarded_header_not_included.inc();
-                    error!("x-forwarded-for header not present for request despite node configuring x-forwarded-for tracking type");
-                    None
-                }
-            }
-        };
+        let client = $self.get_client_ip_addr(&$request, $self.client_id_source.as_ref().unwrap());
 
         // check if either IP is blocked, in which case return early
         $self.handle_traffic_req(client.clone()).await?;
diff --git a/crates/sui-core/src/checkpoints/checkpoint_executor/mod.rs b/crates/sui-core/src/checkpoints/checkpoint_executor/mod.rs
index b1872a9f21723..fd0a9c90a34d8 100644
--- a/crates/sui-core/src/checkpoints/checkpoint_executor/mod.rs
+++ b/crates/sui-core/src/checkpoints/checkpoint_executor/mod.rs
@@ -94,7 +94,7 @@ pub struct CheckpointTimeoutConfig {
 // the function is still very cheap to call so this is okay.
 thread_local! {
     static SCHEDULING_TIMEOUT: once_cell::sync::OnceCell<CheckpointTimeoutConfig> =
-        once_cell::sync::OnceCell::new();
+        const { once_cell::sync::OnceCell::new() };
 }
 
 #[cfg(msim)]
diff --git a/crates/sui-core/src/checkpoints/mod.rs b/crates/sui-core/src/checkpoints/mod.rs
index e139fe3ae42f7..6b64df4e7877c 100644
--- a/crates/sui-core/src/checkpoints/mod.rs
+++ b/crates/sui-core/src/checkpoints/mod.rs
@@ -69,12 +69,12 @@ use tokio::{
 };
 use tracing::{debug, error, info, instrument, warn};
 use typed_store::traits::{TableSummary, TypedStoreDebug};
+use typed_store::DBMapUtils;
 use typed_store::Map;
 use typed_store::{
     rocks::{DBMap, MetricConf},
     TypedStoreError,
 };
-use typed_store_derive::DBMapUtils;
 
 pub type CheckpointHeight = u64;
 
diff --git a/crates/sui-core/src/consensus_adapter.rs b/crates/sui-core/src/consensus_adapter.rs
index 8b33d8031fac7..f67388061656c 100644
--- a/crates/sui-core/src/consensus_adapter.rs
+++ b/crates/sui-core/src/consensus_adapter.rs
@@ -1029,12 +1029,12 @@ impl<'a> InflightDropGuard<'a> {
         adapter
             .metrics
             .sequencing_certificate_inflight
-            .with_label_values(&[&tx_type])
+            .with_label_values(&[tx_type])
             .inc();
         adapter
             .metrics
             .sequencing_certificate_attempt
-            .with_label_values(&[&tx_type])
+            .with_label_values(&[tx_type])
             .inc();
         Self {
             adapter,
diff --git a/crates/sui-core/src/consensus_handler.rs b/crates/sui-core/src/consensus_handler.rs
index 05c0168b831fd..0897ed724e03f 100644
--- a/crates/sui-core/src/consensus_handler.rs
+++ b/crates/sui-core/src/consensus_handler.rs
@@ -10,6 +10,7 @@ use std::{
 
 use arc_swap::ArcSwap;
 use async_trait::async_trait;
+use consensus_core::CommitConsumerMonitor;
 use lru::LruCache;
 use mysten_metrics::{monitored_mpsc::UnboundedReceiver, monitored_scope, spawn_monitored_task};
 use narwhal_config::Committee;
@@ -504,12 +505,16 @@ impl MysticetiConsensusHandler {
     pub fn new(
         mut consensus_handler: ConsensusHandler<CheckpointService>,
         mut receiver: UnboundedReceiver<consensus_core::CommittedSubDag>,
+        commit_consumer_monitor: Arc<CommitConsumerMonitor>,
     ) -> Self {
         let handle = spawn_monitored_task!(async move {
+            // TODO: pause when execution is overloaded, so consensus can detect the backpressure.
             while let Some(consensus_output) = receiver.recv().await {
+                let commit_index = consensus_output.commit_ref.index;
                 consensus_handler
                     .handle_consensus_output_internal(consensus_output)
                     .await;
+                commit_consumer_monitor.set_highest_handled_commit(commit_index);
             }
         });
         Self {
diff --git a/crates/sui-core/src/consensus_manager/mysticeti_manager.rs b/crates/sui-core/src/consensus_manager/mysticeti_manager.rs
index 8bc6df769166e..6a0304f06b2d0 100644
--- a/crates/sui-core/src/consensus_manager/mysticeti_manager.rs
+++ b/crates/sui-core/src/consensus_manager/mysticeti_manager.rs
@@ -1,11 +1,11 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
-use std::{path::PathBuf, sync::Arc};
+use std::{path::PathBuf, sync::Arc, time::Duration};
 
 use arc_swap::ArcSwapOption;
 use async_trait::async_trait;
 use consensus_config::{Committee, NetworkKeyPair, Parameters, ProtocolKeyPair};
-use consensus_core::{CommitConsumer, CommitIndex, ConsensusAuthority, Round};
+use consensus_core::{CommitConsumer, CommitIndex, ConsensusAuthority};
 use fastcrypto::ed25519;
 use mysten_metrics::{monitored_mpsc::unbounded_channel, RegistryID, RegistryService};
 use narwhal_executor::ExecutionState;
@@ -41,6 +41,7 @@ pub struct MysticetiManager {
     metrics: Arc<ConsensusManagerMetrics>,
     registry_service: RegistryService,
     authority: ArcSwapOption<(ConsensusAuthority, RegistryID)>,
+    boot_counter: Mutex<u64>,
     // Use a shared lazy mysticeti client so we can update the internal mysticeti
     // client that gets created for every new epoch.
     client: Arc<LazyMysticetiClient>,
@@ -69,6 +70,7 @@ impl MysticetiManager {
             authority: ArcSwapOption::empty(),
             client,
             consensus_handler: Mutex::new(None),
+            boot_counter: Mutex::new(0),
         }
     }
 
@@ -124,11 +126,17 @@ impl ConsensusManagerTrait for MysticetiManager {
         let consensus_config = config
             .consensus_config()
             .expect("consensus_config should exist");
-        let parameters = Parameters {
+
+        let mut parameters = Parameters {
             db_path: self.get_store_path(epoch),
             ..consensus_config.parameters.clone().unwrap_or_default()
         };
 
+        // Disable the automated last known block sync for mainnet for now
+        if epoch_store.get_chain_identifier().chain() == sui_protocol_config::Chain::Mainnet {
+            parameters.sync_last_known_own_block_timeout = Duration::ZERO;
+        };
+
         let own_protocol_key = self.protocol_keypair.public();
         let (own_index, _) = committee
             .authorities()
@@ -143,12 +151,13 @@ impl ConsensusManagerTrait for MysticetiManager {
         let consumer = CommitConsumer::new(
             commit_sender,
             // TODO(mysticeti): remove dependency on narwhal executor
-            consensus_handler.last_executed_sub_dag_round() as Round,
             consensus_handler.last_executed_sub_dag_index() as CommitIndex,
         );
+        let monitor = consumer.monitor();
 
         // TODO(mysticeti): Investigate if we need to return potential errors from
         // AuthorityNode and add retries here?
+        let boot_counter = *self.boot_counter.lock().await;
         let authority = ConsensusAuthority::start(
             network_type,
             own_index,
@@ -160,26 +169,25 @@ impl ConsensusManagerTrait for MysticetiManager {
             Arc::new(tx_validator.clone()),
             consumer,
             registry.clone(),
+            boot_counter,
         )
         .await;
+        let client = authority.transaction_client();
+
+        // Now increment the boot counter
+        let mut boot_counter = self.boot_counter.lock().await;
+        *boot_counter += 1;
 
         let registry_id = self.registry_service.add(registry.clone());
 
         self.authority
             .swap(Some(Arc::new((authority, registry_id))));
 
-        // create the client to send transactions to Mysticeti and update it.
-        self.client.set(
-            self.authority
-                .load()
-                .as_ref()
-                .expect("ConsensusAuthority should have been created by now.")
-                .0
-                .transaction_client(),
-        );
+        // Initialize the client to send transactions to this Mysticeti instance.
+        self.client.set(client);
 
         // spin up the new mysticeti consensus handler to listen for committed sub dags
-        let handler = MysticetiConsensusHandler::new(consensus_handler, commit_receiver);
+        let handler = MysticetiConsensusHandler::new(consensus_handler, commit_receiver, monitor);
         let mut consensus_handler = self.consensus_handler.lock().await;
         *consensus_handler = Some(handler);
     }
@@ -190,6 +198,9 @@ impl ConsensusManagerTrait for MysticetiManager {
             return;
         };
 
+        // Stop consensus submissions.
+        self.client.clear();
+
         // swap with empty to ensure there is no other reference to authority and we can safely do Arc unwrap
         let r = self.authority.swap(None).unwrap();
         let Ok((authority, registry_id)) = Arc::try_unwrap(r) else {
diff --git a/crates/sui-core/src/db_checkpoint_handler.rs b/crates/sui-core/src/db_checkpoint_handler.rs
index ac177344fb883..3d84ea32014bf 100644
--- a/crates/sui-core/src/db_checkpoint_handler.rs
+++ b/crates/sui-core/src/db_checkpoint_handler.rs
@@ -35,6 +35,7 @@ pub const STATE_SNAPSHOT_COMPLETED_MARKER: &str = "_STATE_SNAPSHOT_COMPLETED";
 
 pub struct DBCheckpointMetrics {
     pub first_missing_db_checkpoint_epoch: IntGauge,
+    pub num_local_db_checkpoints: IntGauge,
 }
 
 impl DBCheckpointMetrics {
@@ -46,6 +47,12 @@ impl DBCheckpointMetrics {
                 registry
             )
             .unwrap(),
+            num_local_db_checkpoints: register_int_gauge_with_registry!(
+                "num_local_db_checkpoints",
+                "Number of RocksDB checkpoints currently residing on local disk (i.e. not yet garbage collected)",
+                registry
+            )
+            .unwrap(),
         };
         Arc::new(this)
     }
@@ -167,6 +174,9 @@ impl DBCheckpointHandler {
         loop {
             tokio::select! {
                 _now = interval.tick() => {
+                    let local_checkpoints_by_epoch =
+                        find_all_dirs_with_epoch_prefix(&self.input_object_store, None).await?;
+                    self.metrics.num_local_db_checkpoints.set(local_checkpoints_by_epoch.len() as i64);
                     match find_missing_epochs_dirs(self.output_object_store.as_ref().unwrap(), SUCCESS_MARKER).await {
                         Ok(epochs) => {
                             self.metrics.first_missing_db_checkpoint_epoch.set(epochs.first().cloned().unwrap_or(0) as i64);
@@ -192,27 +202,28 @@ impl DBCheckpointHandler {
         info!("DB checkpoint upload disabled. DB checkpoint cleanup loop started");
         loop {
             tokio::select! {
-            _now = interval.tick() => {
-                let local_checkpoints_by_epoch =
-                    find_all_dirs_with_epoch_prefix(&self.input_object_store, None).await?;
-                let mut dirs: Vec<_> = local_checkpoints_by_epoch.iter().collect();
-                dirs.sort_by_key(|(epoch_num, _path)| *epoch_num);
-                for (_, db_path) in dirs {
-                    // If db checkpoint marked as completed, skip
-                    let local_db_path = path_to_filesystem(self.input_root_path.clone(), db_path)?;
-                    let upload_completed_path = local_db_path.join(UPLOAD_COMPLETED_MARKER);
-                    if upload_completed_path.exists() {
-                        continue;
+                _now = interval.tick() => {
+                    let local_checkpoints_by_epoch =
+                        find_all_dirs_with_epoch_prefix(&self.input_object_store, None).await?;
+                    self.metrics.num_local_db_checkpoints.set(local_checkpoints_by_epoch.len() as i64);
+                    let mut dirs: Vec<_> = local_checkpoints_by_epoch.iter().collect();
+                    dirs.sort_by_key(|(epoch_num, _path)| *epoch_num);
+                    for (_, db_path) in dirs {
+                        // If db checkpoint marked as completed, skip
+                        let local_db_path = path_to_filesystem(self.input_root_path.clone(), db_path)?;
+                        let upload_completed_path = local_db_path.join(UPLOAD_COMPLETED_MARKER);
+                        if upload_completed_path.exists() {
+                            continue;
+                        }
+                        let bytes = Bytes::from_static(b"success");
+                        let upload_completed_marker = db_path.child(UPLOAD_COMPLETED_MARKER);
+                        put(&self.input_object_store,
+                            &upload_completed_marker,
+                            bytes.clone(),
+                        )
+                        .await?;
                     }
-                    let bytes = Bytes::from_static(b"success");
-                    let upload_completed_marker = db_path.child(UPLOAD_COMPLETED_MARKER);
-                    put(&self.input_object_store,
-                        &upload_completed_marker,
-                        bytes.clone(),
-                    )
-                    .await?;
-                }
-            },
+                },
                  _ = recv.recv() => break,
             }
         }
diff --git a/crates/sui-core/src/epoch/committee_store.rs b/crates/sui-core/src/epoch/committee_store.rs
index 40a7e3d99d03e..c951b19420004 100644
--- a/crates/sui-core/src/epoch/committee_store.rs
+++ b/crates/sui-core/src/epoch/committee_store.rs
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use parking_lot::RwLock;
-use rocksdb::Options;
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
@@ -10,10 +9,11 @@ use sui_types::base_types::ObjectID;
 use sui_types::committee::{Committee, EpochId};
 use sui_types::error::{SuiError, SuiResult};
 use typed_store::rocks::{default_db_options, DBMap, DBOptions, MetricConf};
+use typed_store::rocksdb::Options;
 use typed_store::traits::{TableSummary, TypedStoreDebug};
 
+use typed_store::DBMapUtils;
 use typed_store::Map;
-use typed_store_derive::DBMapUtils;
 
 use sui_macros::nondeterministic;
 
diff --git a/crates/sui-core/src/epoch/consensus_store_pruner.rs b/crates/sui-core/src/epoch/consensus_store_pruner.rs
new file mode 100644
index 0000000000000..49d1c70c1c9b5
--- /dev/null
+++ b/crates/sui-core/src/epoch/consensus_store_pruner.rs
@@ -0,0 +1,363 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use consensus_config::Epoch;
+use mysten_metrics::spawn_logged_monitored_task;
+use prometheus::{
+    register_int_counter_vec_with_registry, register_int_counter_with_registry,
+    register_int_gauge_with_registry, IntCounter, IntCounterVec, IntGauge, Registry,
+};
+use std::fs;
+use std::path::PathBuf;
+use std::time::Duration;
+use tokio::{
+    sync::mpsc,
+    time::{sleep, Instant},
+};
+use tracing::{error, info};
+use typed_store::rocks::safe_drop_db;
+
+struct Metrics {
+    last_pruned_consensus_db_epoch: IntGauge,
+    successfully_pruned_consensus_dbs: IntCounter,
+    error_pruning_consensus_dbs: IntCounterVec,
+}
+
+impl Metrics {
+    fn new(registry: &Registry) -> Self {
+        Self {
+            last_pruned_consensus_db_epoch: register_int_gauge_with_registry!(
+                "last_pruned_consensus_db_epoch",
+                "The last epoch for which the consensus store was pruned",
+                registry
+            )
+            .unwrap(),
+            successfully_pruned_consensus_dbs: register_int_counter_with_registry!(
+                "successfully_pruned_consensus_dbs",
+                "The number of consensus dbs successfully pruned",
+                registry
+            )
+            .unwrap(),
+            error_pruning_consensus_dbs: register_int_counter_vec_with_registry!(
+                "error_pruning_consensus_dbs",
+                "The number of errors encountered while pruning consensus dbs",
+                &["mode"],
+                registry
+            )
+            .unwrap(),
+        }
+    }
+}
+
+pub struct ConsensusStorePruner {
+    tx_remove: mpsc::Sender<Epoch>,
+    _handle: tokio::task::JoinHandle<()>,
+}
+
+impl ConsensusStorePruner {
+    pub fn new(
+        base_path: PathBuf,
+        epoch_retention: u64,
+        epoch_prune_period: Duration,
+        registry: &Registry,
+    ) -> Self {
+        let (tx_remove, mut rx_remove) = mpsc::channel(1);
+        let metrics = Metrics::new(registry);
+
+        let _handle = spawn_logged_monitored_task!(async {
+            info!("Starting consensus store pruner with epoch retention {epoch_retention} and prune period {epoch_prune_period:?}");
+
+            let mut timeout = tokio::time::interval_at(
+                Instant::now() + Duration::from_secs(60), // allow some time for the node to boot etc before attempting to prune
+                epoch_prune_period,
+            );
+
+            let mut latest_epoch = 0;
+            loop {
+                tokio::select! {
+                    _ = timeout.tick() => {
+                        Self::prune_old_epoch_data(&base_path, latest_epoch, epoch_retention, &metrics).await;
+                    }
+                    result = rx_remove.recv() => {
+                        if result.is_none() {
+                            info!("Closing consensus store pruner");
+                            break;
+                        }
+                        latest_epoch = result.unwrap();
+                        Self::prune_old_epoch_data(&base_path, latest_epoch, epoch_retention, &metrics).await;
+                    }
+                }
+            }
+        });
+
+        Self { tx_remove, _handle }
+    }
+
+    /// This method will remove all epoch data stores and directories that are older than the current epoch minus the epoch retention. The method ensures
+    /// that always the `current_epoch` data is retained.
+    pub async fn prune(&self, current_epoch: Epoch) {
+        let result = self.tx_remove.send(current_epoch).await;
+        if result.is_err() {
+            error!(
+                "Error sending message to data removal task for epoch {:?}",
+                current_epoch,
+            );
+        }
+    }
+
+    async fn prune_old_epoch_data(
+        storage_base_path: &PathBuf,
+        current_epoch: Epoch,
+        epoch_retention: u64,
+        metrics: &Metrics,
+    ) {
+        let drop_boundary = current_epoch.saturating_sub(epoch_retention);
+
+        info!(
+            "Consensus store prunning for current epoch {}. Will remove epochs < {:?}",
+            current_epoch, drop_boundary
+        );
+
+        // Get all the epoch stores in the base path directory
+        let files = match fs::read_dir(storage_base_path) {
+            Ok(f) => f,
+            Err(e) => {
+                error!(
+                    "Can not read the files in the storage path directory for epoch cleanup: {:?}",
+                    e
+                );
+                return;
+            }
+        };
+
+        // Look for any that are less than the drop boundary and drop
+        for file_res in files {
+            let f = match file_res {
+                Ok(f) => f,
+                Err(e) => {
+                    error!(
+                        "Error while cleaning up storage of previous epochs: {:?}",
+                        e
+                    );
+                    continue;
+                }
+            };
+
+            let name = f.file_name();
+            let file_epoch_string = match name.to_str() {
+                Some(f) => f,
+                None => continue,
+            };
+
+            let file_epoch = match file_epoch_string.to_owned().parse::<u64>() {
+                Ok(f) => f,
+                Err(e) => {
+                    error!(
+                        "Could not parse file \"{file_epoch_string}\" in storage path into epoch for cleanup: {:?}",
+                        e
+                    );
+                    continue;
+                }
+            };
+
+            if file_epoch < drop_boundary {
+                if let Err(e) = safe_drop_db(f.path()) {
+                    error!(
+                        "Could not prune old consensus storage \"{:?}\" directory with safe approach. Will fallback to force delete: {:?}",
+                        f.path(),
+                        e
+                    );
+
+                    metrics
+                        .error_pruning_consensus_dbs
+                        .with_label_values(&["safe"])
+                        .inc();
+
+                    const WAIT_BEFORE_FORCE_DELETE: Duration = Duration::from_secs(5);
+                    sleep(WAIT_BEFORE_FORCE_DELETE).await;
+
+                    if let Err(err) = fs::remove_dir_all(f.path()) {
+                        error!(
+                            "Could not prune old consensus storage \"{:?}\" directory with force delete: {:?}",
+                            f.path(),
+                            err
+                        );
+                        metrics
+                            .error_pruning_consensus_dbs
+                            .with_label_values(&["force"])
+                            .inc();
+                    } else {
+                        info!(
+                            "Successfully pruned consensus epoch storage directory with force delete: {:?}",
+                            f.path()
+                        );
+                        let last_epoch = metrics.last_pruned_consensus_db_epoch.get();
+                        metrics
+                            .last_pruned_consensus_db_epoch
+                            .set(last_epoch.max(file_epoch as i64));
+                        metrics.successfully_pruned_consensus_dbs.inc();
+                    }
+                } else {
+                    info!(
+                        "Successfully pruned consensus epoch storage directory: {:?}",
+                        f.path()
+                    );
+                    let last_epoch = metrics.last_pruned_consensus_db_epoch.get();
+                    metrics
+                        .last_pruned_consensus_db_epoch
+                        .set(last_epoch.max(file_epoch as i64));
+                    metrics.successfully_pruned_consensus_dbs.inc();
+                }
+            }
+        }
+
+        info!(
+            "Completed old epoch data removal process for epoch {:?}",
+            current_epoch
+        );
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::epoch::consensus_store_pruner::{ConsensusStorePruner, Metrics};
+    use prometheus::Registry;
+    use std::fs;
+    use tokio::time::sleep;
+
+    #[tokio::test]
+    async fn test_remove_old_epoch_data() {
+        telemetry_subscribers::init_for_testing();
+        let metrics = Metrics::new(&Registry::new());
+
+        {
+            // Epoch 0 should not be removed when it's current epoch.
+            let epoch_retention = 0;
+            let current_epoch = 0;
+
+            let base_directory = tempfile::tempdir().unwrap().into_path();
+
+            create_epoch_directories(&base_directory, vec!["0", "other"]);
+
+            ConsensusStorePruner::prune_old_epoch_data(
+                &base_directory,
+                current_epoch,
+                epoch_retention,
+                &metrics,
+            )
+            .await;
+
+            let epochs_left = read_epoch_directories(&base_directory);
+
+            assert_eq!(epochs_left.len(), 1);
+            assert_eq!(epochs_left[0], 0);
+        }
+
+        {
+            // Every directory should be retained only for 1 epoch. We expect any epoch directories < 99 to be removed.
+            let epoch_retention = 1;
+            let current_epoch = 100;
+
+            let base_directory = tempfile::tempdir().unwrap().into_path();
+
+            create_epoch_directories(&base_directory, vec!["97", "98", "99", "100", "other"]);
+
+            ConsensusStorePruner::prune_old_epoch_data(
+                &base_directory,
+                current_epoch,
+                epoch_retention,
+                &metrics,
+            )
+            .await;
+
+            let epochs_left = read_epoch_directories(&base_directory);
+
+            assert_eq!(epochs_left.len(), 2);
+            assert_eq!(epochs_left[0], 99);
+            assert_eq!(epochs_left[1], 100);
+        }
+
+        {
+            // Every directory should be retained only for 0 epochs. That means only the current epoch directory should be retained and everything else
+            // deleted.
+            let epoch_retention = 0;
+            let current_epoch = 100;
+
+            let base_directory = tempfile::tempdir().unwrap().into_path();
+
+            create_epoch_directories(&base_directory, vec!["97", "98", "99", "100", "other"]);
+
+            ConsensusStorePruner::prune_old_epoch_data(
+                &base_directory,
+                current_epoch,
+                epoch_retention,
+                &metrics,
+            )
+            .await;
+
+            let epochs_left = read_epoch_directories(&base_directory);
+
+            assert_eq!(epochs_left.len(), 1);
+            assert_eq!(epochs_left[0], 100);
+        }
+    }
+
+    #[tokio::test(flavor = "current_thread")]
+    async fn test_consensus_store_pruner() {
+        let epoch_retention = 1;
+        let epoch_prune_period = std::time::Duration::from_millis(500);
+
+        let base_directory = tempfile::tempdir().unwrap().into_path();
+
+        // We create some directories up to epoch 100
+        create_epoch_directories(&base_directory, vec!["97", "98", "99", "100", "other"]);
+
+        let pruner = ConsensusStorePruner::new(
+            base_directory.clone(),
+            epoch_retention,
+            epoch_prune_period,
+            &Registry::new(),
+        );
+
+        // We let the pruner run for a couple of times to prune the old directories. Since the default epoch of 0 is used no dirs should be pruned.
+        sleep(3 * epoch_prune_period).await;
+
+        // We expect the directories to be the same as before
+        let epoch_dirs = read_epoch_directories(&base_directory);
+        assert_eq!(epoch_dirs.len(), 4);
+
+        // Then we update the epoch and instruct to prune for current epoch = 100
+        pruner.prune(100).await;
+
+        // We let the pruner run and check again the directories - no directories of epoch < 99 should be left
+        sleep(2 * epoch_prune_period).await;
+
+        let epoch_dirs = read_epoch_directories(&base_directory);
+        assert_eq!(epoch_dirs.len(), 2);
+        assert_eq!(epoch_dirs[0], 99);
+        assert_eq!(epoch_dirs[1], 100);
+    }
+
+    fn create_epoch_directories(base_directory: &std::path::Path, epochs: Vec<&str>) {
+        for epoch in epochs {
+            let mut path = base_directory.to_path_buf();
+            path.push(epoch);
+            fs::create_dir(path).unwrap();
+        }
+    }
+
+    fn read_epoch_directories(base_directory: &std::path::Path) -> Vec<u64> {
+        let files = fs::read_dir(base_directory).unwrap();
+
+        let mut epochs = Vec::new();
+        for file_res in files {
+            let file_epoch_string = file_res.unwrap().file_name().to_str().unwrap().to_owned();
+            if let Ok(file_epoch) = file_epoch_string.parse::<u64>() {
+                epochs.push(file_epoch);
+            }
+        }
+
+        epochs.sort();
+        epochs
+    }
+}
diff --git a/crates/sui-core/src/epoch/data_removal.rs b/crates/sui-core/src/epoch/data_removal.rs
deleted file mode 100644
index 76455294e6cf5..0000000000000
--- a/crates/sui-core/src/epoch/data_removal.rs
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-#[cfg(test)]
-#[path = "../unit_tests/epoch_data_tests.rs"]
-pub mod epoch_data_tests;
-
-use mysten_metrics::spawn_monitored_task;
-use narwhal_config::Epoch;
-use std::fs;
-use std::path::PathBuf;
-use tokio::sync::mpsc;
-
-pub struct EpochDataRemover {
-    base_path: PathBuf,
-    tx_remove: mpsc::Sender<Epoch>,
-}
-
-impl EpochDataRemover {
-    pub fn new(base_path: PathBuf) -> Self {
-        let (tx_remove, _rx_remove) = mpsc::channel(1);
-        Self {
-            base_path,
-            tx_remove,
-        }
-    }
-
-    pub async fn run(&mut self) {
-        let (tx_remove, mut rx_remove) = mpsc::channel(1);
-        self.tx_remove = tx_remove;
-        let base_path = self.base_path.clone();
-        spawn_monitored_task!(async {
-            tracing::info!("Starting Epoch Data Remover");
-            loop {
-                match rx_remove.recv().await {
-                    Some(epoch) => {
-                        remove_old_epoch_data(base_path.clone(), epoch);
-                    }
-                    None => {
-                        tracing::info!("Closing Epoch Data Remover");
-                        break;
-                    }
-                }
-            }
-        });
-    }
-
-    pub async fn remove_old_data(&self, latest_closed_epoch: Epoch) {
-        let result = self.tx_remove.send(latest_closed_epoch).await;
-        if result.is_err() {
-            tracing::error!(
-                "Error sending message to data removal task for epoch {:?}",
-                latest_closed_epoch,
-            );
-        }
-    }
-}
-
-pub(crate) fn remove_old_epoch_data(storage_base_path: PathBuf, epoch: Epoch) {
-    if epoch < 1 {
-        return;
-    }
-
-    // Keep previous epoch data as a safety buffer and remove starting from epoch - 1
-    let drop_boundary = epoch - 1;
-
-    tracing::info!(
-        "Starting old epoch data removal for epoch {:?}",
-        drop_boundary
-    );
-
-    // Get all the epoch stores in the base path directory
-    let files = match fs::read_dir(storage_base_path) {
-        Ok(f) => f,
-        Err(e) => {
-            tracing::error!("Data Remover cannot read the files in the storage path directory for epoch cleanup: {:?}", e);
-            return;
-        }
-    };
-
-    // Look for any that are less than or equal to the drop boundary and drop
-    for file_res in files {
-        let f = match file_res {
-            Ok(f) => f,
-            Err(e) => {
-                tracing::error!(
-                    "Data Remover error while cleaning up storage of previous epochs: {:?}",
-                    e
-                );
-                continue;
-            }
-        };
-
-        let name = f.file_name();
-        let file_epoch_string = match name.to_str() {
-            Some(f) => f,
-            None => continue,
-        };
-
-        let file_epoch = match file_epoch_string.to_owned().parse::<u64>() {
-            Ok(f) => f,
-            Err(e) => {
-                tracing::error!("Data Remover could not parse file in storage path into epoch for cleanup: {:?}",e);
-                continue;
-            }
-        };
-
-        if file_epoch <= drop_boundary {
-            if let Err(e) = fs::remove_dir_all(f.path()) {
-                tracing::error!(
-                    "Data Remover could not remove old epoch storage directory: {:?}",
-                    e
-                );
-            }
-        }
-    }
-
-    tracing::info!(
-        "Completed old epoch data removal process for epoch {:?}",
-        epoch
-    );
-}
diff --git a/crates/sui-core/src/epoch/mod.rs b/crates/sui-core/src/epoch/mod.rs
index 5a8961ca226b4..70c7f5cee189f 100644
--- a/crates/sui-core/src/epoch/mod.rs
+++ b/crates/sui-core/src/epoch/mod.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 pub mod committee_store;
-pub mod data_removal;
+pub mod consensus_store_pruner;
 pub mod epoch_metrics;
 pub mod randomness;
 pub mod reconfiguration;
diff --git a/crates/sui-core/src/execution_cache/writeback_cache.rs b/crates/sui-core/src/execution_cache/writeback_cache.rs
index 845747eeca6ba..2b770f740d50a 100644
--- a/crates/sui-core/src/execution_cache/writeback_cache.rs
+++ b/crates/sui-core/src/execution_cache/writeback_cache.rs
@@ -73,6 +73,7 @@ use sui_types::object::Object;
 use sui_types::storage::{MarkerValue, ObjectKey, ObjectOrTombstone, ObjectStore, PackageObject};
 use sui_types::sui_system_state::{get_sui_system_state, SuiSystemState};
 use sui_types::transaction::{VerifiedSignedTransaction, VerifiedTransaction};
+use tap::TapOptional;
 use tracing::{debug, info, instrument, trace, warn};
 
 use super::ExecutionCacheAPI;
@@ -1453,7 +1454,10 @@ impl ObjectCacheRead for WritebackCache {
                 // exists only to ensure correctness in all the edge cases.
                 let latest: Option<(SequenceNumber, ObjectEntry)> =
                     if let Some(dirty_set) = dirty_entry {
-                        dirty_set.get_highest().cloned()
+                        dirty_set
+                            .get_highest()
+                            .cloned()
+                            .tap_none(|| panic!("dirty set cannot be empty"))
                     } else {
                         self.record_db_get("object_lt_or_eq_version_latest")
                             .get_latest_object_or_tombstone(object_id)?
@@ -1485,7 +1489,12 @@ impl ObjectCacheRead for WritebackCache {
                     }
                 } else {
                     // no object found in dirty set or db, object does not exist
-                    assert!(cached_entry.is_none());
+                    // When this is called from a read api (i.e. not the execution path) it is
+                    // possible that the object has been deleted and pruned. In this case,
+                    // there would be no entry at all on disk, but we may have a tombstone in the
+                    // cache
+                    let highest = cached_entry.and_then(|c| c.get_highest());
+                    assert!(highest.is_none() || highest.unwrap().1.is_tombstone());
                     self.cache_object_not_found(&object_id);
                     Ok(None)
                 }
diff --git a/crates/sui-core/src/mysticeti_adapter.rs b/crates/sui-core/src/mysticeti_adapter.rs
index b3e1f9f8888d9..48bbb39b77a71 100644
--- a/crates/sui-core/src/mysticeti_adapter.rs
+++ b/crates/sui-core/src/mysticeti_adapter.rs
@@ -4,24 +4,23 @@
 use std::{sync::Arc, time::Duration};
 
 use arc_swap::{ArcSwapOption, Guard};
-use consensus_core::TransactionClient;
+use consensus_core::{ClientError, TransactionClient};
 use sui_types::{
     error::{SuiError, SuiResult},
     messages_consensus::{ConsensusTransaction, ConsensusTransactionKind},
 };
 use tap::prelude::*;
-use tokio::time::{sleep, timeout};
-use tracing::warn;
+use tokio::time::{sleep, Instant};
+use tracing::{error, info, warn};
 
 use crate::{
     authority::authority_per_epoch_store::AuthorityPerEpochStore,
     consensus_adapter::SubmitToConsensus, consensus_handler::SequencedConsensusTransactionKey,
 };
 
-/// Basically a wrapper struct that reads from the LOCAL_MYSTICETI_CLIENT variable where the latest
-/// MysticetiClient is stored in order to communicate with Mysticeti. The LazyMysticetiClient is considered
-/// "lazy" only in the sense that we can't use it directly to submit to consensus unless the underlying
-/// local client is set first.
+/// Gets a client to submit transactions to Mysticeti, or waits for one to be available.
+/// This hides the complexities of async consensus initialization and submitting to different
+/// instances of consensus across epochs.
 #[derive(Default, Clone)]
 pub struct LazyMysticetiClient {
     client: Arc<ArcSwapOption<TransactionClient>>,
@@ -40,34 +39,37 @@ impl LazyMysticetiClient {
             return client;
         }
 
-        // We expect this to get called during the SUI process start. After that at least one
-        // object will have initialised and won't need to call again.
-        const MYSTICETI_START_TIMEOUT: Duration = Duration::from_secs(60);
-        const LOAD_RETRY_TIMEOUT: Duration = Duration::from_millis(100);
-        if let Ok(client) = timeout(MYSTICETI_START_TIMEOUT, async {
-            loop {
-                let client = self.client.load();
-                if client.is_some() {
-                    return client;
-                } else {
-                    sleep(LOAD_RETRY_TIMEOUT).await;
+        // Consensus client is initialized after validators or epoch starts, and cleared after an epoch ends.
+        // But calls to get() can happen during validator startup or epoch change, before consensus finished
+        // initializations.
+        // TODO: maybe listen to updates from consensus manager instead of polling.
+        let mut count = 0;
+        let start = Instant::now();
+        const RETRY_INTERVAL: Duration = Duration::from_millis(100);
+        loop {
+            let client = self.client.load();
+            if client.is_some() {
+                return client;
+            } else {
+                sleep(RETRY_INTERVAL).await;
+                count += 1;
+                if count % 100 == 0 {
+                    warn!(
+                        "Waiting for consensus to initialize after {:?}",
+                        Instant::now() - start
+                    );
                 }
             }
-        })
-        .await
-        {
-            return client;
         }
-
-        panic!(
-            "Timed out after {:?} waiting for Mysticeti to start!",
-            MYSTICETI_START_TIMEOUT,
-        );
     }
 
     pub fn set(&self, client: Arc<TransactionClient>) {
         self.client.store(Some(client));
     }
+
+    pub fn clear(&self) {
+        self.client.store(None);
+    }
 }
 
 #[async_trait::async_trait]
@@ -90,9 +92,21 @@ impl SubmitToConsensus for LazyMysticetiClient {
             .expect("Client should always be returned")
             .submit(transactions_bytes)
             .await
-            .tap_err(|r| {
+            .tap_err(|err| {
                 // Will be logged by caller as well.
-                warn!("Submit transactions failed with: {:?}", r);
+                let msg = format!("Transaction submission failed with: {:?}", err);
+                match err {
+                    ClientError::ConsensusShuttingDown(_) => {
+                        info!("{}", msg);
+                    }
+                    ClientError::OversizedTransaction(_, _) => {
+                        if cfg!(debug_assertions) {
+                            panic!("{}", msg);
+                        } else {
+                            error!("{}", msg);
+                        }
+                    }
+                };
             })
             .map_err(|err| SuiError::FailedToSubmitToConsensus(err.to_string()))?;
 
diff --git a/crates/sui-core/src/rest_index.rs b/crates/sui-core/src/rest_index.rs
index 6c804e71e7d81..ade98f8ada4dd 100644
--- a/crates/sui-core/src/rest_index.rs
+++ b/crates/sui-core/src/rest_index.rs
@@ -15,13 +15,13 @@ use std::path::PathBuf;
 use std::sync::Arc;
 use std::sync::Mutex;
 use std::time::Instant;
-use sui_rest_api::CheckpointData;
 use sui_types::base_types::MoveObjectType;
 use sui_types::base_types::ObjectID;
 use sui_types::base_types::SequenceNumber;
 use sui_types::base_types::SuiAddress;
 use sui_types::digests::TransactionDigest;
 use sui_types::dynamic_field::{DynamicFieldInfo, DynamicFieldType};
+use sui_types::full_checkpoint_content::CheckpointData;
 use sui_types::layout_resolver::LayoutResolver;
 use sui_types::messages_checkpoint::CheckpointContents;
 use sui_types::object::Object;
@@ -34,8 +34,8 @@ use tracing::{debug, info};
 use typed_store::rocks::{DBMap, MetricConf};
 use typed_store::traits::Map;
 use typed_store::traits::{TableSummary, TypedStoreDebug};
+use typed_store::DBMapUtils;
 use typed_store::TypedStoreError;
-use typed_store_derive::DBMapUtils;
 
 const CURRENT_DB_VERSION: u64 = 0;
 
@@ -114,9 +114,9 @@ struct IndexStoreTables {
     ///
     /// A few uses for this singleton:
     /// - determining if the DB has been initialized (as some tables will still be empty post
-    /// initializatio)
+    ///     initialization)
     /// - version of the DB. Everytime a new table or schema is changed the version number needs to
-    /// be incremented.
+    ///     be incremented.
     meta: DBMap<(), MetadataInfo>,
 
     /// An index of extra metadata for Transactions.
@@ -406,7 +406,7 @@ impl IndexStoreTables {
 
             for tx in &checkpoint.transactions {
                 // determine changes from removed objects
-                for removed_object in tx.removed_objects() {
+                for removed_object in tx.removed_objects_pre_version() {
                     match removed_object.owner() {
                         Owner::AddressOwner(address) => {
                             let owner_key = OwnerIndexKey::new(*address, removed_object.id());
diff --git a/crates/sui-core/src/storage.rs b/crates/sui-core/src/storage.rs
index d2f6606b9fb95..fe274bd1f0123 100644
--- a/crates/sui-core/src/storage.rs
+++ b/crates/sui-core/src/storage.rs
@@ -119,10 +119,16 @@ impl ReadStore for RocksDbStore {
     }
 
     fn get_lowest_available_checkpoint(&self) -> Result<CheckpointSequenceNumber, StorageError> {
-        self.checkpoint_store
+        let highest_pruned_cp = self
+            .checkpoint_store
             .get_highest_pruned_checkpoint_seq_number()
-            .map(|seq| seq + 1)
-            .map_err(Into::into)
+            .map_err(Into::<StorageError>::into)?;
+
+        if highest_pruned_cp == 0 {
+            Ok(0)
+        } else {
+            Ok(highest_pruned_cp + 1)
+        }
     }
 
     fn get_full_checkpoint_contents_by_sequence_number(
@@ -233,7 +239,8 @@ impl ReadStore for RocksDbStore {
 
     fn get_latest_checkpoint(&self) -> sui_types::storage::error::Result<VerifiedCheckpoint> {
         self.checkpoint_store
-            .get_latest_certified_checkpoint()
+            .get_highest_executed_checkpoint()
+            .map_err(sui_types::storage::error::Error::custom)?
             .ok_or_else(|| {
                 sui_types::storage::error::Error::missing("unable to get latest checkpoint")
             })
@@ -507,11 +514,17 @@ impl RestStateReader for RestReadStore {
     fn get_lowest_available_checkpoint_objects(
         &self,
     ) -> sui_types::storage::error::Result<CheckpointSequenceNumber> {
-        self.state
+        let highest_pruned_cp = self
+            .state
             .get_object_cache_reader()
             .get_highest_pruned_checkpoint()
-            .map(|seq| seq + 1)
-            .map_err(StorageError::custom)
+            .map_err(StorageError::custom)?;
+
+        if highest_pruned_cp == 0 {
+            Ok(0)
+        } else {
+            Ok(highest_pruned_cp + 1)
+        }
     }
 
     fn get_chain_identifier(
diff --git a/crates/sui-core/src/traffic_controller/nodefw_test_server.rs b/crates/sui-core/src/traffic_controller/nodefw_test_server.rs
index 57af7897c13b9..7b8c1f41f1763 100644
--- a/crates/sui-core/src/traffic_controller/nodefw_test_server.rs
+++ b/crates/sui-core/src/traffic_controller/nodefw_test_server.rs
@@ -44,18 +44,11 @@ impl NodeFwTestServer {
             .route("/block_addresses", post(Self::block_addresses))
             .with_state(app_state.clone());
 
-        let shutdown_signal = self.shutdown_signal.clone();
         let addr = SocketAddr::from(([127, 0, 0, 1], port));
-        let server = axum::Server::bind(&addr)
-            .serve(app.into_make_service())
-            .with_graceful_shutdown(async move {
-                shutdown_signal.notified().await;
-            });
 
         let handle = tokio::spawn(async move {
-            if let Err(e) = server.await {
-                panic!("Server error: {}", e);
-            }
+            let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
+            axum::serve(listener, app).await.unwrap();
         });
 
         tokio::spawn(Self::periodically_remove_expired_addresses(
diff --git a/crates/sui-core/src/transaction_input_loader.rs b/crates/sui-core/src/transaction_input_loader.rs
index a33fbd1e45f89..b9f1028598c88 100644
--- a/crates/sui-core/src/transaction_input_loader.rs
+++ b/crates/sui-core/src/transaction_input_loader.rs
@@ -34,7 +34,7 @@ impl TransactionInputLoader {
     /// a single hash map lookup when notify_read_objects_for_execution is called later.
     /// TODO: implement this caching
     #[instrument(level = "trace", skip_all)]
-    pub async fn read_objects_for_signing(
+    pub fn read_objects_for_signing(
         &self,
         _tx_digest_for_caching: Option<&TransactionDigest>,
         input_object_kinds: &[InputObjectKind],
@@ -122,7 +122,7 @@ impl TransactionInputLoader {
     /// cached, but only with appropriate invalidation logic for when an object is received by a
     /// different tx first.
     #[instrument(level = "trace", skip_all)]
-    pub async fn read_objects_for_execution(
+    pub fn read_objects_for_execution(
         &self,
         shared_lock_store: &impl GetSharedLocks,
         tx_key: &TransactionKey,
diff --git a/crates/sui-core/src/transaction_manager.rs b/crates/sui-core/src/transaction_manager.rs
index 5accb919a8680..d7796b69edbc2 100644
--- a/crates/sui-core/src/transaction_manager.rs
+++ b/crates/sui-core/src/transaction_manager.rs
@@ -62,6 +62,7 @@ pub struct TransactionManager {
 #[derive(Clone, Debug)]
 pub struct PendingCertificateStats {
     // The time this certificate enters transaction manager.
+    #[allow(unused)]
     pub enqueue_time: Instant,
     // The time this certificate becomes ready for execution.
     pub ready_time: Option<Instant>,
@@ -966,9 +967,7 @@ impl TransactionQueue {
     /// After removing the digest, first() will return the new oldest entry
     /// in the queue (which may be unchanged).
     fn remove(&mut self, digest: &TransactionDigest) -> Option<Instant> {
-        let Some(when) = self.digests.remove(digest) else {
-            return None;
-        };
+        let when = self.digests.remove(digest)?;
 
         // This loop removes all previously inserted entries that no longer
         // correspond to live entries in self.digests. When the loop terminates,
diff --git a/crates/sui-core/src/transaction_orchestrator.rs b/crates/sui-core/src/transaction_orchestrator.rs
index 6b655d0358d56..ce69aeb474033 100644
--- a/crates/sui-core/src/transaction_orchestrator.rs
+++ b/crates/sui-core/src/transaction_orchestrator.rs
@@ -17,7 +17,7 @@ use futures::future::{select, Either, Future};
 use futures::FutureExt;
 use mysten_common::sync::notify_read::NotifyRead;
 use mysten_metrics::histogram::{Histogram, HistogramVec};
-use mysten_metrics::{spawn_logged_monitored_task, spawn_monitored_task};
+use mysten_metrics::{add_server_timing, spawn_logged_monitored_task, spawn_monitored_task};
 use mysten_metrics::{TX_TYPE_SHARED_OBJ_TX, TX_TYPE_SINGLE_WRITER_TX};
 use prometheus::core::{AtomicI64, AtomicU64, GenericCounter, GenericGauge};
 use prometheus::{
@@ -35,9 +35,9 @@ use sui_types::effects::{TransactionEffectsAPI, VerifiedCertifiedTransactionEffe
 use sui_types::error::{SuiError, SuiResult};
 use sui_types::executable_transaction::VerifiedExecutableTransaction;
 use sui_types::quorum_driver_types::{
-    ExecuteTransactionRequest, ExecuteTransactionRequestType, ExecuteTransactionRequestV3,
-    ExecuteTransactionResponse, ExecuteTransactionResponseV3, FinalizedEffects,
-    QuorumDriverEffectsQueueResult, QuorumDriverError, QuorumDriverResponse, QuorumDriverResult,
+    ExecuteTransactionRequestType, ExecuteTransactionRequestV3, ExecuteTransactionResponseV3,
+    FinalizedEffects, IsTransactionExecutedLocally, QuorumDriverEffectsQueueResult,
+    QuorumDriverError, QuorumDriverResponse, QuorumDriverResult,
 };
 use sui_types::sui_system_state::SuiSystemState;
 use sui_types::transaction::VerifiedTransaction;
@@ -111,22 +111,15 @@ where
         );
 
         let effects_receiver = quorum_driver_handler.subscribe_to_effects();
-        let state_clone = validator_state.clone();
         let metrics = Arc::new(TransactionOrchestratorMetrics::new(prometheus_registry));
-        let metrics_clone = metrics.clone();
         let pending_tx_log = Arc::new(WritePathPendingTransactionLog::new(
             parent_path.join("fullnode_pending_transactions"),
         ));
         let pending_tx_log_clone = pending_tx_log.clone();
         let _local_executor_handle = {
             spawn_monitored_task!(async move {
-                Self::loop_execute_finalized_tx_locally(
-                    state_clone,
-                    effects_receiver,
-                    pending_tx_log_clone,
-                    metrics_clone,
-                )
-                .await;
+                Self::loop_execute_finalized_tx_locally(effects_receiver, pending_tx_log_clone)
+                    .await;
             })
         };
         Self::schedule_txes_in_log(pending_tx_log.clone(), quorum_driver_handler.clone());
@@ -148,125 +141,62 @@ where
     #[instrument(name = "tx_orchestrator_execute_transaction", level = "debug", skip_all,
     fields(
         tx_digest = ?request.transaction.digest(),
-        tx_type = ?request.transaction_type(),
+        tx_type = ?request_type,
     ),
     err)]
     pub async fn execute_transaction_block(
         &self,
-        request: ExecuteTransactionRequest,
+        request: ExecuteTransactionRequestV3,
+        request_type: ExecuteTransactionRequestType,
         client_addr: Option<SocketAddr>,
-    ) -> Result<ExecuteTransactionResponse, QuorumDriverError> {
-        // TODO check if tx is already executed on this node.
-        // Note: since EffectsCert is not stored today, we need to gather that from validators
-        // (and maybe store it for caching purposes)
+    ) -> Result<(ExecuteTransactionResponseV3, IsTransactionExecutedLocally), QuorumDriverError>
+    {
         let epoch_store = self.validator_state.load_epoch_store_one_call_per_task();
 
-        let transaction = epoch_store
-            .verify_transaction(request.transaction)
-            .map_err(QuorumDriverError::InvalidUserSignature)?;
-        let (_in_flight_metrics_guards, good_response_metrics) = self.update_metrics(&transaction);
-        let tx_digest = *transaction.digest();
-        debug!(?tx_digest, "TO Received transaction execution request.");
+        let (transaction, response) = self
+            .execute_transaction_impl(&epoch_store, request, client_addr)
+            .await?;
 
-        let (_e2e_latency_timer, _txn_finality_timer) = if transaction.contains_shared_object() {
-            (
-                self.metrics.request_latency_shared_obj.start_timer(),
-                self.metrics
-                    .wait_for_finality_latency_shared_obj
-                    .start_timer(),
+        let executed_locally = if matches!(
+            request_type,
+            ExecuteTransactionRequestType::WaitForLocalExecution
+        ) {
+            let executable_tx = VerifiedExecutableTransaction::new_from_quorum_execution(
+                transaction,
+                response.effects_cert.executed_epoch(),
+            );
+            let executed_locally = Self::execute_finalized_tx_locally_with_timeout(
+                &self.validator_state,
+                &epoch_store,
+                &executable_tx,
+                &response.effects_cert,
+                &self.metrics,
             )
+            .await
+            .is_ok();
+            add_server_timing("local_execution");
+            executed_locally
         } else {
-            (
-                self.metrics.request_latency_single_writer.start_timer(),
-                self.metrics
-                    .wait_for_finality_latency_single_writer
-                    .start_timer(),
-            )
+            false
         };
 
-        // TODO: refactor all the gauge and timer metrics with `monitored_scope`
-        let wait_for_finality_gauge = self.metrics.wait_for_finality_in_flight.clone();
-        wait_for_finality_gauge.inc();
-        let _wait_for_finality_gauge = scopeguard::guard(wait_for_finality_gauge, |in_flight| {
-            in_flight.dec();
-        });
-
-        let ticket = self
-            .submit(
-                transaction.clone(),
-                ExecuteTransactionRequestV3::new_v2(transaction.clone()),
-                client_addr,
-            )
-            .await
-            .map_err(|e| {
-                warn!(?tx_digest, "QuorumDriverInternalError: {e:?}");
-                QuorumDriverError::QuorumDriverInternalError(e)
-            })?;
-
-        let wait_for_local_execution = matches!(
-            request.request_type,
-            ExecuteTransactionRequestType::WaitForLocalExecution
-        );
-
-        let Ok(result) = timeout(WAIT_FOR_FINALITY_TIMEOUT, ticket).await else {
-            debug!(?tx_digest, "Timeout waiting for transaction finality.");
-            self.metrics.wait_for_finality_timeout.inc();
-            return Err(QuorumDriverError::TimeoutBeforeFinality);
+        let QuorumDriverResponse {
+            effects_cert,
+            events,
+            input_objects,
+            output_objects,
+            auxiliary_data,
+        } = response;
+
+        let response = ExecuteTransactionResponseV3 {
+            effects: FinalizedEffects::new_from_effects_cert(effects_cert.into()),
+            events,
+            input_objects,
+            output_objects,
+            auxiliary_data,
         };
 
-        drop(_txn_finality_timer);
-        drop(_wait_for_finality_gauge);
-        self.metrics.wait_for_finality_finished.inc();
-
-        match result {
-            Err(err) => {
-                warn!(?tx_digest, "QuorumDriverInternalError: {err:?}");
-                Err(QuorumDriverError::QuorumDriverInternalError(err))
-            }
-            Ok(Err(err)) => Err(err),
-            Ok(Ok(response)) => {
-                good_response_metrics.inc();
-                let QuorumDriverResponse { effects_cert, .. } = response;
-                if !wait_for_local_execution {
-                    debug!(?tx_digest, ?wait_for_local_execution, "success");
-                    return Ok(ExecuteTransactionResponse::EffectsCert(Box::new((
-                        FinalizedEffects::new_from_effects_cert(effects_cert.into()),
-                        response.events.unwrap_or_default(),
-                        false,
-                    ))));
-                }
-
-                let executable_tx = VerifiedExecutableTransaction::new_from_quorum_execution(
-                    transaction,
-                    effects_cert.executed_epoch(),
-                );
-
-                match Self::execute_finalized_tx_locally_with_timeout(
-                    &self.validator_state,
-                    &epoch_store,
-                    &executable_tx,
-                    &effects_cert,
-                    &self.metrics,
-                )
-                .await
-                {
-                    Ok(_) => {
-                        debug!(?tx_digest, ?wait_for_local_execution, "success");
-
-                        Ok(ExecuteTransactionResponse::EffectsCert(Box::new((
-                            FinalizedEffects::new_from_effects_cert(effects_cert.into()),
-                            response.events.unwrap_or_default(),
-                            true,
-                        ))))
-                    }
-                    Err(_) => Ok(ExecuteTransactionResponse::EffectsCert(Box::new((
-                        FinalizedEffects::new_from_effects_cert(effects_cert.into()),
-                        response.events.unwrap_or_default(),
-                        false,
-                    )))),
-                }
-            }
-        }
+        Ok((response, executed_locally))
     }
 
     // Utilize the handle_certificate_v3 validator api to request input/output objects
@@ -277,11 +207,37 @@ where
         request: ExecuteTransactionRequestV3,
         client_addr: Option<SocketAddr>,
     ) -> Result<ExecuteTransactionResponseV3, QuorumDriverError> {
-        // TODO check if tx is already executed on this node.
-        // Note: since EffectsCert is not stored today, we need to gather that from validators
-        // (and maybe store it for caching purposes)
         let epoch_store = self.validator_state.load_epoch_store_one_call_per_task();
 
+        let QuorumDriverResponse {
+            effects_cert,
+            events,
+            input_objects,
+            output_objects,
+            auxiliary_data,
+        } = self
+            .execute_transaction_impl(&epoch_store, request, client_addr)
+            .await
+            .map(|(_, r)| r)?;
+
+        Ok(ExecuteTransactionResponseV3 {
+            effects: FinalizedEffects::new_from_effects_cert(effects_cert.into()),
+            events,
+            input_objects,
+            output_objects,
+            auxiliary_data,
+        })
+    }
+
+    // TODO check if tx is already executed on this node.
+    // Note: since EffectsCert is not stored today, we need to gather that from validators
+    // (and maybe store it for caching purposes)
+    pub async fn execute_transaction_impl(
+        &self,
+        epoch_store: &AuthorityPerEpochStore,
+        request: ExecuteTransactionRequestV3,
+        client_addr: Option<SocketAddr>,
+    ) -> Result<(VerifiedTransaction, QuorumDriverResponse), QuorumDriverError> {
         let transaction = epoch_store
             .verify_transaction(request.transaction.clone())
             .map_err(QuorumDriverError::InvalidUserSignature)?;
@@ -313,7 +269,7 @@ where
         });
 
         let ticket = self
-            .submit(transaction, request, client_addr)
+            .submit(transaction.clone(), request, client_addr)
             .await
             .map_err(|e| {
                 warn!(?tx_digest, "QuorumDriverInternalError: {e:?}");
@@ -325,6 +281,7 @@ where
             self.metrics.wait_for_finality_timeout.inc();
             return Err(QuorumDriverError::TimeoutBeforeFinality);
         };
+        add_server_timing("wait_for_finality");
 
         drop(_txn_finality_timer);
         drop(_wait_for_finality_gauge);
@@ -338,20 +295,7 @@ where
             Ok(Err(err)) => Err(err),
             Ok(Ok(response)) => {
                 good_response_metrics.inc();
-                let QuorumDriverResponse {
-                    effects_cert,
-                    events,
-                    input_objects,
-                    output_objects,
-                    auxiliary_data,
-                } = response;
-                Ok(ExecuteTransactionResponseV3 {
-                    effects: FinalizedEffects::new_from_effects_cert(effects_cert.into()),
-                    events,
-                    input_objects,
-                    output_objects,
-                    auxiliary_data,
-                })
+                Ok((transaction, response))
             }
         }
     }
@@ -480,57 +424,19 @@ where
     }
 
     async fn loop_execute_finalized_tx_locally(
-        validator_state: Arc<AuthorityState>,
         mut effects_receiver: Receiver<QuorumDriverEffectsQueueResult>,
         pending_transaction_log: Arc<WritePathPendingTransactionLog>,
-        metrics: Arc<TransactionOrchestratorMetrics>,
     ) {
         loop {
             match effects_receiver.recv().await {
-                Ok(Ok((transaction, QuorumDriverResponse { effects_cert, .. }))) => {
+                Ok(Ok((transaction, ..))) => {
                     let tx_digest = transaction.digest();
                     if let Err(err) = pending_transaction_log.finish_transaction(tx_digest) {
-                        panic!(
-                            "Failed to finish transaction {tx_digest} in pending transaction log: {err}"
+                        error!(
+                            ?tx_digest,
+                            "Failed to finish transaction in pending transaction log: {err}"
                         );
                     }
-
-                    if transaction.contains_shared_object() {
-                        // Do not locally execute transactions with shared objects, as this can
-                        // cause forks until MVCC is merged.
-                        continue;
-                    }
-
-                    let epoch_store = validator_state.load_epoch_store_one_call_per_task();
-
-                    // This is a redundant verification, but SignatureVerifier will cache the
-                    // previous result.
-                    let transaction = match epoch_store.verify_transaction(transaction) {
-                        Ok(transaction) => transaction,
-                        Err(err) => {
-                            // This should be impossible, since we verified the transaction
-                            // before sending it to quorum driver.
-                            error!(
-                                    ?err,
-                                    "Transaction signature failed to verify after quorum driver execution."
-                                );
-                            continue;
-                        }
-                    };
-
-                    let executable_tx = VerifiedExecutableTransaction::new_from_quorum_execution(
-                        transaction,
-                        effects_cert.executed_epoch(),
-                    );
-
-                    let _ = Self::execute_finalized_tx_locally_with_timeout(
-                        &validator_state,
-                        &epoch_store,
-                        &executable_tx,
-                        &effects_cert,
-                        &metrics,
-                    )
-                    .await;
                 }
                 Ok(Err((tx_digest, _err))) => {
                     if let Err(err) = pending_transaction_log.finish_transaction(&tx_digest) {
@@ -808,18 +714,15 @@ impl TransactionOrchestratorMetrics {
 }
 
 #[async_trait::async_trait]
-impl<A> sui_rest_api::TransactionExecutor for TransactiondOrchestrator<A>
+impl<A> sui_types::transaction_executor::TransactionExecutor for TransactiondOrchestrator<A>
 where
     A: AuthorityAPI + Send + Sync + 'static + Clone,
 {
     async fn execute_transaction(
         &self,
-        request: sui_types::quorum_driver_types::ExecuteTransactionRequestV3,
+        request: ExecuteTransactionRequestV3,
         client_addr: Option<std::net::SocketAddr>,
-    ) -> Result<
-        sui_types::quorum_driver_types::ExecuteTransactionResponseV3,
-        sui_types::quorum_driver_types::QuorumDriverError,
-    > {
+    ) -> Result<ExecuteTransactionResponseV3, QuorumDriverError> {
         self.execute_transaction_v3(request, client_addr).await
     }
 }
diff --git a/crates/sui-core/src/unit_tests/authority_aggregator_tests.rs b/crates/sui-core/src/unit_tests/authority_aggregator_tests.rs
index cef3075a2e93f..cc3ffa82fb08e 100644
--- a/crates/sui-core/src/unit_tests/authority_aggregator_tests.rs
+++ b/crates/sui-core/src/unit_tests/authority_aggregator_tests.rs
@@ -693,7 +693,7 @@ fn get_genesis_agg<A: Clone>(
         .build_custom_clients(clients)
 }
 
-fn get_agg_at_epoch<A: Clone>(
+fn get_agg_at_epoch<A>(
     authorities: BTreeMap<AuthorityName, StakeUnit>,
     clients: BTreeMap<AuthorityName, A>,
     epoch: EpochId,
diff --git a/crates/sui-core/src/unit_tests/authority_tests.rs b/crates/sui-core/src/unit_tests/authority_tests.rs
index b0b48a4dfedb6..75e72190ec5f9 100644
--- a/crates/sui-core/src/unit_tests/authority_tests.rs
+++ b/crates/sui-core/src/unit_tests/authority_tests.rs
@@ -6156,7 +6156,6 @@ async fn test_consensus_handler_congestion_control_transaction_cancellation() {
                 .unwrap(),
             authority.epoch_store_for_testing().epoch(),
         )
-        .await
         .unwrap();
 
     // The lamport version should be the lamport version of the owned objects.
diff --git a/crates/sui-core/src/unit_tests/epoch_data_tests.rs b/crates/sui-core/src/unit_tests/epoch_data_tests.rs
deleted file mode 100644
index 62b856d2dda0d..0000000000000
--- a/crates/sui-core/src/unit_tests/epoch_data_tests.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-use crate::epoch::data_removal;
-use std::fs;
-use std::path::PathBuf;
-
-#[tokio::test]
-async fn test_remove_old_epoch_data() {
-    // Create the storage paths
-    let base_path_string = narwhal_test_utils::temp_dir().to_str().unwrap().to_owned();
-
-    let mut base_path = PathBuf::new();
-    base_path.push(base_path_string.clone());
-
-    let mut path_other = PathBuf::new();
-    path_other.push(base_path_string.clone() + "/other");
-    let mut path_98 = base_path.clone();
-    path_98.push(base_path_string.clone() + "/98");
-    let mut path_99 = base_path.clone();
-    path_99.push(base_path_string.clone() + "/99");
-    let mut path_100 = base_path.clone();
-    path_100.push(base_path_string.clone() + "/100");
-
-    // Remove the directories created next in case it wasn't cleaned up before the last test run terminated
-    _ = fs::remove_dir_all(base_path.clone());
-
-    // Create some epoch directories
-    fs::create_dir(base_path.clone()).unwrap();
-    fs::create_dir(path_other.clone()).unwrap();
-    fs::create_dir(path_98.clone()).unwrap();
-    fs::create_dir(path_99.clone()).unwrap();
-    fs::create_dir(path_100.clone()).unwrap();
-
-    // With the current epoch of 100, remove old epochs
-    data_removal::remove_old_epoch_data(base_path.clone(), 100);
-
-    // Now ensure the epoch directories older than 100 were removed
-    let files = fs::read_dir(base_path_string).unwrap();
-
-    let mut epochs_left = Vec::new();
-    for file_res in files {
-        let file_epoch_string = file_res.unwrap().file_name().to_str().unwrap().to_owned();
-        if let Ok(file_epoch) = file_epoch_string.parse::<u64>() {
-            epochs_left.push(file_epoch);
-        }
-    }
-
-    // Remove the directories we created before the test possibly terminates
-    _ = fs::remove_dir_all(base_path);
-
-    assert_eq!(epochs_left.len(), 1);
-    assert_eq!(epochs_left[0], 100);
-}
diff --git a/crates/sui-core/src/unit_tests/execution_driver_tests.rs b/crates/sui-core/src/unit_tests/execution_driver_tests.rs
index e9a5f381dceeb..a138886c4f6a7 100644
--- a/crates/sui-core/src/unit_tests/execution_driver_tests.rs
+++ b/crates/sui-core/src/unit_tests/execution_driver_tests.rs
@@ -46,7 +46,7 @@ use tokio::time::{sleep, timeout};
 #[allow(dead_code)]
 async fn wait_for_certs(
     stream: &mut UnboundedReceiver<VerifiedCertificate>,
-    certs: &Vec<VerifiedCertificate>,
+    certs: &[VerifiedCertificate],
 ) {
     if certs.is_empty() {
         if timeout(Duration::from_secs(30), stream.recv())
diff --git a/crates/sui-core/src/unit_tests/move_integration_tests.rs b/crates/sui-core/src/unit_tests/move_integration_tests.rs
index 1df56180e648a..7e43c4f7ac14b 100644
--- a/crates/sui-core/src/unit_tests/move_integration_tests.rs
+++ b/crates/sui-core/src/unit_tests/move_integration_tests.rs
@@ -2806,7 +2806,7 @@ pub fn build_package(
     let compiled_package = BuildConfig::new_for_testing().build(&path).unwrap();
     let digest = compiled_package.get_package_digest(with_unpublished_deps);
     let modules = compiled_package.get_package_bytes(with_unpublished_deps);
-    let dependencies = compiled_package.get_dependency_original_package_ids();
+    let dependencies = compiled_package.get_dependency_storage_package_ids();
     (digest.to_vec(), modules, dependencies)
 }
 
@@ -2826,7 +2826,7 @@ pub async fn build_and_try_publish_test_package(
 
     let compiled_package = BuildConfig::new_for_testing().build(&path).unwrap();
     let all_module_bytes = compiled_package.get_package_bytes(with_unpublished_deps);
-    let dependencies = compiled_package.get_dependency_original_package_ids();
+    let dependencies = compiled_package.get_dependency_storage_package_ids();
 
     let gas_object = authority.get_object(gas_object_id).await.unwrap();
     let gas_object_ref = gas_object.unwrap().compute_object_reference();
diff --git a/crates/sui-core/src/unit_tests/mysticeti_manager_tests.rs b/crates/sui-core/src/unit_tests/mysticeti_manager_tests.rs
index 394191e235bdd..f56e373ec8c54 100644
--- a/crates/sui-core/src/unit_tests/mysticeti_manager_tests.rs
+++ b/crates/sui-core/src/unit_tests/mysticeti_manager_tests.rs
@@ -29,32 +29,35 @@ async fn test_mysticeti_manager() {
         .committee_size(1.try_into().unwrap())
         .build();
 
-    for _i in 0..3 {
-        let config = &configs.validator_configs()[0];
+    let config = &configs.validator_configs()[0];
 
-        let consensus_config = config.consensus_config().unwrap();
-        let registry_service = RegistryService::new(Registry::new());
-        let secret = Arc::pin(config.protocol_key_pair().copy());
-        let genesis = config.genesis().unwrap();
+    let consensus_config = config.consensus_config().unwrap();
+    let registry_service = RegistryService::new(Registry::new());
+    let secret = Arc::pin(config.protocol_key_pair().copy());
+    let genesis = config.genesis().unwrap();
 
-        let state = TestAuthorityBuilder::new()
-            .with_genesis_and_keypair(genesis, &secret)
-            .build()
-            .await;
+    let state = TestAuthorityBuilder::new()
+        .with_genesis_and_keypair(genesis, &secret)
+        .build()
+        .await;
 
-        let metrics = Arc::new(ConsensusManagerMetrics::new(&Registry::new()));
-        let epoch_store = state.epoch_store_for_testing();
-        let client = Arc::new(LazyMysticetiClient::default());
-
-        let manager = MysticetiManager::new(
-            config.worker_key_pair().copy(),
-            config.network_key_pair().copy(),
-            consensus_config.db_path().to_path_buf(),
-            registry_service,
-            metrics,
-            client,
-        );
+    let metrics = Arc::new(ConsensusManagerMetrics::new(&Registry::new()));
+    let epoch_store = state.epoch_store_for_testing();
+    let client = Arc::new(LazyMysticetiClient::default());
+
+    let manager = MysticetiManager::new(
+        config.worker_key_pair().copy(),
+        config.network_key_pair().copy(),
+        consensus_config.db_path().to_path_buf(),
+        registry_service,
+        metrics,
+        client,
+    );
 
+    let boot_counter = *manager.boot_counter.lock().await;
+    assert_eq!(boot_counter, 0);
+
+    for i in 1..=3 {
         let consensus_handler_initializer = ConsensusHandlerInitializer::new_for_testing(
             state.clone(),
             checkpoint_service_for_testing(state.clone()),
@@ -86,5 +89,8 @@ async fn test_mysticeti_manager() {
 
         // THEN
         assert!(!manager.is_running().await);
+
+        let boot_counter = *manager.boot_counter.lock().await;
+        assert_eq!(boot_counter, i);
     }
 }
diff --git a/crates/sui-core/src/validator_tx_finalizer.rs b/crates/sui-core/src/validator_tx_finalizer.rs
index 4183eed0fbadc..fde6c12e224eb 100644
--- a/crates/sui-core/src/validator_tx_finalizer.rs
+++ b/crates/sui-core/src/validator_tx_finalizer.rs
@@ -22,19 +22,6 @@ use tokio::select;
 use tokio::time::Instant;
 use tracing::{debug, error, trace};
 
-/// Only wake up the transaction finalization task for a given transaction
-/// after 1 mins of seeing it. This gives plenty of time for the transaction
-/// to become final in the normal way. We also don't want this delay to be too long
-/// to reduce memory usage held up by the finalizer threads.
-const TX_FINALIZATION_DELAY: Duration = Duration::from_secs(60);
-/// If a transaction can not be finalized within 1 min of being woken up, give up.
-const FINALIZATION_TIMEOUT: Duration = Duration::from_secs(60);
-
-/// Incremental delay for validators to wake up to finalize a transaction.
-const VALIDATOR_DELAY_INCREMENTS_SEC: u64 = 10;
-
-const VALIDATOR_MAX_DELAY: Duration = Duration::from_secs(180);
-
 struct ValidatorTxFinalizerMetrics {
     num_finalization_attempts: IntCounter,
     num_successful_finalizations: IntCounter,
@@ -100,6 +87,43 @@ impl ValidatorTxFinalizerMetrics {
     }
 }
 
+pub struct ValidatorTxFinalizerConfig {
+    pub tx_finalization_delay: Duration,
+    pub tx_finalization_timeout: Duration,
+    /// Incremental delay for validators to wake up to finalize a transaction.
+    pub validator_delay_increments_sec: u64,
+    pub validator_max_delay: Duration,
+}
+
+#[cfg(not(any(msim, test)))]
+impl Default for ValidatorTxFinalizerConfig {
+    fn default() -> Self {
+        Self {
+            // Only wake up the transaction finalization task for a given transaction
+            // after 1 mins of seeing it. This gives plenty of time for the transaction
+            // to become final in the normal way. We also don't want this delay to be too long
+            // to reduce memory usage held up by the finalizer threads.
+            tx_finalization_delay: Duration::from_secs(60),
+            // If a transaction can not be finalized within 1 min of being woken up, give up.
+            tx_finalization_timeout: Duration::from_secs(60),
+            validator_delay_increments_sec: 10,
+            validator_max_delay: Duration::from_secs(180),
+        }
+    }
+}
+
+#[cfg(any(msim, test))]
+impl Default for ValidatorTxFinalizerConfig {
+    fn default() -> Self {
+        Self {
+            tx_finalization_delay: Duration::from_secs(5),
+            tx_finalization_timeout: Duration::from_secs(60),
+            validator_delay_increments_sec: 1,
+            validator_max_delay: Duration::from_secs(15),
+        }
+    }
+}
+
 /// The `ValidatorTxFinalizer` is responsible for finalizing transactions that
 /// have been signed by the validator. It does this by waiting for a delay
 /// after the transaction has been signed, and then attempting to finalize
@@ -107,8 +131,7 @@ impl ValidatorTxFinalizerMetrics {
 pub struct ValidatorTxFinalizer<C: Clone> {
     agg: Arc<ArcSwap<AuthorityAggregator<C>>>,
     name: AuthorityName,
-    tx_finalization_delay: Duration,
-    finalization_timeout: Duration,
+    config: Arc<ValidatorTxFinalizerConfig>,
     metrics: Arc<ValidatorTxFinalizerMetrics>,
 }
 
@@ -121,8 +144,7 @@ impl<C: Clone> ValidatorTxFinalizer<C> {
         Self {
             agg,
             name,
-            tx_finalization_delay: TX_FINALIZATION_DELAY,
-            finalization_timeout: FINALIZATION_TIMEOUT,
+            config: Arc::new(ValidatorTxFinalizerConfig::default()),
             metrics: Arc::new(ValidatorTxFinalizerMetrics::new(registry)),
         }
     }
@@ -131,16 +153,8 @@ impl<C: Clone> ValidatorTxFinalizer<C> {
     pub(crate) fn new_for_testing(
         agg: Arc<ArcSwap<AuthorityAggregator<C>>>,
         name: AuthorityName,
-        tx_finalization_delay: Duration,
-        finalization_timeout: Duration,
     ) -> Self {
-        Self {
-            agg,
-            name,
-            tx_finalization_delay,
-            finalization_timeout,
-            metrics: Arc::new(ValidatorTxFinalizerMetrics::new(&Registry::new())),
-        }
+        Self::new(agg, name, &Registry::new())
     }
 
     #[cfg(test)]
@@ -208,7 +222,7 @@ where
             "Invoking authority aggregator to finalize transaction"
         );
         tokio::time::timeout(
-            self.finalization_timeout,
+            self.config.tx_finalization_timeout,
             self.agg
                 .load()
                 .execute_transaction_block(tx.into_unsigned().inner(), None),
@@ -234,11 +248,12 @@ where
             return None;
         };
         // TODO: As an optimization, we could also limit the number of validators that would do this.
-        let extra_delay = position as u64 * VALIDATOR_DELAY_INCREMENTS_SEC;
+        let extra_delay = position as u64 * self.config.validator_delay_increments_sec;
         let delay = self
+            .config
             .tx_finalization_delay
             .add(Duration::from_secs(extra_delay));
-        Some(min(delay, VALIDATOR_MAX_DELAY))
+        Some(min(delay, self.config.validator_max_delay))
     }
 }
 
@@ -248,10 +263,9 @@ mod tests {
     use crate::authority::AuthorityState;
     use crate::authority_aggregator::{AuthorityAggregator, AuthorityAggregatorBuilder};
     use crate::authority_client::AuthorityAPI;
-    use crate::validator_tx_finalizer::{ValidatorTxFinalizer, VALIDATOR_MAX_DELAY};
+    use crate::validator_tx_finalizer::ValidatorTxFinalizer;
     use arc_swap::ArcSwap;
     use async_trait::async_trait;
-    use prometheus::Registry;
     use std::cmp::min;
     use std::collections::BTreeMap;
     use std::iter;
@@ -260,7 +274,6 @@ mod tests {
     use std::sync::atomic::AtomicBool;
     use std::sync::atomic::Ordering::Relaxed;
     use std::sync::Arc;
-    use std::time::Duration;
     use sui_macros::sim_test;
     use sui_swarm_config::network_config_builder::ConfigBuilder;
     use sui_test_transaction_builder::TestTransactionBuilder;
@@ -402,12 +415,7 @@ mod tests {
         let gas_object = Object::with_owner_for_testing(sender);
         let gas_object_id = gas_object.id();
         let (states, auth_agg, clients) = create_validators(gas_object).await;
-        let finalizer1 = ValidatorTxFinalizer::new_for_testing(
-            auth_agg.clone(),
-            states[0].name,
-            Duration::from_secs(1),
-            Duration::from_secs(60),
-        );
+        let finalizer1 = ValidatorTxFinalizer::new_for_testing(auth_agg.clone(), states[0].name);
         let signed_tx = create_tx(&clients, &states[0], sender, &keypair, gas_object_id).await;
         let tx_digest = *signed_tx.digest();
         let cache_read = states[0].get_transaction_cache_reader().clone();
@@ -435,12 +443,7 @@ mod tests {
         let gas_object = Object::with_owner_for_testing(sender);
         let gas_object_id = gas_object.id();
         let (states, auth_agg, clients) = create_validators(gas_object).await;
-        let finalizer1 = ValidatorTxFinalizer::new_for_testing(
-            auth_agg.clone(),
-            states[0].name,
-            Duration::from_secs(10),
-            Duration::from_secs(60),
-        );
+        let finalizer1 = ValidatorTxFinalizer::new_for_testing(auth_agg.clone(), states[0].name);
         let signed_tx = create_tx(&clients, &states[0], sender, &keypair, gas_object_id).await;
         let tx_digest = *signed_tx.digest();
         let epoch_store = states[0].epoch_store_for_testing();
@@ -472,12 +475,7 @@ mod tests {
         let (sender, _) = get_account_key_pair();
         let gas_object = Object::with_owner_for_testing(sender);
         let (states, auth_agg, _clients) = create_validators(gas_object).await;
-        let finalizer1 = ValidatorTxFinalizer::new_for_testing(
-            auth_agg.clone(),
-            states[0].name,
-            Duration::from_secs(10),
-            Duration::from_secs(60),
-        );
+        let finalizer1 = ValidatorTxFinalizer::new_for_testing(auth_agg.clone(), states[0].name);
         let mut new_auth_agg = (**auth_agg.load()).clone();
         let mut new_committee = (*new_auth_agg.committee).clone();
         new_committee.epoch = 100;
@@ -497,12 +495,7 @@ mod tests {
         let gas_object = Object::with_owner_for_testing(sender);
         let gas_object_id = gas_object.id();
         let (states, auth_agg, clients) = create_validators(gas_object).await;
-        let finalizer1 = ValidatorTxFinalizer::new_for_testing(
-            auth_agg.clone(),
-            states[0].name,
-            Duration::from_secs(20),
-            Duration::from_secs(60),
-        );
+        let finalizer1 = ValidatorTxFinalizer::new_for_testing(auth_agg.clone(), states[0].name);
         let signed_tx = create_tx(&clients, &states[0], sender, &keypair, gas_object_id).await;
         let tx_digest = *signed_tx.digest();
         let cache_read = states[0].get_transaction_cache_reader().clone();
@@ -540,12 +533,7 @@ mod tests {
         let gas_object = Object::with_owner_for_testing(sender);
         let gas_object_id = gas_object.id();
         let (states, auth_agg, clients) = create_validators(gas_object).await;
-        let finalizer1 = ValidatorTxFinalizer::new_for_testing(
-            auth_agg.clone(),
-            states[0].name,
-            Duration::from_secs(10),
-            Duration::from_secs(30),
-        );
+        let finalizer1 = ValidatorTxFinalizer::new_for_testing(auth_agg.clone(), states[0].name);
         let signed_tx = create_tx(&clients, &states[0], sender, &keypair, gas_object_id).await;
         let tx_digest = *signed_tx.digest();
         let cache_read = states[0].get_transaction_cache_reader().clone();
@@ -585,13 +573,13 @@ mod tests {
         let auth_agg = Arc::new(auth_agg);
         let finalizers = (0..COMMITTEE_SIZE)
             .map(|idx| {
-                ValidatorTxFinalizer::new(
+                ValidatorTxFinalizer::new_for_testing(
                     Arc::new(ArcSwap::new(auth_agg.clone())),
                     auth_agg.committee.voting_rights[idx].0,
-                    &Registry::new(),
                 )
             })
             .collect::<Vec<_>>();
+        let config = finalizers[0].config.clone();
         for _ in 0..100 {
             let tx_digest = TransactionDigest::random();
             let mut delays: Vec<_> = finalizers
@@ -607,7 +595,11 @@ mod tests {
             for (idx, delay) in delays.iter().enumerate() {
                 assert_eq!(
                     *delay,
-                    min(VALIDATOR_MAX_DELAY.as_secs(), 60 + idx as u64 * 10)
+                    min(
+                        config.validator_max_delay.as_secs(),
+                        config.tx_finalization_delay.as_secs()
+                            + idx as u64 * config.validator_delay_increments_sec
+                    )
                 );
             }
         }
diff --git a/crates/sui-data-ingestion-core/src/progress_store/mod.rs b/crates/sui-data-ingestion-core/src/progress_store/mod.rs
index 46f2b65268d44..c7358eb117580 100644
--- a/crates/sui-data-ingestion-core/src/progress_store/mod.rs
+++ b/crates/sui-data-ingestion-core/src/progress_store/mod.rs
@@ -38,12 +38,10 @@ impl<P: ProgressStore> ProgressStore for ProgressStoreWrapper<P> {
         task_name: String,
         checkpoint_number: CheckpointSequenceNumber,
     ) -> Result<()> {
-        if checkpoint_number > self.load(task_name.clone()).await? {
-            self.progress_store
-                .save(task_name.clone(), checkpoint_number)
-                .await?;
-            self.pending_state.insert(task_name, checkpoint_number);
-        }
+        self.progress_store
+            .save(task_name.clone(), checkpoint_number)
+            .await?;
+        self.pending_state.insert(task_name, checkpoint_number);
         Ok(())
     }
 }
diff --git a/crates/sui-data-ingestion-core/src/reader.rs b/crates/sui-data-ingestion-core/src/reader.rs
index c8168da29cce8..2e005a4985f86 100644
--- a/crates/sui-data-ingestion-core/src/reader.rs
+++ b/crates/sui-data-ingestion-core/src/reader.rs
@@ -48,6 +48,7 @@ pub struct CheckpointReader {
 pub struct ReaderOptions {
     pub tick_interal_ms: u64,
     pub timeout_secs: u64,
+    /// number of maximum concurrent requests to the remote store. Increase it for backfills
     pub batch_size: usize,
     pub data_limit: usize,
 }
@@ -57,7 +58,7 @@ impl Default for ReaderOptions {
         Self {
             tick_interal_ms: 100,
             timeout_secs: 5,
-            batch_size: 100,
+            batch_size: 10,
             data_limit: 0,
         }
     }
diff --git a/crates/sui-data-ingestion/src/progress_store.rs b/crates/sui-data-ingestion/src/progress_store.rs
index c8524ccbd5331..b82d91c85b2ab 100644
--- a/crates/sui-data-ingestion/src/progress_store.rs
+++ b/crates/sui-data-ingestion/src/progress_store.rs
@@ -4,6 +4,7 @@
 use anyhow::Result;
 use async_trait::async_trait;
 use aws_config::timeout::TimeoutConfig;
+use aws_sdk_dynamodb::error::SdkError;
 use aws_sdk_dynamodb::types::AttributeValue;
 use aws_sdk_dynamodb::Client;
 use aws_sdk_s3::config::{Credentials, Region};
@@ -58,7 +59,7 @@ impl ProgressStore for DynamoDBProgressStore {
             .send()
             .await?;
         if let Some(output) = item.item() {
-            if let AttributeValue::S(checkpoint_number) = &output["state"] {
+            if let AttributeValue::N(checkpoint_number) = &output["nstate"] {
                 return Ok(CheckpointSequenceNumber::from_str(checkpoint_number)?);
             }
         }
@@ -71,14 +72,29 @@ impl ProgressStore for DynamoDBProgressStore {
     ) -> Result<()> {
         let backoff = backoff::ExponentialBackoff::default();
         backoff::future::retry(backoff, || async {
-            self.client
-                .put_item()
+            let result = self
+                .client
+                .update_item()
                 .table_name(self.table_name.clone())
-                .item("task_name", AttributeValue::S(task_name.clone()))
-                .item("state", AttributeValue::S(checkpoint_number.to_string()))
+                .key("task_name", AttributeValue::S(task_name.clone()))
+                .update_expression("SET #nstate = :newState")
+                .condition_expression("#nstate < :newState")
+                .expression_attribute_names("#nstate", "nstate")
+                .expression_attribute_values(
+                    ":newState",
+                    AttributeValue::N(checkpoint_number.to_string()),
+                )
                 .send()
-                .await
-                .map_err(backoff::Error::transient)
+                .await;
+            match result {
+                Ok(_) => Ok(()),
+                Err(SdkError::ServiceError(err))
+                    if err.err().is_conditional_check_failed_exception() =>
+                {
+                    Ok(())
+                }
+                Err(err) => Err(backoff::Error::transient(err)),
+            }
         })
         .await?;
         Ok(())
diff --git a/crates/sui-e2e-tests/Cargo.toml b/crates/sui-e2e-tests/Cargo.toml
index 4d7e294f06c75..970458f3a9e94 100644
--- a/crates/sui-e2e-tests/Cargo.toml
+++ b/crates/sui-e2e-tests/Cargo.toml
@@ -6,6 +6,9 @@ publish = false
 edition = "2021"
 version.workspace = true
 
+[lints]
+workspace = true
+
 [dependencies]
 
 [dev-dependencies]
@@ -67,4 +70,4 @@ passkey-client.workspace = true
 passkey-authenticator.workspace = true
 coset.workspace = true
 url.workspace = true
-p256.workspace = true
\ No newline at end of file
+p256.workspace = true
diff --git a/crates/sui-e2e-tests/tests/dynamic_committee_tests.rs b/crates/sui-e2e-tests/tests/dynamic_committee_tests.rs
index 3d0b374dfefa8..454328bace837 100644
--- a/crates/sui-e2e-tests/tests/dynamic_committee_tests.rs
+++ b/crates/sui-e2e-tests/tests/dynamic_committee_tests.rs
@@ -57,6 +57,7 @@ trait StatePredicate {
         runner: &StressTestRunner,
         effects: &TransactionEffects,
     );
+    #[allow(unused)]
     async fn post_epoch_post_condition(
         &mut self,
         runner: &StressTestRunner,
@@ -351,7 +352,7 @@ async fn fuzz_dynamic_committee() {
     let num_operations = 10;
 
     // Add more actions here as we create them
-    let actions = vec![Box::new(add_stake::RequestAddStakeGen)];
+    let actions = [Box::new(add_stake::RequestAddStakeGen)];
 
     let mut runner = StressTestRunner::new().await;
 
diff --git a/crates/sui-e2e-tests/tests/full_node_tests.rs b/crates/sui-e2e-tests/tests/full_node_tests.rs
index 841d149c8d4ae..90c018f08aa2f 100644
--- a/crates/sui-e2e-tests/tests/full_node_tests.rs
+++ b/crates/sui-e2e-tests/tests/full_node_tests.rs
@@ -7,6 +7,7 @@ use jsonrpsee::rpc_params;
 use move_core_types::annotated_value::MoveStructLayout;
 use move_core_types::ident_str;
 use rand::rngs::OsRng;
+use std::path::PathBuf;
 use std::sync::Arc;
 use sui::client_commands::{OptsWithGas, SuiClientCommandResult, SuiClientCommands};
 use sui_config::node::RunWithRange;
@@ -36,8 +37,7 @@ use sui_types::messages_grpc::TransactionInfoRequest;
 use sui_types::object::{Object, ObjectRead, Owner, PastObjectRead};
 use sui_types::programmable_transaction_builder::ProgrammableTransactionBuilder;
 use sui_types::quorum_driver_types::{
-    ExecuteTransactionRequest, ExecuteTransactionRequestType, ExecuteTransactionResponse,
-    QuorumDriverResponse,
+    ExecuteTransactionRequestType, ExecuteTransactionRequestV3, QuorumDriverResponse,
 };
 use sui_types::storage::ObjectStore;
 use sui_types::transaction::{
@@ -754,16 +754,13 @@ async fn test_full_node_transaction_orchestrator_basic() -> Result<(), anyhow::E
     let digest = *txn.digest();
     let res = transaction_orchestrator
         .execute_transaction_block(
-            ExecuteTransactionRequest {
-                transaction: txn,
-                request_type: ExecuteTransactionRequestType::WaitForLocalExecution,
-            },
+            ExecuteTransactionRequestV3::new_v2(txn),
+            ExecuteTransactionRequestType::WaitForLocalExecution,
             None,
         )
         .await
         .unwrap_or_else(|e| panic!("Failed to execute transaction {:?}: {:?}", digest, e));
 
-    let ExecuteTransactionResponse::EffectsCert(res) = res;
     let (
         tx,
         QuorumDriverResponse {
@@ -772,11 +769,17 @@ async fn test_full_node_transaction_orchestrator_basic() -> Result<(), anyhow::E
             ..
         },
     ) = rx.recv().await.unwrap().unwrap();
-    let (cte, events, is_executed_locally) = *res;
+    let (response, is_executed_locally) = res;
     assert_eq!(*tx.digest(), digest);
-    assert_eq!(cte.effects.digest(), *certified_txn_effects.digest());
+    assert_eq!(
+        response.effects.effects.digest(),
+        *certified_txn_effects.digest()
+    );
     assert!(is_executed_locally);
-    assert_eq!(events.digest(), txn_events.unwrap_or_default().digest());
+    assert_eq!(
+        response.events.unwrap_or_default().digest(),
+        txn_events.unwrap_or_default().digest()
+    );
     // verify that the node has sequenced and executed the txn
     fullnode.state().get_executed_transaction_and_effects(digest, kv_store.clone()).await
         .unwrap_or_else(|e| panic!("Fullnode does not know about the txn {:?} that was executed with WaitForLocalExecution: {:?}", digest, e));
@@ -786,16 +789,13 @@ async fn test_full_node_transaction_orchestrator_basic() -> Result<(), anyhow::E
     let digest = *txn.digest();
     let res = transaction_orchestrator
         .execute_transaction_block(
-            ExecuteTransactionRequest {
-                transaction: txn,
-                request_type: ExecuteTransactionRequestType::WaitForEffectsCert,
-            },
+            ExecuteTransactionRequestV3::new_v2(txn),
+            ExecuteTransactionRequestType::WaitForEffectsCert,
             None,
         )
         .await
         .unwrap_or_else(|e| panic!("Failed to execute transaction {:?}: {:?}", digest, e));
 
-    let ExecuteTransactionResponse::EffectsCert(res) = res;
     let (
         tx,
         QuorumDriverResponse {
@@ -804,10 +804,16 @@ async fn test_full_node_transaction_orchestrator_basic() -> Result<(), anyhow::E
             ..
         },
     ) = rx.recv().await.unwrap().unwrap();
-    let (cte, events, is_executed_locally) = *res;
+    let (response, is_executed_locally) = res;
     assert_eq!(*tx.digest(), digest);
-    assert_eq!(cte.effects.digest(), *certified_txn_effects.digest());
-    assert_eq!(txn_events.unwrap_or_default().digest(), events.digest());
+    assert_eq!(
+        response.effects.effects.digest(),
+        *certified_txn_effects.digest()
+    );
+    assert_eq!(
+        txn_events.unwrap_or_default().digest(),
+        response.events.unwrap_or_default().digest()
+    );
     assert!(!is_executed_locally);
     fullnode
         .state()
@@ -1189,10 +1195,8 @@ async fn test_pass_back_no_object() -> Result<(), anyhow::Error> {
     let digest = *tx.digest();
     let _res = transaction_orchestrator
         .execute_transaction_block(
-            ExecuteTransactionRequest {
-                transaction: tx,
-                request_type: ExecuteTransactionRequestType::WaitForLocalExecution,
-            },
+            ExecuteTransactionRequestV3::new_v2(tx),
+            ExecuteTransactionRequestType::WaitForLocalExecution,
             None,
         )
         .await
@@ -1404,3 +1408,29 @@ async fn test_full_node_run_with_range_epoch() -> Result<(), anyhow::Error> {
 
     Ok(())
 }
+
+// This test checks that the fullnode is able to resolve events emitted from a transaction
+// that references the structs defined in the package published by the transaction itself,
+// without local execution.
+#[sim_test]
+async fn publish_init_events_without_local_execution() {
+    let test_cluster = TestClusterBuilder::new().build().await;
+    let path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("tests/move_test_code");
+    let tx_data = test_cluster
+        .test_transaction_builder()
+        .await
+        .publish(path)
+        .build();
+    let tx = test_cluster.sign_transaction(&tx_data);
+    let client = test_cluster.wallet.get_client().await.unwrap();
+    let response = client
+        .quorum_driver_api()
+        .execute_transaction_block(
+            tx,
+            SuiTransactionBlockResponseOptions::new().with_events(),
+            Some(ExecuteTransactionRequestType::WaitForEffectsCert),
+        )
+        .await
+        .unwrap();
+    assert_eq!(response.events.unwrap().data.len(), 1);
+}
diff --git a/crates/sui-e2e-tests/tests/move_test_code/sources/init_with_events.move b/crates/sui-e2e-tests/tests/move_test_code/sources/init_with_events.move
new file mode 100644
index 0000000000000..0230961c8e19e
--- /dev/null
+++ b/crates/sui-e2e-tests/tests/move_test_code/sources/init_with_events.move
@@ -0,0 +1,10 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+module move_test_code::init_with_event {
+    public struct Event has drop, copy {}
+
+    fun init(_ctx: &mut TxContext) {
+        sui::event::emit(Event {});
+    }
+}
\ No newline at end of file
diff --git a/crates/sui-e2e-tests/tests/passkey_e2e_tests.rs b/crates/sui-e2e-tests/tests/passkey_e2e_tests.rs
index 699fd96afa842..505f240d82edc 100644
--- a/crates/sui-e2e-tests/tests/passkey_e2e_tests.rs
+++ b/crates/sui-e2e-tests/tests/passkey_e2e_tests.rs
@@ -303,7 +303,11 @@ async fn test_passkey_fails_to_verify_sig() {
     let test_cluster = TestClusterBuilder::new().build().await;
     let response = create_credential_and_sign_test_tx(&test_cluster, None, false, false).await;
     let mut modified_sig = response.user_sig_bytes.clone();
-    modified_sig[1] = 0x00;
+    if modified_sig[1] == 0x00 {
+        modified_sig[1] = 0x01;
+    } else {
+        modified_sig[1] = 0x00;
+    }
     let sig = GenericSignature::PasskeyAuthenticator(
         PasskeyAuthenticator::new_for_testing(
             response.authenticator_data,
diff --git a/crates/sui-e2e-tests/tests/reconfiguration_tests.rs b/crates/sui-e2e-tests/tests/reconfiguration_tests.rs
index 050db3fdfe343..434c405da04d1 100644
--- a/crates/sui-e2e-tests/tests/reconfiguration_tests.rs
+++ b/crates/sui-e2e-tests/tests/reconfiguration_tests.rs
@@ -23,7 +23,7 @@ use sui_types::sui_system_state::{
     get_validator_from_table, sui_system_state_summary::get_validator_by_pool_id,
     SuiSystemStateTrait,
 };
-use sui_types::transaction::{TransactionDataAPI, TransactionExpiration};
+use sui_types::transaction::{TransactionDataAPI, TransactionExpiration, VerifiedTransaction};
 use test_cluster::{TestCluster, TestClusterBuilder};
 use tokio::time::sleep;
 
@@ -297,7 +297,7 @@ async fn do_test_passive_reconfig() {
         });
 }
 
-// Test for syncing a node to an authority that already has many txes.
+// Test that transaction locks from previously epochs could be overridden.
 #[sim_test]
 async fn test_expired_locks() {
     let test_cluster = TestClusterBuilder::new()
@@ -324,13 +324,24 @@ async fn test_expired_locks() {
     };
 
     let t1 = transfer_sui(1);
+    // attempt to equivocate
+    let t2 = transfer_sui(2);
+
+    for (idx, validator) in test_cluster.all_validator_handles().into_iter().enumerate() {
+        let state = validator.state();
+        let epoch_store = state.epoch_store_for_testing();
+        let t = if idx % 2 == 0 { t1.clone() } else { t2.clone() };
+        validator
+            .state()
+            .handle_transaction(&epoch_store, VerifiedTransaction::new_unchecked(t))
+            .await
+            .unwrap();
+    }
     test_cluster
         .create_certificate(t1.clone(), None)
         .await
-        .unwrap();
+        .unwrap_err();
 
-    // attempt to equivocate
-    let t2 = transfer_sui(2);
     test_cluster
         .create_certificate(t2.clone(), None)
         .await
diff --git a/crates/sui-e2e-tests/tests/rest.rs b/crates/sui-e2e-tests/tests/rest.rs
index 7795e04599008..ff408edee6549 100644
--- a/crates/sui-e2e-tests/tests/rest.rs
+++ b/crates/sui-e2e-tests/tests/rest.rs
@@ -15,9 +15,7 @@ use test_cluster::TestClusterBuilder;
 async fn execute_transaction_transfer() {
     let test_cluster = TestClusterBuilder::new().build().await;
 
-    let rest_url = format!("{}/v2", test_cluster.rpc_url());
-
-    let client = Client::new(rest_url);
+    let client = Client::new(test_cluster.rpc_url());
     let address = SuiAddress::random_for_testing_only();
     let amount = 9;
 
diff --git a/crates/sui-e2e-tests/tests/traffic_control_tests.rs b/crates/sui-e2e-tests/tests/traffic_control_tests.rs
index 694c2790a6e16..4ae24ddcc7ea6 100644
--- a/crates/sui-e2e-tests/tests/traffic_control_tests.rs
+++ b/crates/sui-e2e-tests/tests/traffic_control_tests.rs
@@ -5,6 +5,7 @@
 //! they should nearly all be tokio::test rather than simtest.
 
 use core::panic;
+use fastcrypto::encoding::Base64;
 use jsonrpsee::{
     core::{client::ClientT, RpcResult},
     rpc_params,
@@ -316,6 +317,63 @@ async fn test_fullnode_traffic_control_spam_blocked() -> Result<(), anyhow::Erro
     panic!("Expected spam policy to trigger within {txn_count} requests");
 }
 
+#[tokio::test]
+async fn test_fullnode_traffic_control_error_blocked() -> Result<(), anyhow::Error> {
+    let txn_count = 5;
+    let policy_config = PolicyConfig {
+        connection_blocklist_ttl_sec: 3,
+        error_policy_type: PolicyType::TestNConnIP(txn_count - 1),
+        dry_run: false,
+        ..Default::default()
+    };
+    let test_cluster = TestClusterBuilder::new()
+        .with_fullnode_policy_config(Some(policy_config))
+        .build()
+        .await;
+
+    let jsonrpc_client = &test_cluster.fullnode_handle.rpc_client;
+    let context = test_cluster.wallet;
+
+    let mut txns = batch_make_transfer_transactions(&context, txn_count as usize).await;
+    assert!(
+        txns.len() >= txn_count as usize,
+        "Expect at least {} txns. Do we generate enough gas objects during genesis?",
+        txn_count,
+    );
+
+    // it should take no more than 4 requests to be added to the blocklist
+    for _ in 0..txn_count {
+        let txn = txns.swap_remove(0);
+        let tx_digest = txn.digest();
+        let (tx_bytes, _signatures) = txn.to_tx_bytes_and_signatures();
+        // create invalid (empty) client signature
+        let signatures: Vec<Base64> = vec![];
+        let params = rpc_params![
+            tx_bytes,
+            signatures,
+            SuiTransactionBlockResponseOptions::new(),
+            ExecuteTransactionRequestType::WaitForLocalExecution
+        ];
+        let response: RpcResult<SuiTransactionBlockResponse> = jsonrpc_client
+            .request("sui_executeTransactionBlock", params.clone())
+            .await;
+        if let Err(err) = response {
+            if err.to_string().contains("Too many requests") {
+                return Ok(());
+            }
+        } else {
+            let SuiTransactionBlockResponse {
+                digest,
+                confirmed_local_execution,
+                ..
+            } = response.unwrap();
+            assert_eq!(&digest, tx_digest);
+            assert!(confirmed_local_execution.unwrap());
+        }
+    }
+    panic!("Expected spam policy to trigger within {txn_count} requests");
+}
+
 #[tokio::test]
 async fn test_validator_traffic_control_error_delegated() -> Result<(), anyhow::Error> {
     let n = 5;
@@ -569,6 +627,7 @@ async fn test_traffic_sketch_no_blocks() {
     assert!(metrics.total_time_blocked < Duration::from_secs(10));
 }
 
+#[ignore]
 #[sim_test]
 async fn test_traffic_sketch_with_slow_blocks() {
     let sketch_config = FreqThresholdConfig {
diff --git a/crates/sui-e2e-tests/tests/transaction_orchestrator_tests.rs b/crates/sui-e2e-tests/tests/transaction_orchestrator_tests.rs
index 3c0a50eb8074f..01abe0d6078f5 100644
--- a/crates/sui-e2e-tests/tests/transaction_orchestrator_tests.rs
+++ b/crates/sui-e2e-tests/tests/transaction_orchestrator_tests.rs
@@ -13,8 +13,8 @@ use sui_test_transaction_builder::{
 };
 use sui_types::effects::TransactionEffectsAPI;
 use sui_types::quorum_driver_types::{
-    ExecuteTransactionRequest, ExecuteTransactionRequestType, ExecuteTransactionRequestV3,
-    ExecuteTransactionResponse, FinalizedEffects, QuorumDriverError,
+    ExecuteTransactionRequestType, ExecuteTransactionRequestV3, ExecuteTransactionResponseV3,
+    FinalizedEffects, IsTransactionExecutedLocally, QuorumDriverError,
 };
 use sui_types::transaction::Transaction;
 use test_cluster::TestClusterBuilder;
@@ -63,7 +63,7 @@ async fn test_blocking_execution() -> Result<(), anyhow::Error> {
     let txn = txns.swap_remove(0);
     let digest = *txn.digest();
 
-    let res = execute_with_orchestrator(
+    let (_, executed_locally) = execute_with_orchestrator(
         &orchestrator,
         txn,
         ExecuteTransactionRequestType::WaitForLocalExecution,
@@ -71,8 +71,6 @@ async fn test_blocking_execution() -> Result<(), anyhow::Error> {
     .await
     .unwrap_or_else(|e| panic!("Failed to execute transaction {:?}: {:?}", digest, e));
 
-    let ExecuteTransactionResponse::EffectsCert(result) = res;
-    let (_, _, executed_locally) = *result;
     assert!(executed_locally);
 
     let metrics = KeyValueStoreMetrics::new_for_tests();
@@ -250,18 +248,15 @@ async fn test_tx_across_epoch_boundaries() {
     tokio::task::spawn(async move {
         match to
             .execute_transaction_block(
-                ExecuteTransactionRequest {
-                    transaction: tx.clone(),
-                    request_type: ExecuteTransactionRequestType::WaitForEffectsCert,
-                },
-                Some(make_socket_addr()),
+                ExecuteTransactionRequestV3::new_v2(tx.clone()),
+                ExecuteTransactionRequestType::WaitForEffectsCert,
+                None,
             )
             .await
         {
-            Ok(ExecuteTransactionResponse::EffectsCert(res)) => {
+            Ok((response, _)) => {
                 info!(?tx_digest, "tx result: ok");
-                let (effects_cert, _, _) = *res;
-                result_tx.send(effects_cert).await.unwrap();
+                result_tx.send(response.effects).await.unwrap();
             }
             Err(QuorumDriverError::TimeoutBeforeFinality) => {
                 info!(?tx_digest, "tx result: timeout and will retry")
@@ -294,15 +289,9 @@ async fn execute_with_orchestrator(
     orchestrator: &TransactiondOrchestrator<NetworkAuthorityClient>,
     txn: Transaction,
     request_type: ExecuteTransactionRequestType,
-) -> Result<ExecuteTransactionResponse, QuorumDriverError> {
+) -> Result<(ExecuteTransactionResponseV3, IsTransactionExecutedLocally), QuorumDriverError> {
     orchestrator
-        .execute_transaction_block(
-            ExecuteTransactionRequest {
-                transaction: txn,
-                request_type,
-            },
-            Some(make_socket_addr()),
-        )
+        .execute_transaction_block(ExecuteTransactionRequestV3::new_v2(txn), request_type, None)
         .await
 }
 
diff --git a/crates/sui-e2e-tests/tests/validator_tx_finalizer_e2e_tests.rs b/crates/sui-e2e-tests/tests/validator_tx_finalizer_e2e_tests.rs
index d6cfb3ae63018..369ed9e4b8fd1 100644
--- a/crates/sui-e2e-tests/tests/validator_tx_finalizer_e2e_tests.rs
+++ b/crates/sui-e2e-tests/tests/validator_tx_finalizer_e2e_tests.rs
@@ -28,13 +28,23 @@ async fn test_validator_tx_finalizer_fastpath_tx() {
         .process_transaction(tx, None)
         .await
         .unwrap();
-    // Validators wait for 60s before the first one wakes up. Since 2f+1 signed the tx, i.e.
-    // 5 validators have signed the tx, in the worst case where the other 2 wake up first,
-    // it would take 60 + 3 * 10 = 90s for a validator to finalize this.
-    tokio::time::sleep(Duration::from_secs(120)).await;
-    for node in cluster.all_node_handles() {
-        node.with(|n| assert!(n.state().is_tx_already_executed(&tx_digest).unwrap()));
-    }
+    // Since 2f+1 signed the tx, i.e. 5 validators have signed the tx, in the worst case where the other 2 wake up first,
+    // it would take 10 + 3 * 1 = 13s for a validator to finalize this.
+    let tx_digests = [tx_digest];
+    tokio::time::timeout(Duration::from_secs(60), async move {
+        for node in cluster.all_node_handles() {
+            node.with_async(|n| async {
+                n.state()
+                    .get_transaction_cache_reader()
+                    .notify_read_executed_effects_digests(&tx_digests)
+                    .await
+                    .unwrap();
+            })
+            .await;
+        }
+    })
+    .await
+    .unwrap();
 }
 
 #[sim_test]
@@ -59,17 +69,28 @@ async fn test_validator_tx_finalizer_consensus_tx() {
         .process_transaction(tx, None)
         .await
         .unwrap();
-    tokio::time::sleep(Duration::from_secs(120)).await;
-    for node in cluster.all_node_handles() {
-        node.with(|n| assert!(n.state().is_tx_already_executed(&tx_digest).unwrap()));
-    }
+    let tx_digests = [tx_digest];
+    tokio::time::timeout(Duration::from_secs(60), async move {
+        for node in cluster.all_node_handles() {
+            node.with_async(|n| async {
+                n.state()
+                    .get_transaction_cache_reader()
+                    .notify_read_executed_effects_digests(&tx_digests)
+                    .await
+                    .unwrap();
+            })
+            .await;
+        }
+    })
+    .await
+    .unwrap();
 }
 
 #[cfg(msim)]
 #[sim_test]
 async fn test_validator_tx_finalizer_equivocation() {
     let cluster = TestClusterBuilder::new()
-        .with_num_validators(4)
+        .with_num_validators(7)
         // Make epoch duration large enough so that reconfig is never triggered.
         .with_epoch_duration_ms(1000 * 1000)
         .build()
@@ -90,16 +111,16 @@ async fn test_validator_tx_finalizer_equivocation() {
     let tx_digest2 = *tx2.digest();
     let auth_agg = cluster.authority_aggregator();
     for (idx, client) in auth_agg.authority_clients.values().enumerate() {
-        if idx < 2 {
+        if idx % 2 == 0 {
             client.handle_transaction(tx1.clone(), None).await.unwrap();
         } else {
             client.handle_transaction(tx2.clone(), None).await.unwrap();
         }
     }
-    // It takes up to 90s for each validator to wake up and finalize the txs once.
-    // We wait for long enough and check that no validator will spawn another thread
+    // It takes up to 11s (5 + 6 * 1) for each validator to wake up and finalize the txs once.
+    // We wait for long enough and check that no validator will spawn a thread
     // twice to try to finalize the same txs.
-    tokio::time::sleep(Duration::from_secs(200)).await;
+    tokio::time::sleep(Duration::from_secs(30)).await;
     for node in cluster.swarm.validator_node_handles() {
         node.with(|n| {
             let state = n.state();
diff --git a/crates/sui-faucet/Cargo.toml b/crates/sui-faucet/Cargo.toml
index 40c8642d9257d..f8a99e7d2f936 100644
--- a/crates/sui-faucet/Cargo.toml
+++ b/crates/sui-faucet/Cargo.toml
@@ -25,7 +25,6 @@ scopeguard.workspace = true
 tap.workspace = true
 ttl_cache.workspace = true
 eyre.workspace = true
-rocksdb.workspace = true
 tempfile.workspace = true
 parking_lot.workspace = true
 
@@ -37,7 +36,6 @@ sui-sdk.workspace = true
 mysten-metrics.workspace = true
 telemetry-subscribers.workspace = true
 typed-store.workspace = true
-typed-store-derive.workspace = true
 shared-crypto.workspace = true
 async-recursion.workspace = true
 
diff --git a/crates/sui-faucet/src/faucet/simple_faucet.rs b/crates/sui-faucet/src/faucet/simple_faucet.rs
index 0bdbb8641d764..00133d92dcd03 100644
--- a/crates/sui-faucet/src/faucet/simple_faucet.rs
+++ b/crates/sui-faucet/src/faucet/simple_faucet.rs
@@ -328,6 +328,7 @@ impl SimpleFaucet {
     /// Check if the gas coin is still valid. A valid gas coin
     /// 1. Exists presently
     /// 2. is a gas coin
+    ///
     /// If the coin is valid, return Ok(Some(GasCoin))
     /// If the coin invalid, return Ok(None)
     /// If the fullnode returns an unexpected error, returns Err(e)
@@ -1303,7 +1304,7 @@ mod tests {
         .await
         .unwrap();
 
-        let amounts = &vec![coin_amount];
+        let amounts = &[coin_amount];
 
         // Create a vector containing five randomly generated addresses
         let target_addresses: Vec<SuiAddress> = (0..5)
@@ -1384,7 +1385,7 @@ mod tests {
         .await
         .unwrap();
 
-        let amounts = &vec![1; 1];
+        let amounts = &[1; 1];
         // Create a vector containing five randomly generated addresses
         let target_addresses: Vec<SuiAddress> = (0..5)
             .map(|_| SuiAddress::random_for_testing_only())
diff --git a/crates/sui-faucet/src/faucet/write_ahead_log.rs b/crates/sui-faucet/src/faucet/write_ahead_log.rs
index e05a908fb5c4b..231318e34711d 100644
--- a/crates/sui-faucet/src/faucet/write_ahead_log.rs
+++ b/crates/sui-faucet/src/faucet/write_ahead_log.rs
@@ -11,7 +11,7 @@ use typed_store::Map;
 use typed_store::{rocks::DBMap, TypedStoreError};
 
 use tracing::info;
-use typed_store_derive::DBMapUtils;
+use typed_store::DBMapUtils;
 use uuid::Uuid;
 
 /// Persistent log of transactions paying out sui from the faucet, keyed by the coin serving the
diff --git a/crates/sui-faucet/src/server.rs b/crates/sui-faucet/src/server.rs
index 4b4f2400f6d13..cea9242ad9e64 100644
--- a/crates/sui-faucet/src/server.rs
+++ b/crates/sui-faucet/src/server.rs
@@ -85,9 +85,8 @@ pub async fn start_faucet(
 
     let addr = SocketAddr::new(IpAddr::V4(host_ip), port);
     info!("listening on {}", addr);
-    axum::Server::bind(&addr)
-        .serve(app.into_make_service())
-        .await?;
+    let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
+    axum::serve(listener, app).await?;
     Ok(())
 }
 
diff --git a/crates/sui-framework-snapshot/bytecode_snapshot/54/0x0000000000000000000000000000000000000000000000000000000000000001 b/crates/sui-framework-snapshot/bytecode_snapshot/54/0x0000000000000000000000000000000000000000000000000000000000000001
new file mode 100644
index 0000000000000..6aae601648984
Binary files /dev/null and b/crates/sui-framework-snapshot/bytecode_snapshot/54/0x0000000000000000000000000000000000000000000000000000000000000001 differ
diff --git a/crates/sui-framework-snapshot/bytecode_snapshot/54/0x0000000000000000000000000000000000000000000000000000000000000002 b/crates/sui-framework-snapshot/bytecode_snapshot/54/0x0000000000000000000000000000000000000000000000000000000000000002
new file mode 100644
index 0000000000000..0c65581651840
Binary files /dev/null and b/crates/sui-framework-snapshot/bytecode_snapshot/54/0x0000000000000000000000000000000000000000000000000000000000000002 differ
diff --git a/crates/sui-framework-snapshot/bytecode_snapshot/54/0x0000000000000000000000000000000000000000000000000000000000000003 b/crates/sui-framework-snapshot/bytecode_snapshot/54/0x0000000000000000000000000000000000000000000000000000000000000003
new file mode 100644
index 0000000000000..f5e57b11051a4
Binary files /dev/null and b/crates/sui-framework-snapshot/bytecode_snapshot/54/0x0000000000000000000000000000000000000000000000000000000000000003 differ
diff --git a/crates/sui-framework-snapshot/bytecode_snapshot/54/0x000000000000000000000000000000000000000000000000000000000000000b b/crates/sui-framework-snapshot/bytecode_snapshot/54/0x000000000000000000000000000000000000000000000000000000000000000b
new file mode 100644
index 0000000000000..7a2443d5f5413
Binary files /dev/null and b/crates/sui-framework-snapshot/bytecode_snapshot/54/0x000000000000000000000000000000000000000000000000000000000000000b differ
diff --git a/crates/sui-framework-snapshot/bytecode_snapshot/54/0x000000000000000000000000000000000000000000000000000000000000dee9 b/crates/sui-framework-snapshot/bytecode_snapshot/54/0x000000000000000000000000000000000000000000000000000000000000dee9
new file mode 100644
index 0000000000000..d6568ff2626fa
Binary files /dev/null and b/crates/sui-framework-snapshot/bytecode_snapshot/54/0x000000000000000000000000000000000000000000000000000000000000dee9 differ
diff --git a/crates/sui-framework-snapshot/bytecode_snapshot/55/0x0000000000000000000000000000000000000000000000000000000000000001 b/crates/sui-framework-snapshot/bytecode_snapshot/55/0x0000000000000000000000000000000000000000000000000000000000000001
new file mode 100644
index 0000000000000..6aae601648984
Binary files /dev/null and b/crates/sui-framework-snapshot/bytecode_snapshot/55/0x0000000000000000000000000000000000000000000000000000000000000001 differ
diff --git a/crates/sui-framework-snapshot/bytecode_snapshot/55/0x0000000000000000000000000000000000000000000000000000000000000002 b/crates/sui-framework-snapshot/bytecode_snapshot/55/0x0000000000000000000000000000000000000000000000000000000000000002
new file mode 100644
index 0000000000000..54d541c98c202
Binary files /dev/null and b/crates/sui-framework-snapshot/bytecode_snapshot/55/0x0000000000000000000000000000000000000000000000000000000000000002 differ
diff --git a/crates/sui-framework-snapshot/bytecode_snapshot/55/0x0000000000000000000000000000000000000000000000000000000000000003 b/crates/sui-framework-snapshot/bytecode_snapshot/55/0x0000000000000000000000000000000000000000000000000000000000000003
new file mode 100644
index 0000000000000..f5e57b11051a4
Binary files /dev/null and b/crates/sui-framework-snapshot/bytecode_snapshot/55/0x0000000000000000000000000000000000000000000000000000000000000003 differ
diff --git a/crates/sui-framework-snapshot/bytecode_snapshot/55/0x000000000000000000000000000000000000000000000000000000000000000b b/crates/sui-framework-snapshot/bytecode_snapshot/55/0x000000000000000000000000000000000000000000000000000000000000000b
new file mode 100644
index 0000000000000..7a2443d5f5413
Binary files /dev/null and b/crates/sui-framework-snapshot/bytecode_snapshot/55/0x000000000000000000000000000000000000000000000000000000000000000b differ
diff --git a/crates/sui-framework-snapshot/bytecode_snapshot/55/0x000000000000000000000000000000000000000000000000000000000000dee9 b/crates/sui-framework-snapshot/bytecode_snapshot/55/0x000000000000000000000000000000000000000000000000000000000000dee9
new file mode 100644
index 0000000000000..d6568ff2626fa
Binary files /dev/null and b/crates/sui-framework-snapshot/bytecode_snapshot/55/0x000000000000000000000000000000000000000000000000000000000000dee9 differ
diff --git a/crates/sui-framework-snapshot/manifest.json b/crates/sui-framework-snapshot/manifest.json
index b864200572976..52a6de4971010 100644
--- a/crates/sui-framework-snapshot/manifest.json
+++ b/crates/sui-framework-snapshot/manifest.json
@@ -426,5 +426,25 @@
       "0x000000000000000000000000000000000000000000000000000000000000dee9",
       "0x000000000000000000000000000000000000000000000000000000000000000b"
     ]
+  },
+  "54": {
+    "git_revision": "3f4cab62afbf",
+    "package_ids": [
+      "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "0x0000000000000000000000000000000000000000000000000000000000000002",
+      "0x0000000000000000000000000000000000000000000000000000000000000003",
+      "0x000000000000000000000000000000000000000000000000000000000000dee9",
+      "0x000000000000000000000000000000000000000000000000000000000000000b"
+    ]
+  },
+  "55": {
+    "git_revision": "495a499c3ed2",
+    "package_ids": [
+      "0x0000000000000000000000000000000000000000000000000000000000000001",
+      "0x0000000000000000000000000000000000000000000000000000000000000002",
+      "0x0000000000000000000000000000000000000000000000000000000000000003",
+      "0x000000000000000000000000000000000000000000000000000000000000dee9",
+      "0x000000000000000000000000000000000000000000000000000000000000000b"
+    ]
   }
 }
\ No newline at end of file
diff --git a/crates/sui-framework-tests/Cargo.toml b/crates/sui-framework-tests/Cargo.toml
index cb9cc2aec3529..2093974fa826f 100644
--- a/crates/sui-framework-tests/Cargo.toml
+++ b/crates/sui-framework-tests/Cargo.toml
@@ -7,7 +7,15 @@ description = "Runs Move tests for sui-framework"
 license = "Apache-2.0"
 publish = false
 
+[lints]
+workspace = true
+
+[[test]]
+name = "move_tests"
+harness = false
+
 [dev-dependencies]
+datatest-stable.workspace = true
 prometheus.workspace = true
 
 sui-framework.workspace = true
diff --git a/crates/sui-framework-tests/src/lib.rs b/crates/sui-framework-tests/src/lib.rs
index d41a90db7c637..9bc362dc24b5a 100644
--- a/crates/sui-framework-tests/src/lib.rs
+++ b/crates/sui-framework-tests/src/lib.rs
@@ -1,8 +1,5 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-#[cfg(test)]
-mod unit_tests;
-
 #[cfg(test)]
 mod metered_verifier;
diff --git a/crates/sui-framework-tests/src/metered_verifier.rs b/crates/sui-framework-tests/src/metered_verifier.rs
index 0d30fe4febfbe..3c8ca440704f5 100644
--- a/crates/sui-framework-tests/src/metered_verifier.rs
+++ b/crates/sui-framework-tests/src/metered_verifier.rs
@@ -35,7 +35,7 @@ fn test_metered_move_bytecode_verifier() {
 
     let protocol_config = ProtocolConfig::get_for_max_version_UNSAFE();
     let mut verifier_config = protocol_config.verifier_config(/* for_signing */ true);
-    let mut meter_config = protocol_config.meter_config();
+    let mut meter_config = protocol_config.meter_config_for_signing();
     let registry = &Registry::new();
     let bytecode_verifier_metrics = Arc::new(BytecodeVerifierMetrics::new(registry));
     let mut meter = SuiVerifierMeter::new(meter_config.clone());
@@ -202,7 +202,7 @@ fn test_metered_move_bytecode_verifier() {
 
     let protocol_config = ProtocolConfig::get_for_max_version_UNSAFE();
     let verifier_config = protocol_config.verifier_config(/* for_signing */ true);
-    let meter_config = protocol_config.meter_config();
+    let meter_config = protocol_config.meter_config_for_signing();
 
     // Check if the same meter is indeed used multiple invocations of the verifier
     let mut meter = SuiVerifierMeter::new(meter_config);
@@ -229,7 +229,7 @@ fn test_meter_system_packages() {
 
     let protocol_config = ProtocolConfig::get_for_max_version_UNSAFE();
     let verifier_config = protocol_config.verifier_config(/* for_signing */ true);
-    let meter_config = protocol_config.meter_config();
+    let meter_config = protocol_config.meter_config_for_signing();
     let registry = &Registry::new();
     let bytecode_verifier_metrics = Arc::new(BytecodeVerifierMetrics::new(registry));
     let mut meter = SuiVerifierMeter::new(meter_config);
@@ -283,7 +283,7 @@ fn test_build_and_verify_programmability_examples() {
 
     let protocol_config = ProtocolConfig::get_for_max_version_UNSAFE();
     let verifier_config = protocol_config.verifier_config(/* for_signing */ true);
-    let meter_config = protocol_config.meter_config();
+    let meter_config = protocol_config.meter_config_for_signing();
     let registry = &Registry::new();
     let bytecode_verifier_metrics = Arc::new(BytecodeVerifierMetrics::new(registry));
     let examples = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("../../examples");
diff --git a/crates/sui-framework-tests/src/unit_tests.rs b/crates/sui-framework-tests/src/unit_tests.rs
deleted file mode 100644
index c02aad95a77ee..0000000000000
--- a/crates/sui-framework-tests/src/unit_tests.rs
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-use move_cli::base::test::UnitTestResult;
-use move_package::LintFlag;
-use move_unit_test::UnitTestingConfig;
-use std::{
-    fs, io,
-    path::{Path, PathBuf},
-};
-use sui_move::unit_test::run_move_unit_tests;
-use sui_move_build::BuildConfig;
-
-const FILTER_ENV: &str = "FILTER";
-
-#[test]
-#[cfg_attr(msim, ignore)]
-fn run_move_stdlib_unit_tests() {
-    let mut buf = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    buf.extend(["..", "sui-framework", "packages", "move-stdlib"]);
-    check_move_unit_tests(&buf);
-}
-
-#[test]
-#[cfg_attr(msim, ignore)]
-fn run_sui_framework_tests() {
-    let mut buf = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    buf.extend(["..", "sui-framework", "packages", "sui-framework"]);
-    check_move_unit_tests(&buf);
-}
-
-#[test]
-#[cfg_attr(msim, ignore)]
-fn run_sui_system_tests() {
-    let mut buf = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    buf.extend(["..", "sui-framework", "packages", "sui-system"]);
-    check_move_unit_tests(&buf);
-}
-
-#[test]
-#[cfg_attr(msim, ignore)]
-fn run_deepbook_tests() {
-    let mut buf = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    buf.extend(["..", "sui-framework", "packages", "deepbook"]);
-    check_move_unit_tests(&buf);
-}
-#[test]
-#[cfg_attr(msim, ignore)]
-fn run_bridge_tests() {
-    let mut buf = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    buf.extend(["..", "sui-framework", "packages", "bridge"]);
-    check_move_unit_tests(&buf);
-}
-
-fn check_packages_recursively(path: &Path) -> io::Result<()> {
-    for entry in fs::read_dir(path).unwrap() {
-        let entry = entry?;
-        if entry.path().join("Move.toml").exists() {
-            check_package_builds(&entry.path());
-            check_move_unit_tests(&entry.path());
-        } else if entry.file_type()?.is_dir() {
-            check_packages_recursively(&entry.path())?;
-        }
-    }
-    Ok(())
-}
-
-#[test]
-#[cfg_attr(msim, ignore)]
-fn run_examples_move_unit_tests() -> io::Result<()> {
-    let examples = {
-        let mut buf = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-        buf.extend(["..", "..", "examples"]);
-        buf
-    };
-
-    check_packages_recursively(&examples)?;
-
-    Ok(())
-}
-
-/// Ensure packages build outside of test mode.
-fn check_package_builds(path: &Path) {
-    let mut config = BuildConfig::new_for_testing();
-    config.config.dev_mode = true;
-    config.run_bytecode_verifier = true;
-    config.print_diags_to_stderr = true;
-    config.config.warnings_are_errors = true;
-    config.config.silence_warnings = false;
-    config.config.lint_flag = LintFlag::LEVEL_DEFAULT;
-    config
-        .build(path)
-        .unwrap_or_else(|e| panic!("Building package {}.\nWith error {e}", path.display()));
-}
-
-fn check_move_unit_tests(path: &Path) {
-    let mut config = BuildConfig::new_for_testing();
-    // Make sure to verify tests
-    config.config.dev_mode = true;
-    config.config.test_mode = true;
-    config.run_bytecode_verifier = true;
-    config.print_diags_to_stderr = true;
-    config.config.warnings_are_errors = true;
-    config.config.silence_warnings = false;
-    config.config.lint_flag = LintFlag::LEVEL_DEFAULT;
-    let move_config = config.config.clone();
-    let mut testing_config = UnitTestingConfig::default_with_bound(Some(3_000_000));
-    testing_config.filter = std::env::var(FILTER_ENV).ok().map(|s| s.to_string());
-
-    assert_eq!(
-        run_move_unit_tests(path, move_config, Some(testing_config), false).unwrap(),
-        UnitTestResult::Success
-    );
-}
diff --git a/crates/sui-framework-tests/tests/move_tests.rs b/crates/sui-framework-tests/tests/move_tests.rs
new file mode 100644
index 0000000000000..f589f31e372ae
--- /dev/null
+++ b/crates/sui-framework-tests/tests/move_tests.rs
@@ -0,0 +1,80 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use std::path::Path;
+
+use move_cli::base::test::UnitTestResult;
+use move_package::LintFlag;
+use move_unit_test::UnitTestingConfig;
+use sui_move::unit_test::run_move_unit_tests;
+use sui_move_build::BuildConfig;
+
+pub(crate) const EXAMPLES: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../../examples");
+pub(crate) const FRAMEWORK: &str = concat!(
+    env!("CARGO_MANIFEST_DIR"),
+    "/../../crates/sui-framework/packages"
+);
+
+/// Ensure packages build outside of test mode.
+pub(crate) fn build(path: &Path) -> datatest_stable::Result<()> {
+    let Some(path) = path.parent() else {
+        panic!("No parent for Move.toml file at: {}", path.display());
+    };
+
+    let mut config = BuildConfig::new_for_testing();
+    config.config.dev_mode = true;
+    config.run_bytecode_verifier = true;
+    config.print_diags_to_stderr = true;
+    config.config.warnings_are_errors = true;
+    config.config.silence_warnings = false;
+    config.config.lint_flag = LintFlag::LEVEL_DEFAULT;
+
+    config
+        .build(path)
+        .unwrap_or_else(|e| panic!("Building package {}.\nWith error {e}", path.display()));
+
+    Ok(())
+}
+
+/// Ensure package sbuild under test mode and all the tests pass.
+pub(crate) fn tests(path: &Path) -> datatest_stable::Result<()> {
+    let Some(path) = path.parent() else {
+        panic!("No parent for Move.toml file at: {}", path.display());
+    };
+
+    let mut config = BuildConfig::new_for_testing();
+
+    config.config.dev_mode = true;
+    config.config.test_mode = true;
+    config.run_bytecode_verifier = true;
+    config.print_diags_to_stderr = true;
+    config.config.warnings_are_errors = true;
+    config.config.silence_warnings = false;
+    config.config.lint_flag = LintFlag::LEVEL_DEFAULT;
+
+    let move_config = config.config.clone();
+    let mut testing_config = UnitTestingConfig::default_with_bound(Some(3_000_000));
+    testing_config.filter = std::env::var("FILTER").ok().map(|s| s.to_string());
+
+    assert_eq!(
+        run_move_unit_tests(path, move_config, Some(testing_config), false).unwrap(),
+        UnitTestResult::Success
+    );
+
+    Ok(())
+}
+
+datatest_stable::harness!(
+    build,
+    EXAMPLES,
+    r".*/Move.toml$",
+    tests,
+    EXAMPLES,
+    r".*/Move.toml$",
+    build,
+    FRAMEWORK,
+    r".*/Move.toml$",
+    tests,
+    FRAMEWORK,
+    r".*/Move.toml$",
+);
diff --git a/crates/sui-framework/packages/bridge/sources/bridge.move b/crates/sui-framework/packages/bridge/sources/bridge.move
index 86b0b5ba08df4..f0dbc8d10788b 100644
--- a/crates/sui-framework/packages/bridge/sources/bridge.move
+++ b/crates/sui-framework/packages/bridge/sources/bridge.move
@@ -843,4 +843,65 @@ module bridge::bridge {
         let inner = load_inner_mut(bridge);
         inner.execute_add_tokens_on_sui(payload);
     }
+
+    #[test_only]
+    public fun get_seq_num_for(bridge: &mut Bridge, message_type: u8): u64 {
+        let inner = load_inner_mut(bridge);
+        let seq_num = if (inner.sequence_nums.contains(&message_type)) {
+            inner.sequence_nums[&message_type]
+        } else {
+            inner.sequence_nums.insert(message_type, 0);
+            0
+        };
+        seq_num
+    }
+
+    #[test_only]
+    public fun get_seq_num_inc_for(bridge: &mut Bridge, message_type: u8): u64 {
+        let inner = load_inner_mut(bridge);
+        inner.get_current_seq_num_and_increment(message_type)
+    }
+
+    #[test_only]
+    public fun transfer_approve_key(event: TokenTransferApproved): BridgeMessageKey {
+        event.message_key
+    }
+
+    #[test_only]
+    public fun transfer_claimed_key(event: TokenTransferClaimed): BridgeMessageKey {
+        event.message_key
+    }
+
+    #[test_only]
+    public fun transfer_already_approved_key(event: TokenTransferAlreadyApproved): BridgeMessageKey {
+        event.message_key
+    }
+
+    #[test_only]
+    public fun transfer_already_claimed_key(event: TokenTransferAlreadyClaimed): BridgeMessageKey {
+        event.message_key
+    }
+
+    #[test_only]
+    public fun transfer_limit_exceed_key(event: TokenTransferLimitExceed): BridgeMessageKey {
+        event.message_key
+    }
+
+    #[test_only]
+    public fun unwrap_deposited_event(event: TokenDepositedEvent): (u64, u8, vector<u8>, u8, vector<u8>, u8, u64) {
+        (
+            event.seq_num,
+            event.source_chain,
+            event.sender_address,
+            event.target_chain,
+            event.target_address,
+            event.token_type,
+            event.amount,
+        )
+    }
+
+    #[test_only]
+    public fun unwrap_emergency_op_event(event: EmergencyOpEvent): bool {
+        event.frozen
+    }
 }
diff --git a/crates/sui-framework/packages/bridge/sources/limiter.move b/crates/sui-framework/packages/bridge/sources/limiter.move
index 391476f3921b8..55f01477f68a7 100644
--- a/crates/sui-framework/packages/bridge/sources/limiter.move
+++ b/crates/sui-framework/packages/bridge/sources/limiter.move
@@ -276,4 +276,11 @@ module bridge::limiter {
     public(package) fun hour_tail(record: &TransferRecord): u64 {
         record.hour_tail
     }
+
+    #[test_only]
+    public(package) fun unpack_route_limit_event(event: UpdateRouteLimitEvent):
+        (u8, u8, u64) 
+    {
+        (event.sending_chain, event.receiving_chain, event.new_limit)
+    }
 }
diff --git a/crates/sui-framework/packages/bridge/sources/message.move b/crates/sui-framework/packages/bridge/sources/message.move
index e46d30b0e1aa9..769e57f3577a9 100644
--- a/crates/sui-framework/packages/bridge/sources/message.move
+++ b/crates/sui-framework/packages/bridge/sources/message.move
@@ -663,4 +663,9 @@ module bridge::message {
             token_prices,
         }
     }
+
+    #[test_only]
+    public(package) fun unpack_message(msg: BridgeMessageKey): (u8, u8, u64) {
+        (msg.source_chain, msg.message_type, msg.bridge_seq_num)
+    }
 }
diff --git a/crates/sui-framework/packages/bridge/sources/treasury.move b/crates/sui-framework/packages/bridge/sources/treasury.move
index 27898d3a6e3b0..245189fa583f6 100644
--- a/crates/sui-framework/packages/bridge/sources/treasury.move
+++ b/crates/sui-framework/packages/bridge/sources/treasury.move
@@ -280,4 +280,19 @@ module bridge::treasury {
     public fun treasuries(treasury: &BridgeTreasury): &ObjectBag {
         &treasury.treasuries
     }
+
+    #[test_only]
+    public fun unwrap_update_event(event: UpdateTokenPriceEvent): (u8, u64) {
+        (event.token_id, event.new_price)
+    }
+
+    #[test_only]
+    public fun unwrap_new_token_event(event: NewTokenEvent): (u8, TypeName, bool, u64, u64) {
+        (event.token_id, event.type_name, event.native_token, event.decimal_multiplier, event.notional_value)
+    }
+
+    #[test_only]
+    public fun unwrap_registration_event(event: TokenRegistrationEvent): (TypeName, u8, bool) {
+        (event.type_name, event.decimal, event.native_token)
+    }
 }
diff --git a/crates/sui-framework/packages/bridge/tests/bridge_env.move b/crates/sui-framework/packages/bridge/tests/bridge_env.move
new file mode 100644
index 0000000000000..c2ef819b3c7cb
--- /dev/null
+++ b/crates/sui-framework/packages/bridge/tests/bridge_env.move
@@ -0,0 +1,1429 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+#[test_only]
+module bridge::bridge_env {
+    use bridge::bridge::{
+        assert_not_paused,
+        assert_paused,
+        create_bridge_for_testing,
+        inner_token_transfer_records,
+        test_init_bridge_committee,
+        test_load_inner_mut,
+        Bridge,
+        EmergencyOpEvent,
+        TokenDepositedEvent,
+        TokenTransferAlreadyApproved,
+        TokenTransferAlreadyClaimed,
+        TokenTransferApproved,
+        TokenTransferClaimed,
+        TokenTransferLimitExceed
+    };
+    use bridge::btc::{Self, BTC};
+    use bridge::chain_ids;
+    use bridge::committee::BlocklistValidatorEvent;
+    use bridge::eth::{Self, ETH};
+    use bridge::limiter::UpdateRouteLimitEvent;
+    use bridge::message::{
+        Self,
+        BridgeMessage,
+        create_add_tokens_on_sui_message,
+        create_blocklist_message,
+        emergency_op_pause,
+        emergency_op_unpause
+    };
+    use bridge::message_types;
+    use bridge::test_token::{Self, TEST_TOKEN};
+    use bridge::treasury::{
+        TokenRegistrationEvent,
+        NewTokenEvent,
+        UpdateTokenPriceEvent
+    };
+    use bridge::usdc::{Self, USDC};
+    use bridge::usdt::{Self, USDT};
+    use std::ascii::String;
+    use std::type_name;
+    use sui::address;
+    use sui::clock::Clock;
+    use sui::coin::{Self, Coin, CoinMetadata, TreasuryCap};
+    use sui::ecdsa_k1::{KeyPair, secp256k1_keypair_from_seed, secp256k1_sign};
+    use sui::event;
+    use sui::package::UpgradeCap;
+    use sui::test_scenario::{Self, Scenario};
+    use sui::test_utils::destroy;
+    use sui_system::governance_test_utils::{
+        advance_epoch_with_reward_amounts,
+        create_sui_system_state_for_testing,
+        create_validator_for_testing
+    };
+    use sui_system::sui_system::{
+        validator_voting_powers_for_testing,
+        SuiSystemState
+    };
+
+    //
+    // Token IDs
+    //
+    const BTC_ID: u8 = 1;
+    const ETH_ID: u8 = 2;
+    const USDC_ID: u8 = 3;
+    const USDT_ID: u8 = 4;
+    const TEST_TOKEN_ID: u8 = 5;
+
+    public fun btc_id(): u8 {
+        BTC_ID
+    }
+
+    public fun eth_id(): u8 {
+        ETH_ID
+    }
+
+    public fun usdc_id(): u8 {
+        USDC_ID
+    }
+
+    public fun usdt_id(): u8 {
+        USDT_ID
+    }
+
+    public fun test_token_id(): u8 {
+        TEST_TOKEN_ID
+    }
+
+    //
+    // Claim status
+    //
+    const CLAIMED: u8 = 1;
+    const ALREADY_CLAIMED: u8 = 2;
+    const LIMIT_EXCEEDED: u8 = 3;
+
+    public fun claimed(): u8 {
+        CLAIMED
+    }
+
+    public fun already_claimed(): u8 {
+        ALREADY_CLAIMED
+    }
+
+    public fun limit_exceeded(): u8 {
+        LIMIT_EXCEEDED
+    }
+
+    //
+    // Approve status
+    //
+    const APPROVED: u8 = 1;
+    const ALREADY_APPROVED: u8 = 2;
+
+    public fun approved(): u8 {
+        APPROVED
+    }
+
+    public fun already_approved(): u8 {
+        ALREADY_APPROVED
+    }
+
+    //
+    // Validators setup and info
+    //
+
+    // Validator info
+    public struct ValidatorInfo has drop {
+        validator: address,
+        key_pair: KeyPair,
+        stake_amount: u64,
+    }
+
+    public fun addr(validator: &ValidatorInfo): address {
+        validator.validator
+    }
+
+    public fun public_key(validator: &ValidatorInfo): &vector<u8> {
+        validator.key_pair.public_key()
+    }
+
+    public fun create_validator(
+        validator: address,
+        stake_amount: u64,
+        seed: &vector<u8>,
+    ): ValidatorInfo {
+        ValidatorInfo {
+            validator,
+            key_pair: secp256k1_keypair_from_seed(seed),
+            stake_amount,
+        }
+    }
+
+    // Bridge environemnt
+    public struct BridgeEnv {
+        scenario: Scenario,
+        validators: vector<ValidatorInfo>,
+        chain_id: u8,
+        vault: Vault,
+        clock: Clock,
+    }
+
+    // Holds coins for different bridged tokens
+    public struct Vault {
+        btc_coins: Coin<BTC>,
+        eth_coins: Coin<ETH>,
+        usdc_coins: Coin<USDC>,
+        usdt_coins: Coin<USDT>,
+        test_coins: Coin<TEST_TOKEN>,
+    }
+
+    // HotPotato to access shared state
+    // TODO: if the bridge is the only shared state we could remvove this
+    public struct BridgeWrapper {
+        bridge: Bridge,
+    }
+
+    public fun bridge(env: &mut BridgeEnv, sender: address): BridgeWrapper {
+        let scenario = &mut env.scenario;
+        scenario.next_tx(sender);
+        let bridge = scenario.take_shared<Bridge>();
+        BridgeWrapper { bridge }
+    }
+
+    public fun bridge_ref(wrapper: &BridgeWrapper): &Bridge {
+        &wrapper.bridge
+    }
+
+    public fun bridge_ref_mut(wrapper: &mut BridgeWrapper): &mut Bridge {
+        &mut wrapper.bridge
+    }
+
+    public fun return_bridge(bridge: BridgeWrapper) {
+        let BridgeWrapper { bridge } = bridge;
+        test_scenario::return_shared(bridge);
+    }
+
+    //
+    // Public functions
+    //
+
+    //
+    // Environment creation and destruction
+    //
+
+    public fun create_env(chain_id: u8): BridgeEnv {
+        let mut scenario = test_scenario::begin(@0x0);
+        let ctx = scenario.ctx();
+        let mut clock = sui::clock::create_for_testing(ctx);
+        clock.set_for_testing(1_000_000_000);
+        let btc_coins = coin::zero<BTC>(ctx);
+        let eth_coins = coin::zero<ETH>(ctx);
+        let usdc_coins = coin::zero<USDC>(ctx);
+        let usdt_coins = coin::zero<USDT>(ctx);
+        let test_coins = coin::zero<TEST_TOKEN>(ctx);
+        let vault = Vault {
+            btc_coins,
+            eth_coins,
+            usdc_coins,
+            usdt_coins,
+            test_coins,
+        };
+        BridgeEnv {
+            scenario,
+            chain_id,
+            vault,
+            validators: vector::empty(),
+            clock,
+        }
+    }
+
+    public fun destroy_env(env: BridgeEnv) {
+        let BridgeEnv {
+            scenario,
+            chain_id: _,
+            vault,
+            validators: _,
+            clock,
+        } = env;
+        destroy_valut(vault);
+        clock.destroy_for_testing();
+        scenario.end();
+    }
+
+    //
+    // Add a set of validators to the chain.
+    // Call only once in a test scenario.
+    public fun setup_validators(
+        env: &mut BridgeEnv,
+        validators_info: vector<ValidatorInfo>,
+    ) {
+        let scenario = &mut env.scenario;
+        scenario.next_tx(@0x0);
+        let ctx = scenario.ctx();
+        let validators = validators_info.map_ref!(
+            |validator| {
+                create_validator_for_testing(
+                    validator.validator,
+                    validator.stake_amount,
+                    ctx,
+                )
+            },
+        );
+        env.validators = validators_info;
+        create_sui_system_state_for_testing(validators, 0, 0, ctx);
+        advance_epoch_with_reward_amounts(0, 0, scenario);
+    }
+
+    //
+    // Bridge creation and setup
+    //
+
+    // Set up an environment with 3 validators, a bridge with
+    // a treasury and a committee with all 3 validators.
+    // The treasury will contain 4 tokens: ETH, BTC, USDT, USDC.
+    // Save the Bridge as a shared object.
+    public fun create_bridge_default(env: &mut BridgeEnv) {
+        let validators = vector[
+            create_validator(
+                @0xAAAA,
+                100,
+                &b"1234567890_1234567890_1234567890",
+            ),
+            create_validator(
+                @0xBBBB,
+                100,
+                &b"234567890_1234567890_1234567890_",
+            ),
+            create_validator(
+                @0xCCCC,
+                100,
+                &b"34567890_1234567890_1234567890_1",
+            ),
+        ];
+        env.setup_validators(validators);
+
+        let sender = @0x0;
+        env.create_bridge(sender);
+        env.register_committee();
+        env.init_committee(sender);
+        env.setup_treasury(sender);
+    }
+
+    // Create a bridge and set up a treasury.
+    // The treasury will contain 4 tokens: ETH, BTC, USDT, USDC.
+    // Save the Bridge as a shared object.
+    // No operation on the validators.
+    public fun create_bridge(env: &mut BridgeEnv, sender: address) {
+        env.scenario.next_tx(sender);
+        let ctx = env.scenario.ctx();
+        create_bridge_for_testing(object::new(ctx), env.chain_id, ctx);
+    }
+
+    // Register 3 committee members (validators `@0xA`, `@0xB`, `@0xC`)
+    public fun register_committee(env: &mut BridgeEnv) {
+        let scenario = &mut env.scenario;
+        scenario.next_tx(@0x0);
+        let mut bridge = scenario.take_shared<Bridge>();
+        let mut system_state = test_scenario::take_shared<SuiSystemState>(
+            scenario,
+        );
+
+        env
+            .validators
+            .do_ref!(
+                |validator| {
+                    scenario.next_tx(validator.validator);
+                    bridge.committee_registration(
+                        &mut system_state,
+                        *validator.key_pair.public_key(),
+                        b"",
+                        scenario.ctx(),
+                    );
+                },
+            );
+
+        test_scenario::return_shared(bridge);
+        test_scenario::return_shared(system_state);
+    }
+
+    // Init the bridge committee
+    public fun init_committee(env: &mut BridgeEnv, sender: address) {
+        let scenario = &mut env.scenario;
+        scenario.next_tx(sender);
+        let mut bridge = scenario.take_shared<Bridge>();
+        let mut system_state = test_scenario::take_shared<SuiSystemState>(
+            scenario,
+        );
+        let voting_powers = validator_voting_powers_for_testing(
+            &mut system_state,
+        );
+        bridge.test_init_bridge_committee(
+            voting_powers,
+            50,
+            scenario.ctx(),
+        );
+        test_scenario::return_shared(bridge);
+        test_scenario::return_shared(system_state);
+    }
+
+    // Set up a treasury with 4 tokens: ETH, BTC, USDT, USDC.
+    public fun setup_treasury(env: &mut BridgeEnv, sender: address) {
+        env.register_default_tokens(sender);
+        env.add_default_tokens(sender);
+        env.load_vault(sender);
+    }
+
+    // Register 4 tokens with the Bridge: ETH, BTC, USDT, USDC.
+    fun register_default_tokens(env: &mut BridgeEnv, sender: address) {
+        env.scenario.next_tx(sender);
+        let mut bridge = env.scenario.take_shared<Bridge>();
+
+        // BTC
+        let (upgrade_cap, treasury_cap, metadata) = btc::create_bridge_token(env
+            .scenario
+            .ctx());
+        bridge.register_foreign_token<BTC>(
+            treasury_cap,
+            upgrade_cap,
+            &metadata,
+        );
+        destroy(metadata);
+        // ETH
+        let (upgrade_cap, treasury_cap, metadata) = eth::create_bridge_token(env
+            .scenario
+            .ctx());
+        bridge.register_foreign_token<ETH>(
+            treasury_cap,
+            upgrade_cap,
+            &metadata,
+        );
+        destroy(metadata);
+        // USDC
+        let (
+            upgrade_cap,
+            treasury_cap,
+            metadata,
+        ) = usdc::create_bridge_token(env.scenario.ctx());
+        bridge.register_foreign_token<USDC>(
+            treasury_cap,
+            upgrade_cap,
+            &metadata,
+        );
+        destroy(metadata);
+        // USDT
+        let (
+            upgrade_cap,
+            treasury_cap,
+            metadata,
+        ) = usdt::create_bridge_token(env.scenario.ctx());
+        bridge.register_foreign_token<USDT>(
+            treasury_cap,
+            upgrade_cap,
+            &metadata,
+        );
+        destroy(metadata);
+
+        test_scenario::return_shared(bridge);
+    }
+
+    // Add the 4 tokens previously registered: ETH, BTC, USDT, USDC.
+    fun add_default_tokens(env: &mut BridgeEnv, sender: address) {
+        let scenario = &mut env.scenario;
+        scenario.next_tx(sender);
+        let mut bridge = scenario.take_shared<Bridge>();
+
+        let add_token_message = create_add_tokens_on_sui_message(
+            env.chain_id,
+            bridge.get_seq_num_for(message_types::add_tokens_on_sui()),
+            false,
+            vector[BTC_ID, ETH_ID, USDC_ID, USDT_ID],
+            vector[
+                type_name::get<BTC>().into_string(),
+                type_name::get<ETH>().into_string(),
+                type_name::get<USDC>().into_string(),
+                type_name::get<USDT>().into_string(),
+            ],
+            vector[1000, 100, 1, 1],
+        );
+        let signatures = env.sign_message(add_token_message);
+        bridge.execute_system_message(add_token_message, signatures);
+
+        test_scenario::return_shared(bridge);
+    }
+
+    //
+    // Utility functions for custom behavior
+    //
+
+    public fun token_type<T>(env: &mut BridgeEnv): u8 {
+        env.scenario.next_tx(@0x0);
+        let bridge = env.scenario.take_shared<Bridge>();
+        let inner = bridge.test_load_inner();
+        let token_id = inner.inner_treasury().token_id<T>();
+        test_scenario::return_shared(bridge);
+        token_id
+    }
+
+    const SUI_MESSAGE_PREFIX: vector<u8> = b"SUI_BRIDGE_MESSAGE";
+
+    fun sign_message(
+        env: &BridgeEnv,
+        message: BridgeMessage,
+    ): vector<vector<u8>> {
+        let mut message_bytes = SUI_MESSAGE_PREFIX;
+        message_bytes.append(message.serialize_message());
+        let mut message_bytes = SUI_MESSAGE_PREFIX;
+        message_bytes.append(message.serialize_message());
+        env
+            .validators
+            .map_ref!(
+                |validator| {
+                    secp256k1_sign(
+                        validator.key_pair.private_key(),
+                        &message_bytes,
+                        0,
+                        true,
+                    )
+                },
+            )
+    }
+
+    public fun sign_message_with(
+        env: &BridgeEnv,
+        message: BridgeMessage,
+        validator_idxs: vector<u64>,
+    ): vector<vector<u8>> {
+        let mut message_bytes = SUI_MESSAGE_PREFIX;
+        message_bytes.append(message.serialize_message());
+        validator_idxs.map!(
+            |idx| {
+                secp256k1_sign(
+                    env.validators[idx].key_pair.private_key(),
+                    &message_bytes,
+                    0,
+                    true,
+                )
+            },
+        )
+    }
+
+    public fun bridge_in_message<Token>(
+        env: &mut BridgeEnv,
+        source_chain: u8,
+        source_address: vector<u8>,
+        target_address: address,
+        amount: u64,
+    ): BridgeMessage {
+        let token_type = env.token_type<Token>();
+
+        let scenario = &mut env.scenario;
+        scenario.next_tx(@0x0);
+        let mut bridge = scenario.take_shared<Bridge>();
+
+        let message = message::create_token_bridge_message(
+            source_chain,
+            bridge.get_seq_num_inc_for(message_types::token()),
+            source_address,
+            env.chain_id,
+            address::to_bytes(target_address),
+            token_type,
+            amount,
+        );
+        test_scenario::return_shared(bridge);
+        message
+    }
+
+    public fun bridge_out_message<Token>(
+        env: &mut BridgeEnv,
+        target_chain: u8,
+        target_address: vector<u8>,
+        source_address: address,
+        amount: u64,
+        transfer_id: u64,
+    ): BridgeMessage {
+        let token_type = env.token_type<Token>();
+
+        let scenario = &mut env.scenario;
+        scenario.next_tx(@0x0);
+        let bridge = scenario.take_shared<Bridge>();
+
+        let message = message::create_token_bridge_message(
+            env.chain_id,
+            transfer_id,
+            address::to_bytes(source_address),
+            target_chain,
+            target_address,
+            token_type,
+            amount,
+        );
+        test_scenario::return_shared(bridge);
+        message
+    }
+
+    public fun bridge_token_signed_message<Token>(
+        env: &mut BridgeEnv,
+        source_chain: u8,
+        source_address: vector<u8>,
+        target_address: address,
+        amount: u64,
+    ): (BridgeMessage, vector<vector<u8>>) {
+        let token_type = env.token_type<Token>();
+        let scenario = &mut env.scenario;
+        scenario.next_tx(@0x0);
+        let mut bridge = scenario.take_shared<Bridge>();
+        let seq_num = bridge.get_seq_num_inc_for(message_types::token());
+        test_scenario::return_shared(bridge);
+        let message = message::create_token_bridge_message(
+            source_chain,
+            seq_num,
+            source_address,
+            env.chain_id,
+            address::to_bytes(target_address),
+            token_type,
+            amount,
+        );
+        let signatures = env.sign_message(message);
+        (message, signatures)
+    }
+
+    // Bridge the `amount` of the given `Token` from the `source_chain`.
+    public fun bridge_to_sui<Token>(
+        env: &mut BridgeEnv,
+        source_chain: u8,
+        source_address: vector<u8>,
+        target_address: address,
+        amount: u64,
+    ): u64 {
+        let token_type = env.token_type<Token>();
+
+        // setup
+        let scenario = &mut env.scenario;
+        scenario.next_tx(@0x0);
+        let mut bridge = scenario.take_shared<Bridge>();
+
+        // sign message
+        let seq_num = bridge.get_seq_num_inc_for(message_types::token());
+        let message = message::create_token_bridge_message(
+            source_chain,
+            seq_num,
+            source_address,
+            env.chain_id,
+            address::to_bytes(target_address),
+            token_type,
+            amount,
+        );
+        let signatures = env.sign_message(message);
+
+        // run approval
+        bridge.approve_token_transfer(message, signatures);
+
+        // verify approval events
+        let approved_events = event::events_by_type<TokenTransferApproved>();
+        let already_approved_events = event::events_by_type<
+            TokenTransferAlreadyApproved,
+        >();
+        assert!(
+            approved_events.length() == 1 ||
+            already_approved_events.length() == 1,
+        );
+        let key = if (approved_events.length() == 1) {
+            approved_events[0].transfer_approve_key()
+        } else {
+            already_approved_events[0].transfer_already_approved_key()
+        };
+        let (sc, mt, sn) = key.unpack_message();
+        assert!(source_chain == sc);
+        assert!(mt == message_types::token());
+        assert!(sn == seq_num);
+
+        // tear down
+        test_scenario::return_shared(bridge);
+        seq_num
+    }
+
+    // Approves a token transer
+    public fun approve_token_transfer(
+        env: &mut BridgeEnv,
+        message: BridgeMessage,
+        signatures: vector<vector<u8>>,
+    ): u8 {
+        let msg_key = message.key();
+
+        // set up
+        let scenario = &mut env.scenario;
+        scenario.next_tx(@0x0);
+        let mut bridge = scenario.take_shared<Bridge>();
+
+        // run approval
+        bridge.approve_token_transfer(message, signatures);
+
+        // verify approval events
+        let approved = event::events_by_type<TokenTransferApproved>();
+        let already_approved = event::events_by_type<
+            TokenTransferAlreadyApproved,
+        >();
+        assert!(approved.length() == 1 || already_approved.length() == 1);
+        let (key, approve_status) = if (approved.length() == 1) {
+            (approved[0].transfer_approve_key(), APPROVED)
+        } else {
+            (
+                already_approved[0].transfer_already_approved_key(),
+                ALREADY_APPROVED,
+            )
+        };
+        assert!(msg_key == key);
+
+        // tear down
+        test_scenario::return_shared(bridge);
+        approve_status
+    }
+
+    // Clain a token transfer and returns the coin
+    public fun claim_token<T>(
+        env: &mut BridgeEnv,
+        sender: address,
+        source_chain: u8,
+        bridge_seq_num: u64,
+    ): Coin<T> {
+        // set up
+        let scenario = &mut env.scenario;
+        scenario.next_tx(sender);
+        let clock = &env.clock;
+        let mut bridge = scenario.take_shared<Bridge>();
+        let ctx = scenario.ctx();
+        let total_supply_before = get_total_supply<T>(&bridge);
+
+        // run claim
+        let token = bridge.claim_token<T>(
+            clock,
+            source_chain,
+            bridge_seq_num,
+            ctx,
+        );
+
+        // verify value change and claim events
+        let token_value = token.value();
+        assert!(
+            total_supply_before + token_value == get_total_supply<T>(&bridge),
+        );
+        let claimed = event::events_by_type<TokenTransferClaimed>();
+        let already_claimed = event::events_by_type<
+            TokenTransferAlreadyClaimed,
+        >();
+        let limit_exceeded = event::events_by_type<TokenTransferLimitExceed>();
+        assert!(
+            claimed.length() == 1 || already_claimed.length() == 1 ||
+            limit_exceeded.length() == 1,
+        );
+        let key = if (claimed.length() == 1) {
+            claimed[0].transfer_claimed_key()
+        } else if (already_claimed.length() == 1) {
+            already_claimed[0].transfer_already_claimed_key()
+        } else {
+            limit_exceeded[0].transfer_limit_exceed_key()
+        };
+        let (sc, mt, sn) = key.unpack_message();
+        assert!(source_chain == sc);
+        assert!(mt == message_types::token());
+        assert!(sn == bridge_seq_num);
+
+        // tear down
+        test_scenario::return_shared(bridge);
+        token
+    }
+
+    // Claim a token and transfer to the receiver in the bridge message
+    public fun claim_and_transfer_token<T>(
+        env: &mut BridgeEnv,
+        source_chain: u8,
+        bridge_seq_num: u64,
+    ): u8 {
+        // set up
+        let sender = @0xA1B2C3; // random sender
+        let scenario = &mut env.scenario;
+        scenario.next_tx(sender);
+        let clock = &env.clock;
+        let mut bridge = scenario.take_shared<Bridge>();
+        let ctx = scenario.ctx();
+        let total_supply_before = get_total_supply<T>(&bridge);
+
+        // run claim and transfer
+        bridge.claim_and_transfer_token<T>(
+            clock,
+            source_chain,
+            bridge_seq_num,
+            ctx,
+        );
+
+        // verify claim events
+        let claimed = event::events_by_type<TokenTransferClaimed>();
+        let already_claimed = event::events_by_type<
+            TokenTransferAlreadyClaimed,
+        >();
+        let limit_exceeded = event::events_by_type<TokenTransferLimitExceed>();
+        assert!(
+            claimed.length() == 1 || already_claimed.length() == 1 ||
+            limit_exceeded.length() == 1,
+        );
+        let (key, claim_status) = if (claimed.length() == 1) {
+            (claimed[0].transfer_claimed_key(), CLAIMED)
+        } else if (already_claimed.length() == 1) {
+            (already_claimed[0].transfer_already_claimed_key(), ALREADY_CLAIMED)
+        } else {
+            (limit_exceeded[0].transfer_limit_exceed_key(), LIMIT_EXCEEDED)
+        };
+        let (sc, mt, sn) = key.unpack_message();
+        assert!(source_chain == sc);
+        assert!(mt == message_types::token());
+        assert!(sn == bridge_seq_num);
+
+        // verify effects
+        let effects = scenario.next_tx(@0xABCDEF);
+        let created = effects.created();
+        if (!created.is_empty()) {
+            let token_id = effects.created()[0];
+            let token = scenario.take_from_sender_by_id<Coin<T>>(token_id);
+            let token_value = token.value();
+            assert!(
+                total_supply_before + token_value ==
+                get_total_supply<T>(&bridge),
+            );
+            scenario.return_to_sender(token);
+        };
+
+        // tear down
+        test_scenario::return_shared(bridge);
+        claim_status
+    }
+
+    // Send a coin (token) to the target chain
+    public fun send_token<T>(
+        env: &mut BridgeEnv,
+        sender: address,
+        target_chain_id: u8,
+        eth_address: vector<u8>,
+        coin: Coin<T>,
+    ): u64 {
+        // set up
+        let chain_id = env.chain_id;
+        let scenario = env.scenario();
+        scenario.next_tx(sender);
+        let mut bridge = scenario.take_shared<Bridge>();
+        let coin_value = coin.value();
+        let total_supply_before = get_total_supply<T>(&bridge);
+        let seq_num = bridge.get_seq_num_for(message_types::token());
+
+        // run send
+        bridge.send_token(target_chain_id, eth_address, coin, scenario.ctx());
+
+        // verify send events
+        assert!(
+            total_supply_before - coin_value == get_total_supply<T>(&bridge),
+        );
+        let deposited_events = event::events_by_type<TokenDepositedEvent>();
+        assert!(deposited_events.length() == 1);
+        let (
+            event_seq_num,
+            _event_source_chain,
+            _event_sender_address,
+            _event_target_chain,
+            _event_target_address,
+            _event_token_type,
+            event_amount,
+        ) = deposited_events[0].unwrap_deposited_event();
+        assert!(event_seq_num == seq_num);
+        assert!(event_amount == coin_value);
+        assert_key(chain_id, &bridge);
+
+        // tear down
+        test_scenario::return_shared(bridge);
+        seq_num
+    }
+
+    // Update the limit for a given route
+    public fun update_bridge_limit(
+        env: &mut BridgeEnv,
+        sender: address,
+        receiving_chain: u8,
+        sending_chain: u8,
+        limit: u64,
+    ): u64 {
+        // set up
+        let scenario = env.scenario();
+        scenario.next_tx(sender);
+        let mut bridge = scenario.take_shared<Bridge>();
+
+        // message signed
+        let msg = message::create_update_bridge_limit_message(
+            receiving_chain,
+            bridge.get_seq_num_for(message_types::update_bridge_limit()),
+            sending_chain,
+            limit,
+        );
+        let signatures = env.sign_message(msg);
+
+        // run limit update
+        bridge.execute_system_message(msg, signatures);
+
+        // verify limit events
+        let limit_events = event::events_by_type<UpdateRouteLimitEvent>();
+        assert!(limit_events.length() == 1);
+        let event = limit_events[0];
+        let (sc, rc, new_limit) = event.unpack_route_limit_event();
+        assert!(sc == sending_chain);
+        assert!(rc == receiving_chain);
+        assert!(new_limit == limit);
+
+        // tear down
+        test_scenario::return_shared(bridge);
+        new_limit
+    }
+
+    // Update a given asset price (notional value)
+    public fun update_asset_price(
+        env: &mut BridgeEnv,
+        sender: address,
+        token_id: u8,
+        value: u64,
+    ) {
+        // set up
+        let scenario = &mut env.scenario;
+        scenario.next_tx(sender);
+        let mut bridge = scenario.take_shared<Bridge>();
+
+        // message signed
+        let message = message::create_update_asset_price_message(
+            token_id,
+            env.chain_id,
+            bridge.get_seq_num_for(message_types::update_asset_price()),
+            value,
+        );
+        let signatures = env.sign_message(message);
+
+        // run price update
+        bridge.execute_system_message(message, signatures);
+
+        // verify price events
+        let update_events = event::events_by_type<UpdateTokenPriceEvent>();
+        assert!(update_events.length() == 1);
+        let (event_token_id, event_new_price) = update_events[
+            0
+        ].unwrap_update_event();
+        assert!(event_token_id == token_id);
+        assert!(event_new_price == value);
+
+        // tear down
+        test_scenario::return_shared(bridge);
+    }
+
+    // Register the `TEST_TOKEN` token
+    public fun register_test_token(env: &mut BridgeEnv) {
+        // set up
+        let scenario = &mut env.scenario;
+        scenario.next_tx(@0x0);
+        let mut bridge = scenario.take_shared<Bridge>();
+
+        // "create" the `Coin`
+        let (
+            upgrade_cap,
+            treasury_cap,
+            metadata,
+        ) = test_token::create_bridge_token(scenario.ctx());
+        // register the coin/token with the bridge
+        bridge.register_foreign_token<TEST_TOKEN>(
+            treasury_cap,
+            upgrade_cap,
+            &metadata,
+        );
+
+        // verify registration events
+        let register_events = event::events_by_type<TokenRegistrationEvent>();
+        assert!(register_events.length() == 1);
+        let (type_name, decimal, nat) = register_events[
+            0
+        ].unwrap_registration_event();
+        assert!(type_name == type_name::get<TEST_TOKEN>());
+        assert!(decimal == 8);
+        assert!(nat == false);
+
+        // tear down
+        destroy(metadata);
+        test_scenario::return_shared(bridge);
+    }
+
+    // Add a list of tokens to the bridge.
+    public fun add_tokens(
+        env: &mut BridgeEnv,
+        sender: address,
+        native_token: bool,
+        token_ids: vector<u8>,
+        type_names: vector<String>,
+        token_prices: vector<u64>,
+    ) {
+        // set up
+        let scenario = &mut env.scenario;
+        scenario.next_tx(sender);
+        let mut bridge = scenario.take_shared<Bridge>();
+
+        // message signed
+        let message = create_add_tokens_on_sui_message(
+            env.chain_id,
+            bridge.get_seq_num_for(message_types::add_tokens_on_sui()),
+            native_token,
+            token_ids,
+            type_names,
+            token_prices,
+        );
+        let signatures = env.sign_message(message);
+
+        // run token addition
+        bridge.execute_system_message(message, signatures);
+
+        // verify token addition events
+        let new_tokens_events = event::events_by_type<NewTokenEvent>();
+        assert!(new_tokens_events.length() <= token_ids.length());
+
+        // tear down
+        test_scenario::return_shared(bridge);
+    }
+
+    // Blocklist a list of bridge nodes
+    public fun execute_blocklist(
+        env: &mut BridgeEnv,
+        sender: address,
+        chain_id: u8,
+        blocklist_type: u8,
+        validator_ecdsa_addresses: vector<vector<u8>>,
+    ) {
+        // set up
+        let scenario = env.scenario();
+        scenario.next_tx(sender);
+        let mut bridge = scenario.take_shared<Bridge>();
+
+        // message signed
+        let blocklist = create_blocklist_message(
+            chain_id,
+            bridge.get_seq_num_for(message_types::committee_blocklist()),
+            blocklist_type,
+            validator_ecdsa_addresses,
+        );
+        let signatures = env.sign_message(blocklist);
+
+        // run blocklist
+        bridge.execute_system_message(blocklist, signatures);
+
+        // verify blocklist events
+        let block_list_events = event::events_by_type<
+            BlocklistValidatorEvent,
+        >();
+        assert!(
+            block_list_events.length() == validator_ecdsa_addresses.length(),
+        );
+
+        // tear down
+        test_scenario::return_shared(bridge);
+    }
+
+    // Register new token
+    public fun register_foreign_token<T>(
+        env: &mut BridgeEnv,
+        treasury_cap: TreasuryCap<T>,
+        upgrade_cap: UpgradeCap,
+        metadata: CoinMetadata<T>,
+        sender: address,
+    ) {
+        // set up
+        let scenario = env.scenario();
+        scenario.next_tx(sender);
+        let mut bridge = scenario.take_shared<Bridge>();
+
+        // run registration
+        bridge.register_foreign_token<T>(treasury_cap, upgrade_cap, &metadata);
+
+        // verify registration events
+        let register_events = event::events_by_type<TokenRegistrationEvent>();
+        assert!(register_events.length() == 1);
+
+        // verify changes in bridge
+        let type_name = type_name::get<T>();
+        let inner = bridge.test_load_inner();
+        let treasury = inner.inner_treasury();
+        let waiting_room = treasury.waiting_room();
+        assert!(waiting_room.contains(type_name::into_string(type_name)));
+        let treasuries = treasury.treasuries();
+        assert!(treasuries.contains(type_name));
+
+        // tear down
+        test_scenario::return_shared(bridge);
+        destroy(metadata);
+    }
+
+    // Freeze the bridge
+    public fun freeze_bridge(env: &mut BridgeEnv, sender: address, error: u64) {
+        // set up
+        let scenario = env.scenario();
+        scenario.next_tx(sender);
+        let mut bridge = scenario.take_shared<Bridge>();
+        let seq_num = bridge.get_seq_num_for(message_types::emergency_op());
+
+        // message signed
+        let msg = message::create_emergency_op_message(
+            env.chain_id,
+            seq_num,
+            emergency_op_pause(),
+        );
+        let signatures = env.sign_message(msg);
+
+        // run freeze
+        bridge.execute_system_message(msg, signatures);
+
+        // verify freeze events
+        let register_events = event::events_by_type<EmergencyOpEvent>();
+        assert!(register_events.length() == 1);
+        assert!(register_events[0].unwrap_emergency_op_event() == true);
+
+        // verify freeze
+        let inner = bridge.test_load_inner_mut();
+        inner.assert_paused(error);
+
+        // tear down
+        test_scenario::return_shared(bridge);
+    }
+
+    // Unfreeze the bridge
+    public fun unfreeze_bridge(
+        env: &mut BridgeEnv,
+        sender: address,
+        error: u64,
+    ) {
+        // set up
+        let scenario = env.scenario();
+        scenario.next_tx(sender);
+        let mut bridge = scenario.take_shared<Bridge>();
+        let seq_num = bridge.get_seq_num_for(message_types::emergency_op());
+
+        // message signed
+        let msg = message::create_emergency_op_message(
+            env.chain_id,
+            seq_num,
+            emergency_op_unpause(),
+        );
+        let signatures = env.sign_message(msg);
+
+        // run unfreeze
+        bridge.execute_system_message(msg, signatures);
+        let register_events = event::events_by_type<EmergencyOpEvent>();
+        assert!(register_events.length() == 1);
+        assert!(register_events[0].unwrap_emergency_op_event() == false);
+
+        // verify unfreeze events
+
+        // verify unfreeze
+        let inner = bridge.test_load_inner_mut();
+        inner.assert_not_paused(error);
+
+        // tear down
+        test_scenario::return_shared(bridge);
+    }
+
+    //
+    // Getters
+    //
+
+    public fun ctx(env: &mut BridgeEnv): &mut TxContext {
+        env.scenario.ctx()
+    }
+
+    public fun scenario(env: &mut BridgeEnv): &mut Scenario {
+        &mut env.scenario
+    }
+
+    public fun chain_id(env: &mut BridgeEnv): u8 {
+        env.chain_id
+    }
+
+    public fun validators(env: &BridgeEnv): &vector<ValidatorInfo> {
+        &env.validators
+    }
+
+    public fun get_btc(env: &mut BridgeEnv, amount: u64): Coin<BTC> {
+        let scenario = &mut env.scenario;
+        let ctx = scenario.ctx();
+        env.vault.btc_coins.split(amount, ctx)
+    }
+
+    public fun get_eth(env: &mut BridgeEnv, amount: u64): Coin<ETH> {
+        let scenario = &mut env.scenario;
+        let ctx = scenario.ctx();
+        env.vault.eth_coins.split(amount, ctx)
+    }
+
+    public fun get_usdc(env: &mut BridgeEnv, amount: u64): Coin<USDC> {
+        let scenario = &mut env.scenario;
+        let ctx = scenario.ctx();
+        env.vault.usdc_coins.split(amount, ctx)
+    }
+
+    public fun get_usdt(env: &mut BridgeEnv, amount: u64): Coin<USDT> {
+        let scenario = &mut env.scenario;
+        let ctx = scenario.ctx();
+        env.vault.usdt_coins.split(amount, ctx)
+    }
+
+    public fun limits(env: &mut BridgeEnv, dest: u8): u64 {
+        let scenario = env.scenario();
+        scenario.next_tx(@0x0);
+        let bridge = scenario.take_shared<Bridge>();
+        let route = chain_ids::get_route(dest, env.chain_id);
+        let limits = bridge
+            .test_load_inner()
+            .inner_limiter()
+            .get_route_limit(&route);
+        test_scenario::return_shared(bridge);
+        limits
+    }
+
+    fun assert_key(chain_id: u8, bridge: &Bridge) {
+        let inner = bridge.test_load_inner();
+        let transfer_record = inner.inner_token_transfer_records();
+        let seq_num = inner.sequence_nums()[&message_types::token()] - 1;
+        let key = message::create_key(
+            chain_id,
+            message_types::token(),
+            seq_num,
+        );
+        assert!(transfer_record.contains(key));
+    }
+
+    //
+    // Internal functions
+    //
+
+    // Destroy the vault
+    fun destroy_valut(vault: Vault) {
+        let Vault {
+            btc_coins,
+            eth_coins,
+            usdc_coins,
+            usdt_coins,
+            test_coins,
+        } = vault;
+        btc_coins.burn_for_testing();
+        eth_coins.burn_for_testing();
+        usdc_coins.burn_for_testing();
+        usdt_coins.burn_for_testing();
+        test_coins.burn_for_testing();
+    }
+
+    // Load the vault with some coins
+    fun load_vault(env: &mut BridgeEnv, sender: address) {
+        let scenario = &mut env.scenario;
+        scenario.next_tx(sender);
+        let mut bridge = scenario.take_shared<Bridge>();
+        let vault = &mut env.vault;
+        vault.btc_coins.join(mint_some(&mut bridge, scenario.ctx()));
+        vault.eth_coins.join(mint_some(&mut bridge, scenario.ctx()));
+        vault.usdc_coins.join(mint_some(&mut bridge, scenario.ctx()));
+        vault.usdt_coins.join(mint_some(&mut bridge, scenario.ctx()));
+        test_scenario::return_shared(bridge);
+    }
+
+    // Mint some coins
+    fun mint_some<T>(bridge: &mut Bridge, ctx: &mut TxContext): Coin<T> {
+        let treasury = bridge.test_load_inner_mut().inner_treasury_mut();
+        let coin = treasury.mint<T>(1_000_000, ctx);
+        coin
+    }
+
+    fun get_total_supply<T>(bridge: &Bridge): u64 {
+        let inner = bridge.test_load_inner();
+        let treasury = inner.inner_treasury();
+        let treasuries = treasury.treasuries();
+        let tc: &TreasuryCap<T> = &treasuries[type_name::get<T>()];
+        tc.total_supply()
+    }
+}
+
+//
+// Test Coins
+//
+
+#[test_only]
+module bridge::test_token {
+    use std::ascii;
+    use std::type_name;
+    use sui::address;
+    use sui::coin::{CoinMetadata, TreasuryCap, create_currency};
+    use sui::hex;
+    use sui::package::{UpgradeCap, test_publish};
+    use sui::test_utils::create_one_time_witness;
+
+    public struct TEST_TOKEN has drop {}
+
+    public fun create_bridge_token(
+        ctx: &mut TxContext,
+    ): (UpgradeCap, TreasuryCap<TEST_TOKEN>, CoinMetadata<TEST_TOKEN>) {
+        let otw = create_one_time_witness<TEST_TOKEN>();
+        let (treasury_cap, metadata) = create_currency(
+            otw,
+            8,
+            b"tst",
+            b"test",
+            b"bridge test token",
+            option::none(),
+            ctx,
+        );
+
+        let type_name = type_name::get<TEST_TOKEN>();
+        let address_bytes = hex::decode(
+            ascii::into_bytes(type_name::get_address(&type_name)),
+        );
+        let coin_id = address::from_bytes(address_bytes).to_id();
+        let upgrade_cap = test_publish(coin_id, ctx);
+
+        (upgrade_cap, treasury_cap, metadata)
+    }
+}
+
+#[test_only]
+module bridge::btc {
+    use std::ascii;
+    use std::type_name;
+    use sui::address;
+    use sui::coin::{CoinMetadata, TreasuryCap, create_currency};
+    use sui::hex;
+    use sui::package::{UpgradeCap, test_publish};
+    use sui::test_utils::create_one_time_witness;
+
+    public struct BTC has drop {}
+
+    public fun create_bridge_token(
+        ctx: &mut TxContext,
+    ): (UpgradeCap, TreasuryCap<BTC>, CoinMetadata<BTC>) {
+        let otw = create_one_time_witness<BTC>();
+        let (treasury_cap, metadata) = create_currency(
+            otw,
+            8,
+            b"btc",
+            b"bitcoin",
+            b"bridge bitcoin token",
+            option::none(),
+            ctx,
+        );
+
+        let type_name = type_name::get<BTC>();
+        let address_bytes = hex::decode(
+            ascii::into_bytes(type_name::get_address(&type_name)),
+        );
+        let coin_id = address::from_bytes(address_bytes).to_id();
+        let upgrade_cap = test_publish(coin_id, ctx);
+
+        (upgrade_cap, treasury_cap, metadata)
+    }
+}
+
+#[test_only]
+module bridge::eth {
+    use std::ascii;
+    use std::type_name;
+    use sui::address;
+    use sui::coin::{CoinMetadata, TreasuryCap, create_currency};
+    use sui::hex;
+    use sui::package::{UpgradeCap, test_publish};
+    use sui::test_utils::create_one_time_witness;
+
+    public struct ETH has drop {}
+
+    public fun create_bridge_token(
+        ctx: &mut TxContext,
+    ): (UpgradeCap, TreasuryCap<ETH>, CoinMetadata<ETH>) {
+        let otw = create_one_time_witness<ETH>();
+        let (treasury_cap, metadata) = create_currency(
+            otw,
+            8,
+            b"eth",
+            b"eth",
+            b"bridge ethereum token",
+            option::none(),
+            ctx,
+        );
+
+        let type_name = type_name::get<ETH>();
+        let address_bytes = hex::decode(
+            ascii::into_bytes(type_name::get_address(&type_name)),
+        );
+        let coin_id = address::from_bytes(address_bytes).to_id();
+        let upgrade_cap = test_publish(coin_id, ctx);
+
+        (upgrade_cap, treasury_cap, metadata)
+    }
+}
+
+#[test_only]
+module bridge::usdc {
+    use std::ascii;
+    use std::type_name;
+    use sui::address;
+    use sui::coin::{CoinMetadata, TreasuryCap, create_currency};
+    use sui::hex;
+    use sui::package::{UpgradeCap, test_publish};
+    use sui::test_utils::create_one_time_witness;
+
+    public struct USDC has drop {}
+
+    public fun create_bridge_token(
+        ctx: &mut TxContext,
+    ): (UpgradeCap, TreasuryCap<USDC>, CoinMetadata<USDC>) {
+        let otw = create_one_time_witness<USDC>();
+        let (treasury_cap, metadata) = create_currency(
+            otw,
+            6,
+            b"usdc",
+            b"usdc",
+            b"bridge usdc token",
+            option::none(),
+            ctx,
+        );
+
+        let type_name = type_name::get<USDC>();
+        let address_bytes = hex::decode(
+            ascii::into_bytes(type_name::get_address(&type_name)),
+        );
+        let coin_id = address::from_bytes(address_bytes).to_id();
+        let upgrade_cap = test_publish(coin_id, ctx);
+
+        (upgrade_cap, treasury_cap, metadata)
+    }
+}
+
+#[test_only]
+module bridge::usdt {
+    use std::ascii;
+    use std::type_name;
+    use sui::address;
+    use sui::coin::{CoinMetadata, TreasuryCap, create_currency};
+    use sui::hex;
+    use sui::package::{UpgradeCap, test_publish};
+    use sui::test_utils::create_one_time_witness;
+
+    public struct USDT has drop {}
+
+    public fun create_bridge_token(
+        ctx: &mut TxContext,
+    ): (UpgradeCap, TreasuryCap<USDT>, CoinMetadata<USDT>) {
+        let otw = create_one_time_witness<USDT>();
+        let (treasury_cap, metadata) = create_currency(
+            otw,
+            6,
+            b"usdt",
+            b"usdt",
+            b"bridge usdt token",
+            option::none(),
+            ctx,
+        );
+
+        let type_name = type_name::get<USDT>();
+        let address_bytes = hex::decode(
+            ascii::into_bytes(type_name::get_address(&type_name)),
+        );
+        let coin_id = address::from_bytes(address_bytes).to_id();
+        let upgrade_cap = test_publish(coin_id, ctx);
+
+        (upgrade_cap, treasury_cap, metadata)
+    }
+}
diff --git a/crates/sui-framework/packages/bridge/tests/bridge_setup.move b/crates/sui-framework/packages/bridge/tests/bridge_setup.move
deleted file mode 100644
index 4652bb058bbd9..0000000000000
--- a/crates/sui-framework/packages/bridge/tests/bridge_setup.move
+++ /dev/null
@@ -1,800 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-#[test_only]
-module bridge::bridge_setup {
-    use bridge::bridge::{
-        assert_not_paused, assert_paused, create_bridge_for_testing, inner_token_transfer_records,
-        test_execute_add_tokens_on_sui, test_execute_emergency_op, test_init_bridge_committee,
-        test_load_inner_mut, Bridge,
-    };
-    use bridge::btc::{Self, BTC};
-    use bridge::eth::{Self, ETH};
-    use bridge::message::{
-        Self, create_add_tokens_on_sui_message, create_blocklist_message, emergency_op_pause,
-        emergency_op_unpause,
-    };
-    use bridge::message_types;
-    use bridge::test_token::TEST_TOKEN;
-    use bridge::usdc::{Self, USDC};
-    use bridge::usdt::{Self, USDT};
-    use std::{ascii::String, type_name};
-    use sui::coin::{Self, Coin, CoinMetadata, TreasuryCap};
-    use sui::hex;
-    use sui::package::UpgradeCap;
-    use sui::test_scenario::{Self, Scenario};
-    use sui::test_utils::destroy;
-    use sui_system::{
-        governance_test_utils::{
-            advance_epoch_with_reward_amounts,
-            create_sui_system_state_for_testing,
-            create_validator_for_testing,
-        },
-        sui_system::{
-            validator_voting_powers_for_testing,
-            SuiSystemState,
-        },
-    };
-
-    //
-    // Token IDs
-    //
-    const BTC_ID: u8 = 1;
-    const ETH_ID: u8 = 2;
-    const USDC_ID: u8 = 3;
-    const USDT_ID: u8 = 4;
-    const TEST_TOKEN_ID: u8 = 5;
-
-    public fun btc_id(): u8 {
-        BTC_ID
-    }
-
-    public fun eth_id(): u8 {
-        ETH_ID
-    }
-
-    public fun usdc_id(): u8 {
-        USDC_ID
-    }
-
-    public fun usdt_id(): u8 {
-        USDT_ID
-    }
-
-    public fun test_token_id(): u8 {
-        TEST_TOKEN_ID
-    }
-
-    //
-    // Validators setup and info
-    //
-
-    const VALIDATOR1_PUBKEY: vector<u8> = b"029bef8d556d80e43ae7e0becb3a7e6838b95defe45896ed6075bb9035d06c9964";
-    const VALIDATOR2_PUBKEY: vector<u8> = b"033e99a541db69bd32040dfe5037fbf5210dafa8151a71e21c5204b05d95ce0a62";
-    const VALIDATOR3_PUBKEY: vector<u8> = b"033e99a541db69bd32040dfe5037fbf5210dafa8151a71e21c5204b05d95ce0a63";
-
-    // Bridge environemnt
-    public struct BridgeEnv {
-        scenario: Scenario,
-        chain_id: u8,
-        seq_num: u64,
-        vault: Vault,
-    }
-
-    public struct Vault {
-        btc_coins: Coin<BTC>,
-        eth_coins: Coin<ETH>,
-        usdc_coins: Coin<USDC>,
-        usdt_coins: Coin<USDT>,
-        test_coins: Coin<TEST_TOKEN>,
-    }
-
-    // Info to set up a validator
-    public struct ValidatorInfo has copy, drop {
-        validator: address,
-        stake_amount: u64,
-    }
-
-    // HotPotato to access the Bridge
-    public struct BridgeWrapper {
-        bridge: Bridge,
-    }
-
-    //
-    // Public functions
-    //
-
-    //
-    // Environment creation and destruction
-    //
-
-    public fun create_env(chain_id: u8, start_addr: address): BridgeEnv {
-        let mut scenario = test_scenario::begin(start_addr);
-        let ctx = scenario.ctx();
-        let btc_coins = coin::zero<BTC>(ctx);
-        let eth_coins = coin::zero<ETH>(ctx);
-        let usdc_coins = coin::zero<USDC>(ctx);
-        let usdt_coins = coin::zero<USDT>(ctx);
-        let test_coins = coin::zero<TEST_TOKEN>(ctx);
-        let vault = Vault {
-            btc_coins,
-            eth_coins,
-            usdc_coins,
-            usdt_coins,
-            test_coins,
-        };
-        BridgeEnv {
-            scenario,
-            chain_id,
-            seq_num: 0,
-            vault,
-        }
-    }
-
-    public fun destroy_env(env: BridgeEnv) {
-        let BridgeEnv {scenario, chain_id: _, seq_num: _, vault} = env;
-        destroy_valut(vault);
-        scenario.end();
-    }
-
-    public fun create_validator_info(validator: address, stake_amount: u64): ValidatorInfo {
-        ValidatorInfo {
-            validator,
-            stake_amount,
-        }
-    }
-
-    //
-    // Add a set of validators to the chain.
-    // Call only once in a test scenario.
-    public fun setup_validators(
-        env: &mut BridgeEnv,
-        validators_info: vector<ValidatorInfo>,
-        sender: address,
-    ) {
-        let scenario = &mut env.scenario;
-        scenario.next_tx(sender);
-        let ctx = scenario.ctx();
-        let mut validators = vector::empty();
-        let mut count = validators_info.length();
-        while (count > 0) {
-            count = count - 1;
-            validators.push_back(create_validator_for_testing(
-                validators_info[count].validator,
-                validators_info[count].stake_amount,
-                ctx,
-            ));
-        };
-        create_sui_system_state_for_testing(validators, 0, 0, ctx);
-        advance_epoch_with_reward_amounts(0, 0, scenario);
-    }
-
-    //
-    // Bridge creation and setup
-    //
-
-    // Set up an environment with 3 validators, a bridge with
-    // a treasury and a committee with all 3 validators.
-    // The treasury will contain 4 tokens: ETH, BTC, USDT, USDC.
-    // Save the Bridge as a shared object.
-    public fun create_bridge_default(env: &mut BridgeEnv) {
-        let validators = vector[
-            ValidatorInfo { validator: @0xA, stake_amount: 100 },
-            ValidatorInfo { validator: @0xB, stake_amount: 100 },
-            ValidatorInfo { validator: @0xC, stake_amount: 100 },
-        ];
-        let sender = @0x0;
-        env.setup_validators(validators, sender);
-        env.create_bridge(sender);
-        env.register_committee();
-        env.init_committee(sender);
-    }
-
-    // Create a bridge and set up a treasury.
-    // The treasury will contain 4 tokens: ETH, BTC, USDT, USDC.
-    // Save the Bridge as a shared object.
-    // No operation on the validators.
-    public fun create_bridge(env: &mut BridgeEnv, sender: address) {
-        env.scenario.next_tx(sender);
-        let ctx = env.scenario.ctx();
-        create_bridge_for_testing(object::new(ctx), env.chain_id, ctx);
-        env.setup_treasury(sender);
-    }
-
-    // Register 3 committee members (validators `@0xA`, `@0xB`, `@0xC`)
-    public fun register_committee(env: &mut BridgeEnv) {
-        let scenario = &mut env.scenario;
-        scenario.next_tx(@0x0);
-        let mut bridge = scenario.take_shared<Bridge>();
-        let mut system_state = test_scenario::take_shared<SuiSystemState>(scenario);
-
-        // register committee member `@0xA`
-        scenario.next_tx(@0xA);
-        bridge.committee_registration(
-            &mut system_state,
-            hex::decode(VALIDATOR1_PUBKEY),
-            b"",
-            scenario.ctx(),
-        );
-
-        // register committee member `@0xB`
-        scenario.next_tx(@0xB);
-        bridge.committee_registration(
-            &mut system_state,
-            hex::decode(VALIDATOR2_PUBKEY),
-            b"",
-            scenario.ctx(),
-        );
-
-        // register committee member `@0xC`
-        scenario.next_tx(@0xC);
-        bridge.committee_registration(
-            &mut system_state,
-            hex::decode(VALIDATOR3_PUBKEY),
-            b"",
-            scenario.ctx(),
-        );
-
-        test_scenario::return_shared(bridge);
-        test_scenario::return_shared(system_state);
-    }
-
-    // Init the bridge committee
-    public fun init_committee(env: &mut BridgeEnv, sender: address) {
-        let scenario = &mut env.scenario;
-        scenario.next_tx(sender);
-        let mut bridge = scenario.take_shared<Bridge>();
-        let mut system_state = test_scenario::take_shared<SuiSystemState>(scenario);
-        let voting_powers = validator_voting_powers_for_testing(&mut system_state);
-        bridge.test_init_bridge_committee(
-            voting_powers,
-            50,
-            scenario.ctx(),
-        );
-        test_scenario::return_shared(bridge);
-        test_scenario::return_shared(system_state);
-    }
-
-    // Set up a treasury with 4 tokens: ETH, BTC, USDT, USDC.
-    public fun setup_treasury(env: &mut BridgeEnv, sender: address) {
-        env.register_default_tokens(sender);
-        env.add_default_tokens(sender);
-        env.load_vault(sender);
-    }
-
-    // Register 4 tokens with the Bridge: ETH, BTC, USDT, USDC.
-    public fun register_default_tokens(env: &mut BridgeEnv, sender: address) {
-        env.scenario.next_tx(sender);
-        let mut bridge = env.scenario.take_shared<Bridge>();
-
-        // BTC
-        let (upgrade_cap, treasury_cap, metadata) =
-            btc::create_bridge_token(env.scenario.ctx());
-        bridge.register_foreign_token<BTC>(
-            treasury_cap,
-            upgrade_cap,
-            &metadata,
-        );
-        destroy(metadata);
-        // ETH
-        let (upgrade_cap, treasury_cap, metadata) =
-            eth::create_bridge_token(env.scenario.ctx());
-        bridge.register_foreign_token<ETH>(
-            treasury_cap,
-            upgrade_cap,
-            &metadata,
-        );
-        destroy(metadata);
-        // USDC
-        let (upgrade_cap, treasury_cap, metadata) =
-            usdc::create_bridge_token(env.scenario.ctx());
-        bridge.register_foreign_token<USDC>(
-            treasury_cap,
-            upgrade_cap,
-            &metadata,
-        );
-        destroy(metadata);
-        // USDT
-        let (upgrade_cap, treasury_cap, metadata) =
-            usdt::create_bridge_token(env.scenario.ctx());
-        bridge.register_foreign_token<USDT>(
-            treasury_cap,
-            upgrade_cap,
-            &metadata,
-        );
-        destroy(metadata);
-
-        test_scenario::return_shared(bridge);
-    }
-
-    // Add the 4 tokens previously registered: ETH, BTC, USDT, USDC.
-    public fun add_default_tokens(env: &mut BridgeEnv, sender: address) {
-        let scenario = &mut env.scenario;
-        scenario.next_tx(sender);
-        let mut bridge = scenario.take_shared<Bridge>();
-
-        let add_token_message = create_add_tokens_on_sui_message(
-            env.chain_id,
-            env.seq_num(),
-            false, // native_token
-            vector[BTC_ID, ETH_ID, USDC_ID, USDT_ID],
-            vector[
-                type_name::get<BTC>().into_string(),
-                type_name::get<ETH>().into_string(),
-                type_name::get<USDC>().into_string(),
-                type_name::get<USDT>().into_string(),
-            ],
-            vector[1000, 100, 1, 1],
-        );
-        let payload = add_token_message.extract_add_tokens_on_sui();
-        bridge.test_execute_add_tokens_on_sui(payload);
-
-        test_scenario::return_shared(bridge);
-    }
-
-    // Add the 4 tokens previously registered: ETH, BTC, USDT, USDC.
-    public fun add_tokens(
-        env: &mut BridgeEnv, 
-        sender: address,
-        native_token: bool,
-        token_ids: vector<u8>,
-        type_names: vector<String>,
-        token_prices: vector<u64>,
-    ) {
-        let scenario = &mut env.scenario;
-        scenario.next_tx(sender);
-        let mut bridge = scenario.take_shared<Bridge>();
-
-        let add_token_message = create_add_tokens_on_sui_message(
-            env.chain_id,
-            env.seq_num(),
-            native_token,
-            token_ids,
-            type_names,
-            token_prices,
-        );
-        let payload = add_token_message.extract_add_tokens_on_sui();
-        bridge.test_execute_add_tokens_on_sui(payload);
-
-        test_scenario::return_shared(bridge);
-    }
-
-    public fun update_asset_price(
-        env: &mut BridgeEnv, 
-        sender: address,
-        token_id: u8,
-        value:u64,
-    ) {
-        let scenario = &mut env.scenario;
-        scenario.next_tx(sender);
-        let mut bridge = scenario.take_shared<Bridge>();
-        let inner = bridge.test_load_inner_mut();
-
-        let msg = message::create_update_asset_price_message(
-            token_id,
-            env.chain_id,
-            env.seq_num(),
-            value,
-        );
-        let payload = msg.extract_update_asset_price();
-        inner.test_execute_update_asset_price(payload);
-
-        test_scenario::return_shared(bridge);
-    }
-
-    //
-    // Getters
-    //
-
-    public fun validator_pubkeys(): vector<vector<u8>> {
-        vector[
-            VALIDATOR1_PUBKEY,
-            VALIDATOR2_PUBKEY,
-            VALIDATOR3_PUBKEY,
-        ]
-    }
-
-    public fun ctx(env: &mut BridgeEnv): &mut TxContext {
-        env.scenario.ctx()
-    }
-
-    public fun scenario(env: &mut BridgeEnv): &mut Scenario {
-        &mut env.scenario
-    }
-
-    public fun bridge(env: &mut BridgeEnv, sender: address): BridgeWrapper {
-        let scenario = &mut env.scenario;
-        scenario.next_tx(sender);
-        let bridge = scenario.take_shared<Bridge>();
-        BridgeWrapper { bridge }
-    }
-
-    public fun bridge_ref(wrapper: &BridgeWrapper): &Bridge {
-        &wrapper.bridge
-    }
-
-    public fun return_bridge(bridge: BridgeWrapper) {
-        let BridgeWrapper { bridge } = bridge;
-        test_scenario::return_shared(bridge);
-    }
-
-    public fun get_btc(env: &mut BridgeEnv, amount: u64): Coin<BTC> {
-        let scenario = &mut env.scenario;
-        let ctx = scenario.ctx();
-        env.vault.btc_coins.split(amount, ctx)
-    }
-
-    public fun get_eth(env: &mut BridgeEnv, amount: u64): Coin<ETH> {
-        let scenario = &mut env.scenario;
-        let ctx = scenario.ctx();
-        env.vault.eth_coins.split(amount, ctx)
-    }
-
-    public fun get_usdc(env: &mut BridgeEnv, amount: u64): Coin<USDC> {
-        let scenario = &mut env.scenario;
-        let ctx = scenario.ctx();
-        env.vault.usdc_coins.split(amount, ctx)
-    }
-
-    public fun get_usdt(env: &mut BridgeEnv, amount: u64): Coin<USDT> {
-        let scenario = &mut env.scenario;
-        let ctx = scenario.ctx();
-        env.vault.usdt_coins.split(amount, ctx)
-    }
-
-    //
-    // Bridge commands
-    //
-
-    // Register new tokens
-    public fun register_foreign_token<T>(
-        env: &mut BridgeEnv,
-        treasury_cap: TreasuryCap<T>,
-        upgrade_cap: UpgradeCap,
-        metadata: CoinMetadata<T>,
-        sender: address,
-    ) {
-        let scenario = env.scenario();
-        scenario.next_tx(sender);
-        let mut bridge = scenario.take_shared<Bridge>();
-        bridge.register_foreign_token<T>(treasury_cap, upgrade_cap, &metadata);
-
-        // assert changes in bridge
-        let type_name = type_name::get<T>();
-        let inner = bridge.test_load_inner();
-        let treasury = inner.inner_treasury();
-        let waiting_room = treasury.waiting_room();
-        assert!(waiting_room.contains(type_name::into_string(type_name)));
-        let treasuries = treasury.treasuries();
-        assert!(treasuries.contains(type_name));
-
-        test_scenario::return_shared(bridge);
-        destroy(metadata);
-    }
-
-    // Freeze the bridge
-    public fun freeze_bridge(env: &mut BridgeEnv, sender: address, error: u64) {
-        let scenario = env.scenario();
-        scenario.next_tx(sender);
-        let mut bridge = scenario.take_shared<Bridge>();
-        let inner = bridge.test_load_inner_mut();
-        let msg = message::create_emergency_op_message(env.chain_id, 0, emergency_op_pause());
-        let payload = msg.extract_emergency_op_payload();
-        inner.test_execute_emergency_op(payload);
-        inner.assert_paused(error);
-        test_scenario::return_shared(bridge);
-    }
-
-    // Unfreeze the bridge
-    public fun unfreeze_bridge(env: &mut BridgeEnv, sender: address, error: u64) {
-        let scenario = env.scenario();
-        scenario.next_tx(sender);
-        let mut bridge = scenario.take_shared<Bridge>();
-        let inner = bridge.test_load_inner_mut();
-        let msg = message::create_emergency_op_message(env.chain_id, 1, emergency_op_unpause());
-        let payload = msg.extract_emergency_op_payload();
-        inner.test_execute_emergency_op(payload);
-        inner.assert_not_paused(error);
-        test_scenario::return_shared(bridge);
-    }
-
-    public fun send_token<T>(
-        env: &mut BridgeEnv,
-        target_chain_id: u8,
-        eth_address: vector<u8>,
-        coin: Coin<T>,
-    ) {
-        let scenario = env.scenario();
-        scenario.next_tx(@0xAAAA);
-        let mut bridge = scenario.take_shared<Bridge>();
-        let coin_value = coin.value();
-        let total_supply_before = get_total_supply<T>(&bridge);
-
-        bridge.send_token(target_chain_id, eth_address, coin, scenario.ctx());
-
-        assert!(total_supply_before - coin_value == get_total_supply<T>(&bridge));
-
-        let inner = bridge.test_load_inner();
-        let transfer_record = inner.inner_token_transfer_records();
-        let seq_num = inner.sequence_nums()[&message_types::token()] - 1; 
-        let key = message::create_key(env.chain_id, message_types::token(), seq_num);
-        assert!(transfer_record.contains(key));
-
-        test_scenario::return_shared(bridge);
-    }
-
-    public fun execute_blocklist(
-        env: &mut BridgeEnv,
-        sender: address,
-        chain_id: u8,
-        blocklist_type: u8,
-        validator_ecdsa_addresses: vector<vector<u8>>,
-        signatures: vector<vector<u8>>,
-    ) {
-        let scenario = env.scenario();
-        scenario.next_tx(sender);
-        let mut bridge = scenario.take_shared<Bridge>();
-        let blocklist = create_blocklist_message(
-            chain_id,
-            env.seq_num(),
-            blocklist_type,
-            validator_ecdsa_addresses,
-        );
-        bridge.execute_system_message(blocklist, signatures);
-        test_scenario::return_shared(bridge);
-    }
-
-    public fun update_bridge_limit(
-        env: &mut BridgeEnv,
-        sender: address,
-        receiving_chain: u8,
-        sending_chain: u8,
-        limit: u64,
-    ) {
-        let scenario = env.scenario();
-        scenario.next_tx(sender);
-        let mut bridge = scenario.take_shared<Bridge>();
-        let msg = message::create_update_bridge_limit_message(
-            receiving_chain,
-            env.seq_num(),
-            sending_chain,
-            limit,
-        );
-        let payload = msg.extract_update_bridge_limit();
-        bridge.test_load_inner_mut().test_execute_update_bridge_limit(payload);
-        test_scenario::return_shared(bridge);
-    }
-
-    //
-    // Internal functions
-    //
-
-    fun seq_num(env: &mut BridgeEnv): u64 {
-        let seq_num = env.seq_num;
-        env.seq_num = seq_num + 1;
-        seq_num
-    }
-
-    // Destroy the vault
-    fun destroy_valut(vault: Vault) {
-        let Vault {
-            btc_coins,
-            eth_coins,
-            usdc_coins,
-            usdt_coins,
-            test_coins,
-        } = vault;
-        btc_coins.burn_for_testing();
-        eth_coins.burn_for_testing();
-        usdc_coins.burn_for_testing();
-        usdt_coins.burn_for_testing();
-        test_coins.burn_for_testing();
-    }
-
-    // Load the vault with some coins
-    fun load_vault(env: &mut BridgeEnv, sender: address) {
-        let scenario = &mut env.scenario;
-        scenario.next_tx(sender);
-        let mut bridge = scenario.take_shared<Bridge>();
-        let vault = &mut env.vault;
-        vault.btc_coins.join(mint_some(&mut bridge, scenario.ctx()));
-        vault.eth_coins.join(mint_some(&mut bridge, scenario.ctx()));
-        vault.usdc_coins.join(mint_some(&mut bridge, scenario.ctx()));
-        vault.usdt_coins.join(mint_some(&mut bridge, scenario.ctx()));
-        test_scenario::return_shared(bridge);
-    }
-
-    // Mint some coins
-    fun mint_some<T>(bridge: &mut Bridge, ctx: &mut TxContext): Coin<T> {
-        let treasury = bridge.test_load_inner_mut().inner_treasury_mut();
-        let coin = treasury.mint<T>(1_000_000, ctx);
-        coin
-    }
-
-    fun get_total_supply<T>(bridge: &Bridge): u64 {
-        let inner = bridge.test_load_inner();
-        let treasury = inner.inner_treasury();
-        let treasuries = treasury.treasuries();
-        let tc: &TreasuryCap<T> = &treasuries[type_name::get<T>()];
-        tc.total_supply()
-    }
-}
-
-//
-// Test Coins
-//
-
-#[test_only]
-module bridge::test_token {
-    use std::{ascii, type_name};
-    use sui::address;
-    use sui::coin::{CoinMetadata, TreasuryCap, create_currency};
-    use sui::hex;
-    use sui::package::{UpgradeCap, test_publish};
-    use sui::test_utils::create_one_time_witness;
-
-
-    public struct TEST_TOKEN has drop {}
-
-    public fun create_bridge_token(
-        ctx: &mut TxContext,
-    ): (UpgradeCap, TreasuryCap<TEST_TOKEN>, CoinMetadata<TEST_TOKEN>) {
-        let otw = create_one_time_witness<TEST_TOKEN>();
-        let (treasury_cap, metadata) = create_currency(
-            otw,
-            8,
-            b"tst",
-            b"test",
-            b"bridge test token",
-            option::none(),
-            ctx,
-        );
-
-        let type_name = type_name::get<TEST_TOKEN>();
-        let address_bytes = hex::decode(ascii::into_bytes(type_name::get_address(&type_name)));
-        let coin_id = address::from_bytes(address_bytes).to_id();
-        let upgrade_cap = test_publish(coin_id, ctx);
-
-        (upgrade_cap, treasury_cap, metadata)
-    }
-}
-
-#[test_only]
-module bridge::btc {
-    use std::{ascii, type_name};
-    use sui::address;
-    use sui::coin::{CoinMetadata, TreasuryCap, create_currency};
-    use sui::hex;
-    use sui::package::{UpgradeCap, test_publish};
-    use sui::test_utils::create_one_time_witness;
-
-
-    public struct BTC has drop {}
-
-    public fun create_bridge_token(
-        ctx: &mut TxContext,
-    ): (UpgradeCap, TreasuryCap<BTC>, CoinMetadata<BTC>) {
-        let otw = create_one_time_witness<BTC>();
-        let (treasury_cap, metadata) = create_currency(
-            otw,
-            8,
-            b"btc",
-            b"bitcoin",
-            b"bridge bitcoin token",
-            option::none(),
-            ctx,
-        );
-
-        let type_name = type_name::get<BTC>();
-        let address_bytes = hex::decode(ascii::into_bytes(type_name::get_address(&type_name)));
-        let coin_id = address::from_bytes(address_bytes).to_id();
-        let upgrade_cap = test_publish(coin_id, ctx);
-
-        (upgrade_cap, treasury_cap, metadata)
-    }
-}
-
-#[test_only]
-module bridge::eth {
-    use std::{ascii, type_name};
-    use sui::address;
-    use sui::coin::{CoinMetadata, TreasuryCap, create_currency};
-    use sui::hex;
-    use sui::package::{UpgradeCap, test_publish};
-    use sui::test_utils::create_one_time_witness;
-
-
-    public struct ETH has drop {}
-
-    public fun create_bridge_token(
-        ctx: &mut TxContext,
-    ): (UpgradeCap, TreasuryCap<ETH>, CoinMetadata<ETH>) {
-        let otw = create_one_time_witness<ETH>();
-        let (treasury_cap, metadata) = create_currency(
-            otw,
-            8,
-            b"eth",
-            b"eth",
-            b"bridge ethereum token",
-            option::none(),
-            ctx,
-        );
-
-        let type_name = type_name::get<ETH>();
-        let address_bytes = hex::decode(ascii::into_bytes(type_name::get_address(&type_name)));
-        let coin_id = address::from_bytes(address_bytes).to_id();
-        let upgrade_cap = test_publish(coin_id, ctx);
-
-        (upgrade_cap, treasury_cap, metadata)
-    }
-}
-
-#[test_only]
-module bridge::usdc {
-    use std::{ascii, type_name};
-    use sui::address;
-    use sui::coin::{CoinMetadata, TreasuryCap, create_currency};
-    use sui::hex;
-    use sui::package::{UpgradeCap, test_publish};
-    use sui::test_utils::create_one_time_witness;
-
-
-    public struct USDC has drop {}
-
-    public fun create_bridge_token(
-        ctx: &mut TxContext,
-    ): (UpgradeCap, TreasuryCap<USDC>, CoinMetadata<USDC>) {
-        let otw = create_one_time_witness<USDC>();
-        let (treasury_cap, metadata) = create_currency(
-            otw,
-            6,
-            b"usdc",
-            b"usdc",
-            b"bridge usdc token",
-            option::none(),
-            ctx,
-        );
-
-        let type_name = type_name::get<USDC>();
-        let address_bytes = hex::decode(ascii::into_bytes(type_name::get_address(&type_name)));
-        let coin_id = address::from_bytes(address_bytes).to_id();
-        let upgrade_cap = test_publish(coin_id, ctx);
-
-        (upgrade_cap, treasury_cap, metadata)
-    }
-}
-
-#[test_only]
-module bridge::usdt {
-    use std::{ascii, type_name};
-    use sui::address;
-    use sui::coin::{CoinMetadata, TreasuryCap, create_currency};
-    use sui::hex;
-    use sui::package::{UpgradeCap, test_publish};
-    use sui::test_utils::create_one_time_witness;
-
-
-    public struct USDT has drop {}
-
-    public fun create_bridge_token(
-        ctx: &mut TxContext,
-    ): (UpgradeCap, TreasuryCap<USDT>, CoinMetadata<USDT>) {
-        let otw = create_one_time_witness<USDT>();
-        let (treasury_cap, metadata) = create_currency(
-            otw,
-            6,
-            b"usdt",
-            b"usdt",
-            b"bridge usdt token",
-            option::none(),
-            ctx,
-        );
-
-        let type_name = type_name::get<USDT>();
-        let address_bytes = hex::decode(ascii::into_bytes(type_name::get_address(&type_name)));
-        let coin_id = address::from_bytes(address_bytes).to_id();
-        let upgrade_cap = test_publish(coin_id, ctx);
-
-        (upgrade_cap, treasury_cap, metadata)
-    }
-}
diff --git a/crates/sui-framework/packages/bridge/tests/bridge_tests.move b/crates/sui-framework/packages/bridge/tests/bridge_tests.move
index 3c416c33fb24f..d26b5c919a9a2 100644
--- a/crates/sui-framework/packages/bridge/tests/bridge_tests.move
+++ b/crates/sui-framework/packages/bridge/tests/bridge_tests.move
@@ -2,652 +2,761 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #[test_only]
-module bridge::bridge_tests {
-    use bridge::bridge::{
-        inner_limiter, inner_paused, inner_treasury, inner_token_transfer_records_mut,
-        new_bridge_record_for_testing, new_for_testing, test_get_current_seq_num_and_increment,
-        test_execute_update_asset_price, test_get_token_transfer_action_signatures,
-        test_load_inner, test_load_inner_mut, test_get_token_transfer_action_status,
-        transfer_status_approved, transfer_status_claimed, transfer_status_not_found,
-        transfer_status_pending, Bridge,
-    };
-    use bridge::bridge_setup::{
-        btc_id, create_bridge, create_bridge_default, create_env, create_validator_info,
-        eth_id, freeze_bridge, init_committee, register_committee, unfreeze_bridge, test_token_id,
-    };
-    use bridge::btc::BTC;
-    use bridge::chain_ids;
-    use bridge::eth::ETH;
-    use bridge::message::{Self, to_parsed_token_transfer_message};
-    use bridge::message_types;
-    use bridge::test_token::{TEST_TOKEN, create_bridge_token as create_test_token};
-    use bridge::usdc::USDC;
-    use std::type_name;
-    use sui::address;
-    use sui::balance;
-    use sui::coin::{Self, Coin};
-    use sui::hex;
-    use sui::package::test_publish;
-    use sui::test_scenario::Self;
-    use sui::test_utils::destroy;
-
-    // common error start code for unexpected errors in tests (assertions).
-    // If more than one assert in a test needs to use an unexpected error code,
-    // use this as the starting error and add 1 to subsequent errors
-    const UNEXPECTED_ERROR: u64 = 10293847;
-    // use on tests that fail to save cleanup
-    const TEST_DONE: u64 = 74839201;
-
-    #[test]
-    fun test_bridge_create() {
-        let mut env = create_env(chain_ids::sui_testnet(), @0x0);
-        env.create_bridge(@0x0);
-
-        let bridge = env.bridge(@0x0);
-        let inner = bridge.bridge_ref().test_load_inner();
-        inner.assert_not_paused(UNEXPECTED_ERROR);
-        assert!(inner.inner_token_transfer_records().length() == 0);
-        bridge.return_bridge();
-
-        env.destroy_env();
-    }
-
-    #[test]
-    #[expected_failure(abort_code = bridge::bridge::ENotSystemAddress)]
-    fun test_bridge_create_non_system_addr() {
-        let mut env = create_env(chain_ids::sui_mainnet(), @0x1);
-        env.create_bridge(@0x1);
-
-        abort TEST_DONE
-    }
-
-    #[test]
-    fun test_init_committee() {
-        let mut env = create_env(chain_ids::sui_custom(), @0x0);
-        env.create_bridge_default();
-        env.destroy_env();
-    }
-
-    #[test]
-    fun test_init_committee_twice() {
-        let mut env = create_env(chain_ids::sui_testnet(), @0x0);
-        env.create_bridge_default();
-        env.init_committee(@0x0); // second time is a no-op
-
-        env.destroy_env();
-    }
-
-    #[test]
-    #[expected_failure(abort_code = bridge::bridge::ENotSystemAddress)]
-    fun test_init_committee_non_system_addr() {
-        let mut env = create_env(chain_ids::sui_mainnet(), @0x0);
-        // TODO: this is too brittle, fix it
-        env.setup_validators(
-            vector[
-                create_validator_info(@0xA, 100),
-                create_validator_info(@0xB, 100),
-                create_validator_info(@0xC, 100),
-            ],
-            @0x0,
-        );
-        env.create_bridge(@0x0);
-        env.register_committee();
-        env.init_committee(@0xA);
-
-        abort TEST_DONE
-    }
-
-    #[test]
-    #[expected_failure(abort_code = bridge::committee::ECommitteeAlreadyInitiated)]
-    fun test_register_committee_after_init() {
-        let mut env = create_env(chain_ids::sui_custom(), @0x0);
-        env.create_bridge_default();
-        env.register_committee();
-
-        abort TEST_DONE
-    }
-
-    #[test]
-    fun test_register_foreign_token() {
-        let addr = @0x0;
-        let mut env = create_env(chain_ids::sui_testnet(), addr);
-        env.create_bridge_default();
-        let (upgrade_cap, treasury_cap, metadata) = create_test_token(env.scenario().ctx());
-        env.register_foreign_token<TEST_TOKEN>(treasury_cap, upgrade_cap, metadata, addr);
-        env.destroy_env();
-    }
-
-    #[test]
-    #[expected_failure(abort_code = bridge::treasury::ETokenSupplyNonZero)]
-    fun test_register_foreign_token_non_zero_supply() {
-        let addr = @0x0;
-        let mut env = create_env(chain_ids::sui_testnet(), addr);
-        env.create_bridge_default();
-        let (upgrade_cap, mut treasury_cap, metadata) = create_test_token(env.scenario().ctx());
-        let _coin = treasury_cap.mint(1, env.scenario().ctx());
-        env.register_foreign_token<TEST_TOKEN>(treasury_cap, upgrade_cap, metadata, addr);
-
-        abort 0
-    }
-
-    #[test]
-    #[expected_failure(abort_code = bridge::treasury::EInvalidNotionalValue)]
-    fun test_add_token_price_zero_value() {
-        let addr = @0x0;
-        let mut env = create_env(chain_ids::sui_testnet(), addr);
-        env.create_bridge_default();
-        env.add_tokens(
-            addr,
-            false,
-            vector[test_token_id()],
-            vector[type_name::get<TEST_TOKEN>().into_string()],
-            vector[0],
-        );
+module bridge::bridge_tests;
+use bridge::bridge::{
+    inner_limiter,
+    inner_paused,
+    inner_treasury,
+    inner_token_transfer_records_mut,
+    new_bridge_record_for_testing,
+    new_for_testing,
+    test_get_current_seq_num_and_increment,
+    test_execute_update_asset_price,
+    test_get_token_transfer_action_signatures,
+    test_load_inner,
+    test_load_inner_mut,
+    test_get_token_transfer_action_status,
+    transfer_status_approved,
+    transfer_status_claimed,
+    transfer_status_not_found,
+    transfer_status_pending,
+    Bridge
+};
+use bridge::bridge_env::{
+    btc_id,
+    create_bridge,
+    create_bridge_default,
+    create_env,
+    create_validator,
+    eth_id,
+    freeze_bridge,
+    init_committee,
+    register_committee,
+    unfreeze_bridge,
+    test_token_id
+};
+use bridge::btc::BTC;
+use bridge::chain_ids;
+use bridge::eth::ETH;
+use bridge::message::{Self, to_parsed_token_transfer_message};
+use bridge::message_types;
+use bridge::test_token::{TEST_TOKEN, create_bridge_token as create_test_token};
+use bridge::usdc::USDC;
+use std::type_name;
+use sui::address;
+use sui::balance;
+use sui::coin::{Self, Coin};
+use sui::hex;
+use sui::package::test_publish;
+use sui::test_scenario;
+use sui::test_utils::destroy;
+
+// common error start code for unexpected errors in tests (assertions).
+// If more than one assert in a test needs to use an unexpected error code,
+// use this as the starting error and add 1 to subsequent errors
+const UNEXPECTED_ERROR: u64 = 10293847;
+// use on tests that fail to save cleanup
+const TEST_DONE: u64 = 74839201;
+
+#[test]
+fun test_bridge_create() {
+    let mut env = create_env(chain_ids::sui_testnet());
+    env.create_bridge(@0x0);
+
+    let bridge = env.bridge(@0x0);
+    let inner = bridge.bridge_ref().test_load_inner();
+    inner.assert_not_paused(UNEXPECTED_ERROR);
+    assert!(inner.inner_token_transfer_records().length() == 0);
+    bridge.return_bridge();
+
+    env.destroy_env();
+}
 
-        abort 0
-    }
-
-    #[test]
-    #[expected_failure(abort_code = bridge::bridge::EMalformedMessageError)]
-    fun test_add_token_malformed_1() {
-        let addr = @0x0;
-        let mut env = create_env(chain_ids::sui_testnet(), addr);
-        env.create_bridge_default();
-        env.add_tokens(
-            addr,
-            false,
-            vector[test_token_id(), eth_id()],
-            vector[type_name::get<TEST_TOKEN>().into_string()],
-            vector[10],
-        );
+#[test]
+#[expected_failure(abort_code = bridge::bridge::ENotSystemAddress)]
+fun test_bridge_create_non_system_addr() {
+    let mut env = create_env(chain_ids::sui_mainnet());
+    env.create_bridge(@0x1);
 
-        abort 0
-    }
-
-    #[test]
-    #[expected_failure(abort_code = bridge::bridge::EMalformedMessageError)]
-    fun test_add_token_malformed_2() {
-        let addr = @0x0;
-        let mut env = create_env(chain_ids::sui_testnet(), addr);
-        env.create_bridge_default();
-        env.add_tokens(
-            addr,
-            false,
-            vector[test_token_id()],
-            vector[type_name::get<TEST_TOKEN>().into_string(), type_name::get<BTC>().into_string()],
-            vector[10],
-        );
+    abort TEST_DONE
+}
 
-        abort 0
-    }
-
-    #[test]
-    #[expected_failure(abort_code = bridge::bridge::EMalformedMessageError)]
-    fun test_add_token_malformed_3() {
-        let addr = @0x0;
-        let mut env = create_env(chain_ids::sui_testnet(), addr);
-        env.create_bridge_default();
-        env.add_tokens(
-            addr,
-            false,
-            vector[test_token_id()],
-            vector[type_name::get<TEST_TOKEN>().into_string()],
-            vector[10, 20],
-        );
+#[test]
+fun test_create_bridge_default() {
+    let mut env = create_env(chain_ids::sui_custom());
+    env.create_bridge_default();
+    env.destroy_env();
+}
 
-        abort 0
-    }
-
-    #[test]
-    fun test_add_native_token_nop() {
-        // adding a native token is simply a NO-OP at the moment
-        let addr = @0x0;
-        let mut env = create_env(chain_ids::sui_testnet(), addr);
-        env.create_bridge_default();
-        env.add_tokens(
-            addr,
-            true,
-            vector[test_token_id()],
-            vector[type_name::get<TEST_TOKEN>().into_string()],
-            vector[100],
-        );
-        env.destroy_env();
-    }
-
-    #[test]
-    #[expected_failure(abort_code = bridge::treasury::EInvalidUpgradeCap)]
-    fun test_register_foreign_token_bad_upgrade_cap() {
-        let addr = @0x0;
-        let mut env = create_env(chain_ids::sui_testnet(), addr);
-        env.create_bridge_default();
-        let (_upgrade_cap, treasury_cap, metadata) = create_test_token(env.scenario().ctx());
-        let upgrade_cap = test_publish(@0x42.to_id(), env.scenario().ctx());
-        env.register_foreign_token<TEST_TOKEN>(treasury_cap, upgrade_cap, metadata, addr);
-
-        abort 0
-    }
-
-    #[test]
-    fun test_execute_send_token() {
-        let mut env = create_env(chain_ids::sui_testnet(), @0x0);
-        env.create_bridge_default();
-        let btc: Coin<BTC> = env.get_btc(1);
-        let eth_address = x"0000000000000000000000000000000000000000";
-        env.send_token(chain_ids::eth_sepolia(), eth_address, btc);
-        env.destroy_env();
-    }
-
-    #[test]
-    #[expected_failure(abort_code = bridge::bridge::ETokenValueIsZero)]
-    fun test_execute_send_token_zero_value() {
-        let mut env = create_env(chain_ids::sui_testnet(), @0x0);
-        env.create_bridge_default();
-        let btc: Coin<BTC> = env.get_btc(0);
-        let eth_address = x"0000000000000000000000000000000000000000";
-        env.send_token(chain_ids::eth_sepolia(), eth_address, btc);
-
-        abort TEST_DONE
-    }
-
-    #[test]
-    #[expected_failure(abort_code = bridge::bridge::EInvalidEvmAddress)]
-    fun test_execute_send_token_invalid_evem_address() {
-        let mut env = create_env(chain_ids::sui_testnet(), @0x0);
-        env.create_bridge_default();
-        let btc: Coin<BTC> = env.get_btc(1);
-        let eth_address = x"1234";
-        env.send_token(chain_ids::eth_sepolia(), eth_address, btc);
-
-        abort TEST_DONE
-    }
-
-    #[test]
-    #[expected_failure(abort_code = bridge::bridge::EBridgeUnavailable)]
-    fun test_execute_send_token_frozen() {
-        let chain_id = chain_ids::sui_testnet();
-        let mut env = create_env(chain_id, @0x0);
-        env.create_bridge_default();
-        let eth: Coin<ETH> = env.get_eth(1);
-        let eth_address = x"0000000000000000000000000000000000000000";
-        env.freeze_bridge(@0x0, UNEXPECTED_ERROR);
-        env.send_token(chain_ids::eth_sepolia(), eth_address, eth);
-
-        abort TEST_DONE
-    }
-
-    #[test]
-    #[expected_failure(abort_code = bridge::bridge::EInvalidBridgeRoute)]
-    fun test_execute_send_token_invalid_route() {
-        let mut env = create_env(chain_ids::sui_testnet(), @0x0);
-        env.create_bridge_default();
-        let usdc: Coin<USDC> = env.get_usdc(100);
-        let eth_address = x"0000000000000000000000000000000000000000";
-        env.send_token(chain_ids::eth_mainnet(), eth_address, usdc);
-
-        abort TEST_DONE
-    }
-
-    #[test]
-    #[expected_failure(abort_code = bridge::bridge::EUnexpectedChainID)]
-    fun test_system_msg_incorrect_chain_id() {
-        let sender = @0x0;
-        let mut env = create_env(chain_ids::sui_testnet(), sender);
-        env.create_bridge_default();
-        env.execute_blocklist(sender, chain_ids::sui_mainnet(), 0, vector[], vector[]);
-
-        abort TEST_DONE
-    }
-
-    #[test]
-    fun test_get_seq_num_and_increment() {
-        let mut scenario = test_scenario::begin(@0x0);
-        let ctx = scenario.ctx();
-        let chain_id = chain_ids::sui_testnet();
-        let mut bridge = new_for_testing(chain_id, ctx);
-
-        let inner = bridge.test_load_inner_mut();
-        assert!(
-            inner.test_get_current_seq_num_and_increment(
-                message_types::committee_blocklist(),
-            ) == 0,
-        );
-        assert!(
-            inner.sequence_nums()[&message_types::committee_blocklist()] == 1,
-        );
-        assert!(
-            inner.test_get_current_seq_num_and_increment(
-                message_types::committee_blocklist(),
-            ) == 1,
-        );
-        // other message type nonce does not change
-        assert!(
-            !inner.sequence_nums().contains(&message_types::token()),
-        );
-        assert!(
-            !inner.sequence_nums().contains(&message_types::emergency_op()),
-        );
-        assert!(
-            !inner.sequence_nums().contains(&message_types::update_bridge_limit()),
-        );
-        assert!(
-            !inner.sequence_nums().contains(&message_types::update_asset_price()),
-        );
-        assert!(
-            inner.test_get_current_seq_num_and_increment(message_types::token()) == 0,
-        );
-        assert!(
-            inner.test_get_current_seq_num_and_increment(
-                message_types::emergency_op(),
-            ) == 0,
-        );
-        assert!(
-            inner.test_get_current_seq_num_and_increment(
-                message_types::update_bridge_limit(),
-            ) == 0,
-        );
-        assert!(
-            inner.test_get_current_seq_num_and_increment(
-                message_types::update_asset_price(),
-            ) == 0,
-        );
+#[test]
+fun test_init_committee_twice() {
+    let mut env = create_env(chain_ids::sui_testnet());
+    env.create_bridge_default();
+    env.init_committee(@0x0); // second time is a no-op
+
+    env.destroy_env();
+}
+
+#[test]
+#[expected_failure(abort_code = bridge::bridge::ENotSystemAddress)]
+fun test_init_committee_non_system_addr() {
+    let mut env = create_env(chain_ids::sui_mainnet());
+    env.setup_validators(vector[
+        create_validator(@0xA, 100, &b"12345678901234567890123456789012"),
+    ]);
+    env.create_bridge(@0x0);
+    env.register_committee();
+    env.init_committee(@0xA);
+
+    abort TEST_DONE
+}
+
+#[test]
+#[expected_failure(abort_code = bridge::committee::ECommitteeAlreadyInitiated)]
+fun test_register_committee_after_init() {
+    let mut env = create_env(chain_ids::sui_custom());
+    env.create_bridge_default();
+    env.register_committee();
+
+    abort TEST_DONE
+}
+
+#[test]
+fun test_register_foreign_token() {
+    let addr = @0x0;
+    let mut env = create_env(chain_ids::sui_testnet());
+    env.create_bridge_default();
+    let (upgrade_cap, treasury_cap, metadata) = create_test_token(env
+        .scenario()
+        .ctx());
+    env.register_foreign_token<TEST_TOKEN>(
+        treasury_cap,
+        upgrade_cap,
+        metadata,
+        addr,
+    );
+    env.destroy_env();
+}
+
+#[test]
+#[expected_failure(abort_code = bridge::treasury::ETokenSupplyNonZero)]
+fun test_register_foreign_token_non_zero_supply() {
+    let addr = @0x0;
+    let mut env = create_env(chain_ids::sui_testnet());
+    env.create_bridge_default();
+    let (upgrade_cap, mut treasury_cap, metadata) = create_test_token(env
+        .scenario()
+        .ctx());
+    let _coin = treasury_cap.mint(1, env.scenario().ctx());
+    env.register_foreign_token<TEST_TOKEN>(
+        treasury_cap,
+        upgrade_cap,
+        metadata,
+        addr,
+    );
+
+    abort 0
+}
+
+#[test]
+#[expected_failure(abort_code = bridge::treasury::EInvalidNotionalValue)]
+fun test_add_token_price_zero_value() {
+    let addr = @0x0;
+    let mut env = create_env(chain_ids::sui_testnet());
+    env.create_bridge_default();
+    env.add_tokens(
+        addr,
+        false,
+        vector[test_token_id()],
+        vector[type_name::get<TEST_TOKEN>().into_string()],
+        vector[0],
+    );
+
+    abort 0
+}
+
+#[test]
+#[expected_failure(abort_code = bridge::bridge::EMalformedMessageError)]
+fun test_add_token_malformed_1() {
+    let addr = @0x0;
+    let mut env = create_env(chain_ids::sui_testnet());
+    env.create_bridge_default();
+    env.add_tokens(
+        addr,
+        false,
+        vector[test_token_id(), eth_id()],
+        vector[type_name::get<TEST_TOKEN>().into_string()],
+        vector[10],
+    );
+
+    abort 0
+}
+
+#[test]
+#[expected_failure(abort_code = bridge::bridge::EMalformedMessageError)]
+fun test_add_token_malformed_2() {
+    let addr = @0x0;
+    let mut env = create_env(chain_ids::sui_testnet());
+    env.create_bridge_default();
+    env.add_tokens(
+        addr,
+        false,
+        vector[test_token_id()],
+        vector[
+            type_name::get<TEST_TOKEN>().into_string(),
+            type_name::get<BTC>().into_string(),
+        ],
+        vector[10],
+    );
+
+    abort 0
+}
+
+#[test]
+#[expected_failure(abort_code = bridge::bridge::EMalformedMessageError)]
+fun test_add_token_malformed_3() {
+    let addr = @0x0;
+    let mut env = create_env(chain_ids::sui_testnet());
+    env.create_bridge_default();
+    env.add_tokens(
+        addr,
+        false,
+        vector[test_token_id()],
+        vector[type_name::get<TEST_TOKEN>().into_string()],
+        vector[10, 20],
+    );
+
+    abort 0
+}
+
+#[test]
+fun test_add_native_token_nop() {
+    // adding a native token is simply a NO-OP at the moment
+    let addr = @0x0;
+    let mut env = create_env(chain_ids::sui_testnet());
+    env.create_bridge_default();
+    env.add_tokens(
+        addr,
+        true,
+        vector[test_token_id()],
+        vector[type_name::get<TEST_TOKEN>().into_string()],
+        vector[100],
+    );
+    env.destroy_env();
+}
+
+#[test]
+#[expected_failure(abort_code = bridge::treasury::EInvalidUpgradeCap)]
+fun test_register_foreign_token_bad_upgrade_cap() {
+    let addr = @0x0;
+    let mut env = create_env(chain_ids::sui_testnet());
+    env.create_bridge_default();
+    let (_upgrade_cap, treasury_cap, metadata) = create_test_token(env
+        .scenario()
+        .ctx());
+    let upgrade_cap = test_publish(@0x42.to_id(), env.scenario().ctx());
+    env.register_foreign_token<TEST_TOKEN>(
+        treasury_cap,
+        upgrade_cap,
+        metadata,
+        addr,
+    );
+
+    abort 0
+}
+
+#[test]
+fun test_execute_send_token() {
+    let mut env = create_env(chain_ids::sui_testnet());
+    env.create_bridge_default();
+    let btc: Coin<BTC> = env.get_btc(1);
+    let eth_address = x"0000000000000000000000000000000000000000";
+    env.send_token(@0xABCD, chain_ids::eth_sepolia(), eth_address, btc);
+    env.destroy_env();
+}
+
+#[test]
+#[expected_failure(abort_code = bridge::bridge::ETokenValueIsZero)]
+fun test_execute_send_token_zero_value() {
+    let mut env = create_env(chain_ids::sui_testnet());
+    env.create_bridge_default();
+    let btc: Coin<BTC> = env.get_btc(0);
+    let eth_address = x"0000000000000000000000000000000000000000";
+    env.send_token(@0x0, chain_ids::eth_sepolia(), eth_address, btc);
+
+    abort TEST_DONE
+}
+
+#[test]
+#[expected_failure(abort_code = bridge::bridge::EInvalidEvmAddress)]
+fun test_execute_send_token_invalid_evem_address() {
+    let mut env = create_env(chain_ids::sui_testnet());
+    env.create_bridge_default();
+    let btc: Coin<BTC> = env.get_btc(1);
+    let eth_address = x"1234";
+    let val_addr = env.validators()[0].addr();
+    env.send_token(val_addr, chain_ids::eth_sepolia(), eth_address, btc);
+
+    abort TEST_DONE
+}
+
+#[test]
+#[expected_failure(abort_code = bridge::bridge::EBridgeUnavailable)]
+fun test_execute_send_token_frozen() {
+    let chain_id = chain_ids::sui_testnet();
+    let mut env = create_env(chain_id);
+    env.create_bridge_default();
+    let eth: Coin<ETH> = env.get_eth(1);
+    let eth_address = x"0000000000000000000000000000000000000000";
+    env.freeze_bridge(@0x0, UNEXPECTED_ERROR);
+    env.send_token(@0xAAAA, chain_ids::eth_sepolia(), eth_address, eth);
+
+    abort TEST_DONE
+}
 
-        destroy(bridge);
-        scenario.end();
-    }
-
-    #[test]
-    fun test_update_limit() {
-        let chain_id = chain_ids::sui_mainnet();
-        let mut env = create_env(chain_id, @0x0);
-        env.create_bridge_default();
-
-        let bridge = env.bridge(@0x0);
-        let inner = bridge.bridge_ref().test_load_inner();
-        // Assert the starting limit is a different value
-        assert!(
-            inner.inner_limiter().get_route_limit(
+#[test]
+#[expected_failure(abort_code = bridge::bridge::EInvalidBridgeRoute)]
+fun test_execute_send_token_invalid_route() {
+    let mut env = create_env(chain_ids::sui_testnet());
+    env.create_bridge_default();
+    let usdc: Coin<USDC> = env.get_usdc(100);
+    let eth_address = x"0000000000000000000000000000000000000000";
+    env.send_token(@0xABCDEF, chain_ids::eth_mainnet(), eth_address, usdc);
+
+    abort TEST_DONE
+}
+
+#[test]
+#[expected_failure(abort_code = bridge::bridge::EUnexpectedChainID)]
+fun test_system_msg_incorrect_chain_id() {
+    let sender = @0x0;
+    let mut env = create_env(chain_ids::sui_testnet());
+    env.create_bridge_default();
+    env.execute_blocklist(sender, chain_ids::sui_mainnet(), 0, vector[]);
+
+    abort TEST_DONE
+}
+
+#[test]
+fun test_get_seq_num_and_increment() {
+    let mut scenario = test_scenario::begin(@0x0);
+    let ctx = scenario.ctx();
+    let chain_id = chain_ids::sui_testnet();
+    let mut bridge = new_for_testing(chain_id, ctx);
+
+    let inner = bridge.test_load_inner_mut();
+    assert!(
+        inner.test_get_current_seq_num_and_increment(
+            message_types::committee_blocklist(),
+        ) ==
+        0,
+    );
+    assert!(
+        inner.sequence_nums()[&message_types::committee_blocklist()] == 1,
+    );
+    assert!(
+        inner.test_get_current_seq_num_and_increment(
+            message_types::committee_blocklist(),
+        ) ==
+        1,
+    );
+    // other message type nonce does not change
+    assert!(
+        !inner.sequence_nums().contains(&message_types::token()),
+    );
+    assert!(
+        !inner.sequence_nums().contains(&message_types::emergency_op()),
+    );
+    assert!(
+        !inner.sequence_nums().contains(&message_types::update_bridge_limit()),
+    );
+    assert!(
+        !inner.sequence_nums().contains(&message_types::update_asset_price()),
+    );
+    assert!(
+        inner.test_get_current_seq_num_and_increment(message_types::token()) ==
+        0,
+    );
+    assert!(
+        inner.test_get_current_seq_num_and_increment(
+            message_types::emergency_op(),
+        ) ==
+        0,
+    );
+    assert!(
+        inner.test_get_current_seq_num_and_increment(
+            message_types::update_bridge_limit(),
+        ) ==
+        0,
+    );
+    assert!(
+        inner.test_get_current_seq_num_and_increment(
+            message_types::update_asset_price(),
+        ) ==
+        0,
+    );
+
+    destroy(bridge);
+    scenario.end();
+}
+
+#[test]
+fun test_update_limit() {
+    let chain_id = chain_ids::sui_mainnet();
+    let mut env = create_env(chain_id);
+    env.create_bridge_default();
+
+    let bridge = env.bridge(@0x0);
+    let inner = bridge.bridge_ref().test_load_inner();
+    // Assert the starting limit is a different value
+    assert!(
+        inner
+            .inner_limiter()
+            .get_route_limit(
                 &chain_ids::get_route(
                     chain_ids::eth_mainnet(),
                     chain_ids::sui_mainnet(),
                 ),
-            ) != 1,
-        );
-        bridge.return_bridge();
-
-        // update limit
-        env.update_bridge_limit(
-            @0x0,
-            chain_ids::sui_mainnet(),
-            chain_ids::eth_mainnet(),
-            1,
-        );
-
-        let bridge = env.bridge(@0x0);
-        let inner = bridge.bridge_ref().test_load_inner();
-        // Assert the starting limit is a different value
-        assert!(
-            inner.inner_limiter().get_route_limit(
+            ) !=
+        1,
+    );
+    bridge.return_bridge();
+
+    // update limit
+    env.update_bridge_limit(
+        @0x0,
+        chain_ids::sui_mainnet(),
+        chain_ids::eth_mainnet(),
+        1,
+    );
+
+    let bridge = env.bridge(@0x0);
+    let inner = bridge.bridge_ref().test_load_inner();
+    // Assert the starting limit is a different value
+    assert!(
+        inner
+            .inner_limiter()
+            .get_route_limit(
                 &chain_ids::get_route(
                     chain_ids::eth_mainnet(),
                     chain_ids::sui_mainnet(),
                 ),
-            ) == 1,
-        );
-        // other routes are not impacted
-        assert!(
-            inner.inner_limiter().get_route_limit(
+            ) ==
+        1,
+    );
+    // other routes are not impacted
+    assert!(
+        inner
+            .inner_limiter()
+            .get_route_limit(
                 &chain_ids::get_route(
                     chain_ids::eth_sepolia(),
                     chain_ids::sui_testnet(),
                 ),
-            ) != 1,
-        );
-        bridge.return_bridge();
-
-        env.destroy_env();
-    }
-
-    #[test]
-    #[expected_failure(abort_code = bridge::bridge::EUnexpectedChainID)]
-    fun test_execute_update_bridge_limit_abort_with_unexpected_chain_id() {
-        let mut env = create_env(chain_ids::sui_testnet(), @0x0);
-        env.create_bridge_default();
-
-        // This abort because the receiving_chain (sui_mainnet) is not the same as
-        // the bridge's chain_id (sui_devnet)
-        env.update_bridge_limit(
-            @0x0,
-            chain_ids::sui_mainnet(),
-            chain_ids::eth_mainnet(),
-            1,
-        );
+            ) !=
+        1,
+    );
+    bridge.return_bridge();
 
-        abort TEST_DONE
-    }
-
-    #[test]
-    fun test_update_asset_price() {
-        let mut env = create_env(chain_ids::sui_testnet(), @0x0);
-        env.create_bridge_default();
-        let scenario = env.scenario();
-        scenario.next_tx(@0x0);
-        let mut bridge = scenario.take_shared<Bridge>();
-        let inner = bridge.test_load_inner_mut();
-
-        // Assert the starting limit is a different value
-        assert!(
-            inner.inner_treasury().notional_value<BTC>() != 1_001_000_000,
-        );
-        // now change it to 100_001_000
-        let msg = message::create_update_asset_price_message(
-            inner.inner_treasury().token_id<BTC>(),
-            chain_ids::sui_mainnet(),
-            0,
-            1_001_000_000,
-        );
-        let payload = msg.extract_update_asset_price();
-        inner.test_execute_update_asset_price(payload);
-
-        // should be 1_001_000_000 now
-        assert!(inner.inner_treasury().notional_value<BTC>() == 1_001_000_000);
-        // other assets are not impacted
-        assert!(inner.inner_treasury().notional_value<ETH>() != 1_001_000_000);
-
-        destroy(bridge);
-        env.destroy_env();
-    }
-
-    #[test]
-    #[expected_failure(abort_code = bridge::treasury::EInvalidNotionalValue)]
-    fun test_invalid_price_update() {
-        let mut env = create_env(chain_ids::sui_testnet(), @0x0);
-        env.create_bridge_default();
-        env.update_asset_price(@0x0, btc_id(), 0);
-
-        abort 0
-    }
-
-    #[test]
-    #[expected_failure(abort_code = bridge::treasury::EUnsupportedTokenType)]
-    fun test_unsupported_token_type() {
-        let mut env = create_env(chain_ids::sui_testnet(), @0x0);
-        env.create_bridge_default();
-        env.update_asset_price(@0x0, 42, 100);
-
-        abort 0
-    }
-
-    #[test]
-    fun test_execute_freeze_unfreeze() {
-        let chain_id = chain_ids::sui_testnet();
-        let mut env = create_env(chain_id, @0x0);
-        env.create_bridge_default();
-        env.freeze_bridge(@0x0, UNEXPECTED_ERROR + 1);
-        let bridge = env.bridge(@0x0);
-        assert!(bridge.bridge_ref().test_load_inner().inner_paused());
-        bridge.return_bridge();
-        env.unfreeze_bridge(@0x0, UNEXPECTED_ERROR + 2);
-        let bridge = env.bridge(@0x0);
-        assert!(!bridge.bridge_ref().test_load_inner().inner_paused());
-        bridge.return_bridge();
-        env.destroy_env();
-    }
-
-    #[test]
-    #[expected_failure(abort_code = bridge::bridge::EBridgeNotPaused)]
-    fun test_execute_unfreeze_err() {
-        let chain_id = chain_ids::sui_testnet();
-        let mut env = create_env(chain_id, @0x0);
-        env.create_bridge_default();
-        let bridge = env.bridge(@0x0);
-        assert!(!bridge.bridge_ref().test_load_inner().inner_paused());
-        bridge.return_bridge();
-        env.unfreeze_bridge(@0x0, UNEXPECTED_ERROR + 2);
-
-        abort TEST_DONE
-    }
-
-    #[test]
-    #[expected_failure(abort_code = bridge::bridge::EBridgeAlreadyPaused)]
-    fun test_execute_emergency_op_abort_when_already_frozen() {
-        let chain_id = chain_ids::sui_testnet();
-        let mut env = create_env(chain_id, @0x0);
-        env.create_bridge_default();
-
-        // initially it's unfrozen
-        let bridge = env.bridge(@0x0);
-        assert!(!bridge.bridge_ref().test_load_inner().inner_paused());
-        bridge.return_bridge();
-        // freeze it
-        env.freeze_bridge(@0x0, UNEXPECTED_ERROR);
-        let bridge = env.bridge(@0x0);
-        assert!(bridge.bridge_ref().test_load_inner().inner_paused());
-        bridge.return_bridge();
-        // freeze it again, should abort
-        env.freeze_bridge(@0x0, UNEXPECTED_ERROR);
-
-        abort TEST_DONE
-    }
-
-    #[test]
-    fun test_get_token_transfer_action_data() {
-        let mut scenario = test_scenario::begin(@0x0);
-        let ctx = scenario.ctx();
-        let chain_id = chain_ids::sui_testnet();
-        let mut bridge = new_for_testing(chain_id, ctx);
-        let coin = coin::mint_for_testing<ETH>(12345, ctx);
-
-        // Test when pending
-        let message = message::create_token_bridge_message(
-            chain_ids::sui_testnet(), // source chain
-            10, // seq_num
-            address::to_bytes(ctx.sender()), // sender address
-            chain_ids::eth_sepolia(), // target_chain
-            hex::decode(b"00000000000000000000000000000000000000c8"), // target_address
-            1u8, // token_type
-            coin.balance().value(),
-        );
+    env.destroy_env();
+}
+
+#[test]
+#[expected_failure(abort_code = bridge::bridge::EUnexpectedChainID)]
+fun test_execute_update_bridge_limit_abort_with_unexpected_chain_id() {
+    let mut env = create_env(chain_ids::sui_testnet());
+    env.create_bridge_default();
+
+    // This abort because the receiving_chain (sui_mainnet) is not the same as
+    // the bridge's chain_id (sui_devnet)
+    env.update_bridge_limit(
+        @0x0,
+        chain_ids::sui_mainnet(),
+        chain_ids::eth_mainnet(),
+        1,
+    );
+
+    abort TEST_DONE
+}
+
+#[test]
+fun test_update_asset_price() {
+    let mut env = create_env(chain_ids::sui_testnet());
+    env.create_bridge_default();
+    let scenario = env.scenario();
+    scenario.next_tx(@0x0);
+    let mut bridge = scenario.take_shared<Bridge>();
+    let inner = bridge.test_load_inner_mut();
+
+    // Assert the starting limit is a different value
+    assert!(
+        inner.inner_treasury().notional_value<BTC>() != 1_001_000_000,
+    );
+    // now change it to 100_001_000
+    let msg = message::create_update_asset_price_message(
+        inner.inner_treasury().token_id<BTC>(),
+        chain_ids::sui_mainnet(),
+        0,
+        1_001_000_000,
+    );
+    let payload = msg.extract_update_asset_price();
+    inner.test_execute_update_asset_price(payload);
+
+    // should be 1_001_000_000 now
+    assert!(inner.inner_treasury().notional_value<BTC>() == 1_001_000_000);
+    // other assets are not impacted
+    assert!(inner.inner_treasury().notional_value<ETH>() != 1_001_000_000);
+
+    destroy(bridge);
+    env.destroy_env();
+}
+
+#[test]
+#[expected_failure(abort_code = bridge::treasury::EInvalidNotionalValue)]
+fun test_invalid_price_update() {
+    let mut env = create_env(chain_ids::sui_testnet());
+    env.create_bridge_default();
+    env.update_asset_price(@0x0, btc_id(), 0);
+
+    abort 0
+}
+
+#[test]
+#[expected_failure(abort_code = bridge::treasury::EUnsupportedTokenType)]
+fun test_unsupported_token_type() {
+    let mut env = create_env(chain_ids::sui_testnet());
+    env.create_bridge_default();
+    env.update_asset_price(@0x0, 42, 100);
 
-        let key = message.key();
-        bridge.test_load_inner_mut().inner_token_transfer_records_mut().push_back(
+    abort 0
+}
+
+#[test]
+fun test_execute_freeze_unfreeze() {
+    let chain_id = chain_ids::sui_testnet();
+    let mut env = create_env(chain_id);
+    env.create_bridge_default();
+    env.freeze_bridge(@0x0, UNEXPECTED_ERROR + 1);
+    let bridge = env.bridge(@0x0);
+    assert!(bridge.bridge_ref().test_load_inner().inner_paused());
+    bridge.return_bridge();
+    env.unfreeze_bridge(@0x0, UNEXPECTED_ERROR + 2);
+    let bridge = env.bridge(@0x0);
+    assert!(!bridge.bridge_ref().test_load_inner().inner_paused());
+    bridge.return_bridge();
+    env.destroy_env();
+}
+
+#[test]
+#[expected_failure(abort_code = bridge::bridge::EBridgeNotPaused)]
+fun test_execute_unfreeze_err() {
+    let chain_id = chain_ids::sui_testnet();
+    let mut env = create_env(chain_id);
+    env.create_bridge_default();
+    let bridge = env.bridge(@0x0);
+    assert!(!bridge.bridge_ref().test_load_inner().inner_paused());
+    bridge.return_bridge();
+    env.unfreeze_bridge(@0x0, UNEXPECTED_ERROR + 2);
+
+    abort TEST_DONE
+}
+
+#[test]
+#[expected_failure(abort_code = bridge::bridge::EBridgeAlreadyPaused)]
+fun test_execute_emergency_op_abort_when_already_frozen() {
+    let chain_id = chain_ids::sui_testnet();
+    let mut env = create_env(chain_id);
+    env.create_bridge_default();
+
+    // initially it's unfrozen
+    let bridge = env.bridge(@0x0);
+    assert!(!bridge.bridge_ref().test_load_inner().inner_paused());
+    bridge.return_bridge();
+    // freeze it
+    env.freeze_bridge(@0x0, UNEXPECTED_ERROR);
+    let bridge = env.bridge(@0x0);
+    assert!(bridge.bridge_ref().test_load_inner().inner_paused());
+    bridge.return_bridge();
+    // freeze it again, should abort
+    env.freeze_bridge(@0x0, UNEXPECTED_ERROR);
+
+    abort TEST_DONE
+}
+
+#[test]
+fun test_get_token_transfer_action_data() {
+    let mut scenario = test_scenario::begin(@0x0);
+    let ctx = scenario.ctx();
+    let chain_id = chain_ids::sui_testnet();
+    let mut bridge = new_for_testing(chain_id, ctx);
+    let coin = coin::mint_for_testing<ETH>(12345, ctx);
+
+    // Test when pending
+    let message = message::create_token_bridge_message(
+        chain_ids::sui_testnet(), // source chain
+        10, // seq_num
+        address::to_bytes(ctx.sender()), // sender address
+        chain_ids::eth_sepolia(), // target_chain
+        hex::decode(
+            b"00000000000000000000000000000000000000c8",
+        ), // target_address
+        1u8, // token_type
+        coin.balance().value(),
+    );
+
+    let key = message.key();
+    bridge
+        .test_load_inner_mut()
+        .inner_token_transfer_records_mut()
+        .push_back(
             key,
             new_bridge_record_for_testing(message, option::none(), false),
         );
-        assert!(
-            bridge.test_get_token_transfer_action_status(chain_id, 10)
-                == transfer_status_pending(),
-        );
-        assert!(bridge.test_get_token_transfer_action_signatures(chain_id, 10) == option::none());
-
-        // Test when ready for claim
-        let message = message::create_token_bridge_message(
-            chain_ids::sui_testnet(), // source chain
-            11, // seq_num
-            address::to_bytes(ctx.sender()), // sender address
-            chain_ids::eth_sepolia(), // target_chain
-            hex::decode(b"00000000000000000000000000000000000000c8"), // target_address
-            1u8, // token_type
-            balance::value(coin::balance(&coin))
-        );
-        let key = message.key();
-        bridge.test_load_inner_mut().inner_token_transfer_records_mut().push_back(
+    assert!(
+        bridge.test_get_token_transfer_action_status(chain_id, 10) ==
+        transfer_status_pending(),
+    );
+    assert!(
+        bridge.test_get_token_transfer_action_signatures(chain_id, 10) ==
+        option::none(),
+    );
+
+    // Test when ready for claim
+    let message = message::create_token_bridge_message(
+        chain_ids::sui_testnet(), // source chain
+        11, // seq_num
+        address::to_bytes(ctx.sender()), // sender address
+        chain_ids::eth_sepolia(), // target_chain
+        hex::decode(
+            b"00000000000000000000000000000000000000c8",
+        ), // target_address
+        1u8, // token_type
+        balance::value(coin::balance(&coin)),
+    );
+    let key = message.key();
+    bridge
+        .test_load_inner_mut()
+        .inner_token_transfer_records_mut()
+        .push_back(
             key,
-            new_bridge_record_for_testing(message, option::some(vector[]), false),
-        );
-        assert!(
-            bridge.test_get_token_transfer_action_status(chain_id, 11)
-                == transfer_status_approved(),
-        );
-        assert!(
-            bridge.test_get_token_transfer_action_signatures(chain_id, 11)
-                == option::some(vector[]),
-        );
-        assert!(
-            bridge.test_get_parsed_token_transfer_message(chain_id, 11)
-                == option::some(
-                to_parsed_token_transfer_message(&message)
+            new_bridge_record_for_testing(
+                message,
+                option::some(vector[]),
+                false,
             ),
         );
-
-        // Test when already claimed
-        let message = message::create_token_bridge_message(
-            chain_ids::sui_testnet(), // source chain
-            12, // seq_num
-            address::to_bytes(ctx.sender()), // sender address
-            chain_ids::eth_sepolia(), // target_chain
-            hex::decode(b"00000000000000000000000000000000000000c8"), // target_address
-            1u8, // token_type
-            balance::value(coin::balance(&coin))
-        );
-        let key = message.key();
-        bridge.test_load_inner_mut().inner_token_transfer_records_mut().push_back(
+    assert!(
+        bridge.test_get_token_transfer_action_status(chain_id, 11) ==
+        transfer_status_approved(),
+    );
+    assert!(
+        bridge.test_get_token_transfer_action_signatures(chain_id, 11) ==
+        option::some(vector[]),
+    );
+    assert!(
+        bridge.test_get_parsed_token_transfer_message(chain_id, 11) ==
+        option::some(
+            to_parsed_token_transfer_message(&message),
+        ),
+    );
+
+    // Test when already claimed
+    let message = message::create_token_bridge_message(
+        chain_ids::sui_testnet(), // source chain
+        12, // seq_num
+        address::to_bytes(ctx.sender()), // sender address
+        chain_ids::eth_sepolia(), // target_chain
+        hex::decode(
+            b"00000000000000000000000000000000000000c8",
+        ), // target_address
+        1u8, // token_type
+        balance::value(coin::balance(&coin)),
+    );
+    let key = message.key();
+    bridge
+        .test_load_inner_mut()
+        .inner_token_transfer_records_mut()
+        .push_back(
             key,
-            new_bridge_record_for_testing(message, option::some(vector[b"1234"]), true),
-        );
-        assert!(
-            bridge.test_get_token_transfer_action_status(chain_id, 12)
-                == transfer_status_claimed(),
-        );
-        assert!(
-            bridge.test_get_token_transfer_action_signatures(chain_id, 12)
-                == option::some(vector[b"1234"]),
-        );
-        assert!(
-            bridge.test_get_parsed_token_transfer_message(chain_id, 12)
-                == option::some(
-                to_parsed_token_transfer_message(&message)
+            new_bridge_record_for_testing(
+                message,
+                option::some(vector[b"1234"]),
+                true,
             ),
         );
+    assert!(
+        bridge.test_get_token_transfer_action_status(chain_id, 12) ==
+        transfer_status_claimed(),
+    );
+    assert!(
+        bridge.test_get_token_transfer_action_signatures(chain_id, 12) ==
+        option::some(vector[b"1234"]),
+    );
+    assert!(
+        bridge.test_get_parsed_token_transfer_message(chain_id, 12) ==
+        option::some(
+            to_parsed_token_transfer_message(&message),
+        ),
+    );
+
+    // Test when message not found
+    assert!(
+        bridge.test_get_token_transfer_action_status(chain_id, 13) ==
+        transfer_status_not_found(),
+    );
+    assert!(
+        bridge.test_get_token_transfer_action_signatures(chain_id, 13) ==
+        option::none(),
+    );
+    assert!(
+        bridge.test_get_parsed_token_transfer_message(chain_id, 13) ==
+        option::none(),
+    );
+
+    destroy(bridge);
+    coin.burn_for_testing();
+    scenario.end();
+}
 
-        // Test when message not found
-        assert!(
-            bridge.test_get_token_transfer_action_status(chain_id, 13)
-                == transfer_status_not_found(),
-        );
-        assert!(
-            bridge.test_get_token_transfer_action_signatures(chain_id, 13)
-                == option::none(),
-        );
-        assert!(
-            bridge.test_get_parsed_token_transfer_message(chain_id, 13)
-                == option::none(),
-        );
+#[test]
+#[expected_failure(abort_code = bridge::treasury::EUnsupportedTokenType)]
+fun test_get_metadata_no_token() {
+    let chain_id = chain_ids::sui_testnet();
+    let mut env = create_env(chain_id);
+    env.create_bridge_default();
+    let bridge = env.bridge(@0x0);
+    let treasury = bridge.bridge_ref().test_load_inner().inner_treasury();
+    treasury.notional_value<TEST_TOKEN>();
+
+    abort 0
+}
+
+#[test]
+fun change_url() {
+    let chain_id = chain_ids::sui_testnet();
+    let mut env = create_env(chain_id);
+    env.create_bridge_default();
+    let mut bridge = env.bridge(@0xAAAA);
+    bridge
+        .bridge_ref_mut()
+        .update_node_url(b"<url_here>", env.scenario().ctx());
+    bridge.return_bridge();
+    env.destroy_env();
+}
 
-        destroy(bridge);
-        coin.burn_for_testing();
-        scenario.end();
-    }
-
-    #[test]
-    #[expected_failure(abort_code = bridge::treasury::EUnsupportedTokenType)]
-    fun test_get_metadata_no_token() {
-        let chain_id = chain_ids::sui_testnet();
-        let mut env = create_env(chain_id, @0x0);
-        env.create_bridge_default();
-        let bridge = env.bridge(@0x0);
-        let treasury = bridge.bridge_ref().test_load_inner().inner_treasury();
-        treasury.notional_value<TEST_TOKEN>();
-
-        abort 0
-    }
+#[test]
+#[
+    expected_failure(
+        abort_code = bridge::committee::ESenderIsNotInBridgeCommittee,
+    ),
+]
+fun change_url_bad_sender() {
+    let chain_id = chain_ids::sui_testnet();
+    let mut env = create_env(chain_id);
+    env.create_bridge_default();
+    let mut bridge = env.bridge(@0x0);
+    bridge
+        .bridge_ref_mut()
+        .update_node_url(b"<url_here>", env.scenario().ctx());
+    abort 0
 }
diff --git a/crates/sui-framework/packages/bridge/tests/bridge_txns.move b/crates/sui-framework/packages/bridge/tests/bridge_txns.move
new file mode 100644
index 0000000000000..8e2a082f57faa
--- /dev/null
+++ b/crates/sui-framework/packages/bridge/tests/bridge_txns.move
@@ -0,0 +1,329 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+#[test_only]
+module bridge::bridge_txns;
+use bridge::bridge_env::{
+    already_approved,
+    already_claimed,
+    approved,
+    claimed,
+    create_bridge_default,
+    create_env,
+    create_validator,
+    eth_id,
+    limit_exceeded,
+    register_test_token,
+    test_token_id
+};
+use bridge::chain_ids;
+use bridge::crypto::ecdsa_pub_key_to_eth_address;
+use bridge::eth::ETH;
+use bridge::test_token::TEST_TOKEN;
+use std::type_name;
+
+#[test]
+fun test_limits() {
+    let mut env = create_env(chain_ids::sui_custom());
+    env.create_bridge_default();
+
+    let source_chain = chain_ids::eth_custom();
+    let sui_address = @0xABCDEF;
+    let eth_address = x"0000000000000000000000000000000000001234";
+
+    // lower limits
+    let chain_id = env.chain_id();
+    env.update_bridge_limit(@0x0, chain_id, source_chain, 3000);
+    let transfer_id1 = env.bridge_to_sui<ETH>(
+        source_chain,
+        eth_address,
+        sui_address,
+        4000000000,
+    );
+    let transfer_id2 = env.bridge_to_sui<ETH>(
+        source_chain,
+        eth_address,
+        sui_address,
+        1000,
+    );
+    assert!(
+        env.claim_and_transfer_token<ETH>(source_chain, transfer_id1) ==
+        limit_exceeded(),
+    );
+    assert!(
+        env.claim_and_transfer_token<ETH>(source_chain, transfer_id2) ==
+        claimed(),
+    );
+    // double claim is ok and it is a no-op
+    assert!(
+        env.claim_and_transfer_token<ETH>(source_chain, transfer_id2) ==
+        already_claimed(),
+    );
+
+    // up limits to allow claim
+    env.update_bridge_limit(@0x0, chain_id, source_chain, 4000);
+    assert!(
+        env.claim_and_transfer_token<ETH>(source_chain, transfer_id1) ==
+        claimed(),
+    );
+
+    env.destroy_env();
+}
+
+#[test]
+fun test_bridge_and_claim() {
+    let mut env = create_env(chain_ids::sui_custom());
+    env.create_bridge_default();
+
+    let source_chain = chain_ids::eth_custom();
+    let sui_address = @0xABCDEF;
+    let eth_address = x"0000000000000000000000000000000000001234";
+    let amount = 1000;
+
+    //
+    // move from eth and transfer to sui account
+    let transfer_id1 = env.bridge_to_sui<ETH>(
+        source_chain,
+        eth_address,
+        sui_address,
+        amount,
+    );
+    assert!(
+        env.claim_and_transfer_token<ETH>(source_chain, transfer_id1) ==
+        claimed(),
+    );
+    let transfer_id2 = env.bridge_to_sui<ETH>(
+        source_chain,
+        eth_address,
+        sui_address,
+        amount,
+    );
+    assert!(
+        env.claim_and_transfer_token<ETH>(source_chain, transfer_id2) ==
+        claimed(),
+    );
+    // double claim is ok and it is a no-op
+    assert!(
+        env.claim_and_transfer_token<ETH>(source_chain, transfer_id2) ==
+        already_claimed(),
+    );
+
+    //
+    // change order
+    let transfer_id1 = env.bridge_to_sui<ETH>(
+        source_chain,
+        eth_address,
+        sui_address,
+        amount,
+    );
+    let transfer_id2 = env.bridge_to_sui<ETH>(
+        source_chain,
+        eth_address,
+        sui_address,
+        amount,
+    );
+    assert!(
+        env.claim_and_transfer_token<ETH>(source_chain, transfer_id1) ==
+        claimed(),
+    );
+    assert!(
+        env.claim_and_transfer_token<ETH>(source_chain, transfer_id2) ==
+        claimed(),
+    );
+
+    //
+    // move from eth and send it back
+    let transfer_id = env.bridge_to_sui<ETH>(
+        source_chain,
+        eth_address,
+        sui_address,
+        amount,
+    );
+    let token = env.claim_token<ETH>(sui_address, source_chain, transfer_id);
+    env.send_token<ETH>(
+        sui_address,
+        source_chain,
+        eth_address,
+        token,
+    );
+
+    //
+    // approve with subset of signatures
+    let message = env.bridge_in_message<ETH>(
+        source_chain,
+        eth_address,
+        sui_address,
+        amount,
+    );
+    let signatures = env.sign_message_with(message, vector[0, 2]);
+    let transfer_id = message.seq_num();
+    assert!(env.approve_token_transfer(message, signatures) == approved());
+    assert!(
+        env.claim_and_transfer_token<ETH>(source_chain, transfer_id) ==
+        claimed(),
+    );
+
+    //
+    // multiple approve with subset of signatures
+    let message = env.bridge_in_message<ETH>(
+        source_chain,
+        eth_address,
+        sui_address,
+        amount,
+    );
+    let signatures = env.sign_message_with(message, vector[0, 2]);
+    let transfer_id = message.seq_num();
+    assert!(env.approve_token_transfer(message, signatures) == approved());
+    assert!(
+        env.approve_token_transfer(message, signatures) == already_approved(),
+    );
+    assert!(
+        env.approve_token_transfer(message, signatures) == already_approved(),
+    );
+    let token = env.claim_token<ETH>(sui_address, source_chain, transfer_id);
+    let send_token_id = env.send_token<ETH>(
+        sui_address,
+        source_chain,
+        eth_address,
+        token,
+    );
+    let message = env.bridge_out_message<ETH>(
+        source_chain,
+        eth_address,
+        sui_address,
+        amount,
+        send_token_id,
+    );
+    let signatures = env.sign_message_with(message, vector[1, 2]);
+    assert!(env.approve_token_transfer(message, signatures) == approved());
+    let signatures = env.sign_message_with(message, vector[0, 2]);
+    assert!(
+        env.approve_token_transfer(message, signatures) == already_approved(),
+    );
+
+    //
+    // multiple approve with different subset of signatures
+    let message = env.bridge_in_message<ETH>(
+        source_chain,
+        eth_address,
+        sui_address,
+        amount,
+    );
+    let transfer_id = message.seq_num();
+    let signatures = env.sign_message_with(message, vector[0, 2]);
+    assert!(env.approve_token_transfer(message, signatures) == approved());
+    let signatures = env.sign_message_with(message, vector[0, 1]);
+    assert!(
+        env.approve_token_transfer(message, signatures) == already_approved(),
+    );
+    let signatures = env.sign_message_with(message, vector[1, 2]);
+    assert!(
+        env.approve_token_transfer(message, signatures) == already_approved(),
+    );
+    let token = env.claim_token<ETH>(sui_address, source_chain, transfer_id);
+    env.send_token<ETH>(
+        sui_address,
+        source_chain,
+        eth_address,
+        token,
+    );
+
+    env.destroy_env();
+}
+
+#[test]
+#[expected_failure(abort_code = bridge::committee::ESignatureBelowThreshold)]
+fun test_blocklist() {
+    let mut env = create_env(chain_ids::sui_custom());
+    let validators = vector[
+        create_validator(@0xAAAA, 100, &b"1234567890_1234567890_1234567890"),
+        create_validator(@0xBBBB, 100, &b"234567890_1234567890_1234567890_"),
+        create_validator(@0xCCCC, 100, &b"34567890_1234567890_1234567890_1"),
+        create_validator(@0xDDDD, 100, &b"4567890_1234567890_1234567890_12"),
+    ];
+    env.setup_validators(validators);
+
+    let sender = @0x0;
+    env.create_bridge(sender);
+    env.register_committee();
+    env.init_committee(sender);
+    env.setup_treasury(sender);
+
+    let source_chain = chain_ids::eth_custom();
+    let sui_address = @0xABCDEF;
+    let eth_address = x"0000000000000000000000000000000000001234";
+    let amount = 1000;
+
+    // bridging in and out works
+    let message = env.bridge_in_message<ETH>(
+        source_chain,
+        eth_address,
+        sui_address,
+        amount,
+    );
+    let signatures = env.sign_message_with(message, vector[0, 2]);
+    let transfer_id = message.seq_num();
+    assert!(env.approve_token_transfer(message, signatures) == approved());
+    assert!(
+        env.claim_and_transfer_token<ETH>(source_chain, transfer_id) ==
+        claimed(),
+    );
+
+    // block bridge node 0
+    let chain_id = env.chain_id();
+    let node_key = ecdsa_pub_key_to_eth_address(env
+        .validators()[0]
+        .public_key());
+    env.execute_blocklist(@0x0, chain_id, 0, vector[node_key]);
+
+    // signing with 2 valid bridge nodes works
+    let message = env.bridge_in_message<ETH>(
+        source_chain,
+        eth_address,
+        sui_address,
+        amount,
+    );
+    let signatures = env.sign_message_with(message, vector[1, 2]);
+    assert!(env.approve_token_transfer(message, signatures) == approved());
+    assert!(
+        env.approve_token_transfer(message, signatures) == already_approved(),
+    );
+
+    // signing with blocked node fails
+    let message = env.bridge_in_message<ETH>(
+        source_chain,
+        eth_address,
+        sui_address,
+        amount,
+    );
+    let signatures = env.sign_message_with(message, vector[0, 2]);
+    env.approve_token_transfer(message, signatures);
+
+    env.destroy_env();
+}
+
+#[test]
+fun test_system_messages() {
+    let addr = @0xABCDEF0123; // random address
+    let mut env = create_env(chain_ids::sui_custom());
+    env.create_bridge_default();
+
+    env.update_asset_price(addr, eth_id(), 735);
+
+    env.register_test_token();
+    env.add_tokens(
+        addr,
+        false,
+        vector[test_token_id()],
+        vector[type_name::get<TEST_TOKEN>().into_string()],
+        vector[333],
+    );
+
+    let chain_id = env.chain_id();
+    let node_key = ecdsa_pub_key_to_eth_address(env
+        .validators()[0]
+        .public_key());
+    env.execute_blocklist(@0x0, chain_id, 0, vector[node_key]);
+
+    env.destroy_env();
+}
diff --git a/crates/sui-framework/packages/move-stdlib/sources/option.move b/crates/sui-framework/packages/move-stdlib/sources/option.move
index b0f1862c91ba5..00d5b9a20686f 100644
--- a/crates/sui-framework/packages/move-stdlib/sources/option.move
+++ b/crates/sui-framework/packages/move-stdlib/sources/option.move
@@ -153,17 +153,14 @@ module std::option {
     /// Destroy `Option<T>` and call the closure `f` on the value inside if it holds one.
     public macro fun do<$T>($o: Option<$T>, $f: |$T|) {
         let o = $o;
-        if (o.is_some()) {
-            $f(o.destroy_some());
-        }
+        if (o.is_some()) $f(o.destroy_some())
+        else o.destroy_none()
     }
 
     /// Execute a closure on the value inside `t` if it holds one.
     public macro fun do_ref<$T>($o: &Option<$T>, $f: |&$T|) {
         let o = $o;
-        if (o.is_some()) {
-            $f(o.borrow());
-        }
+        if (o.is_some()) $f(o.borrow());
     }
 
     /// Execute a closure on the mutable reference to the value inside `t` if it holds one.
@@ -176,16 +173,24 @@ module std::option {
     /// Equivalent to Rust's `a.or(b)`.
     public macro fun or<$T>($o: Option<$T>, $default: Option<$T>): Option<$T> {
         let o = $o;
-        if (o.is_some()) o
-        else $default
+        if (o.is_some()) {
+            o
+        } else {
+            o.destroy_none();
+            $default
+        }
     }
 
     /// If the value is `Some`, call the closure `f` on it. Otherwise, return `None`.
     /// Equivalent to Rust's `t.and_then(f)`.
     public macro fun and<$T, $U>($o: Option<$T>, $f: |$T| -> Option<$U>): Option<$U> {
         let o = $o;
-        if (o.is_some()) $f(o.extract())
-        else none()
+        if (o.is_some()) {
+            $f(o.destroy_some())
+        } else {
+            o.destroy_none();
+            none()
+        }
     }
 
     /// If the value is `Some`, call the closure `f` on it. Otherwise, return `None`.
@@ -199,9 +204,13 @@ module std::option {
     /// Map an `Option<T>` to `Option<U>` by applying a function to a contained value.
     /// Equivalent to Rust's `t.map(f)`.
     public macro fun map<$T, $U>($o: Option<$T>, $f: |$T| -> $U): Option<$U> {
-        let mut o = $o;
-        if (o.is_some()) some($f(o.extract()))
-        else none()
+        let o = $o;
+        if (o.is_some()) {
+            some($f(o.destroy_some()))
+        } else {
+            o.destroy_none();
+            none()
+        }
     }
 
     /// Map an `Option<T>` value to `Option<U>` by applying a function to a contained value by reference.
@@ -234,7 +243,11 @@ module std::option {
     /// deprecated in favor of this function.
     public macro fun destroy_or<$T>($o: Option<$T>, $default: $T): $T {
         let o = $o;
-        if (o.is_some()) o.destroy_some()
-        else $default
+        if (o.is_some()) {
+            o.destroy_some()
+        } else {
+            o.destroy_none();
+            $default
+        }
     }
 }
diff --git a/crates/sui-framework/packages/move-stdlib/tests/option_tests.move b/crates/sui-framework/packages/move-stdlib/tests/option_tests.move
index a8cb8875d5495..18c02dcee2218 100644
--- a/crates/sui-framework/packages/move-stdlib/tests/option_tests.move
+++ b/crates/sui-framework/packages/move-stdlib/tests/option_tests.move
@@ -172,6 +172,8 @@ module std::option_tests {
 
     // === Macros ===
 
+    public struct NoDrop {}
+
     #[test]
     fun do_destroy() {
         let mut counter = 0;
@@ -179,6 +181,12 @@ module std::option_tests {
         option::some(10).do!(|x| counter = counter + x);
 
         assert!(counter == 15);
+
+        let some = option::some(NoDrop {});
+        let none = option::none<NoDrop>();
+
+        some.do!(|el| { let NoDrop {} = el; });
+        none.do!(|el| { let NoDrop {} = el; });
     }
 
     #[test]
@@ -199,6 +207,49 @@ module std::option_tests {
         assert!(option::none<u8>().map_ref!(|x| vector[*x]) == option::none());
     }
 
+    #[test]
+    fun map_no_drop() {
+        let none = option::none<NoDrop>().map!(|el| {
+            let NoDrop {} = el;
+            100u64
+        });
+        let some = option::some(NoDrop {}).map!(|el| {
+            let NoDrop {} = el;
+            100u64
+        });
+
+        assert!(none == option::none());
+        assert!(some == option::some(100));
+    }
+
+    #[test]
+    fun or_no_drop() {
+        let none = option::none<NoDrop>().or!(option::some(NoDrop {}));
+        let some = option::some(NoDrop {}).or!(option::some(NoDrop {}));
+
+        assert!(none.is_some());
+        assert!(some.is_some());
+
+        let NoDrop {} = none.destroy_some();
+        let NoDrop {} = some.destroy_some();
+    }
+
+    #[test]
+    fun and_no_drop() {
+        let none = option::none<NoDrop>().and!(|e| {
+            let NoDrop {} = e;
+            option::some(100)
+        });
+
+        let some = option::some(NoDrop {}).and!(|e| {
+            let NoDrop {} = e;
+            option::some(100)
+        });
+
+        assert!(some == option::some(100));
+        assert!(none == option::none());
+    }
+
     #[test]
     fun filter() {
         assert!(option::some(5).filter!(|x| *x == 5) == option::some(5));
@@ -217,4 +268,13 @@ module std::option_tests {
         assert!(option::none().destroy_or!(10) == 10);
         assert!(option::some(5).destroy_or!(10) == 5);
     }
+
+    #[test]
+    fun destroy_or_no_drop() {
+        let none = option::none<NoDrop>().destroy_or!(NoDrop {});
+        let some = option::some(NoDrop {}).destroy_or!(NoDrop {});
+
+        let NoDrop {} = some;
+        let NoDrop {} = none;
+    }
 }
diff --git a/crates/sui-framework/packages/sui-framework/sources/math.move b/crates/sui-framework/packages/sui-framework/sources/math.move
index 6f079e8ad56d8..f98a7d7c5eb72 100644
--- a/crates/sui-framework/packages/sui-framework/sources/math.move
+++ b/crates/sui-framework/packages/sui-framework/sources/math.move
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 /// DEPRECATED, use the each integer type's individual module instead, e.g. `std::u64`
+#[deprecated(note = b"Use the each integer type's individual module instead, e.g. `std::u64`")]
 module sui::math {
 
     /// DEPRECATED, use `std::u64::max` instead
diff --git a/crates/sui-framework/packages/sui-framework/tests/math_tests.move b/crates/sui-framework/packages/sui-framework/tests/math_tests.move
index 7ab3117eae52b..e55bb0bad3006 100644
--- a/crates/sui-framework/packages/sui-framework/tests/math_tests.move
+++ b/crates/sui-framework/packages/sui-framework/tests/math_tests.move
@@ -1,7 +1,7 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-#[test_only]
+#[test_only, allow(deprecated_usage)]
 module sui::math_tests {
     use sui::math;
 
diff --git a/crates/sui-framework/packages_compiled/sui-framework b/crates/sui-framework/packages_compiled/sui-framework
index 7e808acfe68d4..fa0f19b2b4ab5 100644
Binary files a/crates/sui-framework/packages_compiled/sui-framework and b/crates/sui-framework/packages_compiled/sui-framework differ
diff --git a/crates/sui-framework/src/lib.rs b/crates/sui-framework/src/lib.rs
index dfc8679cd2fc6..f51f746585acb 100644
--- a/crates/sui-framework/src/lib.rs
+++ b/crates/sui-framework/src/lib.rs
@@ -256,9 +256,7 @@ pub async fn compare_system_package<S: ObjectStore>(
     let mut new_normalized = new_pkg.normalize(binary_config).ok()?;
 
     for (name, cur_module) in cur_normalized {
-        let Some(new_module) = new_normalized.remove(&name) else {
-            return None;
-        };
+        let new_module = new_normalized.remove(&name)?;
 
         if let Err(e) = compatibility.check(&cur_module, &new_module) {
             error!("Compatibility check failed, for new version of {id}::{name}: {e:?}");
diff --git a/crates/sui-genesis-builder/Cargo.toml b/crates/sui-genesis-builder/Cargo.toml
index 32e62bf08712b..c439f28b4caf7 100644
--- a/crates/sui-genesis-builder/Cargo.toml
+++ b/crates/sui-genesis-builder/Cargo.toml
@@ -6,6 +6,9 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 anyhow.workspace = true
 bcs.workspace = true
diff --git a/crates/sui-genesis-builder/src/lib.rs b/crates/sui-genesis-builder/src/lib.rs
index fbab297181074..b0925b19951f3 100644
--- a/crates/sui-genesis-builder/src/lib.rs
+++ b/crates/sui-genesis-builder/src/lib.rs
@@ -693,11 +693,11 @@ fn create_genesis_context(
 ) -> TxContext {
     let mut hasher = DefaultHash::default();
     hasher.update(b"sui-genesis");
-    hasher.update(&bcs::to_bytes(genesis_chain_parameters).unwrap());
-    hasher.update(&bcs::to_bytes(genesis_validators).unwrap());
-    hasher.update(&bcs::to_bytes(token_distribution_schedule).unwrap());
+    hasher.update(bcs::to_bytes(genesis_chain_parameters).unwrap());
+    hasher.update(bcs::to_bytes(genesis_validators).unwrap());
+    hasher.update(bcs::to_bytes(token_distribution_schedule).unwrap());
     for system_package in system_packages {
-        hasher.update(&bcs::to_bytes(system_package.bytes()).unwrap());
+        hasher.update(bcs::to_bytes(system_package.bytes()).unwrap());
     }
 
     let hash = hasher.finalize();
diff --git a/crates/sui-graphql-e2e-tests/Cargo.toml b/crates/sui-graphql-e2e-tests/Cargo.toml
index fb8642a2a404e..1bc925321f16e 100644
--- a/crates/sui-graphql-e2e-tests/Cargo.toml
+++ b/crates/sui-graphql-e2e-tests/Cargo.toml
@@ -7,6 +7,9 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dev-dependencies]
 datatest-stable.workspace = true
 sui-graphql-rpc.workspace = true
diff --git a/crates/sui-graphql-e2e-tests/tests/call/simple.exp b/crates/sui-graphql-e2e-tests/tests/call/simple.exp
index 9ac1393da7ca2..c9fc964fa9eb3 100644
--- a/crates/sui-graphql-e2e-tests/tests/call/simple.exp
+++ b/crates/sui-graphql-e2e-tests/tests/call/simple.exp
@@ -115,10 +115,8 @@ Headers: {
     "content-type": "application/json",
     "content-length": "157",
     "x-sui-rpc-version": "2024.7.0-testing-no-sha",
+    "vary": "origin, access-control-request-method, access-control-request-headers",
     "access-control-allow-origin": "*",
-    "vary": "origin",
-    "vary": "access-control-request-method",
-    "vary": "access-control-request-headers",
 }
 Service version: 2024.7.0-testing-no-sha
 Response: {
diff --git a/crates/sui-graphql-e2e-tests/tests/consistency/balances.exp b/crates/sui-graphql-e2e-tests/tests/consistency/balances.exp
index 0420427fbe84c..e4529876bfe9b 100644
--- a/crates/sui-graphql-e2e-tests/tests/consistency/balances.exp
+++ b/crates/sui-graphql-e2e-tests/tests/consistency/balances.exp
@@ -59,7 +59,7 @@ task 15, line 76:
 Checkpoint created: 7
 
 task 16, lines 78-99:
-//# run-graphql --cursors {"c":2,"t":1,"tc":1}
+//# run-graphql --cursors {"c":2,"t":1,"i":false}
 Response: {
   "data": {
     "transactionBlocks": {
@@ -95,7 +95,7 @@ Response: {
 }
 
 task 17, lines 101-122:
-//# run-graphql --cursors {"c":3,"t":1,"tc":1}
+//# run-graphql --cursors {"c":3,"t":1,"i":false}
 Response: {
   "data": {
     "transactionBlocks": {
@@ -131,7 +131,7 @@ Response: {
 }
 
 task 18, lines 124-145:
-//# run-graphql --cursors {"c":4,"t":1,"tc":1}
+//# run-graphql --cursors {"c":4,"t":1,"i":false}
 Response: {
   "data": {
     "transactionBlocks": {
@@ -175,7 +175,7 @@ task 20, line 149:
 Checkpoint created: 8
 
 task 21, lines 151-172:
-//# run-graphql --cursors {"c":2,"t":1,"tc":1}
+//# run-graphql --cursors {"c":2,"t":1,"i":false}
 Response: {
   "data": {
     "transactionBlocks": {
@@ -211,7 +211,7 @@ Response: {
 }
 
 task 22, lines 174-195:
-//# run-graphql --cursors {"c":3,"t":1,"tc":1}
+//# run-graphql --cursors {"c":3,"t":1,"i":false}
 Response: {
   "data": {
     "transactionBlocks": {
@@ -247,7 +247,7 @@ Response: {
 }
 
 task 23, lines 197-218:
-//# run-graphql --cursors {"c":4,"t":1,"tc":1}
+//# run-graphql --cursors {"c":4,"t":1,"i":false}
 Response: {
   "data": {
     "transactionBlocks": {
@@ -291,7 +291,7 @@ task 25, line 222:
 Checkpoint created: 9
 
 task 26, lines 224-245:
-//# run-graphql --cursors {"c":2,"t":1,"tc":1}
+//# run-graphql --cursors {"c":2,"t":1,"i":false}
 Response: {
   "data": {
     "transactionBlocks": {
@@ -326,7 +326,7 @@ Response: {
 }
 
 task 27, lines 247-268:
-//# run-graphql --cursors {"c":3,"t":1,"tc":1}
+//# run-graphql --cursors {"c":3,"t":1,"i":false}
 Response: {
   "data": {
     "transactionBlocks": {
@@ -362,7 +362,7 @@ Response: {
 }
 
 task 28, lines 270-291:
-//# run-graphql --cursors {"c":4,"t":1,"tc":1}
+//# run-graphql --cursors {"c":4,"t":1,"i":false}
 Response: {
   "data": {
     "transactionBlocks": {
@@ -406,7 +406,7 @@ task 30, line 296:
 Checkpoint created: 10
 
 task 31, lines 298-319:
-//# run-graphql --cursors {"c":2,"t":1,"tc":1}
+//# run-graphql --cursors {"c":2,"t":1,"i":false}
 Response: {
   "data": {
     "transactionBlocks": {
@@ -441,7 +441,7 @@ Response: {
 }
 
 task 32, lines 321-342:
-//# run-graphql --cursors {"c":3,"t":1,"tc":1}
+//# run-graphql --cursors {"c":3,"t":1,"i":false}
 Response: {
   "data": {
     "transactionBlocks": {
@@ -476,7 +476,7 @@ Response: {
 }
 
 task 33, lines 344-365:
-//# run-graphql --cursors {"c":4,"t":1,"tc":1}
+//# run-graphql --cursors {"c":4,"t":1,"i":false}
 Response: {
   "data": {
     "transactionBlocks": {
diff --git a/crates/sui-graphql-e2e-tests/tests/consistency/balances.move b/crates/sui-graphql-e2e-tests/tests/consistency/balances.move
index 70059773d3946..48bb049a865ab 100644
--- a/crates/sui-graphql-e2e-tests/tests/consistency/balances.move
+++ b/crates/sui-graphql-e2e-tests/tests/consistency/balances.move
@@ -75,7 +75,7 @@ module P0::fake {
 
 //# create-checkpoint
 
-//# run-graphql --cursors {"c":2,"t":1,"tc":1}
+//# run-graphql --cursors {"c":2,"t":1,"i":false}
 # Emulating viewing transaction blocks at checkpoint 2. Fake coin balance should be 700.
 {
   transactionBlocks(first: 1, after: "@{cursor_0}", filter: {signAddress: "@{A}"}) {
@@ -98,7 +98,7 @@ module P0::fake {
   }
 }
 
-//# run-graphql --cursors {"c":3,"t":1,"tc":1}
+//# run-graphql --cursors {"c":3,"t":1,"i":false}
 # Emulating viewing transaction blocks at checkpoint 3. Fake coin balance should be 500.
 {
   transactionBlocks(first: 1, after: "@{cursor_0}", filter: {signAddress: "@{A}"}) {
@@ -121,7 +121,7 @@ module P0::fake {
   }
 }
 
-//# run-graphql --cursors {"c":4,"t":1,"tc":1}
+//# run-graphql --cursors {"c":4,"t":1,"i":false}
 # Emulating viewing transaction blocks at checkpoint 4. Fake coin balance should be 400.
 {
   transactionBlocks(first: 1, after: "@{cursor_0}", filter: {signAddress: "@{A}"}) {
@@ -148,7 +148,7 @@ module P0::fake {
 
 //# create-checkpoint
 
-//# run-graphql --cursors {"c":2,"t":1,"tc":1}
+//# run-graphql --cursors {"c":2,"t":1,"i":false}
 # Emulating viewing transaction blocks at checkpoint 2. Fake coin balance should be 700.
 {
   transactionBlocks(first: 1, after: "@{cursor_0}", filter: {signAddress: "@{A}"}) {
@@ -171,7 +171,7 @@ module P0::fake {
   }
 }
 
-//# run-graphql --cursors {"c":3,"t":1,"tc":1}
+//# run-graphql --cursors {"c":3,"t":1,"i":false}
 # Emulating viewing transaction blocks at checkpoint 3. Fake coin balance should be 500.
 {
   transactionBlocks(first: 1, after: "@{cursor_0}", filter: {signAddress: "@{A}"}) {
@@ -194,7 +194,7 @@ module P0::fake {
   }
 }
 
-//# run-graphql --cursors {"c":4,"t":1,"tc":1}
+//# run-graphql --cursors {"c":4,"t":1,"i":false}
 # Emulating viewing transaction blocks at checkpoint 4. Fake coin balance should be 400.
 {
   transactionBlocks(first: 1, after: "@{cursor_0}", filter: {signAddress: "@{A}"}) {
@@ -221,7 +221,7 @@ module P0::fake {
 
 //# create-checkpoint
 
-//# run-graphql --cursors {"c":2,"t":1,"tc":1}
+//# run-graphql --cursors {"c":2,"t":1,"i":false}
 # Outside available range
 {
   transactionBlocks(first: 1, after: "@{cursor_0}", filter: {signAddress: "@{A}"}) {
@@ -244,7 +244,7 @@ module P0::fake {
   }
 }
 
-//# run-graphql --cursors {"c":3,"t":1,"tc":1}
+//# run-graphql --cursors {"c":3,"t":1,"i":false}
 # Emulating viewing transaction blocks at checkpoint 3. Fake coin balance should be 500.
 {
   transactionBlocks(first: 1, after: "@{cursor_0}", filter: {signAddress: "@{A}"}) {
@@ -267,7 +267,7 @@ module P0::fake {
   }
 }
 
-//# run-graphql --cursors {"c":4,"t":1,"tc":1}
+//# run-graphql --cursors {"c":4,"t":1,"i":false}
 # Emulating viewing transaction blocks at checkpoint 4. Fake coin balance should be 400.
 {
   transactionBlocks(first: 1, after: "@{cursor_0}", filter: {signAddress: "@{A}"}) {
@@ -295,7 +295,7 @@ module P0::fake {
 
 //# create-checkpoint
 
-//# run-graphql --cursors {"c":2,"t":1,"tc":1}
+//# run-graphql --cursors {"c":2,"t":1,"i":false}
 # Outside available range
 {
   transactionBlocks(first: 1, after: "@{cursor_0}", filter: {signAddress: "@{A}"}) {
@@ -318,7 +318,7 @@ module P0::fake {
   }
 }
 
-//# run-graphql --cursors {"c":3,"t":1,"tc":1}
+//# run-graphql --cursors {"c":3,"t":1,"i":false}
 # Outside available range
 {
   transactionBlocks(first: 1, after: "@{cursor_0}", filter: {signAddress: "@{A}"}) {
@@ -341,7 +341,7 @@ module P0::fake {
   }
 }
 
-//# run-graphql --cursors {"c":4,"t":1,"tc":1}
+//# run-graphql --cursors {"c":4,"t":1,"i":false}
 # Outside available range
 {
   transactionBlocks(first: 1, after: "@{cursor_0}", filter: {signAddress: "@{A}"}) {
diff --git a/crates/sui-graphql-e2e-tests/tests/consistency/checkpoints/transaction_blocks.exp b/crates/sui-graphql-e2e-tests/tests/consistency/checkpoints/transaction_blocks.exp
index a02e97976ee4a..add91acf3898d 100644
--- a/crates/sui-graphql-e2e-tests/tests/consistency/checkpoints/transaction_blocks.exp
+++ b/crates/sui-graphql-e2e-tests/tests/consistency/checkpoints/transaction_blocks.exp
@@ -92,7 +92,7 @@ Response: {
           "transactionBlocks": {
             "edges": [
               {
-                "cursor": "eyJjIjozLCJ0IjoyLCJ0YyI6MX0",
+                "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
                 "node": {
                   "digest": "Cwqr9jTgQjajoYaqcjzAaQGcQEyCg8XxoN7smGCLiBrs",
                   "sender": {
@@ -107,7 +107,7 @@ Response: {
                 }
               },
               {
-                "cursor": "eyJjIjozLCJ0IjozLCJ0YyI6MX0",
+                "cursor": "eyJjIjozLCJ0IjozLCJpIjpmYWxzZX0",
                 "node": {
                   "digest": "H1WU8uXMGaENQs54EpoHGpV1iMYdH8P5scd1d16s9ECB",
                   "sender": {
@@ -122,7 +122,7 @@ Response: {
                 }
               },
               {
-                "cursor": "eyJjIjozLCJ0Ijo0LCJ0YyI6MX0",
+                "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0",
                 "node": {
                   "digest": "4vJbSYKwEJb5sYU2jiayqsZNRnBywD8y6sd3RQoMppF9",
                   "sender": {
@@ -137,7 +137,7 @@ Response: {
                 }
               },
               {
-                "cursor": "eyJjIjozLCJ0Ijo1LCJ0YyI6MX0",
+                "cursor": "eyJjIjozLCJ0Ijo1LCJpIjpmYWxzZX0",
                 "node": {
                   "digest": "4W23PZz7dHVxoZ2VMCWU9j38Jxy7tLkqcFBcJUB3aCSB",
                   "sender": {
@@ -159,7 +159,7 @@ Response: {
           "transactionBlocks": {
             "edges": [
               {
-                "cursor": "eyJjIjozLCJ0Ijo2LCJ0YyI6Mn0",
+                "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0",
                 "node": {
                   "digest": "JLAF7P6DumC8rgzT1Ygp2QgTwpHE2FUqQbVXL6cGEEQ",
                   "sender": {
@@ -174,7 +174,7 @@ Response: {
                 }
               },
               {
-                "cursor": "eyJjIjozLCJ0Ijo3LCJ0YyI6Mn0",
+                "cursor": "eyJjIjozLCJ0Ijo3LCJpIjpmYWxzZX0",
                 "node": {
                   "digest": "BVMVdn7DDpTbCjtYwWFekcFA9sNeMgDh1wTNWRrngZxh",
                   "sender": {
@@ -189,7 +189,7 @@ Response: {
                 }
               },
               {
-                "cursor": "eyJjIjozLCJ0Ijo4LCJ0YyI6Mn0",
+                "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0",
                 "node": {
                   "digest": "4J5tno4AoU4NPS2NgEseAZK7cpLDh6KJduVtbtwzmHk5",
                   "sender": {
@@ -211,7 +211,7 @@ Response: {
           "transactionBlocks": {
             "edges": [
               {
-                "cursor": "eyJjIjozLCJ0Ijo5LCJ0YyI6M30",
+                "cursor": "eyJjIjozLCJ0Ijo5LCJpIjpmYWxzZX0",
                 "node": {
                   "digest": "5BCS9sencxEJRJHBBPeGhx3rWutYoGSuLFCmnMAaYcDm",
                   "sender": {
@@ -226,7 +226,7 @@ Response: {
                 }
               },
               {
-                "cursor": "eyJjIjozLCJ0IjoxMCwidGMiOjN9",
+                "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9",
                 "node": {
                   "digest": "HQYJnLLcGf4DwgTkpqF4zHbQsLHwc1s4WbQ3Xr5BBaxh",
                   "sender": {
diff --git a/crates/sui-graphql-e2e-tests/tests/consistency/dynamic_fields/dynamic_fields.exp b/crates/sui-graphql-e2e-tests/tests/consistency/dynamic_fields/dynamic_fields.exp
index afbfbb96ca3a1..51b7b407d25ad 100644
--- a/crates/sui-graphql-e2e-tests/tests/consistency/dynamic_fields/dynamic_fields.exp
+++ b/crates/sui-graphql-e2e-tests/tests/consistency/dynamic_fields/dynamic_fields.exp
@@ -1166,7 +1166,17 @@ task 34, lines 497-528:
 Response: {
   "data": {
     "parent_version_4": {
-      "dfAtParentVersion4_outside_range": null
+      "dfAtParentVersion4_outside_range": {
+        "name": {
+          "bcs": "A2RmMQ==",
+          "type": {
+            "repr": "0x0000000000000000000000000000000000000000000000000000000000000001::string::String"
+          }
+        },
+        "value": {
+          "json": "df1"
+        }
+      }
     },
     "parent_version_6": {
       "dfAtParentVersion6": null
diff --git a/crates/sui-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.exp b/crates/sui-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.exp
index 721c1e0dafaf0..7b25ef908d6bf 100644
--- a/crates/sui-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.exp
+++ b/crates/sui-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.exp
@@ -39,25 +39,25 @@ Response: {
       "transactionBlocks": {
         "edges": [
           {
-            "cursor": "eyJjIjozLCJ0IjowLCJ0YyI6MH0",
+            "cursor": "eyJjIjozLCJ0IjowLCJpIjpmYWxzZX0",
             "node": {
               "digest": "J7mHXcoa7LXwyjzZUWsk8zvYZjek359TM4d2hQK4LGHo"
             }
           },
           {
-            "cursor": "eyJjIjozLCJ0IjoxLCJ0YyI6MX0",
+            "cursor": "eyJjIjozLCJ0IjoxLCJpIjpmYWxzZX0",
             "node": {
               "digest": "J1pYPDrTgsKgzB8XWtW8jLJ8RPsbJcC1SQ4Mv2T1hAWt"
             }
           },
           {
-            "cursor": "eyJjIjozLCJ0IjoyLCJ0YyI6Mn0",
+            "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
             "node": {
               "digest": "Cwqr9jTgQjajoYaqcjzAaQGcQEyCg8XxoN7smGCLiBrs"
             }
           },
           {
-            "cursor": "eyJjIjozLCJ0IjozLCJ0YyI6M30",
+            "cursor": "eyJjIjozLCJ0IjozLCJpIjpmYWxzZX0",
             "node": {
               "digest": "Bym7b7ELP77KxVHtgj6F4FB7H6n5LYQuBQYmdvvFxEmM"
             }
@@ -141,7 +141,7 @@ task 21, line 91:
 Epoch advanced: 3
 
 task 22, lines 93-157:
-//# run-graphql --cursors {"t":3,"tc":3,"c":4} {"t":7,"tc":7,"c":8} {"t":11,"tc":11,"c":12}
+//# run-graphql --cursors {"t":3,"i":false,"c":4} {"t":7,"i":false,"c":8} {"t":11,"i":false,"c":12}
 Response: {
   "data": {
     "checkpoint": {
@@ -152,25 +152,25 @@ Response: {
       "transactionBlocks": {
         "edges": [
           {
-            "cursor": "eyJjIjoxMiwidCI6MCwidGMiOjB9",
+            "cursor": "eyJjIjoxMiwidCI6MCwiaSI6ZmFsc2V9",
             "node": {
               "digest": "J7mHXcoa7LXwyjzZUWsk8zvYZjek359TM4d2hQK4LGHo"
             }
           },
           {
-            "cursor": "eyJjIjoxMiwidCI6MSwidGMiOjF9",
+            "cursor": "eyJjIjoxMiwidCI6MSwiaSI6ZmFsc2V9",
             "node": {
               "digest": "J1pYPDrTgsKgzB8XWtW8jLJ8RPsbJcC1SQ4Mv2T1hAWt"
             }
           },
           {
-            "cursor": "eyJjIjoxMiwidCI6MiwidGMiOjJ9",
+            "cursor": "eyJjIjoxMiwidCI6MiwiaSI6ZmFsc2V9",
             "node": {
               "digest": "Cwqr9jTgQjajoYaqcjzAaQGcQEyCg8XxoN7smGCLiBrs"
             }
           },
           {
-            "cursor": "eyJjIjoxMiwidCI6MywidGMiOjN9",
+            "cursor": "eyJjIjoxMiwidCI6MywiaSI6ZmFsc2V9",
             "node": {
               "digest": "Bym7b7ELP77KxVHtgj6F4FB7H6n5LYQuBQYmdvvFxEmM"
             }
@@ -181,19 +181,19 @@ Response: {
     "txs_epoch_0": {
       "edges": [
         {
-          "cursor": "eyJjIjo0LCJ0IjowLCJ0YyI6MH0",
+          "cursor": "eyJjIjo0LCJ0IjowLCJpIjpmYWxzZX0",
           "node": {
             "digest": "J7mHXcoa7LXwyjzZUWsk8zvYZjek359TM4d2hQK4LGHo"
           }
         },
         {
-          "cursor": "eyJjIjo0LCJ0IjoxLCJ0YyI6MX0",
+          "cursor": "eyJjIjo0LCJ0IjoxLCJpIjpmYWxzZX0",
           "node": {
             "digest": "J1pYPDrTgsKgzB8XWtW8jLJ8RPsbJcC1SQ4Mv2T1hAWt"
           }
         },
         {
-          "cursor": "eyJjIjo0LCJ0IjoyLCJ0YyI6Mn0",
+          "cursor": "eyJjIjo0LCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
             "digest": "Cwqr9jTgQjajoYaqcjzAaQGcQEyCg8XxoN7smGCLiBrs"
           }
@@ -205,25 +205,25 @@ Response: {
       "transactionBlocks": {
         "edges": [
           {
-            "cursor": "eyJjIjoxMiwidCI6NCwidGMiOjR9",
+            "cursor": "eyJjIjoxMiwidCI6NCwiaSI6ZmFsc2V9",
             "node": {
               "digest": "H1WU8uXMGaENQs54EpoHGpV1iMYdH8P5scd1d16s9ECB"
             }
           },
           {
-            "cursor": "eyJjIjoxMiwidCI6NSwidGMiOjV9",
+            "cursor": "eyJjIjoxMiwidCI6NSwiaSI6ZmFsc2V9",
             "node": {
               "digest": "4vJbSYKwEJb5sYU2jiayqsZNRnBywD8y6sd3RQoMppF9"
             }
           },
           {
-            "cursor": "eyJjIjoxMiwidCI6NiwidGMiOjZ9",
+            "cursor": "eyJjIjoxMiwidCI6NiwiaSI6ZmFsc2V9",
             "node": {
               "digest": "4W23PZz7dHVxoZ2VMCWU9j38Jxy7tLkqcFBcJUB3aCSB"
             }
           },
           {
-            "cursor": "eyJjIjoxMiwidCI6NywidGMiOjd9",
+            "cursor": "eyJjIjoxMiwidCI6NywiaSI6ZmFsc2V9",
             "node": {
               "digest": "D251V1BnvyRKNFZmiFxaf7gSZLGdLo8fYbbVDb5vJWfd"
             }
@@ -234,43 +234,43 @@ Response: {
     "txs_epoch_1": {
       "edges": [
         {
-          "cursor": "eyJjIjo4LCJ0IjowLCJ0YyI6MH0",
+          "cursor": "eyJjIjo4LCJ0IjowLCJpIjpmYWxzZX0",
           "node": {
             "digest": "J7mHXcoa7LXwyjzZUWsk8zvYZjek359TM4d2hQK4LGHo"
           }
         },
         {
-          "cursor": "eyJjIjo4LCJ0IjoxLCJ0YyI6MX0",
+          "cursor": "eyJjIjo4LCJ0IjoxLCJpIjpmYWxzZX0",
           "node": {
             "digest": "J1pYPDrTgsKgzB8XWtW8jLJ8RPsbJcC1SQ4Mv2T1hAWt"
           }
         },
         {
-          "cursor": "eyJjIjo4LCJ0IjoyLCJ0YyI6Mn0",
+          "cursor": "eyJjIjo4LCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
             "digest": "Cwqr9jTgQjajoYaqcjzAaQGcQEyCg8XxoN7smGCLiBrs"
           }
         },
         {
-          "cursor": "eyJjIjo4LCJ0IjozLCJ0YyI6M30",
+          "cursor": "eyJjIjo4LCJ0IjozLCJpIjpmYWxzZX0",
           "node": {
             "digest": "Bym7b7ELP77KxVHtgj6F4FB7H6n5LYQuBQYmdvvFxEmM"
           }
         },
         {
-          "cursor": "eyJjIjo4LCJ0Ijo0LCJ0YyI6NH0",
+          "cursor": "eyJjIjo4LCJ0Ijo0LCJpIjpmYWxzZX0",
           "node": {
             "digest": "H1WU8uXMGaENQs54EpoHGpV1iMYdH8P5scd1d16s9ECB"
           }
         },
         {
-          "cursor": "eyJjIjo4LCJ0Ijo1LCJ0YyI6NX0",
+          "cursor": "eyJjIjo4LCJ0Ijo1LCJpIjpmYWxzZX0",
           "node": {
             "digest": "4vJbSYKwEJb5sYU2jiayqsZNRnBywD8y6sd3RQoMppF9"
           }
         },
         {
-          "cursor": "eyJjIjo4LCJ0Ijo2LCJ0YyI6Nn0",
+          "cursor": "eyJjIjo4LCJ0Ijo2LCJpIjpmYWxzZX0",
           "node": {
             "digest": "4W23PZz7dHVxoZ2VMCWU9j38Jxy7tLkqcFBcJUB3aCSB"
           }
@@ -282,25 +282,25 @@ Response: {
       "transactionBlocks": {
         "edges": [
           {
-            "cursor": "eyJjIjoxMiwidCI6OCwidGMiOjh9",
+            "cursor": "eyJjIjoxMiwidCI6OCwiaSI6ZmFsc2V9",
             "node": {
               "digest": "JLAF7P6DumC8rgzT1Ygp2QgTwpHE2FUqQbVXL6cGEEQ"
             }
           },
           {
-            "cursor": "eyJjIjoxMiwidCI6OSwidGMiOjl9",
+            "cursor": "eyJjIjoxMiwidCI6OSwiaSI6ZmFsc2V9",
             "node": {
               "digest": "BVMVdn7DDpTbCjtYwWFekcFA9sNeMgDh1wTNWRrngZxh"
             }
           },
           {
-            "cursor": "eyJjIjoxMiwidCI6MTAsInRjIjoxMH0",
+            "cursor": "eyJjIjoxMiwidCI6MTAsImkiOmZhbHNlfQ",
             "node": {
               "digest": "4J5tno4AoU4NPS2NgEseAZK7cpLDh6KJduVtbtwzmHk5"
             }
           },
           {
-            "cursor": "eyJjIjoxMiwidCI6MTEsInRjIjoxMX0",
+            "cursor": "eyJjIjoxMiwidCI6MTEsImkiOmZhbHNlfQ",
             "node": {
               "digest": "GngPX2ztACkKE96VUfoujZ3vA11MMDhPSwwgKhK7hVa"
             }
@@ -311,67 +311,67 @@ Response: {
     "txs_epoch_2": {
       "edges": [
         {
-          "cursor": "eyJjIjoxMiwidCI6MCwidGMiOjB9",
+          "cursor": "eyJjIjoxMiwidCI6MCwiaSI6ZmFsc2V9",
           "node": {
             "digest": "J7mHXcoa7LXwyjzZUWsk8zvYZjek359TM4d2hQK4LGHo"
           }
         },
         {
-          "cursor": "eyJjIjoxMiwidCI6MSwidGMiOjF9",
+          "cursor": "eyJjIjoxMiwidCI6MSwiaSI6ZmFsc2V9",
           "node": {
             "digest": "J1pYPDrTgsKgzB8XWtW8jLJ8RPsbJcC1SQ4Mv2T1hAWt"
           }
         },
         {
-          "cursor": "eyJjIjoxMiwidCI6MiwidGMiOjJ9",
+          "cursor": "eyJjIjoxMiwidCI6MiwiaSI6ZmFsc2V9",
           "node": {
             "digest": "Cwqr9jTgQjajoYaqcjzAaQGcQEyCg8XxoN7smGCLiBrs"
           }
         },
         {
-          "cursor": "eyJjIjoxMiwidCI6MywidGMiOjN9",
+          "cursor": "eyJjIjoxMiwidCI6MywiaSI6ZmFsc2V9",
           "node": {
             "digest": "Bym7b7ELP77KxVHtgj6F4FB7H6n5LYQuBQYmdvvFxEmM"
           }
         },
         {
-          "cursor": "eyJjIjoxMiwidCI6NCwidGMiOjR9",
+          "cursor": "eyJjIjoxMiwidCI6NCwiaSI6ZmFsc2V9",
           "node": {
             "digest": "H1WU8uXMGaENQs54EpoHGpV1iMYdH8P5scd1d16s9ECB"
           }
         },
         {
-          "cursor": "eyJjIjoxMiwidCI6NSwidGMiOjV9",
+          "cursor": "eyJjIjoxMiwidCI6NSwiaSI6ZmFsc2V9",
           "node": {
             "digest": "4vJbSYKwEJb5sYU2jiayqsZNRnBywD8y6sd3RQoMppF9"
           }
         },
         {
-          "cursor": "eyJjIjoxMiwidCI6NiwidGMiOjZ9",
+          "cursor": "eyJjIjoxMiwidCI6NiwiaSI6ZmFsc2V9",
           "node": {
             "digest": "4W23PZz7dHVxoZ2VMCWU9j38Jxy7tLkqcFBcJUB3aCSB"
           }
         },
         {
-          "cursor": "eyJjIjoxMiwidCI6NywidGMiOjd9",
+          "cursor": "eyJjIjoxMiwidCI6NywiaSI6ZmFsc2V9",
           "node": {
             "digest": "D251V1BnvyRKNFZmiFxaf7gSZLGdLo8fYbbVDb5vJWfd"
           }
         },
         {
-          "cursor": "eyJjIjoxMiwidCI6OCwidGMiOjh9",
+          "cursor": "eyJjIjoxMiwidCI6OCwiaSI6ZmFsc2V9",
           "node": {
             "digest": "JLAF7P6DumC8rgzT1Ygp2QgTwpHE2FUqQbVXL6cGEEQ"
           }
         },
         {
-          "cursor": "eyJjIjoxMiwidCI6OSwidGMiOjl9",
+          "cursor": "eyJjIjoxMiwidCI6OSwiaSI6ZmFsc2V9",
           "node": {
             "digest": "BVMVdn7DDpTbCjtYwWFekcFA9sNeMgDh1wTNWRrngZxh"
           }
         },
         {
-          "cursor": "eyJjIjoxMiwidCI6MTAsInRjIjoxMH0",
+          "cursor": "eyJjIjoxMiwidCI6MTAsImkiOmZhbHNlfQ",
           "node": {
             "digest": "4J5tno4AoU4NPS2NgEseAZK7cpLDh6KJduVtbtwzmHk5"
           }
@@ -382,7 +382,7 @@ Response: {
 }
 
 task 23, lines 159-199:
-//# run-graphql --cursors {"t":0,"tc":0,"c":7} {"t":4,"tc":4,"c":11} {"t":8,"tc":8,"c":12}
+//# run-graphql --cursors {"t":0,"i":false,"c":7} {"t":4,"i":false,"c":11} {"t":8,"i":false,"c":12}
 Response: {
   "data": {
     "checkpoint": {
@@ -393,19 +393,19 @@ Response: {
       "transactionBlocks": {
         "edges": [
           {
-            "cursor": "eyJjIjo3LCJ0IjoxLCJ0YyI6MX0",
+            "cursor": "eyJjIjo3LCJ0IjoxLCJpIjpmYWxzZX0",
             "node": {
               "digest": "J1pYPDrTgsKgzB8XWtW8jLJ8RPsbJcC1SQ4Mv2T1hAWt"
             }
           },
           {
-            "cursor": "eyJjIjo3LCJ0IjoyLCJ0YyI6Mn0",
+            "cursor": "eyJjIjo3LCJ0IjoyLCJpIjpmYWxzZX0",
             "node": {
               "digest": "Cwqr9jTgQjajoYaqcjzAaQGcQEyCg8XxoN7smGCLiBrs"
             }
           },
           {
-            "cursor": "eyJjIjo3LCJ0IjozLCJ0YyI6M30",
+            "cursor": "eyJjIjo3LCJ0IjozLCJpIjpmYWxzZX0",
             "node": {
               "digest": "Bym7b7ELP77KxVHtgj6F4FB7H6n5LYQuBQYmdvvFxEmM"
             }
@@ -418,19 +418,19 @@ Response: {
       "transactionBlocks": {
         "edges": [
           {
-            "cursor": "eyJjIjoxMSwidCI6NSwidGMiOjV9",
+            "cursor": "eyJjIjoxMSwidCI6NSwiaSI6ZmFsc2V9",
             "node": {
               "digest": "4vJbSYKwEJb5sYU2jiayqsZNRnBywD8y6sd3RQoMppF9"
             }
           },
           {
-            "cursor": "eyJjIjoxMSwidCI6NiwidGMiOjZ9",
+            "cursor": "eyJjIjoxMSwidCI6NiwiaSI6ZmFsc2V9",
             "node": {
               "digest": "4W23PZz7dHVxoZ2VMCWU9j38Jxy7tLkqcFBcJUB3aCSB"
             }
           },
           {
-            "cursor": "eyJjIjoxMSwidCI6NywidGMiOjd9",
+            "cursor": "eyJjIjoxMSwidCI6NywiaSI6ZmFsc2V9",
             "node": {
               "digest": "D251V1BnvyRKNFZmiFxaf7gSZLGdLo8fYbbVDb5vJWfd"
             }
@@ -443,19 +443,19 @@ Response: {
       "transactionBlocks": {
         "edges": [
           {
-            "cursor": "eyJjIjoxMiwidCI6OSwidGMiOjl9",
+            "cursor": "eyJjIjoxMiwidCI6OSwiaSI6ZmFsc2V9",
             "node": {
               "digest": "BVMVdn7DDpTbCjtYwWFekcFA9sNeMgDh1wTNWRrngZxh"
             }
           },
           {
-            "cursor": "eyJjIjoxMiwidCI6MTAsInRjIjoxMH0",
+            "cursor": "eyJjIjoxMiwidCI6MTAsImkiOmZhbHNlfQ",
             "node": {
               "digest": "4J5tno4AoU4NPS2NgEseAZK7cpLDh6KJduVtbtwzmHk5"
             }
           },
           {
-            "cursor": "eyJjIjoxMiwidCI6MTEsInRjIjoxMX0",
+            "cursor": "eyJjIjoxMiwidCI6MTEsImkiOmZhbHNlfQ",
             "node": {
               "digest": "GngPX2ztACkKE96VUfoujZ3vA11MMDhPSwwgKhK7hVa"
             }
@@ -467,7 +467,7 @@ Response: {
 }
 
 task 24, lines 201-241:
-//# run-graphql --cursors {"t":1,"tc":1,"c":2} {"t":5,"tc":5,"c":6} {"t":9,"tc":9,"c":10}
+//# run-graphql --cursors {"t":1,"i":false,"c":2} {"t":5,"i":false,"c":6} {"t":9,"i":false,"c":10}
 Response: {
   "data": {
     "checkpoint": {
@@ -478,7 +478,7 @@ Response: {
       "transactionBlocks": {
         "edges": [
           {
-            "cursor": "eyJjIjoyLCJ0IjoyLCJ0YyI6Mn0",
+            "cursor": "eyJjIjoyLCJ0IjoyLCJpIjpmYWxzZX0",
             "node": {
               "digest": "Cwqr9jTgQjajoYaqcjzAaQGcQEyCg8XxoN7smGCLiBrs"
             }
@@ -491,7 +491,7 @@ Response: {
       "transactionBlocks": {
         "edges": [
           {
-            "cursor": "eyJjIjo2LCJ0Ijo2LCJ0YyI6Nn0",
+            "cursor": "eyJjIjo2LCJ0Ijo2LCJpIjpmYWxzZX0",
             "node": {
               "digest": "4W23PZz7dHVxoZ2VMCWU9j38Jxy7tLkqcFBcJUB3aCSB"
             }
@@ -504,7 +504,7 @@ Response: {
       "transactionBlocks": {
         "edges": [
           {
-            "cursor": "eyJjIjoxMCwidCI6MTAsInRjIjoxMH0",
+            "cursor": "eyJjIjoxMCwidCI6MTAsImkiOmZhbHNlfQ",
             "node": {
               "digest": "4J5tno4AoU4NPS2NgEseAZK7cpLDh6KJduVtbtwzmHk5"
             }
@@ -516,7 +516,7 @@ Response: {
 }
 
 task 25, lines 243-282:
-//# run-graphql --cursors {"t":5,"tc":5,"c":6}
+//# run-graphql --cursors {"t":5,"i":false,"c":6}
 Response: {
   "data": {
     "checkpoint": {
@@ -525,7 +525,7 @@ Response: {
     "with_cursor": {
       "edges": [
         {
-          "cursor": "eyJjIjo2LCJ0Ijo2LCJ0YyI6Nn0",
+          "cursor": "eyJjIjo2LCJ0Ijo2LCJpIjpmYWxzZX0",
           "node": {
             "digest": "4W23PZz7dHVxoZ2VMCWU9j38Jxy7tLkqcFBcJUB3aCSB",
             "sender": {
@@ -556,7 +556,7 @@ Response: {
     "without_cursor": {
       "edges": [
         {
-          "cursor": "eyJjIjoxMiwidCI6MiwidGMiOjJ9",
+          "cursor": "eyJjIjoxMiwidCI6MiwiaSI6ZmFsc2V9",
           "node": {
             "digest": "Cwqr9jTgQjajoYaqcjzAaQGcQEyCg8XxoN7smGCLiBrs",
             "sender": {
@@ -592,7 +592,7 @@ Response: {
           }
         },
         {
-          "cursor": "eyJjIjoxMiwidCI6NCwidGMiOjR9",
+          "cursor": "eyJjIjoxMiwidCI6NCwiaSI6ZmFsc2V9",
           "node": {
             "digest": "H1WU8uXMGaENQs54EpoHGpV1iMYdH8P5scd1d16s9ECB",
             "sender": {
@@ -628,7 +628,7 @@ Response: {
           }
         },
         {
-          "cursor": "eyJjIjoxMiwidCI6NSwidGMiOjV9",
+          "cursor": "eyJjIjoxMiwidCI6NSwiaSI6ZmFsc2V9",
           "node": {
             "digest": "4vJbSYKwEJb5sYU2jiayqsZNRnBywD8y6sd3RQoMppF9",
             "sender": {
@@ -664,7 +664,7 @@ Response: {
           }
         },
         {
-          "cursor": "eyJjIjoxMiwidCI6NiwidGMiOjZ9",
+          "cursor": "eyJjIjoxMiwidCI6NiwiaSI6ZmFsc2V9",
           "node": {
             "digest": "4W23PZz7dHVxoZ2VMCWU9j38Jxy7tLkqcFBcJUB3aCSB",
             "sender": {
@@ -700,7 +700,7 @@ Response: {
           }
         },
         {
-          "cursor": "eyJjIjoxMiwidCI6OCwidGMiOjh9",
+          "cursor": "eyJjIjoxMiwidCI6OCwiaSI6ZmFsc2V9",
           "node": {
             "digest": "JLAF7P6DumC8rgzT1Ygp2QgTwpHE2FUqQbVXL6cGEEQ",
             "sender": {
@@ -736,7 +736,7 @@ Response: {
           }
         },
         {
-          "cursor": "eyJjIjoxMiwidCI6OSwidGMiOjl9",
+          "cursor": "eyJjIjoxMiwidCI6OSwiaSI6ZmFsc2V9",
           "node": {
             "digest": "BVMVdn7DDpTbCjtYwWFekcFA9sNeMgDh1wTNWRrngZxh",
             "sender": {
@@ -772,7 +772,7 @@ Response: {
           }
         },
         {
-          "cursor": "eyJjIjoxMiwidCI6MTAsInRjIjoxMH0",
+          "cursor": "eyJjIjoxMiwidCI6MTAsImkiOmZhbHNlfQ",
           "node": {
             "digest": "4J5tno4AoU4NPS2NgEseAZK7cpLDh6KJduVtbtwzmHk5",
             "sender": {
diff --git a/crates/sui-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.move b/crates/sui-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.move
index 39c8368818df3..425849aef9e16 100644
--- a/crates/sui-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.move
+++ b/crates/sui-graphql-e2e-tests/tests/consistency/epochs/transaction_blocks.move
@@ -90,7 +90,7 @@ module Test::M1 {
 
 //# advance-epoch
 
-//# run-graphql --cursors {"t":3,"tc":3,"c":4} {"t":7,"tc":7,"c":8} {"t":11,"tc":11,"c":12}
+//# run-graphql --cursors {"t":3,"i":false,"c":4} {"t":7,"i":false,"c":8} {"t":11,"i":false,"c":12}
 # View transactions before the last transaction in each epoch, from the perspective of the first
 # checkpoint in the next epoch.
 {
@@ -156,7 +156,7 @@ module Test::M1 {
   }
 }
 
-//# run-graphql --cursors {"t":0,"tc":0,"c":7} {"t":4,"tc":4,"c":11} {"t":8,"tc":8,"c":12}
+//# run-graphql --cursors {"t":0,"i":false,"c":7} {"t":4,"i":false,"c":11} {"t":8,"i":false,"c":12}
 # View transactions after the first transaction in each epoch, from the perspective of the last
 # checkpoint in the next epoch.
 {
@@ -198,7 +198,7 @@ module Test::M1 {
   }
 }
 
-//# run-graphql --cursors {"t":1,"tc":1,"c":2} {"t":5,"tc":5,"c":6} {"t":9,"tc":9,"c":10}
+//# run-graphql --cursors {"t":1,"i":false,"c":2} {"t":5,"i":false,"c":6} {"t":9,"i":false,"c":10}
 # View transactions after the second transaction in each epoch, from the perspective of a checkpoint
 # around the middle of each epoch.
 {
@@ -240,7 +240,7 @@ module Test::M1 {
   }
 }
 
-//# run-graphql --cursors {"t":5,"tc":5,"c":6}
+//# run-graphql --cursors {"t":5,"i":false,"c":6}
 # Verify that with a cursor, we are locked into a view as if we were at the checkpoint stored in
 # the cursor. Compare against `without_cursor`, which should show the latest state at the actual
 # latest checkpoint. There should only be 1 transaction block in the `with_cursor` query, but
diff --git a/crates/sui-graphql-e2e-tests/tests/epoch/chain_identifier.exp b/crates/sui-graphql-e2e-tests/tests/epoch/chain_identifier.exp
new file mode 100644
index 0000000000000..c53d33a750392
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/epoch/chain_identifier.exp
@@ -0,0 +1,16 @@
+processed 3 tasks
+
+init:
+C: object(0,0)
+
+task 1, line 7:
+//# create-checkpoint
+Checkpoint created: 1
+
+task 2, lines 9-12:
+//# run-graphql
+Response: {
+  "data": {
+    "chainIdentifier": "8f58ad28"
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/epoch/chain_identifier.move b/crates/sui-graphql-e2e-tests/tests/epoch/chain_identifier.move
new file mode 100644
index 0000000000000..22f11bcf6277e
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/epoch/chain_identifier.move
@@ -0,0 +1,12 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+//# init --protocol-version 48 --simulator --accounts C
+
+
+//# create-checkpoint
+
+//# run-graphql
+{
+    chainIdentifier
+}
\ No newline at end of file
diff --git a/crates/sui-graphql-e2e-tests/tests/epoch/protocol_configs.exp b/crates/sui-graphql-e2e-tests/tests/epoch/protocol_configs.exp
new file mode 100644
index 0000000000000..e237e6000cd9a
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/epoch/protocol_configs.exp
@@ -0,0 +1,40 @@
+processed 4 tasks
+
+init:
+C: object(0,0)
+
+task 1, line 6:
+//# create-checkpoint
+Checkpoint created: 1
+
+task 2, lines 8-19:
+//# run-graphql
+Response: {
+  "data": {
+    "protocolConfig": {
+      "protocolVersion": 51,
+      "config": {
+        "value": "128"
+      },
+      "featureFlag": {
+        "value": true
+      }
+    }
+  }
+}
+
+task 3, lines 21-32:
+//# run-graphql
+Response: {
+  "data": {
+    "protocolConfig": {
+      "protocolVersion": 8,
+      "config": {
+        "value": null
+      },
+      "featureFlag": {
+        "value": false
+      }
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/epoch/protocol_configs.move b/crates/sui-graphql-e2e-tests/tests/epoch/protocol_configs.move
new file mode 100644
index 0000000000000..901326e4969a3
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/epoch/protocol_configs.move
@@ -0,0 +1,32 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+//# init --protocol-version 51 --simulator --accounts C
+
+//# create-checkpoint
+
+//# run-graphql
+{
+    protocolConfig {
+        protocolVersion
+        config(key: "max_move_identifier_len") {
+            value
+        }
+        featureFlag(key: "enable_coin_deny_list") {
+            value
+        }
+    }
+}
+
+//# run-graphql
+{
+    protocolConfig(protocolVersion: 8) {
+        protocolVersion
+        config(key: "max_move_identifier_len") {
+            value
+        }
+        featureFlag(key: "enable_coin_deny_list") {
+            value
+        }
+    }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/event_connection/combo_filter_error.exp b/crates/sui-graphql-e2e-tests/tests/event_connection/combo_filter_error.exp
new file mode 100644
index 0000000000000..2e134867efbdc
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/event_connection/combo_filter_error.exp
@@ -0,0 +1,43 @@
+processed 5 tasks
+
+init:
+A: object(0,0), B: object(0,1)
+
+task 1, lines 9-28:
+//# publish
+created: object(1,0)
+mutated: object(0,2)
+gas summary: computation_cost: 1000000, storage_cost: 5380800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 2, line 30:
+//# run Test::M2::emit_emit_a --sender A --args 20
+events: Event { package_id: Test, transaction_module: Identifier("M2"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [20, 0, 0, 0, 0, 0, 0, 0] }
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 988000,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 3, line 32:
+//# create-checkpoint
+Checkpoint created: 1
+
+task 4, lines 34-51:
+//# run-graphql
+Response: {
+  "data": null,
+  "errors": [
+    {
+      "message": "Filtering by both emitting module and event type is not supported",
+      "locations": [
+        {
+          "line": 2,
+          "column": 3
+        }
+      ],
+      "path": [
+        "events"
+      ],
+      "extensions": {
+        "code": "BAD_USER_INPUT"
+      }
+    }
+  ]
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/event_connection/combo_filter_error.move b/crates/sui-graphql-e2e-tests/tests/event_connection/combo_filter_error.move
new file mode 100644
index 0000000000000..ad38316463e76
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/event_connection/combo_filter_error.move
@@ -0,0 +1,51 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+// Tests that fetching events filtered on both emitting module and event would result
+// in an error.
+
+//# init --protocol-version 51 --addresses Test=0x0 --accounts A B --simulator
+
+//# publish
+module Test::M1 {
+    use sui::event;
+
+    public struct EventA has copy, drop {
+        new_value: u64
+    }
+
+    public fun emit_a(value: u64) {
+        event::emit(EventA { new_value: value })
+    }
+}
+
+module Test::M2 {
+    use Test::M1;
+
+    public fun emit_emit_a(value: u64) {
+        M1::emit_a(value);
+    }
+}
+
+//# run Test::M2::emit_emit_a --sender A --args 20
+
+//# create-checkpoint
+
+//# run-graphql
+{
+  events(filter: {sender: "@{A}", emittingModule: "@{Test}::M2", eventType: "@{Test}::M1::EventA"}) {
+    nodes {
+      sendingModule {
+        name
+      }
+      type {
+        repr
+      }
+      sender {
+        address
+      }
+      json
+      bcs
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/event_connection/no_filter.exp b/crates/sui-graphql-e2e-tests/tests/event_connection/no_filter.exp
new file mode 100644
index 0000000000000..3d916fe5b9508
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/event_connection/no_filter.exp
@@ -0,0 +1,254 @@
+processed 6 tasks
+
+init:
+A: object(0,0)
+
+task 1, lines 6-25:
+//# publish
+created: object(1,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 4970400,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 2, line 27:
+//# run Test::M1::emit --sender A --args 0
+events: Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [0, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [1, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [2, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [3, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [4, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [5, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [6, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [7, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [8, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [9, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [10, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [11, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [12, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [13, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [14, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [15, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [16, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [17, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [18, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [19, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [20, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [21, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [22, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [23, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [24, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [25, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [26, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [27, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [28, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [29, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [30, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [31, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [32, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [33, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [34, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [35, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [36, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [37, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [38, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [39, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [40, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [41, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [42, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [43, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [44, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [45, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [46, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [47, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [48, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [49, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [50, 0, 0, 0, 0, 0, 0, 0] }
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 988000,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 3, line 29:
+//# create-checkpoint
+Checkpoint created: 1
+
+task 4, lines 31-44:
+//# run-graphql
+Response: {
+  "data": {
+    "events": {
+      "pageInfo": {
+        "hasPreviousPage": false,
+        "hasNextPage": true,
+        "startCursor": "eyJ0eCI6MiwiZSI6MCwiYyI6MX0",
+        "endCursor": "eyJ0eCI6MiwiZSI6MTksImMiOjF9"
+      },
+      "nodes": [
+        {
+          "json": {
+            "new_value": "0"
+          }
+        },
+        {
+          "json": {
+            "new_value": "1"
+          }
+        },
+        {
+          "json": {
+            "new_value": "2"
+          }
+        },
+        {
+          "json": {
+            "new_value": "3"
+          }
+        },
+        {
+          "json": {
+            "new_value": "4"
+          }
+        },
+        {
+          "json": {
+            "new_value": "5"
+          }
+        },
+        {
+          "json": {
+            "new_value": "6"
+          }
+        },
+        {
+          "json": {
+            "new_value": "7"
+          }
+        },
+        {
+          "json": {
+            "new_value": "8"
+          }
+        },
+        {
+          "json": {
+            "new_value": "9"
+          }
+        },
+        {
+          "json": {
+            "new_value": "10"
+          }
+        },
+        {
+          "json": {
+            "new_value": "11"
+          }
+        },
+        {
+          "json": {
+            "new_value": "12"
+          }
+        },
+        {
+          "json": {
+            "new_value": "13"
+          }
+        },
+        {
+          "json": {
+            "new_value": "14"
+          }
+        },
+        {
+          "json": {
+            "new_value": "15"
+          }
+        },
+        {
+          "json": {
+            "new_value": "16"
+          }
+        },
+        {
+          "json": {
+            "new_value": "17"
+          }
+        },
+        {
+          "json": {
+            "new_value": "18"
+          }
+        },
+        {
+          "json": {
+            "new_value": "19"
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 5, lines 46-59:
+//# run-graphql --cursors {"tx":2,"e":19,"c":1}
+Response: {
+  "data": {
+    "events": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJ0eCI6MiwiZSI6MjAsImMiOjF9",
+        "endCursor": "eyJ0eCI6MiwiZSI6MzksImMiOjF9"
+      },
+      "nodes": [
+        {
+          "json": {
+            "new_value": "20"
+          }
+        },
+        {
+          "json": {
+            "new_value": "21"
+          }
+        },
+        {
+          "json": {
+            "new_value": "22"
+          }
+        },
+        {
+          "json": {
+            "new_value": "23"
+          }
+        },
+        {
+          "json": {
+            "new_value": "24"
+          }
+        },
+        {
+          "json": {
+            "new_value": "25"
+          }
+        },
+        {
+          "json": {
+            "new_value": "26"
+          }
+        },
+        {
+          "json": {
+            "new_value": "27"
+          }
+        },
+        {
+          "json": {
+            "new_value": "28"
+          }
+        },
+        {
+          "json": {
+            "new_value": "29"
+          }
+        },
+        {
+          "json": {
+            "new_value": "30"
+          }
+        },
+        {
+          "json": {
+            "new_value": "31"
+          }
+        },
+        {
+          "json": {
+            "new_value": "32"
+          }
+        },
+        {
+          "json": {
+            "new_value": "33"
+          }
+        },
+        {
+          "json": {
+            "new_value": "34"
+          }
+        },
+        {
+          "json": {
+            "new_value": "35"
+          }
+        },
+        {
+          "json": {
+            "new_value": "36"
+          }
+        },
+        {
+          "json": {
+            "new_value": "37"
+          }
+        },
+        {
+          "json": {
+            "new_value": "38"
+          }
+        },
+        {
+          "json": {
+            "new_value": "39"
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/event_connection/no_filter.move b/crates/sui-graphql-e2e-tests/tests/event_connection/no_filter.move
new file mode 100644
index 0000000000000..aaca18be1a12a
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/event_connection/no_filter.move
@@ -0,0 +1,59 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+//# init --protocol-version 48 --addresses Test=0x0 --accounts A --simulator
+
+//# publish
+module Test::M1 {
+    use sui::event;
+
+    public struct EventA has copy, drop {
+        new_value: u64
+    }
+
+    public entry fun no_emit(value: u64): u64 {
+        value
+    }
+
+    public entry fun emit(value: u64) {
+        let mut i = 0;
+        while (i < 51) {
+            event::emit(EventA { new_value: value + i });
+            i = i + 1;
+        }
+    }
+}
+
+//# run Test::M1::emit --sender A --args 0
+
+//# create-checkpoint
+
+//# run-graphql
+{
+    events {
+        pageInfo {
+            hasPreviousPage
+            hasNextPage
+            startCursor
+            endCursor
+        }
+        nodes {
+            json
+        }
+    }
+}
+
+//# run-graphql --cursors {"tx":2,"e":19,"c":1}
+{
+    events(after: "@{cursor_0}") {
+        pageInfo {
+            hasPreviousPage
+            hasNextPage
+            startCursor
+            endCursor
+        }
+        nodes {
+            json
+        }
+    }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/event_connection/tx_digest.exp b/crates/sui-graphql-e2e-tests/tests/event_connection/tx_digest.exp
new file mode 100644
index 0000000000000..12f3b6c2ebbb3
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/event_connection/tx_digest.exp
@@ -0,0 +1,326 @@
+processed 21 tasks
+
+init:
+A: object(0,0), B: object(0,1)
+
+task 1, lines 10-26:
+//# publish
+created: object(1,0)
+mutated: object(0,2)
+gas summary: computation_cost: 1000000, storage_cost: 4795600,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 2, line 28:
+//# run Test::M1::no_emit --sender A --args 0
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 988000,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 3, line 30:
+//# run Test::M1::emit_2 --sender A --args 2
+events: Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [2, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [3, 0, 0, 0, 0, 0, 0, 0] }
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 988000,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 4, line 32:
+//# run Test::M1::emit_2 --sender B --args 4
+events: Event { package_id: Test, transaction_module: Identifier("M1"), sender: B, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [4, 0, 0, 0, 0, 0, 0, 0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: B, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [5, 0, 0, 0, 0, 0, 0, 0] }
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 988000,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 5, line 34:
+//# create-checkpoint
+Checkpoint created: 1
+
+task 6, lines 36-43:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "nodes": [
+        {
+          "digest": "AXoD3PWjAdYov3o7FaWgAqJA8RmvQrjwxGxAi2MNEujz"
+        },
+        {
+          "digest": "3nuQk9o2VVoqWbF6gS5vBTPwVLhMRbFJREDCvQJUavZ2"
+        },
+        {
+          "digest": "5VAhspujQVcgJNvqe9Ed8BuFTeZdTRCCTzS6WwSZ9Dke"
+        },
+        {
+          "digest": "8n1pk5fYM7v7tvsh4dcKxLRy8uf3he24FZCwdEKi9cSj"
+        },
+        {
+          "digest": "4dqR1zeomDMNHbUAZjooSZXrosPEb67gvvsUFeUSet9v"
+        }
+      ]
+    }
+  }
+}
+
+task 7, lines 45-55:
+//# run-graphql
+Response: {
+  "data": {
+    "events": {
+      "edges": [
+        {
+          "cursor": "eyJ0eCI6MywiZSI6MCwiYyI6MX0",
+          "node": {
+            "json": {
+              "new_value": "2"
+            }
+          }
+        },
+        {
+          "cursor": "eyJ0eCI6MywiZSI6MSwiYyI6MX0",
+          "node": {
+            "json": {
+              "new_value": "3"
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 8, lines 57-68:
+//# run-graphql --cursors {"tx":3,"e":1,"c":1}
+Response: {
+  "data": {
+    "events": {
+      "edges": []
+    }
+  }
+}
+
+task 9, lines 70-83:
+//# run-graphql --cursors {"tx":1,"e":1,"c":1}
+Response: {
+  "data": {
+    "events": {
+      "edges": []
+    }
+  }
+}
+
+task 10, lines 86-96:
+//# run-graphql
+Response: {
+  "data": {
+    "events": {
+      "edges": [
+        {
+          "cursor": "eyJ0eCI6NCwiZSI6MCwiYyI6MX0",
+          "node": {
+            "json": {
+              "new_value": "4"
+            }
+          }
+        },
+        {
+          "cursor": "eyJ0eCI6NCwiZSI6MSwiYyI6MX0",
+          "node": {
+            "json": {
+              "new_value": "5"
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 11, lines 98-108:
+//# run-graphql --cursors {"tx":4,"e":0,"c":1}
+Response: {
+  "data": {
+    "events": {
+      "edges": [
+        {
+          "cursor": "eyJ0eCI6NCwiZSI6MSwiYyI6MX0",
+          "node": {
+            "json": {
+              "new_value": "5"
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 12, lines 111-121:
+//# run-graphql
+Response: {
+  "data": {
+    "events": {
+      "edges": [
+        {
+          "cursor": "eyJ0eCI6MywiZSI6MCwiYyI6MX0",
+          "node": {
+            "json": {
+              "new_value": "2"
+            }
+          }
+        },
+        {
+          "cursor": "eyJ0eCI6MywiZSI6MSwiYyI6MX0",
+          "node": {
+            "json": {
+              "new_value": "3"
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 13, lines 123-134:
+//# run-graphql --cursors {"tx":3,"e":1,"c":1}
+Response: {
+  "data": {
+    "events": {
+      "edges": [
+        {
+          "cursor": "eyJ0eCI6MywiZSI6MCwiYyI6MX0",
+          "node": {
+            "json": {
+              "new_value": "2"
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 14, lines 136-149:
+//# run-graphql --cursors {"tx":4,"e":1,"c":1}
+Response: {
+  "data": {
+    "events": {
+      "edges": []
+    }
+  }
+}
+
+task 15, lines 152-162:
+//# run-graphql
+Response: {
+  "data": {
+    "events": {
+      "edges": [
+        {
+          "cursor": "eyJ0eCI6NCwiZSI6MCwiYyI6MX0",
+          "node": {
+            "json": {
+              "new_value": "4"
+            }
+          }
+        },
+        {
+          "cursor": "eyJ0eCI6NCwiZSI6MSwiYyI6MX0",
+          "node": {
+            "json": {
+              "new_value": "5"
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 16, lines 164-174:
+//# run-graphql --cursors {"tx":4,"e":1,"c":1}
+Response: {
+  "data": {
+    "events": {
+      "edges": [
+        {
+          "cursor": "eyJ0eCI6NCwiZSI6MCwiYyI6MX0",
+          "node": {
+            "json": {
+              "new_value": "4"
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 17, lines 176-187:
+//# run-graphql
+Response: {
+  "data": {
+    "events": {
+      "edges": [
+        {
+          "cursor": "eyJ0eCI6MywiZSI6MCwiYyI6MX0",
+          "node": {
+            "json": {
+              "new_value": "2"
+            }
+          }
+        },
+        {
+          "cursor": "eyJ0eCI6MywiZSI6MSwiYyI6MX0",
+          "node": {
+            "json": {
+              "new_value": "3"
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 18, lines 189-200:
+//# run-graphql
+Response: {
+  "data": {
+    "events": {
+      "edges": [
+        {
+          "cursor": "eyJ0eCI6NCwiZSI6MCwiYyI6MX0",
+          "node": {
+            "json": {
+              "new_value": "4"
+            }
+          }
+        },
+        {
+          "cursor": "eyJ0eCI6NCwiZSI6MSwiYyI6MX0",
+          "node": {
+            "json": {
+              "new_value": "5"
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 19, lines 202-213:
+//# run-graphql
+Response: {
+  "data": {
+    "events": {
+      "edges": []
+    }
+  }
+}
+
+task 20, lines 215-226:
+//# run-graphql
+Response: {
+  "data": {
+    "events": {
+      "edges": []
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/event_connection/tx_digest.move b/crates/sui-graphql-e2e-tests/tests/event_connection/tx_digest.move
new file mode 100644
index 0000000000000..58b17e5fd21d8
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/event_connection/tx_digest.move
@@ -0,0 +1,226 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+// Tests that fetching events filtered on a tx digest that has no events correctly returns no nodes.
+// Also tests that fetching events filtered on a tx digest that has events returns the correct
+// number of page-limit-bound nodes.
+
+//# init --protocol-version 48 --addresses Test=0x0 --accounts A B --simulator
+
+//# publish
+module Test::M1 {
+    use sui::event;
+
+    public struct EventA has copy, drop {
+        new_value: u64
+    }
+
+    public entry fun no_emit(value: u64): u64 {
+        value
+    }
+
+    public entry fun emit_2(value: u64) {
+        event::emit(EventA { new_value: value });
+        event::emit(EventA { new_value: value + 1})
+    }
+}
+
+//# run Test::M1::no_emit --sender A --args 0
+
+//# run Test::M1::emit_2 --sender A --args 2
+
+//# run Test::M1::emit_2 --sender B --args 4
+
+//# create-checkpoint
+
+//# run-graphql
+{
+    transactionBlocks {
+        nodes {
+            digest
+        }
+    }
+}
+
+//# run-graphql
+{
+    events(filter: {transactionDigest: "8n1pk5fYM7v7tvsh4dcKxLRy8uf3he24FZCwdEKi9cSj"}) {
+        edges {
+            cursor
+            node {
+                json
+            }
+        }
+    }
+}
+
+//# run-graphql --cursors {"tx":3,"e":1,"c":1}
+# When the tx digest and after cursor are on the same tx, we'll use the after cursor's event sequence number
+{
+    events(after: "@{cursor_0}" filter: {transactionDigest: "8n1pk5fYM7v7tvsh4dcKxLRy8uf3he24FZCwdEKi9cSj"}) {
+        edges {
+            cursor
+            node {
+                json
+            }
+        }
+    }
+}
+
+//# run-graphql --cursors {"tx":1,"e":1,"c":1}
+# If the after cursor does not match the transaction digest's tx sequence number,
+# we will get an empty response, since it's not possible to fetch an event
+# that isn't of the same tx sequence number
+{
+    events(after: "@{cursor_0}" filter: {transactionDigest: "8n1pk5fYM7v7tvsh4dcKxLRy8uf3he24FZCwdEKi9cSj"}) {
+        edges {
+            cursor
+            node {
+                json
+            }
+        }
+    }
+}
+
+
+//# run-graphql
+{
+    events(filter: {transactionDigest: "4dqR1zeomDMNHbUAZjooSZXrosPEb67gvvsUFeUSet9v"}) {
+        edges {
+            cursor
+            node {
+                json
+            }
+        }
+    }
+}
+
+//# run-graphql --cursors {"tx":4,"e":0,"c":1}
+{
+    events(after: "@{cursor_0}" filter: {transactionDigest: "4dqR1zeomDMNHbUAZjooSZXrosPEb67gvvsUFeUSet9v"}) {
+        edges {
+            cursor
+            node {
+                json
+            }
+        }
+    }
+}
+
+
+//# run-graphql
+{
+    events(last: 10 filter: {transactionDigest: "8n1pk5fYM7v7tvsh4dcKxLRy8uf3he24FZCwdEKi9cSj"}) {
+        edges {
+            cursor
+            node {
+                json
+            }
+        }
+    }
+}
+
+//# run-graphql --cursors {"tx":3,"e":1,"c":1}
+# When the tx digest and cursor are on the same tx, we'll use the cursor's event sequence number
+{
+    events(last: 10 before: "@{cursor_0}" filter: {transactionDigest: "8n1pk5fYM7v7tvsh4dcKxLRy8uf3he24FZCwdEKi9cSj"}) {
+        edges {
+            cursor
+            node {
+                json
+            }
+        }
+    }
+}
+
+//# run-graphql --cursors {"tx":4,"e":1,"c":1}
+# If the cursor does not match the transaction digest's tx sequence number,
+# we will get an empty response, since it's not possible to fetch an event
+# that isn't of the same tx sequence number
+{
+    events(last: 10 before: "@{cursor_0}" filter: {transactionDigest: "8n1pk5fYM7v7tvsh4dcKxLRy8uf3he24FZCwdEKi9cSj"}) {
+        edges {
+            cursor
+            node {
+                json
+            }
+        }
+    }
+}
+
+
+//# run-graphql
+{
+    events(last: 10 filter: {transactionDigest: "4dqR1zeomDMNHbUAZjooSZXrosPEb67gvvsUFeUSet9v"}) {
+        edges {
+            cursor
+            node {
+                json
+            }
+        }
+    }
+}
+
+//# run-graphql --cursors {"tx":4,"e":1,"c":1}
+{
+    events(last: 10 before: "@{cursor_0}" filter: {transactionDigest: "4dqR1zeomDMNHbUAZjooSZXrosPEb67gvvsUFeUSet9v"}) {
+        edges {
+            cursor
+            node {
+                json
+            }
+        }
+    }
+}
+
+//# run-graphql
+# correct sender
+{
+    events(filter: {sender: "@{A}" transactionDigest: "8n1pk5fYM7v7tvsh4dcKxLRy8uf3he24FZCwdEKi9cSj"}) {
+        edges {
+            cursor
+            node {
+                json
+            }
+        }
+    }
+}
+
+//# run-graphql
+# correct sender
+{
+    events(filter: {sender: "@{B}" transactionDigest: "4dqR1zeomDMNHbUAZjooSZXrosPEb67gvvsUFeUSet9v"}) {
+        edges {
+            cursor
+            node {
+                json
+            }
+        }
+    }
+}
+
+//# run-graphql
+# incorrect sender
+{
+    events(filter: {sender: "@{B}" transactionDigest: "8n1pk5fYM7v7tvsh4dcKxLRy8uf3he24FZCwdEKi9cSj"}) {
+        edges {
+            cursor
+            node {
+                json
+            }
+        }
+    }
+}
+
+//# run-graphql
+# incorrect sender
+{
+    events(filter: {sender: "@{A}" transactionDigest: "4dqR1zeomDMNHbUAZjooSZXrosPEb67gvvsUFeUSet9v"}) {
+        edges {
+            cursor
+            node {
+                json
+            }
+        }
+    }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/event_connection/type_filter.exp b/crates/sui-graphql-e2e-tests/tests/event_connection/type_filter.exp
new file mode 100644
index 0000000000000..3afb31848780e
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/event_connection/type_filter.exp
@@ -0,0 +1,211 @@
+processed 12 tasks
+
+init:
+A: object(0,0), B: object(0,1)
+
+task 1, lines 6-34:
+//# publish
+created: object(1,0)
+mutated: object(0,2)
+gas summary: computation_cost: 1000000, storage_cost: 6604400,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 2, line 36:
+//# run Test::M2::emit_emit_a --sender A --args 20
+events: Event { package_id: Test, transaction_module: Identifier("M2"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [] }, contents: [20, 0, 0, 0, 0, 0, 0, 0] }
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 988000,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 3, line 38:
+//# create-checkpoint
+Checkpoint created: 1
+
+task 4, lines 40-57:
+//# run-graphql
+Response: {
+  "data": {
+    "events": {
+      "nodes": [
+        {
+          "sendingModule": {
+            "name": "M2"
+          },
+          "type": {
+            "repr": "0x6edb181eb03cea19a3c4b09d2d6b5de8d0a741df186d072d18b2030eb36faee1::M1::EventA"
+          },
+          "sender": {
+            "address": "0xfccc9a421bbb13c1a66a1aa98f0ad75029ede94857779c6915b44f94068b921e"
+          },
+          "json": {
+            "new_value": "20"
+          },
+          "bcs": "FAAAAAAAAAA="
+        }
+      ]
+    }
+  }
+}
+
+task 5, line 59:
+//# run Test::M2::emit_b --sender A --args 42
+events: Event { package_id: Test, transaction_module: Identifier("M2"), sender: A, type_: StructTag { address: Test, module: Identifier("M2"), name: Identifier("EventB"), type_params: [] }, contents: [42, 0, 0, 0, 0, 0, 0, 0] }
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 988000,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 6, line 61:
+//# run Test::M2::emit_b --sender B --args 43
+events: Event { package_id: Test, transaction_module: Identifier("M2"), sender: B, type_: StructTag { address: Test, module: Identifier("M2"), name: Identifier("EventB"), type_params: [] }, contents: [43, 0, 0, 0, 0, 0, 0, 0] }
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 988000,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 7, line 63:
+//# create-checkpoint
+Checkpoint created: 2
+
+task 8, lines 65-82:
+//# run-graphql
+Response: {
+  "data": {
+    "events": {
+      "nodes": [
+        {
+          "sendingModule": {
+            "name": "M2"
+          },
+          "type": {
+            "repr": "0x6edb181eb03cea19a3c4b09d2d6b5de8d0a741df186d072d18b2030eb36faee1::M1::EventA"
+          },
+          "sender": {
+            "address": "0xfccc9a421bbb13c1a66a1aa98f0ad75029ede94857779c6915b44f94068b921e"
+          },
+          "json": {
+            "new_value": "20"
+          },
+          "bcs": "FAAAAAAAAAA="
+        }
+      ]
+    }
+  }
+}
+
+task 9, lines 84-101:
+//# run-graphql
+Response: {
+  "data": {
+    "events": {
+      "nodes": [
+        {
+          "sendingModule": {
+            "name": "M2"
+          },
+          "type": {
+            "repr": "0x6edb181eb03cea19a3c4b09d2d6b5de8d0a741df186d072d18b2030eb36faee1::M2::EventB"
+          },
+          "sender": {
+            "address": "0xfccc9a421bbb13c1a66a1aa98f0ad75029ede94857779c6915b44f94068b921e"
+          },
+          "json": {
+            "new_value": "42"
+          },
+          "bcs": "KgAAAAAAAAA="
+        }
+      ]
+    }
+  }
+}
+
+task 10, lines 103-120:
+//# run-graphql
+Response: {
+  "data": {
+    "events": {
+      "nodes": [
+        {
+          "sendingModule": {
+            "name": "M2"
+          },
+          "type": {
+            "repr": "0x6edb181eb03cea19a3c4b09d2d6b5de8d0a741df186d072d18b2030eb36faee1::M1::EventA"
+          },
+          "sender": {
+            "address": "0xfccc9a421bbb13c1a66a1aa98f0ad75029ede94857779c6915b44f94068b921e"
+          },
+          "json": {
+            "new_value": "20"
+          },
+          "bcs": "FAAAAAAAAAA="
+        },
+        {
+          "sendingModule": {
+            "name": "M2"
+          },
+          "type": {
+            "repr": "0x6edb181eb03cea19a3c4b09d2d6b5de8d0a741df186d072d18b2030eb36faee1::M2::EventB"
+          },
+          "sender": {
+            "address": "0xfccc9a421bbb13c1a66a1aa98f0ad75029ede94857779c6915b44f94068b921e"
+          },
+          "json": {
+            "new_value": "42"
+          },
+          "bcs": "KgAAAAAAAAA="
+        }
+      ]
+    }
+  }
+}
+
+task 11, lines 122-139:
+//# run-graphql
+Response: {
+  "data": {
+    "events": {
+      "nodes": [
+        {
+          "sendingModule": {
+            "name": "M2"
+          },
+          "type": {
+            "repr": "0x6edb181eb03cea19a3c4b09d2d6b5de8d0a741df186d072d18b2030eb36faee1::M1::EventA"
+          },
+          "sender": {
+            "address": "0xfccc9a421bbb13c1a66a1aa98f0ad75029ede94857779c6915b44f94068b921e"
+          },
+          "json": {
+            "new_value": "20"
+          },
+          "bcs": "FAAAAAAAAAA="
+        },
+        {
+          "sendingModule": {
+            "name": "M2"
+          },
+          "type": {
+            "repr": "0x6edb181eb03cea19a3c4b09d2d6b5de8d0a741df186d072d18b2030eb36faee1::M2::EventB"
+          },
+          "sender": {
+            "address": "0xfccc9a421bbb13c1a66a1aa98f0ad75029ede94857779c6915b44f94068b921e"
+          },
+          "json": {
+            "new_value": "42"
+          },
+          "bcs": "KgAAAAAAAAA="
+        },
+        {
+          "sendingModule": {
+            "name": "M2"
+          },
+          "type": {
+            "repr": "0x6edb181eb03cea19a3c4b09d2d6b5de8d0a741df186d072d18b2030eb36faee1::M2::EventB"
+          },
+          "sender": {
+            "address": "0xa7b032703878aa74c3126935789fd1d4d7e111d5911b09247d6963061c312b5a"
+          },
+          "json": {
+            "new_value": "43"
+          },
+          "bcs": "KwAAAAAAAAA="
+        }
+      ]
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/event_connection/type_filter.move b/crates/sui-graphql-e2e-tests/tests/event_connection/type_filter.move
new file mode 100644
index 0000000000000..0ca546a3a94ef
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/event_connection/type_filter.move
@@ -0,0 +1,140 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+//# init --protocol-version 51 --addresses Test=0x0 --accounts A B --simulator
+
+//# publish
+module Test::M1 {
+    use sui::event;
+
+    public struct EventA has copy, drop {
+        new_value: u64
+    }
+
+    public fun emit_a(value: u64) {
+        event::emit(EventA { new_value: value })
+    }
+}
+
+module Test::M2 {
+    use sui::event;
+    use Test::M1;
+
+    public struct EventB has copy, drop {
+        new_value: u64
+    }
+
+    public fun emit_emit_a(value: u64) {
+        M1::emit_a(value);
+    }
+
+    public fun emit_b(value: u64) {
+        event::emit(EventB { new_value: value })
+    }
+}
+
+//# run Test::M2::emit_emit_a --sender A --args 20
+
+//# create-checkpoint
+
+//# run-graphql
+{
+  events(filter: {sender: "@{A}", eventType: "@{Test}::M1::EventA"}) {
+    nodes {
+      sendingModule {
+        name
+      }
+      type {
+        repr
+      }
+      sender {
+        address
+      }
+      json
+      bcs
+    }
+  }
+}
+
+//# run Test::M2::emit_b --sender A --args 42
+
+//# run Test::M2::emit_b --sender B --args 43
+
+//# create-checkpoint
+
+//# run-graphql
+{
+  events(filter: {sender: "@{A}", eventType: "@{Test}::M1"}) {
+    nodes {
+      sendingModule {
+        name
+      }
+      type {
+        repr
+      }
+      sender {
+        address
+      }
+      json
+      bcs
+    }
+  }
+}
+
+//# run-graphql
+{
+  events(filter: {sender: "@{A}", eventType: "@{Test}::M2"}) {
+    nodes {
+      sendingModule {
+        name
+      }
+      type {
+        repr
+      }
+      sender {
+        address
+      }
+      json
+      bcs
+    }
+  }
+}
+
+//# run-graphql
+{
+  events(filter: {sender: "@{A}", eventType: "@{Test}"}) {
+    nodes {
+      sendingModule {
+        name
+      }
+      type {
+        repr
+      }
+      sender {
+        address
+      }
+      json
+      bcs
+    }
+  }
+}
+
+//# run-graphql
+{
+  events(filter: {eventType: "@{Test}"}) {
+    nodes {
+      sendingModule {
+        name
+      }
+      type {
+        repr
+      }
+      sender {
+        address
+      }
+      json
+      bcs
+    }
+  }
+}
+
diff --git a/crates/sui-graphql-e2e-tests/tests/event_connection/type_param_filter.exp b/crates/sui-graphql-e2e-tests/tests/event_connection/type_param_filter.exp
new file mode 100644
index 0000000000000..383af1455f8f3
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/event_connection/type_param_filter.exp
@@ -0,0 +1,182 @@
+processed 10 tasks
+
+init:
+A: object(0,0), B: object(0,1)
+
+task 1, lines 6-29:
+//# publish
+created: object(1,0)
+mutated: object(0,2)
+gas summary: computation_cost: 1000000, storage_cost: 5996400,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 2, line 32:
+//# run Test::M1::emit_T1 --sender A
+events: Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [Struct(StructTag { address: Test, module: Identifier("M1"), name: Identifier("T1"), type_params: [] })] }, contents: [0] }
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 988000,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 3, line 34:
+//# run Test::M1::emit_T2 --sender A
+events: Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [Struct(StructTag { address: Test, module: Identifier("M1"), name: Identifier("T2"), type_params: [] })] }, contents: [0] }
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 988000,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 4, line 36:
+//# run Test::M1::emit_both --sender A
+events: Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [Struct(StructTag { address: Test, module: Identifier("M1"), name: Identifier("T1"), type_params: [] })] }, contents: [0] }, Event { package_id: Test, transaction_module: Identifier("M1"), sender: A, type_: StructTag { address: Test, module: Identifier("M1"), name: Identifier("EventA"), type_params: [Struct(StructTag { address: Test, module: Identifier("M1"), name: Identifier("T2"), type_params: [] })] }, contents: [0] }
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 988000,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 5, line 38:
+//# create-checkpoint
+Checkpoint created: 1
+
+task 6, lines 40-47:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "nodes": [
+        {
+          "digest": "J7mHXcoa7LXwyjzZUWsk8zvYZjek359TM4d2hQK4LGHo"
+        },
+        {
+          "digest": "Ch3i5cdtNPU5v8oSg3V5cdKtZDa3YjqjMd7Qh4NQLAx6"
+        },
+        {
+          "digest": "6taTf6v2NQCFtd9A4nw3mBbkHwUw8RUoJjqQGSB5cBNt"
+        },
+        {
+          "digest": "AEXpVZ7Vpsk7ZSTsR2QNPT7zhq8oqpJXRGgx3kAaTdn"
+        },
+        {
+          "digest": "9nu1ivpL9hHcbJ9GwGfmD3Kuet5w74t2GBp8f1Ggy3UD"
+        }
+      ]
+    }
+  }
+}
+
+task 7, lines 49-62:
+//# run-graphql
+Response: {
+  "data": {
+    "events": {
+      "nodes": [
+        {
+          "type": {
+            "repr": "0xe722de9e58a9bab3a202b769b7518f91f852460d3d2c6d6743c301d08b9e614a::M1::EventA<0xe722de9e58a9bab3a202b769b7518f91f852460d3d2c6d6743c301d08b9e614a::M1::T1>"
+          },
+          "sender": {
+            "address": "0xfccc9a421bbb13c1a66a1aa98f0ad75029ede94857779c6915b44f94068b921e"
+          },
+          "json": {
+            "value": {
+              "dummy_field": false
+            }
+          }
+        },
+        {
+          "type": {
+            "repr": "0xe722de9e58a9bab3a202b769b7518f91f852460d3d2c6d6743c301d08b9e614a::M1::EventA<0xe722de9e58a9bab3a202b769b7518f91f852460d3d2c6d6743c301d08b9e614a::M1::T2>"
+          },
+          "sender": {
+            "address": "0xfccc9a421bbb13c1a66a1aa98f0ad75029ede94857779c6915b44f94068b921e"
+          },
+          "json": {
+            "value": {
+              "dummy_field": false
+            }
+          }
+        },
+        {
+          "type": {
+            "repr": "0xe722de9e58a9bab3a202b769b7518f91f852460d3d2c6d6743c301d08b9e614a::M1::EventA<0xe722de9e58a9bab3a202b769b7518f91f852460d3d2c6d6743c301d08b9e614a::M1::T1>"
+          },
+          "sender": {
+            "address": "0xfccc9a421bbb13c1a66a1aa98f0ad75029ede94857779c6915b44f94068b921e"
+          },
+          "json": {
+            "value": {
+              "dummy_field": false
+            }
+          }
+        },
+        {
+          "type": {
+            "repr": "0xe722de9e58a9bab3a202b769b7518f91f852460d3d2c6d6743c301d08b9e614a::M1::EventA<0xe722de9e58a9bab3a202b769b7518f91f852460d3d2c6d6743c301d08b9e614a::M1::T2>"
+          },
+          "sender": {
+            "address": "0xfccc9a421bbb13c1a66a1aa98f0ad75029ede94857779c6915b44f94068b921e"
+          },
+          "json": {
+            "value": {
+              "dummy_field": false
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 8, lines 64-77:
+//# run-graphql
+Response: {
+  "data": {
+    "events": {
+      "nodes": [
+        {
+          "type": {
+            "repr": "0xe722de9e58a9bab3a202b769b7518f91f852460d3d2c6d6743c301d08b9e614a::M1::EventA<0xe722de9e58a9bab3a202b769b7518f91f852460d3d2c6d6743c301d08b9e614a::M1::T1>"
+          },
+          "sender": {
+            "address": "0xfccc9a421bbb13c1a66a1aa98f0ad75029ede94857779c6915b44f94068b921e"
+          },
+          "json": {
+            "value": {
+              "dummy_field": false
+            }
+          }
+        },
+        {
+          "type": {
+            "repr": "0xe722de9e58a9bab3a202b769b7518f91f852460d3d2c6d6743c301d08b9e614a::M1::EventA<0xe722de9e58a9bab3a202b769b7518f91f852460d3d2c6d6743c301d08b9e614a::M1::T1>"
+          },
+          "sender": {
+            "address": "0xfccc9a421bbb13c1a66a1aa98f0ad75029ede94857779c6915b44f94068b921e"
+          },
+          "json": {
+            "value": {
+              "dummy_field": false
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 9, lines 79-92:
+//# run-graphql
+Response: {
+  "data": {
+    "events": {
+      "nodes": [
+        {
+          "type": {
+            "repr": "0xe722de9e58a9bab3a202b769b7518f91f852460d3d2c6d6743c301d08b9e614a::M1::EventA<0xe722de9e58a9bab3a202b769b7518f91f852460d3d2c6d6743c301d08b9e614a::M1::T2>"
+          },
+          "sender": {
+            "address": "0xfccc9a421bbb13c1a66a1aa98f0ad75029ede94857779c6915b44f94068b921e"
+          },
+          "json": {
+            "value": {
+              "dummy_field": false
+            }
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/event_connection/type_param_filter.move b/crates/sui-graphql-e2e-tests/tests/event_connection/type_param_filter.move
new file mode 100644
index 0000000000000..128362999b50b
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/event_connection/type_param_filter.move
@@ -0,0 +1,92 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+//# init --protocol-version 51 --addresses Test=0x0 --accounts A B --simulator
+
+//# publish
+module Test::M1 {
+    use sui::event;
+
+    public struct T1 has copy, drop {}
+    public struct T2 has copy, drop {}
+
+    public struct EventA<T> has copy, drop {
+        value: T
+    }
+
+    public fun emit_T1() {
+        event::emit(EventA<T1> { value: T1 {} })
+    }
+
+    public fun emit_T2() {
+        event::emit(EventA<T2> { value: T2 {} })
+    }
+
+    public fun emit_both() {
+        event::emit(EventA<T1> { value: T1 {} });
+        event::emit(EventA<T2> { value: T2 {} })
+    }
+}
+
+
+//# run Test::M1::emit_T1 --sender A
+
+//# run Test::M1::emit_T2 --sender A
+
+//# run Test::M1::emit_both --sender A
+
+//# create-checkpoint
+
+//# run-graphql
+{
+    transactionBlocks {
+        nodes {
+            digest
+        }
+    }
+}
+
+//# run-graphql
+{
+  events(filter: {eventType: "@{Test}::M1::EventA"}) {
+    nodes {
+      type {
+        repr
+      }
+      sender {
+        address
+      }
+      json
+    }
+  }
+}
+
+//# run-graphql
+{
+  events(filter: {eventType: "@{Test}::M1::EventA<@{Test}::M1::T1>"}) {
+    nodes {
+      type {
+        repr
+      }
+      sender {
+        address
+      }
+      json
+    }
+  }
+}
+
+//# run-graphql
+{
+  events(filter: {eventType: "@{Test}::M1::EventA<@{Test}::M1::T2>", transactionDigest: "9nu1ivpL9hHcbJ9GwGfmD3Kuet5w74t2GBp8f1Ggy3UD"}) {
+    nodes {
+      type {
+        repr
+      }
+      sender {
+        address
+      }
+      json
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/packages/versioning.exp b/crates/sui-graphql-e2e-tests/tests/packages/versioning.exp
new file mode 100644
index 0000000000000..7f0e8a7153b98
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/packages/versioning.exp
@@ -0,0 +1,814 @@
+processed 17 tasks
+
+init:
+A: object(0,0)
+
+task 1, lines 6-9:
+//# publish --upgradeable --sender A
+created: object(1,0), object(1,1)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 5076800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 2, line 11:
+//# create-checkpoint
+Checkpoint created: 1
+
+task 3, lines 13-50:
+//# run-graphql
+Response: {
+  "data": {
+    "latestPackage": {
+      "version": 1,
+      "module": {
+        "functions": {
+          "nodes": [
+            {
+              "name": "f"
+            }
+          ]
+        }
+      },
+      "packageVersions": {
+        "nodes": [
+          {
+            "address": "0x175ae86f2df1eb652d57fbe9e44c7f2d67870d2b6776a4356f30930221b63b88",
+            "version": 1
+          }
+        ]
+      }
+    },
+    "firstPackage": {
+      "address": "0x175ae86f2df1eb652d57fbe9e44c7f2d67870d2b6776a4356f30930221b63b88",
+      "version": 1,
+      "module": {
+        "functions": {
+          "nodes": [
+            {
+              "name": "f"
+            }
+          ]
+        }
+      },
+      "packageVersions": {
+        "nodes": [
+          {
+            "address": "0x175ae86f2df1eb652d57fbe9e44c7f2d67870d2b6776a4356f30930221b63b88",
+            "version": 1
+          }
+        ]
+      }
+    },
+    "packages": {
+      "nodes": [
+        {
+          "address": "0x0000000000000000000000000000000000000000000000000000000000000001",
+          "version": 1
+        },
+        {
+          "address": "0x0000000000000000000000000000000000000000000000000000000000000002",
+          "version": 1
+        },
+        {
+          "address": "0x0000000000000000000000000000000000000000000000000000000000000003",
+          "version": 1
+        },
+        {
+          "address": "0x000000000000000000000000000000000000000000000000000000000000dee9",
+          "version": 1
+        },
+        {
+          "address": "0x175ae86f2df1eb652d57fbe9e44c7f2d67870d2b6776a4356f30930221b63b88",
+          "version": 1
+        }
+      ]
+    }
+  }
+}
+
+task 4, lines 52-56:
+//# upgrade --package P0 --upgrade-capability 1,1 --sender A
+created: object(4,0)
+mutated: object(0,0), object(1,1)
+gas summary: computation_cost: 1000000, storage_cost: 5251600,  storage_rebate: 2595780, non_refundable_storage_fee: 26220
+
+task 5, line 58:
+//# create-checkpoint
+Checkpoint created: 2
+
+task 6, lines 60-97:
+//# run-graphql
+Response: {
+  "data": {
+    "latestPackage": {
+      "version": 2,
+      "module": {
+        "functions": {
+          "nodes": [
+            {
+              "name": "f"
+            },
+            {
+              "name": "g"
+            }
+          ]
+        }
+      },
+      "packageVersions": {
+        "nodes": [
+          {
+            "address": "0x175ae86f2df1eb652d57fbe9e44c7f2d67870d2b6776a4356f30930221b63b88",
+            "version": 1
+          },
+          {
+            "address": "0x351bc614b36f0f522a64334e4c278d4bfe200234958870c084e0a005f041d681",
+            "version": 2
+          }
+        ]
+      }
+    },
+    "firstPackage": {
+      "address": "0x175ae86f2df1eb652d57fbe9e44c7f2d67870d2b6776a4356f30930221b63b88",
+      "version": 1,
+      "module": {
+        "functions": {
+          "nodes": [
+            {
+              "name": "f"
+            }
+          ]
+        }
+      },
+      "packageVersions": {
+        "nodes": [
+          {
+            "address": "0x175ae86f2df1eb652d57fbe9e44c7f2d67870d2b6776a4356f30930221b63b88",
+            "version": 1
+          },
+          {
+            "address": "0x351bc614b36f0f522a64334e4c278d4bfe200234958870c084e0a005f041d681",
+            "version": 2
+          }
+        ]
+      }
+    },
+    "packages": {
+      "nodes": [
+        {
+          "address": "0x0000000000000000000000000000000000000000000000000000000000000001",
+          "version": 1
+        },
+        {
+          "address": "0x0000000000000000000000000000000000000000000000000000000000000002",
+          "version": 1
+        },
+        {
+          "address": "0x0000000000000000000000000000000000000000000000000000000000000003",
+          "version": 1
+        },
+        {
+          "address": "0x000000000000000000000000000000000000000000000000000000000000dee9",
+          "version": 1
+        },
+        {
+          "address": "0x175ae86f2df1eb652d57fbe9e44c7f2d67870d2b6776a4356f30930221b63b88",
+          "version": 1
+        },
+        {
+          "address": "0x351bc614b36f0f522a64334e4c278d4bfe200234958870c084e0a005f041d681",
+          "version": 2
+        }
+      ]
+    }
+  }
+}
+
+task 7, lines 99-104:
+//# upgrade --package P1 --upgrade-capability 1,1 --sender A
+created: object(7,0)
+mutated: object(0,0), object(1,1)
+gas summary: computation_cost: 1000000, storage_cost: 5426400,  storage_rebate: 2595780, non_refundable_storage_fee: 26220
+
+task 8, line 106:
+//# create-checkpoint
+Checkpoint created: 3
+
+task 9, lines 108-145:
+//# run-graphql
+Response: {
+  "data": {
+    "latestPackage": {
+      "version": 3,
+      "module": {
+        "functions": {
+          "nodes": [
+            {
+              "name": "f"
+            },
+            {
+              "name": "g"
+            },
+            {
+              "name": "h"
+            }
+          ]
+        }
+      },
+      "packageVersions": {
+        "nodes": [
+          {
+            "address": "0x175ae86f2df1eb652d57fbe9e44c7f2d67870d2b6776a4356f30930221b63b88",
+            "version": 1
+          },
+          {
+            "address": "0x351bc614b36f0f522a64334e4c278d4bfe200234958870c084e0a005f041d681",
+            "version": 2
+          },
+          {
+            "address": "0x0eae57b7a07b0548b1f6b0c309f0692828ff994e9159b541334b25582980631c",
+            "version": 3
+          }
+        ]
+      }
+    },
+    "firstPackage": {
+      "address": "0x175ae86f2df1eb652d57fbe9e44c7f2d67870d2b6776a4356f30930221b63b88",
+      "version": 1,
+      "module": {
+        "functions": {
+          "nodes": [
+            {
+              "name": "f"
+            }
+          ]
+        }
+      },
+      "packageVersions": {
+        "nodes": [
+          {
+            "address": "0x175ae86f2df1eb652d57fbe9e44c7f2d67870d2b6776a4356f30930221b63b88",
+            "version": 1
+          },
+          {
+            "address": "0x351bc614b36f0f522a64334e4c278d4bfe200234958870c084e0a005f041d681",
+            "version": 2
+          },
+          {
+            "address": "0x0eae57b7a07b0548b1f6b0c309f0692828ff994e9159b541334b25582980631c",
+            "version": 3
+          }
+        ]
+      }
+    },
+    "packages": {
+      "nodes": [
+        {
+          "address": "0x0000000000000000000000000000000000000000000000000000000000000001",
+          "version": 1
+        },
+        {
+          "address": "0x0000000000000000000000000000000000000000000000000000000000000002",
+          "version": 1
+        },
+        {
+          "address": "0x0000000000000000000000000000000000000000000000000000000000000003",
+          "version": 1
+        },
+        {
+          "address": "0x000000000000000000000000000000000000000000000000000000000000dee9",
+          "version": 1
+        },
+        {
+          "address": "0x175ae86f2df1eb652d57fbe9e44c7f2d67870d2b6776a4356f30930221b63b88",
+          "version": 1
+        },
+        {
+          "address": "0x351bc614b36f0f522a64334e4c278d4bfe200234958870c084e0a005f041d681",
+          "version": 2
+        },
+        {
+          "address": "0x0eae57b7a07b0548b1f6b0c309f0692828ff994e9159b541334b25582980631c",
+          "version": 3
+        }
+      ]
+    }
+  }
+}
+
+task 10, lines 147-184:
+//# run-graphql
+Response: {
+  "data": {
+    "v1": {
+      "module": {
+        "functions": {
+          "nodes": [
+            {
+              "name": "f"
+            }
+          ]
+        }
+      },
+      "latestPackage": {
+        "module": {
+          "functions": {
+            "nodes": [
+              {
+                "name": "f"
+              },
+              {
+                "name": "g"
+              },
+              {
+                "name": "h"
+              }
+            ]
+          }
+        }
+      }
+    },
+    "v2": {
+      "module": {
+        "functions": {
+          "nodes": [
+            {
+              "name": "f"
+            },
+            {
+              "name": "g"
+            }
+          ]
+        }
+      },
+      "latestPackage": {
+        "module": {
+          "functions": {
+            "nodes": [
+              {
+                "name": "f"
+              },
+              {
+                "name": "g"
+              },
+              {
+                "name": "h"
+              }
+            ]
+          }
+        }
+      }
+    },
+    "v3": {
+      "module": {
+        "functions": {
+          "nodes": [
+            {
+              "name": "f"
+            },
+            {
+              "name": "g"
+            },
+            {
+              "name": "h"
+            }
+          ]
+        }
+      },
+      "latestPackage": {
+        "module": {
+          "functions": {
+            "nodes": [
+              {
+                "name": "f"
+              },
+              {
+                "name": "g"
+              },
+              {
+                "name": "h"
+              }
+            ]
+          }
+        }
+      }
+    }
+  }
+}
+
+task 11, lines 186-223:
+//# run-graphql
+Response: {
+  "data": {
+    "v1_from_p1": {
+      "module": {
+        "functions": {
+          "nodes": [
+            {
+              "name": "f"
+            }
+          ]
+        }
+      }
+    },
+    "v1_from_p2": {
+      "module": {
+        "functions": {
+          "nodes": [
+            {
+              "name": "f"
+            }
+          ]
+        }
+      }
+    },
+    "v2_from_p0": {
+      "module": {
+        "functions": {
+          "nodes": [
+            {
+              "name": "f"
+            },
+            {
+              "name": "g"
+            }
+          ]
+        }
+      }
+    },
+    "v2_from_p2": {
+      "module": {
+        "functions": {
+          "nodes": [
+            {
+              "name": "f"
+            },
+            {
+              "name": "g"
+            }
+          ]
+        }
+      }
+    },
+    "v3_from_p0": {
+      "module": {
+        "functions": {
+          "nodes": [
+            {
+              "name": "f"
+            },
+            {
+              "name": "g"
+            },
+            {
+              "name": "h"
+            }
+          ]
+        }
+      }
+    },
+    "v3_from_p1": {
+      "module": {
+        "functions": {
+          "nodes": [
+            {
+              "name": "f"
+            },
+            {
+              "name": "g"
+            },
+            {
+              "name": "h"
+            }
+          ]
+        }
+      }
+    }
+  }
+}
+
+task 12, lines 225-280:
+//# run-graphql
+Response: {
+  "data": {
+    "v1": {
+      "v1": {
+        "module": {
+          "functions": {
+            "nodes": [
+              {
+                "name": "f"
+              }
+            ]
+          }
+        }
+      },
+      "v2": {
+        "module": {
+          "functions": {
+            "nodes": [
+              {
+                "name": "f"
+              },
+              {
+                "name": "g"
+              }
+            ]
+          }
+        }
+      },
+      "v3": {
+        "module": {
+          "functions": {
+            "nodes": [
+              {
+                "name": "f"
+              },
+              {
+                "name": "g"
+              },
+              {
+                "name": "h"
+              }
+            ]
+          }
+        }
+      }
+    },
+    "v2": {
+      "v1": {
+        "module": {
+          "functions": {
+            "nodes": [
+              {
+                "name": "f"
+              }
+            ]
+          }
+        }
+      },
+      "v2": {
+        "module": {
+          "functions": {
+            "nodes": [
+              {
+                "name": "f"
+              },
+              {
+                "name": "g"
+              }
+            ]
+          }
+        }
+      },
+      "v3": {
+        "module": {
+          "functions": {
+            "nodes": [
+              {
+                "name": "f"
+              },
+              {
+                "name": "g"
+              },
+              {
+                "name": "h"
+              }
+            ]
+          }
+        }
+      }
+    },
+    "v3": {
+      "v1": {
+        "module": {
+          "functions": {
+            "nodes": [
+              {
+                "name": "f"
+              }
+            ]
+          }
+        }
+      },
+      "v2": {
+        "module": {
+          "functions": {
+            "nodes": [
+              {
+                "name": "f"
+              },
+              {
+                "name": "g"
+              }
+            ]
+          }
+        }
+      },
+      "v3": {
+        "module": {
+          "functions": {
+            "nodes": [
+              {
+                "name": "f"
+              },
+              {
+                "name": "g"
+              },
+              {
+                "name": "h"
+              }
+            ]
+          }
+        }
+      }
+    }
+  }
+}
+
+task 13, lines 282-310:
+//# run-graphql
+Response: {
+  "data": {
+    "v0": null,
+    "v1": {
+      "v0": null,
+      "v4": null
+    },
+    "v4": null
+  }
+}
+
+task 14, lines 312-343:
+//# run-graphql
+Response: {
+  "data": {
+    "before": {
+      "nodes": [
+        {
+          "address": "0x0000000000000000000000000000000000000000000000000000000000000001",
+          "version": 1,
+          "previousTransactionBlock": {
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 0
+              }
+            }
+          }
+        },
+        {
+          "address": "0x0000000000000000000000000000000000000000000000000000000000000002",
+          "version": 1,
+          "previousTransactionBlock": {
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 0
+              }
+            }
+          }
+        },
+        {
+          "address": "0x0000000000000000000000000000000000000000000000000000000000000003",
+          "version": 1,
+          "previousTransactionBlock": {
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 0
+              }
+            }
+          }
+        },
+        {
+          "address": "0x000000000000000000000000000000000000000000000000000000000000dee9",
+          "version": 1,
+          "previousTransactionBlock": {
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 0
+              }
+            }
+          }
+        }
+      ]
+    },
+    "after": {
+      "nodes": [
+        {
+          "address": "0x351bc614b36f0f522a64334e4c278d4bfe200234958870c084e0a005f041d681",
+          "version": 2,
+          "previousTransactionBlock": {
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        },
+        {
+          "address": "0x0eae57b7a07b0548b1f6b0c309f0692828ff994e9159b541334b25582980631c",
+          "version": 3,
+          "previousTransactionBlock": {
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        }
+      ]
+    },
+    "between": {
+      "nodes": [
+        {
+          "address": "0x351bc614b36f0f522a64334e4c278d4bfe200234958870c084e0a005f041d681",
+          "version": 2,
+          "previousTransactionBlock": {
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 15, lines 345-380:
+//# run-graphql
+Response: {
+  "data": {
+    "packageVersions": {
+      "nodes": [
+        {
+          "address": "0x175ae86f2df1eb652d57fbe9e44c7f2d67870d2b6776a4356f30930221b63b88",
+          "version": 1
+        },
+        {
+          "address": "0x351bc614b36f0f522a64334e4c278d4bfe200234958870c084e0a005f041d681",
+          "version": 2
+        },
+        {
+          "address": "0x0eae57b7a07b0548b1f6b0c309f0692828ff994e9159b541334b25582980631c",
+          "version": 3
+        }
+      ]
+    },
+    "after": {
+      "nodes": [
+        {
+          "address": "0x351bc614b36f0f522a64334e4c278d4bfe200234958870c084e0a005f041d681",
+          "version": 2
+        },
+        {
+          "address": "0x0eae57b7a07b0548b1f6b0c309f0692828ff994e9159b541334b25582980631c",
+          "version": 3
+        }
+      ]
+    },
+    "before": {
+      "nodes": [
+        {
+          "address": "0x175ae86f2df1eb652d57fbe9e44c7f2d67870d2b6776a4356f30930221b63b88",
+          "version": 1
+        },
+        {
+          "address": "0x351bc614b36f0f522a64334e4c278d4bfe200234958870c084e0a005f041d681",
+          "version": 2
+        }
+      ]
+    },
+    "between": {
+      "nodes": [
+        {
+          "address": "0x351bc614b36f0f522a64334e4c278d4bfe200234958870c084e0a005f041d681",
+          "version": 2
+        }
+      ]
+    }
+  }
+}
+
+task 16, lines 382-400:
+//# run-graphql
+Response: {
+  "data": {
+    "packageVersions": {
+      "nodes": [
+        {
+          "address": "0x0000000000000000000000000000000000000000000000000000000000000001",
+          "version": 1
+        }
+      ]
+    },
+    "package": {
+      "packageVersions": {
+        "nodes": [
+          {
+            "address": "0x0000000000000000000000000000000000000000000000000000000000000001",
+            "version": 1
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/packages/versioning.move b/crates/sui-graphql-e2e-tests/tests/packages/versioning.move
new file mode 100644
index 0000000000000..b0e0900bbcb59
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/packages/versioning.move
@@ -0,0 +1,400 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+//# init --protocol-version 39 --addresses P0=0x0 P1=0x0 P2=0x0 --accounts A --simulator
+
+//# publish --upgradeable --sender A
+module P0::m {
+    public fun f(): u64 { 42 }
+}
+
+//# create-checkpoint
+
+//# run-graphql
+{
+    latestPackage(address: "@{P0}") {
+        version
+        module(name: "m") {
+            functions { nodes { name } }
+        }
+
+        packageVersions {
+            nodes {
+                address
+                version
+            }
+        }
+    }
+
+    firstPackage: package(address: "@{P0}", version: 1) {
+        address
+        version
+        module(name: "m") {
+            functions { nodes { name } }
+        }
+
+        packageVersions {
+            nodes {
+                address
+                version
+            }
+        }
+    }
+
+    packages(first: 10) {
+        nodes {
+            address
+            version
+        }
+    }
+}
+
+//# upgrade --package P0 --upgrade-capability 1,1 --sender A
+module P1::m {
+    public fun f(): u64 { 42 }
+    public fun g(): u64 { 43 }
+}
+
+//# create-checkpoint
+
+//# run-graphql
+{
+    latestPackage(address: "@{P0}") {
+        version
+        module(name: "m") {
+            functions { nodes { name } }
+        }
+
+        packageVersions {
+            nodes {
+                address
+                version
+            }
+        }
+    }
+
+    firstPackage: package(address: "@{P1}", version: 1) {
+        address
+        version
+        module(name: "m") {
+            functions { nodes { name } }
+        }
+
+        packageVersions {
+            nodes {
+                address
+                version
+            }
+        }
+    }
+
+    packages(first: 10) {
+        nodes {
+            address
+            version
+        }
+    }
+}
+
+//# upgrade --package P1 --upgrade-capability 1,1 --sender A
+module P2::m {
+    public fun f(): u64 { 42 }
+    public fun g(): u64 { 43 }
+    public fun h(): u64 { 44 }
+}
+
+//# create-checkpoint
+
+//# run-graphql
+{
+    latestPackage(address: "@{P0}") {
+        version
+        module(name: "m") {
+            functions { nodes { name } }
+        }
+
+        packageVersions {
+            nodes {
+                address
+                version
+            }
+        }
+    }
+
+    firstPackage: package(address: "@{P2}", version: 1) {
+        address
+        version
+        module(name: "m") {
+            functions { nodes { name } }
+        }
+
+        packageVersions {
+            nodes {
+                address
+                version
+            }
+        }
+    }
+
+    packages(first: 10) {
+        nodes {
+            address
+            version
+        }
+    }
+}
+
+//# run-graphql
+{   # Test fetching by ID
+    v1: package(address: "@{P0}") {
+        module(name: "m") {
+            functions { nodes { name } }
+        }
+
+        latestPackage {
+            module(name: "m") {
+                functions { nodes { name } }
+            }
+        }
+    }
+
+    v2: package(address: "@{P1}") {
+        module(name: "m") {
+            functions { nodes { name } }
+        }
+
+        latestPackage {
+            module(name: "m") {
+                functions { nodes { name } }
+            }
+        }
+    }
+
+    v3: package(address: "@{P2}") {
+        module(name: "m") {
+            functions { nodes { name } }
+        }
+
+        latestPackage {
+            module(name: "m") {
+                functions { nodes { name } }
+            }
+        }
+    }
+}
+
+//# run-graphql
+{   # Test fetching by version
+    v1_from_p1: package(address: "@{P1}", version: 1) {
+        module(name: "m") {
+            functions { nodes { name } }
+        }
+    }
+
+    v1_from_p2: package(address: "@{P2}", version: 1) {
+        module(name: "m") {
+            functions { nodes { name } }
+        }
+    }
+
+    v2_from_p0: package(address: "@{P0}", version: 2) {
+        module(name: "m") {
+            functions { nodes { name } }
+        }
+    }
+
+    v2_from_p2: package(address: "@{P2}", version: 2) {
+        module(name: "m") {
+            functions { nodes { name } }
+        }
+    }
+
+    v3_from_p0: package(address: "@{P0}", version: 3) {
+        module(name: "m") {
+            functions { nodes { name } }
+        }
+    }
+
+    v3_from_p1: package(address: "@{P1}", version: 3) {
+        module(name: "m") {
+            functions { nodes { name } }
+        }
+    }
+}
+
+//# run-graphql
+{   # Go from one version to another using packageAtVersion
+    v1: package(address: "@{P1}") {
+        v1: packageAtVersion(version: 1) {
+            module(name: "m") {
+                functions { nodes { name } }
+            }
+        }
+        v2: packageAtVersion(version: 2) {
+            module(name: "m") {
+                functions { nodes { name } }
+            }
+        }
+        v3: packageAtVersion(version: 3) {
+            module(name: "m") {
+                functions { nodes { name } }
+            }
+        }
+    }
+
+    v2: package(address: "@{P2}") {
+        v1: packageAtVersion(version: 1) {
+            module(name: "m") {
+                functions { nodes { name } }
+            }
+        }
+        v2: packageAtVersion(version: 2) {
+            module(name: "m") {
+                functions { nodes { name } }
+            }
+        }
+        v3: packageAtVersion(version: 3) {
+            module(name: "m") {
+                functions { nodes { name } }
+            }
+        }
+    }
+
+    v3: package(address: "@{P2}") {
+        v1: packageAtVersion(version: 1) {
+            module(name: "m") {
+                functions { nodes { name } }
+            }
+        }
+        v2: packageAtVersion(version: 2) {
+            module(name: "m") {
+                functions { nodes { name } }
+            }
+        }
+        v3: packageAtVersion(version: 3) {
+            module(name: "m") {
+                functions { nodes { name } }
+            }
+        }
+    }
+}
+
+//# run-graphql
+{   # Fetch out of range versions (should return null)
+    v0: package(address: "@{P0}", version: 0) {
+        module(name: "m") {
+            functions { nodes { name } }
+        }
+    }
+
+    # This won't return null, but its inner queries will
+    v1: package(address: "@{P0}") {
+        v0: packageAtVersion(version: 0) {
+            module(name: "m") {
+                functions { nodes { name } }
+            }
+        }
+
+        v4: packageAtVersion(version: 4) {
+            module(name: "m") {
+                functions { nodes { name } }
+            }
+        }
+    }
+
+    v4: package(address: "@{P0}", version: 4) {
+        module(name: "m") {
+            functions { nodes { name } }
+        }
+    }
+}
+
+//# run-graphql
+{   # Querying packages with checkpoint bounds
+    before: packages(first: 10, filter: { beforeCheckpoint: 1 }) {
+        nodes {
+            address
+            version
+            previousTransactionBlock {
+                effects { checkpoint { sequenceNumber } }
+            }
+        }
+    }
+
+    after: packages(first: 10, filter: { afterCheckpoint: 1 }) {
+        nodes {
+            address
+            version
+            previousTransactionBlock {
+                effects { checkpoint { sequenceNumber } }
+            }
+        }
+    }
+
+    between: packages(first: 10, filter: { afterCheckpoint: 1, beforeCheckpoint: 3 }) {
+        nodes {
+            address
+            version
+            previousTransactionBlock {
+                effects { checkpoint { sequenceNumber } }
+            }
+        }
+    }
+}
+
+//# run-graphql
+{   # Query for versions of a user package
+    packageVersions(address: "@{P0}") {
+        nodes {
+            address
+            version
+        }
+    }
+
+    after: packageVersions(address: "@{P0}", filter: { afterVersion: 1 }) {
+        nodes {
+            address
+            version
+        }
+    }
+
+    before: packageVersions(address: "@{P0}", filter: { beforeVersion: 3 }) {
+        nodes {
+            address
+            version
+        }
+    }
+
+    between: packageVersions(
+        address: "@{P0}",
+        filter: {
+          afterVersion: 1,
+          beforeVersion: 3,
+        },
+    ) {
+        nodes {
+            address
+            version
+        }
+    }
+}
+
+//# run-graphql
+{   # Query for versions of a system package (there will be only one because we
+    # don't have a way to upgrade system packages in these tests.)
+    packageVersions(address: "0x1") {
+        nodes {
+            address
+            version
+        }
+    }
+
+    package(address: "0x1") {
+        packageVersions {
+            nodes {
+                address
+                version
+            }
+        }
+    }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/at_checkpoint.exp b/crates/sui-graphql-e2e-tests/tests/transactions/at_checkpoint.exp
new file mode 100644
index 0000000000000..48209abf430e8
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/at_checkpoint.exp
@@ -0,0 +1,210 @@
+processed 11 tasks
+
+init:
+A: object(0,0)
+
+task 2, lines 10-12:
+//# programmable --sender A --inputs 1 @A
+//> 0: SplitCoins(Gas, [Input(0)]);
+//> TransferObjects([Result(0)], Input(1))
+created: object(2,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 1976000,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 3, line 14:
+//# create-checkpoint
+Checkpoint created: 1
+
+task 5, line 18:
+//# create-checkpoint
+Checkpoint created: 2
+
+task 7, line 22:
+//# create-checkpoint
+Checkpoint created: 3
+
+task 8, lines 24-36:
+//# run-graphql
+Response: {
+  "data": {
+    "c0": {
+      "nodes": [
+        {
+          "digest": "FPhSSzT7tHmrPhs3H9GT1n4Dqj3eyCgaFLkQSc9FEDVV",
+          "kind": {
+            "__typename": "GenesisTransaction"
+          }
+        }
+      ]
+    },
+    "c1": {
+      "nodes": [
+        {
+          "digest": "43wY12GuxKzFAJAAW7oCcYfRGb3BSKXxgrVTtXwuELfn",
+          "kind": {
+            "__typename": "ConsensusCommitPrologueTransaction"
+          }
+        },
+        {
+          "digest": "Cn6D9eKgVx5EeZddUSpQeTFcVyHKjqmt6yeiroKgr9h6",
+          "kind": {
+            "__typename": "ProgrammableTransactionBlock"
+          }
+        }
+      ]
+    },
+    "c2": {
+      "nodes": [
+        {
+          "digest": "9eMYXfB8mzZhdQgJ6HJTTdcwyXZ3EHVXDpcvERnnBWvR",
+          "kind": {
+            "__typename": "ConsensusCommitPrologueTransaction"
+          }
+        }
+      ]
+    },
+    "c3": {
+      "nodes": [
+        {
+          "digest": "E1TmDoToDfVSW7kMEFiYsNFL2UeCaL1wNbWLdFjxe5mx",
+          "kind": {
+            "__typename": "ConsensusCommitPrologueTransaction"
+          }
+        }
+      ]
+    },
+    "c4": {
+      "nodes": []
+    }
+  }
+}
+
+task 9, lines 38-50:
+//# run-graphql
+Response: {
+  "data": {
+    "c0": {
+      "transactionBlocks": {
+        "nodes": [
+          {
+            "digest": "FPhSSzT7tHmrPhs3H9GT1n4Dqj3eyCgaFLkQSc9FEDVV",
+            "kind": {
+              "__typename": "GenesisTransaction"
+            }
+          }
+        ]
+      }
+    },
+    "c1": {
+      "transactionBlocks": {
+        "nodes": [
+          {
+            "digest": "43wY12GuxKzFAJAAW7oCcYfRGb3BSKXxgrVTtXwuELfn",
+            "kind": {
+              "__typename": "ConsensusCommitPrologueTransaction"
+            }
+          },
+          {
+            "digest": "Cn6D9eKgVx5EeZddUSpQeTFcVyHKjqmt6yeiroKgr9h6",
+            "kind": {
+              "__typename": "ProgrammableTransactionBlock"
+            }
+          }
+        ]
+      }
+    },
+    "c2": {
+      "transactionBlocks": {
+        "nodes": [
+          {
+            "digest": "9eMYXfB8mzZhdQgJ6HJTTdcwyXZ3EHVXDpcvERnnBWvR",
+            "kind": {
+              "__typename": "ConsensusCommitPrologueTransaction"
+            }
+          }
+        ]
+      }
+    },
+    "c3": {
+      "transactionBlocks": {
+        "nodes": [
+          {
+            "digest": "E1TmDoToDfVSW7kMEFiYsNFL2UeCaL1wNbWLdFjxe5mx",
+            "kind": {
+              "__typename": "ConsensusCommitPrologueTransaction"
+            }
+          }
+        ]
+      }
+    },
+    "c4": null
+  }
+}
+
+task 10, lines 52-63:
+//# run-graphql
+Response: {
+  "data": {
+    "checkpoints": {
+      "pageInfo": {
+        "hasNextPage": false
+      },
+      "nodes": [
+        {
+          "transactionBlocks": {
+            "nodes": [
+              {
+                "digest": "FPhSSzT7tHmrPhs3H9GT1n4Dqj3eyCgaFLkQSc9FEDVV",
+                "kind": {
+                  "__typename": "GenesisTransaction"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "transactionBlocks": {
+            "nodes": [
+              {
+                "digest": "43wY12GuxKzFAJAAW7oCcYfRGb3BSKXxgrVTtXwuELfn",
+                "kind": {
+                  "__typename": "ConsensusCommitPrologueTransaction"
+                }
+              },
+              {
+                "digest": "Cn6D9eKgVx5EeZddUSpQeTFcVyHKjqmt6yeiroKgr9h6",
+                "kind": {
+                  "__typename": "ProgrammableTransactionBlock"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "transactionBlocks": {
+            "nodes": [
+              {
+                "digest": "9eMYXfB8mzZhdQgJ6HJTTdcwyXZ3EHVXDpcvERnnBWvR",
+                "kind": {
+                  "__typename": "ConsensusCommitPrologueTransaction"
+                }
+              }
+            ]
+          }
+        },
+        {
+          "transactionBlocks": {
+            "nodes": [
+              {
+                "digest": "E1TmDoToDfVSW7kMEFiYsNFL2UeCaL1wNbWLdFjxe5mx",
+                "kind": {
+                  "__typename": "ConsensusCommitPrologueTransaction"
+                }
+              }
+            ]
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/at_checkpoint.move b/crates/sui-graphql-e2e-tests/tests/transactions/at_checkpoint.move
new file mode 100644
index 0000000000000..5d5e27dbed2e8
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/at_checkpoint.move
@@ -0,0 +1,63 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+//# init --protocol-version 51 --accounts A --simulator
+
+// Limiting transactions by the checkpoint they are in
+
+//# advance-clock --duration-ns 1
+
+//# programmable --sender A --inputs 1 @A
+//> 0: SplitCoins(Gas, [Input(0)]);
+//> TransferObjects([Result(0)], Input(1))
+
+//# create-checkpoint
+
+//# advance-clock --duration-ns 1
+
+//# create-checkpoint
+
+//# advance-clock --duration-ns 1
+
+//# create-checkpoint
+
+//# run-graphql
+{   # Top-level query, with a filter
+    c0: transactionBlocks(filter: { atCheckpoint: 0 }) { nodes { ...Tx } }
+    c1: transactionBlocks(filter: { atCheckpoint: 1 }) { nodes { ...Tx } }
+    c2: transactionBlocks(filter: { atCheckpoint: 2 }) { nodes { ...Tx } }
+    c3: transactionBlocks(filter: { atCheckpoint: 3 }) { nodes { ...Tx } }
+    c4: transactionBlocks(filter: { atCheckpoint: 4 }) { nodes { ...Tx } }
+}
+
+fragment Tx on TransactionBlock {
+  digest
+  kind { __typename }
+}
+
+//# run-graphql
+{   # Via a checkpoint query
+    c0: checkpoint(id: { sequenceNumber: 0 }) { transactionBlocks { nodes { ...Tx } } }
+    c1: checkpoint(id: { sequenceNumber: 1 }) { transactionBlocks { nodes { ...Tx } } }
+    c2: checkpoint(id: { sequenceNumber: 2 }) { transactionBlocks { nodes { ...Tx } } }
+    c3: checkpoint(id: { sequenceNumber: 3 }) { transactionBlocks { nodes { ...Tx } } }
+    c4: checkpoint(id: { sequenceNumber: 4 }) { transactionBlocks { nodes { ...Tx } } }
+}
+
+fragment Tx on TransactionBlock {
+  digest
+  kind { __typename }
+}
+
+//# run-graphql
+{   # Via paginating checkpoints
+    checkpoints(first: 5) {
+        pageInfo { hasNextPage }
+        nodes { transactionBlocks { nodes { ...Tx } } }
+    }
+}
+
+fragment Tx on TransactionBlock {
+  digest
+  kind { __typename }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/filters/kind.exp b/crates/sui-graphql-e2e-tests/tests/transactions/filters/kind.exp
new file mode 100644
index 0000000000000..5f9783d3a76fe
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/filters/kind.exp
@@ -0,0 +1,246 @@
+processed 16 tasks
+
+init:
+A: object(0,0), B: object(0,1), C: object(0,2), D: object(0,3), E: object(0,4)
+
+task 1, lines 6-19:
+//# publish
+created: object(1,0)
+mutated: object(0,5)
+gas summary: computation_cost: 1000000, storage_cost: 5175600,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 2, line 21:
+//# create-checkpoint
+Checkpoint created: 1
+
+task 3, line 23:
+//# run Test::M1::create --args 0 @A --sender A
+created: object(3,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 4, line 25:
+//# run Test::M1::create --args 1 @A --sender B
+created: object(4,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 5, line 27:
+//# run Test::M1::create --args 2 @A --sender C
+created: object(5,0)
+mutated: object(0,2)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 6, line 29:
+//# run Test::M1::create --args 3 @A --sender D
+created: object(6,0)
+mutated: object(0,3)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 7, line 31:
+//# run Test::M1::create --args 4 @A --sender E
+created: object(7,0)
+mutated: object(0,4)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 8, line 33:
+//# create-checkpoint
+Checkpoint created: 2
+
+task 9, lines 35-53:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasNextPage": false,
+        "hasPreviousPage": false,
+        "endCursor": "eyJjIjoyLCJ0Ijo2LCJpIjpmYWxzZX0",
+        "startCursor": "eyJjIjoyLCJ0IjoyLCJpIjpmYWxzZX0"
+      },
+      "nodes": [
+        {
+          "digest": "78YAzuJPHbHXsqqj2GjiBibpAiWim7sha6MseSCN2Y6g",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        },
+        {
+          "digest": "9zVSnZuHjSQZKcbrwmpkUfsRTA4J9VKqSiqzNCmycPex",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        },
+        {
+          "digest": "BmipCooPMB1CHeRuFHS15q4VQ14pSLoYvuuNEfNsvZBc",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        },
+        {
+          "digest": "W3YEPxp4z4LzuwoGq4kmCBiy12xv4cNuEvwusrsxDem",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        },
+        {
+          "digest": "HCNwnSLqsQYEju3KoQbxpa3SD5mVG6FLcggkd2ZYxHvB",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 10, lines 55-73:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasNextPage": false,
+        "hasPreviousPage": false,
+        "endCursor": "eyJjIjoyLCJ0IjoyLCJpIjpmYWxzZX0",
+        "startCursor": "eyJjIjoyLCJ0IjoyLCJpIjpmYWxzZX0"
+      },
+      "nodes": [
+        {
+          "digest": "78YAzuJPHbHXsqqj2GjiBibpAiWim7sha6MseSCN2Y6g",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 11, lines 75-93:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasNextPage": false,
+        "hasPreviousPage": false,
+        "endCursor": "eyJjIjoyLCJ0IjozLCJpIjpmYWxzZX0",
+        "startCursor": "eyJjIjoyLCJ0IjozLCJpIjpmYWxzZX0"
+      },
+      "nodes": [
+        {
+          "digest": "9zVSnZuHjSQZKcbrwmpkUfsRTA4J9VKqSiqzNCmycPex",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 12, lines 95-113:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasNextPage": false,
+        "hasPreviousPage": false,
+        "endCursor": "eyJjIjoyLCJ0Ijo0LCJpIjpmYWxzZX0",
+        "startCursor": "eyJjIjoyLCJ0Ijo0LCJpIjpmYWxzZX0"
+      },
+      "nodes": [
+        {
+          "digest": "BmipCooPMB1CHeRuFHS15q4VQ14pSLoYvuuNEfNsvZBc",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 13, lines 115-133:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasNextPage": false,
+        "hasPreviousPage": false,
+        "endCursor": "eyJjIjoyLCJ0Ijo1LCJpIjpmYWxzZX0",
+        "startCursor": "eyJjIjoyLCJ0Ijo1LCJpIjpmYWxzZX0"
+      },
+      "nodes": [
+        {
+          "digest": "W3YEPxp4z4LzuwoGq4kmCBiy12xv4cNuEvwusrsxDem",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 14, lines 135-153:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasNextPage": false,
+        "hasPreviousPage": false,
+        "endCursor": "eyJjIjoyLCJ0Ijo2LCJpIjpmYWxzZX0",
+        "startCursor": "eyJjIjoyLCJ0Ijo2LCJpIjpmYWxzZX0"
+      },
+      "nodes": [
+        {
+          "digest": "HCNwnSLqsQYEju3KoQbxpa3SD5mVG6FLcggkd2ZYxHvB",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 15, lines 155-173:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasNextPage": false,
+        "hasPreviousPage": false,
+        "endCursor": null,
+        "startCursor": null
+      },
+      "nodes": []
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/filters/kind.move b/crates/sui-graphql-e2e-tests/tests/transactions/filters/kind.move
new file mode 100644
index 0000000000000..485cb837f2023
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/filters/kind.move
@@ -0,0 +1,173 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+//# init --protocol-version 48 --addresses Test=0x0 --accounts A B C D E --simulator
+
+//# publish
+module Test::M1 {
+    public struct Object has key, store {
+        id: UID,
+        value: u64,
+    }
+
+    public entry fun create(value: u64, recipient: address, ctx: &mut TxContext) {
+        transfer::public_transfer(
+            Object { id: object::new(ctx), value },
+            recipient
+        )
+    }
+}
+
+//# create-checkpoint
+
+//# run Test::M1::create --args 0 @A --sender A
+
+//# run Test::M1::create --args 1 @A --sender B
+
+//# run Test::M1::create --args 2 @A --sender C
+
+//# run Test::M1::create --args 3 @A --sender D
+
+//# run Test::M1::create --args 4 @A --sender E
+
+//# create-checkpoint
+
+//# run-graphql
+{
+  transactionBlocks(first: 50 filter: {kind: PROGRAMMABLE_TX atCheckpoint: 2}) {
+    pageInfo {
+      hasNextPage
+      hasPreviousPage
+      endCursor
+      startCursor
+    }
+    nodes {
+      digest
+      effects {
+        checkpoint {
+          sequenceNumber
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql
+{
+  transactionBlocks(first: 50 filter: {kind: PROGRAMMABLE_TX atCheckpoint: 2 signAddress: "@{A}"}) {
+    pageInfo {
+      hasNextPage
+      hasPreviousPage
+      endCursor
+      startCursor
+    }
+    nodes {
+      digest
+      effects {
+        checkpoint {
+          sequenceNumber
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql
+{
+  transactionBlocks(first: 50 filter: {kind: PROGRAMMABLE_TX atCheckpoint: 2 signAddress: "@{B}"}) {
+    pageInfo {
+      hasNextPage
+      hasPreviousPage
+      endCursor
+      startCursor
+    }
+    nodes {
+      digest
+      effects {
+        checkpoint {
+          sequenceNumber
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql
+{
+  transactionBlocks(first: 50 filter: {kind: PROGRAMMABLE_TX atCheckpoint: 2 signAddress: "@{C}"}) {
+    pageInfo {
+      hasNextPage
+      hasPreviousPage
+      endCursor
+      startCursor
+    }
+    nodes {
+      digest
+      effects {
+        checkpoint {
+          sequenceNumber
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql
+{
+  transactionBlocks(first: 50 filter: {kind: PROGRAMMABLE_TX atCheckpoint: 2 signAddress: "@{D}"}) {
+    pageInfo {
+      hasNextPage
+      hasPreviousPage
+      endCursor
+      startCursor
+    }
+    nodes {
+      digest
+      effects {
+        checkpoint {
+          sequenceNumber
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql
+{
+  transactionBlocks(first: 50 filter: {kind: PROGRAMMABLE_TX atCheckpoint: 2 signAddress: "@{E}"}) {
+    pageInfo {
+      hasNextPage
+      hasPreviousPage
+      endCursor
+      startCursor
+    }
+    nodes {
+      digest
+      effects {
+        checkpoint {
+          sequenceNumber
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql
+{
+  transactionBlocks(first: 50 filter: {kind: SYSTEM_TX atCheckpoint: 2}) {
+    pageInfo {
+      hasNextPage
+      hasPreviousPage
+      endCursor
+      startCursor
+    }
+    nodes {
+      digest
+      effects {
+        checkpoint {
+          sequenceNumber
+        }
+      }
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/filters/transaction_ids.exp b/crates/sui-graphql-e2e-tests/tests/transactions/filters/transaction_ids.exp
new file mode 100644
index 0000000000000..68ccdaff1ab7f
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/filters/transaction_ids.exp
@@ -0,0 +1,95 @@
+processed 9 tasks
+
+init:
+A: object(0,0)
+
+task 1, lines 6-19:
+//# publish
+created: object(1,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 5175600,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 2, line 21:
+//# create-checkpoint
+Checkpoint created: 1
+
+task 3, line 23:
+//# run Test::M1::create --args 0 @A --sender A
+created: object(3,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 4, line 25:
+//# create-checkpoint
+Checkpoint created: 2
+
+task 5, lines 27-45:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasNextPage": false,
+        "hasPreviousPage": false,
+        "endCursor": null,
+        "startCursor": null
+      },
+      "nodes": []
+    }
+  }
+}
+
+task 6, lines 47-65:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasNextPage": false,
+        "hasPreviousPage": false,
+        "endCursor": null,
+        "startCursor": null
+      },
+      "nodes": []
+    }
+  }
+}
+
+task 7, lines 67-85:
+//# run-graphql
+Response: {
+  "data": null,
+  "errors": [
+    {
+      "message": "A scan limit must be specified for the given filter combination",
+      "locations": [
+        {
+          "line": 2,
+          "column": 3
+        }
+      ],
+      "path": [
+        "transactionBlocks"
+      ],
+      "extensions": {
+        "code": "BAD_USER_INPUT"
+      }
+    }
+  ]
+}
+
+task 8, lines 87-105:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasNextPage": false,
+        "hasPreviousPage": false,
+        "endCursor": "eyJjIjoyLCJ0IjoyLCJpIjp0cnVlfQ",
+        "startCursor": "eyJjIjoyLCJ0IjowLCJpIjp0cnVlfQ"
+      },
+      "nodes": []
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/filters/transaction_ids.move b/crates/sui-graphql-e2e-tests/tests/transactions/filters/transaction_ids.move
new file mode 100644
index 0000000000000..ba15bcdc5ce9b
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/filters/transaction_ids.move
@@ -0,0 +1,105 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+//# init --protocol-version 48 --addresses Test=0x0 --accounts A --simulator
+
+//# publish
+module Test::M1 {
+    public struct Object has key, store {
+        id: UID,
+        value: u64,
+    }
+
+    public entry fun create(value: u64, recipient: address, ctx: &mut TxContext) {
+        transfer::public_transfer(
+            Object { id: object::new(ctx), value },
+            recipient
+        )
+    }
+}
+
+//# create-checkpoint
+
+//# run Test::M1::create --args 0 @A --sender A
+
+//# create-checkpoint
+
+//# run-graphql
+{
+  transactionBlocks(filter: {transactionIds: []}) {
+    pageInfo {
+      hasNextPage
+      hasPreviousPage
+      endCursor
+      startCursor
+    }
+    nodes {
+      digest
+      effects {
+        checkpoint {
+          sequenceNumber
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql
+{
+  transactionBlocks(filter: {signAddress: "@{A}" transactionIds: []}) {
+    pageInfo {
+      hasNextPage
+      hasPreviousPage
+      endCursor
+      startCursor
+    }
+    nodes {
+      digest
+      effects {
+        checkpoint {
+          sequenceNumber
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql
+{
+  transactionBlocks(filter: {recvAddress: "@{A}" transactionIds: []}) {
+    pageInfo {
+      hasNextPage
+      hasPreviousPage
+      endCursor
+      startCursor
+    }
+    nodes {
+      digest
+      effects {
+        checkpoint {
+          sequenceNumber
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql
+{
+  transactionBlocks(scanLimit: 10 filter: {recvAddress: "@{A}" transactionIds: []}) {
+    pageInfo {
+      hasNextPage
+      hasPreviousPage
+      endCursor
+      startCursor
+    }
+    nodes {
+      digest
+      effects {
+        checkpoint {
+          sequenceNumber
+        }
+      }
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/programmable.exp b/crates/sui-graphql-e2e-tests/tests/transactions/programmable.exp
index d1a45fd72cb9b..96578345e23ca 100644
--- a/crates/sui-graphql-e2e-tests/tests/transactions/programmable.exp
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/programmable.exp
@@ -1008,7 +1008,7 @@ Response: {
     "transactionBlocks": {
       "edges": [
         {
-          "cursor": "eyJjIjo0LCJ0IjowLCJ0YyI6MH0",
+          "cursor": "eyJjIjo0LCJ0IjowLCJpIjpmYWxzZX0",
           "node": {
             "kind": {
               "__typename": "GenesisTransaction"
@@ -1016,7 +1016,7 @@ Response: {
           }
         },
         {
-          "cursor": "eyJjIjo0LCJ0IjoxLCJ0YyI6MX0",
+          "cursor": "eyJjIjo0LCJ0IjoxLCJpIjpmYWxzZX0",
           "node": {
             "kind": {
               "__typename": "ProgrammableTransactionBlock"
@@ -1024,7 +1024,7 @@ Response: {
           }
         },
         {
-          "cursor": "eyJjIjo0LCJ0IjoyLCJ0YyI6Mn0",
+          "cursor": "eyJjIjo0LCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
             "kind": {
               "__typename": "ProgrammableTransactionBlock"
@@ -1032,7 +1032,7 @@ Response: {
           }
         },
         {
-          "cursor": "eyJjIjo0LCJ0IjozLCJ0YyI6M30",
+          "cursor": "eyJjIjo0LCJ0IjozLCJpIjpmYWxzZX0",
           "node": {
             "kind": {
               "__typename": "ProgrammableTransactionBlock"
@@ -1040,7 +1040,7 @@ Response: {
           }
         },
         {
-          "cursor": "eyJjIjo0LCJ0Ijo0LCJ0YyI6M30",
+          "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0",
           "node": {
             "kind": {
               "__typename": "ProgrammableTransactionBlock"
@@ -1048,7 +1048,7 @@ Response: {
           }
         },
         {
-          "cursor": "eyJjIjo0LCJ0Ijo1LCJ0YyI6NH0",
+          "cursor": "eyJjIjo0LCJ0Ijo1LCJpIjpmYWxzZX0",
           "node": {
             "kind": {
               "__typename": "ProgrammableTransactionBlock"
@@ -1067,7 +1067,7 @@ Response: {
     "transactionBlocks": {
       "edges": [
         {
-          "cursor": "eyJjIjo0LCJ0IjowLCJ0YyI6MH0",
+          "cursor": "eyJjIjo0LCJ0IjowLCJpIjpmYWxzZX0",
           "node": {
             "kind": {
               "__typename": "GenesisTransaction"
@@ -1086,7 +1086,7 @@ Response: {
     "transactionBlocks": {
       "edges": [
         {
-          "cursor": "eyJjIjo0LCJ0IjoxLCJ0YyI6MX0",
+          "cursor": "eyJjIjo0LCJ0IjoxLCJpIjpmYWxzZX0",
           "node": {
             "kind": {
               "__typename": "ProgrammableTransactionBlock"
@@ -1094,7 +1094,7 @@ Response: {
           }
         },
         {
-          "cursor": "eyJjIjo0LCJ0IjoyLCJ0YyI6Mn0",
+          "cursor": "eyJjIjo0LCJ0IjoyLCJpIjpmYWxzZX0",
           "node": {
             "kind": {
               "__typename": "ProgrammableTransactionBlock"
@@ -1102,7 +1102,7 @@ Response: {
           }
         },
         {
-          "cursor": "eyJjIjo0LCJ0IjozLCJ0YyI6M30",
+          "cursor": "eyJjIjo0LCJ0IjozLCJpIjpmYWxzZX0",
           "node": {
             "kind": {
               "__typename": "ProgrammableTransactionBlock"
@@ -1110,7 +1110,7 @@ Response: {
           }
         },
         {
-          "cursor": "eyJjIjo0LCJ0Ijo0LCJ0YyI6M30",
+          "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0",
           "node": {
             "kind": {
               "__typename": "ProgrammableTransactionBlock"
@@ -1118,7 +1118,7 @@ Response: {
           }
         },
         {
-          "cursor": "eyJjIjo0LCJ0Ijo1LCJ0YyI6NH0",
+          "cursor": "eyJjIjo0LCJ0Ijo1LCJpIjpmYWxzZX0",
           "node": {
             "kind": {
               "__typename": "ProgrammableTransactionBlock"
@@ -1149,10 +1149,10 @@ Response: {
     "transactionBlocks": {
       "edges": [
         {
-          "cursor": "eyJjIjo0LCJ0IjoyLCJ0YyI6Mn0"
+          "cursor": "eyJjIjo0LCJ0IjoyLCJpIjpmYWxzZX0"
         },
         {
-          "cursor": "eyJjIjo0LCJ0IjozLCJ0YyI6M30"
+          "cursor": "eyJjIjo0LCJ0IjozLCJpIjpmYWxzZX0"
         }
       ]
     }
@@ -1166,10 +1166,10 @@ Response: {
     "transactionBlocks": {
       "edges": [
         {
-          "cursor": "eyJjIjo0LCJ0IjozLCJ0YyI6M30"
+          "cursor": "eyJjIjo0LCJ0IjozLCJpIjpmYWxzZX0"
         },
         {
-          "cursor": "eyJjIjo0LCJ0Ijo0LCJ0YyI6M30"
+          "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0"
         }
       ]
     }
@@ -1183,7 +1183,7 @@ Response: {
     "transactionBlocks": {
       "edges": [
         {
-          "cursor": "eyJjIjo0LCJ0IjozLCJ0YyI6M30"
+          "cursor": "eyJjIjo0LCJ0IjozLCJpIjpmYWxzZX0"
         }
       ]
     }
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/alternating.exp b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/alternating.exp
new file mode 100644
index 0000000000000..3ae2d4b5218c5
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/alternating.exp
@@ -0,0 +1,300 @@
+processed 22 tasks
+
+init:
+A: object(0,0), B: object(0,1)
+
+task 1, lines 8-29:
+//# publish
+created: object(1,0)
+mutated: object(0,2)
+gas summary: computation_cost: 1000000, storage_cost: 5798800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 2, line 31:
+//# create-checkpoint
+Checkpoint created: 1
+
+task 3, line 33:
+//# run Test::M1::create --args 0 @A --sender A
+created: object(3,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 4, line 35:
+//# run Test::M1::create --args 1 @B --sender B
+created: object(4,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 5, line 37:
+//# run Test::M1::create --args 2 @A --sender A
+created: object(5,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 6, line 39:
+//# run Test::M1::create --args 3 @B --sender B
+created: object(6,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 7, line 41:
+//# run Test::M1::create --args 4 @A --sender A
+created: object(7,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 8, line 43:
+//# create-checkpoint
+Checkpoint created: 2
+
+task 9, line 45:
+//# run Test::M1::create --args 100 @B --sender B
+created: object(9,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 10, line 47:
+//# run Test::M1::create --args 101 @A --sender A
+created: object(10,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 11, line 49:
+//# run Test::M1::create --args 102 @B --sender B
+created: object(11,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 12, line 51:
+//# run Test::M1::create --args 103 @A --sender A
+created: object(12,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 13, line 53:
+//# run Test::M1::create --args 104 @B --sender B
+created: object(13,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 14, line 55:
+//# create-checkpoint
+Checkpoint created: 3
+
+task 15, lines 57-78:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": false,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjozLCJ0IjoyLCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjozLCJ0IjozLCJpIjp0cnVlfQ"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "CReUjLynvpq4dD4w6zekGxvSyBBQF2e3KG3K2Rs7oD8L",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 16, lines 80-104:
+//# run-graphql --cursors {"c":3,"t":3,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": false,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0",
+        "endCursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "Hgu3LePqrpyR8Vq3Ve4L2KmvErcdcz92u7YiiotkKJ1N",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "2EwyAHiMofhbM5z5ty7XT1QXs4sNZfHmZLX513Ag8sD3",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 17, lines 106-129:
+//# run-graphql --cursors {"c":3,"t":3,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjozLCJ0Ijo0LCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjozLCJ0Ijo1LCJpIjp0cnVlfQ"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "Hgu3LePqrpyR8Vq3Ve4L2KmvErcdcz92u7YiiotkKJ1N",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 18, lines 131-155:
+//# run-graphql --cursors {"c":3,"t":6,"i":false}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjozLCJ0Ijo3LCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjozLCJ0Ijo4LCJpIjp0cnVlfQ"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "4LUhoFJMmZfG71RHiRkwa9KHovrDv3S3mqUM1vu9JWKJ",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 19, lines 157-184:
+//# run-graphql --cursors {"c":3,"t":5,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjozLCJ0Ijo2LCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "2EwyAHiMofhbM5z5ty7XT1QXs4sNZfHmZLX513Ag8sD3",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "4LUhoFJMmZfG71RHiRkwa9KHovrDv3S3mqUM1vu9JWKJ",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 20, lines 186-209:
+//# run-graphql --cursors {"c":3,"t":8,"i":false}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": false,
+        "startCursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9",
+        "endCursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "AnqDERsdbEiE26CACJa6KtJTLsggisgu7yxhMJ6mU1JZ",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 21, lines 211-235:
+//# run-graphql --cursors {"c":3,"t":8,"i":false}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": false,
+        "startCursor": "eyJjIjozLCJ0Ijo5LCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjozLCJ0IjoxMSwiaSI6dHJ1ZX0"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "AnqDERsdbEiE26CACJa6KtJTLsggisgu7yxhMJ6mU1JZ",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/alternating.move b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/alternating.move
new file mode 100644
index 0000000000000..a5f339d31d94e
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/alternating.move
@@ -0,0 +1,235 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+// Testing behavior of alternating between a scan-limited and normal query
+
+//# init --protocol-version 48 --addresses Test=0x0 --accounts A B --simulator
+
+//# publish
+module Test::M1 {
+    public struct Object has key, store {
+        id: UID,
+        value: u64,
+    }
+
+    public entry fun create(value: u64, recipient: address, ctx: &mut TxContext) {
+        transfer::public_transfer(
+            Object { id: object::new(ctx), value },
+            recipient
+        )
+    }
+
+    public fun swap_value_and_send(mut lhs: Object, mut rhs: Object, recipient: address) {
+        let tmp = lhs.value;
+        lhs.value = rhs.value;
+        rhs.value = tmp;
+        transfer::public_transfer(lhs, recipient);
+        transfer::public_transfer(rhs, recipient);
+    }
+}
+
+//# create-checkpoint
+
+//# run Test::M1::create --args 0 @A --sender A
+
+//# run Test::M1::create --args 1 @B --sender B
+
+//# run Test::M1::create --args 2 @A --sender A
+
+//# run Test::M1::create --args 3 @B --sender B
+
+//# run Test::M1::create --args 4 @A --sender A
+
+//# create-checkpoint
+
+//# run Test::M1::create --args 100 @B --sender B
+
+//# run Test::M1::create --args 101 @A --sender A
+
+//# run Test::M1::create --args 102 @B --sender B
+
+//# run Test::M1::create --args 103 @A --sender A
+
+//# run Test::M1::create --args 104 @B --sender B
+
+//# create-checkpoint
+
+//# run-graphql
+{
+  transactionBlocks(first: 2 scanLimit: 2 filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":3,"t":3,"i":true}
+# This should return the next two matching transactions after 3,
+# so tx 4 and 6. the boundary cursors should wrap the response set,
+# and both should have isScanLimited set to false
+{
+  transactionBlocks(first: 2 after: "@{cursor_0}" filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":3,"t":3,"i":true}
+# Meanwhile, because of the scanLimit of 2, the boundary cursors are
+# startCursor: 4, endCursor: 5, and both are scan limited
+{
+  transactionBlocks(first: 2 after: "@{cursor_0}" scanLimit: 2 filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":3,"t":6,"i":false}
+# From a previous query that was not scan limited, paginate with scan limit
+# startCursor: 7, endCursor: 8, both scan limited
+# response set consists of single tx 8
+{
+  transactionBlocks(first: 2 after: "@{cursor_0}" scanLimit: 2 filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":3,"t":5,"i":true}
+# from tx 5, select the next two transactions that match
+# setting the scanLimit to impose all of the remaining txs
+# even though we've finished scanning
+# we should indicate there is a next page so we don't skip any txs
+# consequently, the endCursor wraps the result set
+# startCursor: 6, endCursor: 8, endCursor is not scan limited
+{
+  transactionBlocks(first: 2 after: "@{cursor_0}" scanLimit: 6 filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":3,"t":8,"i":false}
+# fetch the last tx without scan limit
+# startCursor = endCursor = 10, wrapping the response set
+{
+  transactionBlocks(first: 2 after: "@{cursor_0}" filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":3,"t":8,"i":false}
+# fetch the last tx with scan limit
+# unlike the not-scan-limited query, the start and end cursors
+# are expanded out to the scanned window, instead of wrapping the response set
+{
+  transactionBlocks(first: 2 after: "@{cursor_0}" scanLimit: 6 filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.exp b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.exp
new file mode 100644
index 0000000000000..2fee54d94c6f6
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.exp
@@ -0,0 +1,177 @@
+processed 18 tasks
+
+init:
+A: object(0,0), B: object(0,1)
+
+task 1, lines 9-30:
+//# publish
+created: object(1,0)
+mutated: object(0,2)
+gas summary: computation_cost: 1000000, storage_cost: 5798800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 2, line 32:
+//# create-checkpoint
+Checkpoint created: 1
+
+task 3, line 34:
+//# run Test::M1::create --args 0 @B --sender A
+created: object(3,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 4, line 36:
+//# run Test::M1::create --args 1 @A --sender A
+created: object(4,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 5, line 38:
+//# run Test::M1::create --args 2 @B --sender A
+created: object(5,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 6, line 40:
+//# run Test::M1::create --args 3 @A --sender A
+created: object(6,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 7, line 42:
+//# run Test::M1::create --args 4 @B --sender A
+created: object(7,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 8, line 44:
+//# create-checkpoint
+Checkpoint created: 2
+
+task 9, line 46:
+//# run Test::M1::create --args 100 @A --sender A
+created: object(9,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 10, line 48:
+//# run Test::M1::create --args 101 @A --sender A
+created: object(10,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 11, line 50:
+//# run Test::M1::create --args 102 @A --sender A
+created: object(11,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 12, line 52:
+//# run Test::M1::create --args 103 @B --sender A
+created: object(12,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 13, line 54:
+//# run Test::M1::create --args 104 @B --sender A
+created: object(13,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 14, line 56:
+//# create-checkpoint
+Checkpoint created: 3
+
+task 15, lines 58-81:
+//# run-graphql --cursors {"c":4,"t":2,"i":true} {"c":4,"t":7,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo0LCJ0IjozLCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "6RKZYt946ztfY8ZVspCv8faXBzKxDcTUEHnrCyBSZ4Li",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 16, lines 83-108:
+//# run-graphql --cursors {"c":4,"t":2,"i":true} {"c":4,"t":7,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo0LCJ0IjozLCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjo0LCJ0Ijo2LCJpIjp0cnVlfQ"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "6RKZYt946ztfY8ZVspCv8faXBzKxDcTUEHnrCyBSZ4Li",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjo0LCJ0Ijo2LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "83AZLnLVtQeUdrXGg3igLkeo94j3wTLuwY4izobLLVBT",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 17, lines 110-133:
+//# run-graphql --cursors {"c":4,"t":4,"i":true} {"c":4,"t":8,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo0LCJ0Ijo1LCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjo0LCJ0Ijo1LCJpIjpmYWxzZX0"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo0LCJ0Ijo1LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "74pdWZw8nEhvtan9aoYHAeZxGouHsj9cwBr5GcgncNAz",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.move b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.move
new file mode 100644
index 0000000000000..ba913319b65ad
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/both_cursors.move
@@ -0,0 +1,133 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+// Tests paginating forwards where first and scanLimit are equal. The 1st, 3rd, 5th, and 7th through
+// 10th transactions will match the filtering criteria.
+
+//# init --protocol-version 48 --addresses Test=0x0 --accounts A B --simulator
+
+//# publish
+module Test::M1 {
+    public struct Object has key, store {
+        id: UID,
+        value: u64,
+    }
+
+    public entry fun create(value: u64, recipient: address, ctx: &mut TxContext) {
+        transfer::public_transfer(
+            Object { id: object::new(ctx), value },
+            recipient
+        )
+    }
+
+    public fun swap_value_and_send(mut lhs: Object, mut rhs: Object, recipient: address) {
+        let tmp = lhs.value;
+        lhs.value = rhs.value;
+        rhs.value = tmp;
+        transfer::public_transfer(lhs, recipient);
+        transfer::public_transfer(rhs, recipient);
+    }
+}
+
+//# create-checkpoint
+
+//# run Test::M1::create --args 0 @B --sender A
+
+//# run Test::M1::create --args 1 @A --sender A
+
+//# run Test::M1::create --args 2 @B --sender A
+
+//# run Test::M1::create --args 3 @A --sender A
+
+//# run Test::M1::create --args 4 @B --sender A
+
+//# create-checkpoint
+
+//# run Test::M1::create --args 100 @A --sender A
+
+//# run Test::M1::create --args 101 @A --sender A
+
+//# run Test::M1::create --args 102 @A --sender A
+
+//# run Test::M1::create --args 103 @B --sender A
+
+//# run Test::M1::create --args 104 @B --sender A
+
+//# create-checkpoint
+
+//# run-graphql --cursors {"c":4,"t":2,"i":true} {"c":4,"t":7,"i":true}
+# startCursor is at 3 + scanLimited, endCursor at 4 + not scanLimited
+# this is because between (2, 7), txs 4 and 6 match, and thus endCursor snaps to last of result
+{
+  transactionBlocks(first: 1 scanLimit: 4 after: "@{cursor_0}" before: "@{cursor_1}" filter: {recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":4,"t":2,"i":true} {"c":4,"t":7,"i":true}
+# startCursor is at 3 + scanLimited, endCursor at 6 + scanLimited
+# we return txs 4 and 6, paginate_results thinks we do not have a next page,
+# and scan-limit logic will override this as there are still more txs to scan
+# note that we're scanning txs [3, 6]
+{
+  transactionBlocks(first: 3 scanLimit: 4 after: "@{cursor_0}" before: "@{cursor_1}" filter: {recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":4,"t":4,"i":true} {"c":4,"t":8,"i":true}
+# txs 5 and 7 match, but due to page size of `first: 1`, we only return tx 5
+# startCursor is 5 + scan limited, endCursor is also 5 + scan limited
+{
+  transactionBlocks(first: 1 scanLimit: 3 after: "@{cursor_0}" before: "@{cursor_1}" filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.exp b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.exp
new file mode 100644
index 0000000000000..b02eb2652a412
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.exp
@@ -0,0 +1,358 @@
+processed 25 tasks
+
+init:
+A: object(0,0), B: object(0,1)
+
+task 1, lines 9-30:
+//# publish
+created: object(1,0)
+mutated: object(0,2)
+gas summary: computation_cost: 1000000, storage_cost: 5798800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 2, line 32:
+//# create-checkpoint
+Checkpoint created: 1
+
+task 3, line 34:
+//# run Test::M1::create --args 0 @B --sender A
+created: object(3,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 4, line 36:
+//# run Test::M1::create --args 1 @A --sender A
+created: object(4,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 5, line 38:
+//# run Test::M1::create --args 2 @B --sender A
+created: object(5,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 6, line 40:
+//# run Test::M1::create --args 3 @A --sender A
+created: object(6,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 7, line 42:
+//# run Test::M1::create --args 4 @B --sender A
+created: object(7,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 8, line 44:
+//# create-checkpoint
+Checkpoint created: 2
+
+task 9, line 46:
+//# run Test::M1::create --args 100 @A --sender A
+created: object(9,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 10, line 48:
+//# run Test::M1::create --args 101 @A --sender A
+created: object(10,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 11, line 50:
+//# run Test::M1::create --args 102 @A --sender A
+created: object(11,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 12, line 52:
+//# run Test::M1::create --args 103 @B --sender A
+created: object(12,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 13, line 54:
+//# run Test::M1::create --args 104 @B --sender A
+created: object(13,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 14, line 56:
+//# create-checkpoint
+Checkpoint created: 3
+
+task 15, lines 58-82:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": false,
+        "hasNextPage": false,
+        "startCursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
+        "endCursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "HzyC8gcn4m1ymKxYSpWMaNnmbrqm4hX7UBteJ4me3LFd",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "6RKZYt946ztfY8ZVspCv8faXBzKxDcTUEHnrCyBSZ4Li",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "83AZLnLVtQeUdrXGg3igLkeo94j3wTLuwY4izobLLVBT",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "AWWgnnumcijVEY2YUzs4MtqzFPeLKFAbHnnjXwUyn6Gj",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "DVVVd1cLYDpV3KHhXpirV5NFpk3DKaCuKvXXFeG2owA7",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 16, lines 85-111:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": false,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjozLCJ0IjoyLCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjozLCJ0IjozLCJpIjp0cnVlfQ"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "HzyC8gcn4m1ymKxYSpWMaNnmbrqm4hX7UBteJ4me3LFd",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 17, lines 113-137:
+//# run-graphql --cursors {"c":4,"t":3,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo0LCJ0Ijo0LCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjo0LCJ0Ijo0LCJpIjp0cnVlfQ"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "6RKZYt946ztfY8ZVspCv8faXBzKxDcTUEHnrCyBSZ4Li",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 18, lines 139-165:
+//# run-graphql --cursors {"c":4,"t":4,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo0LCJ0Ijo1LCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjo0LCJ0Ijo3LCJpIjp0cnVlfQ"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo0LCJ0Ijo2LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "83AZLnLVtQeUdrXGg3igLkeo94j3wTLuwY4izobLLVBT",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 19, lines 167-193:
+//# run-graphql --cursors {"c":4,"t":7,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo0LCJ0Ijo4LCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjo0LCJ0Ijo5LCJpIjp0cnVlfQ"
+      },
+      "edges": []
+    }
+  }
+}
+
+task 20, lines 195-220:
+//# run-graphql --cursors {"c":4,"t":9,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": false,
+        "startCursor": "eyJjIjo0LCJ0IjoxMCwiaSI6dHJ1ZX0",
+        "endCursor": "eyJjIjo0LCJ0IjoxMSwiaSI6dHJ1ZX0"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo0LCJ0IjoxMCwiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "AWWgnnumcijVEY2YUzs4MtqzFPeLKFAbHnnjXwUyn6Gj",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjo0LCJ0IjoxMSwiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "DVVVd1cLYDpV3KHhXpirV5NFpk3DKaCuKvXXFeG2owA7",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 21, line 222:
+//# run Test::M1::create --args 105 @A --sender A
+created: object(21,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 22, line 224:
+//# create-checkpoint
+Checkpoint created: 4
+
+task 23, lines 226-252:
+//# run-graphql --cursors {"c":4,"t":11,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": false,
+        "startCursor": "eyJjIjo0LCJ0IjoxMiwiaSI6dHJ1ZX0",
+        "endCursor": "eyJjIjo0LCJ0IjoxMiwiaSI6dHJ1ZX0"
+      },
+      "edges": []
+    }
+  }
+}
+
+task 24, lines 254-281:
+//# run-graphql --cursors {"c":4,"t":12,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo0LCJ0IjoxMCwiaSI6dHJ1ZX0",
+        "endCursor": "eyJjIjo0LCJ0IjoxMSwiaSI6dHJ1ZX0"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo0LCJ0IjoxMCwiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "AWWgnnumcijVEY2YUzs4MtqzFPeLKFAbHnnjXwUyn6Gj",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjo0LCJ0IjoxMSwiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "DVVVd1cLYDpV3KHhXpirV5NFpk3DKaCuKvXXFeG2owA7",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.move b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.move
new file mode 100644
index 0000000000000..a3a3705413cba
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/equal/first.move
@@ -0,0 +1,281 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+// Tests paginating forwards where first and scanLimit are equal. The 1st, 3rd, 5th, and 7th through
+// 10th transactions will match the filtering criteria.
+
+//# init --protocol-version 48 --addresses Test=0x0 --accounts A B --simulator
+
+//# publish
+module Test::M1 {
+    public struct Object has key, store {
+        id: UID,
+        value: u64,
+    }
+
+    public entry fun create(value: u64, recipient: address, ctx: &mut TxContext) {
+        transfer::public_transfer(
+            Object { id: object::new(ctx), value },
+            recipient
+        )
+    }
+
+    public fun swap_value_and_send(mut lhs: Object, mut rhs: Object, recipient: address) {
+        let tmp = lhs.value;
+        lhs.value = rhs.value;
+        rhs.value = tmp;
+        transfer::public_transfer(lhs, recipient);
+        transfer::public_transfer(rhs, recipient);
+    }
+}
+
+//# create-checkpoint
+
+//# run Test::M1::create --args 0 @B --sender A
+
+//# run Test::M1::create --args 1 @A --sender A
+
+//# run Test::M1::create --args 2 @B --sender A
+
+//# run Test::M1::create --args 3 @A --sender A
+
+//# run Test::M1::create --args 4 @B --sender A
+
+//# create-checkpoint
+
+//# run Test::M1::create --args 100 @A --sender A
+
+//# run Test::M1::create --args 101 @A --sender A
+
+//# run Test::M1::create --args 102 @A --sender A
+
+//# run Test::M1::create --args 103 @B --sender A
+
+//# run Test::M1::create --args 104 @B --sender A
+
+//# create-checkpoint
+
+//# run-graphql
+# Expect 7 results
+# [2, 3, 4, 5, 6, 7, 8, 9, 10, 11] <- tx_sequence_number
+# [B, A, B, A, B, A, A, A, B, B]
+{
+  transactionBlocks(first: 50 filter: {recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+
+//# run-graphql
+# scans [B, A] -> [2, 3]
+# Because `scanLimit` is specified, both the start and end cursors should have `is_scan_limited` flag to true
+# startCursor is at 2, endCursor is at 3
+# The cursor for the node will have `is_scan_limited` flag set to false, because we know for sure there is
+# a corresponding element for the cursor in the result set.
+{
+  transactionBlocks(first: 2 scanLimit: 2 filter: {recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":4,"t":3,"i":true}
+# scans [B] -> [4]
+# Still paginating with `scanLimit`, both the start and end cursors should have `is_scan_limited` flag to true
+# because of the scanLimit of 4, startCursor = endCursor = 4
+{
+  transactionBlocks(first: 1 scanLimit: 1 after: "@{cursor_0}" filter: {recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":4,"t":4,"i":true}
+# scans [A, B, A] -> [5, 6, 7]
+# both the start and end cursors should have `is_scan_limited` flag to true
+# startCursor at 5, the sole element has cursor at 6, endCursor at 7
+# instead of wrapping around the result set, the boundary cursors are pushed out
+# to the first and last transaction scanned in this query
+{
+  transactionBlocks(first: 3 scanLimit: 3 after: "@{cursor_0}" filter: {recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":4,"t":7,"i":true}
+# scans [A, A] -> [8, 9]
+# both the start and end cursors should have `is_scan_limited` flag to true
+# startCursor at 5, the sole element has cursor at 8, endCursor at 9
+# instead of returninng None, we set the boundary cursors
+# to the first and last transaction scanned in this query
+{
+  transactionBlocks(first: 2 scanLimit: 2 after: "@{cursor_0}" filter: {recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":4,"t":9,"i":true}
+# scans [B, B] -> [10, 11]
+# both the start and end cursors should have `is_scan_limited` flag to true
+# startCursor at 10, endCursor at 11
+# correctly detects we've reached the end of the upper bound
+{
+  transactionBlocks(first: 2 scanLimit: 2 after: "@{cursor_0}" filter: {recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run Test::M1::create --args 105 @A --sender A
+
+//# create-checkpoint
+
+//# run-graphql --cursors {"c":4,"t":11,"i":true}
+# we've introduced a new final transaction that doesn't match the filter
+# both the start and end cursors should have `is_scan_limited` flag to true
+# startCursor = endCursor = 12, because there is only 1 more from the given cursor,
+# regardless of the specified scanLimit
+# correctly detects we've reached the end of the upper bound
+{
+  transactionBlocks(first: 2 scanLimit: 2 after: "@{cursor_0}" filter: {recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 5}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":4,"t":12,"i":true}
+# try paginating backwards on the last `endCursor`
+# should yield startCursor at 10, endCursor at 11
+# and the result set consists of txs 10 and 11
+# the scanLimit is exclusive of the cursor, hence we reach tx 10 inclusively
+# there is a next page, which is the 12th tx, which should yield an empty set
+# per the filtering criteria
+{
+  transactionBlocks(last: 2 scanLimit: 2 before: "@{cursor_0}" filter: {recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 5}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.exp b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.exp
new file mode 100644
index 0000000000000..e2b301c1dc7e3
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.exp
@@ -0,0 +1,309 @@
+processed 22 tasks
+
+init:
+A: object(0,0), B: object(0,1)
+
+task 1, lines 8-29:
+//# publish
+created: object(1,0)
+mutated: object(0,2)
+gas summary: computation_cost: 1000000, storage_cost: 5798800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 2, line 31:
+//# create-checkpoint
+Checkpoint created: 1
+
+task 3, line 33:
+//# run Test::M1::create --args 0 @B --sender A
+created: object(3,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 4, line 35:
+//# run Test::M1::create --args 1 @B --sender A
+created: object(4,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 5, line 37:
+//# run Test::M1::create --args 2 @A --sender A
+created: object(5,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 6, line 39:
+//# run Test::M1::create --args 3 @A --sender A
+created: object(6,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 7, line 41:
+//# run Test::M1::create --args 4 @A --sender A
+created: object(7,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 8, line 43:
+//# create-checkpoint
+Checkpoint created: 2
+
+task 9, line 45:
+//# run Test::M1::create --args 100 @B --sender A
+created: object(9,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 10, line 47:
+//# run Test::M1::create --args 101 @A --sender A
+created: object(10,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 11, line 49:
+//# run Test::M1::create --args 102 @B --sender A
+created: object(11,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 12, line 51:
+//# run Test::M1::create --args 103 @A --sender A
+created: object(12,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 13, line 53:
+//# run Test::M1::create --args 104 @B --sender A
+created: object(13,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 14, line 55:
+//# create-checkpoint
+Checkpoint created: 3
+
+task 15, lines 57-79:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": false,
+        "hasNextPage": false,
+        "startCursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
+        "endCursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "HzyC8gcn4m1ymKxYSpWMaNnmbrqm4hX7UBteJ4me3LFd",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0IjozLCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "DiywoRFzC33smQhVf5K7AcM853XFgfgFxBGErLTEvVWi",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0Ijo3LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "F32vrNL7p5sa1iFeykvFQ17UYLeM1urXnSNbbGyoqDRx",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0Ijo5LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "3eHY9XENiqep4VvNBr3ws79TEMGhp5egGvFEymk679dc",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "4p5avK1cStj1xtBnvCnHgEUVVr5qnfXQ76ujUZx4ZvP8",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 16, lines 82-106:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": false,
+        "startCursor": "eyJjIjozLCJ0IjoxMCwiaSI6dHJ1ZX0",
+        "endCursor": "eyJjIjozLCJ0IjoxMSwiaSI6dHJ1ZX0"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "4p5avK1cStj1xtBnvCnHgEUVVr5qnfXQ76ujUZx4ZvP8",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 17, lines 108-132:
+//# run-graphql --cursors {"c":4,"t":10,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo0LCJ0Ijo5LCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjo0LCJ0Ijo5LCJpIjp0cnVlfQ"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo0LCJ0Ijo5LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "3eHY9XENiqep4VvNBr3ws79TEMGhp5egGvFEymk679dc",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 18, lines 134-158:
+//# run-graphql --cursors {"c":4,"t":9,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo0LCJ0Ijo2LCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjo0LCJ0Ijo4LCJpIjp0cnVlfQ"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo0LCJ0Ijo3LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "F32vrNL7p5sa1iFeykvFQ17UYLeM1urXnSNbbGyoqDRx",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 19, lines 160-184:
+//# run-graphql --cursors {"c":4,"t":6,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo0LCJ0Ijo0LCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjo0LCJ0Ijo1LCJpIjp0cnVlfQ"
+      },
+      "edges": []
+    }
+  }
+}
+
+task 20, lines 186-209:
+//# run-graphql --cursors {"c":4,"t":4,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": false,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo0LCJ0IjoyLCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjo0LCJ0IjozLCJpIjp0cnVlfQ"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo0LCJ0IjoyLCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "HzyC8gcn4m1ymKxYSpWMaNnmbrqm4hX7UBteJ4me3LFd",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjo0LCJ0IjozLCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "DiywoRFzC33smQhVf5K7AcM853XFgfgFxBGErLTEvVWi",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 21, lines 212-235:
+//# run-graphql --cursors {"c":4,"t":2,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": false,
+        "hasNextPage": false,
+        "startCursor": null,
+        "endCursor": null
+      },
+      "edges": []
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.move b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.move
new file mode 100644
index 0000000000000..6a84f9eabe90b
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/equal/last.move
@@ -0,0 +1,235 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+// Mirrors scan_limit/equal/first.move, paginating backwards where first and scanLimit are equal.
+
+//# init --protocol-version 48 --addresses Test=0x0 --accounts A B --simulator
+
+//# publish
+module Test::M1 {
+    public struct Object has key, store {
+        id: UID,
+        value: u64,
+    }
+
+    public entry fun create(value: u64, recipient: address, ctx: &mut TxContext) {
+        transfer::public_transfer(
+            Object { id: object::new(ctx), value },
+            recipient
+        )
+    }
+
+    public fun swap_value_and_send(mut lhs: Object, mut rhs: Object, recipient: address) {
+        let tmp = lhs.value;
+        lhs.value = rhs.value;
+        rhs.value = tmp;
+        transfer::public_transfer(lhs, recipient);
+        transfer::public_transfer(rhs, recipient);
+    }
+}
+
+//# create-checkpoint
+
+//# run Test::M1::create --args 0 @B --sender A
+
+//# run Test::M1::create --args 1 @B --sender A
+
+//# run Test::M1::create --args 2 @A --sender A
+
+//# run Test::M1::create --args 3 @A --sender A
+
+//# run Test::M1::create --args 4 @A --sender A
+
+//# create-checkpoint
+
+//# run Test::M1::create --args 100 @B --sender A
+
+//# run Test::M1::create --args 101 @A --sender A
+
+//# run Test::M1::create --args 102 @B --sender A
+
+//# run Test::M1::create --args 103 @A --sender A
+
+//# run Test::M1::create --args 104 @B --sender A
+
+//# create-checkpoint
+
+//# run-graphql
+# Expect ten results
+{
+  transactionBlocks(last: 50 filter: {recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+
+//# run-graphql
+# boundary cursors are scan limited
+# startCursor: 10, endCursor: 11
+# result is single element with cursor: 11
+{
+  transactionBlocks(last: 2 scanLimit: 2 filter: {recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":4,"t":10,"i":true}
+# boundary cursors are scan limited
+# startCursor: 9, endCursor: 9
+# result is single element with cursor: 9
+{
+  transactionBlocks(last: 1 scanLimit: 1 before: "@{cursor_0}" filter: {recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":4,"t":9,"i":true}
+# boundary cursors are scan limited
+# startCursor: 6, endCursor: 8
+# result is single element with cursor: 7
+{
+  transactionBlocks(last: 3 scanLimit: 3 before: "@{cursor_0}" filter: {recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":4,"t":6,"i":true}
+# boundary cursors are scan limited
+# startCursor: 4, endCursor: 5
+# expect empty set
+{
+  transactionBlocks(last: 2 scanLimit: 2 before: "@{cursor_0}" filter: {recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":4,"t":4,"i":true}
+# Returns the first two matching transactions, boundary cursors both have `is_scan_limited: true`
+# startCursor: 2, endCursor: 3
+{
+  transactionBlocks(last: 2 scanLimit: 2 before: "@{cursor_0}" filter: {recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+
+//# run-graphql --cursors {"c":4,"t":2,"i":true}
+# Since we know from the previous query that there is not a previous page at this cursor,
+# Expect false for page flags and null for cursors
+{
+  transactionBlocks(last: 2 scanLimit: 2 before: "@{cursor_0}" filter: {recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.exp b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.exp
new file mode 100644
index 0000000000000..9f785684321d9
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.exp
@@ -0,0 +1,378 @@
+processed 34 tasks
+
+init:
+A: object(0,0), B: object(0,1)
+
+task 1, lines 6-27:
+//# publish
+created: object(1,0)
+mutated: object(0,2)
+gas summary: computation_cost: 1000000, storage_cost: 5798800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 2, line 29:
+//# create-checkpoint
+Checkpoint created: 1
+
+task 3, line 31:
+//# run Test::M1::create --args 0 @A --sender A
+created: object(3,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 4, line 33:
+//# run Test::M1::create --args 1 @A --sender A
+created: object(4,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 5, line 35:
+//# run Test::M1::create --args 2 @B --sender B
+created: object(5,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 6, line 37:
+//# run Test::M1::create --args 3 @B --sender B
+created: object(6,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 7, line 39:
+//# run Test::M1::create --args 4 @B --sender B
+created: object(7,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 8, line 41:
+//# create-checkpoint
+Checkpoint created: 2
+
+task 9, line 43:
+//# run Test::M1::create --args 100 @B --sender B
+created: object(9,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 10, line 45:
+//# run Test::M1::create --args 101 @B --sender B
+created: object(10,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 11, line 47:
+//# run Test::M1::create --args 102 @B --sender B
+created: object(11,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 12, line 49:
+//# run Test::M1::create --args 103 @B --sender B
+created: object(12,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 13, line 51:
+//# run Test::M1::create --args 104 @B --sender B
+created: object(13,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 14, line 53:
+//# create-checkpoint
+Checkpoint created: 3
+
+task 15, line 55:
+//# run Test::M1::create --args 100 @B --sender B
+created: object(15,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 16, line 57:
+//# run Test::M1::create --args 101 @B --sender B
+created: object(16,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 17, line 59:
+//# run Test::M1::create --args 102 @B --sender B
+created: object(17,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 18, line 61:
+//# run Test::M1::create --args 103 @B --sender B
+created: object(18,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 19, line 63:
+//# run Test::M1::create --args 104 @B --sender B
+created: object(19,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 20, line 65:
+//# create-checkpoint
+Checkpoint created: 4
+
+task 21, line 67:
+//# run Test::M1::create --args 200 @A --sender A
+created: object(21,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 22, line 69:
+//# run Test::M1::create --args 201 @B --sender A
+created: object(22,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 23, line 71:
+//# run Test::M1::create --args 202 @B --sender B
+created: object(23,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 24, line 73:
+//# run Test::M1::create --args 203 @B --sender B
+created: object(24,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 25, line 75:
+//# run Test::M1::create --args 204 @A --sender A
+created: object(25,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 26, line 77:
+//# create-checkpoint
+Checkpoint created: 5
+
+task 27, lines 79-100:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": false,
+        "hasNextPage": false,
+        "startCursor": "eyJjIjo1LCJ0IjoyLCJpIjpmYWxzZX0",
+        "endCursor": "eyJjIjo1LCJ0IjoyMSwiaSI6ZmFsc2V9"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo1LCJ0IjoyLCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "CReUjLynvpq4dD4w6zekGxvSyBBQF2e3KG3K2Rs7oD8L",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjo1LCJ0IjozLCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "BB6bMUxrBJX9wANzzptKnJM3bMVFKnD4xtY8DGWthaH9",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjo1LCJ0IjoxNywiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "BhW3cLzaCgdRYc6jcmXB6DrQ6KaTfmYmb6vBNiu5xPhg",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 5
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjo1LCJ0IjoxOCwiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "FjpAF5bT173BfV6HLuBdBd2bYevsUVDeJNmYnmJYsTLb",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 5
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjo1LCJ0IjoyMSwiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "Eq611DTcfsBjH1P9Smrv7xFYQZXNtUMgbQCUr5jo3ycJ",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 5
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 28, lines 103-129:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": false,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo1LCJ0IjoyLCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjo1LCJ0IjoyLCJpIjpmYWxzZX0"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo1LCJ0IjoyLCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "CReUjLynvpq4dD4w6zekGxvSyBBQF2e3KG3K2Rs7oD8L",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 29, lines 131-155:
+//# run-graphql --cursors {"c":7,"t":2,"i":false}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo3LCJ0IjozLCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjo3LCJ0Ijo3LCJpIjp0cnVlfQ"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo3LCJ0IjozLCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "BB6bMUxrBJX9wANzzptKnJM3bMVFKnD4xtY8DGWthaH9",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 30, lines 157-180:
+//# run-graphql --cursors {"c":7,"t":7,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo3LCJ0Ijo4LCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjo3LCJ0IjoxMiwiaSI6dHJ1ZX0"
+      },
+      "edges": []
+    }
+  }
+}
+
+task 31, lines 182-205:
+//# run-graphql --cursors {"c":7,"t":12,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo3LCJ0IjoxMywiaSI6dHJ1ZX0",
+        "endCursor": "eyJjIjo3LCJ0IjoxNywiaSI6dHJ1ZX0"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo3LCJ0IjoxNywiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "BhW3cLzaCgdRYc6jcmXB6DrQ6KaTfmYmb6vBNiu5xPhg",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 5
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 32, lines 207-232:
+//# run-graphql --cursors {"c":7,"t":17,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo3LCJ0IjoxOCwiaSI6dHJ1ZX0",
+        "endCursor": "eyJjIjo3LCJ0IjoxOCwiaSI6ZmFsc2V9"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo3LCJ0IjoxOCwiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "FjpAF5bT173BfV6HLuBdBd2bYevsUVDeJNmYnmJYsTLb",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 5
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 33, lines 234-258:
+//# run-graphql --cursors {"c":7,"t":18,"i":false}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": false,
+        "startCursor": "eyJjIjo3LCJ0IjoxOSwiaSI6dHJ1ZX0",
+        "endCursor": "eyJjIjo3LCJ0IjoyMSwiaSI6dHJ1ZX0"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo3LCJ0IjoyMSwiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "Eq611DTcfsBjH1P9Smrv7xFYQZXNtUMgbQCUr5jo3ycJ",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 5
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.move b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.move
new file mode 100644
index 0000000000000..b9aea53452ff2
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/first.move
@@ -0,0 +1,258 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+//# init --protocol-version 48 --addresses Test=0x0 --accounts A B --simulator
+
+//# publish
+module Test::M1 {
+    public struct Object has key, store {
+        id: UID,
+        value: u64,
+    }
+
+    public entry fun create(value: u64, recipient: address, ctx: &mut TxContext) {
+        transfer::public_transfer(
+            Object { id: object::new(ctx), value },
+            recipient
+        )
+    }
+
+    public fun swap_value_and_send(mut lhs: Object, mut rhs: Object, recipient: address) {
+        let tmp = lhs.value;
+        lhs.value = rhs.value;
+        rhs.value = tmp;
+        transfer::public_transfer(lhs, recipient);
+        transfer::public_transfer(rhs, recipient);
+    }
+}
+
+//# create-checkpoint
+
+//# run Test::M1::create --args 0 @A --sender A
+
+//# run Test::M1::create --args 1 @A --sender A
+
+//# run Test::M1::create --args 2 @B --sender B
+
+//# run Test::M1::create --args 3 @B --sender B
+
+//# run Test::M1::create --args 4 @B --sender B
+
+//# create-checkpoint
+
+//# run Test::M1::create --args 100 @B --sender B
+
+//# run Test::M1::create --args 101 @B --sender B
+
+//# run Test::M1::create --args 102 @B --sender B
+
+//# run Test::M1::create --args 103 @B --sender B
+
+//# run Test::M1::create --args 104 @B --sender B
+
+//# create-checkpoint
+
+//# run Test::M1::create --args 100 @B --sender B
+
+//# run Test::M1::create --args 101 @B --sender B
+
+//# run Test::M1::create --args 102 @B --sender B
+
+//# run Test::M1::create --args 103 @B --sender B
+
+//# run Test::M1::create --args 104 @B --sender B
+
+//# create-checkpoint
+
+//# run Test::M1::create --args 200 @A --sender A
+
+//# run Test::M1::create --args 201 @B --sender A
+
+//# run Test::M1::create --args 202 @B --sender B
+
+//# run Test::M1::create --args 203 @B --sender B
+
+//# run Test::M1::create --args 204 @A --sender A
+
+//# create-checkpoint
+
+//# run-graphql
+{
+  transactionBlocks(filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 6}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+
+//# run-graphql
+# startCursor is 2 and scanLimited, endCursor is 2 and not scanLimited
+# instead of setting the endCursor to the last transaction scanned,
+# we set it to the last transaction in the set
+# this is so we don't end up skipping any other matches in the scan range
+# but beyond the scope of the `limit`
+{
+  transactionBlocks(first: 1 scanLimit: 5 filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 6}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":7,"t":2,"i":false}
+# startCursor: 3, endCursor: 7, both are scan-limited
+# endCursor ends at 7, not 3, because we've exhausted all the matches
+# within the window of scanning range, and will overwrite the endCursor to 7.
+{
+  transactionBlocks(first: 1 after: "@{cursor_0}" scanLimit: 5 filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 6}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":7,"t":7,"i":true}
+# startCursor: 8, endCursor: 12, both are scan-limited
+# expect an empty set
+{
+  transactionBlocks(first: 1 after: "@{cursor_0}" scanLimit: 5 filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 6}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":7,"t":12,"i":true}
+# startCursor: 13, endCursor: 17, both are scan-limited
+# single element returned, coincidentally also the last scanned transaction
+{
+  transactionBlocks(first: 1 after: "@{cursor_0}" scanLimit: 5 filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 6}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":7,"t":17,"i":true}
+# startCursor: 18 scanLimited, endCursor: 18 not scanLimited
+# this is because we have multiple matches within the scanning range
+# but due to the `first` limit, we return a subset.
+# we don't want to skip over other matches, so we don't push the endCursor out
+{
+  transactionBlocks(first: 1 after: "@{cursor_0}" scanLimit: 5 filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 6}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":7,"t":18,"i":false}
+# startCursor: 19, endCursor: 21, both are scan-limited
+# single element returned, coincidentally also the last scanned transaction
+# note that the startCursor is 19, not 18 or 21, since we can use the scan-limited behavior
+{
+  transactionBlocks(first: 1 after: "@{cursor_0}" scanLimit: 5 filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 6}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.exp b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.exp
new file mode 100644
index 0000000000000..6f4367472900e
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.exp
@@ -0,0 +1,355 @@
+processed 34 tasks
+
+init:
+A: object(0,0), B: object(0,1)
+
+task 1, lines 6-27:
+//# publish
+created: object(1,0)
+mutated: object(0,2)
+gas summary: computation_cost: 1000000, storage_cost: 5798800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 2, line 29:
+//# create-checkpoint
+Checkpoint created: 1
+
+task 3, line 31:
+//# run Test::M1::create --args 0 @A --sender A
+created: object(3,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 4, line 33:
+//# run Test::M1::create --args 1 @A --sender A
+created: object(4,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 5, line 35:
+//# run Test::M1::create --args 2 @B --sender B
+created: object(5,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 6, line 37:
+//# run Test::M1::create --args 3 @B --sender B
+created: object(6,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 7, line 39:
+//# run Test::M1::create --args 4 @B --sender B
+created: object(7,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 8, line 41:
+//# create-checkpoint
+Checkpoint created: 2
+
+task 9, line 43:
+//# run Test::M1::create --args 100 @B --sender B
+created: object(9,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 10, line 45:
+//# run Test::M1::create --args 101 @B --sender B
+created: object(10,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 11, line 47:
+//# run Test::M1::create --args 102 @B --sender B
+created: object(11,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 12, line 49:
+//# run Test::M1::create --args 103 @B --sender B
+created: object(12,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 13, line 51:
+//# run Test::M1::create --args 104 @B --sender B
+created: object(13,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 14, line 53:
+//# create-checkpoint
+Checkpoint created: 3
+
+task 15, line 55:
+//# run Test::M1::create --args 100 @B --sender B
+created: object(15,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 16, line 57:
+//# run Test::M1::create --args 101 @B --sender B
+created: object(16,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 17, line 59:
+//# run Test::M1::create --args 102 @B --sender B
+created: object(17,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 18, line 61:
+//# run Test::M1::create --args 103 @B --sender B
+created: object(18,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 19, line 63:
+//# run Test::M1::create --args 104 @B --sender B
+created: object(19,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 20, line 65:
+//# create-checkpoint
+Checkpoint created: 4
+
+task 21, line 67:
+//# run Test::M1::create --args 200 @A --sender A
+created: object(21,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 22, line 69:
+//# run Test::M1::create --args 201 @B --sender B
+created: object(22,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 23, line 71:
+//# run Test::M1::create --args 202 @B --sender B
+created: object(23,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 24, line 73:
+//# run Test::M1::create --args 203 @B --sender B
+created: object(24,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 25, line 75:
+//# run Test::M1::create --args 204 @A --sender A
+created: object(25,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 26, line 77:
+//# create-checkpoint
+Checkpoint created: 5
+
+task 27, lines 79-100:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": false,
+        "hasNextPage": false,
+        "startCursor": "eyJjIjo1LCJ0IjoyLCJpIjpmYWxzZX0",
+        "endCursor": "eyJjIjo1LCJ0IjoyMSwiaSI6ZmFsc2V9"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo1LCJ0IjoyLCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "CReUjLynvpq4dD4w6zekGxvSyBBQF2e3KG3K2Rs7oD8L",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjo1LCJ0IjozLCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "BB6bMUxrBJX9wANzzptKnJM3bMVFKnD4xtY8DGWthaH9",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjo1LCJ0IjoxNywiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "BhW3cLzaCgdRYc6jcmXB6DrQ6KaTfmYmb6vBNiu5xPhg",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 5
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjo1LCJ0IjoyMSwiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "G7DhbdbJeze8e5kmVLNY6aVKckM7yfrzadaABv71ssjx",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 5
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 28, lines 103-125:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": false,
+        "startCursor": "eyJjIjo1LCJ0IjoyMSwiaSI6ZmFsc2V9",
+        "endCursor": "eyJjIjo1LCJ0IjoyMSwiaSI6dHJ1ZX0"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo1LCJ0IjoyMSwiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "G7DhbdbJeze8e5kmVLNY6aVKckM7yfrzadaABv71ssjx",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 5
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 29, lines 127-152:
+//# run-graphql --cursors {"c":7,"t":21,"i":false}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo3LCJ0IjoxNiwiaSI6dHJ1ZX0",
+        "endCursor": "eyJjIjo3LCJ0IjoyMCwiaSI6dHJ1ZX0"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo3LCJ0IjoxNywiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "BhW3cLzaCgdRYc6jcmXB6DrQ6KaTfmYmb6vBNiu5xPhg",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 5
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 30, lines 154-177:
+//# run-graphql --cursors {"c":7,"t":16,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo3LCJ0IjoxMSwiaSI6dHJ1ZX0",
+        "endCursor": "eyJjIjo3LCJ0IjoxNSwiaSI6dHJ1ZX0"
+      },
+      "edges": []
+    }
+  }
+}
+
+task 31, lines 179-201:
+//# run-graphql --cursors {"c":7,"t":11,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo3LCJ0Ijo2LCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjo3LCJ0IjoxMCwiaSI6dHJ1ZX0"
+      },
+      "edges": []
+    }
+  }
+}
+
+task 32, lines 203-227:
+//# run-graphql --cursors {"c":7,"t":6,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo3LCJ0IjozLCJpIjpmYWxzZX0",
+        "endCursor": "eyJjIjo3LCJ0Ijo1LCJpIjp0cnVlfQ"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo3LCJ0IjozLCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "BB6bMUxrBJX9wANzzptKnJM3bMVFKnD4xtY8DGWthaH9",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 33, lines 229-251:
+//# run-graphql --cursors {"c":7,"t":3,"i":false}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": false,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo3LCJ0IjoyLCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjo3LCJ0IjoyLCJpIjp0cnVlfQ"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo3LCJ0IjoyLCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "CReUjLynvpq4dD4w6zekGxvSyBBQF2e3KG3K2Rs7oD8L",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.move b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.move
new file mode 100644
index 0000000000000..1b8103b356dd2
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/ge_page/last.move
@@ -0,0 +1,251 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+//# init --protocol-version 48 --addresses Test=0x0 --accounts A B --simulator
+
+//# publish
+module Test::M1 {
+    public struct Object has key, store {
+        id: UID,
+        value: u64,
+    }
+
+    public entry fun create(value: u64, recipient: address, ctx: &mut TxContext) {
+        transfer::public_transfer(
+            Object { id: object::new(ctx), value },
+            recipient
+        )
+    }
+
+    public fun swap_value_and_send(mut lhs: Object, mut rhs: Object, recipient: address) {
+        let tmp = lhs.value;
+        lhs.value = rhs.value;
+        rhs.value = tmp;
+        transfer::public_transfer(lhs, recipient);
+        transfer::public_transfer(rhs, recipient);
+    }
+}
+
+//# create-checkpoint
+
+//# run Test::M1::create --args 0 @A --sender A
+
+//# run Test::M1::create --args 1 @A --sender A
+
+//# run Test::M1::create --args 2 @B --sender B
+
+//# run Test::M1::create --args 3 @B --sender B
+
+//# run Test::M1::create --args 4 @B --sender B
+
+//# create-checkpoint
+
+//# run Test::M1::create --args 100 @B --sender B
+
+//# run Test::M1::create --args 101 @B --sender B
+
+//# run Test::M1::create --args 102 @B --sender B
+
+//# run Test::M1::create --args 103 @B --sender B
+
+//# run Test::M1::create --args 104 @B --sender B
+
+//# create-checkpoint
+
+//# run Test::M1::create --args 100 @B --sender B
+
+//# run Test::M1::create --args 101 @B --sender B
+
+//# run Test::M1::create --args 102 @B --sender B
+
+//# run Test::M1::create --args 103 @B --sender B
+
+//# run Test::M1::create --args 104 @B --sender B
+
+//# create-checkpoint
+
+//# run Test::M1::create --args 200 @A --sender A
+
+//# run Test::M1::create --args 201 @B --sender B
+
+//# run Test::M1::create --args 202 @B --sender B
+
+//# run Test::M1::create --args 203 @B --sender B
+
+//# run Test::M1::create --args 204 @A --sender A
+
+//# create-checkpoint
+
+//# run-graphql
+{
+  transactionBlocks(filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 6}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+
+//# run-graphql
+# startCursor 21 not scan limited, endCursor 21 is scan limited
+{
+  transactionBlocks(last: 1 scanLimit: 5 filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 6}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":7,"t":21,"i":false}
+# startCursor 16, endCursor 20, both isScanLimited
+# This might be a bit confusing, but the `startCursor` is 16 and not 17 because
+# `scanLimit` is 5 - if we set the `startCursor` to 17, then we will never yield tx 17
+# when paginating the other way, since the cursors are exclusive.
+{
+  transactionBlocks(last: 1 before: "@{cursor_0}" scanLimit: 5 filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 6}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":7,"t":16,"i":true}
+# continuing paginating backwards with scan limit
+# startCursor 11, endCursor 15, both scan limited
+{
+  transactionBlocks(last: 1 before: "@{cursor_0}" scanLimit: 5 filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 6}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":7,"t":11,"i":true}
+# startCursor is 7, endCursor is 10, both scan limited
+{
+  transactionBlocks(last: 1 before: "@{cursor_0}" scanLimit: 5 filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 6}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":7,"t":6,"i":true}
+# startCursor is 3, not scanLimited, endCursor is 5, scanLimited
+# this is because we found a matching element at tx 3, but within
+# the scanned window there is another tx that we need to return for
+{
+  transactionBlocks(last: 1 before: "@{cursor_0}" scanLimit: 5 filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 6}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":7,"t":3,"i":false}
+# Reached the end
+{
+  transactionBlocks(last: 1 before: "@{cursor_0}" scanLimit: 5 filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 6}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/invalid_limits.exp b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/invalid_limits.exp
new file mode 100644
index 0000000000000..2dc10793ef702
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/invalid_limits.exp
@@ -0,0 +1,112 @@
+processed 13 tasks
+
+init:
+A: object(0,0), B: object(0,1)
+
+task 1, lines 8-29:
+//# publish
+created: object(1,0)
+mutated: object(0,2)
+gas summary: computation_cost: 1000000, storage_cost: 5798800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 2, line 31:
+//# create-checkpoint
+Checkpoint created: 1
+
+task 3, line 33:
+//# run Test::M1::create --args 0 @B --sender A
+created: object(3,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 4, line 35:
+//# run Test::M1::create --args 1 @A --sender A
+created: object(4,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 5, line 37:
+//# run Test::M1::create --args 2 @B --sender A
+created: object(5,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 6, line 39:
+//# run Test::M1::create --args 3 @A --sender A
+created: object(6,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 7, line 41:
+//# run Test::M1::create --args 4 @B --sender A
+created: object(7,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 8, line 43:
+//# create-checkpoint
+Checkpoint created: 2
+
+task 9, lines 45-66:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": false,
+        "hasNextPage": false,
+        "startCursor": null,
+        "endCursor": null
+      },
+      "edges": []
+    }
+  }
+}
+
+task 10, lines 68-89:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": false,
+        "hasNextPage": false,
+        "startCursor": null,
+        "endCursor": null
+      },
+      "edges": []
+    }
+  }
+}
+
+task 11, lines 91-112:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": false,
+        "hasNextPage": false,
+        "startCursor": null,
+        "endCursor": null
+      },
+      "edges": []
+    }
+  }
+}
+
+task 12, lines 114-135:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": false,
+        "hasNextPage": false,
+        "startCursor": null,
+        "endCursor": null
+      },
+      "edges": []
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/invalid_limits.move b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/invalid_limits.move
new file mode 100644
index 0000000000000..18c025402d2f3
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/invalid_limits.move
@@ -0,0 +1,135 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+// For any instance where limit is 0 or scan limit is 0, we should return an empty result
+
+//# init --protocol-version 48 --addresses Test=0x0 --accounts A B --simulator
+
+//# publish
+module Test::M1 {
+    public struct Object has key, store {
+        id: UID,
+        value: u64,
+    }
+
+    public entry fun create(value: u64, recipient: address, ctx: &mut TxContext) {
+        transfer::public_transfer(
+            Object { id: object::new(ctx), value },
+            recipient
+        )
+    }
+
+    public fun swap_value_and_send(mut lhs: Object, mut rhs: Object, recipient: address) {
+        let tmp = lhs.value;
+        lhs.value = rhs.value;
+        rhs.value = tmp;
+        transfer::public_transfer(lhs, recipient);
+        transfer::public_transfer(rhs, recipient);
+    }
+}
+
+//# create-checkpoint
+
+//# run Test::M1::create --args 0 @B --sender A
+
+//# run Test::M1::create --args 1 @A --sender A
+
+//# run Test::M1::create --args 2 @B --sender A
+
+//# run Test::M1::create --args 3 @A --sender A
+
+//# run Test::M1::create --args 4 @B --sender A
+
+//# create-checkpoint
+
+//# run-graphql
+{
+  transactionBlocks(first: 0 scanLimit: 2 filter: {recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql
+{
+  transactionBlocks(first: 2 scanLimit: 0 filter: {recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql
+{
+  transactionBlocks(first: 0 scanLimit: 0 filter: {recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql
+{
+  transactionBlocks(first: 0 filter: {recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.exp b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.exp
new file mode 100644
index 0000000000000..4cd2dabaa365b
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.exp
@@ -0,0 +1,364 @@
+processed 22 tasks
+
+init:
+A: object(0,0), B: object(0,1)
+
+task 1, lines 10-31:
+//# publish
+created: object(1,0)
+mutated: object(0,2)
+gas summary: computation_cost: 1000000, storage_cost: 5798800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 2, line 33:
+//# create-checkpoint
+Checkpoint created: 1
+
+task 3, line 35:
+//# run Test::M1::create --args 0 @A --sender A
+created: object(3,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 4, line 37:
+//# run Test::M1::create --args 1 @B --sender B
+created: object(4,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 5, line 39:
+//# run Test::M1::create --args 2 @A --sender A
+created: object(5,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 6, line 41:
+//# run Test::M1::create --args 3 @B --sender B
+created: object(6,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 7, line 43:
+//# run Test::M1::create --args 4 @A --sender A
+created: object(7,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 8, line 45:
+//# create-checkpoint
+Checkpoint created: 2
+
+task 9, line 47:
+//# run Test::M1::create --args 100 @B --sender B
+created: object(9,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 10, line 49:
+//# run Test::M1::create --args 101 @A --sender A
+created: object(10,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 11, line 51:
+//# run Test::M1::create --args 102 @B --sender B
+created: object(11,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 12, line 53:
+//# run Test::M1::create --args 103 @A --sender A
+created: object(12,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 13, line 55:
+//# run Test::M1::create --args 104 @B --sender B
+created: object(13,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 14, line 57:
+//# create-checkpoint
+Checkpoint created: 3
+
+task 15, lines 59-81:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": false,
+        "hasNextPage": false,
+        "startCursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
+        "endCursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "CReUjLynvpq4dD4w6zekGxvSyBBQF2e3KG3K2Rs7oD8L",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0IjozLCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "FveHd4cC5ykjtknvewFjmf6V1gHYhdkuEoUEBAV3y52h",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "Hgu3LePqrpyR8Vq3Ve4L2KmvErcdcz92u7YiiotkKJ1N",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0Ijo1LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "5pVYLMHazkfshyLvmQyow1UY4vn9V481KWDxUYpX65BZ",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "2EwyAHiMofhbM5z5ty7XT1QXs4sNZfHmZLX513Ag8sD3",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0Ijo3LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "FtVAPJKNoPumPcQuyzznmZB99yhYNqdsmC7wKPj17xR3",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "4LUhoFJMmZfG71RHiRkwa9KHovrDv3S3mqUM1vu9JWKJ",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0Ijo5LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "FasAf1kHei9QkZuPLBSkCdXXMtv13RbCgiywktFzx58m",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "AnqDERsdbEiE26CACJa6KtJTLsggisgu7yxhMJ6mU1JZ",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "GKKT2n7jc6YyJDcckP3kXhVN5FEZJEk1fN3aFzcgRyRr",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 16, lines 84-106:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": false,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjozLCJ0IjoyLCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjozLCJ0IjozLCJpIjp0cnVlfQ"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "CReUjLynvpq4dD4w6zekGxvSyBBQF2e3KG3K2Rs7oD8L",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 17, lines 108-130:
+//# run-graphql --cursors {"c":4,"t":3,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo0LCJ0Ijo0LCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjo0LCJ0Ijo1LCJpIjp0cnVlfQ"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "Hgu3LePqrpyR8Vq3Ve4L2KmvErcdcz92u7YiiotkKJ1N",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 18, lines 132-158:
+//# run-graphql --cursors {"c":4,"t":5,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo0LCJ0Ijo2LCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjo0LCJ0Ijo4LCJpIjp0cnVlfQ"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo0LCJ0Ijo2LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "2EwyAHiMofhbM5z5ty7XT1QXs4sNZfHmZLX513Ag8sD3",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjo0LCJ0Ijo4LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "4LUhoFJMmZfG71RHiRkwa9KHovrDv3S3mqUM1vu9JWKJ",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 19, lines 160-182:
+//# run-graphql --cursors {"c":4,"t":8,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": false,
+        "startCursor": "eyJjIjo0LCJ0Ijo5LCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjo0LCJ0IjoxMSwiaSI6dHJ1ZX0"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo0LCJ0IjoxMCwiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "AnqDERsdbEiE26CACJa6KtJTLsggisgu7yxhMJ6mU1JZ",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 20, lines 184-207:
+//# run-graphql --cursors {"c":4,"t":10,"i":false}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": false,
+        "startCursor": "eyJjIjo0LCJ0IjoxMSwiaSI6dHJ1ZX0",
+        "endCursor": "eyJjIjo0LCJ0IjoxMSwiaSI6dHJ1ZX0"
+      },
+      "edges": []
+    }
+  }
+}
+
+task 21, lines 209-232:
+//# run-graphql --cursors {"c":4,"t":11,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": false,
+        "hasNextPage": false,
+        "startCursor": null,
+        "endCursor": null
+      },
+      "edges": []
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.move b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.move
new file mode 100644
index 0000000000000..bd9b3d2fe2ace
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/le_page/first.move
@@ -0,0 +1,232 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+// Without a scan limit, we would expect each query to yield a response containing two results.
+// However, because we have a scanLimit of 2, we'll be limited to filtering only two candidate
+// transactions per page, of which one will match the filtering criteria.
+
+//# init --protocol-version 48 --addresses Test=0x0 --accounts A B --simulator
+
+//# publish
+module Test::M1 {
+    public struct Object has key, store {
+        id: UID,
+        value: u64,
+    }
+
+    public entry fun create(value: u64, recipient: address, ctx: &mut TxContext) {
+        transfer::public_transfer(
+            Object { id: object::new(ctx), value },
+            recipient
+        )
+    }
+
+    public fun swap_value_and_send(mut lhs: Object, mut rhs: Object, recipient: address) {
+        let tmp = lhs.value;
+        lhs.value = rhs.value;
+        rhs.value = tmp;
+        transfer::public_transfer(lhs, recipient);
+        transfer::public_transfer(rhs, recipient);
+    }
+}
+
+//# create-checkpoint
+
+//# run Test::M1::create --args 0 @A --sender A
+
+//# run Test::M1::create --args 1 @B --sender B
+
+//# run Test::M1::create --args 2 @A --sender A
+
+//# run Test::M1::create --args 3 @B --sender B
+
+//# run Test::M1::create --args 4 @A --sender A
+
+//# create-checkpoint
+
+//# run Test::M1::create --args 100 @B --sender B
+
+//# run Test::M1::create --args 101 @A --sender A
+
+//# run Test::M1::create --args 102 @B --sender B
+
+//# run Test::M1::create --args 103 @A --sender A
+
+//# run Test::M1::create --args 104 @B --sender B
+
+//# create-checkpoint
+
+//# run-graphql
+# ten transactions total
+{
+  transactionBlocks(first: 50 filter: {afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+
+//# run-graphql
+# startCursor 2, endCursor 3, both scan limited
+{
+  transactionBlocks(first: 3 scanLimit: 2 filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":4,"t":3,"i":true}
+# startCursor: 4, endCursor 5, both scan limited
+{
+  transactionBlocks(first: 3 scanLimit: 2 after: "@{cursor_0}" filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":4,"t":5,"i":true}
+# note the changes: first 3 -> 4, scanLimit 2 -> 3
+# startCursor: 6, endCursor: 8 both scanLimited
+# because we've exhausted all matches in the scanned window,
+# we set the endCursor to the final tx scanned, rather than snapping
+# to the last matched tx
+{
+  transactionBlocks(first: 4 scanLimit: 3 after: "@{cursor_0}" filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":4,"t":8,"i":true}
+# startCursor: 9, endCursor: 11 both scanLimited
+{
+  transactionBlocks(first: 4 scanLimit: 3 after: "@{cursor_0}" filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":4,"t":10,"i":false}
+# using the last element's cursor from the previous query
+# will yield an empty set, fixed on the last scannable tx
+{
+  transactionBlocks(first: 4 scanLimit: 3 after: "@{cursor_0}" filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":4,"t":11,"i":true}
+# trying to paginate on the `endCursor` even though hasNextPage is false
+# cursors are null, both page flags are false
+{
+  transactionBlocks(first: 4 scanLimit: 3 after: "@{cursor_0}" filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.exp b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.exp
new file mode 100644
index 0000000000000..714548cfc5c09
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.exp
@@ -0,0 +1,365 @@
+processed 22 tasks
+
+init:
+A: object(0,0), B: object(0,1)
+
+task 1, lines 10-31:
+//# publish
+created: object(1,0)
+mutated: object(0,2)
+gas summary: computation_cost: 1000000, storage_cost: 5798800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 2, line 33:
+//# create-checkpoint
+Checkpoint created: 1
+
+task 3, line 35:
+//# run Test::M1::create --args 0 @A --sender A
+created: object(3,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 4, line 37:
+//# run Test::M1::create --args 1 @B --sender B
+created: object(4,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 5, line 39:
+//# run Test::M1::create --args 2 @A --sender A
+created: object(5,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 6, line 41:
+//# run Test::M1::create --args 3 @B --sender B
+created: object(6,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 7, line 43:
+//# run Test::M1::create --args 4 @A --sender A
+created: object(7,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 8, line 45:
+//# create-checkpoint
+Checkpoint created: 2
+
+task 9, line 47:
+//# run Test::M1::create --args 100 @B --sender B
+created: object(9,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 10, line 49:
+//# run Test::M1::create --args 101 @A --sender A
+created: object(10,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 11, line 51:
+//# run Test::M1::create --args 102 @B --sender B
+created: object(11,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 12, line 53:
+//# run Test::M1::create --args 103 @A --sender A
+created: object(12,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 13, line 55:
+//# run Test::M1::create --args 104 @B --sender B
+created: object(13,0)
+mutated: object(0,1)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 14, line 57:
+//# create-checkpoint
+Checkpoint created: 3
+
+task 15, lines 59-81:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": false,
+        "hasNextPage": false,
+        "startCursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
+        "endCursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "CReUjLynvpq4dD4w6zekGxvSyBBQF2e3KG3K2Rs7oD8L",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0IjozLCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "FveHd4cC5ykjtknvewFjmf6V1gHYhdkuEoUEBAV3y52h",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0Ijo0LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "Hgu3LePqrpyR8Vq3Ve4L2KmvErcdcz92u7YiiotkKJ1N",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0Ijo1LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "5pVYLMHazkfshyLvmQyow1UY4vn9V481KWDxUYpX65BZ",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0Ijo2LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "2EwyAHiMofhbM5z5ty7XT1QXs4sNZfHmZLX513Ag8sD3",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0Ijo3LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "FtVAPJKNoPumPcQuyzznmZB99yhYNqdsmC7wKPj17xR3",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0Ijo4LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "4LUhoFJMmZfG71RHiRkwa9KHovrDv3S3mqUM1vu9JWKJ",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0Ijo5LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "FasAf1kHei9QkZuPLBSkCdXXMtv13RbCgiywktFzx58m",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "AnqDERsdbEiE26CACJa6KtJTLsggisgu7yxhMJ6mU1JZ",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        },
+        {
+          "cursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "GKKT2n7jc6YyJDcckP3kXhVN5FEZJEk1fN3aFzcgRyRr",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 16, lines 83-105:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": false,
+        "startCursor": "eyJjIjozLCJ0IjoxMCwiaSI6dHJ1ZX0",
+        "endCursor": "eyJjIjozLCJ0IjoxMSwiaSI6dHJ1ZX0"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjozLCJ0IjoxMCwiaSI6ZmFsc2V9",
+          "node": {
+            "digest": "AnqDERsdbEiE26CACJa6KtJTLsggisgu7yxhMJ6mU1JZ",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 17, lines 107-129:
+//# run-graphql --cursors {"c":4,"t":10,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo0LCJ0Ijo4LCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjo0LCJ0Ijo5LCJpIjp0cnVlfQ"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo0LCJ0Ijo4LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "4LUhoFJMmZfG71RHiRkwa9KHovrDv3S3mqUM1vu9JWKJ",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 3
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 18, lines 131-154:
+//# run-graphql --cursors {"c":4,"t":8,"i":false}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo0LCJ0Ijo2LCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjo0LCJ0Ijo3LCJpIjp0cnVlfQ"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo0LCJ0Ijo2LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "2EwyAHiMofhbM5z5ty7XT1QXs4sNZfHmZLX513Ag8sD3",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 19, lines 156-178:
+//# run-graphql --cursors {"c":4,"t":6,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": true,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo0LCJ0Ijo0LCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjo0LCJ0Ijo1LCJpIjp0cnVlfQ"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo0LCJ0Ijo0LCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "Hgu3LePqrpyR8Vq3Ve4L2KmvErcdcz92u7YiiotkKJ1N",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 20, lines 180-202:
+//# run-graphql --cursors {"c":4,"t":4,"i":false}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": false,
+        "hasNextPage": true,
+        "startCursor": "eyJjIjo0LCJ0IjoyLCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjo0LCJ0IjozLCJpIjp0cnVlfQ"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjo0LCJ0IjoyLCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "CReUjLynvpq4dD4w6zekGxvSyBBQF2e3KG3K2Rs7oD8L",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 21, lines 205-227:
+//# run-graphql --cursors {"c":4,"t":2,"i":true}
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": false,
+        "hasNextPage": false,
+        "startCursor": null,
+        "endCursor": null
+      },
+      "edges": []
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.move b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.move
new file mode 100644
index 0000000000000..9a1280bed8b3d
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/le_page/last.move
@@ -0,0 +1,227 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+// Without a scan limit, we would expect each query to yield a response containing two results.
+// However, because we have a scanLimit of 2, we'll be limited to filtering only two candidate
+// transactions per page, of which one will match the filtering criteria.
+
+//# init --protocol-version 48 --addresses Test=0x0 --accounts A B --simulator
+
+//# publish
+module Test::M1 {
+    public struct Object has key, store {
+        id: UID,
+        value: u64,
+    }
+
+    public entry fun create(value: u64, recipient: address, ctx: &mut TxContext) {
+        transfer::public_transfer(
+            Object { id: object::new(ctx), value },
+            recipient
+        )
+    }
+
+    public fun swap_value_and_send(mut lhs: Object, mut rhs: Object, recipient: address) {
+        let tmp = lhs.value;
+        lhs.value = rhs.value;
+        rhs.value = tmp;
+        transfer::public_transfer(lhs, recipient);
+        transfer::public_transfer(rhs, recipient);
+    }
+}
+
+//# create-checkpoint
+
+//# run Test::M1::create --args 0 @A --sender A
+
+//# run Test::M1::create --args 1 @B --sender B
+
+//# run Test::M1::create --args 2 @A --sender A
+
+//# run Test::M1::create --args 3 @B --sender B
+
+//# run Test::M1::create --args 4 @A --sender A
+
+//# create-checkpoint
+
+//# run Test::M1::create --args 100 @B --sender B
+
+//# run Test::M1::create --args 101 @A --sender A
+
+//# run Test::M1::create --args 102 @B --sender B
+
+//# run Test::M1::create --args 103 @A --sender A
+
+//# run Test::M1::create --args 104 @B --sender B
+
+//# create-checkpoint
+
+//# run-graphql
+# ten transactions total
+{
+  transactionBlocks(last: 50 filter: {afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql
+# startCursor: 10, endCursor: 11, both scan limited
+{
+  transactionBlocks(last: 3 scanLimit: 2 filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":4,"t":10,"i":true}
+# startCursor: 8, endCursor: 9, both scan limited
+{
+  transactionBlocks(last: 3 before: "@{cursor_0}" scanLimit: 2 filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":4,"t":8,"i":false}
+# use result's cursor instead of boundary cursor
+# startCursor: 6, endCursor: 7, both scan limited
+{
+  transactionBlocks(last: 3 before: "@{cursor_0}" scanLimit: 2 filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":4,"t":6,"i":true}
+# startCursor: 4, endCursor: 5, both scan limited
+{
+  transactionBlocks(last: 3 before: "@{cursor_0}" scanLimit: 2 filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql --cursors {"c":4,"t":4,"i":false}
+# reached the end with this query
+{
+  transactionBlocks(last: 3 before: "@{cursor_0}" scanLimit: 2 filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
+
+
+//# run-graphql --cursors {"c":4,"t":2,"i":true}
+# cursors are null, and page flags are both false
+{
+  transactionBlocks(last: 3 before: "@{cursor_0}" scanLimit: 2 filter: {recvAddress: "@{A}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/require.exp b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/require.exp
new file mode 100644
index 0000000000000..1e5207ad10ed9
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/require.exp
@@ -0,0 +1,606 @@
+processed 25 tasks
+
+init:
+A: object(0,0), B: object(0,1)
+
+task 1, lines 6-27:
+//# publish
+created: object(1,0)
+mutated: object(0,2)
+gas summary: computation_cost: 1000000, storage_cost: 5798800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 2, line 29:
+//# create-checkpoint
+Checkpoint created: 1
+
+task 3, line 31:
+//# run Test::M1::create --args 0 @B --sender A
+created: object(3,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 0, non_refundable_storage_fee: 0
+
+task 4, line 33:
+//# run Test::M1::create --args 1 @B --sender A
+created: object(4,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 5, line 35:
+//# run Test::M1::create --args 2 @B --sender A
+created: object(5,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 6, line 37:
+//# run Test::M1::create --args 3 @B --sender A
+created: object(6,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 7, line 39:
+//# run Test::M1::create --args 4 @B --sender A
+created: object(7,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 8, line 41:
+//# create-checkpoint
+Checkpoint created: 2
+
+task 9, line 43:
+//# run Test::M1::create --args 100 @B --sender A
+created: object(9,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 10, line 45:
+//# run Test::M1::create --args 101 @B --sender A
+created: object(10,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 11, line 47:
+//# run Test::M1::create --args 102 @B --sender A
+created: object(11,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 12, line 49:
+//# run Test::M1::create --args 103 @B --sender A
+created: object(12,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 13, line 51:
+//# run Test::M1::create --args 104 @B --sender A
+created: object(13,0)
+mutated: object(0,0)
+gas summary: computation_cost: 1000000, storage_cost: 2302800,  storage_rebate: 978120, non_refundable_storage_fee: 9880
+
+task 14, line 53:
+//# create-checkpoint
+Checkpoint created: 3
+
+task 15, lines 55-74:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasNextPage": false,
+        "hasPreviousPage": false,
+        "endCursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9",
+        "startCursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0"
+      },
+      "nodes": [
+        {
+          "digest": "HzyC8gcn4m1ymKxYSpWMaNnmbrqm4hX7UBteJ4me3LFd",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        },
+        {
+          "digest": "DiywoRFzC33smQhVf5K7AcM853XFgfgFxBGErLTEvVWi",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        },
+        {
+          "digest": "7MgEfj6QXfsjDFtvJSAE9FNL3RYt8Kdw21NnfuuVXkbt",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        },
+        {
+          "digest": "B8mg7JvC64cnh656yuwHyXyFPULutxBECMFkCPQNStmZ",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        },
+        {
+          "digest": "7i7Evom2DUeS1PYxKwDnLfoZpv2r6kxdGoEWxXdFA9xV",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        },
+        {
+          "digest": "5HoMDKMTYX3gibs8VroZUeSC3134MroLJN7hfAVZxdPM",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 3
+            }
+          }
+        },
+        {
+          "digest": "BU8q4bm7XjaZiV8cPmchVp6SsmU8cmBWNUVmFTUNAHfb",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 3
+            }
+          }
+        },
+        {
+          "digest": "HckXhLnDYV8hfMh1p8M8r7dpEpvzp5GpG9oHzv9dmv4R",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 3
+            }
+          }
+        },
+        {
+          "digest": "Hvh3oJuoTeRYRU2wkTriwDsozpaay5c7dhRS7Ru3S2S5",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 3
+            }
+          }
+        },
+        {
+          "digest": "ADhRGJc24AQCvUnQNgkfjnna3hsTFK51YTgq5J5VAKQr",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 3
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 16, lines 76-95:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasNextPage": false,
+        "hasPreviousPage": false,
+        "endCursor": "eyJjIjozLCJ0IjoxMSwiaSI6ZmFsc2V9",
+        "startCursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0"
+      },
+      "nodes": [
+        {
+          "digest": "HzyC8gcn4m1ymKxYSpWMaNnmbrqm4hX7UBteJ4me3LFd",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        },
+        {
+          "digest": "DiywoRFzC33smQhVf5K7AcM853XFgfgFxBGErLTEvVWi",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        },
+        {
+          "digest": "7MgEfj6QXfsjDFtvJSAE9FNL3RYt8Kdw21NnfuuVXkbt",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        },
+        {
+          "digest": "B8mg7JvC64cnh656yuwHyXyFPULutxBECMFkCPQNStmZ",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        },
+        {
+          "digest": "7i7Evom2DUeS1PYxKwDnLfoZpv2r6kxdGoEWxXdFA9xV",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        },
+        {
+          "digest": "5HoMDKMTYX3gibs8VroZUeSC3134MroLJN7hfAVZxdPM",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 3
+            }
+          }
+        },
+        {
+          "digest": "BU8q4bm7XjaZiV8cPmchVp6SsmU8cmBWNUVmFTUNAHfb",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 3
+            }
+          }
+        },
+        {
+          "digest": "HckXhLnDYV8hfMh1p8M8r7dpEpvzp5GpG9oHzv9dmv4R",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 3
+            }
+          }
+        },
+        {
+          "digest": "Hvh3oJuoTeRYRU2wkTriwDsozpaay5c7dhRS7Ru3S2S5",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 3
+            }
+          }
+        },
+        {
+          "digest": "ADhRGJc24AQCvUnQNgkfjnna3hsTFK51YTgq5J5VAKQr",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 3
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 17, lines 97-116:
+//# run-graphql
+Response: {
+  "data": null,
+  "errors": [
+    {
+      "message": "A scan limit must be specified for the given filter combination",
+      "locations": [
+        {
+          "line": 3,
+          "column": 3
+        }
+      ],
+      "path": [
+        "transactionBlocks"
+      ],
+      "extensions": {
+        "code": "BAD_USER_INPUT"
+      }
+    }
+  ]
+}
+
+task 18, lines 118-137:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasNextPage": false,
+        "hasPreviousPage": false,
+        "endCursor": "eyJjIjozLCJ0IjoxMSwiaSI6dHJ1ZX0",
+        "startCursor": "eyJjIjozLCJ0IjoyLCJpIjp0cnVlfQ"
+      },
+      "nodes": [
+        {
+          "digest": "HzyC8gcn4m1ymKxYSpWMaNnmbrqm4hX7UBteJ4me3LFd",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        },
+        {
+          "digest": "DiywoRFzC33smQhVf5K7AcM853XFgfgFxBGErLTEvVWi",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        },
+        {
+          "digest": "7MgEfj6QXfsjDFtvJSAE9FNL3RYt8Kdw21NnfuuVXkbt",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        },
+        {
+          "digest": "B8mg7JvC64cnh656yuwHyXyFPULutxBECMFkCPQNStmZ",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        },
+        {
+          "digest": "7i7Evom2DUeS1PYxKwDnLfoZpv2r6kxdGoEWxXdFA9xV",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        },
+        {
+          "digest": "5HoMDKMTYX3gibs8VroZUeSC3134MroLJN7hfAVZxdPM",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 3
+            }
+          }
+        },
+        {
+          "digest": "BU8q4bm7XjaZiV8cPmchVp6SsmU8cmBWNUVmFTUNAHfb",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 3
+            }
+          }
+        },
+        {
+          "digest": "HckXhLnDYV8hfMh1p8M8r7dpEpvzp5GpG9oHzv9dmv4R",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 3
+            }
+          }
+        },
+        {
+          "digest": "Hvh3oJuoTeRYRU2wkTriwDsozpaay5c7dhRS7Ru3S2S5",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 3
+            }
+          }
+        },
+        {
+          "digest": "ADhRGJc24AQCvUnQNgkfjnna3hsTFK51YTgq5J5VAKQr",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 3
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 19, lines 139-158:
+//# run-graphql
+Response: {
+  "data": null,
+  "errors": [
+    {
+      "message": "A scan limit must be specified for the given filter combination",
+      "locations": [
+        {
+          "line": 3,
+          "column": 3
+        }
+      ],
+      "path": [
+        "transactionBlocks"
+      ],
+      "extensions": {
+        "code": "BAD_USER_INPUT"
+      }
+    }
+  ]
+}
+
+task 20, lines 160-179:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasNextPage": false,
+        "hasPreviousPage": false,
+        "endCursor": "eyJjIjozLCJ0IjoxMSwiaSI6dHJ1ZX0",
+        "startCursor": "eyJjIjozLCJ0IjoyLCJpIjp0cnVlfQ"
+      },
+      "nodes": [
+        {
+          "digest": "HzyC8gcn4m1ymKxYSpWMaNnmbrqm4hX7UBteJ4me3LFd",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        },
+        {
+          "digest": "DiywoRFzC33smQhVf5K7AcM853XFgfgFxBGErLTEvVWi",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        },
+        {
+          "digest": "7MgEfj6QXfsjDFtvJSAE9FNL3RYt8Kdw21NnfuuVXkbt",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        },
+        {
+          "digest": "B8mg7JvC64cnh656yuwHyXyFPULutxBECMFkCPQNStmZ",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        },
+        {
+          "digest": "7i7Evom2DUeS1PYxKwDnLfoZpv2r6kxdGoEWxXdFA9xV",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 2
+            }
+          }
+        },
+        {
+          "digest": "5HoMDKMTYX3gibs8VroZUeSC3134MroLJN7hfAVZxdPM",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 3
+            }
+          }
+        },
+        {
+          "digest": "BU8q4bm7XjaZiV8cPmchVp6SsmU8cmBWNUVmFTUNAHfb",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 3
+            }
+          }
+        },
+        {
+          "digest": "HckXhLnDYV8hfMh1p8M8r7dpEpvzp5GpG9oHzv9dmv4R",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 3
+            }
+          }
+        },
+        {
+          "digest": "Hvh3oJuoTeRYRU2wkTriwDsozpaay5c7dhRS7Ru3S2S5",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 3
+            }
+          }
+        },
+        {
+          "digest": "ADhRGJc24AQCvUnQNgkfjnna3hsTFK51YTgq5J5VAKQr",
+          "effects": {
+            "checkpoint": {
+              "sequenceNumber": 3
+            }
+          }
+        }
+      ]
+    }
+  }
+}
+
+task 21, lines 181-200:
+//# run-graphql
+Response: {
+  "data": null,
+  "errors": [
+    {
+      "message": "A scan limit must be specified for the given filter combination",
+      "locations": [
+        {
+          "line": 3,
+          "column": 3
+        }
+      ],
+      "path": [
+        "transactionBlocks"
+      ],
+      "extensions": {
+        "code": "BAD_USER_INPUT"
+      }
+    }
+  ]
+}
+
+task 22, lines 202-221:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasNextPage": false,
+        "hasPreviousPage": false,
+        "endCursor": "eyJjIjozLCJ0IjoxMSwiaSI6dHJ1ZX0",
+        "startCursor": "eyJjIjozLCJ0IjoyLCJpIjp0cnVlfQ"
+      },
+      "nodes": []
+    }
+  }
+}
+
+task 23, lines 224-243:
+//# run-graphql
+Response: {
+  "data": null,
+  "errors": [
+    {
+      "message": "A scan limit must be specified for the given filter combination",
+      "locations": [
+        {
+          "line": 3,
+          "column": 3
+        }
+      ],
+      "path": [
+        "transactionBlocks"
+      ],
+      "extensions": {
+        "code": "BAD_USER_INPUT"
+      }
+    }
+  ]
+}
+
+task 24, lines 245-269:
+//# run-graphql
+Response: {
+  "data": {
+    "transactionBlocks": {
+      "pageInfo": {
+        "hasPreviousPage": false,
+        "hasNextPage": false,
+        "startCursor": "eyJjIjozLCJ0IjoyLCJpIjp0cnVlfQ",
+        "endCursor": "eyJjIjozLCJ0IjoxMSwiaSI6dHJ1ZX0"
+      },
+      "edges": [
+        {
+          "cursor": "eyJjIjozLCJ0IjoyLCJpIjpmYWxzZX0",
+          "node": {
+            "digest": "HzyC8gcn4m1ymKxYSpWMaNnmbrqm4hX7UBteJ4me3LFd",
+            "effects": {
+              "checkpoint": {
+                "sequenceNumber": 2
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/require.move b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/require.move
new file mode 100644
index 0000000000000..90b5570b7ded3
--- /dev/null
+++ b/crates/sui-graphql-e2e-tests/tests/transactions/scan_limit/require.move
@@ -0,0 +1,269 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+//# init --protocol-version 48 --addresses Test=0x0 --accounts A B --simulator
+
+//# publish
+module Test::M1 {
+    public struct Object has key, store {
+        id: UID,
+        value: u64,
+    }
+
+    public entry fun create(value: u64, recipient: address, ctx: &mut TxContext) {
+        transfer::public_transfer(
+            Object { id: object::new(ctx), value },
+            recipient
+        )
+    }
+
+    public fun swap_value_and_send(mut lhs: Object, mut rhs: Object, recipient: address) {
+        let tmp = lhs.value;
+        lhs.value = rhs.value;
+        rhs.value = tmp;
+        transfer::public_transfer(lhs, recipient);
+        transfer::public_transfer(rhs, recipient);
+    }
+}
+
+//# create-checkpoint
+
+//# run Test::M1::create --args 0 @B --sender A
+
+//# run Test::M1::create --args 1 @B --sender A
+
+//# run Test::M1::create --args 2 @B --sender A
+
+//# run Test::M1::create --args 3 @B --sender A
+
+//# run Test::M1::create --args 4 @B --sender A
+
+//# create-checkpoint
+
+//# run Test::M1::create --args 100 @B --sender A
+
+//# run Test::M1::create --args 101 @B --sender A
+
+//# run Test::M1::create --args 102 @B --sender A
+
+//# run Test::M1::create --args 103 @B --sender A
+
+//# run Test::M1::create --args 104 @B --sender A
+
+//# create-checkpoint
+
+//# run-graphql
+# Expect ten results
+{
+  transactionBlocks(filter: {recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasNextPage
+      hasPreviousPage
+      endCursor
+      startCursor
+    }
+    nodes {
+      digest
+      effects {
+        checkpoint {
+          sequenceNumber
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql
+# Don't need scanLimit with sender
+{
+  transactionBlocks(filter: {signAddress: "@{A}" recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4}) {
+    pageInfo {
+      hasNextPage
+      hasPreviousPage
+      endCursor
+      startCursor
+    }
+    nodes {
+      digest
+      effects {
+        checkpoint {
+          sequenceNumber
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql
+# scanLimit required
+{
+  transactionBlocks(filter: {signAddress: "@{A}" recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4 function: "@{Test}::M1::create"}) {
+    pageInfo {
+      hasNextPage
+      hasPreviousPage
+      endCursor
+      startCursor
+    }
+    nodes {
+      digest
+      effects {
+        checkpoint {
+          sequenceNumber
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql
+# valid
+{
+  transactionBlocks(scanLimit: 50 filter: {signAddress: "@{A}" recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4 function: "@{Test}::M1::create"}) {
+    pageInfo {
+      hasNextPage
+      hasPreviousPage
+      endCursor
+      startCursor
+    }
+    nodes {
+      digest
+      effects {
+        checkpoint {
+          sequenceNumber
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql
+# scanLimit required
+{
+  transactionBlocks(filter: {signAddress: "@{A}" recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4 kind: PROGRAMMABLE_TX}) {
+    pageInfo {
+      hasNextPage
+      hasPreviousPage
+      endCursor
+      startCursor
+    }
+    nodes {
+      digest
+      effects {
+        checkpoint {
+          sequenceNumber
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql
+# valid
+{
+  transactionBlocks(scanLimit: 50 filter: {signAddress: "@{A}" recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4 kind: PROGRAMMABLE_TX}) {
+    pageInfo {
+      hasNextPage
+      hasPreviousPage
+      endCursor
+      startCursor
+    }
+    nodes {
+      digest
+      effects {
+        checkpoint {
+          sequenceNumber
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql
+# scanLimit required
+{
+  transactionBlocks(filter: {signAddress: "@{A}" recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4 inputObject: "@{obj_3_0}"}) {
+    pageInfo {
+      hasNextPage
+      hasPreviousPage
+      endCursor
+      startCursor
+    }
+    nodes {
+      digest
+      effects {
+        checkpoint {
+          sequenceNumber
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql
+# valid
+{
+  transactionBlocks(scanLimit: 50 filter: {signAddress: "@{A}" recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4 inputObject: "@{obj_3_0}"}) {
+    pageInfo {
+      hasNextPage
+      hasPreviousPage
+      endCursor
+      startCursor
+    }
+    nodes {
+      digest
+      effects {
+        checkpoint {
+          sequenceNumber
+        }
+      }
+    }
+  }
+}
+
+
+//# run-graphql
+# scanLimit required
+{
+  transactionBlocks(filter: {signAddress: "@{A}" recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4 changedObject: "@{obj_3_0}"}) {
+    pageInfo {
+      hasNextPage
+      hasPreviousPage
+      endCursor
+      startCursor
+    }
+    nodes {
+      digest
+      effects {
+        checkpoint {
+          sequenceNumber
+        }
+      }
+    }
+  }
+}
+
+//# run-graphql
+# Only one of the transactions will match this filter
+# Because scanLimit is specified, the boundary cursors should be at 2 and 11,
+# and both will indicate is_scan_limited
+{
+  transactionBlocks(scanLimit: 50 filter: {signAddress: "@{A}" recvAddress: "@{B}" afterCheckpoint: 1 beforeCheckpoint: 4 changedObject: "@{obj_3_0}"}) {
+    pageInfo {
+      hasPreviousPage
+      hasNextPage
+      startCursor
+      endCursor
+    }
+    edges {
+      cursor
+      node {
+        digest
+        effects {
+          checkpoint {
+            sequenceNumber
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/crates/sui-graphql-rpc/Cargo.toml b/crates/sui-graphql-rpc/Cargo.toml
index 54dfb33052d1b..78a7bc5aef2ae 100644
--- a/crates/sui-graphql-rpc/Cargo.toml
+++ b/crates/sui-graphql-rpc/Cargo.toml
@@ -20,6 +20,7 @@ async-graphql-axum.workspace = true
 async-graphql-value.workspace = true
 async-trait.workspace = true
 axum.workspace = true
+axum-extra.workspace = true
 bin-version.workspace = true
 chrono.workspace = true
 clap.workspace = true
@@ -37,7 +38,6 @@ lru.workspace = true
 move-binary-format.workspace = true
 move-disassembler.workspace = true
 move-ir-types.workspace = true
-markdown-gen.workspace = true
 mysten-metrics.workspace = true
 mysten-network.workspace = true
 move-core-types.workspace = true
@@ -70,8 +70,8 @@ im.workspace = true
 downcast = "0.11.0"
 
 sui-graphql-config.workspace = true
-sui-graphql-rpc-headers.workspace = true
-sui-graphql-rpc-client.workspace = true
+# sui-graphql-rpc-headers.workspace = true
+# sui-graphql-rpc-client.workspace = true
 
 
 # TODO: put these behind feature flag to prevent leakage
diff --git a/crates/sui-graphql-rpc/README.md b/crates/sui-graphql-rpc/README.md
index af7974546ddd0..faae0637948ed 100644
--- a/crates/sui-graphql-rpc/README.md
+++ b/crates/sui-graphql-rpc/README.md
@@ -71,3 +71,8 @@ For local dev, it might be useful to spin up an indexer as well. Instructions ar
 `cargo run --bin sui --features indexer -- start --with-faucet --force-regenesis --with-indexer --pg-port 5432 --pg-db-name sui_indexer_v2 --with-graphql`
 
 `pnpm --filter @mysten/graphql-transport test:e2e`
+
+## Testing
+The full gamut of graphql-specific tests are listed in the [rust.yml](../../.github/workflows/rust.yml).
+
+To run the tests in `sui-graphql-rpc`, you will need to have postgres running locally.
diff --git a/crates/sui-graphql-rpc/docs/examples.md b/crates/sui-graphql-rpc/docs/examples.md
deleted file mode 100644
index b227665131112..0000000000000
--- a/crates/sui-graphql-rpc/docs/examples.md
+++ /dev/null
@@ -1,1700 +0,0 @@
-# Sui GraphQL Examples
-### [Address](#0)
-#### &emsp;&emsp;[Address](#0)
-#### &emsp;&emsp;[Transaction Block Connection](#1)
-### [Balance Connection](#1)
-#### &emsp;&emsp;[Balance Connection](#65535)
-### [Chain Id](#2)
-#### &emsp;&emsp;[Chain Id](#131070)
-### [Checkpoint](#3)
-#### &emsp;&emsp;[At Digest](#196605)
-#### &emsp;&emsp;[At Seq Num](#196606)
-#### &emsp;&emsp;[First Two Tx Blocks For Checkpoint](#196607)
-#### &emsp;&emsp;[Latest Checkpoint](#196608)
-#### &emsp;&emsp;[Multiple Selections](#196609)
-#### &emsp;&emsp;[With Timestamp Tx Block Live Objects](#196610)
-#### &emsp;&emsp;[With Tx Sent Addr Filter](#196611)
-### [Checkpoint Connection](#4)
-#### &emsp;&emsp;[Ascending Fetch](#262140)
-#### &emsp;&emsp;[First Ten After Checkpoint](#262141)
-#### &emsp;&emsp;[Last Ten After Checkpoint](#262142)
-### [Coin Connection](#5)
-#### &emsp;&emsp;[Coin Connection](#327675)
-### [Coin Metadata](#6)
-#### &emsp;&emsp;[Coin Metadata](#393210)
-### [Epoch](#7)
-#### &emsp;&emsp;[Latest Epoch](#458745)
-#### &emsp;&emsp;[Specific Epoch](#458746)
-#### &emsp;&emsp;[With Checkpoint Connection](#458747)
-#### &emsp;&emsp;[With Tx Block Connection](#458748)
-#### &emsp;&emsp;[With Tx Block Connection Latest Epoch](#458749)
-### [Event Connection](#8)
-#### &emsp;&emsp;[Event Connection](#524280)
-#### &emsp;&emsp;[Filter By Emitting Package Module And Event Type](#524281)
-#### &emsp;&emsp;[Filter By Sender](#524282)
-### [Name Service](#9)
-#### &emsp;&emsp;[Name Service](#589815)
-### [Object](#10)
-#### &emsp;&emsp;[Object](#655350)
-### [Object Connection](#11)
-#### &emsp;&emsp;[Filter Object Ids](#720885)
-#### &emsp;&emsp;[Filter On Generic Type](#720886)
-#### &emsp;&emsp;[Filter On Type](#720887)
-#### &emsp;&emsp;[Filter Owner](#720888)
-#### &emsp;&emsp;[Object Connection](#720889)
-### [Owner](#12)
-#### &emsp;&emsp;[Dynamic Field](#786420)
-#### &emsp;&emsp;[Dynamic Field Connection](#786421)
-#### &emsp;&emsp;[Dynamic Object Field](#786422)
-#### &emsp;&emsp;[Owner](#786423)
-### [Protocol Configs](#13)
-#### &emsp;&emsp;[Key Value](#851955)
-#### &emsp;&emsp;[Key Value Feature Flag](#851956)
-#### &emsp;&emsp;[Specific Config](#851957)
-#### &emsp;&emsp;[Specific Feature Flag](#851958)
-### [Service Config](#14)
-#### &emsp;&emsp;[Service Config](#917490)
-### [Stake Connection](#15)
-#### &emsp;&emsp;[Stake Connection](#983025)
-### [Sui System State Summary](#16)
-#### &emsp;&emsp;[Sui System State Summary](#1048560)
-### [Transaction Block](#17)
-#### &emsp;&emsp;[Transaction Block](#1114095)
-#### &emsp;&emsp;[Transaction Block Kind](#1114096)
-### [Transaction Block Connection](#18)
-#### &emsp;&emsp;[Before After Checkpoint](#1179630)
-#### &emsp;&emsp;[Changed Object Filter](#1179631)
-#### &emsp;&emsp;[Input Object Filter](#1179632)
-#### &emsp;&emsp;[Input Object Sign Addr Filter](#1179633)
-#### &emsp;&emsp;[Package Filter](#1179634)
-#### &emsp;&emsp;[Package Module Filter](#1179635)
-#### &emsp;&emsp;[Package Module Func Filter](#1179636)
-#### &emsp;&emsp;[Recv Addr Filter](#1179637)
-#### &emsp;&emsp;[Sign Addr Filter](#1179638)
-#### &emsp;&emsp;[Tx Ids Filter](#1179639)
-#### &emsp;&emsp;[Tx Kind Filter](#1179640)
-#### &emsp;&emsp;[With Defaults Ascending](#1179641)
-### [Transaction Block Effects](#19)
-#### &emsp;&emsp;[Transaction Block Effects](#1245165)
-## <a id=0></a>
-## Address
-### <a id=0></a>
-### Address
-####  Get the address' balance and its coins' id and type
-
-><pre>{
->  address(
->    address: "0x5094652429957619e6efa79a404a6714d1126e63f551f4b6c7fb76440f8118c9"
->  ) {
->    address
->    balance {
->      coinType {
->        repr
->      }
->      coinObjectCount
->      totalBalance
->    }
->    coins {
->      nodes {
->        contents {
->          type {
->            repr
->          }
->        }
->      }
->    }
->  }
->}</pre>
-
-### <a id=1></a>
-### Transaction Block Connection
-####  See examples in Query::transactionBlocks as this is similar behavior
-####  to the `transactionBlocks` in Query but supports additional
-####  `AddressTransactionBlockRelationship` filter
-####  Filtering on package where the signer of the TX is the current
-####  address and displaying the transaction's sender and the gas price
-####  and budget.
-
-><pre># See examples in Query::transactionBlocks as this is similar behavior
-># to the `transactionBlocks` in Query but supports additional
-># `AddressTransactionBlockRelationship` filter
->
-># Filtering on package where the signer of the TX is the current
-># address and displaying the transaction's sender and the gas price
-># and budget.
->query transaction_block_with_relation_filter {
->  address(address: "0x2") {
->    transactionBlocks(relation: SIGN, filter: { function: "0x2" }) {
->      nodes {
->        sender {
->          address
->        }
->        gasInput {
->          gasPrice
->          gasBudget
->        }
->      }
->    }
->  }
->}</pre>
-
-## <a id=1></a>
-## Balance Connection
-### <a id=65535></a>
-### Balance Connection
-####  Query the balance for objects of type COIN and then for each coin
-####  get the coin type, the number of objects, and the total balance
-
-><pre>{
->  address(
->    address: "0x5094652429957619e6efa79a404a6714d1126e63f551f4b6c7fb76440f8118c9"
->  ) {
->    balance(
->      type: "0xc060006111016b8a020ad5b33834984a437aaa7d3c74c18e09a95d48aceab08c::coin::COIN"
->    ) {
->      coinObjectCount
->      totalBalance
->    }
->    balances {
->      nodes {
->        coinType {
->          repr
->        }
->        coinObjectCount
->        totalBalance
->      }
->      pageInfo {
->        endCursor
->      }
->    }
->  }
->}</pre>
-
-## <a id=2></a>
-## Chain Id
-### <a id=131070></a>
-### Chain Id
-####  Returns the chain identifier for the chain that the server is tracking
-
-><pre>{
->  chainIdentifier
->}</pre>
-
-## <a id=3></a>
-## Checkpoint
-### <a id=196605></a>
-### At Digest
-####  Get the checkpoint's information at a particular digest
-
-><pre>{
->  checkpoint(id: { digest: "GaDeWEfbSQCQ8FBQHUHVdm4KjrnbgMqEZPuhStoq5njU" }) {
->    digest
->    sequenceNumber
->    validatorSignatures
->    previousCheckpointDigest
->    networkTotalTransactions
->    rollingGasSummary {
->      computationCost
->      storageCost
->      storageRebate
->      nonRefundableStorageFee
->    }
->    epoch {
->      epochId
->      referenceGasPrice
->      startTimestamp
->      endTimestamp
->    }
->  }
->}</pre>
-
-### <a id=196606></a>
-### At Seq Num
-####  Get the checkpoint's information at a particular sequence number
-
-><pre>{
->  checkpoint(id: { sequenceNumber: 10 }) {
->    digest
->    sequenceNumber
->    validatorSignatures
->    previousCheckpointDigest
->    networkTotalTransactions
->    rollingGasSummary {
->      computationCost
->      storageCost
->      storageRebate
->      nonRefundableStorageFee
->    }
->    epoch {
->      epochId
->      referenceGasPrice
->      startTimestamp
->      endTimestamp
->    }
->  }
->}</pre>
-
-### <a id=196607></a>
-### First Two Tx Blocks For Checkpoint
-####  Get data for the first two transaction blocks of checkpoint at sequence number 10
-
-><pre>{
->  checkpoint(id: { sequenceNumber: 10 }) {
->    transactionBlocks(first: 2) {
->      edges {
->        node {
->          kind {
->            __typename
->          }
->          digest
->          sender {
->            address
->          }
->          expiration {
->            epochId
->          }
->        }
->      }
->      pageInfo {
->        startCursor
->        hasNextPage
->        hasPreviousPage
->        endCursor
->      }
->    }
->  }
->}</pre>
-
-### <a id=196608></a>
-### Latest Checkpoint
-####  Latest checkpoint's data
-
-><pre>{
->  checkpoint {
->    digest
->    sequenceNumber
->    validatorSignatures
->    previousCheckpointDigest
->    networkTotalTransactions
->    rollingGasSummary {
->      computationCost
->      storageCost
->      storageRebate
->      nonRefundableStorageFee
->    }
->    epoch {
->      epochId
->      referenceGasPrice
->      startTimestamp
->      endTimestamp
->    }
->  }
->}</pre>
-
-### <a id=196609></a>
-### Multiple Selections
-####  Get the checkpoint at sequence 9769 and show
-####  its transactions
-
-><pre>{
->  checkpoint(id: { sequenceNumber: 9769 }) {
->    digest
->    sequenceNumber
->    timestamp
->    validatorSignatures
->    previousCheckpointDigest
->    networkTotalTransactions
->    rollingGasSummary {
->      computationCost
->      storageCost
->      storageRebate
->      nonRefundableStorageFee
->    }
->    epoch {
->      epochId
->      liveObjectSetDigest
->    }
->    transactionBlocks {
->      edges {
->        node {
->          digest
->          sender {
->            address
->          }
->          expiration {
->            epochId
->          }
->        }
->      }
->    }
->  }
->}</pre>
-
-### <a id=196610></a>
-### With Timestamp Tx Block Live Objects
-####  Latest checkpoint's timestamp, and transaction block data
-
-><pre>{
->  checkpoint {
->    digest
->    sequenceNumber
->    timestamp
->    transactionBlocks {
->      edges {
->        node {
->          digest
->          sender {
->            address
->          }
->          expiration {
->            epochId
->          }
->        }
->      }
->    }
->  }
->}</pre>
-
-### <a id=196611></a>
-### With Tx Sent Addr Filter
-####  Select checkpoint at sequence number 14830285 for transactions from signAddress
-
-><pre>{
->  checkpoint(id: { sequenceNumber: 14830285 }) {
->    digest
->    sequenceNumber
->    timestamp
->    transactionBlocks(
->      filter: {
->        signAddress: "0x0000000000000000000000000000000000000000000000000000000000000000"
->      }
->    ) {
->      edges {
->        node {
->          digest
->          sender {
->            address
->          }
->          expiration {
->            epochId
->          }
->        }
->      }
->    }
->  }
->}</pre>
-
-## <a id=4></a>
-## Checkpoint Connection
-### <a id=262140></a>
-### Ascending Fetch
-####  Use the checkpoint connection to fetch some default amount of checkpoints in an ascending order
-
-><pre>{
->  checkpoints {
->    nodes {
->      digest
->      sequenceNumber
->      validatorSignatures
->      previousCheckpointDigest
->      networkTotalTransactions
->      rollingGasSummary {
->        computationCost
->        storageCost
->        storageRebate
->        nonRefundableStorageFee
->      }
->      epoch {
->        epochId
->        referenceGasPrice
->        startTimestamp
->        endTimestamp
->      }
->    }
->  }
->}</pre>
-
-### <a id=262141></a>
-### First Ten After Checkpoint
-####  Fetch the digest and sequence number of the first 10 checkpoints after the cursor, which in this example is set to be checkpoint 0. Note that the cursor is opaque.
-
-><pre>{
->  checkpoints(first: 10, after: "eyJjIjoyMjgwMDU4MCwicyI6MH0") {
->    nodes {
->      sequenceNumber
->      digest
->    }
->  }
->}</pre>
-
-### <a id=262142></a>
-### Last Ten After Checkpoint
-####  Fetch the digest and the sequence number of the last 20 checkpoints before the cursor
-
-><pre>{
->  checkpoints(last: 20, before: "eyJjIjoyMjgwMDY1MSwicyI6MjI4MDA2MzJ9") {
->    nodes {
->      sequenceNumber
->      digest
->    }
->  }
->}</pre>
-
-## <a id=5></a>
-## Coin Connection
-### <a id=327675></a>
-### Coin Connection
-####  Get last 3 coins owned by `0x0`.
-
-><pre>{
->  address(
->    address: "0x0000000000000000000000000000000000000000000000000000000000000000"
->  ) {
->    coins(last: 3) {
->      nodes {
->        coinBalance
->      }
->      pageInfo {
->        endCursor
->        hasNextPage
->      }
->    }
->  }
->}</pre>
-
-## <a id=6></a>
-## Coin Metadata
-### <a id=393210></a>
-### Coin Metadata
-
-><pre>query CoinMetadata {
->  coinMetadata(coinType: "0x2::sui::SUI") {
->    decimals
->    name
->    symbol
->    description
->    iconUrl
->    supply
->    hasPublicTransfer
->  }
->}</pre>
-
-## <a id=7></a>
-## Epoch
-### <a id=458745></a>
-### Latest Epoch
-####  Latest epoch, since epoch omitted
-
-><pre>{
->  epoch {
->    protocolConfigs {
->      protocolVersion
->    }
->    epochId
->    referenceGasPrice
->    startTimestamp
->    endTimestamp
->  }
->}</pre>
-
-### <a id=458746></a>
-### Specific Epoch
-####  Selecting all fields for epoch 100
-
-><pre>{
->  epoch(id: 100) {
->    protocolConfigs {
->      protocolVersion
->    }
->    epochId
->    referenceGasPrice
->    startTimestamp
->    endTimestamp
->    validatorSet {
->      totalStake
->      pendingActiveValidatorsSize
->      stakingPoolMappingsSize
->      inactivePoolsSize
->      validatorCandidatesSize
->      activeValidators {
->        nodes {
->          name
->          description
->          imageUrl
->          projectUrl
->          exchangeRates {
->            storageRebate
->            bcs
->            hasPublicTransfer
->          }
->          exchangeRatesSize
->          stakingPoolActivationEpoch
->          stakingPoolSuiBalance
->          rewardsPool
->          poolTokenBalance
->          pendingStake
->          pendingTotalSuiWithdraw
->          pendingPoolTokenWithdraw
->          votingPower
->          gasPrice
->          commissionRate
->          nextEpochStake
->          nextEpochGasPrice
->          nextEpochCommissionRate
->          atRisk
->        }
->      }
->    }
->  }
->}</pre>
-
-### <a id=458747></a>
-### With Checkpoint Connection
-
-><pre>{
->  epoch {
->    checkpoints {
->      nodes {
->        transactionBlocks(first: 10) {
->          pageInfo {
->            hasNextPage
->            endCursor
->          }
->          edges {
->            cursor
->            node {
->              sender {
->                address
->              }
->              effects {
->                gasEffects {
->                  gasObject {
->                    address
->                  }
->                }
->              }
->              gasInput {
->                gasPrice
->                gasBudget
->              }
->            }
->          }
->        }
->      }
->    }
->  }
->}</pre>
-
-### <a id=458748></a>
-### With Tx Block Connection
-####  Fetch the first 20 transactions after tx 231220153 (encoded as a
-####  cursor) in epoch 97.
-
-><pre>{
->  epoch(id: 97) {
->    transactionBlocks(first: 20, after:"eyJjIjoyNjkzMzc3OCwidCI6MjMxMjIwMTUzLCJ0YyI6ODAxMDg4NH0") {
->      pageInfo {
->        hasNextPage
->        endCursor
->      }
->      edges {
->        cursor
->        node {
->          digest
->          sender {
->            address
->          }
->          effects {
->            gasEffects {
->              gasObject {
->                address
->              }
->            }
->          }
->          gasInput {
->            gasPrice
->            gasBudget
->          }
->        }
->      }
->    }
->  }
->}</pre>
-
-### <a id=458749></a>
-### With Tx Block Connection Latest Epoch
-
-><pre>{
->  epoch {
->    transactionBlocks(first: 20, after: "eyJjIjoyNjkzMzMyNCwidCI6MTEwMTYxMDQ4MywidGMiOjI2ODUxMjQ4fQ") {
->      pageInfo {
->        hasNextPage
->        endCursor
->      }
->      edges {
->        cursor
->        node {
->          sender {
->            address
->          }
->          effects {
->            gasEffects {
->              gasObject {
->                address
->              }
->            }
->          }
->          gasInput {
->            gasPrice
->            gasBudget
->          }
->        }
->      }
->    }
->  }
->}</pre>
-
-## <a id=8></a>
-## Event Connection
-### <a id=524280></a>
-### Event Connection
-
-><pre>{
->  events(
->    filter: {
->      eventType: "0x3164fcf73eb6b41ff3d2129346141bd68469964c2d95a5b1533e8d16e6ea6e13::Market::ChangePriceEvent<0x2::sui::SUI>"
->    }
->  ) {
->    nodes {
->      sendingModule {
->        name
->        package { digest }
->      }
->      type {
->        repr
->      }
->      sender {
->        address
->      }
->      timestamp
->      json
->      bcs
->    }
->  }
->}</pre>
-
-### <a id=524281></a>
-### Filter By Emitting Package Module And Event Type
-
-><pre>query ByEmittingPackageModuleAndEventType {
->  events(
->    first: 1
->    after: "eyJ0eCI6Njc2MywiZSI6MCwiYyI6MjI4MDA3NDJ9"
->    filter: {
->      emittingModule: "0x3::sui_system",
->      eventType: "0x3::validator::StakingRequestEvent"
->    }
->  ) {
->    pageInfo {
->      hasNextPage
->      endCursor
->    }
->    nodes {
->      sendingModule {
->        name
->      }
->      type {
->        repr
->      }
->      sender {
->        address
->      }
->      timestamp
->      json
->      bcs
->    }
->  }
->}</pre>
-
-### <a id=524282></a>
-### Filter By Sender
-
-><pre>query ByTxSender {
->  events(
->    first: 1
->    filter: {
->      sender: "0xdff57c401e125a7e0e06606380560b459a179aacd08ed396d0162d57dbbdadfb"
->    }
->  ) {
->    pageInfo {
->      hasNextPage
->      endCursor
->    }
->    nodes {
->      sendingModule {
->        name
->      }
->      type {
->        repr
->      }
->      sender {
->        address
->      }
->      timestamp
->      json
->      bcs
->    }
->  }
->}</pre>
-
-## <a id=9></a>
-## Name Service
-### <a id=589815></a>
-### Name Service
-
-><pre>{
->  resolveSuinsAddress(domain: "example.sui") {
->    address
->  }
->  address(
->    address: "0x0b86be5d779fac217b41d484b8040ad5145dc9ba0cba099d083c6cbda50d983e"
->  ) {
->    address
->    balance(type: "0x2::sui::SUI") {
->      coinType {
->        repr
->      }
->      coinObjectCount
->      totalBalance
->    }
->    defaultSuinsName
->  }
->}</pre>
-
-## <a id=10></a>
-## Object
-### <a id=655350></a>
-### Object
-
-><pre>{
->  object(
->    address: "0x04e20ddf36af412a4096f9014f4a565af9e812db9a05cc40254846cf6ed0ad91"
->  ) {
->    address
->    version
->    digest
->    storageRebate
->    owner {
->      __typename
->      ... on Shared {
->        initialSharedVersion
->      }
->      __typename
->      ... on Parent {
->        parent {
->          address
->        }
->      }
->      __typename
->      ... on AddressOwner {
->        owner {
->          address
->        }
->      }
->    }
->    previousTransactionBlock {
->      digest
->    }
->  }
->}</pre>
-
-## <a id=11></a>
-## Object Connection
-### <a id=720885></a>
-### Filter Object Ids
-####  Filter on objectIds
-
-><pre>{
->  objects(filter: { objectIds: [
->    "0x4bba2c7b9574129c272bca8f58594eba933af8001257aa6e0821ad716030f149"
->  ]}) {
->    edges {
->      node {
->        storageRebate
->        owner {
->          __typename
->          ... on Shared {
->            initialSharedVersion
->          }
->          __typename
->          ... on Parent {
->            parent {
->              address
->            }
->          }
->          __typename
->          ... on AddressOwner {
->            owner {
->              address
->            }
->          }
->        }
->      }
->    }
->  }
->}</pre>
-
-### <a id=720886></a>
-### Filter On Generic Type
-
-><pre>{
->  objects(filter: {type: "0x2::coin::Coin"}) {
->    edges {
->      node {
->        asMoveObject {
->          contents {
->            type { repr }
->          }
->        }
->      }
->    }
->  }
->}</pre>
-
-### <a id=720887></a>
-### Filter On Type
-
-><pre>{
->  objects(filter: {type: "0x3::staking_pool::StakedSui"}) {
->    edges {
->      node {
->        asMoveObject {
->          contents {
->            type {
->              repr
->            }
->          }
->        }
->      }
->    }
->  }
->}</pre>
-
-### <a id=720888></a>
-### Filter Owner
-####  Filter on owner
-
-><pre>{
->  objects(filter: {
->    owner: "0x23b7b0e2badb01581ba9b3ab55587d8d9fdae087e0cfc79f2c72af36f5059439"
->  }) {
->    edges {
->      node {
->        storageRebate
->        owner {
->          __typename
->          ... on Shared {
->            initialSharedVersion
->          }
->          __typename
->          ... on Parent {
->            parent {
->              address
->            }
->          }
->          __typename
->          ... on AddressOwner {
->            owner {
->              address
->            }
->          }
->        }
->      }
->    }
->  }
->}</pre>
-
-### <a id=720889></a>
-### Object Connection
-
-><pre>{
->  objects {
->    nodes {
->      version
->      digest
->      storageRebate
->      previousTransactionBlock {
->        digest
->        sender { defaultSuinsName }
->        gasInput {
->          gasPrice
->          gasBudget
->        }
->      }
->    }
->    pageInfo {
->      endCursor
->    }
->  }
->}</pre>
-
-## <a id=12></a>
-## Owner
-### <a id=786420></a>
-### Dynamic Field
-
-><pre>fragment DynamicFieldValueSelection on DynamicFieldValue {
->  ... on MoveValue {
->    type {
->      repr
->    }
->    data
->    __typename
->  }
->  ... on MoveObject {
->    hasPublicTransfer
->    contents {
->      type {
->        repr
->      }
->      data
->    }
->    __typename
->  }
->}
->
->fragment DynamicFieldNameSelection on MoveValue {
->  type {
->    repr
->  }
->  data
->  bcs
->}
->
->fragment DynamicFieldSelect on DynamicField {
->  name {
->    ...DynamicFieldNameSelection
->  }
->  value {
->    ...DynamicFieldValueSelection
->  }
->}
->
->query DynamicField {
->  object(
->    address: "0xb57fba584a700a5bcb40991e1b2e6bf68b0f3896d767a0da92e69de73de226ac"
->  ) {
->    dynamicField(
->      name: {
->        type: "0x2::kiosk::Listing",
->        bcs: "NLArx1UJguOUYmXgNG8Pv8KbKXLjWtCi6i0Yeq1VhfwA",
->      }
->    ) {
->      ...DynamicFieldSelect
->    }
->  }
->}</pre>
-
-### <a id=786421></a>
-### Dynamic Field Connection
-
-><pre>fragment DynamicFieldValueSelection on DynamicFieldValue {
->  ... on MoveValue {
->    type {
->      repr
->    }
->    data
->  }
->  ... on MoveObject {
->    hasPublicTransfer
->    contents {
->      type {
->        repr
->      }
->      data
->    }
->  }
->}
->
->fragment DynamicFieldNameSelection on MoveValue {
->  type {
->    repr
->  }
->  data
->  bcs
->}
->
->fragment DynamicFieldSelect on DynamicField {
->  name {
->    ...DynamicFieldNameSelection
->  }
->  value {
->    ...DynamicFieldValueSelection
->  }
->}
->
->query DynamicFields {
->  object(
->    address: "0xb57fba584a700a5bcb40991e1b2e6bf68b0f3896d767a0da92e69de73de226ac"
->  ) {
->    dynamicFields {
->      pageInfo {
->        hasNextPage
->        endCursor
->      }
->      edges {
->        cursor
->        node {
->          ...DynamicFieldSelect
->        }
->      }
->    }
->  }
->}</pre>
-
-### <a id=786422></a>
-### Dynamic Object Field
-
-><pre>fragment DynamicFieldValueSelection on DynamicFieldValue {
->  ... on MoveValue {
->    type {
->      repr
->    }
->    data
->    __typename
->  }
->  ... on MoveObject {
->    hasPublicTransfer
->    contents {
->      type {
->        repr
->      }
->      data
->    }
->    __typename
->  }
->}
->
->fragment DynamicFieldNameSelection on MoveValue {
->  type {
->    repr
->  }
->  data
->  bcs
->}
->
->fragment DynamicFieldSelect on DynamicField {
->  name {
->    ...DynamicFieldNameSelection
->  }
->  value {
->    ...DynamicFieldValueSelection
->  }
->}
->
->query DynamicObjectField {
->  object(
->    address: "0xb57fba584a700a5bcb40991e1b2e6bf68b0f3896d767a0da92e69de73de226ac"
->  ) {
->    dynamicObjectField(
->      name: {type: "0x2::kiosk::Item", bcs: "NLArx1UJguOUYmXgNG8Pv8KbKXLjWtCi6i0Yeq1Vhfw="}
->    ) {
->      ...DynamicFieldSelect
->    }
->  }
->}</pre>
-
-### <a id=786423></a>
-### Owner
-
-><pre>{
->  owner(
->    address: "0x931f293ce7f65fd5ebe9542653e1fd92fafa03dda563e13b83be35da8a2eecbe"
->  ) {
->    address
->  }
->}</pre>
-
-## <a id=13></a>
-## Protocol Configs
-### <a id=851955></a>
-### Key Value
-####  Select the key and value of the protocol configuration
-
-><pre>{
->  protocolConfig {
->    configs {
->      key
->      value
->    }
->  }
->}</pre>
-
-### <a id=851956></a>
-### Key Value Feature Flag
-####  Select the key and value of the feature flag
-
-><pre>{
->  protocolConfig {
->    featureFlags {
->      key
->      value
->    }
->  }
->}</pre>
-
-### <a id=851957></a>
-### Specific Config
-####  Select the key and value of the specific protocol configuration, in this case `max_move_identifier_len`
-
-><pre>{
->  protocolConfig {
->    config(key: "max_move_identifier_len") {
->      key
->      value
->    }
->  }
->}</pre>
-
-### <a id=851958></a>
-### Specific Feature Flag
-
-><pre>{
->  protocolConfig {
->    protocolVersion
->    featureFlag(key: "advance_epoch_start_time_in_safe_mode") {
->      value
->    }
->  }
->}</pre>
-
-## <a id=14></a>
-## Service Config
-### <a id=917490></a>
-### Service Config
-####  Get the configuration of the running service
-
-><pre>{
->  serviceConfig {
->    isEnabled(feature: ANALYTICS)
->    enabledFeatures
->    maxQueryDepth
->    maxQueryNodes
->    maxDbQueryCost
->    defaultPageSize
->    maxPageSize
->    requestTimeoutMs
->    maxQueryPayloadSize
->  }
->}</pre>
-
-## <a id=15></a>
-## Stake Connection
-### <a id=983025></a>
-### Stake Connection
-####  Get all the staked objects for this address and all the active validators at the epoch when the stake became active
-
-><pre>{
->  address(
->    address: "0xc0a5b916d0e406ddde11a29558cd91b29c49e644eef597b7424a622955280e1e"
->  ) {
->    address
->    balance(type: "0x2::sui::SUI") {
->      coinType {
->        repr
->      }
->      totalBalance
->    }
->    stakedSuis {
->      nodes {
->        status
->        principal
->        estimatedReward
->        activatedEpoch {
->          epochId
->          referenceGasPrice
->          validatorSet {
->            activeValidators {
->              nodes {
->                name
->                description
->                exchangeRatesSize
->              }
->            }
->            totalStake
->          }
->        }
->        requestedEpoch {
->          epochId
->        }
->      }
->    }
->  }
->}</pre>
-
-## <a id=16></a>
-## Sui System State Summary
-### <a id=1048560></a>
-### Sui System State Summary
-####  Get the latest sui system state data
-
-><pre>{
->  epoch {
->    storageFund {
->      totalObjectStorageRebates
->      nonRefundableBalance
->    }
->    safeMode {
->      enabled
->      gasSummary {
->         computationCost
->         storageCost
->         storageRebate
->         nonRefundableStorageFee
->      }
->    }
->    systemStateVersion
->    systemParameters {
->      durationMs
->      stakeSubsidyStartEpoch
->      minValidatorCount
->      maxValidatorCount
->      minValidatorJoiningStake
->      validatorLowStakeThreshold
->      validatorVeryLowStakeThreshold
->      validatorLowStakeGracePeriod
->    }
->    systemStakeSubsidy {
->      balance
->      distributionCounter
->      currentDistributionAmount
->      periodLength
->      decreaseRate
->
->    }
->  }
->}</pre>
-
-## <a id=17></a>
-## Transaction Block
-### <a id=1114095></a>
-### Transaction Block
-####  Get the data for a TransactionBlock by its digest
-
-><pre>{
->  transactionBlock(digest: "HvTjk3ELg8gRofmB1GgrpLHBFeA53QKmUKGEuhuypezg") {
->    sender {
->      address
->    }
->    gasInput {
->      gasSponsor {
->        address
->      }
->      gasPayment {
->        nodes {
->          address
->        }
->      }
->      gasPrice
->      gasBudget
->    }
->    kind {
->      __typename
->    }
->    signatures
->    digest
->    expiration {
->      epochId
->    }
->    effects {
->      timestamp
->    }
->  }
->}</pre>
-
-### <a id=1114096></a>
-### Transaction Block Kind
-
-><pre>{
->  object(
->    address: "0xd6b9c261ab53d636760a104e4ab5f46c2a3e9cda58bd392488fc4efa6e43728c"
->  ) {
->    previousTransactionBlock {
->      sender {
->        address
->      }
->      kind {
->        __typename
->        ... on ConsensusCommitPrologueTransaction {
->          epoch {
->            epochId
->            referenceGasPrice
->          }
->          round
->          commitTimestamp
->          consensusCommitDigest
->        }
->        ... on ChangeEpochTransaction {
->          computationCharge
->          storageCharge
->          startTimestamp
->          storageRebate
->        }
->        ... on GenesisTransaction {
->          objects {
->            nodes { address }
->          }
->        }
->      }
->    }
->  }
->}</pre>
-
-## <a id=18></a>
-## Transaction Block Connection
-### <a id=1179630></a>
-### Before After Checkpoint
-####  Filter on before_ and after_checkpoint. If both are provided, before must be greater than after
-
-><pre>{
->  transactionBlocks(
->    filter: { afterCheckpoint: 10, beforeCheckpoint: 20 }
->  ) {
->    nodes {
->      sender {
->        address
->      }
->      gasInput {
->        gasPrice
->        gasBudget
->      }
->    }
->  }
->}</pre>
-
-### <a id=1179631></a>
-### Changed Object Filter
-####  Filter on changedObject
-
-><pre>{
->  transactionBlocks(
->    filter: {
->      changedObject: "0x0000000000000000000000000000000000000000000000000000000000000006"
->    }
->  ) {
->    nodes {
->      sender {
->        address
->      }
->      gasInput {
->        gasPrice
->        gasBudget
->      }
->    }
->  }
->}</pre>
-
-### <a id=1179632></a>
-### Input Object Filter
-####  Filter on inputObject
-
-><pre>{
->  transactionBlocks(
->    filter: {
->      inputObject: "0x0000000000000000000000000000000000000000000000000000000000000006"
->    }
->  ) {
->    nodes {
->      sender {
->        address
->      }
->      gasInput {
->        gasPrice
->        gasBudget
->      }
->    }
->  }
->}</pre>
-
-### <a id=1179633></a>
-### Input Object Sign Addr Filter
-####  multiple filters
-
-><pre>{
->  transactionBlocks(
->    filter: {
->      inputObject: "0x0000000000000000000000000000000000000000000000000000000000000006"
->      signAddress: "0x0000000000000000000000000000000000000000000000000000000000000000"
->    }
->  ) {
->    nodes {
->      sender {
->        address
->      }
->      effects {
->        gasEffects {
->          gasObject {
->            address
->          }
->        }
->      }
->      gasInput {
->        gasPrice
->        gasBudget
->      }
->    }
->  }
->}</pre>
-
-### <a id=1179634></a>
-### Package Filter
-####  Filtering on package
-
-><pre>{
->  transactionBlocks(filter: { function: "0x3" }) {
->    nodes {
->      sender {
->        address
->      }
->      gasInput {
->        gasPrice
->        gasBudget
->      }
->    }
->  }
->}</pre>
-
-### <a id=1179635></a>
-### Package Module Filter
-####  Filtering on package and module
-
-><pre>{
->  transactionBlocks(
->    filter: {
->      function: "0x3::sui_system"
->    }
->  ) {
->    nodes {
->      sender {
->        address
->      }
->      gasInput {
->        gasPrice
->        gasBudget
->      }
->    }
->  }
->}</pre>
-
-### <a id=1179636></a>
-### Package Module Func Filter
-####  Filtering on package, module and function
-
-><pre>{
->  transactionBlocks(
->    filter: {
->      function: "0x3::sui_system::request_withdraw_stake"
->    }
->  ) {
->    nodes {
->      sender {
->        address
->      }
->      gasInput {
->        gasPrice
->        gasBudget
->      }
->    }
->  }
->}</pre>
-
-### <a id=1179637></a>
-### Recv Addr Filter
-####  Filter on recvAddress
-
-><pre>{
->  transactionBlocks(
->    filter: {
->      recvAddress: "0x0000000000000000000000000000000000000000000000000000000000000000"
->    }
->  ) {
->    nodes {
->      sender {
->        address
->      }
->      gasInput {
->        gasPrice
->        gasBudget
->      }
->    }
->  }
->}</pre>
-
-### <a id=1179638></a>
-### Sign Addr Filter
-####  Filter on signing address
-
-><pre>{
->  transactionBlocks(
->    filter: {
->      signAddress: "0x0000000000000000000000000000000000000000000000000000000000000000"
->    }
->  ) {
->    nodes {
->      sender {
->        address
->      }
->      gasInput {
->        gasPrice
->        gasBudget
->      }
->    }
->  }
->}</pre>
-
-### <a id=1179639></a>
-### Tx Ids Filter
-####  Filter on transactionIds
-
-><pre>{
->  transactionBlocks(
->    filter: { transactionIds: ["DtQ6v6iJW4wMLgadENPUCEUS5t8AP7qvdG5jX84T1akR"] }
->  ) {
->    nodes {
->      sender {
->        address
->      }
->      gasInput {
->        gasPrice
->        gasBudget
->      }
->    }
->  }
->}</pre>
-
-### <a id=1179640></a>
-### Tx Kind Filter
-####  Filter on TransactionKind (only SYSTEM_TX or PROGRAMMABLE_TX)
-
-><pre>{
->  transactionBlocks(filter: { kind: SYSTEM_TX }) {
->    nodes {
->      sender {
->        address
->      }
->      gasInput {
->        gasPrice
->        gasBudget
->      }
->    }
->  }
->}</pre>
-
-### <a id=1179641></a>
-### With Defaults Ascending
-####  Fetch some default amount of transactions, ascending
-
-><pre>{
->  transactionBlocks {
->    nodes {
->      digest
->      effects {
->        gasEffects {
->          gasObject {
->            version
->            digest
->          }
->          gasSummary {
->            computationCost
->            storageCost
->            storageRebate
->            nonRefundableStorageFee
->          }
->        }
->        errors
->      }
->      sender {
->        address
->      }
->      gasInput {
->        gasPrice
->        gasBudget
->      }
->    }
->    pageInfo {
->      endCursor
->    }
->  }
->}</pre>
-
-## <a id=19></a>
-## Transaction Block Effects
-### <a id=1245165></a>
-### Transaction Block Effects
-
-><pre>{
->  object(
->    address: "0x0bba1e7d907dc2832edfc3bf4468b6deacd9a2df435a35b17e640e135d2d5ddc"
->  ) {
->    version
->    owner {
->      __typename
->      ... on Shared {
->        initialSharedVersion
->      }
->      __typename
->      ... on Parent {
->        parent {
->          address
->        }
->      }
->      __typename
->      ... on AddressOwner {
->        owner {
->          address
->        }
->      }
->    }
->    previousTransactionBlock {
->      effects {
->        status
->        checkpoint {
->          sequenceNumber
->        }
->        lamportVersion
->        gasEffects {
->          gasSummary {
->            computationCost
->            storageCost
->            storageRebate
->            nonRefundableStorageFee
->          }
->        }
->        balanceChanges {
->          nodes {
->            owner {
->              address
->              balance(type: "0x2::sui::SUI") {
->                totalBalance
->              }
->            }
->            amount
->            coinType {
->              repr
->              signature
->              layout
->            }
->          }
->        }
->        dependencies {
->          nodes {
->            sender {
->              address
->            }
->          }
->        }
->      }
->    }
->  }
->}</pre>
-
diff --git a/crates/sui-graphql-rpc/examples/epoch/with_tx_block_connection_latest_epoch.graphql b/crates/sui-graphql-rpc/examples/epoch/with_tx_block_connection_latest_epoch.graphql
index 9fdc8ea5a7fa3..62bc23f9f5855 100644
--- a/crates/sui-graphql-rpc/examples/epoch/with_tx_block_connection_latest_epoch.graphql
+++ b/crates/sui-graphql-rpc/examples/epoch/with_tx_block_connection_latest_epoch.graphql
@@ -1,6 +1,6 @@
 {
   epoch {
-    transactionBlocks(first: 20, after: "eyJjIjoyNjkzMzMyNCwidCI6MTEwMTYxMDQ4MywidGMiOjI2ODUxMjQ4fQ") {
+    transactionBlocks(first: 20, after: "eyJjIjoyNjkzMzMyNCwidCI6MTEwMTYxMDQ4MywiaSI6ZmFsc2V9") {
       pageInfo {
         hasNextPage
         endCursor
diff --git a/crates/sui-graphql-rpc/schema/current_progress_schema.graphql b/crates/sui-graphql-rpc/schema.graphql
similarity index 86%
rename from crates/sui-graphql-rpc/schema/current_progress_schema.graphql
rename to crates/sui-graphql-rpc/schema.graphql
index c5b5ae6e526c0..faca90cc4e354 100644
--- a/crates/sui-graphql-rpc/schema/current_progress_schema.graphql
+++ b/crates/sui-graphql-rpc/schema.graphql
@@ -98,8 +98,27 @@ type Address implements IOwner {
 	"""
 	Similar behavior to the `transactionBlocks` in Query but supporting the additional
 	`AddressTransactionBlockRelationship` filter, which defaults to `SIGN`.
+	
+	`scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+	results. It is required for queries that apply more than two complex filters (on function,
+	kind, sender, recipient, input object, changed object, or ids), and can be at most
+	`serviceConfig.maxScanLimit`.
+	
+	When the scan limit is reached the page will be returned even if it has fewer than `first`
+	results when paginating forward (`last` when paginating backwards). If there are more
+	transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+	`true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+	transaction that was scanned as opposed to the last (or first) transaction in the page.
+	
+	Requesting the next (or previous) page after this cursor will resume the search, scanning
+	the next `scanLimit` many transactions in the direction of pagination, and so on until all
+	transactions in the scanning range have been visited.
+	
+	By default, the scanning range includes all transactions known to GraphQL, but it can be
+	restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+	`afterCheckpoint` and `atCheckpoint` filters.
 	"""
-	transactionBlocks(first: Int, after: String, last: Int, before: String, relation: AddressTransactionBlockRelationship, filter: TransactionBlockFilter): TransactionBlockConnection!
+	transactionBlocks(first: Int, after: String, last: Int, before: String, relation: AddressTransactionBlockRelationship, filter: TransactionBlockFilter, scanLimit: Int): TransactionBlockConnection!
 }
 
 type AddressConnection {
@@ -409,8 +428,25 @@ type Checkpoint {
 	epoch: Epoch
 	"""
 	Transactions in this checkpoint.
+	
+	`scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+	results. It is required for queries that apply more than two complex filters (on function,
+	kind, sender, recipient, input object, changed object, or ids), and can be at most
+	`serviceConfig.maxScanLimit`.
+	
+	When the scan limit is reached the page will be returned even if it has fewer than `first`
+	results when paginating forward (`last` when paginating backwards). If there are more
+	transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+	`true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+	transaction that was scanned as opposed to the last (or first) transaction in the page.
+	
+	Requesting the next (or previous) page after this cursor will resume the search, scanning
+	the next `scanLimit` many transactions in the direction of pagination, and so on until all
+	transactions in the scanning range have been visited.
+	
+	By default, the scanning range consists of all transactions in this checkpoint.
 	"""
-	transactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter): TransactionBlockConnection!
+	transactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter, scanLimit: Int): TransactionBlockConnection!
 }
 
 type CheckpointConnection {
@@ -517,8 +553,27 @@ type Coin implements IMoveObject & IObject & IOwner {
 	storageRebate: BigInt
 	"""
 	The transaction blocks that sent objects to this object.
+	
+	`scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+	results. It is required for queries that apply more than two complex filters (on function,
+	kind, sender, recipient, input object, changed object, or ids), and can be at most
+	`serviceConfig.maxScanLimit`.
+	
+	When the scan limit is reached the page will be returned even if it has fewer than `first`
+	results when paginating forward (`last` when paginating backwards). If there are more
+	transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+	`true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+	transaction that was scanned as opposed to the last (or first) transaction in the page.
+	
+	Requesting the next (or previous) page after this cursor will resume the search, scanning
+	the next `scanLimit` many transactions in the direction of pagination, and so on until all
+	transactions in the scanning range have been visited.
+	
+	By default, the scanning range includes all transactions known to GraphQL, but it can be
+	restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+	`afterCheckpoint` and `atCheckpoint` filters.
 	"""
-	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter): TransactionBlockConnection!
+	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter, scanLimit: Int): TransactionBlockConnection!
 	"""
 	The Base64-encoded BCS serialization of the object's content.
 	"""
@@ -676,8 +731,27 @@ type CoinMetadata implements IMoveObject & IObject & IOwner {
 	storageRebate: BigInt
 	"""
 	The transaction blocks that sent objects to this object.
+	
+	`scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+	results. It is required for queries that apply more than two complex filters (on function,
+	kind, sender, recipient, input object, changed object, or ids), and can be at most
+	`serviceConfig.maxScanLimit`.
+	
+	When the scan limit is reached the page will be returned even if it has fewer than `first`
+	results when paginating forward (`last` when paginating backwards). If there are more
+	transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+	`true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+	transaction that was scanned as opposed to the last (or first) transaction in the page.
+	
+	Requesting the next (or previous) page after this cursor will resume the search, scanning
+	the next `scanLimit` many transactions in the direction of pagination, and so on until all
+	transactions in the scanning range have been visited.
+	
+	By default, the scanning range includes all transactions known to GraphQL, but it can be
+	restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+	`afterCheckpoint` and `atCheckpoint` filters.
 	"""
-	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter): TransactionBlockConnection!
+	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter, scanLimit: Int): TransactionBlockConnection!
 	"""
 	The Base64-encoded BCS serialization of the object's content.
 	"""
@@ -1093,8 +1167,25 @@ type Epoch {
 	checkpoints(first: Int, after: String, last: Int, before: String): CheckpointConnection!
 	"""
 	The epoch's corresponding transaction blocks.
+	
+	`scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+	results. It is required for queries that apply more than two complex filters (on function,
+	kind, sender, recipient, input object, changed object, or ids), and can be at most
+	`serviceConfig.maxScanLimit`.
+	
+	When the scan limit is reached the page will be returned even if it has fewer than `first`
+	results when paginating forward (`last` when paginating backwards). If there are more
+	transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+	`true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+	transaction that was scanned as opposed to the last (or first) transaction in the page.
+	
+	Requesting the next (or previous) page after this cursor will resume the search, scanning
+	the next `scanLimit` many transactions in the direction of pagination, and so on until all
+	transactions in the scanning range have been visited.
+	
+	By default, the scanning range consists of all transactions in this epoch.
 	"""
-	transactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter): TransactionBlockConnection!
+	transactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter, scanLimit: Int): TransactionBlockConnection!
 }
 
 type Event {
@@ -1181,6 +1272,8 @@ input EventFilter {
 	PTB and emits an event.
 	
 	Modules can be filtered by their package, or package::module.
+	We currently do not support filtering by emitting module and event type
+	at the same time so if both are provided in one filter, the query will error.
 	"""
 	emittingModule: String
 	"""
@@ -1429,7 +1522,7 @@ interface IObject {
 	"""
 	The transaction blocks that sent objects to this object.
 	"""
-	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter): TransactionBlockConnection!
+	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter, scanLimit: Int): TransactionBlockConnection!
 	"""
 	The Base64-encoded BCS serialization of the object's content.
 	"""
@@ -1972,8 +2065,27 @@ type MoveObject implements IMoveObject & IObject & IOwner {
 	storageRebate: BigInt
 	"""
 	The transaction blocks that sent objects to this object.
+	
+	`scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+	results. It is required for queries that apply more than two complex filters (on function,
+	kind, sender, recipient, input object, changed object, or ids), and can be at most
+	`serviceConfig.maxScanLimit`.
+	
+	When the scan limit is reached the page will be returned even if it has fewer than `first`
+	results when paginating forward (`last` when paginating backwards). If there are more
+	transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+	`true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+	transaction that was scanned as opposed to the last (or first) transaction in the page.
+	
+	Requesting the next (or previous) page after this cursor will resume the search, scanning
+	the next `scanLimit` many transactions in the direction of pagination, and so on until all
+	transactions in the scanning range have been visited.
+	
+	By default, the scanning range includes all transactions known to GraphQL, but it can be
+	restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+	`afterCheckpoint` and `atCheckpoint` filters.
 	"""
-	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter): TransactionBlockConnection!
+	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter, scanLimit: Int): TransactionBlockConnection!
 	"""
 	The Base64-encoded BCS serialization of the object's content.
 	"""
@@ -2161,13 +2273,48 @@ type MovePackage implements IObject & IOwner {
 	The transaction blocks that sent objects to this package.
 	
 	Note that objects that have been sent to a package become inaccessible.
+	
+	`scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+	results. It is required for queries that apply more than two complex filters (on function,
+	kind, sender, recipient, input object, changed object, or ids), and can be at most
+	`serviceConfig.maxScanLimit`.
+	
+	When the scan limit is reached the page will be returned even if it has fewer than `first`
+	results when paginating forward (`last` when paginating backwards). If there are more
+	transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+	`true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+	transaction that was scanned as opposed to the last (or first) transaction in the page.
+	
+	Requesting the next (or previous) page after this cursor will resume the search, scanning
+	the next `scanLimit` many transactions in the direction of pagination, and so on until all
+	transactions in the scanning range have been visited.
+	
+	By default, the scanning range includes all transactions known to GraphQL, but it can be
+	restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+	`afterCheckpoint` and `atCheckpoint` filters.
 	"""
-	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter): TransactionBlockConnection!
+	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter, scanLimit: Int): TransactionBlockConnection!
 	"""
 	The Base64-encoded BCS serialization of the package's content.
 	"""
 	bcs: Base64
 	"""
+	Fetch another version of this package (the package that shares this package's original ID,
+	but has the specified `version`).
+	"""
+	packageAtVersion(version: Int!): MovePackage
+	"""
+	Fetch all versions of this package (packages that share this package's original ID),
+	optionally bounding the versions exclusively from below with `afterVersion`, or from above
+	with `beforeVersion`.
+	"""
+	packageVersions(first: Int, after: String, last: Int, before: String, filter: MovePackageVersionFilter): MovePackageConnection!
+	"""
+	Fetch the latest version of this package (the package with the highest `version` that shares
+	this packages's original ID)
+	"""
+	latestPackage: MovePackage!
+	"""
 	A representation of the module called `name` in this package, including the
 	structs and functions it defines.
 	"""
@@ -2191,6 +2338,22 @@ type MovePackage implements IObject & IOwner {
 	moduleBcs: Base64
 }
 
+"""
+Filter for paginating `MovePackage`s that were created within a range of checkpoints.
+"""
+input MovePackageCheckpointFilter {
+	"""
+	Fetch packages that were published strictly after this checkpoint. Omitting this fetches
+	packages published since genesis.
+	"""
+	afterCheckpoint: UInt53
+	"""
+	Fetch packages that were published strictly before this checkpoint. Omitting this fetches
+	packages published up to the latest checkpoint (inclusive).
+	"""
+	beforeCheckpoint: UInt53
+}
+
 type MovePackageConnection {
 	"""
 	Information to aid in pagination.
@@ -2220,6 +2383,22 @@ type MovePackageEdge {
 	cursor: String!
 }
 
+"""
+Filter for paginating versions of a given `MovePackage`.
+"""
+input MovePackageVersionFilter {
+	"""
+	Fetch versions of this package that are strictly newer than this version. Omitting this
+	fetches versions since the original version.
+	"""
+	afterVersion: UInt53
+	"""
+	Fetch versions of this package that are strictly older than this version. Omitting this
+	fetches versions up to the latest version (inclusive).
+	"""
+	beforeVersion: UInt53
+}
+
 """
 Description of a struct type, defined in a Move module.
 """
@@ -2492,8 +2671,27 @@ type Object implements IObject & IOwner {
 	storageRebate: BigInt
 	"""
 	The transaction blocks that sent objects to this object.
+	
+	`scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+	results. It is required for queries that apply more than two complex filters (on function,
+	kind, sender, recipient, input object, changed object, or ids), and can be at most
+	`serviceConfig.maxScanLimit`.
+	
+	When the scan limit is reached the page will be returned even if it has fewer than `first`
+	results when paginating forward (`last` when paginating backwards). If there are more
+	transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+	`true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+	transaction that was scanned as opposed to the last (or first) transaction in the page.
+	
+	Requesting the next (or previous) page after this cursor will resume the search, scanning
+	the next `scanLimit` many transactions in the direction of pagination, and so on until all
+	transactions in the scanning range have been visited.
+	
+	By default, the scanning range includes all transactions known to GraphQL, but it can be
+	restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+	`afterCheckpoint` and `atCheckpoint` filters.
 	"""
-	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter): TransactionBlockConnection!
+	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter, scanLimit: Int): TransactionBlockConnection!
 	"""
 	The Base64-encoded BCS serialization of the object's content.
 	"""
@@ -3033,13 +3231,33 @@ type Query {
 	state at the latest checkpoint known to the GraphQL RPC. Similarly, `Owner.asObject` will
 	return the object's version at the latest checkpoint.
 	"""
-	owner(address: SuiAddress!, rootVersion: Int): Owner
+	owner(address: SuiAddress!, rootVersion: UInt53): Owner
 	"""
 	The object corresponding to the given address at the (optionally) given version.
 	When no version is given, the latest version is returned.
 	"""
 	object(address: SuiAddress!, version: UInt53): Object
 	"""
+	The package corresponding to the given address (at the optionally given version).
+	
+	When no version is given, the package is loaded directly from the address given. Otherwise,
+	the address is translated before loading to point to the package whose original ID matches
+	the package at `address`, but whose version is `version`. For non-system packages, this
+	might result in a different address than `address` because different versions of a package,
+	introduced by upgrades, exist at distinct addresses.
+	
+	Note that this interpretation of `version` is different from a historical object read (the
+	interpretation of `version` for the `object` query).
+	"""
+	package(address: SuiAddress!, version: UInt53): MovePackage
+	"""
+	The latest version of the package at `address`.
+	
+	This corresponds to the package with the highest `version` that shares its original ID with
+	the package at `address`.
+	"""
+	latestPackage(address: SuiAddress!): MovePackage
+	"""
 	Look-up an Account by its SuiAddress.
 	"""
 	address(address: SuiAddress!): Address
@@ -3074,10 +3292,31 @@ type Query {
 	checkpoints(first: Int, after: String, last: Int, before: String): CheckpointConnection!
 	"""
 	The transaction blocks that exist in the network.
+	
+	`scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+	results. It is required for queries that apply more than two complex filters (on function,
+	kind, sender, recipient, input object, changed object, or ids), and can be at most
+	`serviceConfig.maxScanLimit`.
+	
+	When the scan limit is reached the page will be returned even if it has fewer than `first`
+	results when paginating forward (`last` when paginating backwards). If there are more
+	transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+	`true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+	transaction that was scanned as opposed to the last (or first) transaction in the page.
+	
+	Requesting the next (or previous) page after this cursor will resume the search, scanning
+	the next `scanLimit` many transactions in the direction of pagination, and so on until all
+	transactions in the scanning range have been visited.
+	
+	By default, the scanning range includes all transactions known to GraphQL, but it can be
+	restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+	`afterCheckpoint` and `atCheckpoint` filters.
 	"""
-	transactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter): TransactionBlockConnection!
+	transactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter, scanLimit: Int): TransactionBlockConnection!
 	"""
-	The events that exist in the network.
+	Query events that are emitted in the network.
+	We currently do not support filtering by emitting module and event type
+	at the same time so if both are provided in one filter, the query will error.
 	"""
 	events(first: Int, after: String, last: Int, before: String, filter: EventFilter): EventConnection!
 	"""
@@ -3085,6 +3324,20 @@ type Query {
 	"""
 	objects(first: Int, after: String, last: Int, before: String, filter: ObjectFilter): ObjectConnection!
 	"""
+	The Move packages that exist in the network, optionally filtered to be strictly before
+	`beforeCheckpoint` and/or strictly after `afterCheckpoint`.
+	
+	This query returns all versions of a given user package that appear between the specified
+	checkpoints, but only records the latest versions of system packages.
+	"""
+	packages(first: Int, after: String, last: Int, before: String, filter: MovePackageCheckpointFilter): MovePackageConnection!
+	"""
+	Fetch all versions of package at `address` (packages that share this package's original ID),
+	optionally bounding the versions exclusively from below with `afterVersion`, or from above
+	with `beforeVersion`.
+	"""
+	packageVersions(first: Int, after: String, last: Int, before: String, address: SuiAddress!, filter: MovePackageVersionFilter): MovePackageConnection!
+	"""
 	Fetch the protocol config by protocol version (defaults to the latest protocol
 	version known to the GraphQL service).
 	"""
@@ -3279,6 +3532,14 @@ type ServiceConfig {
 	Maximum nesting allowed in struct fields when calculating the layout of a single Move Type.
 	"""
 	maxMoveValueDepth: Int!
+	"""
+	Maximum number of transaction ids that can be passed to a `TransactionBlockFilter`.
+	"""
+	maxTransactionIds: Int!
+	"""
+	Maximum number of candidates to scan when gathering a page of results.
+	"""
+	maxScanLimit: Int!
 }
 
 """
@@ -3496,8 +3757,27 @@ type StakedSui implements IMoveObject & IObject & IOwner {
 	storageRebate: BigInt
 	"""
 	The transaction blocks that sent objects to this object.
+	
+	`scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+	results. It is required for queries that apply more than two complex filters (on function,
+	kind, sender, recipient, input object, changed object, or ids), and can be at most
+	`serviceConfig.maxScanLimit`.
+	
+	When the scan limit is reached the page will be returned even if it has fewer than `first`
+	results when paginating forward (`last` when paginating backwards). If there are more
+	transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+	`true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+	transaction that was scanned as opposed to the last (or first) transaction in the page.
+	
+	Requesting the next (or previous) page after this cursor will resume the search, scanning
+	the next `scanLimit` many transactions in the direction of pagination, and so on until all
+	transactions in the scanning range have been visited.
+	
+	By default, the scanning range includes all transactions known to GraphQL, but it can be
+	restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+	`afterCheckpoint` and `atCheckpoint` filters.
 	"""
-	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter): TransactionBlockConnection!
+	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter, scanLimit: Int): TransactionBlockConnection!
 	"""
 	The Base64-encoded BCS serialization of the object's content.
 	"""
@@ -3698,8 +3978,27 @@ type SuinsRegistration implements IMoveObject & IObject & IOwner {
 	storageRebate: BigInt
 	"""
 	The transaction blocks that sent objects to this object.
+	
+	`scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+	results. It is required for queries that apply more than two complex filters (on function,
+	kind, sender, recipient, input object, changed object, or ids), and can be at most
+	`serviceConfig.maxScanLimit`.
+	
+	When the scan limit is reached the page will be returned even if it has fewer than `first`
+	results when paginating forward (`last` when paginating backwards). If there are more
+	transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+	`true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+	transaction that was scanned as opposed to the last (or first) transaction in the page.
+	
+	Requesting the next (or previous) page after this cursor will resume the search, scanning
+	the next `scanLimit` many transactions in the direction of pagination, and so on until all
+	transactions in the scanning range have been visited.
+	
+	By default, the scanning range includes all transactions known to GraphQL, but it can be
+	restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+	`afterCheckpoint` and `atCheckpoint` filters.
 	"""
-	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter): TransactionBlockConnection!
+	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter, scanLimit: Int): TransactionBlockConnection!
 	"""
 	The Base64-encoded BCS serialization of the object's content.
 	"""
@@ -4402,6 +4701,8 @@ type ZkLoginVerifyResult {
 	errors: [String!]!
 }
 
+directive @include(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
+directive @skip(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
 schema {
 	query: Query
 	mutation: Mutation
diff --git a/crates/sui-graphql-rpc/schema/draft_target_schema.graphql b/crates/sui-graphql-rpc/schema/draft_target_schema.graphql
deleted file mode 100644
index 733f13eb57bf7..0000000000000
--- a/crates/sui-graphql-rpc/schema/draft_target_schema.graphql
+++ /dev/null
@@ -1,1588 +0,0 @@
-# Copyright (c) Mysten Labs, Inc.
-# SPDX-License-Identifier: Apache-2.0
-
-# GraphQL Schema Draft
-# --------------------
-#
-# This is a draft design of the schema used by the second iteration of
-# the RPC service.  Note that some elements may not be complete, and
-# others may exist in this schema but may not appear in the production
-# design initially, or ever.
-#
-# The source of truth for the actual schema is accessed by querying
-# the GraphQL server for its `__schema`.
-
-schema {
-  query: Query
-  subscription: Subscription
-  mutation: Mutation
-}
-
-type Query {
-  # First four bytes of the network's genesis checkpoint digest
-  # (uniquely identifies the network)
-  chainIdentifier: String!
-
-  # Range of checkpoints that the RPC has data available for (for data
-  # that can be tied to a particular checkpoint).
-  availableRange: AvailableRange!
-
-  # Configuration for this RPC service
-  serviceConfig: ServiceConfig!
-
-  # Simulate running a transaction to inspect its effects without
-  # committing to them on-chain.
-  #
-  # `txBytes` either a `TransactionData` struct or a `TransactionKind`
-  #     struct, BCS-encoded and then Base64-encoded.  The expected
-  #     type is controlled by the presence or absence of `txMeta`: If
-  #     present, `txBytes` is assumed to be a `TransactionKind`, if
-  #     absent, then `TransactionData`.
-  #
-  # `txMeta` the data that is missing from a `TransactionKind` to make
-  #     a `TransactionData` (sender address and gas information).  All
-  #     its fields are nullable: `sender` defaults to `0x0`, if
-  #     `gasObjects` is not present, or is an empty list, it is
-  #     substituted with a mock Coin object, and `gasPrice` defaults to
-  #     the reference gas price.
-  #
-  # `skipChecks` optional flag to disable the usual verification
-  #     checks that prevent access to objects that are owned by
-  #     addresses other than the sender, and calling non-public,
-  #     non-entry functions.  Defaults to false.
-  dryRunTransactionBlock(
-    txBytes: Base64!,
-    txMeta: TransactionMetadata,
-    skipChecks: Boolean,
-  ): DryRunResult
-
-  owner(address: SuiAddress!): Owner
-  object(address: SuiAddress!, version: Int): Object
-  address(address: SuiAddress!): Address
-  type(type: String!): MoveType!
-
-  # Fetch epoch information by ID (defaults to the latest epoch).
-  epoch(id: Int): Epoch
-
-  # `protocolVersion` defaults to the latest protocol version.
-  protocolConfig(protocolVersion: Int): ProtocolConfigs
-
-  # Fetch checkpoint information by sequence number or digest
-  # (defaults to the latest available checkpoint).
-  checkpoint(id: CheckpointId): Checkpoint
-
-  # Fetch a transaction block by its transaction digest
-  transactionBlock(digest: String!): TransactionBlock
-
-  coinMetadata(coinType: String!): CoinMetadata
-
-  checkpoints(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-  ): CheckpointConnection!
-
-  coins(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-    type: String,
-  ): CoinConnection!
-
-  transactionBlocks(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-    filter: TransactionBlockFilter,
-  ): TransactionBlockConnection!
-
-  events(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-    filter: EventFilter,
-  ): EventConnection!
-
-  objects(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-    filter: ObjectFilter,
-  ): ObjectConnection!
-
-  resolveSuinsAddress(name: String!): Address
-
-  # NB. Will be moved into a private, explorer-specific extension.
-  networkMetrics: NetworkMetrics
-  moveCallMetrics: MoveCallMetrics
-
-  allEpochAddressMetrics(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-  ): AddressMetricsConnection!
-}
-
-# NB. Add after MVP has stabilised.
-#
-# Subscriptions use a "push-pull" system: Subscribers are notified
-# when there is new data by being sent the cursor pointing after that
-# new data.  To actually fetch the data, a call must be made to the
-# equivalent Connection API:
-#
-# e.g. When subscription `subscribe { events(filter: F) }` pushes
-# cursor `E`.  Then
-#
-#     query { events(before: E, filter: F) }
-#
-# Will start paginating events up to the new data (multiple calls may
-# be required if there are multiple pages of information between the
-# start and the latest).  If the client has already processed some
-# prefix, up to cursor `P`, then they can resume with:
-#
-#    query { events(after: P, before: E, filter: F) }
-#
-# The API for transactions is similar.
-type Subscription {
-  events(filter: EventFilter): String!
-  transactions(filter: TransactionBlockFilter): String!
-}
-
-type Mutation {
-  # Execute a transaction, committing its effects on chain.
-  #
-  # `txBytes` is a `TransactionData` struct that has been BCS-encoded
-  #     and then Base64-encoded.
-  # `signatures` are a list of `flag || signature || pubkey` bytes,
-  #     Base64-encoded.
-  #
-  # Waits until the transaction has been finalized on chain to return
-  # its transaction digest.  If the transaction could not be
-  # finalized, returns the errors that prevented it, instead.
-  executeTransactionBlock(
-    txBytes: Base64!,
-    signatures: [Base64!]!,
-  ): ExecutionResult
-}
-
-# String containing 32B hex-encoded address, with a leading "0x".
-# Leading zeroes can be omitted on input but will always appear in
-# outputs (SuiAddress in output is guaranteed to be 66 characters
-# long).
-scalar SuiAddress
-
-# String representation of an arbitrary width, possibly signed integer
-scalar BigInt
-
-# String containing Base64-encoded binary data.
-scalar Base64
-
-# ISO-8601 Date and Time
-scalar DateTime
-
-# Arbitrary JSON data
-scalar JSON
-
-# Scalar representing the contents of a Move Value, corresponding to
-# the following recursive type:
-#
-# type MoveData =
-#     { Number:  BigInt }
-#   | { Bool:    bool }
-#   | { Address: SuiAddress }
-#   | { UID:     SuiAddress }
-#   | { ID:      SuiAddress }
-#   | { String:  string }
-#   | { Vector:  [MoveData] }
-#   | { Option:   MoveData? }
-#   | { Struct:  [{ name: string, value: MoveData }] }
-scalar MoveData
-
-# The signature of a concrete Move Type (a type with all its type
-# parameters instantiated with concrete types, that contains no
-# references), corresponding to the following recursive type:
-#
-# type MoveTypeSignature =
-#     "address"
-#   | "bool"
-#   | "u8" | "u16" | ... | "u256"
-#   | { vector: MoveTypeSignature }
-#   | {
-#       struct: {
-#         package: string,
-#         module: string,
-#         type: string,
-#         typeParameters: [MoveTypeSignature],
-#       }
-#     }
-scalar MoveTypeSignature
-
-# The shape of a concrete Move Type (a type with all its type
-# parameters instantiated with concrete types), corresponding to the
-# following recursive type:
-#
-# type MoveTypeLayout =
-#     "address"
-#   | "bool"
-#   | "u8" | "u16" | ... | "u256"
-#   | { vector: MoveTypeLayout }
-#   | {
-#       struct: {
-#         type: string,
-#         fields: [{ name: string, layout: MoveTypeLayout }],
-#       }
-#     }
-scalar MoveTypeLayout
-
-# The shape of an abstract Move Type (a type that can contain free
-# type parameters, and can optionally be taken by reference),
-# corresponding to the following recursive type:
-#
-# type OpenMoveTypeSignature = {
-#   ref: ("&" | "&mut")?,
-#   body: OpenMoveTypeSignatureBody,
-# }
-#
-# type OpenMoveTypeSignatureBody =
-#     "address"
-#   | "bool"
-#   | "u8" | "u16" | ... | "u256"
-#   | { vector: OpenMoveTypeSignatureBody }
-#   | {
-#       struct: {
-#         package: string,
-#         module: string,
-#         type: string,
-#         typeParameters: [OpenMoveTypeSignatureBody]?
-#       }
-#     }
-#   | { typeParameter: number }
-scalar OpenMoveTypeSignature
-
-# The extra data required to turn a `TransactionKind` into a
-# `TransactionData` in a dry-run.
-input TransactionMetadata {
-  sender: SuiAddress
-  gasPrice: Int
-  gasBudget: Int
-  gasObjects: [ObjectRef!]
-  gasSponsor: SuiAddress
-}
-
-# A reference to a particular version of an object.
-input ObjectRef {
-  address: SuiAddress!
-  version: Int!
-  digest: String!
-}
-
-# Filter either by the digest, or the sequence number, or neither, to
-# get the latest checkpoint.
-input CheckpointId {
-  digest: String
-  sequenceNumber: Int
-}
-
-input ObjectFilter {
-  # This field is used to specify the type of objects that should be
-  # include in the query results.
-  #
-  # Objects can be filtered by their type's package, package::module,
-  # or their fully qualified type name.
-  #
-  # Generic types can be queried by either the generic type name, e.g.
-  # `0x2::coin::Coin`, or by the full type name, such as
-  # `0x2::coin::Coin<0x2::sui::SUI>`.
-  type: String
-
-  # Filter for live objects by their current owners.
-  owner: SuiAddress
-
-  # Filter for live objects by their IDs.
-  objectIds: [SuiAddress!]
-
-  # Filter for live or potentially historical objects by their ID and version.
-  objectKeys: [ObjectKey!]
-
-  # Enhancement (post-MVP), compound filters.  Compound filters are
-  # exclusive (must be the only filter set if they are used).
-  any: [ObjectFilter]
-  all: [ObjectFilter]
-  not: ObjectFilter
-}
-
-input ObjectKey {
-  objectId: SuiAddress!
-  version: Int!
-}
-
-input EventFilter {
-  sender: SuiAddress
-  transactionDigest: String
-  # Enhancement (post-MVP), requires compound filters to be useful.
-  afterCheckpoint: Int
-  beforeCheckpoint: Int
-
-  # Events emitted by a particular module. An event is emitted by a
-  # particular module if some function in the module is called by a
-  # PTB and emits an event.
-  #
-  # Modules can be filtered by their package, or package::module.
-  emittingModule: String
-
-  # This field is used to specify the type of event emitted.
-  #
-  # Events can be filtered by their type's package, package::module,
-  # or their fully qualified type name.
-  #
-  # Generic types can be queried by either the generic type name, e.g.
-  # `0x2::coin::Coin`, or by the full type name, such as
-  # `0x2::coin::Coin<0x2::sui::SUI>`.
-  eventType: String
-
-  # Enhancement (post-MVP), requires compound filters to be useful.
-  startTime: DateTime
-  endTime: DateTime
-
-  # Enhancement (post-MVP), compound filters.  Compound filters are
-  # exclusive (must be the only filter set if they are used).
-  any: [EventFilter]
-  all: [EventFilter]
-  not: EventFilter
-}
-
-input TransactionBlockFilter {
-  # Filter by the function called. Limited to an individual package,
-  # package::module, or package::module::function.
-  function: String
-
-  kind: TransactionBlockKindInput
-  afterCheckpoint: Int
-  beforeCheckpoint: Int
-
-  signAddress: SuiAddress
-  sentAddress: SuiAddress
-  recvAddress: SuiAddress
-  paidAddress: SuiAddress
-
-  inputObject: SuiAddress
-  changedObject: SuiAddress
-
-  transactionIDs: [String!]
-
-  # Enhancement (post-MVP), consistency with EventFilter -- timestamp
-  # comes from checkpoint timestamp.
-  startTime: DateTime
-  endTime: DateTime
-
-  # Enhancement (post-MVP), compound filters.  Compound filters are
-  # exclusive (must be the only filter set if they are used).
-  any: [TransactionBlockFilter]
-  all: [TransactionBlockFilter]
-  not: TransactionBlockFilter
-}
-
-input DynamicFieldFilter {
-  # Filter the type of dynamic field name.
-  #
-  # Names can be filtered by their type's package, package::module, or
-  # their fully qualified type name.
-  #
-  # Generic types can be queried by either the generic type name, e.g.
-  # `0x2::coin::Coin`, or by the full type name, such as
-  # `0x2::coin::Coin<0x2::sui::SUI>`.
-  nameType: String
-
-  # Filter the type of dynamic field value.
-  #
-  # Values can be filtered by their type's package, package::module,
-  # or their fully qualified type name.
-  #
-  # Generic types can be queried by either the generic type name, e.g.
-  # `0x2::coin::Coin`, or by the full type name, such as
-  # `0x2::coin::Coin<0x2::sui::SUI>`.
-  valueType: String
-}
-
-type AvailableRange {
-  first: Checkpoint
-  last: Checkpoint
-}
-
-type ServiceConfig {
-  availableVersions: [String!]
-  enabledFeatures: [Feature!]
-  isEnabled(feature: Feature!): Boolean!
-
-  maxQueryDepth: Int!
-  maxQueryNodes: Int!
-  maxOutputNodes: Int!
-  defaultPageSize: Int!
-  maxPageSize: Int!
-  requestTimeoutMs: Int!
-  maxQueryPayloadSize: Int!
-}
-
-enum Feature {
-  ANALYTICS
-  COINS
-  DYNAMIC_FIELDS
-  NAME_SERVICE
-  SUBSCRIPTIONS
-  SYSTEM_STATE
-}
-
-interface IOwner {
-  address: SuiAddress!
-
-  objects(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-    # Enhancement (post-MVP) relies on compound filters.
-    filter: ObjectFilter,
-  ): MoveObjectConnection!
-
-  balance(type: String!): Balance
-  balances(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-  ): BalanceConnection!
-
-  # `type` defaults to `0x2::sui::SUI`.
-  coins(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-    type: String,
-  ): CoinConnection!
-
-  stakedSuis(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-  ): StakedSuiConnection!
-
-  dynamicField(dynamicFieldName: DynamicFieldName!): DynamicField
-  dynamicObjectField(dynamicFieldName: DynamicFieldName!): DynamicField
-  dynamicFields(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-    # Enhancement (post-MVP) to filter dynamic fields by type.
-    filter: DynamicFieldFilter,
-  ): DynamicFieldConnection!
-
-  defaultSuinsName: String
-  suinsRegistrations(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-  ): SuinsRegistrationConnection!
-}
-
-union ObjectOwner = Immutable | Shared | Parent | AddressOwner
-
-type Immutable {
-  # Dummy field
-  _: Boolean
-}
-
-type Shared {
-  initialSharedVersion: Int!
-}
-
-type Parent {
-  # Child objects are an implementation-detail of dynamic fields. Only
-  # another object can be a parent of a child object (not an address).
-  parent: Object
-}
-
-type AddressOwner {
-  # The address that owns an object could be an Address, or an Object.
-  owner: Owner
-}
-
-interface IObject {
-  version: Int!
-  digest: String!
-  owner: ObjectOwner
-
-  previousTransactionBlock: TransactionBlock
-  storageRebate: BigInt
-
-  display: [DisplayEntry!]
-
-  # Transaction Blocks that sent objects to this object
-  receivedTransactionBlocks(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-    # Enhancement (post-MVP) relies on compound filters.
-    filter: TransactionBlockFilter,
-  ): TransactionBlockConnection!
-
-  bcs: Base64
-}
-
-interface IMoveObject {
-  contents: MoveValue
-}
-
-# Returned by Object.owner, where we can't disambiguate between
-# Address and Object.
-type Owner implements IOwner {
-  asAddress: Address
-  asObject: Object
-}
-
-type Address implements IOwner {
-  transactionBlocks(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-    relation: AddressTransactionBlockRelationship,
-    # Enhancement (post-MVP) relies on compound filters.
-    filter: TransactionBlockFilter,
-  ): TransactionBlockConnection!
-}
-
-enum AddressTransactionBlockRelationship {
-  SIGN # Transactions this address has signed
-  SENT # Transactions that transferred objects from this address
-  RECV # Transactions that received objects into this address
-  PAID # Transactions that were paid for by this address
-}
-
-type Object implements IOwner & IObject {
-  asMoveObject: MoveObject
-  asMovePackage: MovePackage
-}
-
-type DisplayEntry {
-  key: String!
-  value: String
-  error: String
-}
-
-type Epoch {
-  epochId: Int!
-  protocolConfigs: ProtocolConfigs
-  referenceGasPrice: BigInt
-  validatorSet: ValidatorSet
-
-  startTimestamp: DateTime!
-  endTimestamp: DateTime
-
-  totalCheckpoints: BigInt
-  totalGasFees: BigInt
-  totalStakeRewards: BigInt
-  totalStakeSubsidies: BigInt
-  fundSize: BigInt
-  netInflow: BigInt
-  fundInflow: BigInt
-  fundOutflow: BigInt
-
-  # SystemState fields
-  storageFund: StorageFund
-  safeMode: SafeMode
-  systemStateVersion: BigInt
-  systemParameters: SystemParameters
-  systemStakeSubsidy: StakeSubsidy
-
-  checkpoints(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-  ): CheckpointConnection!
-
-  transactionBlocks(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-    # Enhancement (post-MVP) relies on compound filters.
-    filter: TransactionBlockFilter,
-  ): TransactionBlockConnection!
-}
-
-type ProtocolConfigs {
-  protocolVersion: Int!
-  featureFlags: [ProtocolConfigFeatureFlag!]!
-  configs: [ProtocolConfigAttr!]!
-  config(key: String!): ProtocolConfigAttr
-  featureFlag(key: String!): ProtocolConfigFeatureFlag
-}
-
-type ProtocolConfigAttr {
-  key: String!
-  value: String!
-}
-
-type ProtocolConfigFeatureFlag {
-  key: String!
-  value: Boolean!
-}
-
-type SystemParameters {
-  durationMs: BigInt
-  stakeSubsidyStartEpoch: Int
-
-  minValidatorCount: Int
-  maxValidatorCount: Int
-
-  minValidatorJoiningStake: BigInt
-  validatorLowStakeThreshold: BigInt
-  validatorVeryLowStakeThreshold: BigInt
-  validatorLowStakeGracePeriod: Int
-}
-
-type StakeSubsidy {
-  balance: BigInt
-  distributionCounter: Int
-  currentDistributionAmount: BigInt
-  periodLength: Int
-  decreaseRate: Int
-}
-
-type ValidatorSet {
-  totalStake: BigInt
-
-  activeValidators(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String
-  ): ValidatorConnection!
-
-  # Indices into `activeValidators`
-  pendingRemovals: [Int]
-
-  pendingActiveValidators: MoveObject
-  pendingActiveValidatorsSize: Int
-
-  stakePoolMappings: MoveObject
-  stakePoolMappingsSize: Int
-
-  inactivePools: MoveObject
-  inactivePoolsSize: Int
-
-  validatorCandidates: MoveObject
-  validatorCandidatesSize: Int
-}
-
-type Validator {
-  address: Address!
-
-  credentials: ValidatorCredentials
-  nextEpochCredentials: ValidatorCredentials
-
-  name: String
-  description: String
-  imageUrl: String
-  projectUrl: String
-
-  operationCap: MoveObject
-  stakingPool: MoveObject
-
-  exchangeRates: MoveObject
-  exchangeRatesSize: Int
-
-  stakingPoolActivationEpoch: Int
-  stakingPoolSuiBalance: BigInt
-  rewardsPool: BigInt
-  poolTokenBalance: BigInt
-  pendingStake: BigInt
-  pendingTotalSuiWithdraw: BigInt
-  pendingPoolTokenWithdraw: BigInt
-
-  votingPower: Int
-  stakeUnits: Int
-  gasPrice: BigInt
-  commissionRate: Int
-  nextEpochStake: BigInt
-  nextEpochGasPrice: BigInt
-  nextEpochCommissionRate: Int
-
-  # The number of epochs for which this validator has been below the
-  # low stake threshold.
-  atRisk: Int
-
-  # The other validators this validator has reported
-  reportRecords: [SuiAddress!]
-
-  apy: Int
-}
-
-type ValidatorCredentials {
-  protocolPubKey: Base64
-  networkPubKey: Base64
-  workerPubKey: Base64
-  proofOfPossession: Base64
-
-  netAddress: String
-  p2pAddreess: String
-  primaryAddress: String
-  workerAddress: String
-}
-
-type StorageFund {
-  totalObjectStorageRebates: BigInt
-  nonRefundableBalance: BigInt
-}
-
-type SafeMode {
-  enabled: Boolean
-  gasSummary: GasCostSummary
-}
-
-type Checkpoint {
-  digest: String!
-  sequenceNumber: Int!
-
-  timestamp: DateTime!
-  validatorSignatures: Base64
-
-  # Commitments
-  previousCheckpointDigest: String
-  liveObjectSetDigest: String
-
-  networkTotalTransactions: Int
-  rollingGasSummary: GasCostSummary
-
-  epoch: Epoch
-
-  transactionBlocks(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-    # Enhancement (post-MVP) relies on compound filters.
-    filter: TransactionBlockFilter,
-  ): TransactionBlockConnection!
-
-  # NB. Will be moved into a private, explorer-specific extension.
-  addressMetrics: AddressMetrics
-}
-
-type TransactionBlock {
-  digest: String
-
-  sender: Address
-  gasInput: GasInput
-  kind: TransactionBlockKind
-  signatures: [Base64!]
-  effects: TransactionBlockEffects
-
-  expiration: Epoch
-
-  bcs: Base64
-}
-
-enum TransactionBlockKindInput {
-  PROGRAMMABLE_TX
-  SYSTEM_TX
-}
-
-union TransactionBlockKind =
-    ConsensusCommitPrologueTransaction
-  | GenesisTransaction
-  | ChangeEpochTransaction
-  | ProgrammableTransactionBlock
-  | AuthenticatorStateUpdateTransaction
-  | RandomnessStateUpdateTransaction
-  | EndOfEpochTransaction
-
-type ConsensusCommitPrologueTransaction {
-  epoch: Epoch!
-  round: Int!
-  commitTimestamp: DateTime!
-  consensusCommitDigest: String
-}
-
-type GenesisTransaction {
-  objects(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-  ): ObjectConnection!
-}
-
-type ChangeEpochTransaction {
-  epoch: Epoch
-  protocolVersion: Int!
-  startTimestamp: DateTime!
-
-  storageCharge: BigInt!
-  computationCharge: BigInt!
-  storageRebate: BigInt!
-  nonRefundableStorageFee: BigInt!
-
-  systemPackages(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-  ): MovePackageConnection!
-}
-
-type ProgrammableTransactionBlock {
-  inputs(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-  ): TransactionInputConnection!
-
-  transactions(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-  ): ProgrammableTransactionConnection!
-}
-
-union TransactionInput = OwnedOrImmutable | SharedInput | Receiving | Pure
-
-type OwnedOrImmutable {
-  address: SuiAddress!
-  version: Int!
-  digest: String!
-  object: Object
-}
-
-type SharedInput {
-  address: SuiAddress!
-  initialSharedVersion: Int!
-  mutable: Boolean!
-}
-
-type Receiving {
-  address: SuiAddress!
-  version: Int!
-  digest: String!
-  object: Object
-}
-
-type Pure {
-  bytes: Base64!
-}
-
-union TransactionArgument = GasCoin | Input | Result
-
-type GasCoin { _: Boolean }
-type Input   { ix: Int! }
-type Result  { cmd: Int!, ix: Int }
-
-union ProgrammableTransaction =
-    MoveCallTransaction
-  | TransferObjectsTransaction
-  | SplitCoinTransaction
-  | MergeCoinsTransaction
-  | PublishTransaction
-  | UpgradeTransaction
-  | MakeMoveVecTransaction
-
-type MoveCallTransaction {
-  package: SuiAddress!
-  module: String!
-  functionName: String!
-  function: MoveFunction
-  typeArguments: [MoveType!]!
-  arguments: [TransactionArgument!]!
-}
-
-type TransferObjectsTransaction {
-  objects: [TransactionArgument!]!
-  address: TransactionArgument!
-}
-
-type SplitCoinsTransaction {
-  coin: TransactionArgument!
-  amounts: [TransactionArgument!]!
-}
-
-type MergeCoinsTransaction {
-  coin: TransactionArgument!
-  coins: [TransactionArgument!]!
-}
-
-type PublishTransaction {
-  modules: [Base64!]!
-  dependencies: [SuiAddress!]!
-}
-
-type UpgradeTransaction {
-  modules: [Base64!]!
-  dependencies: [SuiAddress!]!
-  currentPackage: SuiAddress!
-  upgradeTicket: TransactionArgument!
-}
-
-type MakeMoveVecTransaction {
-  type: MoveType
-  elements: [TransactionArgument!]!
-}
-
-type TransactionBlockEffects {
-  transactionBlock: TransactionBlock!
-  status: ExecutionStatus
-
-  errors: String
-  dependencies(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-  ): TransactionBlockConnection!
-
-  lamportVersion: Int
-  gasEffects: GasEffects
-
-  unchangedSharedObjects(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-  ): UnchangedSharedObjectConnection!
-
-  objectChanges(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-  ): ObjectChangeConnection!
-
-  balanceChanges(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-  ): BalanceChangeConnection!
-
-  timestamp: DateTime
-  epoch: Epoch
-  checkpoint: Checkpoint
-
-  events(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-    # Extension (post-MVP) relies on compound filters
-    filter: EventFilter,
-  ): EventConnection!
-
-  bcs: Base64
-}
-
-enum ExecutionStatus {
-  SUCCESS
-  FAILURE
-}
-
-type GasInput {
-  gasSponsor: Address
-  gasPayment(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-  ): ObjectConnection!
-
-  gasPrice: BigInt
-  gasBudget: BigInt
-}
-
-type GasEffects {
-  gasObject: Coin
-  gasSummary: GasCostSummary
-}
-
-type GasCostSummary {
-  computationCost: BigInt
-  storageCost: BigInt
-  storageRebate: BigInt
-  nonRefundableStorageFee: BigInt
-}
-
-union UnchangedSharedObject = SharedObjectRead | SharedObjectDelete
-
-type SharedObjectRead {
-  address: SuiAddress!
-  version: u64!
-  digest: String!
-  object: Object
-}
-
-type SharedObjectDelete {
-  address: SuiAddress!
-  version: u64!
-
-  # Whether this transaction intended to use this shared object
-  # mutably or not.
-  mutable: Boolean!
-}
-
-type ObjectChange {
-  address: SuiAddress!
-
-  inputState: Object
-  outputState: Object
-
-  idCreated: Boolean
-  idDeleted: Boolean
-}
-
-type BalanceChange {
-  owner: Owner
-  coinType: MoveType
-  amount: BigInt
-}
-
-type Event {
-  # Module that the event was emitted by
-  sendingModule: MoveModule
-
-  sender: Address
-  timestamp: DateTime
-
-  type: MoveType!
-  bcs: Base64!
-  data: MoveData!
-  json: JSON!
-}
-
-type Balance {
-  coinType: MoveType
-  coinObjectCount: Int
-  totalBalance: BigInt
-}
-
-type Coin implements IOwner & IObject {
-  coinBalance: BigInt
-}
-
-type StakedSui implements IOwner & IObject {
-  stakeStatus: StakeStatus!
-  requestEpoch: Epoch
-  activeEpoch: Epoch
-  principal: BigInt
-
-  # Only available if status is `ACTIVE`.
-  estimatedReward: BigInt
-}
-
-enum StakeStatus {
-  PENDING
-  ACTIVE
-  UNSTAKED
-}
-
-type CoinMetadata implements IOwner & IObject {
-  decimals: Int
-  name: String
-  symbol: String
-  description: String
-  iconUrl: String
-  supply: BigInt
-}
-
-input DynamicFieldName {
-  type: String!
-  bcs: Base64!
-}
-
-type DynamicField {
-  name: MoveValue
-  value: DynamicFieldValue
-}
-
-union DynamicFieldValue = MoveObject | MoveValue
-
-type MoveObject implements IOwner & IObject & IMoveObject {
-  asCoin: Coin
-  asStakedSui: StakedSui
-  asCoinMetadata: CoinMetadata
-  asSuinsRegistration: SuinsRegistration
-}
-
-type MovePackage implements IOwner & IObject {
-  module(name: String!): MoveModule
-  modules(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-  ): MoveModuleConnection!
-
-  linkage: [Linkage!]
-  typeOrigins: [TypeOrigin!]
-
-  moduleBcs: Base64
-}
-
-type Linkage {
-  originalId: SuiAddress!
-  upgradedId: SuiAddress!
-  version: Int!
-}
-
-type TypeOrigin {
-  module: String!
-  struct: String!
-  definingId: SuiAddress!
-}
-
-enum MoveAbility {
-  COPY
-  DROP
-  STORE
-  KEY
-}
-
-enum MoveVisibility {
-  PUBLIC
-  PRIVATE
-  FRIEND
-}
-
-type MoveStructTypeParameter {
-  constraints: [MoveAbility!]!
-  isPhantom: Boolean!
-}
-
-type MoveFunctionTypeParameter {
-  constraints: [MoveAbility!]!
-}
-
-type MoveModule {
-  package: SuiAddress!
-  name: String!
-
-  fileFormatVersion: Int!
-
-  friends(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String
-  ): MoveModuleConnection!
-
-  struct(name: String!): MoveStruct
-  structs(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-  ): MoveStructConnection!
-
-  function(name: String!): MoveFunction
-  functions(
-    first: Int,
-    after: String,
-    last: Int,
-    before: String,
-  ): MoveFunctionConnection!
-
-  bytes: Base64
-  disassembly: String
-}
-
-type MoveStruct {
-  module: MoveModule!
-  name: String!
-  abilities: [MoveAbility!]
-  typeParameters: [MoveStructTypeParameter!]
-  fields: [MoveField!]
-}
-
-type MoveField {
-  name: String!
-  type: OpenMoveType
-}
-
-type MoveFunction {
-  module: MoveModule!
-  name: String!
-
-  visibility: MoveVisibility
-  isEntry: Boolean
-
-  typeParameters: [MoveFunctionTypeParameter!]
-  parameters: [OpenMoveType!]
-  return: [OpenMoveType!]
-}
-
-type MoveValue {
-  type: MoveType!
-  data: MoveData!
-  json: JSON!
-
-  bcs: Base64!
-}
-
-# Represents concrete types (no type parameters, no references)
-type MoveType {
-  # Flat representation of the type signature, as a displayable string.
-  repr: String!
-  # Structured representation of the type signature.
-  signature: MoveTypeSignature!
-  # Structured representation of the "shape" of values that match this type.
-  layout: MoveTypeLayout!
-  # The abilities this concrete type has.
-  abilities: [MoveAbility!]!
-}
-
-# Represents types that could contain references or free type
-# parameters.  Such types can appear as function parameters, or fields
-# in structs.
-type OpenMoveType {
-  # Flat representation of the type signature, as a displayable string.
-  repr: String!
-  # Structured representation of the type signature.
-  signature: OpenMoveTypeSignature!
-}
-
-# Metrics (omitted for brevity)
-type NetworkMetrics
-type MoveCallMetrics
-type AddressMetrics
-
-# Execution
-
-# Either TransactionBlockEffects on success, or error on failure.
-type ExecutionResult {
-  effects: TransactionBlockEffects
-  errors: [String!]
-}
-
-type DryRunResult {
-  transaction: TransactionBlock
-  error: String
-  results: [DryRunEffect!]
-}
-
-type DryRunEffect {
-  # Changes made to arguments that were mutably borrowed by this
-  # transaction
-  mutatedReferences: [DryRunMutation!]
-
-  # Results of this transaction
-  returnValues: [DryRunReturn!]
-}
-
-type DryRunMutation {
-  input: TransactionArgument
-  type: MoveType
-  bcs: Base64
-}
-
-type DryRunReturn {
-  type: MoveType
-  bcs: Base64
-}
-
-# Connections
-
-# Pagination
-type PageInfo {
-    hasNextPage: Boolean!
-    hasPreviousPage: Boolean!
-    startCursor: String
-    endCursor: String
-}
-
-# Checkpoints
-type CheckpointConnection {
-  edges: [CheckpointEdge!]!
-  nodes: [Checkpoint!]!
-  pageInfo: PageInfo!
-}
-
-type CheckpointEdge {
-  cursor: String
-  node: Checkpoint!
-}
-
-# Balance
-type BalanceConnection {
-  edges: [BalanceEdge!]!
-  nodes: [Balance!]!
-  pageInfo: PageInfo!
-}
-
-type BalanceEdge {
-  cursor: String
-  node: Balance!
-}
-
-# Coin
-type CoinConnection {
-  edges: [CoinEdge!]!
-  nodes: [Coin!]!
-  pageInfo: PageInfo!
-}
-
-type CoinEdge {
-  cursor: String
-  node: Coin!
-}
-
-# DynamicField
-type DynamicFieldConnection {
-  edges: [DynamicFieldEdge!]!
-  nodes: [DynamicField!]!
-  pageInfo: PageInfo!
-}
-
-type DynamicFieldEdge {
-  cursor: String
-  node: DynamicField!
-}
-
-# Object
-type ObjectConnection {
-  edges: [ObjectEdge!]!
-  nodes: [Object!]!
-  pageInfo: PageInfo!
-}
-
-type ObjectEdge {
-  cursor: String
-  node: Object!
-}
-
-# MoveObject
-type MoveObjectConnection {
-  edges: [MoveObjectEdge!]!
-  nodes: [MoveObject!]!
-  pageInfo: PageInfo!
-}
-
-type MoveObjectEdge {
-  cursor: String
-  node: MoveObject!
-}
-
-# MovePackage
-type MovePackageConnection {
-  edges: [MovePackageEdge!]!
-  nodes: [MovePackage!]!
-  pageInfo: PageInfo!
-}
-
-type MovePackageEdge {
-  cursor: String
-  node: MovePackage!
-}
-
-# Event
-type EventConnection {
-  edges: [EventEdge!]!
-  nodes: [Event!]!
-  pageInfo: PageInfo!
-}
-
-type EventEdge {
-  cursor: String
-  node: Event!
-}
-
-# MoveFunction
-type MoveFunctionConnection {
-  edges: [MoveFunctionEdge!]!
-  nodes: [MoveFunction!]!
-  pageInfo: PageInfo!
-}
-
-type MoveFunctionEdge {
-  cursor: String
-  node: MoveFunction!
-}
-
-# MoveModuleConnection
-type MoveModuleConnection {
-  edges: [MoveModuleEdge]
-  nodes: [MoveModule]
-  pageInfo: PageInfo!
-}
-
-type MoveModuleEdge {
-  cursor: String
-  node: MoveModule
-}
-
-# MoveStructConnection
-type MoveStructConnection {
-  edges: [MoveStructEdge!]!
-  nodes: [MoveStruct!]!
-  pageInfo: PageInfo!
-}
-
-type MoveStructEdge {
-  cursor: String
-  node: MoveStruct!
-}
-
-# TransactionBlockConnection
-type TransactionBlockConnection {
-  totalTransactionBlocks: Int
-  edges: [TransactionBlockEdge!]!
-  nodes: [TransactionBlock!]!
-  pageInfo: PageInfo!
-}
-
-type TransactionBlockEdge {
-  cursor: String
-  node: TransactionBlock!
-}
-
-# TransactionInputConnection
-type TransactionInputConnection {
-  edges: [TransactionInputEdge!]!
-  nodes: [TransactionInput!]!
-  pageInfo: PageInfo!
-}
-
-type TransactionInputEdge {
-  cursor: String
-  node: TransactionInput!
-}
-
-# ProgrammableTransactionConnection
-type ProgrammableTransactionConnection {
-  edges: [ProgrammableTransactionEdge!]!
-  nodes: [ProgrammableTransaction!]!
-  pageInfo: PageInfo!
-}
-
-type ProgrammableTransactionEdge {
-  cursor: String
-  node: ProgrammableTransaction!
-}
-
-# UnchangedSharedObjectConnection
-
-type UnchangedSharedObjectConnection {
-  edges: [UnchangedSharedObjectEdge!]!
-  nodes: [UnchangedSharedObject!]!
-  pageInfo: PageInfo!
-}
-
-type UnchangedSharedObjectEdge {
-  cursor: String
-  node: UnchangedSharedObject!
-}
-
-# ObjectChangeConnection
-type ObjectChangeConnection {
-  edges: [ObjectChangeEdge!]!
-  nodes: [ObjectChange!]!
-  pageInfo: PageInfo!
-}
-
-type ObjectChangeEdge {
-  cursor: String
-  node: ObjectChange
-}
-
-# BalanceChangeConnection
-type BalanceChangeConnection {
-  edges: [BalanceChangeEdge!]!
-  nodes: [BalanceChange!]!
-  pageInfo: PageInfo!
-}
-
-type BalanceChangeEdge {
-  cursor: String
-  node: BalanceChange
-}
-
-# MoveModuleConnection
-type MoveModuleConnection {
-  edges: [MoveModuleEdge!]!
-  nodes: [MoveModule!]!
-  pageInfo: PageInfo!
-}
-
-type MoveModuleEdge {
-  cursor: String
-  node: MoveModule!
-}
-
-# SuinsRegistrationConnection
-type SuinsRegistrationConnection {
-  edges: [SuinsRegistrationEdge!]!
-  nodes: [SuinsRegistration!]!
-  pageInfo: PageInfo!
-}
-
-type SuinsRegistrationEdge {
-  cursor: String
-  node: SuinsRegistration
-}
-
-type SuinsRegistration {
-	"""
-	Domain name of the SuinsRegistration object
-	"""
-	domain: String!
-	"""
-	Convert the SuinsRegistration object into a Move object
-	"""
-	asMoveObject: MoveObject!
-}
-
-# AddressMetricsConnection
-type AddressMetricsConnection {
-  edges: [AddressMetricEdge!]!
-  nodes: [AddressMetric!]!
-  pageInfo: PageInfo!
-}
-
-type AddressMetricEdge {
-  cursor: String
-  node: AddressMetrics!
-}
-
-# StakedSuiConnection
-type StakedSuiConnection {
-  edges: [StakedSuiEdge!]!
-  nodes: [StakedSui!]!
-  pageInfo: PageInfo!
-}
-
-type StakedSuiEdge {
-  cursor: String
-  node: StakedSui!
-}
-
-# ValidatorConnection
-type ValidatorConnection {
-  edges: [ValidatorEdge!]!
-  nodes: [Validator!]!
-  pageInfo: PageInfo!
-}
-
-type ValidatorEdge {
-  cursor: String
-  node: Validator!
-}
diff --git a/crates/sui-graphql-rpc/src/commands.rs b/crates/sui-graphql-rpc/src/commands.rs
index f605efd735946..4b0eca46c11cb 100644
--- a/crates/sui-graphql-rpc/src/commands.rs
+++ b/crates/sui-graphql-rpc/src/commands.rs
@@ -13,17 +13,13 @@ use std::path::PathBuf;
     version
 )]
 pub enum Command {
-    GenerateDocsExamples,
-    GenerateSchema {
-        /// Path to output GraphQL schema to, in SDL format.
-        #[clap(short, long)]
-        file: Option<PathBuf>,
-    },
-    GenerateExamples {
-        /// Path to output examples docs.
-        #[clap(short, long)]
-        file: Option<PathBuf>,
+    /// Output a TOML config (suitable for passing into the --config parameter of the start-server
+    /// command) with all values set to their defaults.
+    GenerateConfig {
+        /// Optional path to an output file. Prints to `stdout` if not provided.
+        output: Option<PathBuf>,
     },
+
     StartServer {
         /// The title to display at the top of the page
         #[clap(short, long)]
diff --git a/crates/sui-graphql-rpc/src/config.rs b/crates/sui-graphql-rpc/src/config.rs
index 71590683d308f..42f6feab0b084 100644
--- a/crates/sui-graphql-rpc/src/config.rs
+++ b/crates/sui-graphql-rpc/src/config.rs
@@ -92,6 +92,10 @@ pub struct Limits {
     pub max_type_nodes: u32,
     /// Maximum deph of a move value.
     pub max_move_value_depth: u32,
+    /// Maximum number of transaction ids that can be passed to a `TransactionBlockFilter`.
+    pub max_transaction_ids: u32,
+    /// Maximum number of candidates to scan when gathering a page of results.
+    pub max_scan_limit: u32,
 }
 
 #[GraphQLConfig]
@@ -282,6 +286,16 @@ impl ServiceConfig {
     async fn max_move_value_depth(&self) -> u32 {
         self.limits.max_move_value_depth
     }
+
+    /// Maximum number of transaction ids that can be passed to a `TransactionBlockFilter`.
+    async fn max_transaction_ids(&self) -> u32 {
+        self.limits.max_transaction_ids
+    }
+
+    /// Maximum number of candidates to scan when gathering a page of results.
+    async fn max_scan_limit(&self) -> u32 {
+        self.limits.max_scan_limit
+    }
 }
 
 impl TxExecFullNodeConfig {
@@ -452,6 +466,10 @@ impl Default for Limits {
             max_type_nodes: 256,
             // <https://github.com/MystenLabs/sui/blob/4b934f87acae862cecbcbefb3da34cabb79805aa/crates/sui-protocol-config/src/lib.rs#L1988>
             max_move_value_depth: 128,
+            // Filter-specific limits, such as the number of transaction ids that can be specified
+            // for the `TransactionBlockFilter`.
+            max_transaction_ids: 1000,
+            max_scan_limit: 100_000_000,
         }
     }
 }
@@ -514,6 +532,8 @@ mod tests {
                 max-type-argument-width = 64
                 max-type-nodes = 128
                 max-move-value-depth = 256
+                max-transaction-ids = 11
+                max-scan-limit = 50
             "#,
         )
         .unwrap();
@@ -533,6 +553,8 @@ mod tests {
                 max_type_argument_width: 64,
                 max_type_nodes: 128,
                 max_move_value_depth: 256,
+                max_transaction_ids: 11,
+                max_scan_limit: 50,
             },
             ..Default::default()
         };
@@ -596,6 +618,8 @@ mod tests {
                 max-type-argument-width = 64
                 max-type-nodes = 128
                 max-move-value-depth = 256
+                max-transaction-ids = 42
+                max-scan-limit = 420
 
                 [experiments]
                 test-flag = true
@@ -618,6 +642,8 @@ mod tests {
                 max_type_argument_width: 64,
                 max_type_nodes: 128,
                 max_move_value_depth: 256,
+                max_transaction_ids: 42,
+                max_scan_limit: 420,
             },
             disabled_features: BTreeSet::from([FunctionalGroup::Analytics]),
             experiments: Experiments { test_flag: true },
diff --git a/crates/sui-graphql-rpc/src/connection.rs b/crates/sui-graphql-rpc/src/connection.rs
new file mode 100644
index 0000000000000..4c48fc1727d0e
--- /dev/null
+++ b/crates/sui-graphql-rpc/src/connection.rs
@@ -0,0 +1,125 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use std::borrow::Cow;
+use std::marker::PhantomData;
+
+use async_graphql::connection::{
+    ConnectionNameType, CursorType, DefaultConnectionName, DefaultEdgeName, Edge, EdgeNameType,
+    EmptyFields, EnableNodesField, NodesFieldSwitcherSealed, PageInfo,
+};
+use async_graphql::{Object, ObjectType, OutputType, TypeName};
+
+/// Mirrors the `Connection` type from async-graphql, with the exception that if `start_cursor` and/
+/// or `end_cursor` is set on the struct, then when `page_info` is called, it will use those values
+/// before deferring to `edges`. The default implementation derives these cursors from the first and
+/// last element of `edges`, so if `edges` is empty, both are set to null. This is undesirable for
+/// queries that make use of `scan_limit`; when the scan limit is reached, a caller can continue to
+/// paginate forwards or backwards until all candidates in the scanning range have been visited,
+/// even if the current page yields no results.
+pub(crate) struct ScanConnection<
+    Cursor,
+    Node,
+    EdgeFields = EmptyFields,
+    Name = DefaultConnectionName,
+    EdgeName = DefaultEdgeName,
+    NodesField = EnableNodesField,
+> where
+    Cursor: CursorType + Send + Sync,
+    Node: OutputType,
+    EdgeFields: ObjectType,
+    Name: ConnectionNameType,
+    EdgeName: EdgeNameType,
+    NodesField: NodesFieldSwitcherSealed,
+{
+    _mark1: PhantomData<Name>,
+    _mark2: PhantomData<EdgeName>,
+    _mark3: PhantomData<NodesField>,
+    pub edges: Vec<Edge<Cursor, Node, EdgeFields, EdgeName>>,
+    pub has_previous_page: bool,
+    pub has_next_page: bool,
+    pub start_cursor: Option<String>,
+    pub end_cursor: Option<String>,
+}
+
+#[Object(name_type)]
+impl<Cursor, Node, EdgeFields, Name, EdgeName>
+    ScanConnection<Cursor, Node, EdgeFields, Name, EdgeName, EnableNodesField>
+where
+    Cursor: CursorType + Send + Sync,
+    Node: OutputType,
+    EdgeFields: ObjectType,
+    Name: ConnectionNameType,
+    EdgeName: EdgeNameType,
+{
+    /// Information to aid in pagination.
+    async fn page_info(&self) -> PageInfo {
+        // Unlike the default implementation, this Connection will use `start_cursor` and
+        // `end_cursor` if they are `Some`.
+        PageInfo {
+            has_previous_page: self.has_previous_page,
+            has_next_page: self.has_next_page,
+            start_cursor: self
+                .start_cursor
+                .clone()
+                .or_else(|| self.edges.first().map(|edge| edge.cursor.encode_cursor())),
+            end_cursor: self
+                .end_cursor
+                .clone()
+                .or_else(|| self.edges.last().map(|edge| edge.cursor.encode_cursor())),
+        }
+    }
+
+    /// A list of edges.
+    #[inline]
+    async fn edges(&self) -> &[Edge<Cursor, Node, EdgeFields, EdgeName>] {
+        &self.edges
+    }
+
+    /// A list of nodes.
+    async fn nodes(&self) -> Vec<&Node> {
+        self.edges.iter().map(|e| &e.node).collect()
+    }
+}
+
+impl<Cursor, Node, NodesField, EdgeFields, Name, EdgeName>
+    ScanConnection<Cursor, Node, EdgeFields, Name, EdgeName, NodesField>
+where
+    Cursor: CursorType + Send + Sync,
+    Node: OutputType,
+    EdgeFields: ObjectType,
+    Name: ConnectionNameType,
+    EdgeName: EdgeNameType,
+    NodesField: NodesFieldSwitcherSealed,
+{
+    /// Create a new connection.
+    #[inline]
+    pub fn new(has_previous_page: bool, has_next_page: bool) -> Self {
+        ScanConnection {
+            _mark1: PhantomData,
+            _mark2: PhantomData,
+            _mark3: PhantomData,
+            edges: Vec::new(),
+            has_previous_page,
+            has_next_page,
+            start_cursor: None,
+            end_cursor: None,
+        }
+    }
+}
+
+impl<Cursor, Node, EdgeFields, Name, EdgeName, NodesField> TypeName
+    for ScanConnection<Cursor, Node, EdgeFields, Name, EdgeName, NodesField>
+where
+    Cursor: CursorType + Send + Sync,
+    Node: OutputType,
+    EdgeFields: ObjectType,
+    Name: ConnectionNameType,
+    EdgeName: EdgeNameType,
+    NodesField: NodesFieldSwitcherSealed,
+{
+    #[inline]
+    fn type_name() -> Cow<'static, str> {
+        Name::type_name::<Node>().into()
+    }
+}
diff --git a/crates/sui-graphql-rpc/src/consistency.rs b/crates/sui-graphql-rpc/src/consistency.rs
index a4719e5855cdd..285e6ce8f36ba 100644
--- a/crates/sui-graphql-rpc/src/consistency.rs
+++ b/crates/sui-graphql-rpc/src/consistency.rs
@@ -7,7 +7,7 @@ use sui_indexer::models::objects::StoredHistoryObject;
 
 use crate::raw_query::RawQuery;
 use crate::types::available_range::AvailableRange;
-use crate::types::cursor::{JsonCursor, Page};
+use crate::types::cursor::{JsonCursor, Page, ScanLimited};
 use crate::types::object::Cursor;
 use crate::{filter, query};
 
@@ -59,6 +59,10 @@ impl Checkpointed for JsonCursor<ConsistentNamedCursor> {
     }
 }
 
+impl ScanLimited for JsonCursor<ConsistentIndexCursor> {}
+
+impl ScanLimited for JsonCursor<ConsistentNamedCursor> {}
+
 /// Constructs a `RawQuery` against the `objects_snapshot` and `objects_history` table to fetch
 /// objects that satisfy some filtering criteria `filter_fn` within the provided checkpoint `range`.
 /// The `objects_snapshot` table contains the latest versions of objects up to a checkpoint sequence
diff --git a/crates/sui-graphql-rpc/src/data/package_resolver.rs b/crates/sui-graphql-rpc/src/data/package_resolver.rs
index 467911753d266..f10067fd007b9 100644
--- a/crates/sui-graphql-rpc/src/data/package_resolver.rs
+++ b/crates/sui-graphql-rpc/src/data/package_resolver.rs
@@ -26,7 +26,7 @@ pub(crate) type PackageResolver = Arc<Resolver<PackageCache>>;
 /// to `fetch`
 pub struct DbPackageStore(DataLoader);
 
-/// DataLoader key for fetching the latest version of a `Package` by its ID.
+/// `DataLoader` key for fetching the latest version of a `Package` by its ID.
 #[derive(Copy, Clone, Hash, Eq, PartialEq, Debug)]
 struct PackageKey(AccountAddress);
 
diff --git a/crates/sui-graphql-rpc/src/data/pg.rs b/crates/sui-graphql-rpc/src/data/pg.rs
index 980bde05b1fda..cdf57f7d542b9 100644
--- a/crates/sui-graphql-rpc/src/data/pg.rs
+++ b/crates/sui-graphql-rpc/src/data/pg.rs
@@ -1,8 +1,6 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use std::time::Instant;
-
 use super::QueryExecutor;
 use crate::{config::Limits, error::Error, metrics::Metrics};
 use async_trait::async_trait;
@@ -12,6 +10,8 @@ use diesel::{
     query_dsl::LoadQuery,
     QueryResult, RunQueryDsl,
 };
+use std::fmt;
+use std::time::Instant;
 use sui_indexer::indexer_reader::IndexerReader;
 
 use sui_indexer::{run_query_async, run_query_repeatable_async, spawn_read_only_blocking};
@@ -29,6 +29,8 @@ pub(crate) struct PgConnection<'c> {
     conn: &'c mut diesel::PgConnection,
 }
 
+pub(crate) struct ByteaLiteral<'a>(pub &'a [u8]);
+
 impl PgExecutor {
     pub(crate) fn new(
         inner: IndexerReader<diesel::PgConnection>,
@@ -118,6 +120,16 @@ impl<'c> super::DbConnection for PgConnection<'c> {
     }
 }
 
+impl fmt::Display for ByteaLiteral<'_> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "'\\x{}'::bytea", hex::encode(self.0))
+    }
+}
+
+pub(crate) fn bytea_literal(slice: &[u8]) -> ByteaLiteral<'_> {
+    ByteaLiteral(slice)
+}
+
 /// Support for calculating estimated query cost using EXPLAIN and then logging it.
 mod query_cost {
     use super::*;
@@ -208,7 +220,7 @@ mod tests {
         )
         .unwrap();
         let mut conn = get_pool_connection(&pool).unwrap();
-        reset_database(&mut conn, /* drop_all */ true).unwrap();
+        reset_database(&mut conn).unwrap();
 
         let objects: Vec<StoredObject> = BuiltInFramework::iter_system_packages()
             .map(|pkg| IndexedObject::from_object(1, pkg.genesis_object(), None).into())
diff --git a/crates/sui-graphql-rpc/src/examples.rs b/crates/sui-graphql-rpc/src/examples.rs
deleted file mode 100644
index 56f86ca428180..0000000000000
--- a/crates/sui-graphql-rpc/src/examples.rs
+++ /dev/null
@@ -1,240 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-use anyhow::anyhow;
-use markdown_gen::markdown::{AsMarkdown, Markdown};
-use std::io::{BufWriter, Read};
-use std::path::PathBuf;
-
-#[derive(Debug)]
-pub struct ExampleQuery {
-    pub name: String,
-    pub contents: String,
-    pub path: PathBuf,
-}
-
-#[derive(Debug)]
-pub struct ExampleQueryGroup {
-    pub name: String,
-    pub queries: Vec<ExampleQuery>,
-    pub _path: PathBuf,
-}
-
-const QUERY_EXT: &str = "graphql";
-
-fn regularize_string(s: &str) -> String {
-    // Replace underscore with space and make every word first letter uppercase
-    s.replace('_', " ")
-        .split_whitespace()
-        .map(|word| {
-            let mut chars = word.chars();
-            match chars.next() {
-                None => String::new(),
-                Some(f) => f.to_uppercase().chain(chars).collect(),
-            }
-        })
-        .collect::<Vec<_>>()
-        .join(" ")
-}
-
-pub fn load_examples() -> anyhow::Result<Vec<ExampleQueryGroup>> {
-    let mut buf: PathBuf = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    buf.push("examples");
-
-    let mut groups = vec![];
-    for entry in std::fs::read_dir(buf).map_err(|e| anyhow::anyhow!(e))? {
-        let entry = entry.map_err(|e| anyhow::anyhow!(e))?;
-        let path = entry.path();
-        let group_name = path
-            .file_stem()
-            .ok_or(anyhow::anyhow!("File stem cannot be read"))?
-            .to_str()
-            .ok_or(anyhow::anyhow!("File stem cannot be read"))?
-            .to_string();
-
-        let mut group = ExampleQueryGroup {
-            name: group_name.clone(),
-            queries: vec![],
-            _path: path.clone(),
-        };
-
-        for file in std::fs::read_dir(path).map_err(|e| anyhow::anyhow!(e))? {
-            assert!(file.is_ok());
-            let file = file.map_err(|e| anyhow::anyhow!(e))?;
-            assert!(file.path().extension().is_some());
-            let ext = file
-                .path()
-                .extension()
-                .ok_or(anyhow!("File extension cannot be read"))?
-                .to_str()
-                .ok_or(anyhow!("File extension cannot be read to string"))?
-                .to_string();
-            assert_eq!(ext, QUERY_EXT, "wrong file extension for example");
-
-            let file_path = file.path();
-            let query_name = file_path
-                .file_stem()
-                .ok_or(anyhow!("File stem cannot be read"))?
-                .to_str()
-                .ok_or(anyhow!("File extension cannot be read to string"))?
-                .to_string();
-
-            let mut contents = String::new();
-            let mut fp = std::fs::File::open(file_path.clone()).map_err(|e| anyhow!(e))?;
-            fp.read_to_string(&mut contents).map_err(|e| anyhow!(e))?;
-            group.queries.push(ExampleQuery {
-                name: query_name,
-                contents,
-                path: file_path,
-            });
-        }
-        group.queries.sort_by(|x, y| x.name.cmp(&y.name));
-
-        groups.push(group);
-    }
-
-    groups.sort_by(|x, y| x.name.cmp(&y.name));
-    Ok(groups)
-}
-
-/// This generates a markdown page with all the examples, to be used in the docs site
-pub fn generate_examples_for_docs() -> anyhow::Result<String> {
-    let groups = load_examples()?;
-
-    let mut output = BufWriter::new(Vec::new());
-    let mut md = Markdown::new(&mut output);
-    md.write(
-        r#"---
-title: Examples
-description: Query examples for working with the Sui GraphQL RPC.
----
-"#,
-    )?;
-    md.write("This page showcases a number of queries to interact with the network. These examples can also be found in the [repository](https://github.com/MystenLabs/sui/tree/main/crates/sui-graphql-rpc/examples). You can use the [interactive online IDE](https://mainnet.sui.io/rpc/graphql) to run these examples.")?;
-    for group in groups.iter() {
-        let group_name = regularize_string(&group.name);
-        md.write(group_name.heading(2))
-            .map_err(|e| anyhow::anyhow!(e))?;
-        for query in group.queries.iter() {
-            let name = regularize_string(&query.name);
-            md.write(name.heading(3)).map_err(|e| anyhow::anyhow!(e))?;
-            let query = query.contents.lines().collect::<Vec<_>>().join("\n");
-            let content = format!("```graphql\n{}\n```", query);
-            md.write(content.as_str()).map_err(|e| anyhow::anyhow!(e))?;
-        }
-    }
-    let bytes = output.into_inner().map_err(|e| anyhow::anyhow!(e))?;
-    Ok(String::from_utf8(bytes)
-        .map_err(|e| anyhow::anyhow!(e))?
-        .replace('\\', ""))
-}
-
-pub fn generate_markdown() -> anyhow::Result<String> {
-    let groups = load_examples()?;
-
-    let mut output = BufWriter::new(Vec::new());
-    let mut md = Markdown::new(&mut output);
-
-    md.write("Sui GraphQL Examples".heading(1))
-        .map_err(|e| anyhow!(e))?;
-
-    // TODO: reduce multiple loops
-    // Generate the table of contents
-    for (id, group) in groups.iter().enumerate() {
-        let group_name = regularize_string(&group.name);
-        let group_name_toc = format!("[{}](#{})", group_name, id);
-        md.write(group_name_toc.heading(3))
-            .map_err(|e| anyhow!(e))?;
-
-        for (inner, query) in group.queries.iter().enumerate() {
-            let inner_id = inner + 0xFFFF * id;
-            let inner_name = regularize_string(&query.name);
-            let inner_name_toc = format!("&emsp;&emsp;[{}](#{})", inner_name, inner_id);
-            md.write(inner_name_toc.heading(4))
-                .map_err(|e| anyhow!(e))?;
-        }
-    }
-
-    for (id, group) in groups.iter().enumerate() {
-        let group_name = regularize_string(&group.name);
-
-        let id_tag = format!("<a id={}></a>", id);
-        md.write(id_tag.heading(2))
-            .map_err(|e| anyhow::anyhow!(e))?;
-        md.write(group_name.heading(2))
-            .map_err(|e| anyhow::anyhow!(e))?;
-        for (inner, query) in group.queries.iter().enumerate() {
-            let inner_id = inner + 0xFFFF * id;
-            let name = regularize_string(&query.name);
-
-            let id_tag = format!("<a id={}></a>", inner_id);
-            md.write(id_tag.heading(3))
-                .map_err(|e| anyhow::anyhow!(e))?;
-            md.write(name.heading(3)).map_err(|e| anyhow::anyhow!(e))?;
-
-            // Extract all lines that start with `#` and use them as headers
-            let mut headers = vec![];
-            let mut query_start = 0;
-            for (idx, line) in query.contents.lines().enumerate() {
-                let line = line.trim();
-                if line.starts_with('#') {
-                    headers.push(line.trim_start_matches('#'));
-                } else if line.starts_with('{') {
-                    query_start = idx;
-                    break;
-                }
-            }
-
-            // Remove headers from query
-            let query = query
-                .contents
-                .lines()
-                .skip(query_start)
-                .collect::<Vec<_>>()
-                .join("\n");
-
-            let content = format!("<pre>{}</pre>", query);
-            for header in headers {
-                md.write(header.heading(4))
-                    .map_err(|e| anyhow::anyhow!(e))?;
-            }
-            md.write(content.quote()).map_err(|e| anyhow::anyhow!(e))?;
-        }
-    }
-    let bytes = output.into_inner().map_err(|e| anyhow::anyhow!(e))?;
-    Ok(String::from_utf8(bytes)
-        .map_err(|e| anyhow::anyhow!(e))?
-        .replace('\\', ""))
-}
-
-#[test]
-fn test_generate_markdown() {
-    use similar::*;
-    use std::fs::File;
-
-    let mut buf: PathBuf = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    buf.push("docs");
-    buf.push("examples.md");
-    let mut out_file: File = File::open(buf).expect("Could not open examples.md");
-
-    // Read the current content of `out_file`
-    let mut current_content = String::new();
-    out_file
-        .read_to_string(&mut current_content)
-        .expect("Could not read examples.md");
-    let new_content: String = generate_markdown().expect("Generating examples markdown failed");
-
-    if current_content != new_content {
-        let mut res = vec![];
-        let diff = TextDiff::from_lines(&current_content, &new_content);
-        for change in diff.iter_all_changes() {
-            let sign = match change.tag() {
-                ChangeTag::Delete => "---",
-                ChangeTag::Insert => "+++",
-                ChangeTag::Equal => "   ",
-            };
-            res.push(format!("{}{}", sign, change));
-        }
-        panic!("Doc examples have changed. Please run `sui-graphql-rpc generate-examples` to update the docs. Diff: {}", res.join(""));
-    }
-}
diff --git a/crates/sui-graphql-rpc/src/lib.rs b/crates/sui-graphql-rpc/src/lib.rs
index baea0d2ce2ce8..e299aa241eec9 100644
--- a/crates/sui-graphql-rpc/src/lib.rs
+++ b/crates/sui-graphql-rpc/src/lib.rs
@@ -4,11 +4,11 @@
 pub use sui_graphql_rpc_client as client;
 pub mod commands;
 pub mod config;
+pub(crate) mod connection;
 pub(crate) mod consistency;
 pub mod context_data;
 pub(crate) mod data;
 mod error;
-pub mod examples;
 pub mod extensions;
 pub(crate) mod functional_group;
 mod metrics;
diff --git a/crates/sui-graphql-rpc/src/main.rs b/crates/sui-graphql-rpc/src/main.rs
index 6e552a09e92e8..cedc55b39e72a 100644
--- a/crates/sui-graphql-rpc/src/main.rs
+++ b/crates/sui-graphql-rpc/src/main.rs
@@ -9,7 +9,6 @@ use sui_graphql_rpc::commands::Command;
 use sui_graphql_rpc::config::{
     ConnectionConfig, Ide, ServerConfig, ServiceConfig, TxExecFullNodeConfig, Version,
 };
-use sui_graphql_rpc::server::builder::export_schema;
 use sui_graphql_rpc::server::graphiql_server::start_graphiql_server;
 use tokio_util::sync::CancellationToken;
 use tokio_util::task::TaskTracker;
@@ -38,39 +37,19 @@ static VERSION: Version = Version {
 async fn main() {
     let cmd: Command = Command::parse();
     match cmd {
-        Command::GenerateDocsExamples => {
-            let mut buf: PathBuf = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-            // we are looking to put examples content in
-            // sui/docs/content/references/sui-graphql/examples.mdx
-            let filename = "docs/content/references/sui-graphql/examples.mdx";
-            buf.pop();
-            buf.pop();
-            buf.push(filename);
-            let content = sui_graphql_rpc::examples::generate_examples_for_docs()
-                .expect("Generating examples markdown file for docs failed");
-            std::fs::write(buf, content).expect("Writing examples markdown failed");
-            println!("Generated the docs example.mdx file and copied it to {filename}.");
-        }
-        Command::GenerateSchema { file } => {
-            let out = export_schema();
-            if let Some(file) = file {
-                println!("Write schema to file: {:?}", file);
-                std::fs::write(file, &out).unwrap();
+        Command::GenerateConfig { output } => {
+            let config = ServiceConfig::default();
+            let toml = toml::to_string_pretty(&config).expect("Failed to serialize configuration");
+
+            if let Some(path) = output {
+                fs::write(&path, toml).unwrap_or_else(|e| {
+                    panic!("Failed to write configuration to {}: {e}", path.display())
+                });
             } else {
-                println!("{}", &out);
+                println!("{}", toml);
             }
         }
-        Command::GenerateExamples { file } => {
-            let new_content: String = sui_graphql_rpc::examples::generate_markdown()
-                .expect("Generating examples markdown failed");
-            let mut buf: PathBuf = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-            buf.push("docs");
-            buf.push("examples.md");
-            let file = file.unwrap_or(buf);
 
-            std::fs::write(file.clone(), new_content).expect("Writing examples markdown failed");
-            println!("Written examples to file: {:?}", file);
-        }
         Command::StartServer {
             ide_title,
             db_url,
diff --git a/crates/sui-graphql-rpc/src/raw_query.rs b/crates/sui-graphql-rpc/src/raw_query.rs
index e372d478fb22f..55fed2d96c2f3 100644
--- a/crates/sui-graphql-rpc/src/raw_query.rs
+++ b/crates/sui-graphql-rpc/src/raw_query.rs
@@ -179,6 +179,27 @@ macro_rules! or_filter {
     }};
 }
 
+/// Accepts two `RawQuery` instances and a third expression consisting of which columns to join on.
+#[macro_export]
+macro_rules! inner_join {
+    ($lhs:expr, $alias:expr => $rhs_query:expr, using: [$using:expr $(, $more_using:expr)*]) => {{
+        use $crate::raw_query::RawQuery;
+
+        let (lhs_sql, mut binds) = $lhs.finish();
+        let (rhs_sql, rhs_binds) = $rhs_query.finish();
+
+        binds.extend(rhs_binds);
+
+        let sql = format!(
+            "{lhs_sql} INNER JOIN ({rhs_sql}) AS {} USING ({})",
+            $alias,
+            stringify!($using $(, $more_using)*),
+        );
+
+        RawQuery::new(sql, binds)
+    }};
+}
+
 /// Accepts a `SELECT FROM` format string and optional subqueries. If subqueries are provided, there
 /// should be curly braces `{}` in the format string to interpolate each subquery's sql string into.
 /// Concatenates subqueries to the `SELECT FROM` clause, and creates a new `RawQuery` from the
@@ -193,7 +214,8 @@ macro_rules! query {
     };
 
     // Expects a select clause and one or more subqueries. The select clause should contain curly
-    // braces for subqueries to be interpolated into.
+    // braces for subqueries to be interpolated into. Use when the subqueries can be aliased
+    // directly in the select statement.
     ($select:expr $(,$subquery:expr)+) => {{
         use $crate::raw_query::RawQuery;
         let mut binds = vec![];
diff --git a/crates/sui-graphql-rpc/src/server/builder.rs b/crates/sui-graphql-rpc/src/server/builder.rs
index 51fd2ada86411..054072ffefae5 100644
--- a/crates/sui-graphql-rpc/src/server/builder.rs
+++ b/crates/sui-graphql-rpc/src/server/builder.rs
@@ -36,10 +36,9 @@ use async_graphql::extensions::Tracing;
 use async_graphql::EmptySubscription;
 use async_graphql::{extensions::ExtensionFactory, Schema, SchemaBuilder};
 use async_graphql_axum::{GraphQLRequest, GraphQLResponse};
+use axum::body::Body;
 use axum::extract::FromRef;
-use axum::extract::{
-    connect_info::IntoMakeServiceWithConnectInfo, ConnectInfo, Query as AxumQuery, State,
-};
+use axum::extract::{ConnectInfo, Query as AxumQuery, State};
 use axum::http::{HeaderMap, StatusCode};
 use axum::middleware::{self};
 use axum::response::IntoResponse;
@@ -48,9 +47,6 @@ use axum::Extension;
 use axum::Router;
 use chrono::Utc;
 use http::{HeaderValue, Method, Request};
-use hyper::server::conn::AddrIncoming as HyperAddrIncoming;
-use hyper::Body;
-use hyper::Server as HyperServer;
 use mysten_metrics::spawn_monitored_task;
 use mysten_network::callback::{CallbackLayer, MakeCallbackHandler, ResponseHandler};
 use std::convert::Infallible;
@@ -73,7 +69,9 @@ use uuid::Uuid;
 const DEFAULT_MAX_CHECKPOINT_LAG: Duration = Duration::from_secs(300);
 
 pub(crate) struct Server {
-    pub server: HyperServer<HyperAddrIncoming, IntoMakeServiceWithConnectInfo<Router, SocketAddr>>,
+    // pub server: HyperServer<HyperAddrIncoming, IntoMakeServiceWithConnectInfo<Router, SocketAddr>>,
+    router: Router,
+    address: String,
     watermark_task: WatermarkTask,
     system_package_task: SystemPackageTask,
     trigger_exchange_rates_task: TriggerExchangeRatesTask,
@@ -120,13 +118,18 @@ impl Server {
             info!("Starting graphql service");
             let cancellation_token = self.state.cancellation_token.clone();
             spawn_monitored_task!(async move {
-                self.server
-                    .with_graceful_shutdown(async {
-                        cancellation_token.cancelled().await;
-                        info!("Shutdown signal received, terminating graphql service");
-                    })
-                    .await
-                    .map_err(|e| Error::Internal(format!("Server run failed: {}", e)))
+                let listener = tokio::net::TcpListener::bind(&self.address).await.unwrap();
+                axum::serve(
+                    listener,
+                    self.router
+                        .into_make_service_with_connect_info::<SocketAddr>(),
+                )
+                .with_graceful_shutdown(async move {
+                    cancellation_token.cancelled().await;
+                    info!("Shutdown signal received, terminating graphql service");
+                })
+                .await
+                .map_err(|e| Error::Internal(format!("Server run failed: {}", e)))
             })
         };
 
@@ -339,7 +342,7 @@ impl ServerBuilder {
             state.cancellation_token.clone(),
         );
 
-        let app = router
+        let router = router
             .route_layer(middleware::from_fn_with_state(
                 state.version,
                 set_version_middleware,
@@ -353,12 +356,8 @@ impl ServerBuilder {
             .layer(Self::cors()?);
 
         Ok(Server {
-            server: axum::Server::bind(
-                &address
-                    .parse()
-                    .map_err(|_| Error::Internal(format!("Failed to parse address {}", address)))?,
-            )
-            .serve(app.into_make_service_with_connect_info::<SocketAddr>()),
+            router,
+            address,
             watermark_task,
             system_package_task,
             trigger_exchange_rates_task,
@@ -744,7 +743,7 @@ pub mod tests {
         Uuid::new_v4()
     }
 
-    pub async fn test_timeout_impl(wallet: WalletContext) {
+    pub async fn test_timeout_impl(wallet: &WalletContext) {
         struct TimedExecuteExt {
             pub min_req_delay: Duration,
         }
diff --git a/crates/sui-graphql-rpc/src/server/graphiql_server.rs b/crates/sui-graphql-rpc/src/server/graphiql_server.rs
index d5c2f329ecf7f..7a809c01d85be 100644
--- a/crates/sui-graphql-rpc/src/server/graphiql_server.rs
+++ b/crates/sui-graphql-rpc/src/server/graphiql_server.rs
@@ -31,7 +31,7 @@ pub async fn start_graphiql_server(
     version: &Version,
     cancellation_token: CancellationToken,
 ) -> Result<(), Error> {
-    info!("Starting server with config: {:?}", server_config);
+    info!("Starting server with config: {:#?}", server_config);
     info!("Server version: {}", version);
     start_graphiql_server_impl(
         ServerBuilder::from_config(server_config, version, cancellation_token).await?,
diff --git a/crates/sui-graphql-rpc/src/server/version.rs b/crates/sui-graphql-rpc/src/server/version.rs
index 46b7bf32be05b..b73bc9b9d215d 100644
--- a/crates/sui-graphql-rpc/src/server/version.rs
+++ b/crates/sui-graphql-rpc/src/server/version.rs
@@ -2,12 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use axum::{
+    body::Body,
     extract::{Path, State},
-    headers,
     http::{HeaderName, HeaderValue, Request, StatusCode},
     middleware::Next,
     response::{IntoResponse, Response},
 };
+use axum_extra::headers;
 
 use crate::{
     config::Version,
@@ -16,6 +17,7 @@ use crate::{
 
 pub(crate) static VERSION_HEADER: HeaderName = HeaderName::from_static("x-sui-rpc-version");
 
+#[allow(unused)]
 pub(crate) struct SuiRpcVersion(Vec<u8>, Vec<Vec<u8>>);
 const NAMED_VERSIONS: [&str; 3] = ["beta", "legacy", "stable"];
 
@@ -49,11 +51,11 @@ impl headers::Header for SuiRpcVersion {
 /// that this instance of the RPC matches that version constraint.  Each RPC instance only supports
 /// one version of the RPC software, and it is the responsibility of the load balancer to make sure
 /// version constraints are met.
-pub(crate) async fn check_version_middleware<B>(
+pub(crate) async fn check_version_middleware(
     version: Option<Path<String>>,
     State(service_version): State<Version>,
-    request: Request<B>,
-    next: Next<B>,
+    request: Request<Body>,
+    next: Next,
 ) -> Response {
     let Some(Path(version)) = version else {
         return next.run(request).await;
@@ -91,10 +93,10 @@ pub(crate) async fn check_version_middleware<B>(
 
 /// Mark every outgoing response with a header indicating the precise version of the RPC that was
 /// used (including the patch version and sha).
-pub(crate) async fn set_version_middleware<B>(
+pub(crate) async fn set_version_middleware(
     State(version): State<Version>,
-    request: Request<B>,
-    next: Next<B>,
+    request: Request<Body>,
+    next: Next,
 ) -> Response {
     let mut response = next.run(request).await;
     let headers = response.headers_mut();
@@ -196,7 +198,9 @@ mod tests {
     }
 
     async fn response_body(response: Response) -> String {
-        let bytes = hyper::body::to_bytes(response.into_body()).await.unwrap();
+        let bytes = axum::body::to_bytes(response.into_body(), usize::MAX)
+            .await
+            .unwrap();
         let value: serde_json::Value = serde_json::from_slice(bytes.as_ref()).unwrap();
         serde_json::to_string_pretty(&value).unwrap()
     }
diff --git a/crates/sui-graphql-rpc/src/test_infra/cluster.rs b/crates/sui-graphql-rpc/src/test_infra/cluster.rs
index a17bcbdc83996..90c50a604901f 100644
--- a/crates/sui-graphql-rpc/src/test_infra/cluster.rs
+++ b/crates/sui-graphql-rpc/src/test_infra/cluster.rs
@@ -18,7 +18,6 @@ pub use sui_indexer::handlers::objects_snapshot_processor::SnapshotLagConfig;
 use sui_indexer::store::indexer_store::IndexerStore;
 use sui_indexer::store::PgIndexerStore;
 use sui_indexer::test_utils::force_delete_database;
-use sui_indexer::test_utils::start_test_indexer;
 use sui_indexer::test_utils::start_test_indexer_impl;
 use sui_indexer::test_utils::ReaderWriterConfig;
 use sui_swarm_config::genesis_config::{AccountConfig, DEFAULT_GAS_AMOUNT};
@@ -56,6 +55,7 @@ pub struct Cluster {
     pub indexer_join_handle: JoinHandle<Result<(), IndexerError>>,
     pub graphql_server_join_handle: JoinHandle<()>,
     pub graphql_client: SimpleClient,
+    pub cancellation_token: CancellationToken,
 }
 
 /// Starts a validator, fullnode, indexer, and graphql service for testing.
@@ -65,6 +65,7 @@ pub async fn start_cluster(
 ) -> Cluster {
     let data_ingestion_path = tempfile::tempdir().unwrap().into_path();
     let db_url = graphql_connection_config.db_url.clone();
+    let cancellation_token = CancellationToken::new();
     // Starts validator+fullnode
     let val_fn =
         start_validator_with_fullnode(internal_data_source_rpc_port, data_ingestion_path.clone())
@@ -85,12 +86,13 @@ pub async fn start_cluster(
     let queue_sender = nats_queue(odin_connection.clone());
 
     // Starts indexer
-    let (pg_store, pg_handle) = start_test_indexer(
+    let (pg_store, pg_handle) = start_test_indexer_impl(
         Some(db_url),
         val_fn.rpc_url().to_string(),
         ReaderWriterConfig::writer_mode(None),
-        data_ingestion_path,
-        queue_sender,
+        /* reset_database */ true,
+        Some(data_ingestion_path),
+        cancellation_token.clone(),
     )
     .await;
 
@@ -99,7 +101,7 @@ pub async fn start_cluster(
     let graphql_server_handle = start_graphql_server_with_fn_rpc(
         graphql_connection_config.clone(),
         Some(fn_rpc_url),
-        /* cancellation_token */ None,
+        Some(cancellation_token.clone()),
     )
     .await;
 
@@ -118,6 +120,7 @@ pub async fn start_cluster(
         indexer_join_handle: pg_handle,
         graphql_server_join_handle: graphql_server_handle,
         graphql_client: client,
+        cancellation_token,
     }
 }
 
@@ -141,7 +144,7 @@ pub async fn serve_executor(
 
     let executor_server_handle = tokio::spawn(async move {
         sui_rest_api::RestService::new_without_version(executor)
-            .start_service(executor_server_url, Some("/rest".to_owned()))
+            .start_service(executor_server_url)
             .await;
     });
 
@@ -163,7 +166,7 @@ pub async fn serve_executor(
         Some(db_url),
         format!("http://{}", executor_server_url),
         ReaderWriterConfig::writer_mode(snapshot_config.clone()),
-        Some(graphql_connection_config.db_name()),
+        /* reset_database */ true,
         Some(data_ingestion_path),
         cancellation_token.clone(),
         queue_sender,
@@ -321,6 +324,13 @@ impl Cluster {
     pub async fn wait_for_checkpoint_catchup(&self, checkpoint: u64, base_timeout: Duration) {
         wait_for_graphql_checkpoint_catchup(&self.graphql_client, checkpoint, base_timeout).await
     }
+
+    /// Sends a cancellation signal to the graphql and indexer services and waits for them to
+    /// shutdown.
+    pub async fn cleanup_resources(self) {
+        self.cancellation_token.cancel();
+        let _ = join!(self.graphql_server_join_handle, self.indexer_join_handle);
+    }
 }
 
 impl ExecutorCluster {
diff --git a/crates/sui-graphql-rpc/src/types/address.rs b/crates/sui-graphql-rpc/src/types/address.rs
index 6ba4dd390c79d..abd07bc9701e9 100644
--- a/crates/sui-graphql-rpc/src/types/address.rs
+++ b/crates/sui-graphql-rpc/src/types/address.rs
@@ -1,6 +1,8 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::connection::ScanConnection;
+
 use super::{
     balance::{self, Balance},
     coin::Coin,
@@ -135,6 +137,25 @@ impl Address {
 
     /// Similar behavior to the `transactionBlocks` in Query but supporting the additional
     /// `AddressTransactionBlockRelationship` filter, which defaults to `SIGN`.
+    ///
+    /// `scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+    /// results. It is required for queries that apply more than two complex filters (on function,
+    /// kind, sender, recipient, input object, changed object, or ids), and can be at most
+    /// `serviceConfig.maxScanLimit`.
+    ///
+    /// When the scan limit is reached the page will be returned even if it has fewer than `first`
+    /// results when paginating forward (`last` when paginating backwards). If there are more
+    /// transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+    /// `true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+    /// transaction that was scanned as opposed to the last (or first) transaction in the page.
+    ///
+    /// Requesting the next (or previous) page after this cursor will resume the search, scanning
+    /// the next `scanLimit` many transactions in the direction of pagination, and so on until all
+    /// transactions in the scanning range have been visited.
+    ///
+    /// By default, the scanning range includes all transactions known to GraphQL, but it can be
+    /// restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+    /// `afterCheckpoint` and `atCheckpoint` filters.
     async fn transaction_blocks(
         &self,
         ctx: &Context<'_>,
@@ -144,7 +165,8 @@ impl Address {
         before: Option<transaction_block::Cursor>,
         relation: Option<AddressTransactionBlockRelationship>,
         filter: Option<TransactionBlockFilter>,
-    ) -> Result<Connection<String, TransactionBlock>> {
+        scan_limit: Option<u64>,
+    ) -> Result<ScanConnection<String, TransactionBlock>> {
         use AddressTransactionBlockRelationship as R;
         let page = Page::from_params(ctx.data_unchecked(), first, after, last, before)?;
 
@@ -160,17 +182,12 @@ impl Address {
                 ..Default::default()
             },
         }) else {
-            return Ok(Connection::new(false, false));
+            return Ok(ScanConnection::new(false, false));
         };
 
-        TransactionBlock::paginate(
-            ctx.data_unchecked(),
-            page,
-            filter,
-            self.checkpoint_viewed_at,
-        )
-        .await
-        .extend()
+        TransactionBlock::paginate(ctx, page, filter, self.checkpoint_viewed_at, scan_limit)
+            .await
+            .extend()
     }
 }
 
diff --git a/crates/sui-graphql-rpc/src/types/balance.rs b/crates/sui-graphql-rpc/src/types/balance.rs
index 8e4d199df0be0..57eb83935d407 100644
--- a/crates/sui-graphql-rpc/src/types/balance.rs
+++ b/crates/sui-graphql-rpc/src/types/balance.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use super::available_range::AvailableRange;
-use super::cursor::{self, Page, RawPaginated, Target};
+use super::cursor::{self, Page, RawPaginated, ScanLimited, Target};
 use super::uint53::UInt53;
 use super::{big_int::BigInt, move_type::MoveType, sui_address::SuiAddress};
 use crate::consistency::Checkpointed;
@@ -161,6 +161,8 @@ impl Checkpointed for Cursor {
     }
 }
 
+impl ScanLimited for Cursor {}
+
 impl TryFrom<StoredBalance> for Balance {
     type Error = Error;
 
diff --git a/crates/sui-graphql-rpc/src/types/chain_identifier.rs b/crates/sui-graphql-rpc/src/types/chain_identifier.rs
index 1072d0a580f1a..50fb3d8adaf81 100644
--- a/crates/sui-graphql-rpc/src/types/chain_identifier.rs
+++ b/crates/sui-graphql-rpc/src/types/chain_identifier.rs
@@ -6,8 +6,8 @@ use crate::{
     error::Error,
 };
 use async_graphql::*;
-use diesel::{ExpressionMethods, QueryDsl};
-use sui_indexer::schema::checkpoints;
+use diesel::QueryDsl;
+use sui_indexer::schema::chain_identifier;
 use sui_types::{
     digests::ChainIdentifier as NativeChainIdentifier, messages_checkpoint::CheckpointDigest,
 };
@@ -17,15 +17,11 @@ pub(crate) struct ChainIdentifier;
 impl ChainIdentifier {
     /// Query the Chain Identifier from the DB.
     pub(crate) async fn query(db: &Db) -> Result<NativeChainIdentifier, Error> {
-        use checkpoints::dsl;
+        use chain_identifier::dsl;
 
         let digest_bytes = db
             .execute(move |conn| {
-                conn.first(move || {
-                    dsl::checkpoints
-                        .select(dsl::checkpoint_digest)
-                        .order_by(dsl::sequence_number.asc())
-                })
+                conn.first(move || dsl::chain_identifier.select(dsl::checkpoint_digest))
             })
             .await
             .map_err(|e| Error::Internal(format!("Failed to fetch genesis digest: {e}")))?;
diff --git a/crates/sui-graphql-rpc/src/types/checkpoint.rs b/crates/sui-graphql-rpc/src/types/checkpoint.rs
index cbebb9935f491..852c492967f21 100644
--- a/crates/sui-graphql-rpc/src/types/checkpoint.rs
+++ b/crates/sui-graphql-rpc/src/types/checkpoint.rs
@@ -5,7 +5,7 @@ use std::collections::{BTreeMap, BTreeSet, HashMap};
 
 use super::{
     base64::Base64,
-    cursor::{self, Page, Paginated, Target},
+    cursor::{self, Page, Paginated, ScanLimited, Target},
     date_time::DateTime,
     digest::Digest,
     epoch::Epoch,
@@ -13,7 +13,7 @@ use super::{
     transaction_block::{self, TransactionBlock, TransactionBlockFilter},
     uint53::UInt53,
 };
-use crate::consistency::Checkpointed;
+use crate::{connection::ScanConnection, consistency::Checkpointed};
 use crate::{
     data::{self, Conn, DataLoader, Db, DbConnection, QueryExecutor},
     error::Error,
@@ -36,7 +36,7 @@ pub(crate) struct CheckpointId {
     pub sequence_number: Option<UInt53>,
 }
 
-/// DataLoader key for fetching a `Checkpoint` by its sequence number, constrained by a consistency
+/// `DataLoader` key for fetching a `Checkpoint` by its sequence number, constrained by a consistency
 /// cursor.
 #[derive(Copy, Clone, Hash, Eq, PartialEq, Debug)]
 struct SeqNumKey {
@@ -47,7 +47,7 @@ struct SeqNumKey {
     pub checkpoint_viewed_at: u64,
 }
 
-/// DataLoader key for fetching a `Checkpoint` by its digest, constrained by a consistency cursor.
+/// `DataLoader` key for fetching a `Checkpoint` by its digest, constrained by a consistency cursor.
 #[derive(Copy, Clone, Hash, Eq, PartialEq, Debug)]
 struct DigestKey {
     pub digest: Digest,
@@ -144,6 +144,23 @@ impl Checkpoint {
     }
 
     /// Transactions in this checkpoint.
+    ///
+    /// `scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+    /// results. It is required for queries that apply more than two complex filters (on function,
+    /// kind, sender, recipient, input object, changed object, or ids), and can be at most
+    /// `serviceConfig.maxScanLimit`.
+    ///
+    /// When the scan limit is reached the page will be returned even if it has fewer than `first`
+    /// results when paginating forward (`last` when paginating backwards). If there are more
+    /// transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+    /// `true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+    /// transaction that was scanned as opposed to the last (or first) transaction in the page.
+    ///
+    /// Requesting the next (or previous) page after this cursor will resume the search, scanning
+    /// the next `scanLimit` many transactions in the direction of pagination, and so on until all
+    /// transactions in the scanning range have been visited.
+    ///
+    /// By default, the scanning range consists of all transactions in this checkpoint.
     async fn transaction_blocks(
         &self,
         ctx: &Context<'_>,
@@ -152,7 +169,8 @@ impl Checkpoint {
         last: Option<u64>,
         before: Option<transaction_block::Cursor>,
         filter: Option<TransactionBlockFilter>,
-    ) -> Result<Connection<String, TransactionBlock>> {
+        scan_limit: Option<u64>,
+    ) -> Result<ScanConnection<String, TransactionBlock>> {
         let page = Page::from_params(ctx.data_unchecked(), first, after, last, before)?;
 
         let Some(filter) = filter
@@ -162,17 +180,12 @@ impl Checkpoint {
                 ..Default::default()
             })
         else {
-            return Ok(Connection::new(false, false));
+            return Ok(ScanConnection::new(false, false));
         };
 
-        TransactionBlock::paginate(
-            ctx.data_unchecked(),
-            page,
-            filter,
-            self.checkpoint_viewed_at,
-        )
-        .await
-        .extend()
+        TransactionBlock::paginate(ctx, page, filter, self.checkpoint_viewed_at, scan_limit)
+            .await
+            .extend()
     }
 }
 
@@ -373,6 +386,8 @@ impl Checkpointed for Cursor {
     }
 }
 
+impl ScanLimited for Cursor {}
+
 #[async_trait::async_trait]
 impl Loader<SeqNumKey> for Db {
     type Value = Checkpoint;
diff --git a/crates/sui-graphql-rpc/src/types/coin.rs b/crates/sui-graphql-rpc/src/types/coin.rs
index 537c7ca2c44b0..d9654bbe87f10 100644
--- a/crates/sui-graphql-rpc/src/types/coin.rs
+++ b/crates/sui-graphql-rpc/src/types/coin.rs
@@ -1,6 +1,7 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::connection::ScanConnection;
 use crate::consistency::{build_objects_query, View};
 use crate::data::{Db, QueryExecutor};
 use crate::error::Error;
@@ -193,6 +194,25 @@ impl Coin {
     }
 
     /// The transaction blocks that sent objects to this object.
+    ///
+    /// `scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+    /// results. It is required for queries that apply more than two complex filters (on function,
+    /// kind, sender, recipient, input object, changed object, or ids), and can be at most
+    /// `serviceConfig.maxScanLimit`.
+    ///
+    /// When the scan limit is reached the page will be returned even if it has fewer than `first`
+    /// results when paginating forward (`last` when paginating backwards). If there are more
+    /// transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+    /// `true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+    /// transaction that was scanned as opposed to the last (or first) transaction in the page.
+    ///
+    /// Requesting the next (or previous) page after this cursor will resume the search, scanning
+    /// the next `scanLimit` many transactions in the direction of pagination, and so on until all
+    /// transactions in the scanning range have been visited.
+    ///
+    /// By default, the scanning range includes all transactions known to GraphQL, but it can be
+    /// restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+    /// `afterCheckpoint` and `atCheckpoint` filters.
     pub(crate) async fn received_transaction_blocks(
         &self,
         ctx: &Context<'_>,
@@ -201,9 +221,10 @@ impl Coin {
         last: Option<u64>,
         before: Option<transaction_block::Cursor>,
         filter: Option<TransactionBlockFilter>,
-    ) -> Result<Connection<String, TransactionBlock>> {
+        scan_limit: Option<u64>,
+    ) -> Result<ScanConnection<String, TransactionBlock>> {
         ObjectImpl(&self.super_.super_)
-            .received_transaction_blocks(ctx, first, after, last, before, filter)
+            .received_transaction_blocks(ctx, first, after, last, before, filter, scan_limit)
             .await
     }
 
diff --git a/crates/sui-graphql-rpc/src/types/coin_metadata.rs b/crates/sui-graphql-rpc/src/types/coin_metadata.rs
index bad0545636b84..2052c8b42b03d 100644
--- a/crates/sui-graphql-rpc/src/types/coin_metadata.rs
+++ b/crates/sui-graphql-rpc/src/types/coin_metadata.rs
@@ -17,6 +17,7 @@ use super::suins_registration::{DomainFormat, SuinsRegistration};
 use super::transaction_block::{self, TransactionBlock, TransactionBlockFilter};
 use super::type_filter::ExactTypeFilter;
 use super::uint53::UInt53;
+use crate::connection::ScanConnection;
 use crate::data::Db;
 use crate::error::Error;
 use async_graphql::connection::Connection;
@@ -182,6 +183,25 @@ impl CoinMetadata {
     }
 
     /// The transaction blocks that sent objects to this object.
+    ///
+    /// `scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+    /// results. It is required for queries that apply more than two complex filters (on function,
+    /// kind, sender, recipient, input object, changed object, or ids), and can be at most
+    /// `serviceConfig.maxScanLimit`.
+    ///
+    /// When the scan limit is reached the page will be returned even if it has fewer than `first`
+    /// results when paginating forward (`last` when paginating backwards). If there are more
+    /// transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+    /// `true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+    /// transaction that was scanned as opposed to the last (or first) transaction in the page.
+    ///
+    /// Requesting the next (or previous) page after this cursor will resume the search, scanning
+    /// the next `scanLimit` many transactions in the direction of pagination, and so on until all
+    /// transactions in the scanning range have been visited.
+    ///
+    /// By default, the scanning range includes all transactions known to GraphQL, but it can be
+    /// restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+    /// `afterCheckpoint` and `atCheckpoint` filters.
     pub(crate) async fn received_transaction_blocks(
         &self,
         ctx: &Context<'_>,
@@ -190,9 +210,10 @@ impl CoinMetadata {
         last: Option<u64>,
         before: Option<transaction_block::Cursor>,
         filter: Option<TransactionBlockFilter>,
-    ) -> Result<Connection<String, TransactionBlock>> {
+        scan_limit: Option<u64>,
+    ) -> Result<ScanConnection<String, TransactionBlock>> {
         ObjectImpl(&self.super_.super_)
-            .received_transaction_blocks(ctx, first, after, last, before, filter)
+            .received_transaction_blocks(ctx, first, after, last, before, filter, scan_limit)
             .await
     }
 
diff --git a/crates/sui-graphql-rpc/src/types/cursor.rs b/crates/sui-graphql-rpc/src/types/cursor.rs
index 65f7e21673bbb..868bfed21388b 100644
--- a/crates/sui-graphql-rpc/src/types/cursor.rs
+++ b/crates/sui-graphql-rpc/src/types/cursor.rs
@@ -50,7 +50,7 @@ pub(crate) struct Page<C> {
 
 /// Whether the page is extracted from the beginning or the end of the range bounded by the cursors.
 #[derive(PartialEq, Eq, Debug, Clone, Copy)]
-enum End {
+pub(crate) enum End {
     Front,
     Back,
 }
@@ -101,6 +101,21 @@ pub(crate) trait Target<C: CursorType> {
     fn cursor(&self, checkpoint_viewed_at: u64) -> C;
 }
 
+/// Interface for dealing with cursors that may come from a scan-limit-ed query.
+pub(crate) trait ScanLimited: Clone + PartialEq {
+    /// Whether the cursor was derived from a scan limit. Only applicable to the `startCursor` and
+    /// `endCursor` returned from a Connection's `PageInfo`, and indicates that the cursor may not
+    /// have a corresponding node in the result set.
+    fn is_scan_limited(&self) -> bool {
+        false
+    }
+
+    /// Returns a version of the cursor that is not scan limited.
+    fn unlimited(&self) -> Self {
+        self.clone()
+    }
+}
+
 impl<C> JsonCursor<C> {
     pub(crate) fn new(cursor: C) -> Self {
         JsonCursor(OpaqueCursor(cursor))
@@ -184,6 +199,10 @@ impl<C> Page<C> {
     pub(crate) fn is_from_front(&self) -> bool {
         matches!(self.end, End::Front)
     }
+
+    pub(crate) fn end(&self) -> End {
+        self.end
+    }
 }
 
 impl<C> Page<C>
@@ -261,7 +280,7 @@ impl Page<JsonCursor<ConsistentIndexCursor>> {
     }
 }
 
-impl<C: CursorType + Eq + Clone + Send + Sync + 'static> Page<C> {
+impl<C: CursorType + ScanLimited + Eq + Clone + Send + Sync + 'static> Page<C> {
     /// Treat the cursors of this page as upper- and lowerbound filters for a database `query`.
     /// Returns two booleans indicating whether there is a previous or next page in the range,
     /// followed by an iterator of values in the page, fetched from the database.
@@ -361,7 +380,9 @@ impl<C: CursorType + Eq + Clone + Send + Sync + 'static> Page<C> {
     }
 
     /// Given the results of a database query, determine whether the result set has a previous and
-    /// next page and is consistent with the provided cursors.
+    /// next page and is consistent with the provided cursors. Slightly different logic applies
+    /// depending on whether the provided cursors stem from either tip of the response, or if they
+    /// were derived from a scan limit.
     ///
     /// Returns two booleans indicating whether there is a previous or next page in the range,
     /// followed by an iterator of values in the page, fetched from the database. The values
@@ -373,7 +394,7 @@ impl<C: CursorType + Eq + Clone + Send + Sync + 'static> Page<C> {
         results: Vec<T>,
     ) -> (bool, bool, impl Iterator<Item = T>)
     where
-        T: Send + 'static,
+        T: Target<C> + Send + 'static,
     {
         // Detect whether the results imply the existence of a previous or next page.
         let (prev, next, prefix, suffix) =
@@ -386,27 +407,32 @@ impl<C: CursorType + Eq + Clone + Send + Sync + 'static> Page<C> {
                 }
 
                 // Page drawn from the front, and the cursor for the first element does not match
-                // `after`. This implies the bound was invalid, so we return an empty result.
-                (Some(a), Some(f), _, _, End::Front) if f != *a => {
+                // `after`. If that cursor is not from a scan limit, then it must have appeared in
+                // the previous page, and should also be at the tip of the current page. This
+                // absence implies the bound was invalid, so we return an empty result.
+                (Some(a), Some(f), _, _, End::Front) if f != *a && !a.is_scan_limited() => {
                     return (false, false, vec![].into_iter());
                 }
 
                 // Similar to above case, but for back of results.
-                (_, _, Some(l), Some(b), End::Back) if l != *b => {
+                (_, _, Some(l), Some(b), End::Back) if l != *b && !b.is_scan_limited() => {
                     return (false, false, vec![].into_iter());
                 }
 
-                // From here onwards, we know that the results are non-empty and if a cursor was
-                // supplied on the end the page is being drawn from, it was found in the results
-                // (implying a page follows in that direction).
-                (after, _, Some(l), before, End::Front) => {
-                    let has_previous_page = after.is_some();
+                // From here onwards, we know that the results are non-empty. In the forward
+                // pagination scenario, the presence of a previous page is determined by whether a
+                // cursor supplied on the end the page is being drawn from is found in the first
+                // position. The presence of a next page is determined by whether we have more
+                // results than the provided limit, and/ or if the end cursor element appears in the
+                // result set.
+                (after, Some(f), Some(l), before, End::Front) => {
+                    let has_previous_page = after.is_some_and(|a| a.unlimited() == f);
                     let prefix = has_previous_page as usize;
 
                     // If results end with the before cursor, we will at least need to trim one element
                     // from the suffix and we trim more off the end if there is more after applying the
                     // limit.
-                    let mut suffix = before.is_some_and(|b| *b == l) as usize;
+                    let mut suffix = before.is_some_and(|b| b.unlimited() == l) as usize;
                     suffix += results.len().saturating_sub(self.limit() + prefix + suffix);
                     let has_next_page = suffix > 0;
 
@@ -414,11 +440,13 @@ impl<C: CursorType + Eq + Clone + Send + Sync + 'static> Page<C> {
                 }
 
                 // Symmetric to the previous case, but drawing from the back.
-                (after, Some(f), _, before, End::Back) => {
-                    let has_next_page = before.is_some();
+                (after, Some(f), Some(l), before, End::Back) => {
+                    // There is a next page if the last element of the results matches the `before`.
+                    // This last element will get pruned from the result set.
+                    let has_next_page = before.is_some_and(|b| b.unlimited() == l);
                     let suffix = has_next_page as usize;
 
-                    let mut prefix = after.is_some_and(|a| *a == f) as usize;
+                    let mut prefix = after.is_some_and(|a| a.unlimited() == f) as usize;
                     prefix += results.len().saturating_sub(self.limit() + prefix + suffix);
                     let has_previous_page = prefix > 0;
 
diff --git a/crates/sui-graphql-rpc/src/types/dynamic_field.rs b/crates/sui-graphql-rpc/src/types/dynamic_field.rs
index 94e1c1cea0017..60e05ed610512 100644
--- a/crates/sui-graphql-rpc/src/types/dynamic_field.rs
+++ b/crates/sui-graphql-rpc/src/types/dynamic_field.rs
@@ -3,25 +3,21 @@
 
 use async_graphql::connection::{Connection, CursorType, Edge};
 use async_graphql::*;
-use diesel::query_dsl::methods::FilterDsl;
-use diesel::{ExpressionMethods, OptionalExtension};
 use move_core_types::annotated_value::{self as A, MoveStruct};
-use sui_indexer::models::objects::{StoredHistoryObject, StoredObject};
-use sui_indexer::schema::objects;
+use sui_indexer::models::objects::StoredHistoryObject;
 use sui_indexer::types::OwnerType;
 use sui_types::dynamic_field::{derive_dynamic_field_id, DynamicFieldInfo, DynamicFieldType};
 
 use super::available_range::AvailableRange;
 use super::cursor::{Page, Target};
-use super::move_object::MoveObjectDowncastError;
-use super::object::{self, deserialize_move_struct, Object, ObjectKind, ObjectLookup};
+use super::object::{self, deserialize_move_struct, Object, ObjectKind};
 use super::type_filter::ExactTypeFilter;
 use super::{
     base64::Base64, move_object::MoveObject, move_value::MoveValue, sui_address::SuiAddress,
 };
 use crate::consistency::{build_objects_query, View};
 use crate::data::package_resolver::PackageResolver;
-use crate::data::{Db, DbConnection, QueryExecutor};
+use crate::data::{Db, QueryExecutor};
 use crate::error::Error;
 use crate::filter;
 use crate::raw_query::RawQuery;
@@ -174,9 +170,10 @@ impl DynamicField {
         let super_ = MoveObject::query(
             ctx,
             SuiAddress::from(field_id),
-            ObjectLookup::LatestAt {
-                parent_version,
-                checkpoint_viewed_at,
+            if let Some(parent_version) = parent_version {
+                Object::under_parent(parent_version, checkpoint_viewed_at)
+            } else {
+                Object::latest_at(checkpoint_viewed_at)
             },
         )
         .await?;
@@ -184,59 +181,6 @@ impl DynamicField {
         super_.map(Self::try_from).transpose()
     }
 
-    /// Due to recent performance degradations, the existing `DynamicField::query` method is now
-    /// consistently timing out. This impacts features like `verify_zklogin_signature`, which
-    /// depends on resolving a dynamic field of 0x7 authenticator state. This method is a temporary
-    /// fix by fetching the data from the live `objects` table, and should only be used by
-    /// `verify_zklogin_signature`. Once we have fixed `objects_snapshot` table lag and backfilled
-    /// the `objects_version` table, this will no longer be needed.
-    pub(crate) async fn query_latest_dynamic_field(
-        db: &Db,
-        parent: SuiAddress,
-        name: DynamicFieldName,
-        kind: DynamicFieldType,
-        checkpoint_viewed_at: u64,
-    ) -> Result<Option<DynamicField>, Error> {
-        let type_ = match kind {
-            DynamicFieldType::DynamicField => name.type_.0,
-            DynamicFieldType::DynamicObject => {
-                DynamicFieldInfo::dynamic_object_field_wrapper(name.type_.0).into()
-            }
-        };
-
-        let field_id = derive_dynamic_field_id(parent, &type_, &name.bcs.0)
-            .map_err(|e| Error::Internal(format!("Failed to derive dynamic field id: {e}")))?;
-
-        let object_id = SuiAddress::from(field_id);
-
-        let Some(stored_obj): Option<StoredObject> = db
-            .execute(move |conn| {
-                conn.first(move || {
-                    objects::dsl::objects.filter(objects::dsl::object_id.eq(object_id.into_vec()))
-                })
-                .optional()
-            })
-            .await
-            .map_err(|e| Error::Internal(format!("Failed to fetch dynamic field: {e}")))?
-        else {
-            return Ok(None);
-        };
-
-        let history_object = StoredHistoryObject::from(stored_obj);
-        let gql_object =
-            Object::try_from_stored_history_object(history_object, checkpoint_viewed_at, None)?;
-
-        let super_ = match MoveObject::try_from(&gql_object) {
-            Ok(object) => Some(object),
-            Err(MoveObjectDowncastError::WrappedOrDeleted) => None,
-            Err(MoveObjectDowncastError::NotAMoveObject) => {
-                return Err(Error::Internal(format!("{object_id} is not a Move object")));
-            }
-        };
-
-        super_.map(Self::try_from).transpose()
-    }
-
     /// Query the `db` for a `page` of dynamic fields attached to object with ID `parent`. The
     /// returned dynamic fields are bound by the `parent_version` if provided - each field will be
     /// the latest version at or before the provided version. If `parent_version` is not provided,
diff --git a/crates/sui-graphql-rpc/src/types/epoch.rs b/crates/sui-graphql-rpc/src/types/epoch.rs
index 6ca312ca3ba37..915493217d1f7 100644
--- a/crates/sui-graphql-rpc/src/types/epoch.rs
+++ b/crates/sui-graphql-rpc/src/types/epoch.rs
@@ -3,6 +3,7 @@
 
 use std::collections::{BTreeMap, BTreeSet, HashMap};
 
+use crate::connection::ScanConnection;
 use crate::context_data::db_data_provider::{convert_to_validators, PgManager};
 use crate::data::{DataLoader, Db, DbConnection, QueryExecutor};
 use crate::error::Error;
@@ -32,7 +33,7 @@ pub(crate) struct Epoch {
     pub checkpoint_viewed_at: u64,
 }
 
-/// DataLoader key for fetching an `Epoch` by its ID, optionally constrained by a consistency
+/// `DataLoader` key for fetching an `Epoch` by its ID, optionally constrained by a consistency
 /// cursor.
 #[derive(Copy, Clone, Hash, Eq, PartialEq, Debug)]
 struct EpochKey {
@@ -229,6 +230,23 @@ impl Epoch {
     }
 
     /// The epoch's corresponding transaction blocks.
+    ///
+    /// `scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+    /// results. It is required for queries that apply more than two complex filters (on function,
+    /// kind, sender, recipient, input object, changed object, or ids), and can be at most
+    /// `serviceConfig.maxScanLimit`.
+    ///
+    /// When the scan limit is reached the page will be returned even if it has fewer than `first`
+    /// results when paginating forward (`last` when paginating backwards). If there are more
+    /// transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+    /// `true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+    /// transaction that was scanned as opposed to the last (or first) transaction in the page.
+    ///
+    /// Requesting the next (or previous) page after this cursor will resume the search, scanning
+    /// the next `scanLimit` many transactions in the direction of pagination, and so on until all
+    /// transactions in the scanning range have been visited.
+    ///
+    /// By default, the scanning range consists of all transactions in this epoch.
     async fn transaction_blocks(
         &self,
         ctx: &Context<'_>,
@@ -237,13 +255,15 @@ impl Epoch {
         last: Option<u64>,
         before: Option<transaction_block::Cursor>,
         filter: Option<TransactionBlockFilter>,
-    ) -> Result<Connection<String, TransactionBlock>> {
+        scan_limit: Option<u64>,
+    ) -> Result<ScanConnection<String, TransactionBlock>> {
         let page = Page::from_params(ctx.data_unchecked(), first, after, last, before)?;
 
         #[allow(clippy::unnecessary_lazy_evaluations)] // rust-lang/rust-clippy#9422
         let Some(filter) = filter
             .unwrap_or_default()
             .intersect(TransactionBlockFilter {
+                // If `first_checkpoint_id` is 0, we include the 0th checkpoint by leaving it None
                 after_checkpoint: (self.stored.first_checkpoint_id > 0)
                     .then(|| UInt53::from(self.stored.first_checkpoint_id as u64 - 1)),
                 before_checkpoint: self
@@ -253,17 +273,12 @@ impl Epoch {
                 ..Default::default()
             })
         else {
-            return Ok(Connection::new(false, false));
+            return Ok(ScanConnection::new(false, false));
         };
 
-        TransactionBlock::paginate(
-            ctx.data_unchecked(),
-            page,
-            filter,
-            self.checkpoint_viewed_at,
-        )
-        .await
-        .extend()
+        TransactionBlock::paginate(ctx, page, filter, self.checkpoint_viewed_at, scan_limit)
+            .await
+            .extend()
     }
 }
 
diff --git a/crates/sui-graphql-rpc/src/types/event.rs b/crates/sui-graphql-rpc/src/types/event.rs
deleted file mode 100644
index 16284f01618cd..0000000000000
--- a/crates/sui-graphql-rpc/src/types/event.rs
+++ /dev/null
@@ -1,378 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-use std::str::FromStr;
-
-use super::cursor::{self, Page, Paginated, Target};
-use super::digest::Digest;
-use super::type_filter::{ModuleFilter, TypeFilter};
-use super::{
-    address::Address, base64::Base64, date_time::DateTime, move_module::MoveModule,
-    move_value::MoveValue, sui_address::SuiAddress,
-};
-use crate::consistency::Checkpointed;
-use crate::data::{self, QueryExecutor};
-use crate::{data::Db, error::Error};
-use async_graphql::connection::{Connection, CursorType, Edge};
-use async_graphql::*;
-use diesel::{BoolExpressionMethods, ExpressionMethods, NullableExpressionMethods, QueryDsl};
-use serde::{Deserialize, Serialize};
-use sui_indexer::models::{events::StoredEvent, transactions::StoredTransaction};
-use sui_indexer::schema::{events, transactions, tx_senders};
-use sui_types::base_types::ObjectID;
-use sui_types::Identifier;
-use sui_types::{
-    base_types::SuiAddress as NativeSuiAddress, event::Event as NativeEvent, parse_sui_struct_tag,
-};
-
-/// A Sui node emits one of the following events:
-/// Move event
-/// Publish event
-/// Transfer object event
-/// Delete object event
-/// New object event
-/// Epoch change event
-#[derive(Clone, Debug)]
-pub(crate) struct Event {
-    pub stored: Option<StoredEvent>,
-    pub native: NativeEvent,
-    /// The checkpoint sequence number this was viewed at.
-    pub checkpoint_viewed_at: u64,
-}
-
-/// Contents of an Event's cursor.
-#[derive(Serialize, Deserialize, Clone, PartialEq, Eq)]
-pub(crate) struct EventKey {
-    /// Transaction Sequence Number
-    tx: u64,
-
-    /// Event Sequence Number
-    e: u64,
-
-    /// The checkpoint sequence number this was viewed at.
-    #[serde(rename = "c")]
-    checkpoint_viewed_at: u64,
-}
-
-pub(crate) type Cursor = cursor::JsonCursor<EventKey>;
-type Query<ST, GB> = data::Query<ST, events::table, GB>;
-
-#[derive(InputObject, Clone, Default)]
-pub(crate) struct EventFilter {
-    pub sender: Option<SuiAddress>,
-    pub transaction_digest: Option<Digest>,
-    // Enhancement (post-MVP)
-    // after_checkpoint
-    // before_checkpoint
-    /// Events emitted by a particular module. An event is emitted by a
-    /// particular module if some function in the module is called by a
-    /// PTB and emits an event.
-    ///
-    /// Modules can be filtered by their package, or package::module.
-    pub emitting_module: Option<ModuleFilter>,
-
-    /// This field is used to specify the type of event emitted.
-    ///
-    /// Events can be filtered by their type's package, package::module,
-    /// or their fully qualified type name.
-    ///
-    /// Generic types can be queried by either the generic type name, e.g.
-    /// `0x2::coin::Coin`, or by the full type name, such as
-    /// `0x2::coin::Coin<0x2::sui::SUI>`.
-    pub event_type: Option<TypeFilter>,
-    // Enhancement (post-MVP)
-    // pub start_time
-    // pub end_time
-
-    // Enhancement (post-MVP)
-    // pub any
-    // pub all
-    // pub not
-}
-
-#[Object]
-impl Event {
-    /// The Move module containing some function that when called by
-    /// a programmable transaction block (PTB) emitted this event.
-    /// For example, if a PTB invokes A::m1::foo, which internally
-    /// calls A::m2::emit_event to emit an event,
-    /// the sending module would be A::m1.
-    async fn sending_module(&self, ctx: &Context<'_>) -> Result<Option<MoveModule>> {
-        MoveModule::query(
-            ctx,
-            self.native.package_id.into(),
-            &self.native.transaction_module.to_string(),
-            self.checkpoint_viewed_at,
-        )
-        .await
-        .extend()
-    }
-
-    /// Address of the sender of the event
-    async fn sender(&self) -> Result<Option<Address>> {
-        if self.native.sender == NativeSuiAddress::ZERO {
-            return Ok(None);
-        }
-
-        Ok(Some(Address {
-            address: self.native.sender.into(),
-            checkpoint_viewed_at: self.checkpoint_viewed_at,
-        }))
-    }
-
-    /// UTC timestamp in milliseconds since epoch (1/1/1970)
-    async fn timestamp(&self) -> Result<Option<DateTime>, Error> {
-        if let Some(stored) = &self.stored {
-            Ok(Some(DateTime::from_ms(stored.timestamp_ms)?))
-        } else {
-            Ok(None)
-        }
-    }
-
-    #[graphql(flatten)]
-    async fn move_value(&self) -> Result<MoveValue> {
-        Ok(MoveValue::new(
-            self.native.type_.clone().into(),
-            Base64::from(self.native.contents.clone()),
-        ))
-    }
-}
-
-impl Event {
-    /// Query the database for a `page` of events. The Page uses the transaction, event, and
-    /// checkpoint sequence numbers as the cursor to determine the correct page of results. The
-    /// query can optionally be further `filter`-ed by the `EventFilter`.
-    ///
-    /// The `checkpoint_viewed_at` parameter is represents the checkpoint sequence number at which
-    /// this page was queried for. Each entity returned in the connection will inherit this
-    /// checkpoint, so that when viewing that entity's state, it will be from the reference of this
-    /// checkpoint_viewed_at parameter.
-    ///
-    /// If the `Page<Cursor>` is set, then this function will defer to the `checkpoint_viewed_at` in
-    /// the cursor if they are consistent.
-    pub(crate) async fn paginate(
-        db: &Db,
-        page: Page<Cursor>,
-        filter: EventFilter,
-        checkpoint_viewed_at: u64,
-    ) -> Result<Connection<String, Event>, Error> {
-        let cursor_viewed_at = page.validate_cursor_consistency()?;
-        let checkpoint_viewed_at = cursor_viewed_at.unwrap_or(checkpoint_viewed_at);
-
-        let (prev, next, results) = db
-            .execute(move |conn| {
-                page.paginate_query::<StoredEvent, _, _, _>(conn, checkpoint_viewed_at, move || {
-                    let mut query = events::dsl::events.into_boxed();
-
-                    // Bound events by the provided `checkpoint_viewed_at`. From EXPLAIN
-                    // ANALYZE, using the checkpoint sequence number directly instead of
-                    // translating into a transaction sequence number bound is more efficient.
-                    query = query.filter(
-                        events::dsl::checkpoint_sequence_number.le(checkpoint_viewed_at as i64),
-                    );
-
-                    // The transactions table doesn't have an index on the senders column, so use
-                    // `tx_senders`.
-                    if let Some(sender) = &filter.sender {
-                        query = query.filter(
-                            events::dsl::tx_sequence_number.eq_any(
-                                tx_senders::dsl::tx_senders
-                                    .select(tx_senders::dsl::tx_sequence_number)
-                                    .filter(tx_senders::dsl::sender.eq(sender.into_vec())),
-                            ),
-                        )
-                    }
-
-                    if let Some(digest) = &filter.transaction_digest {
-                        // Since the event filter takes in a single tx_digest, we know that
-                        // there will only be one corresponding transaction. We can use
-                        // single_value() to tell the query planner that we expect only one
-                        // instead of a range of values, which will subsequently speed up query
-                        // execution time.
-                        query = query.filter(
-                            events::dsl::tx_sequence_number.nullable().eq(
-                                transactions::dsl::transactions
-                                    .select(transactions::dsl::tx_sequence_number)
-                                    .filter(
-                                        transactions::dsl::transaction_digest.eq(digest.to_vec()),
-                                    )
-                                    .single_value(),
-                            ),
-                        )
-                    }
-
-                    if let Some(module) = &filter.emitting_module {
-                        query = module.apply(query, events::dsl::package, events::dsl::module);
-                    }
-
-                    if let Some(type_) = &filter.event_type {
-                        query = type_.apply(
-                            query,
-                            events::dsl::event_type,
-                            events::dsl::event_type_package,
-                            events::dsl::event_type_module,
-                            events::dsl::event_type_name,
-                        );
-                    }
-
-                    query
-                })
-            })
-            .await?;
-
-        let mut conn = Connection::new(prev, next);
-
-        // The "checkpoint viewed at" sets a consistent upper bound for the nested queries.
-        for stored in results {
-            let cursor = stored.cursor(checkpoint_viewed_at).encode_cursor();
-            conn.edges.push(Edge::new(
-                cursor,
-                Event::try_from_stored_event(stored, checkpoint_viewed_at)?,
-            ));
-        }
-
-        Ok(conn)
-    }
-
-    pub(crate) fn try_from_stored_transaction(
-        stored_tx: &StoredTransaction,
-        idx: usize,
-        checkpoint_viewed_at: u64,
-    ) -> Result<Self, Error> {
-        let Some(serialized_event) = &stored_tx.get_event_at_idx(idx) else {
-            return Err(Error::Internal(format!(
-                "Could not find event with event_sequence_number {} at transaction {}",
-                idx, stored_tx.tx_sequence_number
-            )));
-        };
-
-        let native_event: NativeEvent = bcs::from_bytes(serialized_event).map_err(|_| {
-            Error::Internal(format!(
-                "Failed to deserialize event with {} at transaction {}",
-                idx, stored_tx.tx_sequence_number
-            ))
-        })?;
-
-        let stored_event = StoredEvent {
-            tx_sequence_number: stored_tx.tx_sequence_number,
-            event_sequence_number: idx as i64,
-            transaction_digest: stored_tx.transaction_digest.clone(),
-            checkpoint_sequence_number: stored_tx.checkpoint_sequence_number,
-            #[cfg(feature = "postgres-feature")]
-            senders: vec![Some(native_event.sender.to_vec())],
-            #[cfg(feature = "mysql-feature")]
-            #[cfg(not(feature = "postgres-feature"))]
-            senders: serde_json::to_value(vec![native_event.sender.to_vec()]).unwrap(),
-            package: native_event.package_id.to_vec(),
-            module: native_event.transaction_module.to_string(),
-            event_type: native_event
-                .type_
-                .to_canonical_string(/* with_prefix */ true),
-            event_type_package: native_event.type_.address.to_vec(),
-            event_type_module: native_event.type_.module.to_string(),
-            event_type_name: native_event.type_.name.to_string(),
-            bcs: native_event.contents.clone(),
-            timestamp_ms: stored_tx.timestamp_ms,
-        };
-
-        Ok(Self {
-            stored: Some(stored_event),
-            native: native_event,
-            checkpoint_viewed_at,
-        })
-    }
-
-    fn try_from_stored_event(
-        stored: StoredEvent,
-        checkpoint_viewed_at: u64,
-    ) -> Result<Self, Error> {
-        let Some(Some(sender_bytes)) = ({
-            #[cfg(feature = "postgres-feature")]
-            {
-                stored.senders.first()
-            }
-            #[cfg(feature = "mysql-feature")]
-            #[cfg(not(feature = "postgres-feature"))]
-            {
-                stored
-                    .senders
-                    .as_array()
-                    .ok_or_else(|| {
-                        Error::Internal("Failed to parse event senders as array".to_string())
-                    })?
-                    .first()
-            }
-        }) else {
-            return Err(Error::Internal("No senders found for event".to_string()));
-        };
-        let sender = NativeSuiAddress::from_bytes(sender_bytes)
-            .map_err(|e| Error::Internal(e.to_string()))?;
-        let package_id =
-            ObjectID::from_bytes(&stored.package).map_err(|e| Error::Internal(e.to_string()))?;
-        let type_ =
-            parse_sui_struct_tag(&stored.event_type).map_err(|e| Error::Internal(e.to_string()))?;
-        let transaction_module =
-            Identifier::from_str(&stored.module).map_err(|e| Error::Internal(e.to_string()))?;
-        let contents = stored.bcs.clone();
-        Ok(Event {
-            stored: Some(stored),
-            native: NativeEvent {
-                sender,
-                package_id,
-                transaction_module,
-                type_,
-                contents,
-            },
-            checkpoint_viewed_at,
-        })
-    }
-}
-
-impl Paginated<Cursor> for StoredEvent {
-    type Source = events::table;
-
-    fn filter_ge<ST, GB>(cursor: &Cursor, query: Query<ST, GB>) -> Query<ST, GB> {
-        use events::dsl::{event_sequence_number as event, tx_sequence_number as tx};
-        query.filter(
-            tx.gt(cursor.tx as i64)
-                .or(tx.eq(cursor.tx as i64).and(event.ge(cursor.e as i64))),
-        )
-    }
-
-    fn filter_le<ST, GB>(cursor: &Cursor, query: Query<ST, GB>) -> Query<ST, GB> {
-        use events::dsl::{event_sequence_number as event, tx_sequence_number as tx};
-        query.filter(
-            tx.lt(cursor.tx as i64)
-                .or(tx.eq(cursor.tx as i64).and(event.le(cursor.e as i64))),
-        )
-    }
-
-    fn order<ST, GB>(asc: bool, query: Query<ST, GB>) -> Query<ST, GB> {
-        use events::dsl;
-        if asc {
-            query
-                .order_by(dsl::tx_sequence_number.asc())
-                .then_order_by(dsl::event_sequence_number.asc())
-        } else {
-            query
-                .order_by(dsl::tx_sequence_number.desc())
-                .then_order_by(dsl::event_sequence_number.desc())
-        }
-    }
-}
-
-impl Target<Cursor> for StoredEvent {
-    fn cursor(&self, checkpoint_viewed_at: u64) -> Cursor {
-        Cursor::new(EventKey {
-            tx: self.tx_sequence_number as u64,
-            e: self.event_sequence_number as u64,
-            checkpoint_viewed_at,
-        })
-    }
-}
-
-impl Checkpointed for Cursor {
-    fn checkpoint_viewed_at(&self) -> u64 {
-        self.checkpoint_viewed_at
-    }
-}
diff --git a/crates/sui-graphql-rpc/src/types/event/cursor.rs b/crates/sui-graphql-rpc/src/types/event/cursor.rs
new file mode 100644
index 0000000000000..9a64399f1fab6
--- /dev/null
+++ b/crates/sui-graphql-rpc/src/types/event/cursor.rs
@@ -0,0 +1,183 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    consistency::Checkpointed,
+    filter,
+    raw_query::RawQuery,
+    types::cursor::{self, Paginated, RawPaginated, ScanLimited, Target},
+};
+use diesel::{
+    backend::Backend,
+    deserialize::{self, FromSql, QueryableByName},
+    row::NamedRow,
+    BoolExpressionMethods, ExpressionMethods, QueryDsl,
+};
+use serde::{Deserialize, Serialize};
+use sui_indexer::{models::events::StoredEvent, schema::events};
+
+use super::Query;
+
+/// Contents of an Event's cursor.
+#[derive(Serialize, Deserialize, Clone, PartialEq, Eq)]
+pub(crate) struct EventKey {
+    /// Transaction Sequence Number
+    pub tx: u64,
+
+    /// Event Sequence Number
+    pub e: u64,
+
+    /// The checkpoint sequence number this was viewed at.
+    #[serde(rename = "c")]
+    pub checkpoint_viewed_at: u64,
+}
+
+pub(crate) type Cursor = cursor::JsonCursor<EventKey>;
+
+/// Results from raw queries in Diesel can only be deserialized into structs that implement
+/// `QueryableByName`. This struct is used to represent a row of `tx_sequence_number` and
+/// `event_sequence_number` returned from subqueries against event lookup tables.
+#[derive(Clone, Debug)]
+pub struct EvLookup {
+    pub tx: i64,
+    pub ev: i64,
+}
+
+impl Paginated<Cursor> for StoredEvent {
+    type Source = events::table;
+
+    fn filter_ge<ST, GB>(cursor: &Cursor, query: Query<ST, GB>) -> Query<ST, GB> {
+        use events::dsl::{event_sequence_number as event, tx_sequence_number as tx};
+        query.filter(
+            tx.gt(cursor.tx as i64)
+                .or(tx.eq(cursor.tx as i64).and(event.ge(cursor.e as i64))),
+        )
+    }
+
+    fn filter_le<ST, GB>(cursor: &Cursor, query: Query<ST, GB>) -> Query<ST, GB> {
+        use events::dsl::{event_sequence_number as event, tx_sequence_number as tx};
+        query.filter(
+            tx.lt(cursor.tx as i64)
+                .or(tx.eq(cursor.tx as i64).and(event.le(cursor.e as i64))),
+        )
+    }
+
+    fn order<ST, GB>(asc: bool, query: Query<ST, GB>) -> Query<ST, GB> {
+        use events::dsl;
+        if asc {
+            query
+                .order_by(dsl::tx_sequence_number.asc())
+                .then_order_by(dsl::event_sequence_number.asc())
+        } else {
+            query
+                .order_by(dsl::tx_sequence_number.desc())
+                .then_order_by(dsl::event_sequence_number.desc())
+        }
+    }
+}
+
+impl RawPaginated<Cursor> for StoredEvent {
+    fn filter_ge(cursor: &Cursor, query: RawQuery) -> RawQuery {
+        filter!(
+            query,
+            format!(
+                "ROW(tx_sequence_number, event_sequence_number) >= ({}, {})",
+                cursor.tx, cursor.e
+            )
+        )
+    }
+
+    fn filter_le(cursor: &Cursor, query: RawQuery) -> RawQuery {
+        filter!(
+            query,
+            format!(
+                "ROW(tx_sequence_number, event_sequence_number) <= ({}, {})",
+                cursor.tx, cursor.e
+            )
+        )
+    }
+
+    fn order(asc: bool, query: RawQuery) -> RawQuery {
+        if asc {
+            query.order_by("tx_sequence_number ASC, event_sequence_number ASC")
+        } else {
+            query.order_by("tx_sequence_number DESC, event_sequence_number DESC")
+        }
+    }
+}
+
+impl Target<Cursor> for StoredEvent {
+    fn cursor(&self, checkpoint_viewed_at: u64) -> Cursor {
+        Cursor::new(EventKey {
+            tx: self.tx_sequence_number as u64,
+            e: self.event_sequence_number as u64,
+            checkpoint_viewed_at,
+        })
+    }
+}
+
+impl Checkpointed for Cursor {
+    fn checkpoint_viewed_at(&self) -> u64 {
+        self.checkpoint_viewed_at
+    }
+}
+
+impl ScanLimited for Cursor {}
+
+impl Target<Cursor> for EvLookup {
+    fn cursor(&self, checkpoint_viewed_at: u64) -> Cursor {
+        Cursor::new(EventKey {
+            tx: self.tx as u64,
+            e: self.ev as u64,
+            checkpoint_viewed_at,
+        })
+    }
+}
+
+impl RawPaginated<Cursor> for EvLookup {
+    fn filter_ge(cursor: &Cursor, query: RawQuery) -> RawQuery {
+        filter!(
+            query,
+            format!(
+                "ROW(tx_sequence_number, event_sequence_number) >= ({}, {})",
+                cursor.tx, cursor.e
+            )
+        )
+    }
+
+    fn filter_le(cursor: &Cursor, query: RawQuery) -> RawQuery {
+        filter!(
+            query,
+            format!(
+                "ROW(tx_sequence_number, event_sequence_number) <= ({}, {})",
+                cursor.tx, cursor.e
+            )
+        )
+    }
+
+    fn order(asc: bool, query: RawQuery) -> RawQuery {
+        if asc {
+            query.order_by("tx_sequence_number ASC, event_sequence_number ASC")
+        } else {
+            query.order_by("tx_sequence_number DESC, event_sequence_number DESC")
+        }
+    }
+}
+
+/// `sql_query` raw queries require `QueryableByName`. The default implementation looks for a table
+/// based on the struct name, and it also expects the struct's fields to reflect the table's
+/// columns. We can override this behavior by implementing `QueryableByName` for our struct. For
+/// `EvLookup`, its fields are derived from the common `tx_sequence_number` and
+/// `event_sequence_number` columns for all events-related tables.
+impl<DB> QueryableByName<DB> for EvLookup
+where
+    DB: Backend,
+    i64: FromSql<diesel::sql_types::BigInt, DB>,
+{
+    fn build<'a>(row: &impl NamedRow<'a, DB>) -> deserialize::Result<Self> {
+        let tx = NamedRow::get::<diesel::sql_types::BigInt, _>(row, "tx_sequence_number")?;
+        let ev = NamedRow::get::<diesel::sql_types::BigInt, _>(row, "event_sequence_number")?;
+
+        Ok(Self { tx, ev })
+    }
+}
diff --git a/crates/sui-graphql-rpc/src/types/event/filter.rs b/crates/sui-graphql-rpc/src/types/event/filter.rs
new file mode 100644
index 0000000000000..0a02a31be8969
--- /dev/null
+++ b/crates/sui-graphql-rpc/src/types/event/filter.rs
@@ -0,0 +1,44 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::types::{
+    digest::Digest,
+    sui_address::SuiAddress,
+    type_filter::{ModuleFilter, TypeFilter},
+};
+use async_graphql::*;
+
+#[derive(InputObject, Clone, Default)]
+pub(crate) struct EventFilter {
+    pub sender: Option<SuiAddress>,
+    pub transaction_digest: Option<Digest>,
+    // Enhancement (post-MVP)
+    // after_checkpoint
+    // before_checkpoint
+    /// Events emitted by a particular module. An event is emitted by a
+    /// particular module if some function in the module is called by a
+    /// PTB and emits an event.
+    ///
+    /// Modules can be filtered by their package, or package::module.
+    /// We currently do not support filtering by emitting module and event type
+    /// at the same time so if both are provided in one filter, the query will error.
+    pub emitting_module: Option<ModuleFilter>,
+
+    /// This field is used to specify the type of event emitted.
+    ///
+    /// Events can be filtered by their type's package, package::module,
+    /// or their fully qualified type name.
+    ///
+    /// Generic types can be queried by either the generic type name, e.g.
+    /// `0x2::coin::Coin`, or by the full type name, such as
+    /// `0x2::coin::Coin<0x2::sui::SUI>`.
+    pub event_type: Option<TypeFilter>,
+    // Enhancement (post-MVP)
+    // pub start_time
+    // pub end_time
+
+    // Enhancement (post-MVP)
+    // pub any
+    // pub all
+    // pub not
+}
diff --git a/crates/sui-graphql-rpc/src/types/event/lookups.rs b/crates/sui-graphql-rpc/src/types/event/lookups.rs
new file mode 100644
index 0000000000000..93a9a55bf6e6b
--- /dev/null
+++ b/crates/sui-graphql-rpc/src/types/event/lookups.rs
@@ -0,0 +1,158 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    data::pg::bytea_literal,
+    filter, query,
+    raw_query::RawQuery,
+    types::{
+        cursor::Page,
+        digest::Digest,
+        sui_address::SuiAddress,
+        type_filter::{ModuleFilter, TypeFilter},
+    },
+};
+
+use std::fmt::Write;
+
+use super::Cursor;
+
+fn select_ev(sender: Option<SuiAddress>, from: &str) -> RawQuery {
+    let query = query!(format!(
+        "SELECT tx_sequence_number, event_sequence_number FROM {}",
+        from
+    ));
+
+    if let Some(sender) = sender {
+        return query.filter(format!("sender = {}", bytea_literal(sender.as_slice())));
+    }
+
+    query
+}
+
+pub(crate) fn select_sender(sender: SuiAddress) -> RawQuery {
+    select_ev(Some(sender), "event_senders")
+}
+
+pub(crate) fn select_event_type(event_type: &TypeFilter, sender: Option<SuiAddress>) -> RawQuery {
+    match event_type {
+        TypeFilter::ByModule(ModuleFilter::ByPackage(p)) => {
+            filter!(
+                select_ev(sender, "event_struct_package"),
+                format!("package = {}", bytea_literal(p.as_slice()))
+            )
+        }
+        TypeFilter::ByModule(ModuleFilter::ByModule(p, m)) => {
+            filter!(
+                select_ev(sender, "event_struct_module"),
+                format!(
+                    "package = {} and module = {{}}",
+                    bytea_literal(p.as_slice())
+                ),
+                m
+            )
+        }
+        TypeFilter::ByType(tag) => {
+            let package = tag.address;
+            let module = tag.module.to_string();
+            let mut name = tag.name.as_str().to_owned();
+            let (table, col_name) = if tag.type_params.is_empty() {
+                ("event_struct_name", "type_name")
+            } else {
+                let mut prefix = "<";
+                for param in &tag.type_params {
+                    name += prefix;
+                    // SAFETY: write! to String always succeeds.
+                    write!(
+                        name,
+                        "{}",
+                        param.to_canonical_display(/* with_prefix */ true)
+                    )
+                    .unwrap();
+                    prefix = ", ";
+                }
+                name += ">";
+                ("event_struct_instantiation", "type_instantiation")
+            };
+
+            filter!(
+                select_ev(sender, table),
+                format!(
+                    "package = {} and module = {{}} and {} = {{}}",
+                    bytea_literal(package.as_slice()),
+                    col_name
+                ),
+                module,
+                name
+            )
+        }
+    }
+}
+
+pub(crate) fn select_emit_module(
+    emit_module: &ModuleFilter,
+    sender: Option<SuiAddress>,
+) -> RawQuery {
+    match emit_module {
+        ModuleFilter::ByPackage(p) => {
+            filter!(
+                select_ev(sender, "event_emit_package"),
+                format!("package = {}", bytea_literal(p.as_slice()))
+            )
+        }
+        ModuleFilter::ByModule(p, m) => {
+            filter!(
+                select_ev(sender, "event_emit_module"),
+                format!(
+                    "package = {} and module = {{}}",
+                    bytea_literal(p.as_slice())
+                ),
+                m
+            )
+        }
+    }
+}
+
+/// Adds filters to bound an events query from above and below based on cursors and filters. The
+/// query will always at least be bounded by `tx_hi`, the current exclusive upperbound on
+/// transaction sequence numbers, based on the consistency cursor.
+pub(crate) fn add_bounds(
+    mut query: RawQuery,
+    tx_digest_filter: &Option<Digest>,
+    page: &Page<Cursor>,
+    tx_hi: i64,
+) -> RawQuery {
+    query = filter!(query, format!("tx_sequence_number < {}", tx_hi));
+
+    if let Some(after) = page.after() {
+        query = filter!(
+            query,
+            format!(
+                "ROW(tx_sequence_number, event_sequence_number) >= ({}, {})",
+                after.tx, after.e
+            )
+        );
+    }
+
+    if let Some(before) = page.before() {
+        query = filter!(
+            query,
+            format!(
+                "ROW(tx_sequence_number, event_sequence_number) <= ({}, {})",
+                before.tx, before.e
+            )
+        );
+    }
+
+    if let Some(digest) = tx_digest_filter {
+        query = filter!(
+            query,
+            format!(
+                "tx_sequence_number = (SELECT tx_sequence_number FROM tx_digests WHERE tx_digest = {})",
+                bytea_literal(digest.as_slice()),
+            )
+        );
+    }
+
+    query
+}
diff --git a/crates/sui-graphql-rpc/src/types/event/mod.rs b/crates/sui-graphql-rpc/src/types/event/mod.rs
new file mode 100644
index 0000000000000..10c130c7f43c1
--- /dev/null
+++ b/crates/sui-graphql-rpc/src/types/event/mod.rs
@@ -0,0 +1,285 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use std::str::FromStr;
+
+use super::cursor::{Page, Target};
+use super::{
+    address::Address, base64::Base64, date_time::DateTime, move_module::MoveModule,
+    move_value::MoveValue,
+};
+use crate::data::{self, DbConnection, QueryExecutor};
+use crate::query;
+use crate::{data::Db, error::Error};
+use async_graphql::connection::{Connection, CursorType, Edge};
+use async_graphql::*;
+use cursor::EvLookup;
+use diesel::{ExpressionMethods, QueryDsl};
+use lookups::{add_bounds, select_emit_module, select_event_type, select_sender};
+use sui_indexer::models::{events::StoredEvent, transactions::StoredTransaction};
+use sui_indexer::schema::{checkpoints, events};
+use sui_types::base_types::ObjectID;
+use sui_types::Identifier;
+use sui_types::{
+    base_types::SuiAddress as NativeSuiAddress, event::Event as NativeEvent, parse_sui_struct_tag,
+};
+
+mod cursor;
+mod filter;
+mod lookups;
+pub(crate) use cursor::Cursor;
+pub(crate) use filter::EventFilter;
+
+/// A Sui node emits one of the following events:
+/// Move event
+/// Publish event
+/// Transfer object event
+/// Delete object event
+/// New object event
+/// Epoch change event
+#[derive(Clone, Debug)]
+pub(crate) struct Event {
+    pub stored: Option<StoredEvent>,
+    pub native: NativeEvent,
+    /// The checkpoint sequence number this was viewed at.
+    pub checkpoint_viewed_at: u64,
+}
+
+type Query<ST, GB> = data::Query<ST, events::table, GB>;
+
+#[Object]
+impl Event {
+    /// The Move module containing some function that when called by
+    /// a programmable transaction block (PTB) emitted this event.
+    /// For example, if a PTB invokes A::m1::foo, which internally
+    /// calls A::m2::emit_event to emit an event,
+    /// the sending module would be A::m1.
+    async fn sending_module(&self, ctx: &Context<'_>) -> Result<Option<MoveModule>> {
+        MoveModule::query(
+            ctx,
+            self.native.package_id.into(),
+            &self.native.transaction_module.to_string(),
+            self.checkpoint_viewed_at,
+        )
+        .await
+        .extend()
+    }
+
+    /// Address of the sender of the event
+    async fn sender(&self) -> Result<Option<Address>> {
+        if self.native.sender == NativeSuiAddress::ZERO {
+            return Ok(None);
+        }
+
+        Ok(Some(Address {
+            address: self.native.sender.into(),
+            checkpoint_viewed_at: self.checkpoint_viewed_at,
+        }))
+    }
+
+    /// UTC timestamp in milliseconds since epoch (1/1/1970)
+    async fn timestamp(&self) -> Result<Option<DateTime>, Error> {
+        if let Some(stored) = &self.stored {
+            Ok(Some(DateTime::from_ms(stored.timestamp_ms)?))
+        } else {
+            Ok(None)
+        }
+    }
+
+    #[graphql(flatten)]
+    async fn move_value(&self) -> Result<MoveValue> {
+        Ok(MoveValue::new(
+            self.native.type_.clone().into(),
+            Base64::from(self.native.contents.clone()),
+        ))
+    }
+}
+
+impl Event {
+    /// Query the database for a `page` of events. The Page uses the transaction, event, and
+    /// checkpoint sequence numbers as the cursor to determine the correct page of results. The
+    /// query can optionally be further `filter`-ed by the `EventFilter`.
+    ///
+    /// The `checkpoint_viewed_at` parameter represents the checkpoint sequence number at which
+    /// this page was queried. Each entity returned in the connection inherits this checkpoint, so
+    /// that when viewing that entity's state, it's as if it's being viewed at this checkpoint.
+    ///
+    /// The cursors in `page` might also include checkpoint viewed at fields. If these are set,
+    /// they take precedence over the checkpoint that pagination is being conducted in.
+    pub(crate) async fn paginate(
+        db: &Db,
+        page: Page<Cursor>,
+        filter: EventFilter,
+        checkpoint_viewed_at: u64,
+    ) -> Result<Connection<String, Event>, Error> {
+        let cursor_viewed_at = page.validate_cursor_consistency()?;
+        let checkpoint_viewed_at = cursor_viewed_at.unwrap_or(checkpoint_viewed_at);
+
+        // Construct tx and ev sequence number query with table-relevant filters, if they exist. The
+        // resulting query will look something like `SELECT tx_sequence_number,
+        // event_sequence_number FROM lookup_table WHERE ...`. If no filter is provided we don't
+        // need to use any lookup tables and can just query `events` table, as can be seen in the
+        // code below.
+        let query_constraint = match (filter.sender, &filter.emitting_module, &filter.event_type) {
+            (None, None, None) => None,
+            (Some(sender), None, None) => Some(select_sender(sender)),
+            (sender, None, Some(event_type)) => Some(select_event_type(event_type, sender)),
+            (sender, Some(module), None) => Some(select_emit_module(module, sender)),
+            (_, Some(_), Some(_)) => {
+                return Err(Error::Client(
+                    "Filtering by both emitting module and event type is not supported".to_string(),
+                ))
+            }
+        };
+
+        use checkpoints::dsl;
+        let (prev, next, results) = db
+            .execute(move |conn| {
+                let tx_hi: i64 = conn.first(move || {
+                    dsl::checkpoints.select(dsl::network_total_transactions)
+                        .filter(dsl::sequence_number.eq(checkpoint_viewed_at as i64))
+                })?;
+
+                let (prev, next, mut events): (bool, bool, Vec<StoredEvent>) =
+                    if let Some(filter_query) =  query_constraint {
+                        let query = add_bounds(filter_query, &filter.transaction_digest, &page, tx_hi);
+
+                        let (prev, next, results) =
+                            page.paginate_raw_query::<EvLookup>(conn, checkpoint_viewed_at, query)?;
+
+                        let ev_lookups = results
+                            .into_iter()
+                            .map(|x| (x.tx, x.ev))
+                            .collect::<Vec<(i64, i64)>>();
+
+                        if ev_lookups.is_empty() {
+                            return Ok::<_, diesel::result::Error>((prev, next, vec![]));
+                        }
+
+                        // Unlike a multi-get on a single column which can be serviced by a query `IN
+                        // (...)`, because events have a composite primary key, the query planner tends
+                        // to perform a sequential scan when given a list of tuples to lookup. A query
+                        // using `UNION ALL` allows us to leverage the index on the composite key.
+                        let events = conn.results(move || {
+                            // Diesel's DSL does not current support chained `UNION ALL`, so we have to turn
+                            // to `RawQuery` here.
+                            let query_string = ev_lookups.iter()
+                                .map(|&(tx, ev)| {
+                                    format!("SELECT * FROM events WHERE tx_sequence_number = {} AND event_sequence_number = {}", tx, ev)
+                                })
+                                .collect::<Vec<String>>()
+                                .join(" UNION ALL ");
+
+                            query!(query_string).into_boxed()
+                        })?;
+                        (prev, next, events)
+                    } else {
+                        // No filter is provided so we add bounds to the basic `SELECT * FROM
+                        // events` query and call it a day.
+                        let query = add_bounds(query!("SELECT * FROM events"), &filter.transaction_digest, &page, tx_hi);
+                        let (prev, next, events_iter) = page.paginate_raw_query::<StoredEvent>(conn, checkpoint_viewed_at, query)?;
+                        let events = events_iter.collect::<Vec<StoredEvent>>();
+                        (prev, next, events)
+                    };
+
+                // UNION ALL does not guarantee order, so we need to sort the results. Whether
+                // `first` or `last, the result set is always sorted in ascending order.
+                events.sort_by(|a, b| {
+                        a.tx_sequence_number.cmp(&b.tx_sequence_number)
+                            .then_with(|| a.event_sequence_number.cmp(&b.event_sequence_number))
+                });
+
+
+                Ok::<_, diesel::result::Error>((prev, next, events))
+            })
+            .await?;
+
+        let mut conn = Connection::new(prev, next);
+
+        // The "checkpoint viewed at" sets a consistent upper bound for the nested queries.
+        for stored in results {
+            let cursor = stored.cursor(checkpoint_viewed_at).encode_cursor();
+            conn.edges.push(Edge::new(
+                cursor,
+                Event::try_from_stored_event(stored, checkpoint_viewed_at)?,
+            ));
+        }
+
+        Ok(conn)
+    }
+
+    pub(crate) fn try_from_stored_transaction(
+        stored_tx: &StoredTransaction,
+        idx: usize,
+        checkpoint_viewed_at: u64,
+    ) -> Result<Self, Error> {
+        let Some(serialized_event) = &stored_tx.get_event_at_idx(idx) else {
+            return Err(Error::Internal(format!(
+                "Could not find event with event_sequence_number {} at transaction {}",
+                idx, stored_tx.tx_sequence_number
+            )));
+        };
+
+        let native_event: NativeEvent = bcs::from_bytes(serialized_event).map_err(|_| {
+            Error::Internal(format!(
+                "Failed to deserialize event with {} at transaction {}",
+                idx, stored_tx.tx_sequence_number
+            ))
+        })?;
+
+        let stored_event = StoredEvent {
+            tx_sequence_number: stored_tx.tx_sequence_number,
+            event_sequence_number: idx as i64,
+            transaction_digest: stored_tx.transaction_digest.clone(),
+            #[cfg(feature = "postgres-feature")]
+            senders: vec![Some(native_event.sender.to_vec())],
+            package: native_event.package_id.to_vec(),
+            module: native_event.transaction_module.to_string(),
+            event_type: native_event
+                .type_
+                .to_canonical_string(/* with_prefix */ true),
+            bcs: native_event.contents.clone(),
+            timestamp_ms: stored_tx.timestamp_ms,
+        };
+
+        Ok(Self {
+            stored: Some(stored_event),
+            native: native_event,
+            checkpoint_viewed_at,
+        })
+    }
+
+    fn try_from_stored_event(
+        stored: StoredEvent,
+        checkpoint_viewed_at: u64,
+    ) -> Result<Self, Error> {
+        let Some(Some(sender_bytes)) = ({
+            #[cfg(feature = "postgres-feature")]
+            {
+                stored.senders.first()
+            }
+        }) else {
+            return Err(Error::Internal("No senders found for event".to_string()));
+        };
+        let sender = NativeSuiAddress::from_bytes(sender_bytes)
+            .map_err(|e| Error::Internal(e.to_string()))?;
+        let package_id =
+            ObjectID::from_bytes(&stored.package).map_err(|e| Error::Internal(e.to_string()))?;
+        let type_ =
+            parse_sui_struct_tag(&stored.event_type).map_err(|e| Error::Internal(e.to_string()))?;
+        let transaction_module =
+            Identifier::from_str(&stored.module).map_err(|e| Error::Internal(e.to_string()))?;
+        let contents = stored.bcs.clone();
+        Ok(Event {
+            stored: Some(stored),
+            native: NativeEvent {
+                sender,
+                package_id,
+                transaction_module,
+                type_,
+                contents,
+            },
+            checkpoint_viewed_at,
+        })
+    }
+}
diff --git a/crates/sui-graphql-rpc/src/types/move_module.rs b/crates/sui-graphql-rpc/src/types/move_module.rs
index e34ad6c46a8bc..f85d6fe558abc 100644
--- a/crates/sui-graphql-rpc/src/types/move_module.rs
+++ b/crates/sui-graphql-rpc/src/types/move_module.rs
@@ -15,7 +15,6 @@ use super::datatype::MoveDatatype;
 use super::move_enum::MoveEnum;
 use super::move_function::MoveFunction;
 use super::move_struct::MoveStruct;
-use super::object::Object;
 use super::{base64::Base64, move_package::MovePackage, sui_address::SuiAddress};
 
 #[derive(Clone)]
@@ -40,7 +39,7 @@ impl MoveModule {
         MovePackage::query(
             ctx,
             self.storage_id,
-            Object::latest_at(self.checkpoint_viewed_at),
+            MovePackage::by_id_at(self.checkpoint_viewed_at),
         )
         .await
         .extend()?
@@ -91,7 +90,7 @@ impl MoveModule {
         let Some(package) = MovePackage::query(
             ctx,
             self.storage_id,
-            Object::latest_at(checkpoint_viewed_at),
+            MovePackage::by_id_at(checkpoint_viewed_at),
         )
         .await
         .extend()?
@@ -482,7 +481,7 @@ impl MoveModule {
         checkpoint_viewed_at: u64,
     ) -> Result<Option<Self>, Error> {
         let Some(package) =
-            MovePackage::query(ctx, address, Object::latest_at(checkpoint_viewed_at)).await?
+            MovePackage::query(ctx, address, MovePackage::by_id_at(checkpoint_viewed_at)).await?
         else {
             return Ok(None);
         };
diff --git a/crates/sui-graphql-rpc/src/types/move_object.rs b/crates/sui-graphql-rpc/src/types/move_object.rs
index d41b8dd639420..cabe71c92bf60 100644
--- a/crates/sui-graphql-rpc/src/types/move_object.rs
+++ b/crates/sui-graphql-rpc/src/types/move_object.rs
@@ -20,6 +20,7 @@ use super::transaction_block::{self, TransactionBlock, TransactionBlockFilter};
 use super::type_filter::ExactTypeFilter;
 use super::uint53::UInt53;
 use super::{coin::Coin, object::Object};
+use crate::connection::ScanConnection;
 use crate::data::Db;
 use crate::error::Error;
 use crate::types::stake::StakedSui;
@@ -49,6 +50,7 @@ pub(crate) enum MoveObjectDowncastError {
 
 /// This interface is implemented by types that represent a Move object on-chain (A Move value whose
 /// type has `key`).
+#[allow(clippy::duplicated_attributes)]
 #[derive(Interface)]
 #[graphql(
     name = "IMoveObject",
@@ -261,6 +263,25 @@ impl MoveObject {
     }
 
     /// The transaction blocks that sent objects to this object.
+    ///
+    /// `scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+    /// results. It is required for queries that apply more than two complex filters (on function,
+    /// kind, sender, recipient, input object, changed object, or ids), and can be at most
+    /// `serviceConfig.maxScanLimit`.
+    ///
+    /// When the scan limit is reached the page will be returned even if it has fewer than `first`
+    /// results when paginating forward (`last` when paginating backwards). If there are more
+    /// transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+    /// `true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+    /// transaction that was scanned as opposed to the last (or first) transaction in the page.
+    ///
+    /// Requesting the next (or previous) page after this cursor will resume the search, scanning
+    /// the next `scanLimit` many transactions in the direction of pagination, and so on until all
+    /// transactions in the scanning range have been visited.
+    ///
+    /// By default, the scanning range includes all transactions known to GraphQL, but it can be
+    /// restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+    /// `afterCheckpoint` and `atCheckpoint` filters.
     pub(crate) async fn received_transaction_blocks(
         &self,
         ctx: &Context<'_>,
@@ -269,9 +290,10 @@ impl MoveObject {
         last: Option<u64>,
         before: Option<transaction_block::Cursor>,
         filter: Option<TransactionBlockFilter>,
-    ) -> Result<Connection<String, TransactionBlock>> {
+        scan_limit: Option<u64>,
+    ) -> Result<ScanConnection<String, TransactionBlock>> {
         ObjectImpl(&self.super_)
-            .received_transaction_blocks(ctx, first, after, last, before, filter)
+            .received_transaction_blocks(ctx, first, after, last, before, filter, scan_limit)
             .await
     }
 
diff --git a/crates/sui-graphql-rpc/src/types/move_package.rs b/crates/sui-graphql-rpc/src/types/move_package.rs
index 1791b0bde32ca..a85bc75d8a661 100644
--- a/crates/sui-graphql-rpc/src/types/move_package.rs
+++ b/crates/sui-graphql-rpc/src/types/move_package.rs
@@ -1,16 +1,16 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+use std::collections::{BTreeMap, BTreeSet, HashMap};
+
 use super::balance::{self, Balance};
 use super::base64::Base64;
 use super::big_int::BigInt;
 use super::coin::Coin;
-use super::cursor::{JsonCursor, Page};
+use super::cursor::{BcsCursor, JsonCursor, Page, RawPaginated, ScanLimited, Target};
 use super::move_module::MoveModule;
 use super::move_object::MoveObject;
-use super::object::{
-    self, Object, ObjectFilter, ObjectImpl, ObjectLookup, ObjectOwner, ObjectStatus,
-};
+use super::object::{self, Object, ObjectFilter, ObjectImpl, ObjectOwner, ObjectStatus};
 use super::owner::OwnerImpl;
 use super::stake::StakedSui;
 use super::sui_address::SuiAddress;
@@ -18,11 +18,23 @@ use super::suins_registration::{DomainFormat, SuinsRegistration};
 use super::transaction_block::{self, TransactionBlock, TransactionBlockFilter};
 use super::type_filter::ExactTypeFilter;
 use super::uint53::UInt53;
-use crate::consistency::ConsistentNamedCursor;
+use crate::connection::ScanConnection;
+use crate::consistency::{Checkpointed, ConsistentNamedCursor};
+use crate::data::{DataLoader, Db, DbConnection, QueryExecutor};
 use crate::error::Error;
+use crate::raw_query::RawQuery;
+use crate::types::sui_address::addr;
+use crate::{filter, query};
 use async_graphql::connection::{Connection, CursorType, Edge};
+use async_graphql::dataloader::Loader;
 use async_graphql::*;
+use diesel::prelude::QueryableByName;
+use diesel::{BoolExpressionMethods, ExpressionMethods, JoinOnDsl, QueryDsl, Selectable};
+use serde::{Deserialize, Serialize};
+use sui_indexer::models::objects::StoredHistoryObject;
+use sui_indexer::schema::packages;
 use sui_package_resolver::{error::Error as PackageCacheError, Package as ParsedMovePackage};
+use sui_types::is_system_package;
 use sui_types::{move_package::MovePackage as NativeMovePackage, object::Data};
 
 #[derive(Clone)]
@@ -35,6 +47,49 @@ pub(crate) struct MovePackage {
     pub native: NativeMovePackage,
 }
 
+/// Filter for paginating `MovePackage`s that were created within a range of checkpoints.
+#[derive(InputObject, Debug, Default, Clone)]
+pub(crate) struct MovePackageCheckpointFilter {
+    /// Fetch packages that were published strictly after this checkpoint. Omitting this fetches
+    /// packages published since genesis.
+    pub after_checkpoint: Option<UInt53>,
+
+    /// Fetch packages that were published strictly before this checkpoint. Omitting this fetches
+    /// packages published up to the latest checkpoint (inclusive).
+    pub before_checkpoint: Option<UInt53>,
+}
+
+/// Filter for paginating versions of a given `MovePackage`.
+#[derive(InputObject, Debug, Default, Clone)]
+pub(crate) struct MovePackageVersionFilter {
+    /// Fetch versions of this package that are strictly newer than this version. Omitting this
+    /// fetches versions since the original version.
+    pub after_version: Option<UInt53>,
+
+    /// Fetch versions of this package that are strictly older than this version. Omitting this
+    /// fetches versions up to the latest version (inclusive).
+    pub before_version: Option<UInt53>,
+}
+
+/// Filter for a point query of a MovePackage, supporting querying different versions of a package
+/// by their version. Note that different versions of the same user package exist at different IDs
+/// to each other, so this is different from looking up the historical version of an object.
+pub(crate) enum PackageLookup {
+    /// Get the package at the given address, if it was created before the given checkpoint.
+    ById { checkpoint_viewed_at: u64 },
+
+    /// Get the package whose original ID matches the storage ID of the package at the given
+    /// address, but whose version is `version`.
+    Versioned {
+        version: u64,
+        checkpoint_viewed_at: u64,
+    },
+
+    /// Get the package whose original ID matches the storage ID of the package at the given
+    /// address, but that has the max version at the given checkpoint.
+    Latest { checkpoint_viewed_at: u64 },
+}
+
 /// Information used by a package to link to a specific version of its dependency.
 #[derive(SimpleObject)]
 struct Linkage {
@@ -62,9 +117,51 @@ struct TypeOrigin {
     defining_id: SuiAddress,
 }
 
+/// A wrapper around the stored representation of a package, used to implement pagination-related
+/// traits.
+#[derive(Selectable, QueryableByName)]
+#[diesel(table_name = packages)]
+struct StoredHistoryPackage {
+    original_id: Vec<u8>,
+    #[diesel(embed)]
+    object: StoredHistoryObject,
+}
+
 pub(crate) struct MovePackageDowncastError;
 
 pub(crate) type CModule = JsonCursor<ConsistentNamedCursor>;
+pub(crate) type Cursor = BcsCursor<PackageCursor>;
+
+/// The inner struct for the `MovePackage` cursor. The package is identified by the checkpoint it
+/// was created in, its original ID, and its version, and the `checkpoint_viewed_at` specifies the
+/// checkpoint snapshot that the data came from.
+#[derive(Serialize, Deserialize, Clone, PartialEq, Eq, Debug)]
+pub(crate) struct PackageCursor {
+    pub checkpoint_sequence_number: u64,
+    pub original_id: Vec<u8>,
+    pub package_version: u64,
+    pub checkpoint_viewed_at: u64,
+}
+
+/// `DataLoader` key for fetching the storage ID of the (user) package that shares an original (aka
+/// runtime) ID with the package stored at `package_id`, and whose version is `version`.
+///
+/// Note that this is different from looking up the historical version of an object -- the query
+/// returns the ID of the package (each version of a user package is at a different ID) -- and it
+/// does not work for system packages (whose versions do all reside under the same ID).
+#[derive(Copy, Clone, Hash, Eq, PartialEq, Debug)]
+struct PackageVersionKey {
+    address: SuiAddress,
+    version: u64,
+}
+
+/// `DataLoader` key for fetching the latest version of a user package: The package with the largest
+/// version whose original ID matches the original ID of the package at `address`.
+#[derive(Copy, Clone, Hash, Eq, PartialEq, Debug)]
+struct LatestKey {
+    address: SuiAddress,
+    checkpoint_viewed_at: u64,
+}
 
 /// A MovePackage is a kind of Move object that represents code that has been published on chain.
 /// It exposes information about its modules, type definitions, functions, and dependencies.
@@ -236,6 +333,25 @@ impl MovePackage {
     /// The transaction blocks that sent objects to this package.
     ///
     /// Note that objects that have been sent to a package become inaccessible.
+    ///
+    /// `scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+    /// results. It is required for queries that apply more than two complex filters (on function,
+    /// kind, sender, recipient, input object, changed object, or ids), and can be at most
+    /// `serviceConfig.maxScanLimit`.
+    ///
+    /// When the scan limit is reached the page will be returned even if it has fewer than `first`
+    /// results when paginating forward (`last` when paginating backwards). If there are more
+    /// transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+    /// `true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+    /// transaction that was scanned as opposed to the last (or first) transaction in the page.
+    ///
+    /// Requesting the next (or previous) page after this cursor will resume the search, scanning
+    /// the next `scanLimit` many transactions in the direction of pagination, and so on until all
+    /// transactions in the scanning range have been visited.
+    ///
+    /// By default, the scanning range includes all transactions known to GraphQL, but it can be
+    /// restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+    /// `afterCheckpoint` and `atCheckpoint` filters.
     pub(crate) async fn received_transaction_blocks(
         &self,
         ctx: &Context<'_>,
@@ -244,9 +360,10 @@ impl MovePackage {
         last: Option<u64>,
         before: Option<transaction_block::Cursor>,
         filter: Option<TransactionBlockFilter>,
-    ) -> Result<Connection<String, TransactionBlock>> {
+        scan_limit: Option<u64>,
+    ) -> Result<ScanConnection<String, TransactionBlock>> {
         ObjectImpl(&self.super_)
-            .received_transaction_blocks(ctx, first, after, last, before, filter)
+            .received_transaction_blocks(ctx, first, after, last, before, filter, scan_limit)
             .await
     }
 
@@ -255,6 +372,60 @@ impl MovePackage {
         ObjectImpl(&self.super_).bcs().await
     }
 
+    /// Fetch another version of this package (the package that shares this package's original ID,
+    /// but has the specified `version`).
+    async fn package_at_version(
+        &self,
+        ctx: &Context<'_>,
+        version: u64,
+    ) -> Result<Option<MovePackage>> {
+        MovePackage::query(
+            ctx,
+            self.super_.address,
+            MovePackage::by_version(version, self.checkpoint_viewed_at_impl()),
+        )
+        .await
+        .extend()
+    }
+
+    /// Fetch all versions of this package (packages that share this package's original ID),
+    /// optionally bounding the versions exclusively from below with `afterVersion`, or from above
+    /// with `beforeVersion`.
+    async fn package_versions(
+        &self,
+        ctx: &Context<'_>,
+        first: Option<u64>,
+        after: Option<Cursor>,
+        last: Option<u64>,
+        before: Option<Cursor>,
+        filter: Option<MovePackageVersionFilter>,
+    ) -> Result<Connection<String, MovePackage>> {
+        let page = Page::from_params(ctx.data_unchecked(), first, after, last, before)?;
+
+        MovePackage::paginate_by_version(
+            ctx.data_unchecked(),
+            page,
+            self.super_.address,
+            filter,
+            self.checkpoint_viewed_at_impl(),
+        )
+        .await
+        .extend()
+    }
+
+    /// Fetch the latest version of this package (the package with the highest `version` that shares
+    /// this packages's original ID)
+    async fn latest_package(&self, ctx: &Context<'_>) -> Result<MovePackage> {
+        Ok(MovePackage::query(
+            ctx,
+            self.super_.address,
+            MovePackage::latest_at(self.checkpoint_viewed_at_impl()),
+        )
+        .await
+        .extend()?
+        .ok_or_else(|| Error::Internal("No latest version found".to_string()))?)
+    }
+
     /// A representation of the module called `name` in this package, including the
     /// structs and functions it defines.
     async fn module(&self, name: String) -> Result<Option<MoveModule>> {
@@ -416,11 +587,82 @@ impl MovePackage {
         }
     }
 
+    /// Look-up the package by its Storage ID, as of a given checkpoint.
+    pub(crate) fn by_id_at(checkpoint_viewed_at: u64) -> PackageLookup {
+        PackageLookup::ById {
+            checkpoint_viewed_at,
+        }
+    }
+
+    /// Look-up a specific version of the package, identified by the storage ID of any version of
+    /// the package, and the desired version (the actual object loaded might be at a different
+    /// object ID).
+    pub(crate) fn by_version(version: u64, checkpoint_viewed_at: u64) -> PackageLookup {
+        PackageLookup::Versioned {
+            version,
+            checkpoint_viewed_at,
+        }
+    }
+
+    /// Look-up the package that shares the same original ID as the package at `address`, but has
+    /// the latest version, as of the given checkpoint.
+    pub(crate) fn latest_at(checkpoint_viewed_at: u64) -> PackageLookup {
+        PackageLookup::Latest {
+            checkpoint_viewed_at,
+        }
+    }
+
     pub(crate) async fn query(
         ctx: &Context<'_>,
         address: SuiAddress,
-        key: ObjectLookup,
+        key: PackageLookup,
     ) -> Result<Option<Self>, Error> {
+        let (address, key) = match key {
+            PackageLookup::ById {
+                checkpoint_viewed_at,
+            } => (address, Object::latest_at(checkpoint_viewed_at)),
+
+            PackageLookup::Versioned {
+                version,
+                checkpoint_viewed_at,
+            } => {
+                if is_system_package(address) {
+                    (address, Object::at_version(version, checkpoint_viewed_at))
+                } else {
+                    let DataLoader(loader) = &ctx.data_unchecked();
+                    let Some(translation) = loader
+                        .load_one(PackageVersionKey { address, version })
+                        .await?
+                    else {
+                        return Ok(None);
+                    };
+
+                    (translation, Object::latest_at(checkpoint_viewed_at))
+                }
+            }
+
+            PackageLookup::Latest {
+                checkpoint_viewed_at,
+            } => {
+                if is_system_package(address) {
+                    (address, Object::latest_at(checkpoint_viewed_at))
+                } else {
+                    let DataLoader(loader) = &ctx.data_unchecked();
+                    let Some(translation) = loader
+                        .load_one(LatestKey {
+                            address,
+                            checkpoint_viewed_at,
+                        })
+                        .await?
+                    else {
+                        return Ok(None);
+                    };
+
+                    (translation, Object::latest_at(checkpoint_viewed_at))
+                }
+            }
+        };
+
         let Some(object) = Object::query(ctx, address, key).await? else {
             return Ok(None);
         };
@@ -429,6 +671,342 @@ impl MovePackage {
             Error::Internal(format!("{address} is not a package"))
         })?))
     }
+
+    /// Query the database for a `page` of Move packages. The Page uses the checkpoint sequence
+    /// number the package was created at, its original ID, and its version as the cursor. The query
+    /// can optionally be filtered by a bound on the checkpoints the packages were created in.
+    ///
+    /// The `checkpoint_viewed_at` parameter represents the checkpoint sequence number at which this
+    /// page was queried. Each entity returned in the connection will inherit this checkpoint, so
+    /// that when viewing that entity's state, it will be as if it is being viewed at this
+    /// checkpoint.
+    ///
+    /// The cursors in `page` may also include checkpoint viewed at fields. If these are set, they
+    /// take precedence over the checkpoint that pagination is being conducted in.
+    pub(crate) async fn paginate_by_checkpoint(
+        db: &Db,
+        page: Page<Cursor>,
+        filter: Option<MovePackageCheckpointFilter>,
+        checkpoint_viewed_at: u64,
+    ) -> Result<Connection<String, MovePackage>, Error> {
+        let cursor_viewed_at = page.validate_cursor_consistency()?;
+        let checkpoint_viewed_at = cursor_viewed_at.unwrap_or(checkpoint_viewed_at);
+
+        let after_checkpoint: Option<u64> = filter
+            .as_ref()
+            .and_then(|f| f.after_checkpoint)
+            .map(|v| v.into());
+
+        // Clamp the "before checkpoint" bound by "checkpoint viewed at".
+        let before_checkpoint = filter
+            .as_ref()
+            .and_then(|f| f.before_checkpoint)
+            .map(|v| v.into())
+            .unwrap_or(u64::MAX)
+            .min(checkpoint_viewed_at + 1);
+
+        let (prev, next, results) = db
+            .execute(move |conn| {
+                let mut q = query!(
+                    r#"
+                    SELECT
+                            p.original_id,
+                            o.*
+                    FROM
+                            packages p
+                    INNER JOIN
+                            objects_history o
+                    ON
+                            p.package_id = o.object_id
+                    AND     p.package_version = o.object_version
+                    AND     p.checkpoint_sequence_number = o.checkpoint_sequence_number
+                "#
+                );
+
+                q = filter!(
+                    q,
+                    format!("o.checkpoint_sequence_number < {before_checkpoint}")
+                );
+                if let Some(after) = after_checkpoint {
+                    q = filter!(q, format!("{after} < o.checkpoint_sequence_number"));
+                }
+
+                page.paginate_raw_query::<StoredHistoryPackage>(conn, checkpoint_viewed_at, q)
+            })
+            .await?;
+
+        let mut conn = Connection::new(prev, next);
+
+        // The "checkpoint viewed at" sets a consistent upper bound for the nested queries.
+        for stored in results {
+            let cursor = stored.cursor(checkpoint_viewed_at).encode_cursor();
+            let package =
+                MovePackage::try_from_stored_history_object(stored.object, checkpoint_viewed_at)?;
+            conn.edges.push(Edge::new(cursor, package));
+        }
+
+        Ok(conn)
+    }
+
+    /// Query the database for a `page` of Move packages. The Page uses the checkpoint sequence
+    /// number the package was created at, its original ID, and its version as the cursor. The query
+    /// is filtered by the ID of a package and will only return packages from the same family
+    /// (sharing the same original ID as the package whose ID was given), and can optionally be
+    /// filtered by an upper and lower bound on package version.
+    ///
+    /// The `checkpoint_viewed_at` parameter represents the checkpoint sequence number at which this
+    /// page was queried. Each entity returned in the connection will inherit this checkpoint, so
+    /// that when viewing that entity's state, it will be as if it is being viewed at this
+    /// checkpoint.
+    ///
+    /// The cursors in `page` may also include checkpoint viewed at fields. If these are set, they
+    /// take precedence over the checkpoint that pagination is being conducted in.
+    pub(crate) async fn paginate_by_version(
+        db: &Db,
+        page: Page<Cursor>,
+        package: SuiAddress,
+        filter: Option<MovePackageVersionFilter>,
+        checkpoint_viewed_at: u64,
+    ) -> Result<Connection<String, MovePackage>, Error> {
+        let cursor_viewed_at = page.validate_cursor_consistency()?;
+        let checkpoint_viewed_at = cursor_viewed_at.unwrap_or(checkpoint_viewed_at);
+        let (prev, next, results) = db
+            .execute(move |conn| {
+                page.paginate_raw_query::<StoredHistoryPackage>(
+                    conn,
+                    checkpoint_viewed_at,
+                    if is_system_package(package) {
+                        system_package_version_query(package, filter)
+                    } else {
+                        user_package_version_query(package, filter)
+                    },
+                )
+            })
+            .await?;
+
+        let mut conn = Connection::new(prev, next);
+
+        // The "checkpoint viewed at" sets a consistent upper bound for the nested queries.
+        for stored in results {
+            let cursor = stored.cursor(checkpoint_viewed_at).encode_cursor();
+            let package =
+                MovePackage::try_from_stored_history_object(stored.object, checkpoint_viewed_at)?;
+            conn.edges.push(Edge::new(cursor, package));
+        }
+
+        Ok(conn)
+    }
+
+    /// `checkpoint_viewed_at` points to the checkpoint snapshot that this `MovePackage` came from.
+    /// This is stored in the `MovePackage` so that related fields from the package are read from
+    /// the same checkpoint (consistently).
+    pub(crate) fn try_from_stored_history_object(
+        history_object: StoredHistoryObject,
+        checkpoint_viewed_at: u64,
+    ) -> Result<Self, Error> {
+        let object = Object::try_from_stored_history_object(
+            history_object,
+            checkpoint_viewed_at,
+            /* root_version */ None,
+        )?;
+        Self::try_from(&object).map_err(|_| Error::Internal("Not a package!".to_string()))
+    }
+}
+
+impl Checkpointed for Cursor {
+    fn checkpoint_viewed_at(&self) -> u64 {
+        self.checkpoint_viewed_at
+    }
+}
+
+impl RawPaginated<Cursor> for StoredHistoryPackage {
+    fn filter_ge(cursor: &Cursor, query: RawQuery) -> RawQuery {
+        filter!(
+            query,
+            format!(
+                "o.checkpoint_sequence_number > {cp} OR (\
+                 o.checkpoint_sequence_number = {cp} AND
+                 original_id > '\\x{id}'::bytea OR (\
+                 original_id = '\\x{id}'::bytea AND \
+                 o.object_version >= {pv}\
+                 ))",
+                cp = cursor.checkpoint_sequence_number,
+                id = hex::encode(&cursor.original_id),
+                pv = cursor.package_version,
+            )
+        )
+    }
+
+    fn filter_le(cursor: &Cursor, query: RawQuery) -> RawQuery {
+        filter!(
+            query,
+            format!(
+                "o.checkpoint_sequence_number < {cp} OR (\
+                 o.checkpoint_sequence_number = {cp} AND
+                 original_id < '\\x{id}'::bytea OR (\
+                 original_id = '\\x{id}'::bytea AND \
+                 o.object_version <= {pv}\
+                 ))",
+                cp = cursor.checkpoint_sequence_number,
+                id = hex::encode(&cursor.original_id),
+                pv = cursor.package_version,
+            )
+        )
+    }
+
+    fn order(asc: bool, query: RawQuery) -> RawQuery {
+        if asc {
+            query
+                .order_by("o.checkpoint_sequence_number ASC")
+                .order_by("original_id ASC")
+                .order_by("o.object_version ASC")
+        } else {
+            query
+                .order_by("o.checkpoint_sequence_number DESC")
+                .order_by("original_id DESC")
+                .order_by("o.object_version DESC")
+        }
+    }
+}
+
+impl Target<Cursor> for StoredHistoryPackage {
+    fn cursor(&self, checkpoint_viewed_at: u64) -> Cursor {
+        Cursor::new(PackageCursor {
+            checkpoint_sequence_number: self.object.checkpoint_sequence_number as u64,
+            original_id: self.original_id.clone(),
+            package_version: self.object.object_version as u64,
+            checkpoint_viewed_at,
+        })
+    }
+}
+
+impl ScanLimited for BcsCursor<PackageCursor> {}
+
+#[async_trait::async_trait]
+impl Loader<PackageVersionKey> for Db {
+    type Value = SuiAddress;
+    type Error = Error;
+
+    async fn load(
+        &self,
+        keys: &[PackageVersionKey],
+    ) -> Result<HashMap<PackageVersionKey, SuiAddress>, Error> {
+        use packages::dsl;
+        let other = diesel::alias!(packages as other);
+
+        let id_versions: BTreeSet<_> = keys
+            .iter()
+            .map(|k| (k.address.into_vec(), k.version as i64))
+            .collect();
+
+        let stored_packages: Vec<(Vec<u8>, i64, Vec<u8>)> = self
+            .execute(move |conn| {
+                conn.results(|| {
+                    let mut query = dsl::packages
+                        .inner_join(other.on(dsl::original_id.eq(other.field(dsl::original_id))))
+                        .select((
+                            dsl::package_id,
+                            other.field(dsl::package_version),
+                            other.field(dsl::package_id),
+                        ))
+                        .into_boxed();
+
+                    for (id, version) in id_versions.iter().cloned() {
+                        query = query.or_filter(
+                            dsl::package_id
+                                .eq(id)
+                                .and(other.field(dsl::package_version).eq(version)),
+                        );
+                    }
+
+                    query
+                })
+            })
+            .await
+            .map_err(|e| Error::Internal(format!("Failed to load packages: {e}")))?;
+
+        let mut result = HashMap::new();
+        for (id, version, other_id) in stored_packages {
+            result.insert(
+                PackageVersionKey {
+                    address: addr(&id)?,
+                    version: version as u64,
+                },
+                addr(&other_id)?,
+            );
+        }
+
+        Ok(result)
+    }
+}
+
+#[async_trait::async_trait]
+impl Loader<LatestKey> for Db {
+    type Value = SuiAddress;
+    type Error = Error;
+
+    async fn load(&self, keys: &[LatestKey]) -> Result<HashMap<LatestKey, SuiAddress>, Error> {
+        use packages::dsl;
+        let other = diesel::alias!(packages as other);
+
+        let mut ids_by_cursor: BTreeMap<_, BTreeSet<_>> = BTreeMap::new();
+        for key in keys {
+            ids_by_cursor
+                .entry(key.checkpoint_viewed_at)
+                .or_default()
+                .insert(key.address.into_vec());
+        }
+
+        // Issue concurrent reads for each group of IDs
+        let futures = ids_by_cursor
+            .into_iter()
+            .map(|(checkpoint_viewed_at, ids)| {
+                self.execute(move |conn| {
+                    let results: Vec<(Vec<u8>, Vec<u8>)> = conn.results(|| {
+                        let o_original_id = other.field(dsl::original_id);
+                        let o_package_id = other.field(dsl::package_id);
+                        let o_cp_seq_num = other.field(dsl::checkpoint_sequence_number);
+                        let o_version = other.field(dsl::package_version);
+
+                        let query = dsl::packages
+                            .inner_join(other.on(dsl::original_id.eq(o_original_id)))
+                            .select((dsl::package_id, o_package_id))
+                            .filter(dsl::package_id.eq_any(ids.iter().cloned()))
+                            .filter(o_cp_seq_num.le(checkpoint_viewed_at as i64))
+                            .order_by((dsl::package_id, dsl::original_id, o_version.desc()))
+                            .distinct_on((dsl::package_id, dsl::original_id));
+                        query
+                    })?;
+
+                    Ok::<_, diesel::result::Error>(
+                        results
+                            .into_iter()
+                            .map(|(p, latest)| (checkpoint_viewed_at, p, latest))
+                            .collect::<Vec<_>>(),
+                    )
+                })
+            });
+
+        // Wait for the reads to all finish, and gather them into the result map.
+        let groups = futures::future::join_all(futures).await;
+
+        let mut results = HashMap::new();
+        for group in groups {
+            for (checkpoint_viewed_at, address, latest) in
+                group.map_err(|e| Error::Internal(format!("Failed to fetch packages: {e}")))?
+            {
+                results.insert(
+                    LatestKey {
+                        address: addr(&address)?,
+                        checkpoint_viewed_at,
+                    },
+                    addr(&latest)?,
+                );
+            }
+        }
+
+        Ok(results)
+    }
 }
 
 impl TryFrom<&Object> for MovePackage {
@@ -449,3 +1027,94 @@ impl TryFrom<&Object> for MovePackage {
         }
     }
 }
+
+/// Query for fetching all the versions of a system package (assumes that `package` has already been
+/// verified as a system package). This is an `objects_history` query disguised as a package query.
+fn system_package_version_query(
+    package: SuiAddress,
+    filter: Option<MovePackageVersionFilter>,
+) -> RawQuery {
+    // Query uses a left join to force the query planner to use `objects_version` in the outer loop.
+    let mut q = query!(
+        r#"
+            SELECT
+                    o.object_id AS original_id,
+                    o.*
+            FROM
+                    objects_version v
+            LEFT JOIN
+                    objects_history o
+            ON
+                    v.object_id = o.object_id
+            AND     v.object_version = o.object_version
+            AND     v.cp_sequence_number = o.checkpoint_sequence_number
+        "#
+    );
+
+    q = filter!(
+        q,
+        format!(
+            "v.object_id = '\\x{}'::bytea",
+            hex::encode(package.into_vec())
+        )
+    );
+
+    if let Some(after) = filter.as_ref().and_then(|f| f.after_version) {
+        let a: u64 = after.into();
+        q = filter!(q, format!("v.object_version > {a}"));
+    }
+
+    if let Some(before) = filter.as_ref().and_then(|f| f.before_version) {
+        let b: u64 = before.into();
+        q = filter!(q, format!("v.object_version < {b}"));
+    }
+
+    q
+}
+
+/// Query for fetching all the versions of a non-system package (assumes that `package` has already
+/// been verified as a system package)
+fn user_package_version_query(
+    package: SuiAddress,
+    filter: Option<MovePackageVersionFilter>,
+) -> RawQuery {
+    let mut q = query!(
+        r#"
+            SELECT
+                    p.original_id,
+                    o.*
+            FROM
+                    packages q
+            INNER JOIN
+                    packages p
+            ON
+                    q.original_id = p.original_id
+            INNER JOIN
+                    objects_history o
+            ON
+                    p.package_id = o.object_id
+            AND     p.package_version = o.object_version
+            AND     p.checkpoint_sequence_number = o.checkpoint_sequence_number
+        "#
+    );
+
+    q = filter!(
+        q,
+        format!(
+            "q.package_id = '\\x{}'::bytea",
+            hex::encode(package.into_vec())
+        )
+    );
+
+    if let Some(after) = filter.as_ref().and_then(|f| f.after_version) {
+        let a: u64 = after.into();
+        q = filter!(q, format!("p.package_version > {a}"));
+    }
+
+    if let Some(before) = filter.as_ref().and_then(|f| f.before_version) {
+        let b: u64 = before.into();
+        q = filter!(q, format!("p.package_version < {b}"));
+    }
+
+    q
+}
diff --git a/crates/sui-graphql-rpc/src/types/object.rs b/crates/sui-graphql-rpc/src/types/object.rs
index 7243666ef520c..eebe0b86447ed 100644
--- a/crates/sui-graphql-rpc/src/types/object.rs
+++ b/crates/sui-graphql-rpc/src/types/object.rs
@@ -9,7 +9,7 @@ use super::balance::{self, Balance};
 use super::big_int::BigInt;
 use super::coin::Coin;
 use super::coin_metadata::CoinMetadata;
-use super::cursor::{self, Page, RawPaginated, Target};
+use super::cursor::{self, Page, RawPaginated, ScanLimited, Target};
 use super::digest::Digest;
 use super::display::{Display, DisplayEntry};
 use super::dynamic_field::{DynamicField, DynamicFieldName};
@@ -17,12 +17,14 @@ use super::move_object::MoveObject;
 use super::move_package::MovePackage;
 use super::owner::OwnerImpl;
 use super::stake::StakedSui;
+use super::sui_address::addr;
 use super::suins_registration::{DomainFormat, SuinsRegistration};
 use super::transaction_block;
 use super::transaction_block::TransactionBlockFilter;
 use super::type_filter::{ExactTypeFilter, TypeFilter};
 use super::uint53::UInt53;
 use super::{owner::Owner, sui_address::SuiAddress, transaction_block::TransactionBlock};
+use crate::connection::ScanConnection;
 use crate::consistency::{build_objects_query, Checkpointed, View};
 use crate::data::package_resolver::PackageResolver;
 use crate::data::{DataLoader, Db, DbConnection, QueryExecutor};
@@ -34,12 +36,12 @@ use crate::{filter, or_filter};
 use async_graphql::connection::{CursorType, Edge};
 use async_graphql::dataloader::Loader;
 use async_graphql::{connection::Connection, *};
-use diesel::{BoolExpressionMethods, ExpressionMethods, QueryDsl};
+use diesel::{BoolExpressionMethods, ExpressionMethods, JoinOnDsl, QueryDsl, SelectableHelper};
 use move_core_types::annotated_value::{MoveStruct, MoveTypeLayout};
 use move_core_types::language_storage::StructTag;
 use serde::{Deserialize, Serialize};
 use sui_indexer::models::objects::{StoredDeletedHistoryObject, StoredHistoryObject};
-use sui_indexer::schema::objects_history;
+use sui_indexer::schema::{objects_history, objects_version};
 use sui_indexer::types::ObjectStatus as NativeObjectStatus;
 use sui_indexer::types::OwnerType;
 use sui_types::object::bounded_visitor::BoundedVisitor;
@@ -181,12 +183,18 @@ pub(crate) struct AddressOwner {
     owner: Option<Owner>,
 }
 
+/// Filter for a point query of an Object.
 pub(crate) enum ObjectLookup {
     LatestAt {
-        /// The parent version to be used as an optional upper bound for the query. Look for the
-        /// latest version of a child object that is less than or equal to this upper bound.
-        parent_version: Option<u64>,
-        /// The checkpoint sequence number at which this was viewed at
+        /// The checkpoint sequence number at which this was viewed at.
+        checkpoint_viewed_at: u64,
+    },
+
+    UnderParent {
+        /// The parent version to be used as an upper bound for the query. Look for the latest
+        /// version of a child object whose version is less than or equal to this upper bound.
+        parent_version: u64,
+        /// The checkpoint sequence number at which this was viewed at.
         checkpoint_viewed_at: u64,
     },
 
@@ -213,6 +221,7 @@ pub(crate) struct HistoricalObjectCursor {
 
 /// Interface implemented by on-chain values that are addressable by an ID (also referred to as its
 /// address). This includes Move objects and packages.
+#[allow(clippy::duplicated_attributes)]
 #[derive(Interface)]
 #[graphql(
     name = "IObject",
@@ -254,7 +263,8 @@ pub(crate) struct HistoricalObjectCursor {
         arg(name = "last", ty = "Option<u64>"),
         arg(name = "before", ty = "Option<transaction_block::Cursor>"),
         arg(name = "filter", ty = "Option<TransactionBlockFilter>"),
-        ty = "Connection<String, TransactionBlock>",
+        arg(name = "scan_limit", ty = "Option<u64>"),
+        ty = "ScanConnection<String, TransactionBlock>",
         desc = "The transaction blocks that sent objects to this object."
     ),
     field(
@@ -273,7 +283,7 @@ pub(crate) enum IObject {
     SuinsRegistration(SuinsRegistration),
 }
 
-/// DataLoader key for fetching an `Object` at a specific version, constrained by a consistency
+/// `DataLoader` key for fetching an `Object` at a specific version, constrained by a consistency
 /// cursor (if that version was created after the checkpoint the query is viewing at, then it will
 /// fail).
 #[derive(Copy, Clone, Hash, Eq, PartialEq, Debug)]
@@ -283,13 +293,21 @@ struct HistoricalKey {
     checkpoint_viewed_at: u64,
 }
 
-/// DataLoader key for fetching the latest version of an `Object` as of a consistency cursor. The
-/// query can optionally be bounded by a `parent_version` which imposes an additional requirement
-/// that the object's version is bounded above by the parent version.
+/// `DataLoader` key for fetching the latest version of an object whose parent object has version
+/// `parent_version`, as of `checkpoint_viewed_at`. This look-up can fail to find a valid object if
+/// the key is not self-consistent, for example if the `parent_version` is set to a higher version
+/// than the object's actual parent as of `checkpoint_viewed_at`.
+#[derive(Copy, Clone, Hash, Eq, PartialEq, Debug)]
+struct ParentVersionKey {
+    id: SuiAddress,
+    parent_version: u64,
+    checkpoint_viewed_at: u64,
+}
+
+/// `DataLoader` key for fetching the latest version of an object as of a given checkpoint.
 #[derive(Copy, Clone, Hash, Eq, PartialEq, Debug)]
 struct LatestAtKey {
     id: SuiAddress,
-    parent_version: Option<u64>,
     checkpoint_viewed_at: u64,
 }
 
@@ -437,6 +455,25 @@ impl Object {
     }
 
     /// The transaction blocks that sent objects to this object.
+    ///
+    /// `scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+    /// results. It is required for queries that apply more than two complex filters (on function,
+    /// kind, sender, recipient, input object, changed object, or ids), and can be at most
+    /// `serviceConfig.maxScanLimit`.
+    ///
+    /// When the scan limit is reached the page will be returned even if it has fewer than `first`
+    /// results when paginating forward (`last` when paginating backwards). If there are more
+    /// transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+    /// `true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+    /// transaction that was scanned as opposed to the last (or first) transaction in the page.
+    ///
+    /// Requesting the next (or previous) page after this cursor will resume the search, scanning
+    /// the next `scanLimit` many transactions in the direction of pagination, and so on until all
+    /// transactions in the scanning range have been visited.
+    ///
+    /// By default, the scanning range includes all transactions known to GraphQL, but it can be
+    /// restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+    /// `afterCheckpoint` and `atCheckpoint` filters.
     pub(crate) async fn received_transaction_blocks(
         &self,
         ctx: &Context<'_>,
@@ -445,9 +482,10 @@ impl Object {
         last: Option<u64>,
         before: Option<transaction_block::Cursor>,
         filter: Option<TransactionBlockFilter>,
-    ) -> Result<Connection<String, TransactionBlock>> {
+        scan_limit: Option<u64>,
+    ) -> Result<ScanConnection<String, TransactionBlock>> {
         ObjectImpl(self)
-            .received_transaction_blocks(ctx, first, after, last, before, filter)
+            .received_transaction_blocks(ctx, first, after, last, before, filter, scan_limit)
             .await
     }
 
@@ -542,9 +580,7 @@ impl ObjectImpl<'_> {
     pub(crate) async fn owner(&self, ctx: &Context<'_>) -> Option<ObjectOwner> {
         use NativeOwner as O;
 
-        let Some(native) = self.0.native_impl() else {
-            return None;
-        };
+        let native = self.0.native_impl()?;
 
         match native.owner {
             O::AddressOwner(address) => {
@@ -606,7 +642,8 @@ impl ObjectImpl<'_> {
         last: Option<u64>,
         before: Option<transaction_block::Cursor>,
         filter: Option<TransactionBlockFilter>,
-    ) -> Result<Connection<String, TransactionBlock>> {
+        scan_limit: Option<u64>,
+    ) -> Result<ScanConnection<String, TransactionBlock>> {
         let page = Page::from_params(ctx.data_unchecked(), first, after, last, before)?;
 
         let Some(filter) = filter
@@ -616,17 +653,12 @@ impl ObjectImpl<'_> {
                 ..Default::default()
             })
         else {
-            return Ok(Connection::new(false, false));
+            return Ok(ScanConnection::new(false, false));
         };
 
-        TransactionBlock::paginate(
-            ctx.data_unchecked(),
-            page,
-            filter,
-            self.0.checkpoint_viewed_at,
-        )
-        .await
-        .extend()
+        TransactionBlock::paginate(ctx, page, filter, self.0.checkpoint_viewed_at, scan_limit)
+            .await
+            .extend()
     }
 
     pub(crate) async fn bcs(&self) -> Result<Option<Base64>> {
@@ -807,7 +839,6 @@ impl Object {
     /// Look-up the latest version of the object as of a given checkpoint.
     pub(crate) fn latest_at(checkpoint_viewed_at: u64) -> ObjectLookup {
         ObjectLookup::LatestAt {
-            parent_version: None,
             checkpoint_viewed_at,
         }
     }
@@ -815,8 +846,8 @@ impl Object {
     /// Look-up the latest version of an object whose version is less than or equal to its parent's
     /// version, as of a given checkpoint.
     pub(crate) fn under_parent(parent_version: u64, checkpoint_viewed_at: u64) -> ObjectLookup {
-        ObjectLookup::LatestAt {
-            parent_version: Some(parent_version),
+        ObjectLookup::UnderParent {
+            parent_version,
             checkpoint_viewed_at,
         }
     }
@@ -849,18 +880,30 @@ impl Object {
                     })
                     .await
             }
-            ObjectLookup::LatestAt {
+
+            ObjectLookup::UnderParent {
                 parent_version,
                 checkpoint_viewed_at,
             } => {
                 loader
-                    .load_one(LatestAtKey {
+                    .load_one(ParentVersionKey {
                         id,
                         parent_version,
                         checkpoint_viewed_at,
                     })
                     .await
             }
+
+            ObjectLookup::LatestAt {
+                checkpoint_viewed_at,
+            } => {
+                loader
+                    .load_one(LatestAtKey {
+                        id,
+                        checkpoint_viewed_at,
+                    })
+                    .await
+            }
         }
     }
 
@@ -1058,7 +1101,7 @@ impl ObjectFilter {
                         hex::encode(id.into_vec())
                     )
                     .unwrap();
-                    prefix = ",";
+                    prefix = ", ";
                 }
                 inner.push(')');
                 query = or_filter!(query, inner);
@@ -1132,6 +1175,8 @@ impl Checkpointed for Cursor {
     }
 }
 
+impl ScanLimited for Cursor {}
+
 impl RawPaginated<Cursor> for StoredHistoryObject {
     fn filter_ge(cursor: &Cursor, query: RawQuery) -> RawQuery {
         filter!(
@@ -1177,7 +1222,8 @@ impl Loader<HistoricalKey> for Db {
     type Error = Error;
 
     async fn load(&self, keys: &[HistoricalKey]) -> Result<HashMap<HistoricalKey, Object>, Error> {
-        use objects_history::dsl;
+        use objects_history::dsl as h;
+        use objects_version::dsl as v;
 
         let id_versions: BTreeSet<_> = keys
             .iter()
@@ -1187,12 +1233,19 @@ impl Loader<HistoricalKey> for Db {
         let objects: Vec<StoredHistoryObject> = self
             .execute(move |conn| {
                 conn.results(move || {
-                    let mut query = dsl::objects_history.into_boxed();
+                    let mut query = h::objects_history
+                        .inner_join(
+                            v::objects_version.on(v::cp_sequence_number
+                                .eq(h::checkpoint_sequence_number)
+                                .and(v::object_id.eq(h::object_id))
+                                .and(v::object_version.eq(h::object_version))),
+                        )
+                        .select(StoredHistoryObject::as_select())
+                        .into_boxed();
 
-                    // TODO: Speed up using an `obj_version` table.
                     for (id, version) in id_versions.iter().cloned() {
-                        query = query
-                            .or_filter(dsl::object_id.eq(id).and(dsl::object_version.eq(version)));
+                        query =
+                            query.or_filter(v::object_id.eq(id).and(v::object_version.eq(version)));
                     }
 
                     query
@@ -1234,17 +1287,20 @@ impl Loader<HistoricalKey> for Db {
 }
 
 #[async_trait::async_trait]
-impl Loader<LatestAtKey> for Db {
+impl Loader<ParentVersionKey> for Db {
     type Value = Object;
     type Error = Error;
 
-    async fn load(&self, keys: &[LatestAtKey]) -> Result<HashMap<LatestAtKey, Object>, Error> {
+    async fn load(
+        &self,
+        keys: &[ParentVersionKey],
+    ) -> Result<HashMap<ParentVersionKey, Object>, Error> {
         // Group keys by checkpoint viewed at and parent version -- we'll issue a separate query for
         // each group.
         #[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Copy)]
         struct GroupKey {
             checkpoint_viewed_at: u64,
-            parent_version: Option<u64>,
+            parent_version: u64,
         }
 
         let mut keys_by_cursor_and_parent_version: BTreeMap<_, BTreeSet<_>> = BTreeMap::new();
@@ -1257,50 +1313,40 @@ impl Loader<LatestAtKey> for Db {
             keys_by_cursor_and_parent_version
                 .entry(group_key)
                 .or_default()
-                .insert(key.id);
+                .insert(key.id.into_vec());
         }
 
         // Issue concurrent reads for each group of keys.
         let futures = keys_by_cursor_and_parent_version
             .into_iter()
             .map(|(group_key, ids)| {
-                self.execute_repeatable(move |conn| {
-                    let Some(range) = AvailableRange::result(conn, group_key.checkpoint_viewed_at)?
-                    else {
-                        return Ok::<Vec<(GroupKey, StoredHistoryObject)>, diesel::result::Error>(
-                            vec![],
-                        );
-                    };
-
-                    let filter = ObjectFilter {
-                        object_ids: Some(ids.iter().cloned().collect()),
-                        ..Default::default()
-                    };
-
-                    // TODO: Implement queries that use a parent version bound using an
-                    // `obj_version` table.
-                    let apply_parent_bound = |q: RawQuery| {
-                        if let Some(parent_version) = group_key.parent_version {
-                            filter!(q, format!("object_version <= {parent_version}"))
-                        } else {
-                            q
-                        }
-                    };
-
-                    Ok(conn
-                        .results(move || {
-                            build_objects_query(
-                                View::Consistent,
-                                range,
-                                &Page::bounded(ids.len() as u64),
-                                |q| apply_parent_bound(filter.apply(q)),
-                                apply_parent_bound,
+                self.execute(move |conn| {
+                    let stored: Vec<StoredHistoryObject> = conn.results(move || {
+                        use objects_history::dsl as h;
+                        use objects_version::dsl as v;
+
+                        h::objects_history
+                            .inner_join(
+                                v::objects_version.on(v::cp_sequence_number
+                                    .eq(h::checkpoint_sequence_number)
+                                    .and(v::object_id.eq(h::object_id))
+                                    .and(v::object_version.eq(h::object_version))),
                             )
+                            .select(StoredHistoryObject::as_select())
+                            .filter(v::object_id.eq_any(ids.iter().cloned()))
+                            .filter(v::object_version.le(group_key.parent_version as i64))
+                            .distinct_on(v::object_id)
+                            .order_by(v::object_id)
+                            .then_order_by(v::object_version.desc())
                             .into_boxed()
-                        })?
-                        .into_iter()
-                        .map(|r| (group_key, r))
-                        .collect())
+                    })?;
+
+                    Ok::<_, diesel::result::Error>(
+                        stored
+                            .into_iter()
+                            .map(|stored| (group_key, stored))
+                            .collect::<Vec<_>>(),
+                    )
                 })
             });
 
@@ -1312,15 +1358,21 @@ impl Loader<LatestAtKey> for Db {
             for (group_key, stored) in
                 group.map_err(|e| Error::Internal(format!("Failed to fetch objects: {e}")))?
             {
+                // This particular object is invalid -- it didn't exist at the checkpoint we are
+                // viewing at.
+                if group_key.checkpoint_viewed_at < stored.checkpoint_sequence_number as u64 {
+                    continue;
+                }
+
                 let object = Object::try_from_stored_history_object(
                     stored,
                     group_key.checkpoint_viewed_at,
                     // If `LatestAtKey::parent_version` is set, it must have been correctly
                     // propagated from the `Object::root_version` of some object.
-                    group_key.parent_version,
+                    Some(group_key.parent_version),
                 )?;
 
-                let key = LatestAtKey {
+                let key = ParentVersionKey {
                     id: object.address,
                     checkpoint_viewed_at: group_key.checkpoint_viewed_at,
                     parent_version: group_key.parent_version,
@@ -1334,6 +1386,81 @@ impl Loader<LatestAtKey> for Db {
     }
 }
 
+#[async_trait::async_trait]
+impl Loader<LatestAtKey> for Db {
+    type Value = Object;
+    type Error = Error;
+
+    async fn load(&self, keys: &[LatestAtKey]) -> Result<HashMap<LatestAtKey, Object>, Error> {
+        // Group keys by checkpoint viewed at -- we'll issue a separate query for each group.
+        let mut keys_by_cursor_and_parent_version: BTreeMap<_, BTreeSet<_>> = BTreeMap::new();
+
+        for key in keys {
+            keys_by_cursor_and_parent_version
+                .entry(key.checkpoint_viewed_at)
+                .or_default()
+                .insert(key.id);
+        }
+
+        // Issue concurrent reads for each group of keys.
+        let futures =
+            keys_by_cursor_and_parent_version
+                .into_iter()
+                .map(|(checkpoint_viewed_at, ids)| {
+                    self.execute_repeatable(move |conn| {
+                        let Some(range) = AvailableRange::result(conn, checkpoint_viewed_at)?
+                        else {
+                            return Ok::<Vec<(u64, StoredHistoryObject)>, diesel::result::Error>(
+                                vec![],
+                            );
+                        };
+
+                        let filter = ObjectFilter {
+                            object_ids: Some(ids.iter().cloned().collect()),
+                            ..Default::default()
+                        };
+
+                        Ok(conn
+                            .results(move || {
+                                build_objects_query(
+                                    View::Consistent,
+                                    range,
+                                    &Page::bounded(ids.len() as u64),
+                                    |q| filter.apply(q),
+                                    |q| q,
+                                )
+                                .into_boxed()
+                            })?
+                            .into_iter()
+                            .map(|r| (checkpoint_viewed_at, r))
+                            .collect())
+                    })
+                });
+
+        // Wait for the reads to all finish, and gather them into the result map.
+        let groups = futures::future::join_all(futures).await;
+
+        let mut results = HashMap::new();
+        for group in groups {
+            for (checkpoint_viewed_at, stored) in
+                group.map_err(|e| Error::Internal(format!("Failed to fetch objects: {e}")))?
+            {
+                let object =
+                    Object::try_from_stored_history_object(stored, checkpoint_viewed_at, None)?;
+
+                let key = LatestAtKey {
+                    id: object.address,
+                    checkpoint_viewed_at,
+                };
+
+                results.insert(key, object);
+            }
+        }
+
+        Ok(results)
+    }
+}
+
 impl From<&ObjectKind> for ObjectStatus {
     fn from(kind: &ObjectKind) -> Self {
         match kind {
@@ -1353,15 +1480,6 @@ impl From<&Object> for OwnerImpl {
     }
 }
 
-/// Parse a `SuiAddress` from its stored representation.  Failure is an internal error: the
-/// database should never contain a malformed address (containing the wrong number of bytes).
-fn addr(bytes: impl AsRef<[u8]>) -> Result<SuiAddress, Error> {
-    SuiAddress::from_bytes(bytes.as_ref()).map_err(|e| {
-        let bytes = bytes.as_ref().to_vec();
-        Error::Internal(format!("Error deserializing address: {bytes:?}: {e}"))
-    })
-}
-
 pub(crate) async fn deserialize_move_struct(
     move_object: &NativeMoveObject,
     resolver: &PackageResolver,
diff --git a/crates/sui-graphql-rpc/src/types/owner.rs b/crates/sui-graphql-rpc/src/types/owner.rs
index 79525ca9e9921..8d790fdc2d699 100644
--- a/crates/sui-graphql-rpc/src/types/owner.rs
+++ b/crates/sui-graphql-rpc/src/types/owner.rs
@@ -56,6 +56,7 @@ pub(crate) struct OwnerImpl {
 /// are identified by an address which can represent either the public key of an account or another
 /// object. The same address can only refer to an account or an object, never both, but it is not
 /// possible to know which up-front.
+#[allow(clippy::duplicated_attributes)]
 #[derive(Interface)]
 #[graphql(
     name = "IOwner",
@@ -251,9 +252,10 @@ impl Owner {
         Object::query(
             ctx,
             self.address,
-            object::ObjectLookup::LatestAt {
-                parent_version: self.root_version,
-                checkpoint_viewed_at: self.checkpoint_viewed_at,
+            if let Some(parent_version) = self.root_version {
+                Object::under_parent(parent_version, self.checkpoint_viewed_at)
+            } else {
+                Object::latest_at(self.checkpoint_viewed_at)
             },
         )
         .await
diff --git a/crates/sui-graphql-rpc/src/types/protocol_config.rs b/crates/sui-graphql-rpc/src/types/protocol_config.rs
index 9a10021d529cf..f4f8fd9caf771 100644
--- a/crates/sui-graphql-rpc/src/types/protocol_config.rs
+++ b/crates/sui-graphql-rpc/src/types/protocol_config.rs
@@ -1,15 +1,15 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+use std::collections::BTreeMap;
+
 use async_graphql::*;
 use diesel::{ExpressionMethods, QueryDsl};
-use sui_indexer::schema::{checkpoints, epochs};
-use sui_protocol_config::{ProtocolConfig as NativeProtocolConfig, ProtocolVersion};
+use sui_indexer::schema::{epochs, feature_flags, protocol_configs};
 
 use crate::{
     data::{Db, DbConnection, QueryExecutor},
     error::Error,
-    types::chain_identifier::ChainIdentifier,
 };
 
 use super::uint53::UInt53;
@@ -30,7 +30,9 @@ pub(crate) struct ProtocolConfigFeatureFlag {
 
 #[derive(Clone, Debug)]
 pub(crate) struct ProtocolConfigs {
-    native: NativeProtocolConfig,
+    version: u64,
+    configs: BTreeMap<String, Option<String>>,
+    feature_flags: BTreeMap<String, bool>,
 }
 
 /// Constants that control how the chain operates.
@@ -41,15 +43,15 @@ impl ProtocolConfigs {
     /// The protocol is not required to change on every epoch boundary, so the protocol version
     /// tracks which change to the protocol these configs are from.
     async fn protocol_version(&self) -> UInt53 {
-        self.native.version.as_u64().into()
+        self.version.into()
     }
 
     /// List all available feature flags and their values.  Feature flags are a form of boolean
     /// configuration that are usually used to gate features while they are in development.  Once a
     /// flag has been enabled, it is rare for it to be disabled.
     async fn feature_flags(&self) -> Vec<ProtocolConfigFeatureFlag> {
-        self.native
-            .feature_map()
+        self.feature_flags
+            .clone()
             .into_iter()
             .map(|(key, value)| ProtocolConfigFeatureFlag { key, value })
             .collect()
@@ -58,31 +60,24 @@ impl ProtocolConfigs {
     /// List all available configurations and their values.  These configurations can take any value
     /// (but they will all be represented in string form), and do not include feature flags.
     async fn configs(&self) -> Vec<ProtocolConfigAttr> {
-        self.native
-            .attr_map()
+        self.configs
+            .clone()
             .into_iter()
-            .map(|(key, value)| ProtocolConfigAttr {
-                key,
-                value: value.map(|v| v.to_string()),
-            })
+            .map(|(key, value)| ProtocolConfigAttr { key, value })
             .collect()
     }
 
     /// Query for the value of the configuration with name `key`.
     async fn config(&self, key: String) -> Option<ProtocolConfigAttr> {
-        self.native
-            .attr_map()
-            .get(&key)
-            .map(|value| ProtocolConfigAttr {
-                key,
-                value: value.as_ref().map(|v| v.to_string()),
-            })
+        self.configs.get(&key).map(|value| ProtocolConfigAttr {
+            key,
+            value: value.as_ref().map(|v| v.to_string()),
+        })
     }
 
     /// Query for the state of the feature flag with name `key`.
     async fn feature_flag(&self, key: String) -> Option<ProtocolConfigFeatureFlag> {
-        self.native
-            .feature_map()
+        self.feature_flags
             .get(&key)
             .map(|value| ProtocolConfigFeatureFlag { key, value: *value })
     }
@@ -90,37 +85,61 @@ impl ProtocolConfigs {
 
 impl ProtocolConfigs {
     pub(crate) async fn query(db: &Db, protocol_version: Option<u64>) -> Result<Self, Error> {
-        use checkpoints::dsl as c;
         use epochs::dsl as e;
+        use feature_flags::dsl as f;
+        use protocol_configs::dsl as p;
+
+        let version = if let Some(version) = protocol_version {
+            version
+        } else {
+            let latest_version: i64 = db
+                .execute(move |conn| {
+                    conn.first(move || {
+                        e::epochs
+                            .select(e::protocol_version)
+                            .order_by(e::epoch.desc())
+                    })
+                })
+                .await
+                .map_err(|e| {
+                    Error::Internal(format!(
+                        "Failed to fetch latest protocol version in db: {e}"
+                    ))
+                })?;
+            latest_version as u64
+        };
+
+        // TODO: This could be optimized by fetching all configs and flags in a single query.
+        let configs: BTreeMap<String, Option<String>> = db
+            .execute(move |conn| {
+                conn.results(move || {
+                    p::protocol_configs
+                        .select((p::config_name, p::config_value))
+                        .filter(p::protocol_version.eq(version as i64))
+                })
+            })
+            .await
+            .map_err(|e| Error::Internal(format!("Failed to fetch protocol configs in db: {e}")))?
+            .into_iter()
+            .collect();
 
-        let (latest_version, digest_bytes): (i64, Option<Vec<u8>>) = db
+        let feature_flags: BTreeMap<String, bool> = db
             .execute(move |conn| {
-                conn.first(move || {
-                    e::epochs
-                        .select((
-                            e::protocol_version,
-                            c::checkpoints
-                                .select(c::checkpoint_digest)
-                                .filter(c::sequence_number.eq(0))
-                                .single_value(),
-                        ))
-                        .order_by(e::epoch.desc())
+                conn.results(move || {
+                    f::feature_flags
+                        .select((f::flag_name, f::flag_value))
+                        .filter(f::protocol_version.eq(version as i64))
                 })
             })
             .await
-            .map_err(|e| Error::Internal(format!("Failed to fetch system details: {e}")))?;
-
-        let native = NativeProtocolConfig::get_for_version_if_supported(
-            protocol_version.unwrap_or(latest_version as u64).into(),
-            ChainIdentifier::from_bytes(digest_bytes.unwrap_or_default())?.chain(),
-        )
-        .ok_or_else(|| {
-            Error::ProtocolVersionUnsupported(
-                ProtocolVersion::MIN.as_u64(),
-                ProtocolVersion::MAX.as_u64(),
-            )
-        })?;
-
-        Ok(ProtocolConfigs { native })
+            .map_err(|e| Error::Internal(format!("Failed to fetch feature flags in db: {e}")))?
+            .into_iter()
+            .collect();
+
+        Ok(ProtocolConfigs {
+            version,
+            configs,
+            feature_flags,
+        })
     }
 }
diff --git a/crates/sui-graphql-rpc/src/types/query.rs b/crates/sui-graphql-rpc/src/types/query.rs
index f10d28f06236f..f6f4704b3009f 100644
--- a/crates/sui-graphql-rpc/src/types/query.rs
+++ b/crates/sui-graphql-rpc/src/types/query.rs
@@ -12,6 +12,9 @@ use sui_sdk::SuiClient;
 use sui_types::transaction::{TransactionData, TransactionKind};
 use sui_types::{gas_coin::GAS, transaction::TransactionDataAPI, TypeTag};
 
+use super::move_package::{
+    self, MovePackage, MovePackageCheckpointFilter, MovePackageVersionFilter,
+};
 use super::suins_registration::NameService;
 use super::uint53::UInt53;
 use super::{
@@ -36,6 +39,7 @@ use super::{
     transaction_metadata::TransactionMetadata,
     type_filter::ExactTypeFilter,
 };
+use crate::connection::ScanConnection;
 use crate::server::watermark_task::Watermark;
 use crate::types::base64::Base64 as GraphQLBase64;
 use crate::types::zklogin_verify_signature::verify_zklogin_signature;
@@ -195,13 +199,13 @@ impl Query {
         &self,
         ctx: &Context<'_>,
         address: SuiAddress,
-        root_version: Option<u64>,
+        root_version: Option<UInt53>,
     ) -> Result<Option<Owner>> {
         let Watermark { checkpoint, .. } = *ctx.data()?;
         Ok(Some(Owner {
             address,
             checkpoint_viewed_at: checkpoint,
-            root_version,
+            root_version: root_version.map(|v| v.into()),
         }))
     }
 
@@ -214,17 +218,52 @@ impl Query {
         version: Option<UInt53>,
     ) -> Result<Option<Object>> {
         let Watermark { checkpoint, .. } = *ctx.data()?;
+        let key = match version {
+            Some(version) => Object::at_version(version.into(), checkpoint),
+            None => Object::latest_at(checkpoint),
+        };
+
+        Object::query(ctx, address, key).await.extend()
+    }
+
+    /// The package corresponding to the given address (at the optionally given version).
+    ///
+    /// When no version is given, the package is loaded directly from the address given. Otherwise,
+    /// the address is translated before loading to point to the package whose original ID matches
+    /// the package at `address`, but whose version is `version`. For non-system packages, this
+    /// might result in a different address than `address` because different versions of a package,
+    /// introduced by upgrades, exist at distinct addresses.
+    ///
+    /// Note that this interpretation of `version` is different from a historical object read (the
+    /// interpretation of `version` for the `object` query).
+    async fn package(
+        &self,
+        ctx: &Context<'_>,
+        address: SuiAddress,
+        version: Option<UInt53>,
+    ) -> Result<Option<MovePackage>> {
+        let Watermark { checkpoint, .. } = *ctx.data()?;
+        let key = match version {
+            Some(version) => MovePackage::by_version(version.into(), checkpoint),
+            None => MovePackage::by_id_at(checkpoint),
+        };
 
-        match version {
-            Some(version) => {
-                Object::query(ctx, address, Object::at_version(version.into(), checkpoint))
-                    .await
-                    .extend()
-            }
-            None => Object::query(ctx, address, Object::latest_at(checkpoint))
-                .await
-                .extend(),
-        }
+        MovePackage::query(ctx, address, key).await.extend()
+    }
+
+    /// The latest version of the package at `address`.
+    ///
+    /// This corresponds to the package with the highest `version` that shares its original ID with
+    /// the package at `address`.
+    async fn latest_package(
+        &self,
+        ctx: &Context<'_>,
+        address: SuiAddress,
+    ) -> Result<Option<MovePackage>> {
+        let Watermark { checkpoint, .. } = *ctx.data()?;
+        MovePackage::query(ctx, address, MovePackage::latest_at(checkpoint))
+            .await
+            .extend()
     }
 
     /// Look-up an Account by its SuiAddress.
@@ -331,6 +370,25 @@ impl Query {
     }
 
     /// The transaction blocks that exist in the network.
+    ///
+    /// `scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+    /// results. It is required for queries that apply more than two complex filters (on function,
+    /// kind, sender, recipient, input object, changed object, or ids), and can be at most
+    /// `serviceConfig.maxScanLimit`.
+    ///
+    /// When the scan limit is reached the page will be returned even if it has fewer than `first`
+    /// results when paginating forward (`last` when paginating backwards). If there are more
+    /// transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+    /// `true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+    /// transaction that was scanned as opposed to the last (or first) transaction in the page.
+    ///
+    /// Requesting the next (or previous) page after this cursor will resume the search, scanning
+    /// the next `scanLimit` many transactions in the direction of pagination, and so on until all
+    /// transactions in the scanning range have been visited.
+    ///
+    /// By default, the scanning range includes all transactions known to GraphQL, but it can be
+    /// restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+    /// `afterCheckpoint` and `atCheckpoint` filters.
     async fn transaction_blocks(
         &self,
         ctx: &Context<'_>,
@@ -339,21 +397,26 @@ impl Query {
         last: Option<u64>,
         before: Option<transaction_block::Cursor>,
         filter: Option<TransactionBlockFilter>,
-    ) -> Result<Connection<String, TransactionBlock>> {
+        scan_limit: Option<u64>,
+    ) -> Result<ScanConnection<String, TransactionBlock>> {
         let Watermark { checkpoint, .. } = *ctx.data()?;
 
         let page = Page::from_params(ctx.data_unchecked(), first, after, last, before)?;
+
         TransactionBlock::paginate(
-            ctx.data_unchecked(),
+            ctx,
             page,
             filter.unwrap_or_default(),
             checkpoint,
+            scan_limit,
         )
         .await
         .extend()
     }
 
-    /// The events that exist in the network.
+    /// Query events that are emitted in the network.
+    /// We currently do not support filtering by emitting module and event type
+    /// at the same time so if both are provided in one filter, the query will error.
     async fn events(
         &self,
         ctx: &Context<'_>,
@@ -399,6 +462,49 @@ impl Query {
         .extend()
     }
 
+    /// The Move packages that exist in the network, optionally filtered to be strictly before
+    /// `beforeCheckpoint` and/or strictly after `afterCheckpoint`.
+    ///
+    /// This query returns all versions of a given user package that appear between the specified
+    /// checkpoints, but only records the latest versions of system packages.
+    async fn packages(
+        &self,
+        ctx: &Context<'_>,
+        first: Option<u64>,
+        after: Option<move_package::Cursor>,
+        last: Option<u64>,
+        before: Option<move_package::Cursor>,
+        filter: Option<MovePackageCheckpointFilter>,
+    ) -> Result<Connection<String, MovePackage>> {
+        let Watermark { checkpoint, .. } = *ctx.data()?;
+
+        let page = Page::from_params(ctx.data_unchecked(), first, after, last, before)?;
+        MovePackage::paginate_by_checkpoint(ctx.data_unchecked(), page, filter, checkpoint)
+            .await
+            .extend()
+    }
+
+    /// Fetch all versions of package at `address` (packages that share this package's original ID),
+    /// optionally bounding the versions exclusively from below with `afterVersion`, or from above
+    /// with `beforeVersion`.
+    async fn package_versions(
+        &self,
+        ctx: &Context<'_>,
+        first: Option<u64>,
+        after: Option<move_package::Cursor>,
+        last: Option<u64>,
+        before: Option<move_package::Cursor>,
+        address: SuiAddress,
+        filter: Option<MovePackageVersionFilter>,
+    ) -> Result<Connection<String, MovePackage>> {
+        let Watermark { checkpoint, .. } = *ctx.data()?;
+
+        let page = Page::from_params(ctx.data_unchecked(), first, after, last, before)?;
+        MovePackage::paginate_by_version(ctx.data_unchecked(), page, address, filter, checkpoint)
+            .await
+            .extend()
+    }
+
     /// Fetch the protocol config by protocol version (defaults to the latest protocol
     /// version known to the GraphQL service).
     async fn protocol_config(
diff --git a/crates/sui-graphql-rpc/src/types/stake.rs b/crates/sui-graphql-rpc/src/types/stake.rs
index 763741c67b747..75c0a07dabf5a 100644
--- a/crates/sui-graphql-rpc/src/types/stake.rs
+++ b/crates/sui-graphql-rpc/src/types/stake.rs
@@ -1,6 +1,7 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
+use crate::connection::ScanConnection;
 use crate::error::Error;
 use crate::{context_data::db_data_provider::PgManager, data::Db};
 
@@ -201,6 +202,25 @@ impl StakedSui {
     }
 
     /// The transaction blocks that sent objects to this object.
+    ///
+    /// `scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+    /// results. It is required for queries that apply more than two complex filters (on function,
+    /// kind, sender, recipient, input object, changed object, or ids), and can be at most
+    /// `serviceConfig.maxScanLimit`.
+    ///
+    /// When the scan limit is reached the page will be returned even if it has fewer than `first`
+    /// results when paginating forward (`last` when paginating backwards). If there are more
+    /// transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+    /// `true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+    /// transaction that was scanned as opposed to the last (or first) transaction in the page.
+    ///
+    /// Requesting the next (or previous) page after this cursor will resume the search, scanning
+    /// the next `scanLimit` many transactions in the direction of pagination, and so on until all
+    /// transactions in the scanning range have been visited.
+    ///
+    /// By default, the scanning range includes all transactions known to GraphQL, but it can be
+    /// restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+    /// `afterCheckpoint` and `atCheckpoint` filters.
     pub(crate) async fn received_transaction_blocks(
         &self,
         ctx: &Context<'_>,
@@ -209,9 +229,10 @@ impl StakedSui {
         last: Option<u64>,
         before: Option<transaction_block::Cursor>,
         filter: Option<TransactionBlockFilter>,
-    ) -> Result<Connection<String, TransactionBlock>> {
+        scan_limit: Option<u64>,
+    ) -> Result<ScanConnection<String, TransactionBlock>> {
         ObjectImpl(&self.super_.super_)
-            .received_transaction_blocks(ctx, first, after, last, before, filter)
+            .received_transaction_blocks(ctx, first, after, last, before, filter, scan_limit)
             .await
     }
 
diff --git a/crates/sui-graphql-rpc/src/types/sui_address.rs b/crates/sui-graphql-rpc/src/types/sui_address.rs
index 287bf0540e887..3a775e15064d4 100644
--- a/crates/sui-graphql-rpc/src/types/sui_address.rs
+++ b/crates/sui-graphql-rpc/src/types/sui_address.rs
@@ -3,18 +3,18 @@
 
 use std::str::FromStr;
 
+use crate::error::Error;
 use async_graphql::*;
 use move_core_types::account_address::AccountAddress;
 use serde::{Deserialize, Serialize};
 use sui_types::base_types::{ObjectID, SuiAddress as NativeSuiAddress};
-use thiserror::Error;
 
 const SUI_ADDRESS_LENGTH: usize = 32;
 
 #[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Copy)]
 pub(crate) struct SuiAddress([u8; SUI_ADDRESS_LENGTH]);
 
-#[derive(Error, Debug, Eq, PartialEq)]
+#[derive(thiserror::Error, Debug, Eq, PartialEq)]
 pub(crate) enum FromStrError {
     #[error("Invalid SuiAddress. Missing 0x prefix.")]
     NoPrefix,
@@ -30,7 +30,7 @@ pub(crate) enum FromStrError {
     BadHex(char, usize),
 }
 
-#[derive(Error, Debug, Eq, PartialEq)]
+#[derive(thiserror::Error, Debug, Eq, PartialEq)]
 pub(crate) enum FromVecError {
     #[error("Expected SuiAddress with {} bytes, received {0}", SUI_ADDRESS_LENGTH)]
     WrongLength(usize),
@@ -161,6 +161,15 @@ impl std::fmt::Display for SuiAddress {
     }
 }
 
+/// Parse a `SuiAddress` from its stored representation.  Failure is an internal error: the
+/// database should never contain a malformed address (containing the wrong number of bytes).
+pub(crate) fn addr(bytes: impl AsRef<[u8]>) -> Result<SuiAddress, Error> {
+    SuiAddress::from_bytes(bytes.as_ref()).map_err(|e| {
+        let bytes = bytes.as_ref().to_vec();
+        Error::Internal(format!("Error deserializing address: {bytes:?}: {e}"))
+    })
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/crates/sui-graphql-rpc/src/types/suins_registration.rs b/crates/sui-graphql-rpc/src/types/suins_registration.rs
index ed5337cb5d84f..e7391a258346e 100644
--- a/crates/sui-graphql-rpc/src/types/suins_registration.rs
+++ b/crates/sui-graphql-rpc/src/types/suins_registration.rs
@@ -25,6 +25,7 @@ use super::{
     uint53::UInt53,
 };
 use crate::{
+    connection::ScanConnection,
     consistency::{build_objects_query, View},
     data::{Db, DbConnection, QueryExecutor},
     error::Error,
@@ -238,6 +239,25 @@ impl SuinsRegistration {
     }
 
     /// The transaction blocks that sent objects to this object.
+    ///
+    /// `scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+    /// results. It is required for queries that apply more than two complex filters (on function,
+    /// kind, sender, recipient, input object, changed object, or ids), and can be at most
+    /// `serviceConfig.maxScanLimit`.
+    ///
+    /// When the scan limit is reached the page will be returned even if it has fewer than `first`
+    /// results when paginating forward (`last` when paginating backwards). If there are more
+    /// transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+    /// `true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+    /// transaction that was scanned as opposed to the last (or first) transaction in the page.
+    ///
+    /// Requesting the next (or previous) page after this cursor will resume the search, scanning
+    /// the next `scanLimit` many transactions in the direction of pagination, and so on until all
+    /// transactions in the scanning range have been visited.
+    ///
+    /// By default, the scanning range includes all transactions known to GraphQL, but it can be
+    /// restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+    /// `afterCheckpoint` and `atCheckpoint` filters.
     pub(crate) async fn received_transaction_blocks(
         &self,
         ctx: &Context<'_>,
@@ -246,9 +266,10 @@ impl SuinsRegistration {
         last: Option<u64>,
         before: Option<transaction_block::Cursor>,
         filter: Option<TransactionBlockFilter>,
-    ) -> Result<Connection<String, TransactionBlock>> {
+        scan_limit: Option<u64>,
+    ) -> Result<ScanConnection<String, TransactionBlock>> {
         ObjectImpl(&self.super_.super_)
-            .received_transaction_blocks(ctx, first, after, last, before, filter)
+            .received_transaction_blocks(ctx, first, after, last, before, filter, scan_limit)
             .await
     }
 
diff --git a/crates/sui-graphql-rpc/src/types/transaction_block/cursor.rs b/crates/sui-graphql-rpc/src/types/transaction_block/cursor.rs
new file mode 100644
index 0000000000000..56a82609bda1e
--- /dev/null
+++ b/crates/sui-graphql-rpc/src/types/transaction_block/cursor.rs
@@ -0,0 +1,173 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    consistency::Checkpointed,
+    filter,
+    raw_query::RawQuery,
+    types::cursor::{self, Paginated, RawPaginated, ScanLimited, Target},
+};
+use diesel::{
+    backend::Backend,
+    deserialize::{self, FromSql, QueryableByName},
+    row::NamedRow,
+    ExpressionMethods, QueryDsl,
+};
+use serde::{Deserialize, Serialize};
+use sui_indexer::{models::transactions::StoredTransaction, schema::transactions};
+
+use super::Query;
+
+pub(crate) type Cursor = cursor::JsonCursor<TransactionBlockCursor>;
+
+/// The cursor returned for each `TransactionBlock` in a connection's page of results. The
+/// `checkpoint_viewed_at` will set the consistent upper bound for subsequent queries made on this
+/// cursor.
+#[derive(Serialize, Deserialize, Clone, PartialEq, Eq)]
+pub(crate) struct TransactionBlockCursor {
+    /// The checkpoint sequence number this was viewed at.
+    #[serde(rename = "c")]
+    pub checkpoint_viewed_at: u64,
+    #[serde(rename = "t")]
+    pub tx_sequence_number: u64,
+    /// Whether the cursor was derived from a `scan_limit`. Only applicable to the `startCursor` and
+    /// `endCursor` returned from a Connection's `PageInfo`, and indicates that the cursor may not
+    /// have a corresponding node in the result set.
+    #[serde(rename = "i")]
+    pub is_scan_limited: bool,
+}
+
+/// Results from raw queries in Diesel can only be deserialized into structs that implements
+/// `QueryableByName`. This struct is used to represent a row of `tx_sequence_number` returned from
+/// subqueries against tx lookup tables.
+#[derive(Clone, Debug)]
+pub struct TxLookup {
+    pub tx_sequence_number: i64,
+}
+
+impl Checkpointed for Cursor {
+    fn checkpoint_viewed_at(&self) -> u64 {
+        self.checkpoint_viewed_at
+    }
+}
+
+impl ScanLimited for Cursor {
+    fn is_scan_limited(&self) -> bool {
+        self.is_scan_limited
+    }
+
+    fn unlimited(&self) -> Self {
+        Cursor::new(TransactionBlockCursor {
+            is_scan_limited: false,
+            tx_sequence_number: self.tx_sequence_number,
+            checkpoint_viewed_at: self.checkpoint_viewed_at,
+        })
+    }
+}
+
+impl Paginated<Cursor> for StoredTransaction {
+    type Source = transactions::table;
+
+    fn filter_ge<ST, GB>(cursor: &Cursor, query: Query<ST, GB>) -> Query<ST, GB> {
+        query.filter(transactions::dsl::tx_sequence_number.ge(cursor.tx_sequence_number as i64))
+    }
+
+    fn filter_le<ST, GB>(cursor: &Cursor, query: Query<ST, GB>) -> Query<ST, GB> {
+        query.filter(transactions::dsl::tx_sequence_number.le(cursor.tx_sequence_number as i64))
+    }
+
+    fn order<ST, GB>(asc: bool, query: Query<ST, GB>) -> Query<ST, GB> {
+        use transactions::dsl;
+        if asc {
+            query.order_by(dsl::tx_sequence_number.asc())
+        } else {
+            query.order_by(dsl::tx_sequence_number.desc())
+        }
+    }
+}
+
+impl Target<Cursor> for StoredTransaction {
+    fn cursor(&self, checkpoint_viewed_at: u64) -> Cursor {
+        Cursor::new(TransactionBlockCursor {
+            tx_sequence_number: self.tx_sequence_number as u64,
+            checkpoint_viewed_at,
+            is_scan_limited: false,
+        })
+    }
+}
+
+impl RawPaginated<Cursor> for StoredTransaction {
+    fn filter_ge(cursor: &Cursor, query: RawQuery) -> RawQuery {
+        filter!(
+            query,
+            format!("tx_sequence_number >= {}", cursor.tx_sequence_number)
+        )
+    }
+
+    fn filter_le(cursor: &Cursor, query: RawQuery) -> RawQuery {
+        filter!(
+            query,
+            format!("tx_sequence_number <= {}", cursor.tx_sequence_number)
+        )
+    }
+
+    fn order(asc: bool, query: RawQuery) -> RawQuery {
+        if asc {
+            query.order_by("tx_sequence_number ASC")
+        } else {
+            query.order_by("tx_sequence_number DESC")
+        }
+    }
+}
+
+impl Target<Cursor> for TxLookup {
+    fn cursor(&self, checkpoint_viewed_at: u64) -> Cursor {
+        Cursor::new(TransactionBlockCursor {
+            tx_sequence_number: self.tx_sequence_number as u64,
+            checkpoint_viewed_at,
+            is_scan_limited: false,
+        })
+    }
+}
+
+impl RawPaginated<Cursor> for TxLookup {
+    fn filter_ge(cursor: &Cursor, query: RawQuery) -> RawQuery {
+        filter!(
+            query,
+            format!("tx_sequence_number >= {}", cursor.tx_sequence_number)
+        )
+    }
+
+    fn filter_le(cursor: &Cursor, query: RawQuery) -> RawQuery {
+        filter!(
+            query,
+            format!("tx_sequence_number <= {}", cursor.tx_sequence_number)
+        )
+    }
+
+    fn order(asc: bool, query: RawQuery) -> RawQuery {
+        if asc {
+            query.order_by("tx_sequence_number ASC")
+        } else {
+            query.order_by("tx_sequence_number DESC")
+        }
+    }
+}
+
+/// `sql_query` raw queries require `QueryableByName`. The default implementation looks for a table
+/// based on the struct name, and it also expects the struct's fields to reflect the table's
+/// columns. We can override this behavior by implementing `QueryableByName` for our struct. For
+/// `TxBounds`, its fields are derived from `checkpoints`, so we can't leverage the default
+/// implementation directly.
+impl<DB> QueryableByName<DB> for TxLookup
+where
+    DB: Backend,
+    i64: FromSql<diesel::sql_types::BigInt, DB>,
+{
+    fn build<'a>(row: &impl NamedRow<'a, DB>) -> deserialize::Result<Self> {
+        let tx_sequence_number =
+            NamedRow::get::<diesel::sql_types::BigInt, _>(row, "tx_sequence_number")?;
+
+        Ok(Self { tx_sequence_number })
+    }
+}
diff --git a/crates/sui-graphql-rpc/src/types/transaction_block/filter.rs b/crates/sui-graphql-rpc/src/types/transaction_block/filter.rs
new file mode 100644
index 0000000000000..29c104ac9484c
--- /dev/null
+++ b/crates/sui-graphql-rpc/src/types/transaction_block/filter.rs
@@ -0,0 +1,130 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use super::TransactionBlockKindInput;
+use crate::types::{digest::Digest, sui_address::SuiAddress, type_filter::FqNameFilter};
+use crate::types::{intersect, uint53::UInt53};
+use async_graphql::InputObject;
+use std::collections::BTreeSet;
+use sui_types::base_types::SuiAddress as NativeSuiAddress;
+
+#[derive(InputObject, Debug, Default, Clone)]
+pub(crate) struct TransactionBlockFilter {
+    pub function: Option<FqNameFilter>,
+
+    /// An input filter selecting for either system or programmable transactions.
+    pub kind: Option<TransactionBlockKindInput>,
+    pub after_checkpoint: Option<UInt53>,
+    pub at_checkpoint: Option<UInt53>,
+    pub before_checkpoint: Option<UInt53>,
+
+    pub sign_address: Option<SuiAddress>,
+    pub recv_address: Option<SuiAddress>,
+
+    pub input_object: Option<SuiAddress>,
+    pub changed_object: Option<SuiAddress>,
+
+    pub transaction_ids: Option<Vec<Digest>>,
+}
+
+impl TransactionBlockFilter {
+    /// Try to create a filter whose results are the intersection of transaction blocks in `self`'s
+    /// results and transaction blocks in `other`'s results. This may not be possible if the
+    /// resulting filter is inconsistent in some way (e.g. a filter that requires one field to be
+    /// two different values simultaneously).
+    pub(crate) fn intersect(self, other: Self) -> Option<Self> {
+        macro_rules! intersect {
+            ($field:ident, $body:expr) => {
+                intersect::field(self.$field, other.$field, $body)
+            };
+        }
+
+        Some(Self {
+            function: intersect!(function, FqNameFilter::intersect)?,
+            kind: intersect!(kind, intersect::by_eq)?,
+
+            after_checkpoint: intersect!(after_checkpoint, intersect::by_max)?,
+            at_checkpoint: intersect!(at_checkpoint, intersect::by_eq)?,
+            before_checkpoint: intersect!(before_checkpoint, intersect::by_min)?,
+
+            sign_address: intersect!(sign_address, intersect::by_eq)?,
+            recv_address: intersect!(recv_address, intersect::by_eq)?,
+            input_object: intersect!(input_object, intersect::by_eq)?,
+            changed_object: intersect!(changed_object, intersect::by_eq)?,
+
+            transaction_ids: intersect!(transaction_ids, |a, b| {
+                let a = BTreeSet::from_iter(a.into_iter());
+                let b = BTreeSet::from_iter(b.into_iter());
+                Some(a.intersection(&b).cloned().collect())
+            })?,
+        })
+    }
+
+    /// Most filter conditions require a scan limit if used in tandem with other filters. The
+    /// exception to this is sender and checkpoint, since sender is denormalized on all tables, and
+    /// the corresponding tx range can be determined for a checkpoint.
+    pub(crate) fn requires_scan_limit(&self) -> bool {
+        [
+            self.function.is_some(),
+            self.kind.is_some(),
+            self.recv_address.is_some(),
+            self.input_object.is_some(),
+            self.changed_object.is_some(),
+            self.transaction_ids.is_some(),
+        ]
+        .into_iter()
+        .filter(|is_set| *is_set)
+        .count()
+            > 1
+    }
+
+    /// If we don't query a lookup table that has a denormalized sender column, we need to
+    /// explicitly sp
+    pub(crate) fn explicit_sender(&self) -> Option<SuiAddress> {
+        if self.function.is_none()
+            && self.kind.is_none()
+            && self.recv_address.is_none()
+            && self.input_object.is_none()
+            && self.changed_object.is_none()
+        {
+            self.sign_address
+        } else {
+            None
+        }
+    }
+
+    /// A TransactionBlockFilter is considered not to have any filters if no filters are specified,
+    /// or if the only filters are on `checkpoint`.
+    pub(crate) fn has_filters(&self) -> bool {
+        self.function.is_some()
+            || self.kind.is_some()
+            || self.sign_address.is_some()
+            || self.recv_address.is_some()
+            || self.input_object.is_some()
+            || self.changed_object.is_some()
+            || self.transaction_ids.is_some()
+    }
+
+    pub(crate) fn is_empty(&self) -> bool {
+        self.before_checkpoint == Some(UInt53::from(0))
+            || matches!(
+                (self.after_checkpoint, self.before_checkpoint),
+                (Some(after), Some(before)) if after >= before
+            )
+            || matches!(
+                (self.after_checkpoint, self.at_checkpoint),
+                (Some(after), Some(at)) if after >= at
+            )
+            || matches!(
+                (self.at_checkpoint, self.before_checkpoint),
+                (Some(at), Some(before)) if at >= before
+            )
+            // If SystemTx, sender if specified must be 0x0. Conversely, if sender is 0x0, kind must be SystemTx.
+            || matches!(
+                (self.kind, self.sign_address),
+                (Some(kind), Some(signer))
+                    if (kind == TransactionBlockKindInput::SystemTx)
+                        != (signer == SuiAddress::from(NativeSuiAddress::ZERO))
+            )
+    }
+}
diff --git a/crates/sui-graphql-rpc/src/types/transaction_block.rs b/crates/sui-graphql-rpc/src/types/transaction_block/mod.rs
similarity index 61%
rename from crates/sui-graphql-rpc/src/types/transaction_block.rs
rename to crates/sui-graphql-rpc/src/types/transaction_block/mod.rs
index 5009d076145d8..1573fe97cfeab 100644
--- a/crates/sui-graphql-rpc/src/types/transaction_block.rs
+++ b/crates/sui-graphql-rpc/src/types/transaction_block/mod.rs
@@ -1,22 +1,34 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use std::collections::{BTreeMap, BTreeSet, HashMap};
-
-use async_graphql::{
-    connection::{Connection, CursorType, Edge},
-    dataloader::Loader,
-    *,
+use super::{
+    address::Address,
+    base64::Base64,
+    cursor::{Page, Target},
+    digest::Digest,
+    epoch::Epoch,
+    gas::GasInput,
+    sui_address::SuiAddress,
+    transaction_block_effects::{TransactionBlockEffects, TransactionBlockEffectsKind},
+    transaction_block_kind::TransactionBlockKind,
 };
-use diesel::{BoolExpressionMethods, ExpressionMethods, JoinOnDsl, QueryDsl, SelectableHelper};
+use crate::{
+    config::ServiceConfig,
+    connection::ScanConnection,
+    data::{self, DataLoader, Db, DbConnection, QueryExecutor},
+    error::Error,
+    server::watermark_task::Watermark,
+};
+use async_graphql::{connection::CursorType, dataloader::Loader, *};
+use connection::Edge;
+use cursor::TxLookup;
+use diesel::{ExpressionMethods, JoinOnDsl, QueryDsl, SelectableHelper};
 use fastcrypto::encoding::{Base58, Encoding};
 use serde::{Deserialize, Serialize};
+use std::collections::{BTreeMap, HashMap};
 use sui_indexer::{
     models::transactions::StoredTransaction,
-    schema::{
-        transactions, tx_calls, tx_changed_objects, tx_digests, tx_input_objects, tx_recipients,
-        tx_senders,
-    },
+    schema::{transactions, tx_digests},
 };
 use sui_types::{
     base_types::SuiAddress as NativeSuiAddress,
@@ -29,27 +41,13 @@ use sui_types::{
     },
 };
 
-use crate::{
-    consistency::Checkpointed,
-    data::{self, DataLoader, Db, DbConnection, QueryExecutor},
-    error::Error,
-    server::watermark_task::Watermark,
-    types::intersect,
-};
+mod cursor;
+mod filter;
+mod tx_lookups;
 
-use super::{
-    address::Address,
-    base64::Base64,
-    cursor::{self, Page, Paginated, Target},
-    digest::Digest,
-    epoch::Epoch,
-    gas::GasInput,
-    sui_address::SuiAddress,
-    transaction_block_effects::{TransactionBlockEffects, TransactionBlockEffectsKind},
-    transaction_block_kind::TransactionBlockKind,
-    type_filter::FqNameFilter,
-    uint53::UInt53,
-};
+pub(crate) use cursor::Cursor;
+pub(crate) use filter::TransactionBlockFilter;
+pub(crate) use tx_lookups::{subqueries, TxBounds};
 
 /// Wraps the actual transaction block data with the checkpoint sequence number at which the data
 /// was viewed, for consistent results on paginating through and resolving nested types.
@@ -94,26 +92,6 @@ pub(crate) enum TransactionBlockKindInput {
     ProgrammableTx = 1,
 }
 
-#[derive(InputObject, Debug, Default, Clone)]
-pub(crate) struct TransactionBlockFilter {
-    pub function: Option<FqNameFilter>,
-
-    /// An input filter selecting for either system or programmable transactions.
-    pub kind: Option<TransactionBlockKindInput>,
-    pub after_checkpoint: Option<UInt53>,
-    pub at_checkpoint: Option<UInt53>,
-    pub before_checkpoint: Option<UInt53>,
-
-    pub sign_address: Option<SuiAddress>,
-    pub recv_address: Option<SuiAddress>,
-
-    pub input_object: Option<SuiAddress>,
-    pub changed_object: Option<SuiAddress>,
-
-    pub transaction_ids: Option<Vec<Digest>>,
-}
-
-pub(crate) type Cursor = cursor::JsonCursor<TransactionBlockCursor>;
 type Query<ST, GB> = data::Query<ST, transactions::table, GB>;
 
 /// The cursor returned for each `TransactionBlock` in a connection's page of results. The
@@ -131,7 +109,7 @@ pub(crate) struct TransactionBlockCursor {
     pub tx_checkpoint_number: u64,
 }
 
-/// DataLoader key for fetching a `TransactionBlock` by its digest, optionally constrained by a
+/// `DataLoader` key for fetching a `TransactionBlock` by its digest, optionally constrained by a
 /// consistency cursor.
 #[derive(Copy, Clone, Hash, Eq, PartialEq, Debug)]
 struct DigestKey {
@@ -298,104 +276,132 @@ impl TransactionBlock {
     ///
     /// If the `Page<Cursor>` is set, then this function will defer to the `checkpoint_viewed_at` in
     /// the cursor if they are consistent.
+    ///
+    /// Filters that involve a combination of `recvAddress`, `inputObject`, `changedObject`, and
+    /// `function` should provide a value for `scan_limit`. This modifies querying behavior by
+    /// limiting how many transactions to scan through before applying filters, and also affects
+    /// pagination behavior.
     pub(crate) async fn paginate(
-        db: &Db,
+        ctx: &Context<'_>,
         page: Page<Cursor>,
         filter: TransactionBlockFilter,
         checkpoint_viewed_at: u64,
-    ) -> Result<Connection<String, TransactionBlock>, Error> {
-        use transactions as tx;
+        scan_limit: Option<u64>,
+    ) -> Result<ScanConnection<String, TransactionBlock>, Error> {
+        let limits = &ctx.data_unchecked::<ServiceConfig>().limits;
+
+        // If the caller has provided some arbitrary combination of `function`, `kind`,
+        // `recvAddress`, `inputObject`, or `changedObject`, we require setting a `scanLimit`.
+        if let Some(scan_limit) = scan_limit {
+            if scan_limit > limits.max_scan_limit as u64 {
+                return Err(Error::Client(format!(
+                    "Scan limit exceeds max limit of '{}'",
+                    limits.max_scan_limit
+                )));
+            }
+        } else if filter.requires_scan_limit() {
+            return Err(Error::Client(
+                "A scan limit must be specified for the given filter combination".to_string(),
+            ));
+        }
+
+        if let Some(tx_ids) = &filter.transaction_ids {
+            if tx_ids.len() > limits.max_transaction_ids as usize {
+                return Err(Error::Client(format!(
+                    "Transaction IDs exceed max limit of '{}'",
+                    limits.max_transaction_ids
+                )));
+            }
+        }
+
+        // If page size or scan limit is 0, we want to standardize behavior by returning an empty
+        // connection
+        if filter.is_empty() || page.limit() == 0 || scan_limit.is_some_and(|v| v == 0) {
+            return Ok(ScanConnection::new(false, false));
+        }
 
         let cursor_viewed_at = page.validate_cursor_consistency()?;
         let checkpoint_viewed_at = cursor_viewed_at.unwrap_or(checkpoint_viewed_at);
+        let db: &Db = ctx.data_unchecked();
+        let is_from_front = page.is_from_front();
 
-        let (prev, next, results) = db
-            .execute(move |conn| {
-                page.paginate_query::<StoredTransaction, _, _, _>(
+        use transactions::dsl as tx;
+        let (prev, next, transactions, tx_bounds): (
+            bool,
+            bool,
+            Vec<StoredTransaction>,
+            Option<TxBounds>,
+        ) = db
+            .execute_repeatable(move |conn| {
+                let Some(tx_bounds) = TxBounds::query(
                     conn,
+                    filter.after_checkpoint.map(u64::from),
+                    filter.at_checkpoint.map(u64::from),
+                    filter.before_checkpoint.map(u64::from),
                     checkpoint_viewed_at,
-                    move || {
-                        let mut query = tx::dsl::transactions.into_boxed();
-
-                        if let Some(f) = &filter.function {
-                            let sub_query = tx_calls::dsl::tx_calls
-                                .select(tx_calls::dsl::tx_sequence_number)
-                                .into_boxed();
-
-                            query = query.filter(tx::dsl::tx_sequence_number.eq_any(f.apply(
-                                sub_query,
-                                tx_calls::dsl::package,
-                                tx_calls::dsl::module,
-                                tx_calls::dsl::func,
-                            )));
-                        }
-
-                        if let Some(k) = &filter.kind {
-                            query = query.filter(tx::dsl::transaction_kind.eq(*k as i16))
-                        }
-
-                        if let Some(c) = &filter.after_checkpoint {
-                            query =
-                                query.filter(tx::dsl::checkpoint_sequence_number.gt(i64::from(*c)));
-                        }
-
-                        if let Some(c) = &filter.at_checkpoint {
-                            query =
-                                query.filter(tx::dsl::checkpoint_sequence_number.eq(i64::from(*c)));
-                        }
-
-                        let before_checkpoint = filter
-                            .before_checkpoint
-                            .map_or(checkpoint_viewed_at + 1, |c| {
-                                u64::from(c).min(checkpoint_viewed_at + 1)
-                            });
-                        query = query.filter(
-                            tx::dsl::checkpoint_sequence_number.lt(before_checkpoint as i64),
-                        );
-
-                        if let Some(a) = &filter.sign_address {
-                            let sub_query = tx_senders::dsl::tx_senders
-                                .select(tx_senders::dsl::tx_sequence_number)
-                                .filter(tx_senders::dsl::sender.eq(a.into_vec()));
-                            query = query.filter(tx::dsl::tx_sequence_number.eq_any(sub_query));
-                        }
-
-                        if let Some(a) = &filter.recv_address {
-                            let sub_query = tx_recipients::dsl::tx_recipients
-                                .select(tx_recipients::dsl::tx_sequence_number)
-                                .filter(tx_recipients::dsl::recipient.eq(a.into_vec()));
-                            query = query.filter(tx::dsl::tx_sequence_number.eq_any(sub_query));
-                        }
-
-                        if let Some(o) = &filter.input_object {
-                            let sub_query = tx_input_objects::dsl::tx_input_objects
-                                .select(tx_input_objects::dsl::tx_sequence_number)
-                                .filter(tx_input_objects::dsl::object_id.eq(o.into_vec()));
-                            query = query.filter(tx::dsl::tx_sequence_number.eq_any(sub_query));
-                        }
-
-                        if let Some(o) = &filter.changed_object {
-                            let sub_query = tx_changed_objects::dsl::tx_changed_objects
-                                .select(tx_changed_objects::dsl::tx_sequence_number)
-                                .filter(tx_changed_objects::dsl::object_id.eq(o.into_vec()));
-                            query = query.filter(tx::dsl::tx_sequence_number.eq_any(sub_query));
-                        }
-
-                        if let Some(txs) = &filter.transaction_ids {
-                            let digests: Vec<_> = txs.iter().map(|d| d.to_vec()).collect();
-                            query = query.filter(tx::dsl::transaction_digest.eq_any(digests));
-                        }
-
-                        query
-                    },
-                )
+                    scan_limit,
+                    &page,
+                )?
+                else {
+                    return Ok::<_, diesel::result::Error>((false, false, Vec::new(), None));
+                };
+
+                // If no filters are selected, or if the filter is composed of only checkpoint
+                // filters, we can directly query the main `transactions` table. Otherwise, we first
+                // fetch the set of `tx_sequence_number` from a join over relevant lookup tables,
+                // and then issue a query against the `transactions` table to fetch the remaining
+                // contents.
+                let (prev, next, transactions) = if !filter.has_filters() {
+                    let (prev, next, iter) = page.paginate_query::<StoredTransaction, _, _, _>(
+                        conn,
+                        checkpoint_viewed_at,
+                        move || {
+                            tx::transactions
+                                .filter(tx::tx_sequence_number.ge(tx_bounds.scan_lo() as i64))
+                                .filter(tx::tx_sequence_number.lt(tx_bounds.scan_hi() as i64))
+                                .into_boxed()
+                        },
+                    )?;
+
+                    (prev, next, iter.collect())
+                } else {
+                    let subquery = subqueries(&filter, tx_bounds).unwrap();
+                    let (prev, next, results) =
+                        page.paginate_raw_query::<TxLookup>(conn, checkpoint_viewed_at, subquery)?;
+
+                    let tx_sequence_numbers = results
+                        .into_iter()
+                        .map(|x| x.tx_sequence_number)
+                        .collect::<Vec<i64>>();
+
+                    let transactions = conn.results(move || {
+                        tx::transactions
+                            .filter(tx::tx_sequence_number.eq_any(tx_sequence_numbers.clone()))
+                    })?;
+
+                    (prev, next, transactions)
+                };
+
+                Ok::<_, diesel::result::Error>((prev, next, transactions, Some(tx_bounds)))
             })
             .await?;
 
-        let mut conn = Connection::new(prev, next);
+        let mut conn = ScanConnection::new(prev, next);
+
+        let Some(tx_bounds) = tx_bounds else {
+            return Ok(conn);
+        };
 
-        // The "checkpoint viewed at" sets a consistent upper bound for the nested queries.
-        for stored in results {
+        if scan_limit.is_some() {
+            apply_scan_limited_pagination(
+                &mut conn,
+                tx_bounds,
+                checkpoint_viewed_at,
+                is_from_front,
+            );
+        }
+
+        for stored in transactions {
             let cursor = stored.cursor(checkpoint_viewed_at).encode_cursor();
             let inner = TransactionBlockInner::try_from(stored)?;
             let transaction = TransactionBlock {
@@ -409,87 +415,6 @@ impl TransactionBlock {
     }
 }
 
-impl TransactionBlockFilter {
-    /// Try to create a filter whose results are the intersection of transaction blocks in `self`'s
-    /// results and transaction blocks in `other`'s results. This may not be possible if the
-    /// resulting filter is inconsistent in some way (e.g. a filter that requires one field to be
-    /// two different values simultaneously).
-    pub(crate) fn intersect(self, other: Self) -> Option<Self> {
-        macro_rules! intersect {
-            ($field:ident, $body:expr) => {
-                intersect::field(self.$field, other.$field, $body)
-            };
-        }
-
-        Some(Self {
-            function: intersect!(function, FqNameFilter::intersect)?,
-            kind: intersect!(kind, intersect::by_eq)?,
-
-            after_checkpoint: intersect!(after_checkpoint, intersect::by_max)?,
-            at_checkpoint: intersect!(at_checkpoint, intersect::by_eq)?,
-            before_checkpoint: intersect!(before_checkpoint, intersect::by_min)?,
-
-            sign_address: intersect!(sign_address, intersect::by_eq)?,
-            recv_address: intersect!(recv_address, intersect::by_eq)?,
-            input_object: intersect!(input_object, intersect::by_eq)?,
-            changed_object: intersect!(changed_object, intersect::by_eq)?,
-
-            transaction_ids: intersect!(transaction_ids, |a, b| {
-                let a = BTreeSet::from_iter(a.into_iter());
-                let b = BTreeSet::from_iter(b.into_iter());
-                Some(a.intersection(&b).cloned().collect())
-            })?,
-        })
-    }
-}
-
-impl Paginated<Cursor> for StoredTransaction {
-    type Source = transactions::table;
-
-    fn filter_ge<ST, GB>(cursor: &Cursor, query: Query<ST, GB>) -> Query<ST, GB> {
-        query
-            .filter(transactions::dsl::tx_sequence_number.ge(cursor.tx_sequence_number as i64))
-            .filter(
-                transactions::dsl::checkpoint_sequence_number
-                    .ge(cursor.tx_checkpoint_number as i64),
-            )
-    }
-
-    fn filter_le<ST, GB>(cursor: &Cursor, query: Query<ST, GB>) -> Query<ST, GB> {
-        query
-            .filter(transactions::dsl::tx_sequence_number.le(cursor.tx_sequence_number as i64))
-            .filter(
-                transactions::dsl::checkpoint_sequence_number
-                    .le(cursor.tx_checkpoint_number as i64),
-            )
-    }
-
-    fn order<ST, GB>(asc: bool, query: Query<ST, GB>) -> Query<ST, GB> {
-        use transactions::dsl;
-        if asc {
-            query.order_by(dsl::tx_sequence_number.asc())
-        } else {
-            query.order_by(dsl::tx_sequence_number.desc())
-        }
-    }
-}
-
-impl Target<Cursor> for StoredTransaction {
-    fn cursor(&self, checkpoint_viewed_at: u64) -> Cursor {
-        Cursor::new(TransactionBlockCursor {
-            tx_sequence_number: self.tx_sequence_number as u64,
-            tx_checkpoint_number: self.checkpoint_sequence_number as u64,
-            checkpoint_viewed_at,
-        })
-    }
-}
-
-impl Checkpointed for Cursor {
-    fn checkpoint_viewed_at(&self) -> u64 {
-        self.checkpoint_viewed_at
-    }
-}
-
 #[async_trait::async_trait]
 impl Loader<DigestKey> for Db {
     type Value = TransactionBlock;
@@ -507,9 +432,7 @@ impl Loader<DigestKey> for Db {
         let transactions: Vec<StoredTransaction> = self
             .execute(move |conn| {
                 conn.results(move || {
-                    let join = ds::cp_sequence_number
-                        .eq(tx::checkpoint_sequence_number)
-                        .and(ds::tx_sequence_number.eq(tx::tx_sequence_number));
+                    let join = ds::tx_sequence_number.eq(tx::tx_sequence_number);
 
                     tx::transactions
                         .inner_join(ds::tx_digests.on(join))
@@ -601,3 +524,88 @@ impl TryFrom<TransactionBlockEffects> for TransactionBlock {
         })
     }
 }
+
+fn apply_scan_limited_pagination(
+    conn: &mut ScanConnection<String, TransactionBlock>,
+    tx_bounds: TxBounds,
+    checkpoint_viewed_at: u64,
+    is_from_front: bool,
+) {
+    if is_from_front {
+        apply_forward_scan_limited_pagination(conn, tx_bounds, checkpoint_viewed_at);
+    } else {
+        apply_backward_scan_limited_pagination(conn, tx_bounds, checkpoint_viewed_at);
+    }
+}
+
+/// When paginating forwards on a scan-limited query, the starting cursor and previous page flag
+/// will be the first tx scanned in the current window, and whether this window is within the
+/// scanning range. The ending cursor and next page flag wraps the last element of the result set if
+/// there are more matches in the scanned window that are truncated - if the page size is smaller
+/// than the scan limit - but otherwise is expanded out to the last tx scanned.
+fn apply_forward_scan_limited_pagination(
+    conn: &mut ScanConnection<String, TransactionBlock>,
+    tx_bounds: TxBounds,
+    checkpoint_viewed_at: u64,
+) {
+    conn.has_previous_page = tx_bounds.scan_has_prev_page();
+    conn.start_cursor = Some(
+        Cursor::new(cursor::TransactionBlockCursor {
+            checkpoint_viewed_at,
+            tx_sequence_number: tx_bounds.scan_start_cursor(),
+            is_scan_limited: true,
+        })
+        .encode_cursor(),
+    );
+
+    // There may be more results within the scanned range that got truncated, which occurs when page
+    // size is less than `scan_limit`, so only overwrite the end when the base pagination reports no
+    // next page.
+    if !conn.has_next_page {
+        conn.has_next_page = tx_bounds.scan_has_next_page();
+        conn.end_cursor = Some(
+            Cursor::new(cursor::TransactionBlockCursor {
+                checkpoint_viewed_at,
+                tx_sequence_number: tx_bounds.scan_end_cursor(),
+                is_scan_limited: true,
+            })
+            .encode_cursor(),
+        );
+    }
+}
+
+/// When paginating backwards on a scan-limited query, the ending cursor and next page flag will be
+/// the last tx scanned in the current window, and whether this window is within the scanning range.
+/// The starting cursor and previous page flag wraps the first element of the result set if there
+/// are more matches in the scanned window that are truncated - if the page size is smaller than the
+/// scan limit - but otherwise is expanded out to the first tx scanned.
+fn apply_backward_scan_limited_pagination(
+    conn: &mut ScanConnection<String, TransactionBlock>,
+    tx_bounds: TxBounds,
+    checkpoint_viewed_at: u64,
+) {
+    conn.has_next_page = tx_bounds.scan_has_next_page();
+    conn.end_cursor = Some(
+        Cursor::new(cursor::TransactionBlockCursor {
+            checkpoint_viewed_at,
+            tx_sequence_number: tx_bounds.scan_end_cursor(),
+            is_scan_limited: true,
+        })
+        .encode_cursor(),
+    );
+
+    // There may be more results within the scanned range that are truncated, especially if page
+    // size is less than `scan_limit`, so only overwrite the end when the base pagination reports no
+    // next page.
+    if !conn.has_previous_page {
+        conn.has_previous_page = tx_bounds.scan_has_prev_page();
+        conn.start_cursor = Some(
+            Cursor::new(cursor::TransactionBlockCursor {
+                checkpoint_viewed_at,
+                tx_sequence_number: tx_bounds.scan_start_cursor(),
+                is_scan_limited: true,
+            })
+            .encode_cursor(),
+        );
+    }
+}
diff --git a/crates/sui-graphql-rpc/src/types/transaction_block/tx_lookups.rs b/crates/sui-graphql-rpc/src/types/transaction_block/tx_lookups.rs
new file mode 100644
index 0000000000000..8077f4b4d5da4
--- /dev/null
+++ b/crates/sui-graphql-rpc/src/types/transaction_block/tx_lookups.rs
@@ -0,0 +1,431 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use super::{Cursor, TransactionBlockFilter};
+use crate::{
+    data::{pg::bytea_literal, Conn, DbConnection},
+    filter, inner_join, query,
+    raw_query::RawQuery,
+    types::{
+        cursor::{End, Page},
+        digest::Digest,
+        sui_address::SuiAddress,
+        transaction_block::TransactionBlockKindInput,
+        type_filter::{FqNameFilter, ModuleFilter},
+    },
+};
+use diesel::{ExpressionMethods, OptionalExtension, QueryDsl};
+use std::fmt::Write;
+use sui_indexer::schema::checkpoints;
+
+/// Bounds on transaction sequence number, imposed by filters, cursors, and the scan limit. The
+/// outermost bounds are determined by the checkpoint filters. These get translated into bounds in
+/// terms of transaction sequence numbers:
+///
+/// ```ignore
+///     tx_lo                                                             tx_hi
+///     [-----------------------------------------------------------------)
+/// ```
+///
+/// If cursors are provided, they further restrict the range of transactions to scan. Cursors are
+/// exclusive, but when issuing database queries, we treat them inclusively so that we can detect
+/// previous and next pages based on the existence of cursors in the results:
+///
+/// ```ignore
+///             cursor_lo                                  cursor_hi_inclusive
+///             [------------------------------------------]
+/// ```
+///
+/// Finally, the scan limit restricts the number of transactions to scan. The scan limit can be
+/// applied to either the front (forward pagination) or the back (backward pagination):
+///
+/// ```ignore
+///             [-----scan-limit-----)---------------------|  end = Front
+///             |---------------------[-----scan-limit------) end = Back
+/// ```
+///
+/// This data structure can be used to compute the interval of transactions to look in for
+/// candidates to include in a page of results. It can also determine whether the scanning has been
+/// cut short on either side, implying that there is a previous or next page of values to scan.
+///
+/// NOTE: for consistency, assume that lowerbounds are inclusive and upperbounds are exclusive.
+/// Bounds that do not follow this convention will be annotated explicitly (e.g. `lo_exclusive` or
+/// `hi_inclusive`).
+#[derive(Clone, Debug, Copy)]
+pub(crate) struct TxBounds {
+    /// The inclusive lower bound tx_sequence_number derived from checkpoint bounds. If checkpoint
+    /// bounds are not provided, this will default to `0`.
+    tx_lo: u64,
+
+    /// The exclusive upper bound tx_sequence_number derived from checkpoint bounds. If checkpoint
+    /// bounds are not provided, this will default to the total transaction count at the checkpoint
+    /// viewed.
+    tx_hi: u64,
+
+    /// The starting cursor (aka `after`).
+    cursor_lo_exclusive: Option<u64>,
+
+    // The ending cursor (aka `before`).
+    cursor_hi: Option<u64>,
+
+    /// The number of transactions to treat as candidates, defaults to all the transactions in the
+    /// range defined by the bounds above.
+    scan_limit: Option<u64>,
+
+    /// Which end of the range candidates will be scanned from.
+    end: End,
+}
+
+impl TxBounds {
+    /// Determines the `tx_sequence_number` range from the checkpoint bounds for a transaction block
+    /// query. If no checkpoint range is specified, the default is between 0 and the
+    /// `checkpoint_viewed_at`. The corresponding `tx_sequence_number` range is fetched from db, and
+    /// further adjusted by cursors and scan limit. If there are any inconsistencies or invalid
+    /// combinations, i.e. `after` cursor is greater than the upper bound, return None.
+    pub(crate) fn query(
+        conn: &mut Conn,
+        cp_after: Option<u64>,
+        cp_at: Option<u64>,
+        cp_before: Option<u64>,
+        checkpoint_viewed_at: u64,
+        scan_limit: Option<u64>,
+        page: &Page<Cursor>,
+    ) -> Result<Option<Self>, diesel::result::Error> {
+        // Lowerbound in terms of checkpoint sequence number. We want to get the total transaction
+        // count of the checkpoint before this one, or 0 if there is no previous checkpoint.
+        let cp_lo = max_option([cp_after.map(|x| x.saturating_add(1)), cp_at]).unwrap_or(0);
+
+        let cp_before_inclusive = match cp_before {
+            // There are no results strictly before checkpoint 0.
+            Some(0) => return Ok(None),
+            Some(x) => Some(x - 1),
+            None => None,
+        };
+
+        // Upperbound in terms of checkpoint sequence number. We want to get the total transaction
+        // count at the end of this checkpoint. If no upperbound is given, use
+        // `checkpoint_viewed_at`.
+        //
+        // SAFETY: we can unwrap because of the `Some(checkpoint_viewed_at)
+        let cp_hi = min_option([cp_before_inclusive, cp_at, Some(checkpoint_viewed_at)]).unwrap();
+
+        use checkpoints::dsl;
+        let (tx_lo, tx_hi) = if let Some(cp_prev) = cp_lo.checked_sub(1) {
+            let res: Vec<i64> = conn.results(move || {
+                dsl::checkpoints
+                    .select(dsl::network_total_transactions)
+                    .filter(dsl::sequence_number.eq_any([cp_prev as i64, cp_hi as i64]))
+                    .order_by(dsl::network_total_transactions.asc())
+            })?;
+
+            // If there are not two distinct results, it means that the transaction bounds are
+            // empty (lo and hi are the same), or it means that the one or other of the checkpoints
+            // doesn't exist, so we can return early.
+            let &[lo, hi] = res.as_slice() else {
+                return Ok(None);
+            };
+
+            (lo as u64, hi as u64)
+        } else {
+            let res: Option<i64> = conn
+                .first(move || {
+                    dsl::checkpoints
+                        .select(dsl::network_total_transactions)
+                        .filter(dsl::sequence_number.eq(cp_hi as i64))
+                })
+                .optional()?;
+
+            // If there is no result, it means that the checkpoint doesn't exist, so we can return
+            // early.
+            let Some(hi) = res else {
+                return Ok(None);
+            };
+
+            (0, hi as u64)
+        };
+
+        // If the cursors point outside checkpoint bounds, we can return early.
+        if matches!(page.after(), Some(a) if tx_hi <= a.tx_sequence_number.saturating_add(1)) {
+            return Ok(None);
+        }
+
+        if matches!(page.before(), Some(b) if b.tx_sequence_number <= tx_lo) {
+            return Ok(None);
+        }
+
+        Ok(Some(Self {
+            tx_lo,
+            tx_hi,
+            cursor_lo_exclusive: page.after().map(|a| a.tx_sequence_number),
+            cursor_hi: page.before().map(|b| b.tx_sequence_number),
+            scan_limit,
+            end: page.end(),
+        }))
+    }
+
+    /// Inclusive lowerbound for range of transactions to scan, accounting for the bounds from
+    /// filters and the cursor, but not scan limits. For the purposes of scanning records in the
+    /// DB, cursors are treated inclusively, even though they are exclusive bounds.
+    fn db_lo(&self) -> u64 {
+        max_option([self.cursor_lo_exclusive, Some(self.tx_lo)]).unwrap()
+    }
+
+    /// Exclusive upperbound for range of transactions to scan, accounting for the bounds from
+    /// filters and the cursor, but not scan limits. For the purposes of scanning records in the
+    /// DB, cursors are treated inclusively, even though they are exclusive bounds.
+    fn db_hi(&self) -> u64 {
+        min_option([
+            self.cursor_hi.map(|h| h.saturating_add(1)),
+            Some(self.tx_hi),
+        ])
+        .unwrap()
+    }
+
+    /// Whether the cursor lowerbound restricts the transaction range.
+    fn has_cursor_prev_page(&self) -> bool {
+        self.cursor_lo_exclusive.is_some_and(|lo| self.tx_lo <= lo)
+    }
+
+    /// Whether the cursor upperbound restricts the transaction range.
+    fn has_cursor_next_page(&self) -> bool {
+        self.cursor_hi.is_some_and(|hi| hi < self.tx_hi)
+    }
+
+    /// Inclusive lowerbound of range of transactions to scan.
+    pub(crate) fn scan_lo(&self) -> u64 {
+        match (self.end, self.scan_limit) {
+            (End::Front, _) | (_, None) => self.db_lo(),
+            (End::Back, Some(scan_limit)) => self
+                .db_hi()
+                // If there is a next page, additionally scan the cursor upperbound.
+                .saturating_sub(self.has_cursor_next_page() as u64)
+                .saturating_sub(scan_limit)
+                .max(self.db_lo()),
+        }
+    }
+
+    /// Exclusive upperbound of range of transactions to scan.
+    pub(crate) fn scan_hi(&self) -> u64 {
+        match (self.end, self.scan_limit) {
+            (End::Back, _) | (_, None) => self.db_hi(),
+            (End::Front, Some(scan_limit)) => self
+                .db_lo()
+                // If there is a previous page, additionally scan the cursor lowerbound.
+                .saturating_add(self.has_cursor_prev_page() as u64)
+                .saturating_add(scan_limit)
+                .min(self.db_hi()),
+        }
+    }
+
+    /// The first transaction scanned, ignoring transactions pointed at by cursors.
+    pub(crate) fn scan_start_cursor(&self) -> u64 {
+        let skip_cursor_lo = self.end == End::Front && self.has_cursor_prev_page();
+        self.scan_lo().saturating_add(skip_cursor_lo as u64)
+    }
+
+    /// The last transaction scanned, ignoring transactions pointed at by cursors.
+    pub(crate) fn scan_end_cursor(&self) -> u64 {
+        let skip_cursor_hi = self.end == End::Back && self.has_cursor_next_page();
+        self.scan_hi().saturating_sub(skip_cursor_hi as u64 + 1)
+    }
+
+    /// Whether there are more transactions to scan before this page.
+    pub(crate) fn scan_has_prev_page(&self) -> bool {
+        self.tx_lo < self.scan_start_cursor()
+    }
+
+    /// Whether there are more transactions to scan after this page.
+    pub(crate) fn scan_has_next_page(&self) -> bool {
+        self.scan_end_cursor() + 1 < self.tx_hi
+    }
+}
+
+/// Determines the maximum value in an arbitrary number of Option<impl Ord>.
+fn max_option<T: Ord>(xs: impl IntoIterator<Item = Option<T>>) -> Option<T> {
+    xs.into_iter().flatten().max()
+}
+
+/// Determines the minimum value in an arbitrary number of Option<impl Ord>.
+fn min_option<T: Ord>(xs: impl IntoIterator<Item = Option<T>>) -> Option<T> {
+    xs.into_iter().flatten().min()
+}
+
+/// Constructs a `RawQuery` as a join over all relevant side tables, filtered on their own filter
+/// condition, plus optionally a sender, plus optionally tx/cp bounds.
+pub(crate) fn subqueries(filter: &TransactionBlockFilter, tx_bounds: TxBounds) -> Option<RawQuery> {
+    let sender = filter.sign_address;
+
+    let mut subqueries = vec![];
+
+    if let Some(f) = &filter.function {
+        subqueries.push(match f {
+            FqNameFilter::ByModule(filter) => match filter {
+                ModuleFilter::ByPackage(p) => ("tx_calls_pkg", select_pkg(p, sender, tx_bounds)),
+                ModuleFilter::ByModule(p, m) => {
+                    ("tx_calls_mod", select_mod(p, m.clone(), sender, tx_bounds))
+                }
+            },
+            FqNameFilter::ByFqName(p, m, n) => (
+                "tx_calls_fun",
+                select_fun(p, m.clone(), n.clone(), sender, tx_bounds),
+            ),
+        });
+    }
+    if let Some(kind) = &filter.kind {
+        subqueries.push(("tx_kinds", select_kind(*kind, sender, tx_bounds)));
+    }
+    if let Some(recv) = &filter.recv_address {
+        subqueries.push(("tx_recipients", select_recipient(recv, sender, tx_bounds)));
+    }
+    if let Some(input) = &filter.input_object {
+        subqueries.push(("tx_input_objects", select_input(input, sender, tx_bounds)));
+    }
+    if let Some(changed) = &filter.changed_object {
+        subqueries.push((
+            "tx_changed_objects",
+            select_changed(changed, sender, tx_bounds),
+        ));
+    }
+    if let Some(sender) = &filter.explicit_sender() {
+        subqueries.push(("tx_senders", select_sender(sender, tx_bounds)));
+    }
+    if let Some(txs) = &filter.transaction_ids {
+        subqueries.push(("tx_digests", select_ids(txs, tx_bounds)));
+    }
+
+    let (_, mut subquery) = subqueries.pop()?;
+
+    if !subqueries.is_empty() {
+        subquery = query!("SELECT tx_sequence_number FROM ({}) AS initial", subquery);
+        while let Some((alias, subselect)) = subqueries.pop() {
+            subquery = inner_join!(subquery, alias => subselect, using: ["tx_sequence_number"]);
+        }
+    }
+
+    Some(subquery)
+}
+
+fn select_tx(sender: Option<SuiAddress>, bound: TxBounds, from: &str) -> RawQuery {
+    let mut query = filter!(
+        query!(format!("SELECT tx_sequence_number FROM {from}")),
+        format!(
+            "{} <= tx_sequence_number AND tx_sequence_number < {}",
+            bound.scan_lo(),
+            bound.scan_hi()
+        )
+    );
+
+    if let Some(sender) = sender {
+        query = filter!(
+            query,
+            format!("sender = {}", bytea_literal(sender.as_slice()))
+        );
+    }
+
+    query
+}
+
+fn select_pkg(pkg: &SuiAddress, sender: Option<SuiAddress>, bound: TxBounds) -> RawQuery {
+    filter!(
+        select_tx(sender, bound, "tx_calls_pkg"),
+        format!("package = {}", bytea_literal(pkg.as_slice()))
+    )
+}
+
+fn select_mod(
+    pkg: &SuiAddress,
+    mod_: String,
+    sender: Option<SuiAddress>,
+    bound: TxBounds,
+) -> RawQuery {
+    filter!(
+        select_tx(sender, bound, "tx_calls_mod"),
+        format!(
+            "package = {} and module = {{}}",
+            bytea_literal(pkg.as_slice())
+        ),
+        mod_
+    )
+}
+
+fn select_fun(
+    pkg: &SuiAddress,
+    mod_: String,
+    fun: String,
+    sender: Option<SuiAddress>,
+    bound: TxBounds,
+) -> RawQuery {
+    filter!(
+        select_tx(sender, bound, "tx_calls_fun"),
+        format!(
+            "package = {} AND module = {{}} AND func = {{}}",
+            bytea_literal(pkg.as_slice()),
+        ),
+        mod_,
+        fun
+    )
+}
+
+/// Returns a RawQuery that selects transactions of a specific kind. If SystemTX is specified, we
+/// ignore the `sender`. If ProgrammableTX is specified, we filter against the `tx_kinds` table if
+/// no `sender` is provided; otherwise, we just query the `tx_senders` table. Other combinations, in
+/// particular when kind is SystemTx and sender is specified and not 0x0, are inconsistent and will
+/// not produce any results. These inconsistent cases are expected to be checked for before this is
+/// called.
+fn select_kind(
+    kind: TransactionBlockKindInput,
+    sender: Option<SuiAddress>,
+    bound: TxBounds,
+) -> RawQuery {
+    match (kind, sender) {
+        // We can simplify the query to just the `tx_senders` table if ProgrammableTX and sender is
+        // specified.
+        (TransactionBlockKindInput::ProgrammableTx, Some(sender)) => select_sender(&sender, bound),
+        // Otherwise, we can ignore the sender always, and just query the `tx_kinds` table.
+        _ => filter!(
+            select_tx(None, bound, "tx_kinds"),
+            format!("tx_kind = {}", kind as i16)
+        ),
+    }
+}
+
+fn select_sender(sender: &SuiAddress, bound: TxBounds) -> RawQuery {
+    select_tx(Some(*sender), bound, "tx_senders")
+}
+
+fn select_recipient(recv: &SuiAddress, sender: Option<SuiAddress>, bound: TxBounds) -> RawQuery {
+    filter!(
+        select_tx(sender, bound, "tx_recipients"),
+        format!("recipient = {}", bytea_literal(recv.as_slice()))
+    )
+}
+
+fn select_input(input: &SuiAddress, sender: Option<SuiAddress>, bound: TxBounds) -> RawQuery {
+    filter!(
+        select_tx(sender, bound, "tx_input_objects"),
+        format!("object_id = {}", bytea_literal(input.as_slice()))
+    )
+}
+
+fn select_changed(changed: &SuiAddress, sender: Option<SuiAddress>, bound: TxBounds) -> RawQuery {
+    filter!(
+        select_tx(sender, bound, "tx_changed_objects"),
+        format!("object_id = {}", bytea_literal(changed.as_slice()))
+    )
+}
+
+fn select_ids(ids: &Vec<Digest>, bound: TxBounds) -> RawQuery {
+    let query = select_tx(None, bound, "tx_digests");
+    if ids.is_empty() {
+        filter!(query, "1=0")
+    } else {
+        let mut inner = String::new();
+        let mut prefix = "tx_digest IN (";
+        for id in ids {
+            write!(&mut inner, "{prefix}{}", bytea_literal(id.as_slice())).unwrap();
+            prefix = ", ";
+        }
+        inner.push(')');
+        filter!(query, inner)
+    }
+}
diff --git a/crates/sui-graphql-rpc/src/types/type_filter.rs b/crates/sui-graphql-rpc/src/types/type_filter.rs
index 31fa106d43577..16f9dd03181f1 100644
--- a/crates/sui-graphql-rpc/src/types/type_filter.rs
+++ b/crates/sui-graphql-rpc/src/types/type_filter.rs
@@ -2,18 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use super::{string_input::impl_string_input, sui_address::SuiAddress};
+use crate::filter;
 use crate::raw_query::RawQuery;
-use crate::{
-    data::{DieselBackend, Query},
-    filter,
-};
 use async_graphql::*;
-use diesel::{
-    expression::{is_aggregate::No, ValidGrouping},
-    query_builder::QueryFragment,
-    sql_types::{Binary, Text},
-    AppearsOnTable, Expression, ExpressionMethods, QueryDsl, QuerySource,
-};
 use move_core_types::language_storage::StructTag;
 use std::{fmt, result::Result, str::FromStr};
 use sui_types::{
@@ -67,89 +58,7 @@ pub(crate) enum Error {
     InvalidFormat(&'static str),
 }
 
-/// Trait for a field that can be used in a query.
-pub(crate) trait Field<Type, QS: QuerySource>:
-    ExpressionMethods
-    + Expression<SqlType = Type>
-    + QueryFragment<DieselBackend>
-    + AppearsOnTable<QS>
-    + ValidGrouping<(), IsAggregate = No>
-    + Send
-    + 'static
-{
-}
-
-impl<T, Type, QS: QuerySource> Field<Type, QS> for T where
-    T: ExpressionMethods
-        + Expression<SqlType = Type>
-        + QueryFragment<DieselBackend>
-        + AppearsOnTable<QS>
-        + ValidGrouping<(), IsAggregate = No>
-        + Send
-        + 'static
-{
-}
-
 impl TypeFilter {
-    /// Modify `query` to apply this filter to `type_field`, `package_field`, `module_field`
-    /// and `name_field`, where `type_field` stores the full type tag while the rest
-    /// store the package, module and name of the type tag respectively. The new query
-    /// after applying the filter is returned.
-    pub(crate) fn apply<T, P, M, N, QS, ST, GB>(
-        &self,
-        query: Query<ST, QS, GB>,
-        // Field storing the full type tag, including type parameters.
-        type_field: T,
-        package_field: P,
-        module_field: M,
-        // Name field only includes the name of the struct, like `Coin`, not including type parameters.
-        name_field: N,
-    ) -> Query<ST, QS, GB>
-    where
-        Query<ST, QS, GB>: QueryDsl,
-        T: Field<Text, QS>,
-        P: Field<Binary, QS>,
-        M: Field<Text, QS>,
-        N: Field<Text, QS>,
-        QS: QuerySource,
-    {
-        match self {
-            TypeFilter::ByModule(ModuleFilter::ByPackage(p)) => {
-                query.filter(package_field.eq(p.into_vec()))
-            }
-
-            TypeFilter::ByModule(ModuleFilter::ByModule(p, m)) => query
-                .filter(package_field.eq(p.into_vec()))
-                .filter(module_field.eq(m.clone())),
-
-            // A type filter without type parameters is interpreted as either an exact match, or a
-            // match for all generic instantiations of the type so we check against only package, module
-            // and name fields.
-            TypeFilter::ByType(tag) if tag.type_params.is_empty() => {
-                let p = tag.address.to_vec();
-                let m = tag.module.to_string();
-                let n = tag.name.to_string();
-                query
-                    .filter(package_field.eq(p))
-                    .filter(module_field.eq(m))
-                    .filter(name_field.eq(n))
-            }
-
-            TypeFilter::ByType(tag) => {
-                let p = tag.address.to_vec();
-                let m = tag.module.to_string();
-                let n = tag.name.to_string();
-                let exact = tag.to_canonical_string(/* with_prefix */ true);
-                // We check against the full type field for an exact match, including type parameters.
-                query
-                    .filter(package_field.eq(p))
-                    .filter(module_field.eq(m))
-                    .filter(name_field.eq(n))
-                    .filter(type_field.eq(exact))
-            }
-        }
-    }
-
     /// Modify `query` to apply this filter to `field`, returning the new query.
     pub(crate) fn apply_raw(
         &self,
@@ -268,32 +177,6 @@ impl TypeFilter {
 }
 
 impl FqNameFilter {
-    /// Modify `query` to apply this filter, treating `package` as the column containing the package
-    /// address, `module` as the module containing the module name, and `name` as the column
-    /// containing the module member name.
-    pub(crate) fn apply<P, M, N, QS, ST, GB>(
-        &self,
-        query: Query<ST, QS, GB>,
-        package: P,
-        module: M,
-        name: N,
-    ) -> Query<ST, QS, GB>
-    where
-        Query<ST, QS, GB>: QueryDsl,
-        P: Field<Binary, QS>,
-        M: Field<Text, QS>,
-        N: Field<Text, QS>,
-        QS: QuerySource,
-    {
-        match self {
-            FqNameFilter::ByModule(filter) => filter.apply(query, package, module),
-            FqNameFilter::ByFqName(p, m, n) => query
-                .filter(package.eq(p.into_vec()))
-                .filter(module.eq(m.clone()))
-                .filter(name.eq(n.clone())),
-        }
-    }
-
     /// Try to create a filter whose results are the intersection of the results of the input
     /// filters (`self` and `other`). This may not be possible if the resulting filter is
     /// inconsistent (e.g. a filter that requires the module member's package to be at two different
@@ -321,28 +204,6 @@ impl FqNameFilter {
 }
 
 impl ModuleFilter {
-    /// Modify `query` to apply this filter, treating `package` as the column containing the package
-    /// address and `module` as the module containing the module name.
-    pub(crate) fn apply<P, M, QS, ST, GB>(
-        &self,
-        query: Query<ST, QS, GB>,
-        package: P,
-        module: M,
-    ) -> Query<ST, QS, GB>
-    where
-        Query<ST, QS, GB>: QueryDsl,
-        P: Field<Binary, QS>,
-        M: Field<Text, QS>,
-        QS: QuerySource,
-    {
-        match self {
-            ModuleFilter::ByPackage(p) => query.filter(package.eq(p.into_vec())),
-            ModuleFilter::ByModule(p, m) => query
-                .filter(package.eq(p.into_vec()))
-                .filter(module.eq(m.clone())),
-        }
-    }
-
     /// Try to create a filter whose results are the intersection of the results of the input
     /// filters (`self` and `other`). This may not be possible if the resulting filter is
     /// inconsistent (e.g. a filter that requires the module's package to be at two different
diff --git a/crates/sui-graphql-rpc/src/types/zklogin_verify_signature.rs b/crates/sui-graphql-rpc/src/types/zklogin_verify_signature.rs
index 3f568010b662f..eb51fe116f263 100644
--- a/crates/sui-graphql-rpc/src/types/zklogin_verify_signature.rs
+++ b/crates/sui-graphql-rpc/src/types/zklogin_verify_signature.rs
@@ -78,14 +78,11 @@ pub(crate) async fn verify_zklogin_signature(
         ));
     };
 
-    // fetch on-chain JWKs from dynamic field of system object. Due to recent performance
-    // degradations, the existing `DynamicField::query` method is now consistently timing out. As a
-    // workaround, we are using the `query_latest_dynamic_field` method, which fetches object data
-    // from the live `objects` table. This can be reverted once the `objects_snapshot` lag issue is
-    // fixed and we've backfilled the `objects_version` table.
-    let df = DynamicField::query_latest_dynamic_field(
-        ctx.data_unchecked(),
+    // fetch on-chain JWKs from dynamic field of system object.
+    let df = DynamicField::query(
+        ctx,
         SUI_AUTHENTICATOR_STATE_ADDRESS.into(),
+        None,
         DynamicFieldName {
             type_: ExactTypeFilter(TypeTag::U64),
             bcs: Base64(bcs::to_bytes(&1u64).unwrap()),
diff --git a/crates/sui-graphql-rpc/tests/e2e_tests.rs b/crates/sui-graphql-rpc/tests/e2e_tests.rs
index ddb28fd7bf876..e42072d8e28b8 100644
--- a/crates/sui-graphql-rpc/tests/e2e_tests.rs
+++ b/crates/sui-graphql-rpc/tests/e2e_tests.rs
@@ -27,7 +27,7 @@ mod tests {
     use tempfile::tempdir;
     use tokio::time::sleep;
 
-    async fn prep_cluster() -> (ConnectionConfig, ExecutorCluster) {
+    async fn prep_executor_cluster() -> (ConnectionConfig, ExecutorCluster) {
         let rng = StdRng::from_seed([12; 32]);
         let data_ingestion_path = tempdir().unwrap().into_path();
         let mut sim = Simulacrum::new_with_rng(rng);
@@ -93,6 +93,7 @@ mod tests {
             chain_id_actual
         );
         assert_eq!(&format!("{}", res), &exp);
+        cluster.cleanup_resources().await
     }
 
     #[tokio::test]
@@ -146,7 +147,7 @@ mod tests {
     #[tokio::test]
     #[serial]
     async fn test_graphql_client_response() {
-        let (_, cluster) = prep_cluster().await;
+        let (_, cluster) = prep_executor_cluster().await;
 
         let query = r#"
             {
@@ -175,7 +176,7 @@ mod tests {
     #[tokio::test]
     #[serial]
     async fn test_graphql_client_variables() {
-        let (_, cluster) = prep_cluster().await;
+        let (_, cluster) = prep_executor_cluster().await;
 
         let query = r#"{obj1: object(address: $framework_addr) {address}
             obj2: object(address: $deepbook_addr) {address}}"#;
@@ -411,6 +412,7 @@ mod tests {
             .as_str()
             .unwrap();
         assert_eq!(sender_read, sender.to_string());
+        cluster.cleanup_resources().await
     }
 
     #[tokio::test]
@@ -433,7 +435,7 @@ mod tests {
             sui_graphql_rpc::test_infra::cluster::start_cluster(ConnectionConfig::default(), None)
                 .await;
 
-        let test_cluster = cluster.validator_fullnode_handle;
+        let test_cluster = &cluster.validator_fullnode_handle;
         test_cluster.wait_for_epoch_all_nodes(1).await;
         test_cluster.wait_for_authenticator_state_update().await;
 
@@ -532,6 +534,7 @@ mod tests {
         let binding = res.response_body().data.clone().into_json().unwrap();
         let res = binding.get("verifyZkloginSignature").unwrap();
         assert_eq!(res.get("success").unwrap(), false);
+        cluster.cleanup_resources().await
     }
 
     // TODO: add more test cases for transaction execution/dry run in transactional test runner.
@@ -625,6 +628,7 @@ mod tests {
             .unwrap();
         assert_eq!(sender_read, sender.to_string());
         assert!(res.get("results").unwrap().is_array());
+        cluster.cleanup_resources().await
     }
 
     // Test dry run where the transaction kind is provided instead of the full transaction.
@@ -695,6 +699,7 @@ mod tests {
         // in which case the sender is null.
         assert!(sender_read.is_null());
         assert!(res.get("results").unwrap().is_array());
+        cluster.cleanup_resources().await
     }
 
     // Test that we can handle dry run with failures at execution stage too.
@@ -783,6 +788,8 @@ mod tests {
             .as_str()
             .unwrap()
             .contains("UnusedValueWithoutDrop"));
+
+        cluster.cleanup_resources().await
     }
 
     #[tokio::test]
@@ -828,6 +835,7 @@ mod tests {
             .get("liveObjectSetDigest")
             .unwrap()
             .is_null());
+        cluster.cleanup_resources().await
     }
 
     use sui_graphql_rpc::server::builder::tests::*;
@@ -846,8 +854,9 @@ mod tests {
             .await;
         // timeout test includes mutation timeout, which requies a [SuiClient] to be able to run
         // the test, and a transaction. [WalletContext] gives access to everything that's needed.
-        let wallet = cluster.validator_fullnode_handle.wallet;
+        let wallet = &cluster.validator_fullnode_handle.wallet;
         test_timeout_impl(wallet).await;
+        cluster.cleanup_resources().await
     }
 
     #[tokio::test]
@@ -865,7 +874,7 @@ mod tests {
     #[tokio::test]
     #[serial]
     async fn test_query_default_page_limit() {
-        let (connection_config, _) = prep_cluster().await;
+        let (connection_config, _) = prep_executor_cluster().await;
         test_query_default_page_limit_impl(connection_config).await;
     }
 
@@ -891,10 +900,10 @@ mod tests {
         let cluster =
             sui_graphql_rpc::test_infra::cluster::start_cluster(connection_config, None).await;
 
-        println!("Cluster started");
         cluster
             .wait_for_checkpoint_catchup(0, Duration::from_secs(10))
             .await;
         test_health_check_impl().await;
+        cluster.cleanup_resources().await
     }
 }
diff --git a/crates/sui-graphql-rpc/tests/examples_validation_tests.rs b/crates/sui-graphql-rpc/tests/examples_validation_tests.rs
index fc2a95d21c90b..205c0e1407b5d 100644
--- a/crates/sui-graphql-rpc/tests/examples_validation_tests.rs
+++ b/crates/sui-graphql-rpc/tests/examples_validation_tests.rs
@@ -3,105 +3,147 @@
 
 #[cfg(feature = "pg_integration")]
 mod tests {
+    use anyhow::{anyhow, Context, Result};
     use rand::rngs::StdRng;
     use rand::SeedableRng;
     use serial_test::serial;
     use simulacrum::Simulacrum;
     use std::cmp::max;
+    use std::collections::BTreeMap;
+    use std::fs;
     use std::path::PathBuf;
     use std::sync::Arc;
     use sui_graphql_rpc::config::{ConnectionConfig, Limits};
-    use sui_graphql_rpc::examples::{load_examples, ExampleQuery, ExampleQueryGroup};
     use sui_graphql_rpc::test_infra::cluster::ExecutorCluster;
     use sui_graphql_rpc::test_infra::cluster::DEFAULT_INTERNAL_DATA_SOURCE_PORT;
     use tempfile::tempdir;
 
-    fn bad_examples() -> ExampleQueryGroup {
-        ExampleQueryGroup {
-            name: "bad_examples".to_string(),
-            queries: vec![
-                ExampleQuery {
-                    name: "multiple_queries".to_string(),
+    struct Example {
+        contents: String,
+        path: Option<PathBuf>,
+    }
+
+    fn good_examples() -> Result<BTreeMap<String, Example>> {
+        let examples = PathBuf::from(&env!("CARGO_MANIFEST_DIR")).join("examples");
+
+        let mut dirs = vec![examples.clone()];
+        let mut queries = BTreeMap::new();
+        while let Some(dir) = dirs.pop() {
+            let entries =
+                fs::read_dir(&dir).with_context(|| format!("Looking in {}", dir.display()))?;
+
+            for entry in entries {
+                let entry = entry.with_context(|| format!("Entry in {}", dir.display()))?;
+                let path = entry.path();
+                let typ_ = entry
+                    .file_type()
+                    .with_context(|| format!("Metadata for {}", path.display()))?;
+
+                if typ_.is_dir() {
+                    dirs.push(entry.path());
+                    continue;
+                }
+
+                if path.ends_with(".graphql") {
+                    let contents = fs::read_to_string(&path)
+                        .with_context(|| format!("Reading {}", path.display()))?;
+
+                    let rel_path = path
+                        .strip_prefix(&examples)
+                        .with_context(|| format!("Generating name from {}", path.display()))?
+                        .with_extension("");
+
+                    let name = rel_path
+                        .to_str()
+                        .ok_or_else(|| anyhow!("Generating name from {}", path.display()))?;
+
+                    queries.insert(
+                        name.to_string(),
+                        Example {
+                            contents,
+                            path: Some(path),
+                        },
+                    );
+                }
+            }
+        }
+
+        Ok(queries)
+    }
+
+    fn bad_examples() -> BTreeMap<String, Example> {
+        BTreeMap::from_iter([
+            (
+                "multiple_queries".to_string(),
+                Example {
                     contents: "{ chainIdentifier } { chainIdentifier }".to_string(),
-                    path: PathBuf::from("multiple_queries.graphql"),
+                    path: None,
                 },
-                ExampleQuery {
-                    name: "malformed".to_string(),
+            ),
+            (
+                "malformed".to_string(),
+                Example {
                     contents: "query { }}".to_string(),
-                    path: PathBuf::from("malformed.graphql"),
+                    path: None,
                 },
-                ExampleQuery {
-                    name: "invalid".to_string(),
+            ),
+            (
+                "invalid".to_string(),
+                Example {
                     contents: "djewfbfo".to_string(),
-                    path: PathBuf::from("invalid.graphql"),
+                    path: None,
                 },
-                ExampleQuery {
-                    name: "empty".to_string(),
+            ),
+            (
+                "empty".to_string(),
+                Example {
                     contents: "     ".to_string(),
-                    path: PathBuf::from("empty.graphql"),
+                    path: None,
                 },
-            ],
-            _path: PathBuf::from("bad_examples"),
-        }
+            ),
+        ])
     }
 
-    async fn validate_example_query_group(
+    async fn test_query(
         cluster: &ExecutorCluster,
-        group: &ExampleQueryGroup,
+        name: &str,
+        query: &Example,
         max_nodes: &mut u64,
         max_output_nodes: &mut u64,
         max_depth: &mut u64,
         max_payload: &mut u64,
     ) -> Vec<String> {
-        let mut errors = vec![];
-        for query in &group.queries {
-            let resp = cluster
-                .graphql_client
-                .execute_to_graphql(query.contents.clone(), true, vec![], vec![])
-                .await
-                .unwrap();
-            resp.errors().iter().for_each(|err| {
-                errors.push(format!(
-                    "Query failed: {}: {} at: {}\nError: {}",
-                    group.name,
-                    query.name,
-                    query.path.display(),
-                    err
-                ))
-            });
-            if resp.errors().is_empty() {
-                let usage = resp
-                    .usage()
-                    .expect("Usage fetch should succeed")
-                    .unwrap_or_else(|| panic!("Usage should be present for query: {}", query.name));
-
-                let nodes = *usage.get("inputNodes").unwrap_or_else(|| {
-                    panic!("Node usage should be present for query: {}", query.name)
-                });
-                let output_nodes = *usage.get("outputNodes").unwrap_or_else(|| {
-                    panic!(
-                        "Output node usage should be present for query: {}",
-                        query.name
-                    )
-                });
-                let depth = *usage.get("depth").unwrap_or_else(|| {
-                    panic!("Depth usage should be present for query: {}", query.name)
-                });
-                let payload = *usage.get("queryPayload").unwrap_or_else(|| {
-                    panic!("Payload usage should be present for query: {}", query.name)
-                });
-                *max_nodes = max(*max_nodes, nodes);
-                *max_output_nodes = max(*max_output_nodes, output_nodes);
-                *max_depth = max(*max_depth, depth);
-                *max_payload = max(*max_payload, payload);
-            }
+        let resp = cluster
+            .graphql_client
+            .execute_to_graphql(query.contents.clone(), true, vec![], vec![])
+            .await
+            .unwrap();
+
+        let errors = resp.errors();
+        if errors.is_empty() {
+            let usage = resp
+                .usage()
+                .expect("Usage not found")
+                .expect("Usage not found");
+            *max_nodes = max(*max_nodes, usage["inputNodes"]);
+            *max_output_nodes = max(*max_output_nodes, usage["outputNodes"]);
+            *max_depth = max(*max_depth, usage["depth"]);
+            *max_payload = max(*max_payload, usage["queryPayload"]);
+            return vec![];
         }
+
         errors
+            .into_iter()
+            .map(|e| match &query.path {
+                Some(p) => format!("Query {name:?} at {} failed: {e}", p.display()),
+                None => format!("Query {name:?} failed: {e}"),
+            })
+            .collect()
     }
 
     #[tokio::test]
     #[serial]
-    async fn test_single_all_examples_structure_valid() {
+    async fn good_examples_within_limits() {
         let rng = StdRng::from_seed([12; 32]);
         let data_ingestion_path = tempdir().unwrap().into_path();
         let mut sim = Simulacrum::new_with_rng(rng);
@@ -119,20 +161,20 @@ mod tests {
         )
         .await;
 
-        let groups = load_examples().expect("Could not load examples");
-
         let mut errors = vec![];
-        for group in groups {
-            let group_errors = validate_example_query_group(
-                &cluster,
-                &group,
-                &mut max_nodes,
-                &mut max_output_nodes,
-                &mut max_depth,
-                &mut max_payload,
-            )
-            .await;
-            errors.extend(group_errors);
+        for (name, example) in good_examples().expect("Could not load examples") {
+            errors.extend(
+                test_query(
+                    &cluster,
+                    &name,
+                    &example,
+                    &mut max_nodes,
+                    &mut max_output_nodes,
+                    &mut max_depth,
+                    &mut max_payload,
+                )
+                .await,
+            );
         }
 
         // Check that our examples can run with our usage limits
@@ -167,7 +209,7 @@ mod tests {
 
     #[tokio::test]
     #[serial]
-    async fn test_bad_examples_fail() {
+    async fn bad_examples_fail() {
         let rng = StdRng::from_seed([12; 32]);
         let data_ingestion_path = tempdir().unwrap().into_path();
         let mut sim = Simulacrum::new_with_rng(rng);
@@ -185,21 +227,19 @@ mod tests {
         )
         .await;
 
-        let bad_examples = bad_examples();
-        let errors = validate_example_query_group(
-            &cluster,
-            &bad_examples,
-            &mut max_nodes,
-            &mut max_output_nodes,
-            &mut max_depth,
-            &mut max_payload,
-        )
-        .await;
+        for (name, example) in bad_examples() {
+            let errors = test_query(
+                &cluster,
+                &name,
+                &example,
+                &mut max_nodes,
+                &mut max_output_nodes,
+                &mut max_depth,
+                &mut max_payload,
+            )
+            .await;
 
-        assert_eq!(
-            errors.len(),
-            bad_examples.queries.len(),
-            "all examples should fail"
-        );
+            assert!(!errors.is_empty(), "Query {name:?} should have failed");
+        }
     }
 }
diff --git a/crates/sui-graphql-rpc/tests/snapshot_tests.rs b/crates/sui-graphql-rpc/tests/snapshot_tests.rs
index 30a66934b5deb..dcefef844375d 100644
--- a/crates/sui-graphql-rpc/tests/snapshot_tests.rs
+++ b/crates/sui-graphql-rpc/tests/snapshot_tests.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use insta::assert_snapshot;
-use std::fs::write;
+use std::fs;
 use std::path::PathBuf;
 use sui_graphql_rpc::server::builder::export_schema;
 
@@ -11,9 +11,8 @@ fn test_schema_sdl_export() {
     let sdl = export_schema();
 
     // update the current schema file
-    let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
-    path.extend(["schema", "current_progress_schema.graphql"]);
-    write(path, &sdl).unwrap();
+    let path = PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("schema.graphql");
+    fs::write(path, &sdl).unwrap();
 
     assert_snapshot!(sdl);
 }
diff --git a/crates/sui-graphql-rpc/tests/snapshots/snapshot_tests__schema_sdl_export.snap b/crates/sui-graphql-rpc/tests/snapshots/snapshot_tests__schema_sdl_export.snap
index 7746f8124de1c..ed3ec693362f4 100644
--- a/crates/sui-graphql-rpc/tests/snapshots/snapshot_tests__schema_sdl_export.snap
+++ b/crates/sui-graphql-rpc/tests/snapshots/snapshot_tests__schema_sdl_export.snap
@@ -102,8 +102,27 @@ type Address implements IOwner {
 	"""
 	Similar behavior to the `transactionBlocks` in Query but supporting the additional
 	`AddressTransactionBlockRelationship` filter, which defaults to `SIGN`.
+	
+	`scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+	results. It is required for queries that apply more than two complex filters (on function,
+	kind, sender, recipient, input object, changed object, or ids), and can be at most
+	`serviceConfig.maxScanLimit`.
+	
+	When the scan limit is reached the page will be returned even if it has fewer than `first`
+	results when paginating forward (`last` when paginating backwards). If there are more
+	transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+	`true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+	transaction that was scanned as opposed to the last (or first) transaction in the page.
+	
+	Requesting the next (or previous) page after this cursor will resume the search, scanning
+	the next `scanLimit` many transactions in the direction of pagination, and so on until all
+	transactions in the scanning range have been visited.
+	
+	By default, the scanning range includes all transactions known to GraphQL, but it can be
+	restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+	`afterCheckpoint` and `atCheckpoint` filters.
 	"""
-	transactionBlocks(first: Int, after: String, last: Int, before: String, relation: AddressTransactionBlockRelationship, filter: TransactionBlockFilter): TransactionBlockConnection!
+	transactionBlocks(first: Int, after: String, last: Int, before: String, relation: AddressTransactionBlockRelationship, filter: TransactionBlockFilter, scanLimit: Int): TransactionBlockConnection!
 }
 
 type AddressConnection {
@@ -413,8 +432,25 @@ type Checkpoint {
 	epoch: Epoch
 	"""
 	Transactions in this checkpoint.
+	
+	`scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+	results. It is required for queries that apply more than two complex filters (on function,
+	kind, sender, recipient, input object, changed object, or ids), and can be at most
+	`serviceConfig.maxScanLimit`.
+	
+	When the scan limit is reached the page will be returned even if it has fewer than `first`
+	results when paginating forward (`last` when paginating backwards). If there are more
+	transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+	`true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+	transaction that was scanned as opposed to the last (or first) transaction in the page.
+	
+	Requesting the next (or previous) page after this cursor will resume the search, scanning
+	the next `scanLimit` many transactions in the direction of pagination, and so on until all
+	transactions in the scanning range have been visited.
+	
+	By default, the scanning range consists of all transactions in this checkpoint.
 	"""
-	transactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter): TransactionBlockConnection!
+	transactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter, scanLimit: Int): TransactionBlockConnection!
 }
 
 type CheckpointConnection {
@@ -521,8 +557,27 @@ type Coin implements IMoveObject & IObject & IOwner {
 	storageRebate: BigInt
 	"""
 	The transaction blocks that sent objects to this object.
+	
+	`scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+	results. It is required for queries that apply more than two complex filters (on function,
+	kind, sender, recipient, input object, changed object, or ids), and can be at most
+	`serviceConfig.maxScanLimit`.
+	
+	When the scan limit is reached the page will be returned even if it has fewer than `first`
+	results when paginating forward (`last` when paginating backwards). If there are more
+	transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+	`true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+	transaction that was scanned as opposed to the last (or first) transaction in the page.
+	
+	Requesting the next (or previous) page after this cursor will resume the search, scanning
+	the next `scanLimit` many transactions in the direction of pagination, and so on until all
+	transactions in the scanning range have been visited.
+	
+	By default, the scanning range includes all transactions known to GraphQL, but it can be
+	restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+	`afterCheckpoint` and `atCheckpoint` filters.
 	"""
-	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter): TransactionBlockConnection!
+	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter, scanLimit: Int): TransactionBlockConnection!
 	"""
 	The Base64-encoded BCS serialization of the object's content.
 	"""
@@ -680,8 +735,27 @@ type CoinMetadata implements IMoveObject & IObject & IOwner {
 	storageRebate: BigInt
 	"""
 	The transaction blocks that sent objects to this object.
+	
+	`scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+	results. It is required for queries that apply more than two complex filters (on function,
+	kind, sender, recipient, input object, changed object, or ids), and can be at most
+	`serviceConfig.maxScanLimit`.
+	
+	When the scan limit is reached the page will be returned even if it has fewer than `first`
+	results when paginating forward (`last` when paginating backwards). If there are more
+	transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+	`true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+	transaction that was scanned as opposed to the last (or first) transaction in the page.
+	
+	Requesting the next (or previous) page after this cursor will resume the search, scanning
+	the next `scanLimit` many transactions in the direction of pagination, and so on until all
+	transactions in the scanning range have been visited.
+	
+	By default, the scanning range includes all transactions known to GraphQL, but it can be
+	restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+	`afterCheckpoint` and `atCheckpoint` filters.
 	"""
-	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter): TransactionBlockConnection!
+	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter, scanLimit: Int): TransactionBlockConnection!
 	"""
 	The Base64-encoded BCS serialization of the object's content.
 	"""
@@ -1097,8 +1171,25 @@ type Epoch {
 	checkpoints(first: Int, after: String, last: Int, before: String): CheckpointConnection!
 	"""
 	The epoch's corresponding transaction blocks.
+	
+	`scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+	results. It is required for queries that apply more than two complex filters (on function,
+	kind, sender, recipient, input object, changed object, or ids), and can be at most
+	`serviceConfig.maxScanLimit`.
+	
+	When the scan limit is reached the page will be returned even if it has fewer than `first`
+	results when paginating forward (`last` when paginating backwards). If there are more
+	transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+	`true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+	transaction that was scanned as opposed to the last (or first) transaction in the page.
+	
+	Requesting the next (or previous) page after this cursor will resume the search, scanning
+	the next `scanLimit` many transactions in the direction of pagination, and so on until all
+	transactions in the scanning range have been visited.
+	
+	By default, the scanning range consists of all transactions in this epoch.
 	"""
-	transactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter): TransactionBlockConnection!
+	transactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter, scanLimit: Int): TransactionBlockConnection!
 }
 
 type Event {
@@ -1185,6 +1276,8 @@ input EventFilter {
 	PTB and emits an event.
 	
 	Modules can be filtered by their package, or package::module.
+	We currently do not support filtering by emitting module and event type
+	at the same time so if both are provided in one filter, the query will error.
 	"""
 	emittingModule: String
 	"""
@@ -1433,7 +1526,7 @@ interface IObject {
 	"""
 	The transaction blocks that sent objects to this object.
 	"""
-	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter): TransactionBlockConnection!
+	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter, scanLimit: Int): TransactionBlockConnection!
 	"""
 	The Base64-encoded BCS serialization of the object's content.
 	"""
@@ -1976,8 +2069,27 @@ type MoveObject implements IMoveObject & IObject & IOwner {
 	storageRebate: BigInt
 	"""
 	The transaction blocks that sent objects to this object.
+	
+	`scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+	results. It is required for queries that apply more than two complex filters (on function,
+	kind, sender, recipient, input object, changed object, or ids), and can be at most
+	`serviceConfig.maxScanLimit`.
+	
+	When the scan limit is reached the page will be returned even if it has fewer than `first`
+	results when paginating forward (`last` when paginating backwards). If there are more
+	transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+	`true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+	transaction that was scanned as opposed to the last (or first) transaction in the page.
+	
+	Requesting the next (or previous) page after this cursor will resume the search, scanning
+	the next `scanLimit` many transactions in the direction of pagination, and so on until all
+	transactions in the scanning range have been visited.
+	
+	By default, the scanning range includes all transactions known to GraphQL, but it can be
+	restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+	`afterCheckpoint` and `atCheckpoint` filters.
 	"""
-	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter): TransactionBlockConnection!
+	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter, scanLimit: Int): TransactionBlockConnection!
 	"""
 	The Base64-encoded BCS serialization of the object's content.
 	"""
@@ -2165,13 +2277,48 @@ type MovePackage implements IObject & IOwner {
 	The transaction blocks that sent objects to this package.
 	
 	Note that objects that have been sent to a package become inaccessible.
+	
+	`scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+	results. It is required for queries that apply more than two complex filters (on function,
+	kind, sender, recipient, input object, changed object, or ids), and can be at most
+	`serviceConfig.maxScanLimit`.
+	
+	When the scan limit is reached the page will be returned even if it has fewer than `first`
+	results when paginating forward (`last` when paginating backwards). If there are more
+	transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+	`true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+	transaction that was scanned as opposed to the last (or first) transaction in the page.
+	
+	Requesting the next (or previous) page after this cursor will resume the search, scanning
+	the next `scanLimit` many transactions in the direction of pagination, and so on until all
+	transactions in the scanning range have been visited.
+	
+	By default, the scanning range includes all transactions known to GraphQL, but it can be
+	restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+	`afterCheckpoint` and `atCheckpoint` filters.
 	"""
-	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter): TransactionBlockConnection!
+	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter, scanLimit: Int): TransactionBlockConnection!
 	"""
 	The Base64-encoded BCS serialization of the package's content.
 	"""
 	bcs: Base64
 	"""
+	Fetch another version of this package (the package that shares this package's original ID,
+	but has the specified `version`).
+	"""
+	packageAtVersion(version: Int!): MovePackage
+	"""
+	Fetch all versions of this package (packages that share this package's original ID),
+	optionally bounding the versions exclusively from below with `afterVersion`, or from above
+	with `beforeVersion`.
+	"""
+	packageVersions(first: Int, after: String, last: Int, before: String, filter: MovePackageVersionFilter): MovePackageConnection!
+	"""
+	Fetch the latest version of this package (the package with the highest `version` that shares
+	this packages's original ID)
+	"""
+	latestPackage: MovePackage!
+	"""
 	A representation of the module called `name` in this package, including the
 	structs and functions it defines.
 	"""
@@ -2195,6 +2342,22 @@ type MovePackage implements IObject & IOwner {
 	moduleBcs: Base64
 }
 
+"""
+Filter for paginating `MovePackage`s that were created within a range of checkpoints.
+"""
+input MovePackageCheckpointFilter {
+	"""
+	Fetch packages that were published strictly after this checkpoint. Omitting this fetches
+	packages published since genesis.
+	"""
+	afterCheckpoint: UInt53
+	"""
+	Fetch packages that were published strictly before this checkpoint. Omitting this fetches
+	packages published up to the latest checkpoint (inclusive).
+	"""
+	beforeCheckpoint: UInt53
+}
+
 type MovePackageConnection {
 	"""
 	Information to aid in pagination.
@@ -2224,6 +2387,22 @@ type MovePackageEdge {
 	cursor: String!
 }
 
+"""
+Filter for paginating versions of a given `MovePackage`.
+"""
+input MovePackageVersionFilter {
+	"""
+	Fetch versions of this package that are strictly newer than this version. Omitting this
+	fetches versions since the original version.
+	"""
+	afterVersion: UInt53
+	"""
+	Fetch versions of this package that are strictly older than this version. Omitting this
+	fetches versions up to the latest version (inclusive).
+	"""
+	beforeVersion: UInt53
+}
+
 """
 Description of a struct type, defined in a Move module.
 """
@@ -2496,8 +2675,27 @@ type Object implements IObject & IOwner {
 	storageRebate: BigInt
 	"""
 	The transaction blocks that sent objects to this object.
+	
+	`scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+	results. It is required for queries that apply more than two complex filters (on function,
+	kind, sender, recipient, input object, changed object, or ids), and can be at most
+	`serviceConfig.maxScanLimit`.
+	
+	When the scan limit is reached the page will be returned even if it has fewer than `first`
+	results when paginating forward (`last` when paginating backwards). If there are more
+	transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+	`true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+	transaction that was scanned as opposed to the last (or first) transaction in the page.
+	
+	Requesting the next (or previous) page after this cursor will resume the search, scanning
+	the next `scanLimit` many transactions in the direction of pagination, and so on until all
+	transactions in the scanning range have been visited.
+	
+	By default, the scanning range includes all transactions known to GraphQL, but it can be
+	restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+	`afterCheckpoint` and `atCheckpoint` filters.
 	"""
-	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter): TransactionBlockConnection!
+	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter, scanLimit: Int): TransactionBlockConnection!
 	"""
 	The Base64-encoded BCS serialization of the object's content.
 	"""
@@ -3037,13 +3235,33 @@ type Query {
 	state at the latest checkpoint known to the GraphQL RPC. Similarly, `Owner.asObject` will
 	return the object's version at the latest checkpoint.
 	"""
-	owner(address: SuiAddress!, rootVersion: Int): Owner
+	owner(address: SuiAddress!, rootVersion: UInt53): Owner
 	"""
 	The object corresponding to the given address at the (optionally) given version.
 	When no version is given, the latest version is returned.
 	"""
 	object(address: SuiAddress!, version: UInt53): Object
 	"""
+	The package corresponding to the given address (at the optionally given version).
+	
+	When no version is given, the package is loaded directly from the address given. Otherwise,
+	the address is translated before loading to point to the package whose original ID matches
+	the package at `address`, but whose version is `version`. For non-system packages, this
+	might result in a different address than `address` because different versions of a package,
+	introduced by upgrades, exist at distinct addresses.
+	
+	Note that this interpretation of `version` is different from a historical object read (the
+	interpretation of `version` for the `object` query).
+	"""
+	package(address: SuiAddress!, version: UInt53): MovePackage
+	"""
+	The latest version of the package at `address`.
+	
+	This corresponds to the package with the highest `version` that shares its original ID with
+	the package at `address`.
+	"""
+	latestPackage(address: SuiAddress!): MovePackage
+	"""
 	Look-up an Account by its SuiAddress.
 	"""
 	address(address: SuiAddress!): Address
@@ -3078,10 +3296,31 @@ type Query {
 	checkpoints(first: Int, after: String, last: Int, before: String): CheckpointConnection!
 	"""
 	The transaction blocks that exist in the network.
+	
+	`scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+	results. It is required for queries that apply more than two complex filters (on function,
+	kind, sender, recipient, input object, changed object, or ids), and can be at most
+	`serviceConfig.maxScanLimit`.
+	
+	When the scan limit is reached the page will be returned even if it has fewer than `first`
+	results when paginating forward (`last` when paginating backwards). If there are more
+	transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+	`true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+	transaction that was scanned as opposed to the last (or first) transaction in the page.
+	
+	Requesting the next (or previous) page after this cursor will resume the search, scanning
+	the next `scanLimit` many transactions in the direction of pagination, and so on until all
+	transactions in the scanning range have been visited.
+	
+	By default, the scanning range includes all transactions known to GraphQL, but it can be
+	restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+	`afterCheckpoint` and `atCheckpoint` filters.
 	"""
-	transactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter): TransactionBlockConnection!
+	transactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter, scanLimit: Int): TransactionBlockConnection!
 	"""
-	The events that exist in the network.
+	Query events that are emitted in the network.
+	We currently do not support filtering by emitting module and event type
+	at the same time so if both are provided in one filter, the query will error.
 	"""
 	events(first: Int, after: String, last: Int, before: String, filter: EventFilter): EventConnection!
 	"""
@@ -3089,6 +3328,20 @@ type Query {
 	"""
 	objects(first: Int, after: String, last: Int, before: String, filter: ObjectFilter): ObjectConnection!
 	"""
+	The Move packages that exist in the network, optionally filtered to be strictly before
+	`beforeCheckpoint` and/or strictly after `afterCheckpoint`.
+	
+	This query returns all versions of a given user package that appear between the specified
+	checkpoints, but only records the latest versions of system packages.
+	"""
+	packages(first: Int, after: String, last: Int, before: String, filter: MovePackageCheckpointFilter): MovePackageConnection!
+	"""
+	Fetch all versions of package at `address` (packages that share this package's original ID),
+	optionally bounding the versions exclusively from below with `afterVersion`, or from above
+	with `beforeVersion`.
+	"""
+	packageVersions(first: Int, after: String, last: Int, before: String, address: SuiAddress!, filter: MovePackageVersionFilter): MovePackageConnection!
+	"""
 	Fetch the protocol config by protocol version (defaults to the latest protocol
 	version known to the GraphQL service).
 	"""
@@ -3283,6 +3536,14 @@ type ServiceConfig {
 	Maximum nesting allowed in struct fields when calculating the layout of a single Move Type.
 	"""
 	maxMoveValueDepth: Int!
+	"""
+	Maximum number of transaction ids that can be passed to a `TransactionBlockFilter`.
+	"""
+	maxTransactionIds: Int!
+	"""
+	Maximum number of candidates to scan when gathering a page of results.
+	"""
+	maxScanLimit: Int!
 }
 
 """
@@ -3500,8 +3761,27 @@ type StakedSui implements IMoveObject & IObject & IOwner {
 	storageRebate: BigInt
 	"""
 	The transaction blocks that sent objects to this object.
+	
+	`scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+	results. It is required for queries that apply more than two complex filters (on function,
+	kind, sender, recipient, input object, changed object, or ids), and can be at most
+	`serviceConfig.maxScanLimit`.
+	
+	When the scan limit is reached the page will be returned even if it has fewer than `first`
+	results when paginating forward (`last` when paginating backwards). If there are more
+	transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+	`true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+	transaction that was scanned as opposed to the last (or first) transaction in the page.
+	
+	Requesting the next (or previous) page after this cursor will resume the search, scanning
+	the next `scanLimit` many transactions in the direction of pagination, and so on until all
+	transactions in the scanning range have been visited.
+	
+	By default, the scanning range includes all transactions known to GraphQL, but it can be
+	restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+	`afterCheckpoint` and `atCheckpoint` filters.
 	"""
-	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter): TransactionBlockConnection!
+	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter, scanLimit: Int): TransactionBlockConnection!
 	"""
 	The Base64-encoded BCS serialization of the object's content.
 	"""
@@ -3702,8 +3982,27 @@ type SuinsRegistration implements IMoveObject & IObject & IOwner {
 	storageRebate: BigInt
 	"""
 	The transaction blocks that sent objects to this object.
+	
+	`scanLimit` restricts the number of candidate transactions scanned when gathering a page of
+	results. It is required for queries that apply more than two complex filters (on function,
+	kind, sender, recipient, input object, changed object, or ids), and can be at most
+	`serviceConfig.maxScanLimit`.
+	
+	When the scan limit is reached the page will be returned even if it has fewer than `first`
+	results when paginating forward (`last` when paginating backwards). If there are more
+	transactions to scan, `pageInfo.hasNextPage` (or `pageInfo.hasPreviousPage`) will be set to
+	`true`, and `PageInfo.endCursor` (or `PageInfo.startCursor`) will be set to the last
+	transaction that was scanned as opposed to the last (or first) transaction in the page.
+	
+	Requesting the next (or previous) page after this cursor will resume the search, scanning
+	the next `scanLimit` many transactions in the direction of pagination, and so on until all
+	transactions in the scanning range have been visited.
+	
+	By default, the scanning range includes all transactions known to GraphQL, but it can be
+	restricted by the `after` and `before` cursors, and the `beforeCheckpoint`,
+	`afterCheckpoint` and `atCheckpoint` filters.
 	"""
-	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter): TransactionBlockConnection!
+	receivedTransactionBlocks(first: Int, after: String, last: Int, before: String, filter: TransactionBlockFilter, scanLimit: Int): TransactionBlockConnection!
 	"""
 	The Base64-encoded BCS serialization of the object's content.
 	"""
@@ -4406,6 +4705,8 @@ type ZkLoginVerifyResult {
 	errors: [String!]!
 }
 
+directive @include(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
+directive @skip(if: Boolean!) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT
 schema {
 	query: Query
 	mutation: Mutation
diff --git a/crates/sui-indexer-builder/Cargo.toml b/crates/sui-indexer-builder/Cargo.toml
new file mode 100644
index 0000000000000..4ae5164d862ce
--- /dev/null
+++ b/crates/sui-indexer-builder/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "sui-indexer-builder"
+version = "0.1.0"
+authors = ["Mysten Labs <build@mystenlabs.com>"]
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+anyhow.workspace = true
+tokio = { workspace = true, features = ["full"] }
+async-trait.workspace = true
+mysten-metrics.workspace = true
+sui-types.workspace = true
+sui-data-ingestion-core.workspace = true
+tracing.workspace = true
+prometheus.workspace = true
+telemetry-subscribers.workspace = true
\ No newline at end of file
diff --git a/crates/sui-indexer-builder/src/indexer_builder.rs b/crates/sui-indexer-builder/src/indexer_builder.rs
new file mode 100644
index 0000000000000..dd7b317c76141
--- /dev/null
+++ b/crates/sui-indexer-builder/src/indexer_builder.rs
@@ -0,0 +1,323 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use std::cmp::{max, min};
+use std::sync::Arc;
+
+use anyhow::Error;
+use async_trait::async_trait;
+use tokio::task::JoinHandle;
+
+use mysten_metrics::{metered_channel, spawn_monitored_task};
+
+use crate::{Task, Tasks};
+
+type CheckpointData<T> = (u64, Vec<T>);
+pub type DataSender<T> = metered_channel::Sender<CheckpointData<T>>;
+
+pub struct IndexerBuilder<D, M> {
+    name: String,
+    datasource: D,
+    data_mapper: M,
+    backfill_strategy: BackfillStrategy,
+    disable_live_task: bool,
+}
+
+impl<D, M> IndexerBuilder<D, M> {
+    pub fn new(name: &str, datasource: D, data_mapper: M) -> IndexerBuilder<D, M> {
+        IndexerBuilder {
+            name: name.into(),
+            datasource,
+            data_mapper,
+            backfill_strategy: BackfillStrategy::Simple,
+            disable_live_task: false,
+        }
+    }
+    pub fn build<R, P>(
+        self,
+        start_from_checkpoint: u64,
+        genesis_checkpoint: u64,
+        persistent: P,
+    ) -> Indexer<P, D, M>
+    where
+        P: Persistent<R>,
+    {
+        Indexer {
+            name: self.name,
+            storage: persistent,
+            datasource: self.datasource.into(),
+            backfill_strategy: self.backfill_strategy,
+            disable_live_task: self.disable_live_task,
+            start_from_checkpoint,
+            data_mapper: self.data_mapper,
+            genesis_checkpoint,
+        }
+    }
+
+    pub fn with_backfill_strategy(mut self, backfill: BackfillStrategy) -> Self {
+        self.backfill_strategy = backfill;
+        self
+    }
+
+    pub fn disable_live_task(mut self) -> Self {
+        self.disable_live_task = true;
+        self
+    }
+}
+
+pub struct Indexer<P, D, M> {
+    name: String,
+    storage: P,
+    datasource: Arc<D>,
+    data_mapper: M,
+    backfill_strategy: BackfillStrategy,
+    disable_live_task: bool,
+    start_from_checkpoint: u64,
+    genesis_checkpoint: u64,
+}
+
+impl<P, D, M> Indexer<P, D, M> {
+    pub async fn start<T, R>(mut self) -> Result<(), Error>
+    where
+        D: Datasource<T> + 'static,
+        M: DataMapper<T, R> + 'static,
+        P: Persistent<R> + 'static,
+        T: Send,
+    {
+        // Update tasks first
+        self.update_tasks().await?;
+        // get updated tasks from storage and start workers
+        let updated_tasks = self.storage.tasks(&self.name).await?;
+        // Start latest checkpoint worker
+        // Tasks are ordered in checkpoint descending order, realtime update task always come first
+        // tasks won't be empty here, ok to unwrap.
+        let live_task_future = match updated_tasks.live_task() {
+            Some(live_task) if !self.disable_live_task => {
+                let live_task_future = self.datasource.start_ingestion_task(
+                    live_task.task_name.clone(),
+                    live_task.checkpoint,
+                    live_task.target_checkpoint,
+                    self.storage.clone(),
+                    self.data_mapper.clone(),
+                );
+                Some(live_task_future)
+            }
+            _ => None,
+        };
+
+        let backfill_tasks = updated_tasks.backfill_tasks();
+        let storage_clone = self.storage.clone();
+        let data_mapper_clone = self.data_mapper.clone();
+        let datasource_clone = self.datasource.clone();
+
+        let handle = spawn_monitored_task!(async {
+            // Execute task one by one
+            for backfill_task in backfill_tasks {
+                if backfill_task.checkpoint < backfill_task.target_checkpoint {
+                    datasource_clone
+                        .start_ingestion_task(
+                            backfill_task.task_name.clone(),
+                            backfill_task.checkpoint,
+                            backfill_task.target_checkpoint,
+                            storage_clone.clone(),
+                            data_mapper_clone.clone(),
+                        )
+                        .await
+                        .expect("Backfill task failed");
+                }
+            }
+        });
+
+        if let Some(live_task_future) = live_task_future {
+            live_task_future.await?;
+        }
+
+        tokio::try_join!(handle)?;
+
+        Ok(())
+    }
+
+    async fn update_tasks<R>(&mut self) -> Result<(), Error>
+    where
+        P: Persistent<R>,
+    {
+        let tasks = self.storage.tasks(&self.name).await?;
+        let backfill_tasks = tasks.backfill_tasks();
+        let latest_task = backfill_tasks.first();
+
+        // 1, create and update live task if needed
+        if !self.disable_live_task {
+            let from_checkpoint = max(
+                self.start_from_checkpoint,
+                latest_task
+                    .map(|t| t.target_checkpoint + 1)
+                    .unwrap_or_default(),
+            );
+
+            match tasks.live_task() {
+                None => {
+                    self.storage
+                        .register_task(
+                            format!("{} - Live", self.name),
+                            from_checkpoint,
+                            i64::MAX as u64,
+                        )
+                        .await?;
+                }
+                Some(mut live_task) => {
+                    if self.start_from_checkpoint > live_task.checkpoint {
+                        live_task.checkpoint = self.start_from_checkpoint;
+                        self.storage.update_task(live_task).await?;
+                    }
+                }
+            }
+        }
+
+        // 2, create backfill tasks base on task config and existing tasks in the db
+        match latest_task {
+            None => {
+                // No task in database, create backfill tasks from genesis to `start_from_checkpoint`
+                if self.start_from_checkpoint != self.genesis_checkpoint {
+                    self.create_backfill_tasks(
+                        self.genesis_checkpoint,
+                        self.start_from_checkpoint - 1,
+                    )
+                    .await?
+                }
+            }
+            Some(latest_task) => {
+                if latest_task.target_checkpoint + 1 < self.start_from_checkpoint {
+                    self.create_backfill_tasks(
+                        latest_task.target_checkpoint + 1,
+                        self.start_from_checkpoint - 1,
+                    )
+                    .await?;
+                }
+            }
+        }
+        Ok(())
+    }
+
+    // Create backfill tasks according to backfill strategy
+    async fn create_backfill_tasks<R>(&mut self, mut from_cp: u64, to_cp: u64) -> Result<(), Error>
+    where
+        P: Persistent<R>,
+    {
+        match self.backfill_strategy {
+            BackfillStrategy::Simple => {
+                self.storage
+                    .register_task(
+                        format!("{} - backfill - {from_cp}:{to_cp}", self.name),
+                        from_cp,
+                        to_cp,
+                    )
+                    .await
+            }
+            BackfillStrategy::Partitioned { task_size } => {
+                while from_cp < self.start_from_checkpoint {
+                    let target_cp = min(from_cp + task_size - 1, to_cp);
+                    self.storage
+                        .register_task(
+                            format!("{} - backfill - {from_cp}:{target_cp}", self.name),
+                            from_cp,
+                            target_cp,
+                        )
+                        .await?;
+                    from_cp = target_cp + 1;
+                }
+                Ok(())
+            }
+            BackfillStrategy::Disabled => Ok(()),
+        }
+    }
+}
+
+#[async_trait]
+pub trait Persistent<T>: IndexerProgressStore + Sync + Send + Clone {
+    async fn write(&self, data: Vec<T>) -> Result<(), Error>;
+}
+
+#[async_trait]
+pub trait IndexerProgressStore: Send {
+    async fn load_progress(&self, task_name: String) -> anyhow::Result<u64>;
+    async fn save_progress(
+        &mut self,
+        task_name: String,
+        checkpoint_number: u64,
+    ) -> anyhow::Result<()>;
+
+    async fn tasks(&self, task_prefix: &str) -> Result<Vec<Task>, Error>;
+
+    async fn register_task(
+        &mut self,
+        task_name: String,
+        checkpoint: u64,
+        target_checkpoint: u64,
+    ) -> Result<(), anyhow::Error>;
+
+    async fn update_task(&mut self, task: Task) -> Result<(), Error>;
+}
+
+#[async_trait]
+pub trait Datasource<T: Send>: Sync + Send {
+    async fn start_ingestion_task<M, P, R>(
+        &self,
+        task_name: String,
+        starting_checkpoint: u64,
+        target_checkpoint: u64,
+        mut storage: P,
+        data_mapper: M,
+    ) -> Result<(), Error>
+    where
+        M: DataMapper<T, R>,
+        P: Persistent<R>,
+    {
+        // todo: add metrics for number of tasks
+        let (data_sender, mut data_channel) = metered_channel::channel(
+            1000,
+            &mysten_metrics::get_metrics()
+                .unwrap()
+                .channel_inflight
+                .with_label_values(&[&task_name]),
+        );
+        let join_handle = self
+            .start_data_retrieval(starting_checkpoint, target_checkpoint, data_sender)
+            .await?;
+
+        while let Some((block_number, data)) = data_channel.recv().await {
+            if block_number > target_checkpoint {
+                break;
+            }
+            if !data.is_empty() {
+                let processed_data = data.into_iter().try_fold(vec![], |mut result, d| {
+                    result.append(&mut data_mapper.map(d)?);
+                    Ok::<Vec<_>, Error>(result)
+                })?;
+                // TODO: we might be able to write data and progress in a single transaction.
+                storage.write(processed_data).await?;
+            }
+            storage
+                .save_progress(task_name.clone(), block_number)
+                .await?;
+        }
+        join_handle.abort();
+        join_handle.await?
+    }
+
+    async fn start_data_retrieval(
+        &self,
+        starting_checkpoint: u64,
+        target_checkpoint: u64,
+        data_sender: DataSender<T>,
+    ) -> Result<JoinHandle<Result<(), Error>>, Error>;
+}
+
+pub enum BackfillStrategy {
+    Simple,
+    Partitioned { task_size: u64 },
+    Disabled,
+}
+
+pub trait DataMapper<T, R>: Sync + Send + Clone {
+    fn map(&self, data: T) -> Result<Vec<R>, anyhow::Error>;
+}
diff --git a/crates/sui-indexer-builder/src/lib.rs b/crates/sui-indexer-builder/src/lib.rs
new file mode 100644
index 0000000000000..f4cb0d4d32eda
--- /dev/null
+++ b/crates/sui-indexer-builder/src/lib.rs
@@ -0,0 +1,35 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod indexer_builder;
+pub mod sui_datasource;
+
+#[derive(Clone, Debug)]
+pub struct Task {
+    pub task_name: String,
+    pub checkpoint: u64,
+    pub target_checkpoint: u64,
+    pub timestamp: u64,
+}
+
+pub trait Tasks {
+    fn live_task(&self) -> Option<Task>;
+
+    fn backfill_tasks(&self) -> Vec<Task>;
+}
+
+impl Tasks for Vec<Task> {
+    fn live_task(&self) -> Option<Task> {
+        // TODO: Change the schema to record live task properly.
+        self.iter()
+            .find(|t| t.target_checkpoint == i64::MAX as u64)
+            .cloned()
+    }
+
+    fn backfill_tasks(&self) -> Vec<Task> {
+        self.iter()
+            .filter(|t| t.target_checkpoint != i64::MAX as u64)
+            .cloned()
+            .collect()
+    }
+}
diff --git a/crates/sui-indexer-builder/src/sui_datasource.rs b/crates/sui-indexer-builder/src/sui_datasource.rs
new file mode 100644
index 0000000000000..388308bf10c4a
--- /dev/null
+++ b/crates/sui-indexer-builder/src/sui_datasource.rs
@@ -0,0 +1,146 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::indexer_builder::{DataSender, Datasource};
+use anyhow::Error;
+use async_trait::async_trait;
+use mysten_metrics::{metered_channel, spawn_monitored_task};
+use std::path::PathBuf;
+use sui_data_ingestion_core::{
+    DataIngestionMetrics, IndexerExecutor, ProgressStore, ReaderOptions, Worker, WorkerPool,
+};
+use sui_types::base_types::TransactionDigest;
+use sui_types::full_checkpoint_content::CheckpointData as SuiCheckpointData;
+use sui_types::full_checkpoint_content::CheckpointTransaction;
+use sui_types::messages_checkpoint::CheckpointSequenceNumber;
+use tokio::sync::oneshot;
+use tokio::sync::oneshot::Sender;
+use tokio::task::JoinHandle;
+use tracing::info;
+
+pub struct SuiCheckpointDatasource {
+    remote_store_url: String,
+    concurrency: usize,
+    checkpoint_path: PathBuf,
+    metrics: DataIngestionMetrics,
+}
+impl SuiCheckpointDatasource {
+    pub fn new(
+        remote_store_url: String,
+        concurrency: usize,
+        checkpoint_path: PathBuf,
+        metrics: DataIngestionMetrics,
+    ) -> Self {
+        SuiCheckpointDatasource {
+            remote_store_url,
+            concurrency,
+            checkpoint_path,
+            metrics,
+        }
+    }
+}
+
+#[async_trait]
+impl Datasource<CheckpointTxnData> for SuiCheckpointDatasource {
+    async fn start_data_retrieval(
+        &self,
+        starting_checkpoint: u64,
+        target_checkpoint: u64,
+        data_sender: DataSender<CheckpointTxnData>,
+    ) -> Result<JoinHandle<Result<(), Error>>, Error> {
+        let (exit_sender, exit_receiver) = oneshot::channel();
+        let progress_store = PerTaskInMemProgressStore {
+            current_checkpoint: starting_checkpoint,
+            exit_checkpoint: target_checkpoint,
+            exit_sender: Some(exit_sender),
+        };
+        let mut executor = IndexerExecutor::new(progress_store, 1, self.metrics.clone());
+        let worker = IndexerWorker::new(data_sender);
+        let worker_pool = WorkerPool::new(
+            worker,
+            TransactionDigest::random().to_string(),
+            self.concurrency,
+        );
+        executor.register(worker_pool).await?;
+        let checkpoint_path = self.checkpoint_path.clone();
+        let remote_store_url = self.remote_store_url.clone();
+        Ok(spawn_monitored_task!(async {
+            executor
+                .run(
+                    checkpoint_path,
+                    Some(remote_store_url),
+                    vec![], // optional remote store access options
+                    ReaderOptions::default(),
+                    exit_receiver,
+                )
+                .await?;
+            Ok(())
+        }))
+    }
+}
+
+struct PerTaskInMemProgressStore {
+    pub current_checkpoint: u64,
+    pub exit_checkpoint: u64,
+    pub exit_sender: Option<Sender<()>>,
+}
+
+#[async_trait]
+impl ProgressStore for PerTaskInMemProgressStore {
+    async fn load(
+        &mut self,
+        _task_name: String,
+    ) -> Result<CheckpointSequenceNumber, anyhow::Error> {
+        Ok(self.current_checkpoint)
+    }
+
+    async fn save(
+        &mut self,
+        _task_name: String,
+        checkpoint_number: CheckpointSequenceNumber,
+    ) -> anyhow::Result<()> {
+        if checkpoint_number >= self.exit_checkpoint {
+            if let Some(sender) = self.exit_sender.take() {
+                let _ = sender.send(());
+            }
+        }
+        self.current_checkpoint = checkpoint_number;
+        Ok(())
+    }
+}
+
+pub struct IndexerWorker<T> {
+    data_sender: metered_channel::Sender<(u64, Vec<T>)>,
+}
+
+impl<T> IndexerWorker<T> {
+    pub fn new(data_sender: metered_channel::Sender<(u64, Vec<T>)>) -> Self {
+        Self { data_sender }
+    }
+}
+
+pub type CheckpointTxnData = (CheckpointTransaction, u64, u64);
+
+#[async_trait]
+impl Worker for IndexerWorker<CheckpointTxnData> {
+    async fn process_checkpoint(&self, checkpoint: SuiCheckpointData) -> anyhow::Result<()> {
+        info!(
+            "Received checkpoint [{}] {}: {}",
+            checkpoint.checkpoint_summary.epoch,
+            checkpoint.checkpoint_summary.sequence_number,
+            checkpoint.transactions.len(),
+        );
+        let checkpoint_num = checkpoint.checkpoint_summary.sequence_number;
+        let timestamp_ms = checkpoint.checkpoint_summary.timestamp_ms;
+
+        let transactions = checkpoint
+            .transactions
+            .into_iter()
+            .map(|tx| (tx, checkpoint_num, timestamp_ms))
+            .collect();
+        Ok(self
+            .data_sender
+            .send((checkpoint_num, transactions))
+            .await?)
+    }
+}
diff --git a/crates/sui-indexer-builder/tests/indexer_test_utils.rs b/crates/sui-indexer-builder/tests/indexer_test_utils.rs
new file mode 100644
index 0000000000000..17e8cb1ad35dc
--- /dev/null
+++ b/crates/sui-indexer-builder/tests/indexer_test_utils.rs
@@ -0,0 +1,149 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use std::collections::HashMap;
+use std::sync::Arc;
+use std::time::{SystemTime, UNIX_EPOCH};
+
+use anyhow::{anyhow, Error};
+use async_trait::async_trait;
+use tokio::sync::Mutex;
+use tokio::task::JoinHandle;
+
+use mysten_metrics::spawn_monitored_task;
+
+use sui_indexer_builder::indexer_builder::{
+    DataMapper, DataSender, Datasource, IndexerProgressStore, Persistent,
+};
+use sui_indexer_builder::Task;
+
+pub struct TestDatasource<T> {
+    pub data: Vec<T>,
+}
+
+#[async_trait]
+impl<T> Datasource<T> for TestDatasource<T>
+where
+    T: Send + Sync + Clone + 'static,
+{
+    async fn start_data_retrieval(
+        &self,
+        starting_checkpoint: u64,
+        _target_checkpoint: u64,
+        data_sender: DataSender<T>,
+    ) -> Result<JoinHandle<Result<(), Error>>, Error> {
+        let data_clone = self.data.clone();
+
+        Ok(spawn_monitored_task!(async {
+            let mut cp = starting_checkpoint;
+            while cp < data_clone.len() as u64 {
+                data_sender
+                    .send((cp, vec![data_clone[cp as usize].clone()]))
+                    .await?;
+                cp += 1;
+            }
+            Ok(())
+        }))
+    }
+}
+
+#[derive(Clone, Debug, Default)]
+pub struct InMemoryPersistent<T> {
+    pub progress_store: Arc<Mutex<HashMap<String, Task>>>,
+    pub data: Arc<Mutex<Vec<T>>>,
+}
+
+impl<T> InMemoryPersistent<T> {
+    pub fn new() -> Self {
+        InMemoryPersistent {
+            progress_store: Default::default(),
+            data: Arc::new(Mutex::new(vec![])),
+        }
+    }
+}
+
+#[async_trait]
+impl<T: Send + Sync> IndexerProgressStore for InMemoryPersistent<T> {
+    async fn load_progress(&self, task_name: String) -> anyhow::Result<u64> {
+        Ok(self
+            .progress_store
+            .lock()
+            .await
+            .get(&task_name)
+            .unwrap()
+            .checkpoint)
+    }
+
+    async fn save_progress(
+        &mut self,
+        task_name: String,
+        checkpoint_number: u64,
+    ) -> anyhow::Result<()> {
+        self.progress_store
+            .lock()
+            .await
+            .get_mut(&task_name)
+            .unwrap()
+            .checkpoint = checkpoint_number;
+        Ok(())
+    }
+
+    async fn tasks(&self, task_prefix: &str) -> Result<Vec<Task>, Error> {
+        let mut tasks = self
+            .progress_store
+            .lock()
+            .await
+            .values()
+            .filter(|task| task.task_name.starts_with(task_prefix))
+            .cloned()
+            .collect::<Vec<_>>();
+        tasks.sort_by(|t1, t2| t2.checkpoint.cmp(&t1.checkpoint));
+        Ok(tasks)
+    }
+
+    async fn register_task(
+        &mut self,
+        task_name: String,
+        checkpoint: u64,
+        target_checkpoint: u64,
+    ) -> Result<(), Error> {
+        let existing = self.progress_store.lock().await.insert(
+            task_name.clone(),
+            Task {
+                task_name: task_name.clone(),
+                checkpoint,
+                target_checkpoint,
+                timestamp: SystemTime::now().duration_since(UNIX_EPOCH)?.as_millis() as u64,
+            },
+        );
+        if existing.is_some() {
+            return Err(anyhow!("Task {task_name} already exists"));
+        }
+        Ok(())
+    }
+
+    async fn update_task(&mut self, task: Task) -> Result<(), Error> {
+        self.progress_store
+            .lock()
+            .await
+            .insert(task.task_name.clone(), task);
+        Ok(())
+    }
+}
+
+#[async_trait]
+impl<T: Clone + Send + Sync> Persistent<T> for InMemoryPersistent<T> {
+    async fn write(&self, data: Vec<T>) -> Result<(), Error> {
+        self.data.lock().await.append(&mut data.clone());
+        Ok(())
+    }
+}
+
+#[derive(Clone)]
+pub struct NoopDataMapper;
+
+impl<T> DataMapper<T, T> for NoopDataMapper {
+    fn map(&self, data: T) -> Result<Vec<T>, Error> {
+        Ok(vec![data])
+    }
+}
diff --git a/crates/sui-indexer-builder/tests/indexer_tests.rs b/crates/sui-indexer-builder/tests/indexer_tests.rs
new file mode 100644
index 0000000000000..c4febf9069a76
--- /dev/null
+++ b/crates/sui-indexer-builder/tests/indexer_tests.rs
@@ -0,0 +1,191 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::indexer_test_utils::{InMemoryPersistent, NoopDataMapper, TestDatasource};
+use prometheus::Registry;
+use sui_indexer_builder::indexer_builder::{
+    BackfillStrategy, IndexerBuilder, IndexerProgressStore,
+};
+use sui_indexer_builder::Task;
+
+mod indexer_test_utils;
+
+#[tokio::test]
+async fn indexer_simple_backfill_task_test() {
+    telemetry_subscribers::init_for_testing();
+    let registry = Registry::new();
+    mysten_metrics::init_metrics(&registry);
+
+    let data = (0..=10u64).collect::<Vec<_>>();
+    let datasource = TestDatasource { data: data.clone() };
+    let persistent = InMemoryPersistent::new();
+    let indexer = IndexerBuilder::new("test_indexer", datasource, NoopDataMapper).build(
+        5,
+        0,
+        persistent.clone(),
+    );
+
+    indexer.start().await.unwrap();
+
+    // it should have 2 task created for the indexer - a live task and a backfill task
+    let tasks = persistent.tasks("test_indexer").await.unwrap();
+    assert_eq!(2, tasks.len());
+    // the tasks should be ordered by checkpoint number,
+    // the first one will be the live task and second one will be the backfill
+    assert_eq!(10, tasks.first().unwrap().checkpoint);
+    assert_eq!(i64::MAX as u64, tasks.first().unwrap().target_checkpoint);
+    assert_eq!(4, tasks.last().unwrap().checkpoint);
+    assert_eq!(4, tasks.last().unwrap().target_checkpoint);
+
+    // the data recorded in storage should be the same as the datasource
+    let mut recorded_data = persistent.data.lock().await.clone();
+    recorded_data.sort();
+    assert_eq!(data, recorded_data);
+}
+
+#[tokio::test]
+async fn indexer_partitioned_backfill_task_test() {
+    telemetry_subscribers::init_for_testing();
+    let registry = Registry::new();
+    mysten_metrics::init_metrics(&registry);
+
+    let data = (0..=50u64).collect::<Vec<_>>();
+    let datasource = TestDatasource { data: data.clone() };
+    let persistent = InMemoryPersistent::new();
+    let indexer = IndexerBuilder::new("test_indexer", datasource, NoopDataMapper)
+        .with_backfill_strategy(BackfillStrategy::Partitioned { task_size: 10 })
+        .build(35, 0, persistent.clone());
+    indexer.start().await.unwrap();
+
+    // it should have 5 task created for the indexer - a live task and 4 backfill task
+    let tasks = persistent.tasks("test_indexer").await.unwrap();
+    assert_eq!(5, tasks.len());
+    // the tasks should be ordered by checkpoint number,
+    // the first one will be the live task and rest will be the backfills
+    assert_eq!(50, tasks.first().unwrap().checkpoint);
+    assert_eq!(i64::MAX as u64, tasks.first().unwrap().target_checkpoint);
+    assert_eq!(34, tasks.get(1).unwrap().checkpoint);
+    assert_eq!(34, tasks.get(1).unwrap().target_checkpoint);
+    assert_eq!(29, tasks.get(2).unwrap().checkpoint);
+    assert_eq!(29, tasks.get(2).unwrap().target_checkpoint);
+    assert_eq!(19, tasks.get(3).unwrap().checkpoint);
+    assert_eq!(19, tasks.get(3).unwrap().target_checkpoint);
+    assert_eq!(9, tasks.get(4).unwrap().checkpoint);
+    assert_eq!(9, tasks.get(4).unwrap().target_checkpoint);
+    // the data recorded in storage should be the same as the datasource
+    let mut recorded_data = persistent.data.lock().await.clone();
+    recorded_data.sort();
+    assert_eq!(data, recorded_data);
+}
+
+#[tokio::test]
+async fn indexer_partitioned_task_with_data_already_in_db_test() {
+    telemetry_subscribers::init_for_testing();
+    let registry = Registry::new();
+    mysten_metrics::init_metrics(&registry);
+
+    let data = (0..=50u64).collect::<Vec<_>>();
+    let datasource = TestDatasource { data: data.clone() };
+    let persistent = InMemoryPersistent::new();
+    persistent.data.lock().await.append(&mut (0..=30).collect());
+    persistent.progress_store.lock().await.insert(
+        "test_indexer - backfill - 1".to_string(),
+        Task {
+            task_name: "test_indexer - backfill - 1".to_string(),
+            checkpoint: 30,
+            target_checkpoint: 30,
+            timestamp: 0,
+        },
+    );
+    let indexer = IndexerBuilder::new("test_indexer", datasource, NoopDataMapper)
+        .with_backfill_strategy(BackfillStrategy::Partitioned { task_size: 10 })
+        .build(25, 0, persistent.clone());
+    indexer.start().await.unwrap();
+
+    // it should have 2 task created for the indexer, one existing task and one live task
+    let tasks = persistent.tasks("test_indexer").await.unwrap();
+    assert_eq!(2, tasks.len());
+    // the first one will be the live task
+    assert_eq!(50, tasks.first().unwrap().checkpoint);
+    assert_eq!(i64::MAX as u64, tasks.first().unwrap().target_checkpoint);
+    // the data recorded in storage should be the same as the datasource
+    let mut recorded_data = persistent.data.lock().await.clone();
+    recorded_data.sort();
+    assert_eq!(data, recorded_data);
+}
+
+#[tokio::test]
+async fn indexer_partitioned_task_with_data_already_in_db_test2() {
+    telemetry_subscribers::init_for_testing();
+    let registry = Registry::new();
+    mysten_metrics::init_metrics(&registry);
+
+    let data = (0..=50u64).collect::<Vec<_>>();
+    let datasource = TestDatasource { data: data.clone() };
+    let persistent = InMemoryPersistent::new();
+    persistent.data.lock().await.append(&mut (0..=30).collect());
+    persistent.progress_store.lock().await.insert(
+        "test_indexer - backfill - 1".to_string(),
+        Task {
+            task_name: "test_indexer - backfill - 1".to_string(),
+            checkpoint: 30,
+            target_checkpoint: 30,
+            timestamp: 0,
+        },
+    );
+    let indexer = IndexerBuilder::new("test_indexer", datasource, NoopDataMapper)
+        .with_backfill_strategy(BackfillStrategy::Partitioned { task_size: 10 })
+        .build(35, 0, persistent.clone());
+    indexer.start().await.unwrap();
+
+    // it should have 3 task created for the indexer, existing task, a backfill task from cp 31 to cp 34, and a live task
+    let tasks = persistent.tasks("test_indexer").await.unwrap();
+    assert_eq!(3, tasks.len());
+    // the tasks should be ordered by checkpoint number,
+    // the first one will be the live task and rest will be the backfills
+    assert_eq!(50, tasks.first().unwrap().checkpoint);
+    assert_eq!(i64::MAX as u64, tasks.first().unwrap().target_checkpoint);
+    assert_eq!(34, tasks.get(1).unwrap().checkpoint);
+    assert_eq!(34, tasks.get(1).unwrap().target_checkpoint);
+    assert_eq!(30, tasks.get(2).unwrap().checkpoint);
+    assert_eq!(30, tasks.get(2).unwrap().target_checkpoint);
+    // the data recorded in storage should be the same as the datasource
+    let mut recorded_data = persistent.data.lock().await.clone();
+    recorded_data.sort();
+    assert_eq!(data, recorded_data);
+}
+
+#[tokio::test]
+async fn resume_test() {
+    telemetry_subscribers::init_for_testing();
+    let registry = Registry::new();
+    mysten_metrics::init_metrics(&registry);
+
+    let data = (0..=50u64).collect::<Vec<_>>();
+    let datasource = TestDatasource { data: data.clone() };
+    let persistent = InMemoryPersistent::new();
+    persistent.progress_store.lock().await.insert(
+        "test_indexer - backfill - 30".to_string(),
+        Task {
+            task_name: "test_indexer - backfill - 30".to_string(),
+            checkpoint: 10,
+            target_checkpoint: 30,
+            timestamp: 0,
+        },
+    );
+    let indexer = IndexerBuilder::new("test_indexer", datasource, NoopDataMapper)
+        .with_backfill_strategy(BackfillStrategy::Simple)
+        .build(30, 0, persistent.clone());
+    indexer.start().await.unwrap();
+
+    // it should have 2 task created for the indexer, one existing task and one live task
+    let tasks = persistent.tasks("test_indexer").await.unwrap();
+    assert_eq!(2, tasks.len());
+    // the first one will be the live task
+    assert_eq!(50, tasks.first().unwrap().checkpoint);
+    assert_eq!(i64::MAX as u64, tasks.first().unwrap().target_checkpoint);
+    // the data recorded in storage should be the same as the datasource
+    let mut recorded_data = persistent.data.lock().await.clone();
+    recorded_data.sort();
+    assert_eq!((10..=50u64).collect::<Vec<_>>(), recorded_data);
+}
diff --git a/crates/sui-indexer/README.md b/crates/sui-indexer/README.md
index cce84ca39feba..d81a7f2e89910 100644
--- a/crates/sui-indexer/README.md
+++ b/crates/sui-indexer/README.md
@@ -1,5 +1,7 @@
 Sui indexer is an off-fullnode service to serve data from Sui protocol, including both data directly generated from chain and derivative data.
 
+&#9888; **Warning:** Sui indexer is still experimental and we expect occasional breaking changes that require backfills.
+
 ## Architecture
 ![enhanced_FN](https://user-images.githubusercontent.com/106119108/221022505-a1d873c6-60e2-45f1-b2aa-e50192c4dfbb.png)
 
diff --git a/crates/sui-indexer/logs.txt b/crates/sui-indexer/logs.txt
new file mode 100644
index 0000000000000..87a45b8b9affd
--- /dev/null
+++ b/crates/sui-indexer/logs.txt
@@ -0,0 +1,5000 @@
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456213Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95141
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456216Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95142
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456217Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95124 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456218Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95133 for workflow primary in 67.296µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456218Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456219Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456219Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95133 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456220Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456221Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95124 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456223Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95133 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456223Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95137
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456224Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456226Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456224Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95140 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456226Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95138 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456226Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456228Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95131 with time now 1726138825456 and checkpoint time 1681502931527
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456229Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95127 with time now 1726138825456 and checkpoint time 1681502927526
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456229Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456232Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95138: 44635886918 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456232Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456232Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95140: 44635884975 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456233Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95138 with time now 1726138825456 and checkpoint time 1681502938538
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456234Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95127 for workflow primary in 73.728µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456234Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95140 with time now 1726138825456 and checkpoint time 1681502940481
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456237Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95131 for workflow primary in 86.982µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456238Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95138
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456239Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456240Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95127 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456242Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95131 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456242Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95127 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456244Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95131 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456243Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95140
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456244Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456245Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95136 with time now 1726138825456 and checkpoint time 1681502936516
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456247Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456247Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95134 with time now 1726138825456 and checkpoint time 1681502934570
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456248Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95139 with time now 1726138825456 and checkpoint time 1681502939570
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456249Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456250Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95135 with time now 1726138825456 and checkpoint time 1681502935535
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456253Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95132 with time now 1726138825456 and checkpoint time 1681502932529
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456253Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95129 with time now 1726138825456 and checkpoint time 1681502929565
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456255Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456256Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95136 for workflow primary in 70.271µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456258Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95139 for workflow primary in 58.489µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456261Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95135 for workflow primary in 74.569µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456262Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456264Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95145 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456264Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95134 for workflow primary in 117.981µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456266Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95136 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456265Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95132 for workflow primary in 111.167µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456265Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95129 for workflow primary in 100.749µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456267Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95145: 44635879878 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456267Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95130 with time now 1726138825456 and checkpoint time 1681502930569
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456268Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95145 with time now 1726138825456 and checkpoint time 1681502945578
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456268Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95139 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456269Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95142 with time now 1726138825456 and checkpoint time 1681502942502
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456270Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95135 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456270Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95147 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456271Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95134 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456268Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95149 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456272Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95146 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456273Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95129 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456274Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95132 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456275Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95147: 44635877902 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456275Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95148 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456276Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95147 with time now 1726138825456 and checkpoint time 1681502947554
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456277Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95146: 44635878913 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456274Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95136 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456277Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456277Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95149: 44635875941 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456278Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95146 with time now 1726138825456 and checkpoint time 1681502946543
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456279Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95145
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456280Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95149 with time now 1726138825456 and checkpoint time 1681502949515
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456280Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95139 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456280Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95147
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456281Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95143 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456281Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95148: 44635876902 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456282Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95135 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456283Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95148 with time now 1726138825456 and checkpoint time 1681502948554
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456283Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456284Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95134 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456284Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95142 for workflow primary in 79.869µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456285Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95143: 44635881898 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456285Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95137 with time now 1726138825456 and checkpoint time 1681502937556
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456285Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95129 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456286Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95143 with time now 1726138825456 and checkpoint time 1681502943558
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456286Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95146
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456285Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95141 with time now 1726138825456 and checkpoint time 1681502941536
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456287Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95132 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456286Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95130 for workflow primary in 111.709µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456286Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456288Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95138 with time now 1726138825456 and checkpoint time 1681502938538
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456289Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95142 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456291Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95151 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456292Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95144 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456290Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95130 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456293Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95149
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456294Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456294Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95151: 44635873831 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456294Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95148
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456295Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95143
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456296Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95151 with time now 1726138825456 and checkpoint time 1681502951625
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456296Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95150 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456298Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95142 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456299Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456299Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456299Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95144: 44635880909 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456300Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95137 for workflow primary in 109.645µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456300Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95138 for workflow primary in 72.185µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456300Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95144 with time now 1726138825456 and checkpoint time 1681502944547
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456301Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456301Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95130 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456303Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95137 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456304Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95151
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456304Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95138 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456302Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95141 for workflow primary in 105.066µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456304Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456304Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95138 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456303Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95150: 44635874847 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456305Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95144
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456306Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95141 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456306Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456306Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95150 with time now 1726138825456 and checkpoint time 1681502950609
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456307Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95137 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456309Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456309Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95141 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456310Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95152 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456312Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456312Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456313Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95145 with time now 1726138825456 and checkpoint time 1681502945578
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456313Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456314Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95150
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456315Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95152: 44635872905 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456317Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95140 with time now 1726138825456 and checkpoint time 1681502940481
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456317Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95152 with time now 1726138825456 and checkpoint time 1681502952551
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456319Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95145 for workflow primary in 54.682µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456323Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95155 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456325Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456326Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95147 with time now 1726138825456 and checkpoint time 1681502947554
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456326Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95155: 44635869912 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456327Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456328Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95155 with time now 1726138825456 and checkpoint time 1681502955544
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456327Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456327Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95152
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456328Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456329Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456330Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95145 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456332Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95140 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456332Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95140 for workflow primary in 104.135µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456336Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95145 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456336Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95147 for workflow primary in 64.751µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456337Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95140 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456337Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95147 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456337Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456338Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95155
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456339Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95147 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456338Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95154 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456340Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95153 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456344Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95151 with time now 1726138825456 and checkpoint time 1681502951625
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456344Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95153: 44635871867 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456345Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95153 with time now 1726138825456 and checkpoint time 1681502953589
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456344Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456347Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95154: 44635870852 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456349Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95154 with time now 1726138825456 and checkpoint time 1681502954604
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456349Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95143 with time now 1726138825456 and checkpoint time 1681502943558
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456351Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95156 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456351Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95146 with time now 1726138825456 and checkpoint time 1681502946543
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456352Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95153
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456352Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95157 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456352Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95151 for workflow primary in 60.253µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456352Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95158 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456355Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95143 for workflow primary in 72.275µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456354Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95154
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456355Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456355Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95151 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456356Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95156: 44635868920 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456356Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95157: 44635865405 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456356Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456357Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95143 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456358Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95156 with time now 1726138825456 and checkpoint time 1681502956536
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456358Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95157 with time now 1726138825456 and checkpoint time 1681502960051
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456358Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95151 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456358Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456357Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95158: 44635863443 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456358Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95146 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456360Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95143 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456358Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95146 for workflow primary in 84.197µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456360Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95158 with time now 1726138825456 and checkpoint time 1681502962013
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456361Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95146 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456360Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95144 with time now 1726138825456 and checkpoint time 1681502944547
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456362Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456365Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95157
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456367Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95149 with time now 1726138825456 and checkpoint time 1681502949515
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456369Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456372Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95156
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456372Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95159 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456373Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95158
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456374Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95159: 44635862999 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456374Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456375Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95159 with time now 1726138825456 and checkpoint time 1681502962457
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456376Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456376Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456376Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95144 for workflow primary in 82.986µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456376Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95150 with time now 1726138825456 and checkpoint time 1681502950609
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456379Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456378Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95160 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456380Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456380Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95148 with time now 1726138825456 and checkpoint time 1681502948554
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456381Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95159
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456383Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95160: 44635861956 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456385Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95160 with time now 1726138825456 and checkpoint time 1681502963500
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456384Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95149 for workflow primary in 110.657µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456386Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95153 with time now 1726138825456 and checkpoint time 1681502953589
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456386Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456386Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95150 for workflow primary in 87.974µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456389Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95144 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456389Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95160
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456390Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456391Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95149 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456390Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456390Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95144 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456392Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95150 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456392Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95153 for workflow primary in 51.526µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456393Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95153 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456393Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95148 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456393Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95149 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456393Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95148 for workflow primary in 115.456µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456395Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456395Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95150 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456395Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456394Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95152 with time now 1726138825456 and checkpoint time 1681502952551
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456396Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95148 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456397Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95153 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456400Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456400Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95161 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456404Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95163 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456405Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95162 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456405Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456405Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95161: 44635859592 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456407Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95152 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456406Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95152 for workflow primary in 93.424µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456407Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95161 with time now 1726138825456 and checkpoint time 1681502965864
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456408Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95163: 44635858089 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456409Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95163 with time now 1726138825456 and checkpoint time 1681502967367
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456410Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95156 with time now 1726138825456 and checkpoint time 1681502956536
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456410Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95162: 44635859171 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456411Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95162 with time now 1726138825456 and checkpoint time 1681502966285
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456416Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95157 with time now 1726138825456 and checkpoint time 1681502960051
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456417Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95165 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456417Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95156 for workflow primary in 65.563µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456417Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95161
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456419Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95165: 44635855454 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456418Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95162
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456419Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95165 with time now 1726138825456 and checkpoint time 1681502970002
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456418Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95154 with time now 1726138825456 and checkpoint time 1681502954604
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456418Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95163
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456420Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95155 with time now 1726138825456 and checkpoint time 1681502955544
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456421Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95156 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456423Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95157 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456422Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95157 for workflow primary in 69.37µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456423Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95152 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456424Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95156 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456425Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95164 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456425Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95157 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456427Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95164: 44635855873 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456428Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95164 with time now 1726138825456 and checkpoint time 1681502969583
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456430Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95165
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456431Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95164
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456431Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456430Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456431Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95159 with time now 1726138825456 and checkpoint time 1681502962457
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456431Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456433Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95160 with time now 1726138825456 and checkpoint time 1681502963500
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456433Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95158 with time now 1726138825456 and checkpoint time 1681502962013
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456435Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456435Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95167 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456437Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456436Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95154 for workflow primary in 95.528µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456437Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95167: 44635853490 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456436Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95155 for workflow primary in 111.528µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456439Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95167 with time now 1726138825456 and checkpoint time 1681502971966
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456439Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95160 for workflow primary in 58.9µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456438Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95154 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456441Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95158 for workflow primary in 86.702µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456441Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95159 for workflow primary in 68.098µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456443Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95167
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456442Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95155 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456444Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456444Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456445Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456445Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95154 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456445Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95160 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456446Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95166 for workflow primary
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456447Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95155 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456448Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456447Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95159 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456449Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95160 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456449Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 95166: 44635854479 ms
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456450Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456450Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95158 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456450Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95159 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456450Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 95166 with time now 1726138825456 and checkpoint time 1681502970977
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456451Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95158 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456463Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456467Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95165 with time now 1726138825456 and checkpoint time 1681502970002
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456468Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95164 with time now 1726138825456 and checkpoint time 1681502969583
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456469Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456473Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95164 for workflow primary in 47.749µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456473Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=95166
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456474Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95165 for workflow primary in 56.746µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456478Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95165 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456480Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95164 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456481Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456484Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95167 with time now 1726138825456 and checkpoint time 1681502971966
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456483Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95165 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456486Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95164 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456487Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95162 with time now 1726138825456 and checkpoint time 1681502966285
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456489Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95163 with time now 1726138825456 and checkpoint time 1681502967367
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456490Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95161 with time now 1726138825456 and checkpoint time 1681502965864
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456491Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95167 for workflow primary in 55.023µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456492Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95162 for workflow primary in 85.901µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456496Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95167 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456497Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95162 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456497Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95163 for workflow primary in 90.169µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456497Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95167 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456498Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95163 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456497Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456498Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95161 for workflow primary in 95.959µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456499Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95161 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456500Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95162 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456501Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95163 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456502Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95161 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456521Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: indexed checkpoint 95166 with time now 1726138825456 and checkpoint time 1681502970977
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456532Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95166 for workflow primary in 84.758µs
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456538Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95166 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.456542Z  INFO sui_types::nats_queue: Received checkpoint with seq number 95166 but expected 85168
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.557136Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.658171Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.759153Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.860336Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:25 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:25.961510Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:26 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:26.061741Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:26 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:26.162947Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:26 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:26.264135Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:26 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:26.365341Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:26 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:26.466503Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:26 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:26.567684Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:26 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:26.668848Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:26 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:26.770019Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:26 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:26.871217Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:26 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:26.972378Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:27 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:27.073559Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:27 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:27.173716Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:27 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:27.274886Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:27 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:27.376079Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:27 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:27.477236Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:27 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:27.578110Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:27 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:27.679262Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:27 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:27.780439Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:27 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:27.881609Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:27 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:27.981775Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:28 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:28.082951Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:28 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:28.184108Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:28 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:28.285306Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:28 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:28.350510Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 85168: 44647223649 ms
+Sep 12 13:00:28 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:28.350515Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 85168 with time now 1726138828350 and checkpoint time 1681491604701
+Sep 12 13:00:28 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:28.350544Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=85168
+Sep 12 13:00:28 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:28.351801Z  INFO sui_data_ingestion_core::worker_pool: transient worker execution error `Failed to get network total transactions in epoch`: `Indexer failed to read PostgresDB with error: `Record not found`` for checkpoint 85168
+Sep 12 13:00:28 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:28.385906Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:28 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:28.487124Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:28 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:28.588317Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:28 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:28.689537Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:28 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:28.789791Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:28 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:28.891005Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:28 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:28.992246Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:29 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:29.093478Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:29 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:29.194711Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:29 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:29.295968Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:29 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:29.397134Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:29 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:29.498360Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:29 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:29.599553Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:29 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:29.699786Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:29 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:29.801005Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:29 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:29.902233Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:30 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:30.003500Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:30 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:30.104713Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:30 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:30.205960Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:30 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:30.307176Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:30 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:30.408410Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:30 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:30.509611Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:30 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:30.609805Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:30 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:30.711027Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:30 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:30.812217Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:30 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:30.913448Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:31 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:31.014670Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:31 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:31.116190Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:31 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:31.217448Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:31 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:31.318704Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:31 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:31.420102Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:31 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:31.521285Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:31 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:31.622527Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:31 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:31.722752Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:31 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:31.823957Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:31 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:31.925206Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:32 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:32.026422Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:32 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:32.127665Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:32 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:32.228888Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:32 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:32.330125Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:32 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:32.431388Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:32 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:32.532589Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:32 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:32.633685Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:32 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:32.734871Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:32 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:32.836105Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:32 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:32.937323Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:33 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:33.038551Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:33 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:33.138805Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:33 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:33.240025Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:33 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:33.341272Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:33 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:33.442495Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:33 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:33.543709Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:33 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:33.644906Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:33 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:33.746415Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:33 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:33.847637Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:33 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:33.948821Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:34 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:34.050033Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:34 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:34.151223Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:34 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:34.252490Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:34 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:34.352832Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:34 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:34.454055Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:34 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:34.555278Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:34 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:34.656471Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:34 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:34.757686Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:34 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:34.858880Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:34 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:34.960077Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:35 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:35.061301Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:35 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:35.162489Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:35 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:35.263736Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:35 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:35.364952Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:35 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:35.466165Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:35 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:35.567417Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:35 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:35.668640Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:35 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:35.770273Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:35 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:35.871503Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:35 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:35.971745Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:36 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:36.072973Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:36 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:36.174206Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:36 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:36.275480Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:36 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:36.376714Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:36 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:36.477941Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:36 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:36.579130Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:36 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:36.680364Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:36 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:36.781591Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:36 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:36.881818Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:36 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:36.983071Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:37 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:37.084288Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:37 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:37.185533Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:37 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:37.285755Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:37 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:37.386989Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:37 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:37.488225Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:37 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:37.589255Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:37 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:37.690487Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:37 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:37.791689Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:37 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:37.892927Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:37 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:37.994150Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:38 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:38.095380Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:38 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:38.196640Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:38 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:38.297856Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:38 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:38.399100Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:38 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:38.500296Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:38 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:38.601500Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:38 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:38.673721Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 85168: 44647233972 ms
+Sep 12 13:00:38 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:38.673728Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 85168 with time now 1726138838673 and checkpoint time 1681491604701
+Sep 12 13:00:38 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:38.673775Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=85168
+Sep 12 13:00:38 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:38.674779Z  INFO sui_data_ingestion_core::worker_pool: transient worker execution error `Failed to get network total transactions in epoch`: `Indexer failed to read PostgresDB with error: `Record not found`` for checkpoint 85168
+Sep 12 13:00:38 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:38.701823Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:38 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:38.803002Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:38 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:38.904199Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:39 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:39.005354Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:39 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:39.106545Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:39 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:39.207705Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:39 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:39.308880Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:39 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:39.409975Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:39 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:39.511156Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:39 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:39.612346Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:39 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:39.713499Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:39 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:39.814686Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:39 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:39.915857Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:40 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:40.017026Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:40 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:40.118216Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:40 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:40.219371Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:40 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:40.320553Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:40 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:40.420707Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:40 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:40.521880Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:40 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:40.623076Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:40 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:40.724238Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:40 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:40.825432Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:40 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:40.926588Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:41 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:41.026768Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:41 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:41.127927Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:41 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:41.229099Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:41 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:41.330326Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:41 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:41.431513Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:41 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:41.531732Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:41 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:41.632923Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:41 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:41.734159Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:41 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:41.835384Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:41 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:41.936615Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:42 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:42.036865Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:42 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:42.138079Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:42 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:42.239325Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:42 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:42.340537Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:42 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:42.440849Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:42 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:42.542017Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:42 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:42.642904Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:42 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:42.744153Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:42 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:42.845369Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:42 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:42.946614Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:43 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:43.046773Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:43 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:43.147937Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:43 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:43.249115Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:43 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:43.350300Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:43 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:43.451528Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:43 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:43.551766Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:43 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:43.652949Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:43 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:43.754129Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:43 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:43.855315Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:43 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:43.956531Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:44 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:44.057429Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:44 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:44.158610Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:44 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:44.258760Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:44 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:44.360684Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:44 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:44.461824Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:44 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:44.563014Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:44 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:44.664233Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:44 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:44.765385Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:44 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:44.866554Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:44 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:44.967715Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:45 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:45.068917Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:45 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:45.170143Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:45 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:45.271665Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:45 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:45.372908Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:45 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:45.474302Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:45 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:45.574857Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:45 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:45.676057Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:45 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:45.777243Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:45 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:45.878799Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:45 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:45.980792Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:46 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:46.082054Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:46 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:46.183274Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:46 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:46.284487Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:46 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:46.385059Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:46 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:46.486224Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:46 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:46.586927Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:46 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:46.688114Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:46 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:46.789312Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:46 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:46.890492Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:46 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:46.991679Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:47 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:47.092912Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:47 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:47.194652Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:47 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:47.295871Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:47 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:47.397061Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:47 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:47.498270Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:47 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:47.599020Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:47 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:47.700219Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:47 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:47.801444Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:47 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:47.902643Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:48 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:48.003857Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:48 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:48.105064Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:48 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:48.206298Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:48 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:48.307558Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:48 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:48.407782Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:48 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:48.509190Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:48 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:48.610684Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:48 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:48.712302Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:48 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:48.813483Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:48 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:48.914665Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:49 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:49.015873Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:49 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:49.117043Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:49 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:49.218241Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:49 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:49.319414Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:49 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:49.420367Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:49 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:49.521581Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:49 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:49.621760Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:49 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:49.722964Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:49 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:49.824135Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:49 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:49.925349Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:50 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:50.025944Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:50 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:50.127131Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:50 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:50.228343Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:50 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:50.329518Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:50 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:50.429720Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:50 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:50.530891Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:50 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:50.632138Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:50 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:50.733325Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:50 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:50.834859Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:50 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:50.936083Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:51 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:51.037271Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:51 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:51.138487Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:51 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:51.239678Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:51 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:51.340881Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:51 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:51.442112Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:51 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:51.543305Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:51 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:51.644535Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:51 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:51.744713Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:51 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:51.846302Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:51 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:51.946914Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:52 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:52.048114Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:52 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:52.149324Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:52 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:52.250497Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:52 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:52.351697Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:52 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:52.452867Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:52 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:52.554052Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:52 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:52.654971Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:52 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:52.756154Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:52 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:52.856790Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:52 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:52.957969Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:53 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:53.059242Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:53 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:53.160433Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:53 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:53.261635Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:53 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:53.362864Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:53 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:53.464057Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:53 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:53.565274Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:53 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:53.666448Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:53 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:53.767667Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:53 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:53.868848Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:53 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:53.970028Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:54 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:54.071234Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:54 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:54.172403Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:54 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:54.273598Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:54 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:54.374544Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:54 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:54.474748Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:54 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:54.575969Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:54 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:54.677155Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:54 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:54.778381Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:54 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:54.879566Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:54 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:54.979810Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:55 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:55.081055Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:55 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:55.182268Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:55 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:55.283495Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:55 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:55.325634Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 85168: 44647250624 ms
+Sep 12 13:00:55 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:55.325640Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 85168 with time now 1726138855325 and checkpoint time 1681491604701
+Sep 12 13:00:55 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:55.325676Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=85168
+Sep 12 13:00:55 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:55.326629Z  INFO sui_data_ingestion_core::worker_pool: transient worker execution error `Failed to get network total transactions in epoch`: `Indexer failed to read PostgresDB with error: `Record not found`` for checkpoint 85168
+Sep 12 13:00:55 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:55.383778Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:55 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:55.485289Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:55 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:55.586509Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:55 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:55.686751Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:55 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:55.787978Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:55 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:55.889206Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:55 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:55.990474Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:56 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:56.091691Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:56 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:56.192938Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:56 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:56.294146Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:56 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:56.395382Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:56 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:56.496618Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:56 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:56.597802Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:56 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:56.699055Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:56 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:56.799741Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:56 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:56.901413Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:57 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:57.002635Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:57 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:57.103865Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:57 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:57.205123Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:57 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:57.306343Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:57 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:57.407590Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:57 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:57.507791Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:57 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:57.608813Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:57 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:57.710319Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:57 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:57.811515Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:57 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:57.911741Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:58 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:58.013019Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:58 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:58.114414Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:58 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:58.215782Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:58 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:58.317185Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:58 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:58.418617Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:58 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:58.520004Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:58 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:58.621427Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:58 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:58.722709Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:58 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:58.823976Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:58 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:58.925179Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:59 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:59.026398Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:59 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:59.126826Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:59 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:59.228219Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:59 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:59.329633Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:59 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:59.430932Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:59 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:59.532331Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:59 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:59.633766Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:59 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:59.735162Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:59 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:59.836588Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:00:59 sui-mainnet-node cargo[3499927]: 2024-09-12T11:00:59.936968Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:00 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:00.038374Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:00 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:00.139765Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:00 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:00.241165Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:00 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:00.342593Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:00 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:00.442899Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:00 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:00.544191Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:00 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:00.645579Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:00 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:00.745994Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:00 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:00.847261Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:00 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:00.948674Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:01 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:01.050101Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:01 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:01.151401Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:01 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:01.252815Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:01 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:01.354218Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:01 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:01.455621Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:01 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:01.557033Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:01 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:01.658334Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:01 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:01.737621Z  INFO sui_indexer::db::setup_postgres: DB connection pool size: 100, with idle conn: 100.
+Sep 12 13:01:01 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:01.758844Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:01 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:01.860146Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:01 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:01.961555Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:02 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:02.062827Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:02 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:02.164137Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:02 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:02.265391Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:02 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:02.366754Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:02 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:02.468148Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:02 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:02.569534Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:02 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:02.669857Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:02 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:02.771291Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:02 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:02.872559Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:02 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:02.972980Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:03 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:03.074365Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:03 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:03.175688Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:03 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:03.277088Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:03 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:03.378501Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:03 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:03.478833Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:03 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:03.580220Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:03 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:03.681634Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:03 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:03.783029Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:03 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:03.884435Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:03 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:03.984871Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:04 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:04.086263Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:04 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:04.187690Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:04 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:04.289078Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:04 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:04.390494Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:04 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:04.490873Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:04 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:04.592247Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:04 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:04.693651Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:04 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:04.795038Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:04 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:04.896451Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:04 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:04.996814Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:05 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:05.098221Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:05 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:05.199600Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:05 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:05.299997Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:05 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:05.401419Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:05 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:05.502789Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:05 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:05.604195Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:05 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:05.705588Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:05 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:05.805909Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:05 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:05.907336Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:06 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:06.008645Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:06 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:06.109975Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:06 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:06.211363Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:06 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:06.312687Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:06 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:06.413948Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:06 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:06.515255Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:06 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:06.616681Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:06 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:06.718073Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:06 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:06.819324Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:06 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:06.920638Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:07 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:07.022207Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:07 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:07.123555Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:07 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:07.223952Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:07 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:07.325376Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:07 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:07.426766Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:07 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:07.528092Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:07 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:07.629440Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:07 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:07.729852Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:07 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:07.831277Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:07 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:07.932670Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:08 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:08.034058Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:08 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:08.135472Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:08 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:08.235882Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:08 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:08.337316Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:08 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:08.438712Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:08 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:08.540127Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:08 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:08.641514Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:08 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:08.741926Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:08 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:08.843325Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:08 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:08.944727Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:09 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:09.046158Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:09 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:09.147550Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:09 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:09.247969Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:09 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:09.349357Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:09 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:09.450496Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:09 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:09.550741Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:09 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:09.652130Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:09 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:09.753557Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:09 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:09.853945Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:09 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:09.939399Z  INFO sui_indexer::handlers::checkpoint_handler: checkpoint download lag for cp 85168: 44647265238 ms
+Sep 12 13:01:09 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:09.939408Z  INFO sui_indexer::handlers::checkpoint_handler: Indexer lag: downloaded checkpoint 85168 with time now 1726138869939 and checkpoint time 1681491604701
+Sep 12 13:01:09 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:09.939487Z  INFO sui_indexer::handlers::checkpoint_handler: Indexing checkpoint data blob checkpoint_seq=85168
+Sep 12 13:01:09 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:09.940990Z  INFO sui_data_ingestion_core::worker_pool: transient worker execution error `Failed to get network total transactions in epoch`: `Indexer failed to read PostgresDB with error: `Record not found`` for checkpoint 85168
+Sep 12 13:01:09 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:09.955124Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:10 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:10.056519Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:10 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:10.156920Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:10 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:10.258178Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:10 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:10.359572Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:10 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:10.459990Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:10 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:10.561371Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:10 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:10.662770Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:10 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:10.764166Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:10 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:10.865363Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:10 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:10.966588Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:11 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:11.066861Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:11 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:11.168252Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:11 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:11.269618Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:11 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:11.369998Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:11 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:11.471406Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:11 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:11.572778Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:11 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:11.673998Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:11 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:11.775372Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:11 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:11.876590Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:11 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:11.976913Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:12 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:12.078108Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:12 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:12.179365Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:12 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:12.280676Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:12 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:12.382092Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:12 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:12.483495Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:12 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:12.584671Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:12 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:12.685844Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:12 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:12.787240Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:12 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:12.888665Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:12 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:12.990051Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:13 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:13.091476Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:13 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:13.191864Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:13 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:13.293267Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:13 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:13.394695Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:13 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:13.496090Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:13 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:13.597509Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:13 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:13.698807Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:13 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:13.800216Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:13 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:13.901601Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:14 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:14.001911Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:14 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:14.103334Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:14 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:14.204704Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:14 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:14.306116Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:14 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:14.407156Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:14 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:14.508561Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:14 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:14.608918Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:14 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:14.710308Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:14 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:14.811732Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:14 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:14.913119Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:15 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:15.014531Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:15 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:15.114923Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:15 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:15.216497Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:15 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:15.316839Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:15 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:15.418234Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:15 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:15.519665Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:15 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:15.621054Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:15 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:15.722473Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:15 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:15.822740Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:15 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:15.924139Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:16 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:16.025563Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:16 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:16.125950Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:16 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:16.227365Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:16 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:16.328757Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:16 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:16.430159Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:16 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:16.531595Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:16 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:16.631993Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:16 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:16.733413Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:16 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:16.834692Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:16 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:16.935890Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:17 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:17.037121Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:17 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:17.138431Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:17 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:17.238857Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:17 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:17.340157Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:17 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:17.441572Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:17 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:17.541961Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:17 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:17.643518Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:17 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:17.743946Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:17 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:17.845343Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:17 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:17.946764Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:18 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:18.048147Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:18 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:18.149558Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:18 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:18.249950Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:18 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:18.351353Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:18 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:18.452781Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:18 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:18.554174Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:18 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:18.655505Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:18 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:18.755844Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:18 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:18.857249Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:18 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:18.958513Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:19 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:19.058911Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:19 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:19.160335Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:19 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:19.261718Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:19 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:19.363117Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:19 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:19.464510Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:19 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:19.564846Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:19 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:19.666272Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:19 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:19.767578Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:19 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:19.868000Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:19 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:19.969383Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:20 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:20.070792Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:20 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:20.172187Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:20 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:20.273586Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:20 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:20.374013Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:20 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:20.475404Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:20 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:20.576818Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:20 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:20.678205Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:20 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:20.779607Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:20 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:20.880038Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:20 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:20.981435Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:21 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:21.081857Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:21 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:21.183242Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:21 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:21.284667Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:21 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:21.386059Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:21 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:21.487476Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:21 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:21.587903Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:21 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:21.689292Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:21 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:21.790709Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:21 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:21.892095Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:21 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:21.993347Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:22 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:22.094543Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:22 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:22.194783Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:22 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:22.296046Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:22 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:22.397434Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:22 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:22.497845Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:22 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:22.599075Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:22 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:22.700494Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:22 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:22.800923Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:22 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:22.902316Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:23 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:23.003651Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:23 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:23.105038Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:23 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:23.206361Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:23 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:23.307604Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:23 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:23.408159Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:23 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:23.509585Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:23 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:23.609982Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:23 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:23.711397Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:23 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:23.812786Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:23 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:23.914195Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:24 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:24.015630Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:24 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:24.117022Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:24 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:24.218440Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:24 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:24.318842Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:24 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:24.420130Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:24 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:24.521522Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:24 sui-mainnet-node cargo[3499927]: 2024-09-12T11:01:24.621923Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 95168, pruning watermark: 85168, new updates: 0
+Sep 12 13:01:24 sui-mainnet-node systemd[1]: Stopping sui-indexer.service - Sui indexer...
+Sep 12 13:01:24 sui-mainnet-node systemd[1]: sui-indexer.service: Deactivated successfully.
+Sep 12 13:01:24 sui-mainnet-node systemd[1]: Stopped sui-indexer.service - Sui indexer.
+Sep 12 13:01:24 sui-mainnet-node systemd[1]: sui-indexer.service: Consumed 57.035s CPU time.
+Sep 12 13:25:37 sui-mainnet-node systemd[1]: Started sui-indexer.service - Sui indexer.
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: warning: /root/sui/crates/sui-indexer/Cargo.toml: unused manifest key: dependencies.odin.version
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: warning: /root/sui/crates/sui-data-ingestion-core/Cargo.toml: unused manifest key: dependencies.odin.version
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: warning: /root/sui/crates/sui-types/Cargo.toml: unused manifest key: dependencies.odin.version
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: warning: /root/sui/crates/sui-json-rpc/Cargo.toml: unused manifest key: dependencies.odin.version
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: warning: unused macro definition: `debug_print_format`
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:   --> external-crates/move/crates/move-compiler/src/shared/string_utils.rs:99:14
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    |
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 99 | macro_rules! debug_print_format {
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    |              ^^^^^^^^^^^^^^^^^^
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    |
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    = note: `#[warn(unused_macros)]` on by default
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: warning: unused import: `debug_print_format`
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    --> external-crates/move/crates/move-compiler/src/shared/string_utils.rs:117:16
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     |
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 117 | pub(crate) use debug_print_format;
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     |                ^^^^^^^^^^^^^^^^^^
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     |
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     = note: `#[warn(unused_imports)]` on by default
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: warning: unused macro definition: `debug_print_internal`
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    --> external-crates/move/crates/move-compiler/src/shared/string_utils.rs:127:14
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     |
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 127 | macro_rules! debug_print_internal {
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     |              ^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: warning: unused import: `debug_print_internal`
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    --> external-crates/move/crates/move-compiler/src/shared/string_utils.rs:168:16
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     |
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 168 | pub(crate) use debug_print_internal;
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     |                ^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: warning: unused import: `AstDebug`
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:   --> external-crates/move/crates/move-compiler/src/typing/expand.rs:12:61
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    |
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 12 |     shared::{ide::IDEAnnotation, string_utils::debug_print, AstDebug},
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    |                                                             ^^^^^^^^
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: warning: unused import: `ast_debug::AstDebug`
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:   --> external-crates/move/crates/move-compiler/src/typing/match_analysis.rs:11:9
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    |
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 11 |         ast_debug::AstDebug,
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    |         ^^^^^^^^^^^^^^^^^^^
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: warning: fields `match_variant_translation`, `match_translation`, `match_specialization`, `match_work_queue`, `function_translation`, and `eval_order` are never read
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    --> external-crates/move/crates/move-compiler/src/hlir/translate.rs:122:16
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     |
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 121 | pub(super) struct HLIRDebugFlags {
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     |                   -------------- fields in this struct
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 122 |     pub(super) match_variant_translation: bool,
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     |                ^^^^^^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 123 |     pub(super) match_translation: bool,
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     |                ^^^^^^^^^^^^^^^^^
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 124 |     pub(super) match_specialization: bool,
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     |                ^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 125 |     pub(super) match_work_queue: bool,
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     |                ^^^^^^^^^^^^^^^^
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 126 |     pub(super) function_translation: bool,
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     |                ^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 127 |     pub(super) eval_order: bool,
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     |                ^^^^^^^^^^
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     |
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     = note: `#[warn(dead_code)]` on by default
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: warning: field `debug` is never read
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    --> external-crates/move/crates/move-compiler/src/hlir/translate.rs:133:9
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     |
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 130 | pub(super) struct Context<'env> {
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     |                   ------- field in this struct
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: ...
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 133 |     pub debug: HLIRDebugFlags,
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     |         ^^^^^
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: warning: fields `match_counterexample`, `autocomplete_resolution`, `function_translation`, and `type_elaboration` are never read
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:   --> external-crates/move/crates/move-compiler/src/typing/core.rs:85:16
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    |
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 84 | pub(super) struct TypingDebugFlags {
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    |                   ---------------- fields in this struct
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 85 |     pub(super) match_counterexample: bool,
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    |                ^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 86 |     pub(super) autocomplete_resolution: bool,
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    |                ^^^^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 87 |     pub(super) function_translation: bool,
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    |                ^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 88 |     pub(super) type_elaboration: bool,
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    |                ^^^^^^^^^^^^^^^^
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: warning: field `debug` is never read
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:   --> external-crates/move/crates/move-compiler/src/typing/core.rs:95:16
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    |
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 91 | pub struct Context<'env> {
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    |            ------- field in this struct
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: ...
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 95 |     pub(super) debug: TypingDebugFlags,
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    |                ^^^^^
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: warning: `move-compiler` (lib) generated 10 warnings (run `cargo fix --lib -p move-compiler` to apply 4 suggestions)
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: warning: unused import: `ClientOptions`
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:  --> crates/sui-config/src/object_storage_config.rs:8:20
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:   |
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 8 | use object_store::{ClientOptions, DynObjectStore};
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:   |                    ^^^^^^^^^^^^^
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:   |
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:   = note: `#[warn(unused_imports)]` on by default
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: warning: unused imports: `HeaderMap`, `HeaderName`, and `HeaderValue`
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:  --> crates/sui-config/src/object_storage_config.rs:9:23
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:   |
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 9 | use reqwest::header::{HeaderMap, HeaderName, HeaderValue};
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:   |                       ^^^^^^^^^  ^^^^^^^^^^  ^^^^^^^^^^^
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: warning: `sui-config` (lib) generated 2 warnings (run `cargo fix --lib -p sui-config` to apply 2 suggestions)
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: warning: use of deprecated method `tonic::transport::server::Router::<L>::into_router`: Use `Routes::into_axum_router` instead.
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    --> consensus/core/src/network/tonic_network.rs:696:14
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     |
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 696 |             .into_router();
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     |              ^^^^^^^^^^^
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     |
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     = note: `#[warn(deprecated)]` on by default
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: warning: `consensus-core` (lib) generated 1 warning
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: warning: unused import: `sui_types::nats_queue::NatsQueueSender`
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:   --> crates/sui-data-ingestion-core/src/executor.rs:19:5
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    |
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 19 | use sui_types::nats_queue::NatsQueueSender;
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    |
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    = note: `#[warn(unused_imports)]` on by default
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: warning: `sui-data-ingestion-core` (lib) generated 1 warning (run `cargo fix --lib -p sui-data-ingestion-core` to apply 1 suggestion)
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: warning: unused variable: `ccp_digest`
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:     --> crates/sui-core/src/checkpoints/mod.rs:1106:22
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:      |
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: 1106 |         if let Some((ccp_digest, ccp_effects)) = consensus_commit_prologue {
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:      |                      ^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_ccp_digest`
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:      |
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:      = note: `#[warn(unused_variables)]` on by default
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]: warning: `sui-core` (lib) generated 1 warning
+Sep 12 13:25:37 sui-mainnet-node cargo[3519529]:    Compiling sui-indexer v1.32.3 (/root/sui/crates/sui-indexer)
+Sep 12 13:25:46 sui-mainnet-node cargo[3519529]: warning: unused import: `sui_package_resolver::PackageStore`
+Sep 12 13:25:46 sui-mainnet-node cargo[3519529]:   --> crates/sui-indexer/src/handlers/tx_processor.rs:14:5
+Sep 12 13:25:46 sui-mainnet-node cargo[3519529]:    |
+Sep 12 13:25:46 sui-mainnet-node cargo[3519529]: 14 | use sui_package_resolver::PackageStore;
+Sep 12 13:25:46 sui-mainnet-node cargo[3519529]:    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:25:46 sui-mainnet-node cargo[3519529]:    |
+Sep 12 13:25:46 sui-mainnet-node cargo[3519529]:    = note: `#[warn(unused_imports)]` on by default
+Sep 12 13:25:46 sui-mainnet-node cargo[3519529]: warning: unused import: `sui_package_resolver::Resolver`
+Sep 12 13:25:46 sui-mainnet-node cargo[3519529]:   --> crates/sui-indexer/src/handlers/tx_processor.rs:15:5
+Sep 12 13:25:46 sui-mainnet-node cargo[3519529]:    |
+Sep 12 13:25:46 sui-mainnet-node cargo[3519529]: 15 | use sui_package_resolver::Resolver;
+Sep 12 13:25:46 sui-mainnet-node cargo[3519529]:    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:25:46 sui-mainnet-node cargo[3519529]: warning: unused import: `sui_types::base_types::SuiAddress`
+Sep 12 13:25:46 sui-mainnet-node cargo[3519529]:   --> crates/sui-indexer/src/handlers/tx_processor.rs:17:5
+Sep 12 13:25:46 sui-mainnet-node cargo[3519529]:    |
+Sep 12 13:25:46 sui-mainnet-node cargo[3519529]: 17 | use sui_types::base_types::SuiAddress;
+Sep 12 13:25:46 sui-mainnet-node cargo[3519529]:    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:31:48 sui-mainnet-node cargo[3519529]: warning: `sui-indexer` (lib) generated 3 warnings (run `cargo fix --lib -p sui-indexer` to apply 3 suggestions)
+Sep 12 13:35:04 sui-mainnet-node systemd[1]: Stopping sui-indexer.service - Sui indexer...
+Sep 12 13:35:04 sui-mainnet-node systemd[1]: sui-indexer.service: Deactivated successfully.
+Sep 12 13:35:04 sui-mainnet-node systemd[1]: Stopped sui-indexer.service - Sui indexer.
+Sep 12 13:35:04 sui-mainnet-node systemd[1]: sui-indexer.service: Consumed 9min 28.040s CPU time.
+Sep 12 13:35:04 sui-mainnet-node systemd[1]: Started sui-indexer.service - Sui indexer.
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: /root/sui/crates/sui-data-ingestion-core/Cargo.toml: unused manifest key: dependencies.odin.version
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: /root/sui/crates/sui-types/Cargo.toml: unused manifest key: dependencies.odin.version
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: /root/sui/crates/sui-indexer/Cargo.toml: unused manifest key: dependencies.odin.version
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: /root/sui/crates/sui-json-rpc/Cargo.toml: unused manifest key: dependencies.odin.version
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: unused macro definition: `debug_print_format`
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:   --> external-crates/move/crates/move-compiler/src/shared/string_utils.rs:99:14
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 99 | macro_rules! debug_print_format {
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |              ^^^^^^^^^^^^^^^^^^
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    = note: `#[warn(unused_macros)]` on by default
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: unused import: `debug_print_format`
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    --> external-crates/move/crates/move-compiler/src/shared/string_utils.rs:117:16
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 117 | pub(crate) use debug_print_format;
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     |                ^^^^^^^^^^^^^^^^^^
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     = note: `#[warn(unused_imports)]` on by default
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: unused macro definition: `debug_print_internal`
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    --> external-crates/move/crates/move-compiler/src/shared/string_utils.rs:127:14
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 127 | macro_rules! debug_print_internal {
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     |              ^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: unused import: `debug_print_internal`
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    --> external-crates/move/crates/move-compiler/src/shared/string_utils.rs:168:16
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 168 | pub(crate) use debug_print_internal;
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     |                ^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: unused import: `AstDebug`
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:   --> external-crates/move/crates/move-compiler/src/typing/expand.rs:12:61
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 12 |     shared::{ide::IDEAnnotation, string_utils::debug_print, AstDebug},
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |                                                             ^^^^^^^^
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: unused import: `ast_debug::AstDebug`
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:   --> external-crates/move/crates/move-compiler/src/typing/match_analysis.rs:11:9
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 11 |         ast_debug::AstDebug,
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |         ^^^^^^^^^^^^^^^^^^^
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: fields `match_variant_translation`, `match_translation`, `match_specialization`, `match_work_queue`, `function_translation`, and `eval_order` are never read
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    --> external-crates/move/crates/move-compiler/src/hlir/translate.rs:122:16
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 121 | pub(super) struct HLIRDebugFlags {
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     |                   -------------- fields in this struct
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 122 |     pub(super) match_variant_translation: bool,
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     |                ^^^^^^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 123 |     pub(super) match_translation: bool,
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     |                ^^^^^^^^^^^^^^^^^
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 124 |     pub(super) match_specialization: bool,
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     |                ^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 125 |     pub(super) match_work_queue: bool,
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     |                ^^^^^^^^^^^^^^^^
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 126 |     pub(super) function_translation: bool,
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     |                ^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 127 |     pub(super) eval_order: bool,
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     |                ^^^^^^^^^^
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     = note: `#[warn(dead_code)]` on by default
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: field `debug` is never read
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    --> external-crates/move/crates/move-compiler/src/hlir/translate.rs:133:9
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 130 | pub(super) struct Context<'env> {
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     |                   ------- field in this struct
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: ...
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 133 |     pub debug: HLIRDebugFlags,
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     |         ^^^^^
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: fields `match_counterexample`, `autocomplete_resolution`, `function_translation`, and `type_elaboration` are never read
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:   --> external-crates/move/crates/move-compiler/src/typing/core.rs:85:16
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 84 | pub(super) struct TypingDebugFlags {
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |                   ---------------- fields in this struct
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 85 |     pub(super) match_counterexample: bool,
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |                ^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 86 |     pub(super) autocomplete_resolution: bool,
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |                ^^^^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 87 |     pub(super) function_translation: bool,
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |                ^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 88 |     pub(super) type_elaboration: bool,
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |                ^^^^^^^^^^^^^^^^
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: field `debug` is never read
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:   --> external-crates/move/crates/move-compiler/src/typing/core.rs:95:16
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 91 | pub struct Context<'env> {
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |            ------- field in this struct
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: ...
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 95 |     pub(super) debug: TypingDebugFlags,
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |                ^^^^^
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: `move-compiler` (lib) generated 10 warnings (run `cargo fix --lib -p move-compiler` to apply 4 suggestions)
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: unused import: `ClientOptions`
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:  --> crates/sui-config/src/object_storage_config.rs:8:20
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:   |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 8 | use object_store::{ClientOptions, DynObjectStore};
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:   |                    ^^^^^^^^^^^^^
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:   |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:   = note: `#[warn(unused_imports)]` on by default
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: unused imports: `HeaderMap`, `HeaderName`, and `HeaderValue`
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:  --> crates/sui-config/src/object_storage_config.rs:9:23
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:   |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 9 | use reqwest::header::{HeaderMap, HeaderName, HeaderValue};
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:   |                       ^^^^^^^^^  ^^^^^^^^^^  ^^^^^^^^^^^
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: `sui-config` (lib) generated 2 warnings (run `cargo fix --lib -p sui-config` to apply 2 suggestions)
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: use of deprecated method `tonic::transport::server::Router::<L>::into_router`: Use `Routes::into_axum_router` instead.
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    --> consensus/core/src/network/tonic_network.rs:696:14
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 696 |             .into_router();
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     |              ^^^^^^^^^^^
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     = note: `#[warn(deprecated)]` on by default
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: `consensus-core` (lib) generated 1 warning
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: unused import: `sui_types::nats_queue::NatsQueueSender`
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:   --> crates/sui-data-ingestion-core/src/executor.rs:19:5
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 19 | use sui_types::nats_queue::NatsQueueSender;
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    = note: `#[warn(unused_imports)]` on by default
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: `sui-data-ingestion-core` (lib) generated 1 warning (run `cargo fix --lib -p sui-data-ingestion-core` to apply 1 suggestion)
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: unused variable: `ccp_digest`
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:     --> crates/sui-core/src/checkpoints/mod.rs:1106:22
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:      |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 1106 |         if let Some((ccp_digest, ccp_effects)) = consensus_commit_prologue {
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:      |                      ^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_ccp_digest`
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:      |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:      = note: `#[warn(unused_variables)]` on by default
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: `sui-core` (lib) generated 1 warning
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: unused import: `sui_package_resolver::PackageStore`
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:   --> crates/sui-indexer/src/handlers/tx_processor.rs:14:5
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 14 | use sui_package_resolver::PackageStore;
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    = note: `#[warn(unused_imports)]` on by default
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: unused import: `sui_package_resolver::Resolver`
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:   --> crates/sui-indexer/src/handlers/tx_processor.rs:15:5
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 15 | use sui_package_resolver::Resolver;
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: unused import: `sui_types::base_types::SuiAddress`
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:   --> crates/sui-indexer/src/handlers/tx_processor.rs:17:5
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: 17 | use sui_types::base_types::SuiAddress;
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]: warning: `sui-indexer` (lib) generated 3 warnings (run `cargo fix --lib -p sui-indexer` to apply 3 suggestions)
+Sep 12 13:35:05 sui-mainnet-node cargo[3519948]:    Compiling sui-indexer v1.32.3 (/root/sui/crates/sui-indexer)
+Sep 12 13:37:40 sui-mainnet-node systemd[1]: Stopping sui-indexer.service - Sui indexer...
+Sep 12 13:37:41 sui-mainnet-node systemd[1]: sui-indexer.service: Deactivated successfully.
+Sep 12 13:37:41 sui-mainnet-node systemd[1]: Stopped sui-indexer.service - Sui indexer.
+Sep 12 13:37:41 sui-mainnet-node systemd[1]: sui-indexer.service: Consumed 2min 36.407s CPU time.
+Sep 12 13:37:41 sui-mainnet-node systemd[1]: Started sui-indexer.service - Sui indexer.
+Sep 12 13:37:41 sui-mainnet-node cargo[3520474]: warning: /root/sui/crates/sui-json-rpc/Cargo.toml: unused manifest key: dependencies.odin.version
+Sep 12 13:37:41 sui-mainnet-node cargo[3520474]: warning: /root/sui/crates/sui-data-ingestion-core/Cargo.toml: unused manifest key: dependencies.odin.version
+Sep 12 13:37:41 sui-mainnet-node cargo[3520474]: warning: /root/sui/crates/sui-types/Cargo.toml: unused manifest key: dependencies.odin.version
+Sep 12 13:37:41 sui-mainnet-node cargo[3520474]: warning: /root/sui/crates/sui-indexer/Cargo.toml: unused manifest key: dependencies.odin.version
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: warning: unused macro definition: `debug_print_format`
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:   --> external-crates/move/crates/move-compiler/src/shared/string_utils.rs:99:14
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 99 | macro_rules! debug_print_format {
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |              ^^^^^^^^^^^^^^^^^^
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    = note: `#[warn(unused_macros)]` on by default
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: warning: unused import: `debug_print_format`
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    --> external-crates/move/crates/move-compiler/src/shared/string_utils.rs:117:16
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 117 | pub(crate) use debug_print_format;
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     |                ^^^^^^^^^^^^^^^^^^
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     = note: `#[warn(unused_imports)]` on by default
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: warning: unused macro definition: `debug_print_internal`
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    --> external-crates/move/crates/move-compiler/src/shared/string_utils.rs:127:14
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 127 | macro_rules! debug_print_internal {
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     |              ^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: warning: unused import: `debug_print_internal`
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    --> external-crates/move/crates/move-compiler/src/shared/string_utils.rs:168:16
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 168 | pub(crate) use debug_print_internal;
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     |                ^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: warning: unused import: `AstDebug`
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:   --> external-crates/move/crates/move-compiler/src/typing/expand.rs:12:61
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 12 |     shared::{ide::IDEAnnotation, string_utils::debug_print, AstDebug},
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |                                                             ^^^^^^^^
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: warning: unused import: `ast_debug::AstDebug`
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:   --> external-crates/move/crates/move-compiler/src/typing/match_analysis.rs:11:9
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 11 |         ast_debug::AstDebug,
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |         ^^^^^^^^^^^^^^^^^^^
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: warning: fields `match_variant_translation`, `match_translation`, `match_specialization`, `match_work_queue`, `function_translation`, and `eval_order` are never read
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    --> external-crates/move/crates/move-compiler/src/hlir/translate.rs:122:16
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 121 | pub(super) struct HLIRDebugFlags {
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     |                   -------------- fields in this struct
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 122 |     pub(super) match_variant_translation: bool,
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     |                ^^^^^^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 123 |     pub(super) match_translation: bool,
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     |                ^^^^^^^^^^^^^^^^^
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 124 |     pub(super) match_specialization: bool,
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     |                ^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 125 |     pub(super) match_work_queue: bool,
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     |                ^^^^^^^^^^^^^^^^
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 126 |     pub(super) function_translation: bool,
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     |                ^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 127 |     pub(super) eval_order: bool,
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     |                ^^^^^^^^^^
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     = note: `#[warn(dead_code)]` on by default
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: warning: field `debug` is never read
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    --> external-crates/move/crates/move-compiler/src/hlir/translate.rs:133:9
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 130 | pub(super) struct Context<'env> {
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     |                   ------- field in this struct
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: ...
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 133 |     pub debug: HLIRDebugFlags,
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     |         ^^^^^
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: warning: fields `match_counterexample`, `autocomplete_resolution`, `function_translation`, and `type_elaboration` are never read
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:   --> external-crates/move/crates/move-compiler/src/typing/core.rs:85:16
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 84 | pub(super) struct TypingDebugFlags {
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |                   ---------------- fields in this struct
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 85 |     pub(super) match_counterexample: bool,
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |                ^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 86 |     pub(super) autocomplete_resolution: bool,
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |                ^^^^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 87 |     pub(super) function_translation: bool,
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |                ^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 88 |     pub(super) type_elaboration: bool,
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |                ^^^^^^^^^^^^^^^^
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: warning: field `debug` is never read
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:   --> external-crates/move/crates/move-compiler/src/typing/core.rs:95:16
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 91 | pub struct Context<'env> {
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |            ------- field in this struct
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: ...
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 95 |     pub(super) debug: TypingDebugFlags,
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |                ^^^^^
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: warning: `move-compiler` (lib) generated 10 warnings (run `cargo fix --lib -p move-compiler` to apply 4 suggestions)
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: warning: unused import: `ClientOptions`
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:  --> crates/sui-config/src/object_storage_config.rs:8:20
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:   |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 8 | use object_store::{ClientOptions, DynObjectStore};
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:   |                    ^^^^^^^^^^^^^
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:   |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:   = note: `#[warn(unused_imports)]` on by default
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: warning: unused imports: `HeaderMap`, `HeaderName`, and `HeaderValue`
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:  --> crates/sui-config/src/object_storage_config.rs:9:23
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:   |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 9 | use reqwest::header::{HeaderMap, HeaderName, HeaderValue};
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:   |                       ^^^^^^^^^  ^^^^^^^^^^  ^^^^^^^^^^^
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: warning: `sui-config` (lib) generated 2 warnings (run `cargo fix --lib -p sui-config` to apply 2 suggestions)
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: warning: use of deprecated method `tonic::transport::server::Router::<L>::into_router`: Use `Routes::into_axum_router` instead.
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    --> consensus/core/src/network/tonic_network.rs:696:14
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 696 |             .into_router();
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     |              ^^^^^^^^^^^
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     = note: `#[warn(deprecated)]` on by default
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: warning: `consensus-core` (lib) generated 1 warning
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: warning: unused import: `sui_types::nats_queue::NatsQueueSender`
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:   --> crates/sui-data-ingestion-core/src/executor.rs:19:5
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 19 | use sui_types::nats_queue::NatsQueueSender;
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    = note: `#[warn(unused_imports)]` on by default
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: warning: `sui-data-ingestion-core` (lib) generated 1 warning (run `cargo fix --lib -p sui-data-ingestion-core` to apply 1 suggestion)
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: warning: unused variable: `ccp_digest`
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:     --> crates/sui-core/src/checkpoints/mod.rs:1106:22
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:      |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 1106 |         if let Some((ccp_digest, ccp_effects)) = consensus_commit_prologue {
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:      |                      ^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_ccp_digest`
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:      |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:      = note: `#[warn(unused_variables)]` on by default
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: warning: `sui-core` (lib) generated 1 warning
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: warning: unused import: `sui_package_resolver::PackageStore`
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:   --> crates/sui-indexer/src/handlers/tx_processor.rs:14:5
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 14 | use sui_package_resolver::PackageStore;
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    = note: `#[warn(unused_imports)]` on by default
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: warning: unused import: `sui_package_resolver::Resolver`
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:   --> crates/sui-indexer/src/handlers/tx_processor.rs:15:5
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 15 | use sui_package_resolver::Resolver;
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: warning: unused import: `sui_types::base_types::SuiAddress`
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:   --> crates/sui-indexer/src/handlers/tx_processor.rs:17:5
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: 17 | use sui_types::base_types::SuiAddress;
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]: warning: `sui-indexer` (lib) generated 3 warnings (run `cargo fix --lib -p sui-indexer` to apply 3 suggestions)
+Sep 12 13:37:42 sui-mainnet-node cargo[3520474]:    Compiling sui-indexer v1.32.3 (/root/sui/crates/sui-indexer)
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]:     Finished `release` profile [optimized + debuginfo] target(s) in 3m 51s
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]:      Running `/root/sui/target/release/sui-indexer --db-url 'postgres://postgres:postgres@localhost/sui_indexer_v2' --rpc-client-url 'http://0.0.0.0:9000' --fullnode-sync-worker --reset-db`
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:32.951608Z  WARN sui_indexer: WARNING: Sui indexer is still experimental and we expect occasional breaking changes that require backfills.
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:32.951715Z  INFO sui_indexer: Parsed indexer config: IndexerConfig {
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]:     db_url: Some(
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]:         Secret([REDACTED alloc::string::String]),
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]:     ),
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]:     db_user_name: None,
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]:     db_password: None,
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]:     db_host: None,
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]:     db_port: None,
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]:     db_name: None,
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]:     rpc_client_url: "http://0.0.0.0:9000",
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]:     remote_store_url: Some(
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]:         "https://checkpoints.mainnet.sui.io",
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]:     ),
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]:     client_metric_host: "0.0.0.0",
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]:     client_metric_port: 9184,
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]:     rpc_server_url: "0.0.0.0",
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]:     rpc_server_port: 9000,
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]:     reset_db: true,
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]:     fullnode_sync_worker: true,
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]:     rpc_server_worker: false,
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]:     data_ingestion_path: None,
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]:     name_service_package_address: None,
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]:     name_service_registry_id: None,
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]:     name_service_reverse_registry_id: None,
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]: }
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:32.951800Z  WARN sui_indexer::metrics: Failed to convert full node url http://0.0.0.0:9000 to a shorter version
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:32.951810Z  INFO sui_indexer::metrics: Starting prometheus server with labels: {"indexer_fullnode": "unknown_url"}
+Sep 12 13:41:32 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:32.954521Z  INFO async_nats: event: connected
+Sep 12 13:41:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:33.339265Z  INFO sui_indexer::db::setup_postgres: Postgres database connection pool is created at postgres://postgres:postgres@localhost/sui_indexer_v2
+Sep 12 13:41:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:33.339727Z  INFO sui_indexer::db::setup_postgres: Resetting PG database ...
+Sep 12 13:41:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:33.436418Z  INFO sui_indexer::db::setup_postgres: Dropped all tables.
+Sep 12 13:41:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:33.437832Z  INFO sui_indexer::db::setup_postgres: Dropped all procedures.
+Sep 12 13:41:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:33.438450Z  INFO sui_indexer::db::setup_postgres: Dropped all functions.
+Sep 12 13:41:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:33.440543Z  INFO sui_indexer::db::setup_postgres: Created __diesel_schema_migrations table.
+Sep 12 13:41:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:33.767319Z  INFO sui_indexer::db::setup_postgres: Reset database complete.
+Sep 12 13:41:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:33.767328Z  INFO sui_indexer::db::setup_postgres: Reset Postgres database complete.
+Sep 12 13:41:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:33.767540Z  INFO sui_indexer::db::setup_postgres: DB connection pool size: 100, with idle conn: 99.
+Sep 12 13:41:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:33.769394Z  INFO sui_indexer::store::pg_partition_manager: Found 4 tables with partitions : [{"events": (0, 0), "objects_history": (0, 0), "objects_version": (0, 99), "transactions": (0, 0)}]
+Sep 12 13:41:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:33.769477Z  INFO sui_indexer::indexer: Sui Indexer Writer (version "1.32.3") started...
+Sep 12 13:41:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:33.769482Z  INFO sui_indexer::handlers::objects_snapshot_processor: Starting object snapshot processor...
+Sep 12 13:41:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:33.770452Z  INFO sui_indexer::indexer: Starting indexer pruner with epochs to keep: 1
+Sep 12 13:41:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:33.770490Z  INFO sui_indexer::handlers::objects_snapshot_processor: Starting objects snapshot committer...
+Sep 12 13:41:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:33.771603Z  INFO sui_indexer::store::pg_partition_manager: Found 4 tables with partitions : [{"events": (0, 0), "objects_history": (0, 0), "objects_version": (0, 99), "transactions": (0, 0)}]
+Sep 12 13:41:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:33.771964Z  INFO sui_types::nats_queue: Nats queue init checkpoint: 56614153
+Sep 12 13:41:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:33.771968Z  INFO sui_types::nats_queue: Nats notifications queue init checkpoint: 56614153
+Sep 12 13:41:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:33.771974Z  INFO sui_indexer::indexer: Starting data ingestion executor...
+Sep 12 13:41:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:33.771984Z  INFO sui_indexer::handlers::committer: Indexer checkpoint commit task started...
+Sep 12 13:41:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:33.771986Z  INFO sui_indexer::handlers::committer: Using checkpoint commit batch size 100
+Sep 12 13:41:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:33.772204Z  INFO sui_data_ingestion_core::worker_pool: Starting indexing pipeline primary with concurrency 200. Current watermark is 56614153.
+Sep 12 13:41:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:33.772204Z  INFO sui_data_ingestion_core::worker_pool: Starting indexing pipeline object_snapshot with concurrency 200. Current watermark is 0.
+Sep 12 13:41:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:33.772353Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 0
+Sep 12 13:41:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:33.894569Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 0, pruning watermark: 0, new updates: 0
+Sep 12 13:41:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:33.995586Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 0, pruning watermark: 0, new updates: 0
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.096850Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 0, pruning watermark: 0, new updates: 0
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.197631Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 0, pruning watermark: 0, new updates: 0
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.299487Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 0, pruning watermark: 0, new updates: 4
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.301078Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 3 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.301080Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 0 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.301089Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 1 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.301126Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.301126Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.301124Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 2 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.301141Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.302371Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 9.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.302531Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 3 for workflow object_snapshot in 1.447546ms
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.303290Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 2 for workflow object_snapshot in 2.158915ms
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.303423Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 1 for workflow object_snapshot in 2.328532ms
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.304723Z  INFO sui_types::object::bounded_visitor: Using default value for 'MAX_ANNOTATED_VALUE_SIZE' -- max bound: 1048576
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.330787Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 0 for workflow object_snapshot in 29.699977ms
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.331033Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 4
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.432620Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 4, pruning watermark: 4, new updates: 32
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433068Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 7 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433086Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433087Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 22 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433099Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433105Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 7 for workflow object_snapshot in 29.344µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433111Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 4 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433119Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433120Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 22 for workflow object_snapshot in 28.312µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433135Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 4 for workflow object_snapshot in 22.232µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433139Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 8 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433143Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 6 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433147Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433145Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 5 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433150Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433159Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 8 for workflow object_snapshot in 17.683µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433161Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 6 for workflow object_snapshot in 16.18µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433163Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 9 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433165Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 24 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433167Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433171Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433174Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433176Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 9 for workflow object_snapshot in 11.742µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433178Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 24 for workflow object_snapshot in 11.061µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433173Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 26 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433183Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 23 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433185Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 10 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433188Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433189Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433190Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433196Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 23 for workflow object_snapshot in 11.041µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433195Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 35 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433201Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 10 for workflow object_snapshot in 14.568µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433199Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 5
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433202Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 30 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433201Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 5 for workflow object_snapshot in 50.775µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433208Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433208Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 26 for workflow object_snapshot in 27.25µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433211Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 11 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433211Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 25 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433212Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433212Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 32 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433216Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 33 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433217Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433217Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 30 for workflow object_snapshot in 13.355µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433222Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 27 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433223Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433223Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433228Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433228Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433229Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 11 for workflow object_snapshot in 15.539µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433233Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 35 for workflow object_snapshot in 33.302µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433235Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 12 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433235Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 11
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433238Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 27 for workflow object_snapshot in 14.117µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433241Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433242Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 28 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433242Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 32 for workflow object_snapshot in 27.151µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433243Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 31 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433247Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433246Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 33 for workflow object_snapshot in 28.444µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433246Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 25 for workflow object_snapshot in 32.16µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433249Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 12 for workflow object_snapshot in 11.992µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433250Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433250Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 12
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433253Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 13 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433249Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 34 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433254Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 17 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433253Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 29 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433256Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 28 for workflow object_snapshot in 13.024µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433257Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433259Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433260Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433262Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 19 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433263Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 31 for workflow object_snapshot in 17.213µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433263Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 13
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433263Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 15 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433264Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433267Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433269Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 29 for workflow object_snapshot in 13.736µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433269Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 17 for workflow object_snapshot in 14.096µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433269Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 18 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433270Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 13 for workflow object_snapshot in 15.73µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433274Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433275Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 16 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433275Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 20 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433275Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 19 for workflow object_snapshot in 11.932µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433276Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433279Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 21 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433280Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433282Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 14 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433284Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 34 for workflow object_snapshot in 28.714µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433287Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433287Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433289Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 18 for workflow object_snapshot in 17.373µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433290Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433291Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 20 for workflow object_snapshot in 14.397µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433295Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 15 for workflow object_snapshot in 29.365µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433296Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 16 for workflow object_snapshot in 19.617µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433296Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 14 for workflow object_snapshot in 13.245µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433296Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 14
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433308Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 21 for workflow object_snapshot in 27.331µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433363Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 21
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.433382Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 36
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.533770Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 36, pruning watermark: 36, new updates: 0
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.635620Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 36, pruning watermark: 36, new updates: 200
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636014Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 56 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636027Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 45 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636033Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 57 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636041Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636041Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636043Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636048Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 79 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636056Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 45 for workflow object_snapshot in 24.796µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636057Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636063Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 36 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636065Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 57 for workflow object_snapshot in 28.654µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636069Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 80 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636072Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636074Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636075Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 79 for workflow object_snapshot in 22.312µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636078Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 58 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636075Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 90 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636082Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636083Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 80 for workflow object_snapshot in 12.213µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636081Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 56 for workflow object_snapshot in 57.998µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636085Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 91 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636086Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636088Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 58 for workflow object_snapshot in 8.916µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636089Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636091Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 46 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636093Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 59 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636094Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 36 for workflow object_snapshot in 30.106µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636096Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 91 for workflow object_snapshot in 9.187µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636096Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636099Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 37 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636099Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 92 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636099Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 51 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636102Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 59 for workflow object_snapshot in 7.895µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636103Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636104Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636103Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 90 for workflow object_snapshot in 23.654µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636107Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636107Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 60 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636109Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 81 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636110Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636115Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636115Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 92 for workflow object_snapshot in 14.687µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636118Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 93 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636118Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 60 for workflow object_snapshot in 10.23µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636119Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 37 for workflow object_snapshot in 18.535µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636122Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636124Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 38 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636124Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 81 for workflow object_snapshot in 14.066µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636127Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 61 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636127Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 82 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636126Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636129Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636126Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 53 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636128Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 46 for workflow object_snapshot in 34.284µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636130Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636130Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636132Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 93 for workflow object_snapshot in 12.935µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636136Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 61 for workflow object_snapshot in 7.764µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636136Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 94 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636135Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 54 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636136Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636138Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 62 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636138Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 82 for workflow object_snapshot in 10.259µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636138Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 38 for workflow object_snapshot in 13.024µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636139Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636141Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636143Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 83 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636143Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636146Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 94 for workflow object_snapshot in 8.746µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636146Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636148Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 95 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636149Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 62 for workflow object_snapshot in 9.838µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636151Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636152Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 63 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636152Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 53 for workflow object_snapshot in 22.112µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636151Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 51 for workflow object_snapshot in 48.841µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636153Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 83 for workflow object_snapshot in 9.387µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636152Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 55 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636155Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636156Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 39 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636157Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 95 for workflow object_snapshot in 7.634µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636157Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 52 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636162Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636162Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636164Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 54 for workflow object_snapshot in 26.199µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636164Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 47 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636170Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 52 for workflow object_snapshot in 11.01µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636170Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 39 for workflow object_snapshot in 12.133µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636169Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 84 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636171Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 63 for workflow object_snapshot in 18.113µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636173Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 98 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636173Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636175Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 72 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636175Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636175Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 67 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636175Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 40 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636179Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636180Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636181Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636181Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636182Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 84 for workflow object_snapshot in 11.12µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636185Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 85 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636186Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636187Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 40 for workflow object_snapshot in 10.289µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636188Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 67 for workflow object_snapshot in 11.592µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636188Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636189Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 72 for workflow object_snapshot in 13.264µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636190Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 41 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636189Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 47 for workflow object_snapshot in 23.373µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636192Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 73 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636192Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 66 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636194Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636194Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636194Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 98 for workflow object_snapshot in 18.745µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636196Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 85 for workflow object_snapshot in 9.588µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636198Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636200Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 73 for workflow object_snapshot in 6.633µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636200Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 41 for workflow object_snapshot in 8.416µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636200Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 86 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636200Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 96 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636196Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 71 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636202Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 74 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636203Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636200Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 65 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636206Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636206Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 55 for workflow object_snapshot in 49.944µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636207Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 66 for workflow object_snapshot in 12.974µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636209Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 86 for workflow object_snapshot in 7.975µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636209Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636211Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 74 for workflow object_snapshot in 6.532µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636210Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 49 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636212Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 42 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636213Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 75 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636213Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 50 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636215Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636217Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636218Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636219Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 87 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636219Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636221Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 42 for workflow object_snapshot in 8.205µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636222Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636220Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 64 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636219Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636224Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 43 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636223Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 96 for workflow object_snapshot in 19.756µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636225Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 75 for workflow object_snapshot in 10.79µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636226Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 49 for workflow object_snapshot in 13.605µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636228Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 87 for workflow object_snapshot in 7.764µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636229Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636228Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 50 for workflow object_snapshot in 13.595µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636231Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 48 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636231Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 69 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636227Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636234Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 88 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636235Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 78 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636235Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 43 for workflow object_snapshot in 10.439µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636235Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 77 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636237Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636238Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636239Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 44 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636241Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636242Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636243Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636239Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 97 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636243Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 78 for workflow object_snapshot in 6.803µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636243Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 88 for workflow object_snapshot in 7.885µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636245Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636244Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 65 for workflow object_snapshot in 39.964µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636246Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 89 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636245Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636250Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636255Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 44 for workflow object_snapshot in 14.848µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636257Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 89 for workflow object_snapshot in 9.488µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636257Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 77 for workflow object_snapshot in 19.787µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636260Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 69 for workflow object_snapshot in 26.82µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636260Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 70 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636263Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 76 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636266Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 68 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636267Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 48 for workflow object_snapshot in 34.825µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636268Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 71 for workflow object_snapshot in 64.19µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636263Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636273Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 37
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636273Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 64 for workflow object_snapshot in 48.741µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636275Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636275Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636281Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636287Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 68 for workflow object_snapshot in 19.667µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636288Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 76 for workflow object_snapshot in 23.615µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636300Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 97 for workflow object_snapshot in 55.374µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636302Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 38
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636308Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 70 for workflow object_snapshot in 44.673µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636310Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 99 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636328Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636334Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 39
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636340Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 123 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636343Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 99 for workflow object_snapshot in 27.822µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636344Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636348Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 136 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636348Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 132 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636347Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 135 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636349Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 133 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636349Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 129 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636351Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 134 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636352Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 123 for workflow object_snapshot in 10.23µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636352Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 141 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636355Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636355Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 40
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636355Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 100 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636357Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636359Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636360Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636359Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636360Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636361Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636363Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636364Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 100 for workflow object_snapshot in 7.734µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636366Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 136 for workflow object_snapshot in 16.762µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636368Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 101 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636369Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 142 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636370Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 134 for workflow object_snapshot in 17.433µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636371Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636372Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 41
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636373Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 135 for workflow object_snapshot in 21.77µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636374Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636374Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 138 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636375Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 141 for workflow object_snapshot in 21.38µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636375Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 133 for workflow object_snapshot in 23.594µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636377Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 101 for workflow object_snapshot in 8.125µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636377Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 132 for workflow object_snapshot in 26.79µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636379Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636379Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 139 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636379Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 102 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636380Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 144 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636381Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 130 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636382Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636383Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636383Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 142 for workflow object_snapshot in 12.864µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636385Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636386Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636387Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 138 for workflow object_snapshot in 11.732µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636388Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 102 for workflow object_snapshot in 7.173µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636386Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 129 for workflow object_snapshot in 34.084µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636390Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 103 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636392Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 137 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636393Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636392Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 139 for workflow object_snapshot in 11.812µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636394Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 144 for workflow object_snapshot in 12.934µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636395Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 124 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636396Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 130 for workflow object_snapshot in 13.576µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636396Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 140 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636397Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636398Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 103 for workflow object_snapshot in 7.414µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636398Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 143 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636399Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 131 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636401Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 104 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636401Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636403Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636404Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636403Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636404Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636410Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 104 for workflow object_snapshot in 8.496µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636411Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 140 for workflow object_snapshot in 12.433µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636414Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 114 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636415Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 143 for workflow object_snapshot in 14.888µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636416Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 137 for workflow object_snapshot in 22.852µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636418Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 131 for workflow object_snapshot in 17.753µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636419Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 109 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636419Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 124 for workflow object_snapshot in 21.39µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636421Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636412Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 105 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636425Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 125 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636430Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636431Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 114 for workflow object_snapshot in 15.72µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636432Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636434Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636435Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 147 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636436Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 110 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636432Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 148 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636438Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 112 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636440Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636440Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636440Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 109 for workflow object_snapshot in 19.747µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636443Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 150 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636439Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 152 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636443Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 145 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636444Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 107 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636445Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 108 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636444Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 105 for workflow object_snapshot in 20.418µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636447Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636447Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 125 for workflow object_snapshot in 20.408µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636450Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636450Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636449Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 115 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636451Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 147 for workflow object_snapshot in 14.668µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636451Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636452Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636466Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 150 for workflow object_snapshot in 21.85µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636451Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 110 for workflow object_snapshot in 13.656µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636468Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636468Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 113 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636470Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 149 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636470Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636470Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 126 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636470Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 119 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636472Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 42
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636472Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 106 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636472Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 108 for workflow object_snapshot in 25.608µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636451Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 151 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636475Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636469Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 146 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636476Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 107 for workflow object_snapshot in 29.395µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636475Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 111 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636478Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636478Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636478Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636479Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636487Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 149 for workflow object_snapshot in 15.288µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636488Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636490Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 127 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636489Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 148 for workflow object_snapshot in 50.595µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636490Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 145 for workflow object_snapshot in 43.611µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636492Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636494Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636493Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636493Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 152 for workflow object_snapshot in 47.759µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636495Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 113 for workflow object_snapshot in 24.075µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636495Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 106 for workflow object_snapshot in 21.139µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636497Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 112 for workflow object_snapshot in 55.484µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636500Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 128 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636501Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 165 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636501Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 161 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636500Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 126 for workflow object_snapshot in 27.912µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636501Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 111 for workflow object_snapshot in 22.963µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636503Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 163 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636499Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636504Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 43
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636505Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636505Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 164 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636507Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636506Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 115 for workflow object_snapshot in 54.492µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636507Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636507Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 119 for workflow object_snapshot in 33.843µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636508Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 127 for workflow object_snapshot in 16.321µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636509Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636509Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636508Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 159 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636507Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 156 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636511Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 116 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636511Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 120 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636516Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 165 for workflow object_snapshot in 14.166µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636517Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636512Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 160 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636517Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 44
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636518Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636517Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636519Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 161 for workflow object_snapshot in 16.05µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636518Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 151 for workflow object_snapshot in 42.82µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636519Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 164 for workflow object_snapshot in 12.734µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636520Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 128 for workflow object_snapshot in 18.204µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636518Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 158 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636520Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 166 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636523Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 157 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636525Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 169 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636525Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 173 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636525Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 117 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636521Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 163 for workflow object_snapshot in 17.002µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636526Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 171 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636527Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636528Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636529Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 170 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636529Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636530Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636530Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636531Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 48
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636531Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636531Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 162 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636532Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 172 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636532Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 116 for workflow object_snapshot in 18.956µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636533Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636533Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 159 for workflow object_snapshot in 21.51µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636534Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636534Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 167 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636537Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636537Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 118 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636537Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 120 for workflow object_snapshot in 23.334µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636536Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636539Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 169 for workflow object_snapshot in 12.563µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636539Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 168 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636540Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 154 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636541Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 121 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636542Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636542Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 64
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636542Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636538Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636543Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636546Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 117 for workflow object_snapshot in 19.296µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636546Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 166 for workflow object_snapshot in 23.774µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636547Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636547Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636548Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 155 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636548Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636548Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 156 for workflow object_snapshot in 36.028µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636548Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 146 for workflow object_snapshot in 69.74µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636551Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 122 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636552Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 174 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636552Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 173 for workflow object_snapshot in 25.147µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636554Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636556Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636556Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 153 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636556Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 171 for workflow object_snapshot in 28.083µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636557Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 68
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636558Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 178 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636558Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 177 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636560Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636562Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 176 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636564Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636562Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 167 for workflow object_snapshot in 25.297µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636566Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 168 for workflow object_snapshot in 25.217µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636566Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 118 for workflow object_snapshot in 27.702µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636568Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636569Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 70
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636569Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 155 for workflow object_snapshot in 18.915µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636569Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 121 for workflow object_snapshot in 26.259µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636569Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636570Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 157 for workflow object_snapshot in 45.175µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636569Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 170 for workflow object_snapshot in 38.822µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636568Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 179 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636570Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 175 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636574Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636572Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 180 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636569Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 162 for workflow object_snapshot in 35.606µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636573Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 160 for workflow object_snapshot in 53.791µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636575Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 172 for workflow object_snapshot in 41.838µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636577Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 174 for workflow object_snapshot in 24.526µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636579Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 181 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636579Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 153 for workflow object_snapshot in 20.618µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636580Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 154 for workflow object_snapshot in 37.801µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636581Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 99
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636581Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 158 for workflow object_snapshot in 58.85µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636582Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 183 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636582Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 182 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636584Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 184 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636584Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 122 for workflow object_snapshot in 31.579µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636585Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636587Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636587Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 178 for workflow object_snapshot in 27.712µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636587Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636588Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 176 for workflow object_snapshot in 24.225µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636591Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 186 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636591Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636590Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 177 for workflow object_snapshot in 29.876µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636592Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636593Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636595Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 100
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636597Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636598Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 185 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636595Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636601Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 179 for workflow object_snapshot in 28.753µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636602Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 184 for workflow object_snapshot in 16.581µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636604Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636605Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 188 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636605Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 183 for workflow object_snapshot in 21.821µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636605Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 187 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636607Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 189 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636607Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 101
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636609Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636609Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 186 for workflow object_snapshot in 16.841µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636610Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 190 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636610Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 181 for workflow object_snapshot in 28.563µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636611Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636613Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 180 for workflow object_snapshot in 36.979µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636612Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 191 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636614Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636615Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 188 for workflow object_snapshot in 9.658µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636615Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 185 for workflow object_snapshot in 15.399µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636616Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636614Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 182 for workflow object_snapshot in 29.155µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636617Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 192 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636617Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 189 for workflow object_snapshot in 9.218µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636617Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 175 for workflow object_snapshot in 42.519µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636619Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 193 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636621Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636622Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 102
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636623Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 187 for workflow object_snapshot in 15.549µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636624Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636625Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 190 for workflow object_snapshot in 14.577µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636625Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636630Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 194 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636633Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 195 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636632Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 191 for workflow object_snapshot in 17.242µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636634Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 196 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636634Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 103
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636636Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 192 for workflow object_snapshot in 17.343µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636638Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636639Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636640Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636640Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 193 for workflow object_snapshot in 18.956µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636640Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 198 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636642Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 199 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636644Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 196 for workflow object_snapshot in 9.377µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636644Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 197 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636645Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636645Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 104
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636646Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 200 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636646Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636649Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 201 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636651Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636651Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636652Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 198 for workflow object_snapshot in 9.928µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636652Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 195 for workflow object_snapshot in 17.884µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636653Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 199 for workflow object_snapshot in 10.449µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636653Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 202 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636657Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 105
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636657Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636658Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 200 for workflow object_snapshot in 11.332µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636660Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636662Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 197 for workflow object_snapshot in 16.21µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636664Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 194 for workflow object_snapshot in 31.338µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636668Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 106
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636669Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 202 for workflow object_snapshot in 13.726µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636672Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 204 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636673Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 201 for workflow object_snapshot in 21.741µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636678Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 111
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636682Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 203 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636682Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636686Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 115
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636686Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 205 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636687Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636688Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 210 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636690Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636691Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 207 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636694Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 116
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636694Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636695Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 203 for workflow object_snapshot in 11.452µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636695Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 204 for workflow object_snapshot in 20.198µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636699Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 213 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636702Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636697Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636704Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 117
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636703Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 210 for workflow object_snapshot in 14.076µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636702Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 208 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636709Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 205 for workflow object_snapshot in 21.861µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636711Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 211 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636712Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 207 for workflow object_snapshot in 19.146µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636712Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 213 for workflow object_snapshot in 12.533µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636712Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636715Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 209 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636712Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 212 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636717Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636718Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 206 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636718Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 214 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636720Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636722Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636722Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636722Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 215 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636725Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636725Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 208 for workflow object_snapshot in 20.438µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636727Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 216 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636728Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 211 for workflow object_snapshot in 14.727µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636729Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 214 for workflow object_snapshot in 9.689µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636729Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636730Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 212 for workflow object_snapshot in 14.046µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636731Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636731Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 206 for workflow object_snapshot in 12.103µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636734Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 217 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636734Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 209 for workflow object_snapshot in 18.505µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636735Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 218 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636740Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636741Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 219 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636741Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636740Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 215 for workflow object_snapshot in 15.96µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636741Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 216 for workflow object_snapshot in 13.005µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636744Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 220 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636745Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636747Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 221 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636749Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636750Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 217 for workflow object_snapshot in 14.747µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636750Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 218 for workflow object_snapshot in 13.265µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636752Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 219 for workflow object_snapshot in 10.059µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636752Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636753Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 222 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636757Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 220 for workflow object_snapshot in 12.283µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636759Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 223 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636762Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636762Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 221 for workflow object_snapshot in 13.976µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636765Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636773Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 224 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636775Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 223 for workflow object_snapshot in 14.748µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636777Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636779Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 222 for workflow object_snapshot in 22.902µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636786Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 224 for workflow object_snapshot in 11.641µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636808Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 118
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636852Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 121
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636859Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 225 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636865Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636865Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 226 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636871Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636875Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 122
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636876Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 225 for workflow object_snapshot in 14.888µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636880Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 227 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636880Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 226 for workflow object_snapshot in 13.294µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636884Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636884Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 228 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636887Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 175
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636888Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636889Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 227 for workflow object_snapshot in 7.915µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636889Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 231 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636892Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 230 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636895Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 228 for workflow object_snapshot in 9.828µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636895Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636896Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636896Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 229 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636902Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 230 for workflow object_snapshot in 8.847µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636906Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636907Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 231 for workflow object_snapshot in 15.92µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636926Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 187
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636926Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 233 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636926Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 229 for workflow object_snapshot in 26.159µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636930Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 232 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636930Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636935Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636939Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 233 for workflow object_snapshot in 10.96µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636944Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 232 for workflow object_snapshot in 12.834µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636945Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 235 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636948Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 190
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636951Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 234 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636953Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636957Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636962Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 191
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636968Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 234 for workflow object_snapshot in 14.728µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636968Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 235 for workflow object_snapshot in 20.629µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636972Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 192
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636985Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 193
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.636996Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 194
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.637007Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 201
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.637036Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 203
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.637052Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 204
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.637062Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 205
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.637071Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 206
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.637083Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 209
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.637093Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 215
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.637120Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 216
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.637133Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 217
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.637143Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 218
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.637153Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 219
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.637165Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 220
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.637175Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 221
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.637185Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 222
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.637201Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 224
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.637211Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 225
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.637223Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 226
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.637234Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 227
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.637243Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 228
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.637255Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 229
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.637263Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 232
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.637272Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 234
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.637280Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 235
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.637289Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 236
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.738075Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 236, pruning watermark: 236, new updates: 2
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.738144Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 237 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.738152Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 236 for workflow object_snapshot
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.738155Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.738160Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.738171Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 237 for workflow object_snapshot in 21.81µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.738176Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 236 for workflow object_snapshot in 22.011µs
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.738201Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 238
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.838970Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 238, pruning watermark: 238, new updates: 0
+Sep 12 13:41:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:34.939905Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 238, pruning watermark: 238, new updates: 0
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041165Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 238, pruning watermark: 238, new updates: 200
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041258Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 239 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041258Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 238 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041273Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 245 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041274Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041275Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041282Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041301Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 238 for workflow object_snapshot in 36.538µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041301Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 245 for workflow object_snapshot in 24.456µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041304Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 239 for workflow object_snapshot in 39.414µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041308Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 240 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041310Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 242 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041312Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 241 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041317Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041317Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041321Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041327Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 243 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041333Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 240 for workflow object_snapshot in 22.162µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041333Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 242 for workflow object_snapshot in 19.867µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041331Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 239
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041339Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 241 for workflow object_snapshot in 24.927µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041340Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 244 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041347Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041346Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041346Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 253 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041355Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 249 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041363Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041363Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 244 for workflow object_snapshot in 21.039µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041364Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041363Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 251 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041370Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 252 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041373Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 243 for workflow object_snapshot in 40.566µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041377Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041379Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 249 for workflow object_snapshot in 21.29µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041381Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 240
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041385Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 246 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041385Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 253 for workflow object_snapshot in 35.327µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041389Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 252 for workflow object_snapshot in 16.41µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041394Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041396Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 254 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041396Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 247 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041398Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 250 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041404Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041405Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041406Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 246 for workflow object_snapshot in 18.735µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041417Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 254 for workflow object_snapshot in 18.896µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041418Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041419Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 247 for workflow object_snapshot in 20.308µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041424Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 248 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041429Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 257 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041430Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 258 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041431Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041432Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 256 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041437Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041437Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 250 for workflow object_snapshot in 34.675µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041438Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041440Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041444Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 248 for workflow object_snapshot in 18.024µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041446Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 259 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041446Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041451Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 257 for workflow object_snapshot in 19.296µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041452Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041465Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 258 for workflow object_snapshot in 32.33µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041468Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 261 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041471Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 241
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041472Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 262 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041473Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 263 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041474Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 264 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041477Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041479Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 259 for workflow object_snapshot in 31.97µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041477Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 260 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041479Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 256 for workflow object_snapshot in 41.958µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041481Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041480Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 251 for workflow object_snapshot in 112.089µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041485Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041488Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 243
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041487Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 255 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041491Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 261 for workflow object_snapshot in 19.978µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041491Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041494Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041493Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 265 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041494Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 263 for workflow object_snapshot in 18.986µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041499Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041501Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 246
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041503Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 264 for workflow object_snapshot in 25.688µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041505Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 255 for workflow object_snapshot in 15.579µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041509Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 266 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041510Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 260 for workflow object_snapshot in 28.704µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041511Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041514Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 247
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041516Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 262 for workflow object_snapshot in 42.229µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041518Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041526Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 268 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041525Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 267 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041528Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 270 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041529Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 248
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041531Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 266 for workflow object_snapshot in 19.556µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041533Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041534Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041535Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041535Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 265 for workflow object_snapshot in 38.992µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041534Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 269 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041544Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 251
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041544Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 268 for workflow object_snapshot in 16.391µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041547Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 270 for workflow object_snapshot in 16.1µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041547Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 267 for workflow object_snapshot in 18.996µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041547Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041553Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 271 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041555Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 272 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041560Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041562Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 255
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041565Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 269 for workflow object_snapshot in 26.9µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041573Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041575Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 271 for workflow object_snapshot in 19.006µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041581Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 273 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041586Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 275 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041588Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041590Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 272 for workflow object_snapshot in 32.461µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041594Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041597Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 274 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041597Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 273 for workflow object_snapshot in 14.076µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041604Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 275 for workflow object_snapshot in 15.89µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041607Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 260
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041610Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041609Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 276 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041611Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 279 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041611Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 278 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041612Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 277 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041618Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041619Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041621Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041621Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041621Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 274 for workflow object_snapshot in 21.971µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041624Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 262
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041626Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 279 for workflow object_snapshot in 13.936µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041634Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 280 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041634Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 278 for workflow object_snapshot in 20.318µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041637Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 265
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041637Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 276 for workflow object_snapshot in 25.879µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041637Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 277 for workflow object_snapshot in 22.783µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041640Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041651Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 280 for workflow object_snapshot in 15.018µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041653Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 267
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041661Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 283 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041661Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 281 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041666Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041668Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 269
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041669Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041677Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 283 for workflow object_snapshot in 14.117µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041679Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 281 for workflow object_snapshot in 16.05µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041680Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 282 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041681Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 271
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041686Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041686Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 284 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041689Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 285 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041691Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041696Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041697Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 272
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041699Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 282 for workflow object_snapshot in 17.012µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041702Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 284 for workflow object_snapshot in 14.517µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041706Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 285 for workflow object_snapshot in 15.739µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041707Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 287 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041713Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 273
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041714Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 288 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041715Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041722Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 286 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041723Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041726Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 289 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041727Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 274
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041729Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041729Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 290 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041730Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 287 for workflow object_snapshot in 20.889µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041731Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041742Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 276
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041741Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 291 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041742Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 289 for workflow object_snapshot in 15.179µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041738Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 288 for workflow object_snapshot in 20.699µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041746Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 286 for workflow object_snapshot in 22.121µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041752Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041757Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041759Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 280
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041766Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 291 for workflow object_snapshot in 21.289µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041772Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 281
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041772Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 292 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041775Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 290 for workflow object_snapshot in 43.401µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041779Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041784Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 295 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041786Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 282
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041790Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 292 for workflow object_snapshot in 15.419µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041790Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041795Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 293 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041799Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 294 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041799Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 295 for workflow object_snapshot in 13.736µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041800Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 284
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041803Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041805Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041811Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 294 for workflow object_snapshot in 10.89µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041816Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 285
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041816Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 296 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041820Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 293 for workflow object_snapshot in 22.612µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041824Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 297 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041825Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041828Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 299 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041828Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 286
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041831Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041834Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041834Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 298 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041834Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 301 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041836Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 296 for workflow object_snapshot in 18.554µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041839Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 300 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041841Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 290
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041841Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 297 for workflow object_snapshot in 14.788µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041841Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 299 for workflow object_snapshot in 11.442µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041842Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041843Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041853Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 292
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041854Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 302 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041856Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041856Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 298 for workflow object_snapshot in 19.376µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041858Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 301 for workflow object_snapshot in 21.149µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041862Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041868Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 293
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041871Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 302 for workflow object_snapshot in 14.998µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041873Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 300 for workflow object_snapshot in 31.959µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041883Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 296
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041890Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 303 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041895Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041895Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 306 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041900Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 297
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041903Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 303 for workflow object_snapshot in 12.143µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041909Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041909Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 305 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041913Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 304 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041915Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041922Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041925Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 305 for workflow object_snapshot in 13.886µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041935Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 306 for workflow object_snapshot in 36.729µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041936Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 298
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041936Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 304 for workflow object_snapshot in 20.398µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041943Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 307 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041954Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 300
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041954Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041969Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 308 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041972Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 303
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041974Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 310 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041975Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 307 for workflow object_snapshot in 29.305µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041976Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 311 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041978Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041986Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 304
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041986Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041988Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041992Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 308 for workflow object_snapshot in 21.34µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041994Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 315 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041996Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 314 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.041999Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 313 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042001Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 307
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042001Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 310 for workflow object_snapshot in 25.457µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042003Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042004Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042004Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 311 for workflow object_snapshot in 24.946µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042008Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042009Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 312 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042012Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 320 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042014Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 308
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042016Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 314 for workflow object_snapshot in 18.164µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042018Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042019Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 317 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042018Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 315 for workflow object_snapshot in 21.04µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042014Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 319 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042020Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 313 for workflow object_snapshot in 18.665µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042022Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042026Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 309
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042028Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042030Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 318 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042032Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 312 for workflow object_snapshot in 20.308µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042033Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 316 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042037Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042037Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 320 for workflow object_snapshot in 22.812µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042039Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 309 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042040Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042043Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 322 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042044Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042045Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 318 for workflow object_snapshot in 12.644µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042048Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 317 for workflow object_snapshot in 27.391µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042046Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 321 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042050Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042050Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042052Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 316 for workflow object_snapshot in 17.493µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042053Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 309 for workflow object_snapshot in 12.754µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042062Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042067Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 322 for workflow object_snapshot in 22.222µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042071Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 319 for workflow object_snapshot in 49.823µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042074Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 321 for workflow object_snapshot in 24.105µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042080Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 323 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042085Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 324 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042089Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 325 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042089Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042090Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042097Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042098Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 316
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042100Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 324 for workflow object_snapshot in 12.814µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042100Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 326 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042105Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 323 for workflow object_snapshot in 21.801µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042107Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 325 for workflow object_snapshot in 15.068µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042108Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 327 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042109Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042112Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042120Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 327 for workflow object_snapshot in 10.67µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042127Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 326 for workflow object_snapshot in 24.796µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042151Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 319
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042158Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 331 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042165Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 328 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042166Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 329 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042167Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042168Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 321
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042172Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042172Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042181Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 323
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042181Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 330 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042181Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 331 for workflow object_snapshot in 20.539µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042182Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 328 for workflow object_snapshot in 15.289µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042182Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 329 for workflow object_snapshot in 14.948µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042188Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042193Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 325
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042205Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 326
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042206Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 330 for workflow object_snapshot in 22.612µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042208Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 334 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042207Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 332 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042214Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 333 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042220Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 328
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042220Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042220Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042220Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042222Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 335 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042226Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042231Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 333 for workflow object_snapshot in 14.948µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042232Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 336 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042232Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 329
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042235Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 335 for workflow object_snapshot in 12.483µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042236Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 332 for workflow object_snapshot in 24.767µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042239Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042236Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 334 for workflow object_snapshot in 24.676µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042241Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 338 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042243Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 337 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042246Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 330
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042246Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042245Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 340 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042253Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042255Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042255Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 338 for workflow object_snapshot in 12.383µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042258Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 343 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042257Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 336 for workflow object_snapshot in 22.932µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042259Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 332
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042265Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042264Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 341 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042265Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 339 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042270Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 337 for workflow object_snapshot in 24.556µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042270Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 340 for workflow object_snapshot in 22.252µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042272Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042272Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 342 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042275Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 334
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042275Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 343 for workflow object_snapshot in 16.16µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042279Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042281Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 339 for workflow object_snapshot in 14.107µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042281Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042280Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 345 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042285Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 344 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042288Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042291Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042293Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 336
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042297Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 346 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042297Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 341 for workflow object_snapshot in 29.815µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042302Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 344 for workflow object_snapshot in 14.687µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042302Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 342 for workflow object_snapshot in 28.493µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042304Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042306Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 337
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042305Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 345 for workflow object_snapshot in 22.111µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042311Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 347 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042316Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 346 for workflow object_snapshot in 16.521µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042316Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042320Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 339
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042324Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 348 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042328Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 347 for workflow object_snapshot in 15.108µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042329Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042335Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 349 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042334Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 341
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042337Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 348 for workflow object_snapshot in 11.893µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042340Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042348Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 349 for workflow object_snapshot in 11.611µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042349Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 342
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042357Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 350 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042362Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 345
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042367Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042374Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 346
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042381Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 350 for workflow object_snapshot in 21.871µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042387Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 347
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042388Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 351 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042394Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042396Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 355 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042399Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 348
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042399Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 352 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042402Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 351 for workflow object_snapshot in 11.521µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042402Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 354 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042404Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042407Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 353 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042408Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042409Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042410Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 349
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042413Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042419Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 355 for workflow object_snapshot in 19.907µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042420Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 352 for workflow object_snapshot in 17.914µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042422Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 354 for workflow object_snapshot in 17.733µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042422Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 350
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042426Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 353 for workflow object_snapshot in 17.573µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042435Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 351
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042435Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 356 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042447Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 357 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042448Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 352
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042452Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042476Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 353
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042477Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 359 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042476Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 357 for workflow object_snapshot in 27.681µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042484Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042485Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042487Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 358 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042489Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 356
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042494Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042495Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 359 for workflow object_snapshot in 15.719µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042494Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 361 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042504Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042504Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 356 for workflow object_snapshot in 66.153µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042510Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 360 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042517Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 358 for workflow object_snapshot in 27.381µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042517Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 361 for workflow object_snapshot in 19.767µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042519Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042525Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 363 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042530Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042532Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 365 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042532Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 360 for workflow object_snapshot in 19.927µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042535Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 358
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042537Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042540Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 363 for workflow object_snapshot in 12.944µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042542Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 362 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042543Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 364 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042546Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 365 for workflow object_snapshot in 12.343µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042552Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042553Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042560Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 367 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042566Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 362 for workflow object_snapshot in 20.418µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042566Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 366 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042569Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042568Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 364 for workflow object_snapshot in 23.033µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042577Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042580Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 367 for workflow object_snapshot in 17.833µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042583Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 360
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042589Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 368 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042592Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 366 for workflow object_snapshot in 23.373µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042595Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042600Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 369 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042603Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 362
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042604Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 372 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042613Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042615Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042617Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 364
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042621Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 371 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042622Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 370 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042622Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 374 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042624Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 368 for workflow object_snapshot in 32.982µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042626Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042629Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042628Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 372 for workflow object_snapshot in 19.967µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042629Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042631Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 366
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042631Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 369 for workflow object_snapshot in 27.221µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042635Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 371 for workflow object_snapshot in 12.383µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042637Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 373 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042640Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 370 for workflow object_snapshot in 16.481µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042645Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 374 for workflow object_snapshot in 20.348µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042646Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042646Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 375 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042647Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 376 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042651Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 368
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042652Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042655Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 373 for workflow object_snapshot in 16.2µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042655Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042657Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 377 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042661Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 375 for workflow object_snapshot in 13.104µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042665Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042667Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 376 for workflow object_snapshot in 18.164µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042670Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 378 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042671Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 369
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042676Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042681Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 377 for workflow object_snapshot in 21.45µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042686Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 379 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042690Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 370
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042692Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042693Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 378 for workflow object_snapshot in 22.452µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042700Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 379 for workflow object_snapshot in 11.512µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042708Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 373
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042716Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 380 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042726Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042728Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 375
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042727Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 382 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042728Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 383 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042734Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042736Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042739Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 380 for workflow object_snapshot in 20.599µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042741Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 381 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042741Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 384 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042744Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 383 for workflow object_snapshot in 13.685µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042746Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 376
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042749Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042751Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042753Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 382 for workflow object_snapshot in 22.793µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042758Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 384 for workflow object_snapshot in 14.007µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042761Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 381 for workflow object_snapshot in 17.663µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042765Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 377
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042776Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 385 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042781Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042780Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 386 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042783Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 378
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042785Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042793Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 386 for workflow object_snapshot in 10.59µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042793Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 387 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042801Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042800Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 385 for workflow object_snapshot in 22.451µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042804Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 379
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042809Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 389 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042813Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042815Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 387 for workflow object_snapshot in 19.376µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042820Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 389 for workflow object_snapshot in 9.487µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042824Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 380
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042826Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 390 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042826Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 391 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042827Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 388 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042832Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042834Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 392 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042836Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042836Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042844Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042843Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 381
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042847Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 390 for workflow object_snapshot in 18.856µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042848Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 388 for workflow object_snapshot in 18.444µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042849Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 394 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042849Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 391 for workflow object_snapshot in 19.828µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042850Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 393 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042857Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042858Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 392 for workflow object_snapshot in 21.52µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042862Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 385
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042866Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 394 for workflow object_snapshot in 14.808µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042873Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042878Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 387
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042882Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 395 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042887Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042891Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 393 for workflow object_snapshot in 34.244µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042894Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 396 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042896Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 395 for workflow object_snapshot in 12.052µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042896Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 388
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042896Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 397 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042896Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 399 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042904Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042903Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042908Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 398 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042910Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042915Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 397 for workflow object_snapshot in 16.04µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042914Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 391
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042917Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042918Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 396 for workflow object_snapshot in 21.531µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042922Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 399 for workflow object_snapshot in 21.32µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042926Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 400 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042928Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 401 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042930Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 398 for workflow object_snapshot in 20.108µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042934Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042934Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 392
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042936Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 402 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042936Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042944Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042944Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 401 for workflow object_snapshot in 15.068µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042948Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 400 for workflow object_snapshot in 19.997µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042949Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 403 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042953Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 393
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042955Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 402 for workflow object_snapshot in 18.074µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042956Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042966Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 403 for workflow object_snapshot in 15.379µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042971Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 395
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.042988Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 396
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043004Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 398
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043005Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 405 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043008Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 408 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043008Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 407 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043015Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043015Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043017Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043023Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 400
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043025Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 408 for workflow object_snapshot in 14.748µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043028Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 406 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043029Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 409 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043032Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 404 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043032Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 405 for workflow object_snapshot in 24.846µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043033Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 407 for workflow object_snapshot in 23.574µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043035Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043035Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043042Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 413 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043042Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043042Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 402
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043045Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 406 for workflow object_snapshot in 14.598µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043047Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043046Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 411 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043047Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 409 for workflow object_snapshot in 16.892µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043051Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 412 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043049Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 410 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043056Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043055Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 404 for workflow object_snapshot in 19.466µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043056Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 413 for workflow object_snapshot in 12.594µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043056Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043064Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 403
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043064Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043064Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 414 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043064Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 412 for workflow object_snapshot in 11.632µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043065Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 415 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043070Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043072Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043072Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 411 for workflow object_snapshot in 23.354µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043074Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 416 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043080Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 414 for workflow object_snapshot in 14.226µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043081Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043078Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 417 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043080Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 410 for workflow object_snapshot in 26.94µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043084Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 404
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043086Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 415 for workflow object_snapshot in 18.705µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043090Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043091Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 416 for workflow object_snapshot in 15.278µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043103Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 410
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043104Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 417 for workflow object_snapshot in 21.61µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043117Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 418 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043123Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043128Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 421 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043131Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 418 for workflow object_snapshot in 12.323µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043130Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 415
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043134Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043149Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 424 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043150Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 421 for workflow object_snapshot in 20.187µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043151Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 422 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043156Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 419 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043159Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043160Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043162Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043168Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 416
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043171Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 419 for workflow object_snapshot in 14.026µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043172Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 425 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043175Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 422 for workflow object_snapshot in 21.099µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043178Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 426 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043178Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 424 for workflow object_snapshot in 26.86µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043180Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 423 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043181Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043185Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043185Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 427 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043186Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 417
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043187Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043187Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 428 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043192Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 420 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043193Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043194Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 429 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043195Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 425 for workflow object_snapshot in 20.038µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043197Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 423 for workflow object_snapshot in 14.377µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043199Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043199Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 426 for workflow object_snapshot in 19.918µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043201Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043204Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 418
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043203Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043206Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 427 for workflow object_snapshot in 19.416µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043207Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 429 for workflow object_snapshot in 11.732µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043216Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 430 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043218Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 432 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043219Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 419
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043219Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 431 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043220Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043221Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 420 for workflow object_snapshot in 25.939µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043223Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 428 for workflow object_snapshot in 30.306µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043227Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043227Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043228Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 430 for workflow object_snapshot in 11.341µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043234Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 420
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043234Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 433 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043240Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043241Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 431 for workflow object_snapshot in 19.116µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043246Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 432 for workflow object_snapshot in 26.659µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043249Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 433 for workflow object_snapshot in 12.624µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043249Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 428
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043255Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 434 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043257Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 435 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043262Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043265Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 430
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043268Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043270Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 435 for workflow object_snapshot in 11.311µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043278Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 437 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043281Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 431
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043282Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 434 for workflow object_snapshot in 24.095µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043281Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 436 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043285Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043294Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043296Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 437 for workflow object_snapshot in 16.791µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043297Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 432
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043305Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 436 for workflow object_snapshot in 20.208µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043312Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 433
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043327Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 434
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043341Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 436
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.043356Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 438
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.143600Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 438, pruning watermark: 438, new updates: 0
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245363Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 438, pruning watermark: 438, new updates: 19
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245472Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 438 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245484Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 445 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245488Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245496Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245506Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 438 for workflow object_snapshot in 27.261µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245520Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 441 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245523Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 439
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245533Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 450 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245533Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 445 for workflow object_snapshot in 46.487µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245539Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245539Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245540Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 442 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245552Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245559Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 443 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245563Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 439 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245563Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 441 for workflow object_snapshot in 38.272µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245570Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 450 for workflow object_snapshot in 34.574µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245570Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 440 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245574Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 446 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245575Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245577Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245577Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 442 for workflow object_snapshot in 35.035µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245579Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245583Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 444 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245585Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 456 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245588Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 446 for workflow object_snapshot in 13.004µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245590Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 440 for workflow object_snapshot in 18.695µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245593Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245595Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 449 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245595Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 447 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245594Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245598Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245600Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245600Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245601Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 439 for workflow object_snapshot in 34.975µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245598Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 448 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245608Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 444 for workflow object_snapshot in 23.223µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245610Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 449 for workflow object_snapshot in 14.086µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245614Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 447 for workflow object_snapshot in 17.603µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245614Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 451 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245615Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 452 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245618Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 443 for workflow object_snapshot in 53.801µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245619Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 455 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245622Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245621Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 456 for workflow object_snapshot in 33.102µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245622Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 454 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245624Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245626Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 443
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245628Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245629Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245631Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 452 for workflow object_snapshot in 14.857µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245635Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245636Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 451 for workflow object_snapshot in 20.589µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245590Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 453 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245645Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 455 for workflow object_snapshot in 23.684µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245654Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 448 for workflow object_snapshot in 44.032µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245654Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 454 for workflow object_snapshot in 29.084µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245662Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245670Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 448
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245674Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 453 for workflow object_snapshot in 29.535µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245685Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 453
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.245697Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 457
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.347571Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 457, pruning watermark: 457, new updates: 72
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348081Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 459 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348094Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 468 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348097Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348117Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 459 for workflow object_snapshot in 28.433µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348119Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348130Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 457 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348135Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 458 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348143Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 463 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348144Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348146Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348150Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 468 for workflow object_snapshot in 50.865µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348160Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348167Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 457 for workflow object_snapshot in 32.721µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348170Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 464 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348175Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 458 for workflow object_snapshot in 37.6µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348180Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348183Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 463 for workflow object_snapshot in 37.249µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348184Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 466 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348188Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 477 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348189Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 478 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348193Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 458
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348193Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348199Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348205Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 464 for workflow object_snapshot in 32.941µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348209Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348209Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 466 for workflow object_snapshot in 22.692µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348211Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 467 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348216Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 465 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348221Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 478 for workflow object_snapshot in 30.627µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348222Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348223Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 460
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348226Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348223Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 473 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348228Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 475 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348236Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348239Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 465 for workflow object_snapshot in 20.779µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348238Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 476 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348246Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 475 for workflow object_snapshot in 15.94µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348246Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 460 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348246Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 467 for workflow object_snapshot in 32.641µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348248Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348250Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 461 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348254Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 462 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348255Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348255Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348255Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348255Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 474 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348260Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 477 for workflow object_snapshot in 68.889µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348263Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348267Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 470 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348269Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 461 for workflow object_snapshot in 18.084µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348273Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 460 for workflow object_snapshot in 24.235µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348272Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 473 for workflow object_snapshot in 43.321µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348274Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 481 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348274Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348276Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 476 for workflow object_snapshot in 31.799µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348281Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348280Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 471 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348281Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348283Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 469 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348285Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 462 for workflow object_snapshot in 29.926µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348285Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 482 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348289Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348289Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 472 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348293Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 481 for workflow object_snapshot in 17.523µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348294Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348295Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348296Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 484 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348300Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 474 for workflow object_snapshot in 40.035µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348301Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 487 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348302Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 470 for workflow object_snapshot in 33.041µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348303Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 471 for workflow object_snapshot in 20.078µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348303Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348309Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 482 for workflow object_snapshot in 21.75µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348311Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 486 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348311Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 469 for workflow object_snapshot in 25.477µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348312Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348311Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348313Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 479 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348320Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348320Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348321Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 485 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348324Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 472 for workflow object_snapshot in 30.266µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348324Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 480 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348327Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 483 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348329Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348331Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 479 for workflow object_snapshot in 16.26µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348332Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 488 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348332Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 487 for workflow object_snapshot in 27.381µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348335Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348337Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348337Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 486 for workflow object_snapshot in 23.333µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348339Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348340Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 485 for workflow object_snapshot in 17.223µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348340Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 489 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348342Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 484 for workflow object_snapshot in 44.703µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348347Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 483 for workflow object_snapshot in 18.315µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348349Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 488 for workflow object_snapshot in 15.559µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348349Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 462
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348350Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 490 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348351Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348356Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 491 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348357Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 492 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348359Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 480 for workflow object_snapshot in 30.697µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348360Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348364Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 489 for workflow object_snapshot in 21.37µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348372Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348373Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 493 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348374Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348377Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348377Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 490 for workflow object_snapshot in 24.716µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348380Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 469
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348385Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 491 for workflow object_snapshot in 26.74µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348388Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 493 for workflow object_snapshot in 13.715µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348390Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 492 for workflow object_snapshot in 30.176µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348399Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 472
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348410Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 495 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348415Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348415Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 479
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348417Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 494 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348423Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 495 for workflow object_snapshot in 11.912µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348426Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348434Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 480
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348438Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 496 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348441Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 494 for workflow object_snapshot in 22.031µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348443Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348451Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 496 for workflow object_snapshot in 11.892µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348464Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 497 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348465Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 498 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348467Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 489
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348469Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 499 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348472Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348475Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348475Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 500 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348476Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 502 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348478Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348482Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348484Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 498 for workflow object_snapshot in 16.911µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348485Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 497 for workflow object_snapshot in 18.745µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348485Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348488Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 490
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348491Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 499 for workflow object_snapshot in 20.067µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348494Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 501 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348500Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 503 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348500Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 500 for workflow object_snapshot in 22.722µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348504Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 502 for workflow object_snapshot in 26.109µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348508Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348509Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348512Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 491
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348511Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 504 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348520Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348521Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 503 for workflow object_snapshot in 19.757µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348524Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 505 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348528Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 509 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348529Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 492
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348530Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348530Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 507 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348530Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 501 for workflow object_snapshot in 32.911µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348535Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348535Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 504 for workflow object_snapshot in 20.949µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348537Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 508 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348538Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348540Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 505 for workflow object_snapshot in 14.206µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348544Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 506 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348546Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348544Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 509 for workflow object_snapshot in 14.567µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348547Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 494
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348549Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 507 for workflow object_snapshot in 17.353µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348553Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348555Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 510 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348562Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 512 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348562Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 508 for workflow object_snapshot in 21.871µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348564Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 496
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348565Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 506 for workflow object_snapshot in 18.775µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348569Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 511 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348570Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348572Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348576Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348578Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 513 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348581Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 497
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348585Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348586Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 510 for workflow object_snapshot in 27.462µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348588Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 511 for workflow object_snapshot in 16.791µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348590Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 512 for workflow object_snapshot in 25.538µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348599Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 499
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348598Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 513 for workflow object_snapshot in 18.525µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348605Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 514 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348613Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 515 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348615Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348617Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 500
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348624Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348626Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 517 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348631Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348630Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 514 for workflow object_snapshot in 21.891µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348634Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 501
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348641Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 515 for workflow object_snapshot in 23.925µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348647Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 517 for workflow object_snapshot in 18.976µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348650Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 516 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348651Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 504
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348656Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 518 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348658Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 519 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348658Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 520 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348660Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348665Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348666Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 521 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348668Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348667Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348672Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 505
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348673Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348673Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 516 for workflow object_snapshot in 21.32µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348678Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 518 for workflow object_snapshot in 19.276µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348680Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 519 for workflow object_snapshot in 19.185µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348680Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 520 for workflow object_snapshot in 19.035µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348681Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 523 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348685Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 521 for workflow object_snapshot in 17.102µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348689Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 522 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348689Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 506
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348698Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348705Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 510
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348706Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 522 for workflow object_snapshot in 14.988µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348713Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 524 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348712Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348714Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 526 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348716Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 511
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348717Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348718Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 527 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348719Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348723Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348724Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 524 for workflow object_snapshot in 10.41µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348730Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 523 for workflow object_snapshot in 47.188µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348730Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 528 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348732Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 527 for workflow object_snapshot in 12.012µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348732Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 512
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348732Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 525 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348733Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 526 for workflow object_snapshot in 17.893µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348741Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348748Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 513
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348757Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 525 for workflow object_snapshot in 22.262µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348763Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 514
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348771Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348779Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 515
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348783Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 528 for workflow object_snapshot in 50.615µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348791Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 516
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348802Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 518
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348813Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 519
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348824Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 520
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348835Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 521
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348846Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 522
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348857Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 523
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348867Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 525
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348878Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 528
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.348888Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 529
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.450075Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 529, pruning watermark: 529, new updates: 0
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.550926Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 529, pruning watermark: 529, new updates: 200
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551007Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 533 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551022Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551046Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 533 for workflow object_snapshot in 32.49µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551102Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 549 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551125Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551144Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 549 for workflow object_snapshot in 36.117µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551155Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 534 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551166Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551179Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 534 for workflow object_snapshot in 21.12µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551186Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 535 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551198Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551214Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 535 for workflow object_snapshot in 26.199µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551233Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 536 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551247Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551265Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 536 for workflow object_snapshot in 29.926µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551274Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 529 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551283Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 537 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551293Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551294Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551306Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 537 for workflow object_snapshot in 19.567µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551305Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 529 for workflow object_snapshot in 29.615µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551326Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 530 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551334Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551346Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 530 for workflow object_snapshot in 18.425µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551353Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 531 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551359Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551370Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 531 for workflow object_snapshot in 15.018µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551370Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 538 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551387Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 532 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551387Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551390Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 544 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551394Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551404Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551404Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 538 for workflow object_snapshot in 31.86µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551405Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 532 for workflow object_snapshot in 16.06µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551423Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 544 for workflow object_snapshot in 28.574µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551428Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 548 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551429Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 539 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551426Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 547 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551436Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551443Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551445Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 539 for workflow object_snapshot in 14.718µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551445Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551449Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 540 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551469Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551473Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 548 for workflow object_snapshot in 43.411µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551478Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 540 for workflow object_snapshot in 27.19µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551483Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 541 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551483Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 542 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551483Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 547 for workflow object_snapshot in 52.078µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551488Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551486Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 545 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551492Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 530
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551493Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551503Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 541 for workflow object_snapshot in 19.176µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551506Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 542 for workflow object_snapshot in 20.278µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551507Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 543 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551513Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551513Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551516Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 546 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551523Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 543 for workflow object_snapshot in 13.996µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551527Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551532Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 556 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551533Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 545 for workflow object_snapshot in 42.8µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551537Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551537Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 531
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551534Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 552 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551541Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 560 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551545Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 556 for workflow object_snapshot in 11.632µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551545Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 546 for workflow object_snapshot in 25.377µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551549Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551545Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 554 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551549Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551553Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 532
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551560Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 560 for workflow object_snapshot in 17.022µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551565Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 539
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551565Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 555 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551566Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 557 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551568Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 552 for workflow object_snapshot in 28.263µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551569Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551571Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551572Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551573Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 553 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551577Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 540
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551580Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 555 for workflow object_snapshot in 13.556µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551582Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 557 for workflow object_snapshot in 14.046µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551588Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 558 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551589Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 541
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551588Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551590Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 550 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551592Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 554 for workflow object_snapshot in 41.497µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551594Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551592Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 559 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551598Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 551 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551599Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551601Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 542
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551602Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 568 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551602Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 558 for workflow object_snapshot in 11.993µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551604Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551608Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 573 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551609Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551608Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 553 for workflow object_snapshot in 32.541µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551613Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 543
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551614Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551613Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 551 for workflow object_snapshot in 13.575µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551614Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 550 for workflow object_snapshot in 22.102µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551616Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 566 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551617Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551623Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 568 for workflow object_snapshot in 19.617µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551624Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 573 for workflow object_snapshot in 14.968µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551624Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 545
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551625Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 565 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551631Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551631Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 562 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551632Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 569 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551633Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551637Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551638Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 546
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551640Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551646Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 562 for workflow object_snapshot in 12.714µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551610Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 564 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551650Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 569 for workflow object_snapshot in 16.701µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551649Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 565 for workflow object_snapshot in 21.981µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551651Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 550
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551654Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 561 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551652Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 559 for workflow object_snapshot in 53.911µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551651Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 563 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551654Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 566 for workflow object_snapshot in 35.837µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551659Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 570 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551659Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551659Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551663Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 567 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551665Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551658Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 581 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551669Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 561 for workflow object_snapshot in 13.666µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551671Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551674Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 570 for workflow object_snapshot in 13.485µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551674Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 571 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551676Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 564 for workflow object_snapshot in 28.032µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551677Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 577 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551678Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 582 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551679Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 575 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551682Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551682Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 572 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551682Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551688Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551689Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551690Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 567 for workflow object_snapshot in 25.598µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551691Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 579 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551692Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 580 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551693Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551696Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 576 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551695Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 571 for workflow object_snapshot in 18.725µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551697Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 572 for workflow object_snapshot in 12.403µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551697Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 589 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551697Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551697Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551700Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 585 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551701Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551703Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551703Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 587 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551704Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551700Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 574 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551707Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551707Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 577 for workflow object_snapshot in 27.622µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551709Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551714Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 589 for workflow object_snapshot in 15.218µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551715Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551716Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 588 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551715Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 581 for workflow object_snapshot in 47.138µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551717Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 580 for workflow object_snapshot in 22.402µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551718Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 575 for workflow object_snapshot in 36.829µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551719Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 582 for workflow object_snapshot in 37.781µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551720Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 592 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551719Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 563 for workflow object_snapshot in 62.216µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551720Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 587 for workflow object_snapshot in 15.338µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551720Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551721Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 585 for workflow object_snapshot in 19.116µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551722Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 576 for workflow object_snapshot in 24.105µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551722Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 586 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551724Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551725Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551727Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 590 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551733Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551733Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 574 for workflow object_snapshot in 27.001µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551734Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 594 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551735Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 592 for workflow object_snapshot in 14.056µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551735Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551738Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 591 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551741Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 588 for workflow object_snapshot in 23.303µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551741Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 579 for workflow object_snapshot in 47.739µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551744Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 593 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551743Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551745Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551746Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 578 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551749Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551749Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 590 for workflow object_snapshot in 19.136µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551749Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 583 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551750Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 584 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551754Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 591 for workflow object_snapshot in 14.498µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551755Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551756Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 595 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551758Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 593 for workflow object_snapshot in 12.614µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551758Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551759Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551760Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 594 for workflow object_snapshot in 23.534µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551765Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551767Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 578 for workflow object_snapshot in 18.274µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551768Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 597 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551768Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 586 for workflow object_snapshot in 41.828µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551763Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 596 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551773Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 584 for workflow object_snapshot in 21.019µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551772Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 583 for workflow object_snapshot in 20.709µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551774Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 598 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551776Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 599 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551779Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551779Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551779Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 595 for workflow object_snapshot in 20.088µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551781Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 600 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551785Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551786Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 601 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551787Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 559
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551788Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 598 for workflow object_snapshot in 12.283µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551790Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551792Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 597 for workflow object_snapshot in 22.412µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551795Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 602 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551795Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551797Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551800Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551801Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 603 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551803Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 604 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551803Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 600 for workflow object_snapshot in 19.486µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551804Z  INFO sui_data_ingestion_core::worker_pool: finished checkpoint processing 596 for workflow object_snapshot in 32.24µs
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551808Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551812Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 606 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551814Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551819Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551822Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 607 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551823Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 608 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551824Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 561
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551811Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 605 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551829Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551830Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551835Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 609 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551839Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 563
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551838Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551844Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551851Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 611 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551853Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 612 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551853Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 610 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551855Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 613 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551858Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551859Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551860Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 615 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551861Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551862Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551862Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 616 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551866Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551867Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 617 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551868Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551868Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 618 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551869Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 614 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551874Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551874Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551874Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 619 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551875Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551877Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 620 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551882Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551885Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 621 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551886Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551891Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 574
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551892Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 623 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551895Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 622 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551899Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551898Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 624 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551901Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551900Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551905Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551910Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 625 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551916Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551916Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 626 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551919Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 578
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551926Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551928Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 628 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551928Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 627 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551934Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 583
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551934Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551933Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 629 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551936Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551940Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 630 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551943Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551944Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 631 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551947Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 584
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551947Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 632 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551950Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551951Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551953Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 633 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551955Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551958Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551965Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 634 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551970Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 595
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551973Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551976Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 635 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551981Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 636 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551982Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551982Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 637 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551989Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551990Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551995Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 639 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551995Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 641 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551997Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 638 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.551999Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 648 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552002Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552005Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552006Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552005Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 596
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552005Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 644 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552006Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552010Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 640 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552011Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 642 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552014Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552016Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552016Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552018Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 645 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552019Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 643 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552022Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 649 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552023Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552026Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 650 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552026Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552026Z  INFO sui_data_ingestion_core::reader: cleaning processed files, watermark is 599
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552027Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 651 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552027Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 652 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552030Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 647 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552031Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552031Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 646 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552032Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552034Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552037Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552038Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552040Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552049Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 653 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552052Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 654 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552053Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 656 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552053Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 655 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552057Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552058Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552059Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552060Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552073Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 658 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552073Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 657 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552078Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552080Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552084Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 659 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552091Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552100Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 661 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552102Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 660 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552106Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552109Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552125Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 662 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552132Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552132Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 666 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552139Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552143Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 664 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552144Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 663 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552148Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552149Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 665 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552150Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 669 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552154Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552155Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552164Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552164Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 667 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552166Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 671 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552167Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 670 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552167Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 668 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552169Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552170Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552171Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552172Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552181Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 673 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552182Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 672 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552185Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552186Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 674 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552187Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552191Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552195Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 675 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552199Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552199Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 676 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552202Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552207Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 677 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552212Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552215Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 678 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552220Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552223Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 680 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552225Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 679 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552227Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552231Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552235Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 682 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552237Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 681 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552240Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552242Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552247Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 683 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552248Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 684 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552252Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552254Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552255Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 685 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552257Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552261Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 686 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552265Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552267Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 687 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552270Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552278Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 689 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552280Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 688 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552282Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552285Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552294Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 691 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552295Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 690 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552296Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552298Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552302Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 692 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552304Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552310Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 693 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552313Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552324Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 694 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552328Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552335Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 695 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552339Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552347Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 697 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552353Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552354Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 696 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552358Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 698 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552361Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552363Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552370Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 699 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552372Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552375Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 700 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552379Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 701 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552382Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552383Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552384Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 702 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552387Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552389Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 703 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552389Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 705 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552391Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552392Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 704 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552394Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552394Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552412Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 706 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552412Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 709 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552416Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552418Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552425Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 707 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552426Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 710 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552427Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 708 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552428Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 712 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552431Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552431Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552431Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552437Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 711 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552439Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552442Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552444Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 713 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552449Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 714 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552449Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 715 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552452Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552452Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552461Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552486Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 718 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552494Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552494Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 716 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552496Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 721 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552499Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 717 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552502Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552502Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 722 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552504Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552506Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552507Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552508Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 719 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552510Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 724 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552510Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 723 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552511Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552512Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552515Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552518Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 720 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552520Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 726 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552521Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 725 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552525Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 727 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552524Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552525Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552525Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552527Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552537Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 728 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.552539Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653388Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 729, pruning watermark: 599, new updates: 41
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653508Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 740 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653519Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 742 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653522Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653521Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 734 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653526Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653534Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653537Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 735 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653540Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 741 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653541Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653546Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653549Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 729 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653550Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 736 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653554Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653555Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653559Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 743 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653559Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 745 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653562Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 730 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653565Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653567Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653569Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 746 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653572Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 731 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653572Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 737 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653572Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 744 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653573Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653575Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653577Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653578Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653581Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653582Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 732 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653585Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653589Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 747 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653592Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 733 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653592Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 738 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653593Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 739 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653593Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 748 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653594Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653597Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653599Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653599Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653598Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 751 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653599Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653605Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653609Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 750 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653612Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 753 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653613Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 752 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653615Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653608Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 749 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653619Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 754 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653619Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653621Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653624Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653627Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653648Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 759 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653650Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 755 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653648Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 756 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653653Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 757 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653656Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653659Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653661Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653662Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653666Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 758 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653672Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653671Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 763 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653672Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 761 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653677Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653678Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653678Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 760 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653683Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653684Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 762 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653688Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 764 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653690Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653692Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 765 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653692Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 766 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653693Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653697Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653699Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653711Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 767 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653713Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 769 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653716Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653717Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 768 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653721Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.653722Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.753697Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 770, pruning watermark: 599, new updates: 0
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.855439Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 770, pruning watermark: 599, new updates: 0
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956261Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 770, pruning watermark: 599, new updates: 200
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956338Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 772 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956349Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956370Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 770 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956378Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956374Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 777 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956388Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956389Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 771 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956394Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956406Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 774 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956410Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 775 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956412Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956412Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 782 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956417Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956420Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 773 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956425Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956425Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956432Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 776 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956437Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956437Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 783 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956443Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956441Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 785 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956448Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 778 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956452Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956465Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956471Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 780 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956470Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 784 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956474Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 786 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956476Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956473Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 788 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956479Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 781 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956480Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956484Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956483Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956486Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956487Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 779 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956495Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956496Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 789 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956502Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956503Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 791 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956505Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 790 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956504Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 787 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956508Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956510Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956510Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 792 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956519Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956521Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 794 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956523Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 795 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956523Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 793 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956526Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956529Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956532Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956536Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 797 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956536Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 798 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956537Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956538Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 796 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956544Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956548Z  INFO sui_data_ingestion_core::worker_pool: received checkpoint for processing 799 for workflow object_snapshot
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956549Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956553Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:35.956554Z  INFO sui_indexer::handlers::checkpoint_handler: Resolving Move struct layouts for struct tags of size 1.
+Sep 12 13:41:36 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:36.057196Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 970, pruning watermark: 599, new updates: 5
+Sep 12 13:41:36 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:36.158435Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 975, pruning watermark: 599, new updates: 27
+Sep 12 13:41:36 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:36.259421Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 1002, pruning watermark: 599, new updates: 58
+Sep 12 13:41:36 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:36.360395Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 1060, pruning watermark: 599, new updates: 151
+Sep 12 13:41:36 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:36.460846Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 1211, pruning watermark: 599, new updates: 49
+Sep 12 13:41:36 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:36.562153Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 1260, pruning watermark: 599, new updates: 113
+Sep 12 13:41:36 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:36.663250Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 1373, pruning watermark: 599, new updates: 96
+Sep 12 13:41:36 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:36.763647Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 1469, pruning watermark: 599, new updates: 107
+Sep 12 13:41:36 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:36.865045Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 1576, pruning watermark: 599, new updates: 67
+Sep 12 13:41:36 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:36.966365Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 1643, pruning watermark: 599, new updates: 101
+Sep 12 13:41:37 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:37.066983Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 1744, pruning watermark: 599, new updates: 144
+Sep 12 13:41:37 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:37.168314Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 1888, pruning watermark: 599, new updates: 102
+Sep 12 13:41:37 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:37.269400Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 1990, pruning watermark: 599, new updates: 157
+Sep 12 13:41:37 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:37.370348Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 2147, pruning watermark: 599, new updates: 76
+Sep 12 13:41:37 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:37.471198Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 2223, pruning watermark: 599, new updates: 0
+Sep 12 13:41:37 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:37.572193Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 2223, pruning watermark: 599, new updates: 0
+Sep 12 13:41:37 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:37.673099Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 2223, pruning watermark: 599, new updates: 200
+Sep 12 13:41:37 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:37.774117Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 2423, pruning watermark: 599, new updates: 0
+Sep 12 13:41:37 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:37.875434Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 2423, pruning watermark: 599, new updates: 4
+Sep 12 13:41:37 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:37.976574Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 2427, pruning watermark: 599, new updates: 196
+Sep 12 13:41:38 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:38.077568Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 2623, pruning watermark: 599, new updates: 61
+Sep 12 13:41:38 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:38.179251Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 2684, pruning watermark: 599, new updates: 145
+Sep 12 13:41:38 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:38.280416Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 2829, pruning watermark: 599, new updates: 47
+Sep 12 13:41:38 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:38.380641Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 2876, pruning watermark: 599, new updates: 153
+Sep 12 13:41:38 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:38.482202Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 3029, pruning watermark: 599, new updates: 90
+Sep 12 13:41:38 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:38.583082Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 3119, pruning watermark: 599, new updates: 117
+Sep 12 13:41:38 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:38.683784Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 3236, pruning watermark: 599, new updates: 111
+Sep 12 13:41:38 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:38.784885Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 3347, pruning watermark: 599, new updates: 109
+Sep 12 13:41:38 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:38.885824Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 3456, pruning watermark: 599, new updates: 125
+Sep 12 13:41:38 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:38.986659Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 3581, pruning watermark: 599, new updates: 112
+Sep 12 13:41:39 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:39.088532Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 3693, pruning watermark: 599, new updates: 17
+Sep 12 13:41:39 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:39.190056Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 3710, pruning watermark: 599, new updates: 153
+Sep 12 13:41:39 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:39.290694Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 3863, pruning watermark: 599, new updates: 30
+Sep 12 13:41:39 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:39.391676Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 3893, pruning watermark: 599, new updates: 105
+Sep 12 13:41:39 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:39.493002Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 3998, pruning watermark: 599, new updates: 85
+Sep 12 13:41:39 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:39.593916Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 4083, pruning watermark: 599, new updates: 6
+Sep 12 13:41:39 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:39.695469Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 4089, pruning watermark: 599, new updates: 200
+Sep 12 13:41:39 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:39.796750Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 4289, pruning watermark: 599, new updates: 5
+Sep 12 13:41:39 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:39.897853Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 4294, pruning watermark: 599, new updates: 119
+Sep 12 13:41:39 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:39.999029Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 4413, pruning watermark: 599, new updates: 81
+Sep 12 13:41:40 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:40.099742Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 4494, pruning watermark: 599, new updates: 24
+Sep 12 13:41:40 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:40.200601Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 4518, pruning watermark: 599, new updates: 97
+Sep 12 13:41:40 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:40.301651Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 4615, pruning watermark: 599, new updates: 105
+Sep 12 13:41:40 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:40.403040Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 4720, pruning watermark: 599, new updates: 41
+Sep 12 13:41:40 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:40.504238Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 4761, pruning watermark: 599, new updates: 87
+Sep 12 13:41:40 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:40.605122Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 4848, pruning watermark: 599, new updates: 105
+Sep 12 13:41:40 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:40.706105Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 4953, pruning watermark: 599, new updates: 97
+Sep 12 13:41:40 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:40.806745Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 5050, pruning watermark: 599, new updates: 103
+Sep 12 13:41:40 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:40.908475Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 5153, pruning watermark: 599, new updates: 167
+Sep 12 13:41:41 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:41.009712Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 5320, pruning watermark: 599, new updates: 143
+Sep 12 13:41:41 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:41.110733Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 5463, pruning watermark: 599, new updates: 9
+Sep 12 13:41:41 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:41.212271Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 5472, pruning watermark: 599, new updates: 99
+Sep 12 13:41:41 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:41.312672Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 5571, pruning watermark: 599, new updates: 108
+Sep 12 13:41:41 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:41.413576Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 5679, pruning watermark: 599, new updates: 97
+Sep 12 13:41:41 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:41.515013Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 5776, pruning watermark: 599, new updates: 154
+Sep 12 13:41:41 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:41.615557Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 5930, pruning watermark: 599, new updates: 81
+Sep 12 13:41:41 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:41.716553Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 6011, pruning watermark: 599, new updates: 0
+Sep 12 13:41:41 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:41.818476Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 6011, pruning watermark: 599, new updates: 0
+Sep 12 13:41:41 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:41.919158Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 6011, pruning watermark: 599, new updates: 200
+Sep 12 13:41:42 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:42.020096Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 6211, pruning watermark: 599, new updates: 0
+Sep 12 13:41:42 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:42.120827Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 6211, pruning watermark: 599, new updates: 12
+Sep 12 13:41:42 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:42.222418Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 6223, pruning watermark: 599, new updates: 5
+Sep 12 13:41:42 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:42.323390Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 6228, pruning watermark: 599, new updates: 200
+Sep 12 13:41:42 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:42.423655Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 6428, pruning watermark: 599, new updates: 3
+Sep 12 13:41:42 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:42.524797Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 6431, pruning watermark: 599, new updates: 199
+Sep 12 13:41:42 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:42.626339Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 6630, pruning watermark: 599, new updates: 129
+Sep 12 13:41:42 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:42.727408Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 6759, pruning watermark: 599, new updates: 78
+Sep 12 13:41:42 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:42.827955Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 6837, pruning watermark: 599, new updates: 196
+Sep 12 13:41:42 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:42.928570Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 7033, pruning watermark: 599, new updates: 35
+Sep 12 13:41:43 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:43.030548Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 7068, pruning watermark: 599, new updates: 138
+Sep 12 13:41:43 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:43.131741Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 7206, pruning watermark: 599, new updates: 70
+Sep 12 13:41:43 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:43.233546Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 7276, pruning watermark: 599, new updates: 187
+Sep 12 13:41:43 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:43.334627Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 7463, pruning watermark: 599, new updates: 44
+Sep 12 13:41:43 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:43.435798Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 7507, pruning watermark: 599, new updates: 172
+Sep 12 13:41:43 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:43.536713Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 7679, pruning watermark: 599, new updates: 114
+Sep 12 13:41:43 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:43.638263Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 7793, pruning watermark: 599, new updates: 0
+Sep 12 13:41:43 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:43.739308Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 7793, pruning watermark: 599, new updates: 187
+Sep 12 13:41:43 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:43.840115Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 7980, pruning watermark: 599, new updates: 19
+Sep 12 13:41:43 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:43.940624Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 7999, pruning watermark: 599, new updates: 196
+Sep 12 13:41:44 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:44.041719Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 8195, pruning watermark: 599, new updates: 52
+Sep 12 13:41:44 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:44.143439Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 8247, pruning watermark: 599, new updates: 0
+Sep 12 13:41:44 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:44.243737Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 8247, pruning watermark: 599, new updates: 200
+Sep 12 13:41:44 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:44.344942Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 8447, pruning watermark: 599, new updates: 43
+Sep 12 13:41:44 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:44.446489Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 8490, pruning watermark: 599, new updates: 174
+Sep 12 13:41:44 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:44.548310Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 8664, pruning watermark: 599, new updates: 128
+Sep 12 13:41:44 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:44.649491Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 8792, pruning watermark: 599, new updates: 99
+Sep 12 13:41:44 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:44.751218Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 8891, pruning watermark: 599, new updates: 0
+Sep 12 13:41:44 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:44.851795Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 8891, pruning watermark: 599, new updates: 200
+Sep 12 13:41:44 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:44.952652Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 9091, pruning watermark: 599, new updates: 81
+Sep 12 13:41:45 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:45.053748Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 9172, pruning watermark: 599, new updates: 124
+Sep 12 13:41:45 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:45.154759Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 9296, pruning watermark: 599, new updates: 197
+Sep 12 13:41:45 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:45.256047Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 9493, pruning watermark: 599, new updates: 9
+Sep 12 13:41:45 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:45.357619Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 9502, pruning watermark: 599, new updates: 200
+Sep 12 13:41:45 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:45.459008Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 9702, pruning watermark: 599, new updates: 51
+Sep 12 13:41:45 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:45.560018Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 9753, pruning watermark: 599, new updates: 58
+Sep 12 13:41:45 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:45.660802Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 9811, pruning watermark: 599, new updates: 0
+Sep 12 13:41:45 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:45.762231Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 9811, pruning watermark: 599, new updates: 200
+Sep 12 13:41:45 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:45.863395Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10011, pruning watermark: 599, new updates: 200
+Sep 12 13:41:45 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:45.964099Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10211, pruning watermark: 599, new updates: 6
+Sep 12 13:41:46 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:46.065603Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10217, pruning watermark: 599, new updates: 194
+Sep 12 13:41:46 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:46.166559Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10411, pruning watermark: 599, new updates: 6
+Sep 12 13:41:46 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:46.268530Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10417, pruning watermark: 599, new updates: 182
+Sep 12 13:41:46 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:46.369671Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:46 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:46.471295Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:46 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:46.571776Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:46 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:46.672772Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:46 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:46.774179Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:46 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:46.875549Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:46 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:46.976964Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:47 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:47.078264Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:47 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:47.179675Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:47 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:47.281069Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:47 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:47.382484Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:47 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:47.482823Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:47 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:47.584212Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:47 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:47.685607Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:47 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:47.786922Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:47 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:47.888305Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:47 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:47.988563Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:48 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:48.089964Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:48 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:48.191304Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:48 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:48.292690Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:48 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:48.394101Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:48 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:48.495494Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:48 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:48.595894Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:48 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:48.697302Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:48 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:48.798542Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:48 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:48.899959Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:49 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:49.001344Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:49 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:49.101752Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:49 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:49.203061Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:49 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:49.304474Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:49 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:49.404862Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:49 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:49.506088Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:49 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:49.607439Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:49 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:49.707677Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:49 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:49.809079Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:49 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:49.910511Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:50 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:50.011905Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:50 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:50.113322Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:50 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:50.214705Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:50 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:50.316118Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:50 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:50.417512Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:50 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:50.518826Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:50 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:50.620233Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:50 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:50.721598Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:50 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:50.822993Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:50 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:50.924364Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:51 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:51.024748Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:51 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:51.126159Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:51 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:51.227535Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:51 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:51.328936Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:51 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:51.430301Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:51 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:51.531692Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:51 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:51.633068Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:51 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:51.734443Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:51 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:51.834864Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:51 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:51.936249Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:52 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:52.037670Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:52 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:52.139063Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:52 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:52.240489Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:52 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:52.340755Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:52 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:52.442152Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:52 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:52.543580Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:52 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:52.644952Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:52 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:52.746339Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:52 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:52.846616Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:52 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:52.947994Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:53 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:53.049397Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:53 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:53.149765Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:53 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:53.251160Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:53 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:53.352471Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:53 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:53.452874Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:53 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:53.554269Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:53 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:53.655647Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:53 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:53.757064Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:53 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:53.858305Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:53 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:53.958719Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:54 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:54.060108Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:54 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:54.161511Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:54 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:54.262941Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:54 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:54.364335Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:54 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:54.465562Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:54 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:54.566770Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:54 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:54.668078Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:54 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:54.769392Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:54 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:54.869796Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:54 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:54.971141Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:55 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:55.072533Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:55 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:55.173955Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:55 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:55.275345Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:55 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:55.375756Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:55 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:55.477190Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:55 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:55.578590Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:55 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:55.679998Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:55 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:55.781363Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:55 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:55.881755Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:55 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:55.983148Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:56 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:56.084487Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:56 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:56.184922Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:56 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:56.286318Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:56 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:56.386748Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:56 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:56.488138Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:56 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:56.589550Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:56 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:56.690931Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:56 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:56.792310Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:56 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:56.892716Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:56 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:56.994014Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:57 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:57.095408Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:57 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:57.195793Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:57 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:57.297201Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:57 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:57.398606Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:57 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:57.499941Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:57 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:57.601513Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:57 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:57.702874Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:57 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:57.804272Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:57 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:57.905679Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:58 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:58.007077Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:58 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:58.108501Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:58 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:58.208802Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:58 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:58.310227Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:58 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:58.411614Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:58 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:58.513017Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:58 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:58.614433Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:58 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:58.714805Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:58 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:58.816297Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:58 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:58.917661Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:59 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:59.019071Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:59 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:59.120481Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:59 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:59.220797Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:59 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:59.322225Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:59 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:59.423614Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:59 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:59.524819Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:59 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:59.625982Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:59 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:59.727364Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:59 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:59.828545Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:41:59 sui-mainnet-node cargo[3520474]: 2024-09-12T11:41:59.929943Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:00 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:00.031365Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:00 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:00.131749Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:00 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:00.233162Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:00 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:00.334551Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:00 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:00.435951Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:00 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:00.537380Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:00 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:00.637755Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:00 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:00.739147Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:00 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:00.840508Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:00 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:00.941905Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:01 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:01.043301Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:01 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:01.144698Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:01 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:01.246122Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:01 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:01.347503Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:01 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:01.447916Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:01 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:01.549306Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:01 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:01.650596Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:01 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:01.752002Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:01 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:01.853371Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:01 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:01.953777Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:02 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:02.055161Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:02 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:02.156569Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:02 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:02.257964Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:02 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:02.359363Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:02 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:02.459789Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:02 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:02.561091Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:02 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:02.662488Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:02 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:02.762852Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:02 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:02.864232Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:02 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:02.965583Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:03 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:03.066970Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:03 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:03.168391Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:03 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:03.268777Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:03 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:03.370100Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:03 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:03.471491Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:03 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:03.571813Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:03 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:03.673133Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:03 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:03.774519Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:03 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:03.875844Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:03 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:03.977144Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:04 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:04.078480Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:04 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:04.178877Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:04 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:04.280274Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:04 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:04.381615Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:04 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:04.482915Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:04 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:04.584226Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:04 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:04.685681Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:04 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:04.787084Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:04 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:04.888349Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:04 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:04.988744Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:05 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:05.090164Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:05 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:05.191554Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:05 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:05.292962Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:05 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:05.394355Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:05 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:05.494757Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:05 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:05.596183Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:05 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:05.697564Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:05 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:05.799137Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:05 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:05.900547Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:06 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:06.001741Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:06 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:06.103175Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:06 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:06.204575Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:06 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:06.306096Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:06 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:06.407136Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:06 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:06.508044Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:06 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:06.609344Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:06 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:06.709746Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:06 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:06.811178Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:06 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:06.912566Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:07 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:07.013820Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:07 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:07.115130Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:07 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:07.216471Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:07 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:07.316733Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:07 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:07.418129Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:07 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:07.519555Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:07 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:07.620923Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:07 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:07.722311Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:07 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:07.823680Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:07 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:07.925059Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:08 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:08.026499Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:08 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:08.126895Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:08 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:08.228314Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:08 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:08.329700Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:08 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:08.431105Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:08 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:08.532371Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:08 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:08.632660Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:08 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:08.734057Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:08 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:08.834857Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:08 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:08.936278Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:09 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:09.037669Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:09 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:09.139073Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:09 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:09.240421Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:09 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:09.340813Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:09 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:09.442144Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:09 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:09.543426Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:09 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:09.643836Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:09 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:09.745059Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:09 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:09.846480Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:09 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:09.946907Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:10 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:10.048304Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:10 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:10.148720Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:10 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:10.250104Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:10 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:10.351432Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:10 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:10.452715Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:10 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:10.554108Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:10 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:10.655532Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:10 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:10.756916Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:10 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:10.858327Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:10 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:10.958674Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:11 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:11.060000Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:11 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:11.161426Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:11 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:11.261819Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:11 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:11.363237Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:11 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:11.464622Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:11 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:11.566029Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:11 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:11.667426Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:11 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:11.767823Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:11 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:11.869247Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:11 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:11.970609Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:12 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:12.072031Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:12 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:12.173333Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:12 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:12.273736Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:12 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:12.375165Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:12 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:12.476559Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:12 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:12.577876Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:12 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:12.679236Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:12 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:12.780643Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:12 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:12.882039Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:12 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:12.983352Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:13 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:13.083785Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:13 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:13.185106Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:13 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:13.286520Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:13 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:13.387909Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:13 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:13.489312Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:13 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:13.589654Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:13 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:13.691050Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:13 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:13.792028Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:13 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:13.893393Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:13 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:13.993961Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:14 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:14.095350Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:14 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:14.195755Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:14 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:14.297188Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:14 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:14.398579Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:14 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:14.499995Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:14 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:14.601380Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:14 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:14.701778Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:14 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:14.803022Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:14 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:14.904426Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:15 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:15.004690Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:15 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:15.106080Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:15 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:15.207498Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:15 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:15.307887Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:15 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:15.409204Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:15 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:15.510634Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:15 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:15.611924Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:15 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:15.713319Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:15 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:15.814678Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:15 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:15.915976Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:16 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:16.017360Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:16 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:16.117759Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:16 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:16.219186Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:16 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:16.320576Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:16 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:16.421906Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:16 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:16.523193Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:16 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:16.624569Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:16 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:16.725976Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:16 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:16.827259Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:16 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:16.928658Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:17 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:17.030038Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:17 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:17.131452Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:17 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:17.231859Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:17 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:17.333259Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:17 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:17.434686Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:17 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:17.535988Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:17 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:17.637386Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:17 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:17.737749Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:17 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:17.839132Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:17 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:17.940377Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:18 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:18.040765Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:18 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:18.142187Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:18 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:18.243574Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:18 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:18.344985Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:18 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:18.446375Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:18 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:18.546777Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:18 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:18.648010Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:18 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:18.749290Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:18 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:18.849791Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:18 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:18.951150Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:19 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:19.052504Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:19 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:19.153907Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:19 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:19.255131Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:19 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:19.356555Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:19 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:19.457943Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:19 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:19.559356Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:19 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:19.659723Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:19 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:19.761101Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:19 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:19.862336Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:19 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:19.963665Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:20 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:20.065083Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:20 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:20.166388Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:20 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:20.266800Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:20 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:20.368192Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:20 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:20.469590Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:20 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:20.571015Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:20 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:20.672399Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:20 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:20.772814Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:20 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:20.874202Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:20 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:20.975609Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:21 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:21.077041Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:21 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:21.178434Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:21 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:21.278860Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:21 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:21.380246Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:21 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:21.481585Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:21 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:21.582977Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:21 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:21.684371Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:21 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:21.784799Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:21 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:21.886190Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:21 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:21.987531Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:22 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:22.088916Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:22 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:22.190390Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:22 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:22.290786Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:22 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:22.392184Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:22 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:22.493598Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:22 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:22.594983Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:22 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:22.696389Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:22 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:22.796776Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:22 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:22.898178Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:22 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:22.999609Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:23 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:23.101000Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:23 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:23.202420Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:23 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:23.302802Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:23 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:23.404210Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:23 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:23.505604Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:23 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:23.607002Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:23 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:23.708405Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:23 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:23.809132Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:23 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:23.910555Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:24 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:24.011945Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:24 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:24.113356Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:24 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:24.213784Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:24 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:24.315179Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:24 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:24.416600Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:24 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:24.517984Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:24 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:24.619394Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:24 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:24.720613Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:24 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:24.822013Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:24 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:24.923255Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:25 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:25.024566Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:25 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:25.125832Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:25 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:25.227131Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:25 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:25.328537Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:25 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:25.429967Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:25 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:25.531362Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:25 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:25.631783Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:25 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:25.733167Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:25 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:25.834579Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:25 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:25.935971Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:26 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:26.037292Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:26 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:26.137723Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:26 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:26.239021Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:26 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:26.340437Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:26 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:26.440837Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:26 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:26.542244Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:26 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:26.643641Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:26 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:26.745035Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:26 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:26.846471Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:26 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:26.946860Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:27 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:27.048274Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:27 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:27.149680Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:27 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:27.251084Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:27 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:27.352514Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:27 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:27.453905Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:27 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:27.555323Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:27 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:27.656708Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:27 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:27.758118Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:27 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:27.859514Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:27 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:27.960911Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:28 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:28.062340Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:28 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:28.162724Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:28 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:28.264137Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:28 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:28.365526Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:28 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:28.466926Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:28 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:28.568354Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:28 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:28.668747Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:28 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:28.770161Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:28 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:28.871630Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:28 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:28.973040Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:29 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:29.074439Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:29 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:29.174848Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:29 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:29.276272Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:29 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:29.377673Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:29 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:29.478999Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:29 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:29.580389Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:29 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:29.680792Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:29 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:29.782048Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:29 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:29.883427Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:29 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:29.983673Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:30 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:30.084901Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:30 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:30.186315Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:30 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:30.287707Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:30 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:30.389271Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:30 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:30.490587Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:30 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:30.591946Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:30 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:30.693245Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:30 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:30.794627Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:30 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:30.896030Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:30 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:30.997475Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:31 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:31.097741Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:31 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:31.199078Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:31 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:31.300483Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:31 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:31.400899Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:31 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:31.502290Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:31 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:31.603627Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:31 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:31.705056Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:31 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:31.806450Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:31 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:31.906885Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:32 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:32.008269Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:32 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:32.109581Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:32 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:32.210893Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:32 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:32.312204Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:32 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:32.413609Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:32 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:32.514908Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:32 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:32.616143Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:32 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:32.717356Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:32 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:32.817759Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:32 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:32.919190Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:33.020559Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:33.121959Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:33.223318Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:33.323699Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:33.425069Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:33.526477Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:33.626899Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:33.728285Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:33.769639Z  INFO sui_indexer::db::setup_postgres: DB connection pool size: 100, with idle conn: 100.
+Sep 12 13:42:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:33.829103Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:33 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:33.930507Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:34.031912Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:34.133340Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:34.233633Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:34.335058Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:34.436438Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:34.536867Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:34.638256Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:34.739572Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:34.840999Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:34 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:34.942391Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:35.043577Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:35.144804Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:35.245850Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:35.347246Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:35.448646Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:35.550041Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:35.651426Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:35.751841Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:35.853232Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:35 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:35.954635Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:36 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:36.055893Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:36 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:36.157285Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:36 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:36.258703Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:36 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:36.360088Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:36 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:36.461496Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:36 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:36.561890Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:36 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:36.663289Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:36 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:36.764665Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:36 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:36.866052Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:36 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:36.967486Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:37 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:37.067688Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:37 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:37.169068Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:37 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:37.270485Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:37 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:37.370853Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:37 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:37.472232Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:37 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:37.573583Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:37 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:37.674967Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:37 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:37.776336Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:37 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:37.876727Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:37 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:37.978155Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:38 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:38.079544Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:38 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:38.180960Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:38 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:38.282346Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:38 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:38.382752Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:38 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:38.484006Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:38 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:38.585403Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:38 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:38.685826Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:38 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:38.787207Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:38 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:38.887851Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:38 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:38.989239Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:39 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:39.090643Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:39 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:39.192070Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:39 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:39.293376Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:39 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:39.393708Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:39 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:39.495092Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:39 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:39.596501Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:39 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:39.696893Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:39 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:39.798290Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:39 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:39.898716Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:40 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:40.000105Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:40 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:40.101329Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:40 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:40.202618Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:40 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:40.303940Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:40 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:40.405374Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:40 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:40.505770Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:40 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:40.607191Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:40 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:40.708578Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:40 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:40.809988Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:40 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:40.911378Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:41 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:41.011782Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:41 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:41.113208Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:41 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:41.214515Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:41 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:41.315931Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:41 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:41.417229Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:41 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:41.518638Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:41 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:41.619903Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:41 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:41.721299Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:41 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:41.821636Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:41 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:41.923022Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:42 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:42.024436Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:42 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:42.124764Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:42 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:42.226170Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:42 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:42.327604Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:42 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:42.428996Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:42 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:42.530328Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:42 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:42.631708Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:42 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:42.733117Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:42 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:42.834510Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:42 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:42.935908Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:43 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:43.037331Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:43 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:43.137720Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:43 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:43.239134Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:43 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:43.340523Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:43 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:43.441927Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:43 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:43.543358Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:43 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:43.643750Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:43 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:43.745171Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:43 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:43.846635Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:43 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:43.948044Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:44 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:44.049438Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:44 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:44.149856Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:44 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:44.251109Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:44 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:44.352499Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:44 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:44.452915Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:44 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:44.554284Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:44 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:44.655697Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:44 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:44.757124Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:44 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:44.858522Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:44 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:44.959746Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:45 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:45.061119Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:45 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:45.162411Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:45 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:45.262639Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:45 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:45.364171Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:45 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:45.465600Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:45 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:45.566994Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:45 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:45.668392Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:45 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:45.768766Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:45 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:45.870088Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:45 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:45.971504Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:46 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:46.071904Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:46 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:46.173335Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:46 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:46.273723Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:46 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:46.375143Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:46 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:46.476531Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:46 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:46.577938Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:46 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:46.679342Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:46 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:46.779713Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:46 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:46.881113Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:46 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:46.982485Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:47 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:47.082896Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:47 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:47.184207Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:47 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:47.285412Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:47 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:47.385819Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:47 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:47.487188Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:47 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:47.588600Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:47 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:47.689968Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:47 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:47.791278Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:47 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:47.892548Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:47 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:47.993946Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:48 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:48.095375Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:48 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:48.195766Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:48 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:48.297181Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:48 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:48.398490Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:48 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:48.498895Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:48 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:48.600327Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:48 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:48.701593Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:48 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:48.803337Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:48 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:48.903719Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:49 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:49.005127Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:49 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:49.106521Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:49 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:49.207924Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:49 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:49.309351Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:49 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:49.409739Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:49 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:49.511153Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:49 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:49.612543Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:49 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:49.713924Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:49 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:49.815356Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:49 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:49.915748Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:50 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:50.017006Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:50 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:50.118321Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:50 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:50.219565Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:50 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:50.320767Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:50 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:50.422164Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:50 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:50.523512Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:50 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:50.624884Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:50 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:50.726289Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:50 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:50.827671Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:50 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:50.929073Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:51 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:51.030507Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:51 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:51.131902Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:51 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:51.233324Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:51 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:51.334705Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:51 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:51.436028Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:51 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:51.537335Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:51 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:51.637715Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:51 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:51.739034Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:51 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:51.840398Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:51 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:51.940790Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:52 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:52.042165Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:52 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:52.143569Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:52 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:52.245004Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:52 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:52.346396Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:52 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:52.446817Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:52 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:52.548115Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:52 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:52.649521Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:52 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:52.750825Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:52 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:52.852222Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:52 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:52.953565Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:53 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:53.054957Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:53 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:53.156374Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:53 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:53.256763Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:53 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:53.358169Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:53 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:53.459566Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:53 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:53.560874Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:53 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:53.662277Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:53 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:53.763666Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:53 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:53.865451Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:53 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:53.965860Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:54 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:54.067267Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:54 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:54.168702Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:54 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:54.269989Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:54 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:54.371311Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:54 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:54.472697Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:54 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:54.574106Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:54 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:54.675492Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:54 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:54.775882Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:54 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:54.877300Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:54 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:54.978602Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:55 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:55.080021Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:55 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:55.181415Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:55 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:55.281685Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:55 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:55.382953Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:55 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:55.484346Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:55 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:55.585578Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:55 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:55.686944Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:55 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:55.788328Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:55 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:55.889608Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:55 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:55.990983Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:56 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:56.092357Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:56 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:56.192744Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:56 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:56.294161Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:56 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:56.395546Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:56 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:56.496949Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:56 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:56.598299Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:56 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:56.699584Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:56 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:56.800928Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:56 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:56.902287Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:57 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:57.003672Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:57 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:57.105059Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:57 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:57.206449Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:57 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:57.306895Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:57 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:57.408284Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:57 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:57.509566Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:57 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:57.610830Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:57 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:57.712201Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:57 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:57.813650Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:57 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:57.915013Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:58 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:58.016398Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:58 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:58.116762Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:58 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:58.218155Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:58 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:58.319523Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:58 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:58.420902Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:58 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:58.522310Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:58 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:58.623678Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:58 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:58.725072Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:58 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:58.826666Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:58 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:58.928070Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:59 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:59.029599Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:59 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:59.130989Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:59 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:59.232411Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:59 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:59.332709Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:59 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:59.434118Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:59 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:59.535505Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:59 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:59.636886Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:59 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:59.738286Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:59 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:59.839663Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:42:59 sui-mainnet-node cargo[3520474]: 2024-09-12T11:42:59.941079Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:00 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:00.042482Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:00 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:00.142888Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:00 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:00.244148Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:00 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:00.345470Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:00 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:00.445737Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:00 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:00.547133Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:00 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:00.648368Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:00 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:00.748740Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:00 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:00.850151Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:00 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:00.951578Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:01 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:01.052970Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:01 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:01.154391Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:01 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:01.254773Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:01 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:01.356179Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:01 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:01.457571Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:01 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:01.558881Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:01 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:01.660285Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:01 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:01.761649Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:01 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:01.863037Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:01 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:01.964401Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:02 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:02.064799Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:02 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:02.166227Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:02 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:02.267622Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:02 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:02.369040Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:02 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:02.470314Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:02 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:02.570723Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:02 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:02.672096Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:02 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:02.773479Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:02 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:02.873880Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:02 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:02.975246Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:03 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:03.076672Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:03 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:03.178059Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:03 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:03.279476Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:03 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:03.380736Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:03 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:03.482045Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:03 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:03.583479Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:03 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:03.683775Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:03 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:03.785179Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:03 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:03.886685Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:03 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:03.988091Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:04 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:04.089570Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:04 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:04.190946Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:04 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:04.292262Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:04 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:04.393653Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:04 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:04.495060Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:04 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:04.596325Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:04 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:04.696614Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:04 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:04.798014Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:04 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:04.899378Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:04 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:04.999698Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:05 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:05.101093Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:05 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:05.202502Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:05 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:05.302931Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:05 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:05.404221Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:05 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:05.505488Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:05 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:05.605881Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:05 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:05.707298Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:05 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:05.808694Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:05 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:05.909922Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:06 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:06.011349Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:06 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:06.111745Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:06 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:06.213167Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:06 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:06.314555Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:06 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:06.415963Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:06 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:06.517381Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:06 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:06.617765Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:06 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:06.719117Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:06 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:06.820504Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:06 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:06.920915Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:07 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:07.022274Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:07 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:07.123601Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:07 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:07.224993Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:07 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:07.326383Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:07 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:07.426805Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:07 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:07.528057Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:07 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:07.629470Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:07 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:07.729840Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:07 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:07.831141Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:07 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:07.932568Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:08 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:08.033872Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:08 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:08.135206Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:08 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:08.236598Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:08 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:08.338005Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:08 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:08.439436Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:08 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:08.539847Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:08 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:08.641250Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:08 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:08.742629Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:08 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:08.844272Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:08 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:08.945679Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:09 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:09.047075Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:09 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:09.148498Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:09 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:09.248886Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:09 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:09.350304Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:09 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:09.451693Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:09 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:09.553099Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:09 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:09.654498Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:09 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:09.754867Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:09 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:09.856263Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:09 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:09.957625Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:10 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:10.059028Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:10 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:10.160423Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:10 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:10.260830Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:10 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:10.362258Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:10 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:10.463664Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:10 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:10.564888Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:10 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:10.666291Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:10 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:10.767616Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:10 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:10.869042Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:10 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:10.970440Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:11 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:11.070878Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:11 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:11.172267Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:11 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:11.273677Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:11 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:11.375066Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:11 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:11.476485Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:11 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:11.576911Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:11 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:11.678287Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:11 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:11.779681Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:11 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:11.880940Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:11 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:11.982324Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:12 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:12.083706Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:12 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:12.185104Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:12 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:12.286527Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:12 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:12.387912Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:12 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:12.489235Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:12 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:12.590541Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:12 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:12.691931Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:12 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:12.793358Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:12 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:12.893653Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:12 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:12.995075Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:13 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:13.096475Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:13 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:13.196885Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:13 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:13.298194Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:13 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:13.399594Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:13 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:13.501023Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:13 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:13.602410Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:13 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:13.702809Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:13 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:13.804183Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:13 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:13.904814Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:14 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:14.006247Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:14 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:14.107649Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:14 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:14.208995Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:14 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:14.310376Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:14 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:14.410790Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:14 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:14.512185Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:14 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:14.613584Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:14 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:14.714992Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:14 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:14.816380Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:14 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:14.916798Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:15 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:15.018186Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:15 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:15.119597Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:15 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:15.221033Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:15 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:15.322433Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:15 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:15.422994Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:15 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:15.524325Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:15 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:15.625548Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:15 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:15.726927Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:15 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:15.828224Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:15 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:15.929670Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:16 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:16.031061Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:16 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:16.132498Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:16 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:16.232802Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:16 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:16.334209Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:16 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:16.435521Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:16 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:16.536923Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:16 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:16.638329Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:16 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:16.739693Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:16 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:16.841101Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:16 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:16.942495Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:17 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:17.042899Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:17 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:17.144333Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:17 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:17.244718Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:17 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:17.346139Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:17 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:17.447524Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:17 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:17.548933Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:17 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:17.650298Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:17 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:17.751674Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:17 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:17.853093Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:17 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:17.954497Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:18 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:18.054721Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:18 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:18.156100Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:18 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:18.257419Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:18 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:18.357850Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:18 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:18.459248Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:18 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:18.560672Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:18 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:18.662045Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:18 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:18.763447Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:18 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:18.863849Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:18 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:18.965247Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:19 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:19.066674Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:19 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:19.167898Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:19 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:19.269231Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:19 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:19.370621Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:19 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:19.471939Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:19 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:19.573370Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:19 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:19.673745Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:19 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:19.775143Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:19 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:19.876504Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:19 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:19.976895Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:20 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:20.078276Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:20 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:20.179681Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:20 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:20.281110Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:20 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:20.382499Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:20 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:20.482919Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:20 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:20.584273Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:20 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:20.685499Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:20 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:20.785814Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:20 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:20.887216Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:20 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:20.988641Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:21 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:21.090029Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:21 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:21.191446Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:21 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:21.291775Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:21 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:21.393178Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:21 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:21.494612Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:21 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:21.596006Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:21 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:21.697324Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:21 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:21.798683Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:21 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:21.900067Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:22 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:22.001435Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:22 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:22.101828Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:22 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:22.203257Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:22 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:22.304649Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:22 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:22.406063Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:22 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:22.507453Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:22 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:22.607872Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:22 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:22.709303Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:22 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:22.810669Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:22 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:22.912093Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:23 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:23.013405Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:23 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:23.113731Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:23 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:23.215124Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:23 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:23.316524Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:23 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:23.417950Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:23 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:23.519345Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:23 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:23.619892Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:23 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:23.721251Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:23 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:23.821802Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:23 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:23.923198Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:24 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:24.024599Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:24 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:24.126026Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:24 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:24.227415Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:24 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:24.327753Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:24 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:24.429146Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:24 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:24.530478Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:24 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:24.630890Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:24 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:24.732261Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:24 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:24.833659Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:24 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:24.935037Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:25 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:25.036447Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:25 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:25.136772Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:25 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:25.238175Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:25 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:25.339604Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:25 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:25.440996Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:25 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:25.542243Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:25 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:25.643619Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:25 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:25.744856Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:25 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:25.846298Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:25 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:25.947628Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:26 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:26.048973Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:26 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:26.150362Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:26 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:26.250776Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:26 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:26.352171Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:26 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:26.453573Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:26 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:26.555005Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:26 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:26.656383Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:26 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:26.756780Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:26 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:26.858143Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:26 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:26.959525Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:27 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:27.060937Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:27 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:27.162224Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:27 sui-mainnet-node cargo[3520474]: 2024-09-12T11:43:27.263624Z  INFO sui_data_ingestion_core::reader: Read from remote. Current checkpoint number: 10599, pruning watermark: 599, new updates: 0
+Sep 12 13:43:27 sui-mainnet-node systemd[1]: Stopping sui-indexer.service - Sui indexer...
+Sep 12 13:43:27 sui-mainnet-node systemd[1]: sui-indexer.service: Deactivated successfully.
+Sep 12 13:43:27 sui-mainnet-node systemd[1]: Stopped sui-indexer.service - Sui indexer.
+Sep 12 13:43:27 sui-mainnet-node systemd[1]: sui-indexer.service: Consumed 3min 55.279s CPU time.
diff --git a/crates/sui-indexer/migrations/mysql/2024-04-24-180249_packages/up.sql b/crates/sui-indexer/migrations/mysql/2024-04-24-180249_packages/up.sql
index f3fe2539038fc..7ee89206f254f 100644
--- a/crates/sui-indexer/migrations/mysql/2024-04-24-180249_packages/up.sql
+++ b/crates/sui-indexer/migrations/mysql/2024-04-24-180249_packages/up.sql
@@ -1,7 +1,14 @@
 CREATE TABLE packages
 (
-    package_id                   blob          NOT NULL,
+    package_id                   BLOB          NOT NULL,
+    original_id                  BLOB          NOT NULL,
+    package_version              BIGINT        NOT NULL,
     -- bcs serialized MovePackage
-    move_package                 MEDIUMBLOB          NOT NULL,
-        CONSTRAINT packages_pk PRIMARY KEY (package_id(255))
+    move_package                 MEDIUMBLOB    NOT NULL,
+    checkpoint_sequence_number   BIGINT        NOT NULL,
+    CONSTRAINT packages_pk PRIMARY KEY (package_id(32), original_id(32), package_version),
+    CONSTRAINT packages_unique_package_id UNIQUE (package_id(32))
 );
+
+CREATE INDEX packages_cp_id_version ON packages (checkpoint_sequence_number, original_id(32), package_version);
+CREATE INDEX packages_id_version_cp ON packages (original_id(32), package_version, checkpoint_sequence_number);
diff --git a/crates/sui-indexer/migrations/mysql/2024-05-05-155158_obj_indices/down.sql b/crates/sui-indexer/migrations/mysql/2024-05-05-155158_obj_indices/down.sql
new file mode 100644
index 0000000000000..7a3a7670f24c2
--- /dev/null
+++ b/crates/sui-indexer/migrations/mysql/2024-05-05-155158_obj_indices/down.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS objects_version;
diff --git a/crates/sui-indexer/migrations/mysql/2024-05-05-155158_obj_indices/up.sql b/crates/sui-indexer/migrations/mysql/2024-05-05-155158_obj_indices/up.sql
new file mode 100644
index 0000000000000..e501b71a073c0
--- /dev/null
+++ b/crates/sui-indexer/migrations/mysql/2024-05-05-155158_obj_indices/up.sql
@@ -0,0 +1,9 @@
+-- The Postgres version of this table is partitioned by the first byte
+-- of object_id, but this kind of partition is not easily supported in
+-- MySQL, so this variant is unpartitioned for now.
+CREATE TABLE objects_version (
+    object_id           BLOB          NOT NULL,
+    object_version      BIGINT        NOT NULL,
+    cp_sequence_number  BIGINT        NOT NULL,
+    PRIMARY KEY (object_id(32), object_version)
+)
diff --git a/crates/sui-indexer/migrations/pg/2023-08-19-044020_events/up.sql b/crates/sui-indexer/migrations/pg/2023-08-19-044020_events/up.sql
index a6c0d70566e7b..14aa6a098161f 100644
--- a/crates/sui-indexer/migrations/pg/2023-08-19-044020_events/up.sql
+++ b/crates/sui-indexer/migrations/pg/2023-08-19-044020_events/up.sql
@@ -1,9 +1,9 @@
+-- TODO: modify queries in indexer reader to take advantage of the new indices
 CREATE TABLE events
 (
     tx_sequence_number          BIGINT       NOT NULL,
     event_sequence_number       BIGINT       NOT NULL,
     transaction_digest          bytea        NOT NULL,
-    checkpoint_sequence_number  bigint       NOT NULL,
     -- array of SuiAddress in bytes. All signers of the transaction.
     senders                     bytea[]      NOT NULL,
     -- bytes of the entry package ID. Notice that the package and module here
@@ -14,20 +14,13 @@ CREATE TABLE events
     module                      text         NOT NULL,
     -- StructTag in Display format, fully qualified including type parameters
     event_type                  text         NOT NULL,
-    -- Components of the StructTag of the event type: package, module,
-    -- name (name of the struct, without type parameters)
-    event_type_package          bytea        NOT NULL,
-    event_type_module           text         NOT NULL,
-    event_type_name             text         NOT NULL,
     -- timestamp of the checkpoint when the event was emitted
     timestamp_ms                BIGINT       NOT NULL,
     -- bcs of the Event contents (Event.contents)
     bcs                         BYTEA        NOT NULL,
-    PRIMARY KEY(tx_sequence_number, event_sequence_number, checkpoint_sequence_number)
-) PARTITION BY RANGE (checkpoint_sequence_number);
+    PRIMARY KEY(tx_sequence_number, event_sequence_number)
+) PARTITION BY RANGE (tx_sequence_number);
 CREATE TABLE events_partition_0 PARTITION OF events FOR VALUES FROM (0) TO (MAXVALUE);
 CREATE INDEX events_package ON events (package, tx_sequence_number, event_sequence_number);
 CREATE INDEX events_package_module ON events (package, module, tx_sequence_number, event_sequence_number);
 CREATE INDEX events_event_type ON events (event_type text_pattern_ops, tx_sequence_number, event_sequence_number);
-CREATE INDEX events_type_package_module_name ON events (event_type_package, event_type_module, event_type_name, tx_sequence_number, event_sequence_number);
-CREATE INDEX events_checkpoint_sequence_number ON events (checkpoint_sequence_number);
diff --git a/crates/sui-indexer/migrations/pg/2023-08-19-044026_transactions/down.sql b/crates/sui-indexer/migrations/pg/2023-08-19-044026_transactions/down.sql
index e5850457f922e..15e9dc9f1cb82 100644
--- a/crates/sui-indexer/migrations/pg/2023-08-19-044026_transactions/down.sql
+++ b/crates/sui-indexer/migrations/pg/2023-08-19-044026_transactions/down.sql
@@ -1,2 +1,3 @@
 -- This file should undo anything in `up.sql`
 DROP TABLE IF EXISTS transactions;
+DROP TABLE IF EXISTS transactions_partition_0;
diff --git a/crates/sui-indexer/migrations/pg/2023-08-19-044026_transactions/up.sql b/crates/sui-indexer/migrations/pg/2023-08-19-044026_transactions/up.sql
index ede66ad44798c..f5404e3610751 100644
--- a/crates/sui-indexer/migrations/pg/2023-08-19-044026_transactions/up.sql
+++ b/crates/sui-indexer/migrations/pg/2023-08-19-044026_transactions/up.sql
@@ -18,10 +18,6 @@ CREATE TABLE transactions (
     -- number of successful commands in this transaction, bound by number of command
     -- in a programmaable transaction.
     success_command_count       smallint     NOT NULL,
-    PRIMARY KEY (tx_sequence_number, checkpoint_sequence_number)
-) PARTITION BY RANGE (checkpoint_sequence_number);
+    PRIMARY KEY (tx_sequence_number)
+) PARTITION BY RANGE (tx_sequence_number);
 CREATE TABLE transactions_partition_0 PARTITION OF transactions FOR VALUES FROM (0) TO (MAXVALUE);
-CREATE INDEX transactions_transaction_digest ON transactions (transaction_digest);
-CREATE INDEX transactions_checkpoint_sequence_number ON transactions (checkpoint_sequence_number);
--- only create index for system transactions (0). See types.rs
-CREATE INDEX transactions_transaction_kind ON transactions (transaction_kind) WHERE transaction_kind = 0;
diff --git a/crates/sui-indexer/migrations/pg/2023-08-19-044044_checkpoints/up.sql b/crates/sui-indexer/migrations/pg/2023-08-19-044044_checkpoints/up.sql
index 5f7281a2e1a1d..ddb63b020de70 100644
--- a/crates/sui-indexer/migrations/pg/2023-08-19-044044_checkpoints/up.sql
+++ b/crates/sui-indexer/migrations/pg/2023-08-19-044044_checkpoints/up.sql
@@ -1,15 +1,15 @@
 CREATE TABLE checkpoints
 (
-    sequence_number                     bigint       PRIMARY KEY,
-    checkpoint_digest                   bytea        NOT NULL,
-    epoch                               bigint       NOT NULL,
+    sequence_number                     BIGINT       PRIMARY KEY,
+    checkpoint_digest                   BYTEA        NOT NULL,
+    epoch                               BIGINT       NOT NULL,
     -- total transactions in the network at the end of this checkpoint (including itself)
-    network_total_transactions          bigint       NOT NULL,
-    previous_checkpoint_digest          bytea,
+    network_total_transactions          BIGINT       NOT NULL,
+    previous_checkpoint_digest          BYTEA,
     -- if this checkpoitn is the last checkpoint of an epoch
     end_of_epoch                        boolean      NOT NULL,
     -- array of TranscationDigest in bytes included in this checkpoint
-    tx_digests                          bytea[]      NOT NULL,
+    tx_digests                          BYTEA[]      NOT NULL,
     timestamp_ms                        BIGINT       NOT NULL,
     total_gas_cost                      BIGINT       NOT NULL,
     computation_cost                    BIGINT       NOT NULL,
@@ -17,11 +17,13 @@ CREATE TABLE checkpoints
     storage_rebate                      BIGINT       NOT NULL,
     non_refundable_storage_fee          BIGINT       NOT NULL,
     -- bcs serialized Vec<CheckpointCommitment> bytes
-    checkpoint_commitments              bytea        NOT NULL,
+    checkpoint_commitments              BYTEA        NOT NULL,
     -- bcs serialized AggregateAuthoritySignature bytes
-    validator_signature                 bytea        NOT NULL,
+    validator_signature                 BYTEA        NOT NULL,
     -- bcs serialzied EndOfEpochData bytes, if the checkpoint marks end of an epoch
-    end_of_epoch_data                   bytea
+    end_of_epoch_data                   BYTEA,
+    min_tx_sequence_number              BIGINT,
+    max_tx_sequence_number              BIGINT
 );
 
 CREATE INDEX checkpoints_epoch ON checkpoints (epoch, sequence_number);
diff --git a/crates/sui-indexer/migrations/pg/2023-08-19-044052_epochs/up.sql b/crates/sui-indexer/migrations/pg/2023-08-19-044052_epochs/up.sql
index 4a0a17289ccec..5b540121cb849 100644
--- a/crates/sui-indexer/migrations/pg/2023-08-19-044052_epochs/up.sql
+++ b/crates/sui-indexer/migrations/pg/2023-08-19-044052_epochs/up.sql
@@ -26,3 +26,22 @@ CREATE TABLE epochs
     -- of the epoch
     epoch_commitments               bytea
 );
+
+-- Table storing the protocol configs for each protocol version.
+-- Examples include gas schedule, transaction limits, etc.
+CREATE TABLE protocol_configs
+(
+    protocol_version                BIGINT       NOT NULL,
+    config_name                     TEXT         NOT NULL,
+    config_value                    TEXT,
+    PRIMARY KEY(protocol_version, config_name)
+);
+
+-- Table storing the feature flags for each protocol version.
+CREATE TABLE feature_flags
+(
+    protocol_version                BIGINT       NOT NULL,
+    flag_name                       TEXT         NOT NULL,
+    flag_value                      BOOLEAN      NOT NULL,
+    PRIMARY KEY(protocol_version, flag_name)
+);
diff --git a/crates/sui-indexer/migrations/pg/2023-08-19-060729_packages/up.sql b/crates/sui-indexer/migrations/pg/2023-08-19-060729_packages/up.sql
index a95489af4dc41..f08a5549608eb 100644
--- a/crates/sui-indexer/migrations/pg/2023-08-19-060729_packages/up.sql
+++ b/crates/sui-indexer/migrations/pg/2023-08-19-060729_packages/up.sql
@@ -1,6 +1,14 @@
-CREATE TABLE packages 
+CREATE TABLE packages
 (
-    package_id                   bytea          PRIMARY KEY,
+    package_id                   bytea          NOT NULL,
+    original_id                  bytea          NOT NULL,
+    package_version              bigint         NOT NULL,
     -- bcs serialized MovePackage
-    move_package                 bytea          NOT NULL
+    move_package                 bytea          NOT NULL,
+    checkpoint_sequence_number   bigint         NOT NULL,
+    CONSTRAINT packages_pkey PRIMARY KEY (package_id, original_id, package_version),
+    CONSTRAINT packages_unique_package_id UNIQUE (package_id)
 );
+
+CREATE INDEX packages_cp_id_version ON packages (checkpoint_sequence_number, original_id, package_version);
+CREATE INDEX packages_id_version_cp ON packages (original_id, package_version, checkpoint_sequence_number);
diff --git a/crates/sui-indexer/migrations/pg/2023-10-06-204335_tx_indices/down.sql b/crates/sui-indexer/migrations/pg/2023-10-06-204335_tx_indices/down.sql
index 8e4f29f981c22..f5604c0db5357 100644
--- a/crates/sui-indexer/migrations/pg/2023-10-06-204335_tx_indices/down.sql
+++ b/crates/sui-indexer/migrations/pg/2023-10-06-204335_tx_indices/down.sql
@@ -2,5 +2,8 @@ DROP TABLE IF EXISTS tx_senders;
 DROP TABLE IF EXISTS tx_recipients;
 DROP TABLE IF EXISTS tx_input_objects;
 DROP TABLE IF EXISTS tx_changed_objects;
-DROP TABLE IF EXISTS tx_calls;
+DROP TABLE IF EXISTS tx_calls_pkg;
+DROP TABLE IF EXISTS tx_calls_mod;
+DROP TABLE IF EXISTS tx_calls_fun;
 DROP TABLE IF EXISTS tx_digests;
+DROP TABLE IF EXISTS tx_kinds;
diff --git a/crates/sui-indexer/migrations/pg/2023-10-06-204335_tx_indices/up.sql b/crates/sui-indexer/migrations/pg/2023-10-06-204335_tx_indices/up.sql
index ed81a281f2b0a..0bcd824e31254 100644
--- a/crates/sui-indexer/migrations/pg/2023-10-06-204335_tx_indices/up.sql
+++ b/crates/sui-indexer/migrations/pg/2023-10-06-204335_tx_indices/up.sql
@@ -1,57 +1,70 @@
 CREATE TABLE tx_senders (
-    cp_sequence_number          BIGINT       NOT NULL,
     tx_sequence_number          BIGINT       NOT NULL,
-    -- SuiAddress in bytes.
     sender                      BYTEA        NOT NULL,
-    PRIMARY KEY(sender, tx_sequence_number, cp_sequence_number)
+    PRIMARY KEY(sender, tx_sequence_number)
 );
-CREATE INDEX tx_senders_tx_sequence_number_index ON tx_senders (tx_sequence_number, cp_sequence_number);
 
 CREATE TABLE tx_recipients (
-    cp_sequence_number          BIGINT       NOT NULL,
     tx_sequence_number          BIGINT       NOT NULL,
-    -- SuiAddress in bytes.
     recipient                   BYTEA        NOT NULL,
-    PRIMARY KEY(recipient, tx_sequence_number, cp_sequence_number)
+    sender                      BYTEA        NOT NULL,
+    PRIMARY KEY(recipient, tx_sequence_number)
 );
-CREATE INDEX tx_recipients_tx_sequence_number_index ON tx_recipients (tx_sequence_number, cp_sequence_number);
+CREATE INDEX tx_recipients_sender ON tx_recipients (sender, recipient, tx_sequence_number);
 
 CREATE TABLE tx_input_objects (
-    cp_sequence_number          BIGINT       NOT NULL,
     tx_sequence_number          BIGINT       NOT NULL,
-    -- Object ID in bytes. 
     object_id                   BYTEA        NOT NULL,
-    PRIMARY KEY(object_id, tx_sequence_number, cp_sequence_number)
+    sender                      BYTEA        NOT NULL,
+    PRIMARY KEY(object_id, tx_sequence_number)
 );
 CREATE INDEX tx_input_objects_tx_sequence_number_index ON tx_input_objects (tx_sequence_number);
+CREATE INDEX tx_input_objects_sender ON tx_input_objects (sender, object_id, tx_sequence_number);
 
 CREATE TABLE tx_changed_objects (
-    cp_sequence_number          BIGINT       NOT NULL,
     tx_sequence_number          BIGINT       NOT NULL,
-    -- Object Id in bytes.
     object_id                   BYTEA        NOT NULL,
-    PRIMARY KEY(object_id, tx_sequence_number, cp_sequence_number)
+    sender                      BYTEA        NOT NULL,
+    PRIMARY KEY(object_id, tx_sequence_number)
 );
 CREATE INDEX tx_changed_objects_tx_sequence_number_index ON tx_changed_objects (tx_sequence_number);
+CREATE INDEX tx_changed_objects_sender ON tx_changed_objects (sender, object_id, tx_sequence_number);
+
+CREATE TABLE tx_calls_pkg (
+    tx_sequence_number          BIGINT       NOT NULL,
+    package                     BYTEA        NOT NULL,
+    sender                      BYTEA        NOT NULL,
+    PRIMARY KEY(package, tx_sequence_number)
+);
+CREATE INDEX tx_calls_pkg_sender ON tx_calls_pkg (sender, package, tx_sequence_number);
+
+CREATE TABLE tx_calls_mod (
+    tx_sequence_number          BIGINT       NOT NULL,
+    package                     BYTEA        NOT NULL,
+    module                      TEXT         NOT NULL,
+    sender                      BYTEA        NOT NULL,
+    PRIMARY KEY(package, module, tx_sequence_number)
+);
+CREATE INDEX tx_calls_mod_sender ON tx_calls_mod (sender, package, module, tx_sequence_number);
 
-CREATE TABLE tx_calls (
-    cp_sequence_number          BIGINT       NOT NULL,
+CREATE TABLE tx_calls_fun (
     tx_sequence_number          BIGINT       NOT NULL,
     package                     BYTEA        NOT NULL,
     module                      TEXT         NOT NULL,
     func                        TEXT         NOT NULL,
-    -- 1. Using Primary Key as a unique index.
-    -- 2. Diesel does not like tables with no primary key.
-    PRIMARY KEY(package, tx_sequence_number, cp_sequence_number)
+    sender                      BYTEA        NOT NULL,
+    PRIMARY KEY(package, module, func, tx_sequence_number)
 );
-CREATE INDEX tx_calls_module ON tx_calls (package, module, tx_sequence_number, cp_sequence_number);
-CREATE INDEX tx_calls_func ON tx_calls (package, module, func, tx_sequence_number, cp_sequence_number);
-CREATE INDEX tx_calls_tx_sequence_number ON tx_calls (tx_sequence_number, cp_sequence_number);
+CREATE INDEX tx_calls_fun_sender ON tx_calls_fun (sender, package, module, func, tx_sequence_number);
 
--- un-partitioned table for tx_digest -> (cp_sequence_number, tx_sequence_number) lookup.
 CREATE TABLE tx_digests (
     tx_digest                   BYTEA        PRIMARY KEY,
-    cp_sequence_number          BIGINT       NOT NULL,
     tx_sequence_number          BIGINT       NOT NULL
 );
 CREATE INDEX tx_digests_tx_sequence_number ON tx_digests (tx_sequence_number);
+
+CREATE TABLE tx_kinds (
+    tx_sequence_number          BIGINT       NOT NULL,
+    tx_kind                     SMALLINT     NOT NULL,
+    PRIMARY KEY(tx_kind, tx_sequence_number)
+);
diff --git a/crates/sui-indexer/migrations/pg/2023-11-29-193859_advance_partition/down.sql b/crates/sui-indexer/migrations/pg/2023-11-29-193859_advance_partition/down.sql
index 1693f3892a5fa..bab0311186e1d 100644
--- a/crates/sui-indexer/migrations/pg/2023-11-29-193859_advance_partition/down.sql
+++ b/crates/sui-indexer/migrations/pg/2023-11-29-193859_advance_partition/down.sql
@@ -1 +1,2 @@
 DROP PROCEDURE IF EXISTS advance_partition;
+DROP PROCEDURE IF EXISTS drop_partition;
diff --git a/crates/sui-indexer/migrations/pg/2023-11-29-193859_advance_partition/up.sql b/crates/sui-indexer/migrations/pg/2023-11-29-193859_advance_partition/up.sql
index cb24af8e09934..8ca64b86a7081 100644
--- a/crates/sui-indexer/migrations/pg/2023-11-29-193859_advance_partition/up.sql
+++ b/crates/sui-indexer/migrations/pg/2023-11-29-193859_advance_partition/up.sql
@@ -1,10 +1,10 @@
-CREATE OR REPLACE PROCEDURE advance_partition(table_name TEXT, last_epoch BIGINT, new_epoch BIGINT, last_epoch_start_cp BIGINT, new_epoch_start_cp BIGINT)
+CREATE OR REPLACE PROCEDURE advance_partition(table_name TEXT, last_epoch BIGINT, new_epoch BIGINT, last_epoch_start BIGINT, new_epoch_start BIGINT)
 LANGUAGE plpgsql
 AS $$
 BEGIN
     EXECUTE format('ALTER TABLE %I DETACH PARTITION %I_partition_%s', table_name, table_name, last_epoch);
-    EXECUTE format('ALTER TABLE %I ATTACH PARTITION %I_partition_%s FOR VALUES FROM (%L) TO (%L)', table_name, table_name, last_epoch, last_epoch_start_cp, new_epoch_start_cp);
-    EXECUTE format('CREATE TABLE IF NOT EXISTS %I_partition_%s PARTITION OF %I FOR VALUES FROM (%L) TO (MAXVALUE)', table_name, new_epoch, table_name, new_epoch_start_cp);
+    EXECUTE format('ALTER TABLE %I ATTACH PARTITION %I_partition_%s FOR VALUES FROM (%L) TO (%L)', table_name, table_name, last_epoch, last_epoch_start, new_epoch_start);
+    EXECUTE format('CREATE TABLE IF NOT EXISTS %I_partition_%s PARTITION OF %I FOR VALUES FROM (%L) TO (MAXVALUE)', table_name, new_epoch, table_name, new_epoch_start);
 END;
 $$;
 
diff --git a/crates/sui-indexer/migrations/pg/2024-05-05-155158_obj_indices/down.sql b/crates/sui-indexer/migrations/pg/2024-05-05-155158_obj_indices/down.sql
new file mode 100644
index 0000000000000..7a3a7670f24c2
--- /dev/null
+++ b/crates/sui-indexer/migrations/pg/2024-05-05-155158_obj_indices/down.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS objects_version;
diff --git a/crates/sui-indexer/migrations/pg/2024-05-05-155158_obj_indices/up.sql b/crates/sui-indexer/migrations/pg/2024-05-05-155158_obj_indices/up.sql
new file mode 100644
index 0000000000000..666e5a2423319
--- /dev/null
+++ b/crates/sui-indexer/migrations/pg/2024-05-05-155158_obj_indices/up.sql
@@ -0,0 +1,31 @@
+-- Indexing table mapping an object's ID and version to its checkpoint
+-- sequence number, partitioned by the first byte of its Object ID.
+CREATE TABLE objects_version (
+    object_id           bytea         NOT NULL,
+    object_version      bigint        NOT NULL,
+    cp_sequence_number  bigint        NOT NULL,
+    PRIMARY KEY (object_id, object_version)
+) PARTITION BY RANGE (object_id);
+
+-- Create a partition for each first byte value.
+DO $$
+DECLARE
+    lo text;
+    hi text;
+BEGIN
+    FOR i IN 0..254 LOOP
+        lo := LPAD(TO_HEX(i), 2, '0');
+        hi := LPAD(TO_HEX(i + 1), 2, '0');
+        EXECUTE FORMAT($F$
+            CREATE TABLE objects_version_%1$s PARTITION OF objects_version FOR VALUES
+            FROM (E'\\x%1$s00000000000000000000000000000000000000000000000000000000000000')
+            TO   (E'\\x%2$s00000000000000000000000000000000000000000000000000000000000000');
+        $F$, lo, hi);
+    END LOOP;
+END;
+$$ LANGUAGE plpgsql;
+
+-- Special case for the last partition, because of the upper bound.
+CREATE TABLE objects_version_ff PARTITION OF objects_version FOR VALUES
+FROM (E'\\xff00000000000000000000000000000000000000000000000000000000000000')
+TO   (MAXVALUE);
diff --git a/crates/sui-indexer/migrations/pg/2024-06-14-045801_event_indices/down.sql b/crates/sui-indexer/migrations/pg/2024-06-14-045801_event_indices/down.sql
new file mode 100644
index 0000000000000..3583887435168
--- /dev/null
+++ b/crates/sui-indexer/migrations/pg/2024-06-14-045801_event_indices/down.sql
@@ -0,0 +1,7 @@
+DROP TABLE IF EXISTS event_emit_package;
+DROP TABLE IF EXISTS event_emit_module;
+DROP TABLE IF EXISTS event_struct_package;
+DROP TABLE IF EXISTS event_struct_module;
+DROP TABLE IF EXISTS event_struct_name;
+DROP TABLE IF EXISTS event_struct_instantiation;
+DROP TABLE IF EXISTS event_senders;
diff --git a/crates/sui-indexer/migrations/pg/2024-06-14-045801_event_indices/up.sql b/crates/sui-indexer/migrations/pg/2024-06-14-045801_event_indices/up.sql
new file mode 100644
index 0000000000000..a89625146a9fd
--- /dev/null
+++ b/crates/sui-indexer/migrations/pg/2024-06-14-045801_event_indices/up.sql
@@ -0,0 +1,74 @@
+CREATE TABLE event_emit_package
+(
+    package                     BYTEA   NOT NULL,
+    tx_sequence_number          BIGINT  NOT NULL,
+    event_sequence_number       BIGINT  NOT NULL,
+    sender                      BYTEA   NOT NULL,
+    PRIMARY KEY(package, tx_sequence_number, event_sequence_number)
+);
+CREATE INDEX event_emit_package_sender ON event_emit_package (sender, package, tx_sequence_number, event_sequence_number);
+
+CREATE TABLE event_emit_module
+(
+    package                     BYTEA   NOT NULL,
+    module                      TEXT    NOT NULL,
+    tx_sequence_number          BIGINT  NOT NULL,
+    event_sequence_number       BIGINT  NOT NULL,
+    sender                      BYTEA   NOT NULL,
+    PRIMARY KEY(package, module, tx_sequence_number, event_sequence_number)
+);
+CREATE INDEX event_emit_module_sender ON event_emit_module (sender, package, module, tx_sequence_number, event_sequence_number);
+
+CREATE TABLE event_struct_package
+(
+    package                     BYTEA   NOT NULL,
+    tx_sequence_number          BIGINT  NOT NULL,
+    event_sequence_number       BIGINT  NOT NULL,
+    sender                      BYTEA   NOT NULL,
+    PRIMARY KEY(package, tx_sequence_number, event_sequence_number)
+);
+CREATE INDEX event_struct_package_sender ON event_struct_package (sender, package, tx_sequence_number, event_sequence_number);
+
+
+CREATE TABLE event_struct_module
+(
+    package                     BYTEA   NOT NULL,
+    module                      TEXT    NOT NULL,
+    tx_sequence_number          BIGINT  NOT NULL,
+    event_sequence_number       BIGINT  NOT NULL,
+    sender                      BYTEA   NOT NULL,
+    PRIMARY KEY(package, module, tx_sequence_number, event_sequence_number)
+);
+CREATE INDEX event_struct_module_sender ON event_struct_module (sender, package, module, tx_sequence_number, event_sequence_number);
+
+CREATE TABLE event_struct_name
+(
+    package                     BYTEA   NOT NULL,
+    module                      TEXT    NOT NULL,
+    type_name                   TEXT    NOT NULL,
+    tx_sequence_number          BIGINT  NOT NULL,
+    event_sequence_number       BIGINT  NOT NULL,
+    sender                      BYTEA   NOT NULL,
+    PRIMARY KEY(package, module, type_name, tx_sequence_number, event_sequence_number)
+);
+CREATE INDEX event_struct_name_sender ON event_struct_name (sender, package, module, type_name, tx_sequence_number, event_sequence_number);
+
+CREATE TABLE event_struct_instantiation
+(
+    package                     BYTEA   NOT NULL,
+    module                      TEXT    NOT NULL,
+    type_instantiation          TEXT    NOT NULL,
+    tx_sequence_number          BIGINT  NOT NULL,
+    event_sequence_number       BIGINT  NOT NULL,
+    sender                      BYTEA   NOT NULL,
+    PRIMARY KEY(package, module, type_instantiation, tx_sequence_number, event_sequence_number)
+);
+CREATE INDEX event_struct_instantiation_sender ON event_struct_instantiation (sender, package, module, type_instantiation, tx_sequence_number, event_sequence_number);
+
+CREATE TABLE event_senders
+(
+    sender                      BYTEA   NOT NULL,
+    tx_sequence_number          BIGINT  NOT NULL,
+    event_sequence_number       BIGINT  NOT NULL,
+    PRIMARY KEY(sender, tx_sequence_number, event_sequence_number)
+);
diff --git a/crates/sui-indexer/migrations/pg/2024-07-13-003534_chain_identifier/down.sql b/crates/sui-indexer/migrations/pg/2024-07-13-003534_chain_identifier/down.sql
new file mode 100644
index 0000000000000..57f1de973b1d2
--- /dev/null
+++ b/crates/sui-indexer/migrations/pg/2024-07-13-003534_chain_identifier/down.sql
@@ -0,0 +1,2 @@
+-- This file should undo anything in `up.sql`
+DROP TABLE IF EXISTS chain_identifier;
diff --git a/crates/sui-indexer/migrations/pg/2024-07-13-003534_chain_identifier/up.sql b/crates/sui-indexer/migrations/pg/2024-07-13-003534_chain_identifier/up.sql
new file mode 100644
index 0000000000000..205e3a89f63e5
--- /dev/null
+++ b/crates/sui-indexer/migrations/pg/2024-07-13-003534_chain_identifier/up.sql
@@ -0,0 +1,6 @@
+-- Your SQL goes here
+CREATE TABLE chain_identifier
+(
+    checkpoint_digest   BYTEA    NOT NULL,
+    PRIMARY KEY(checkpoint_digest)
+);
diff --git a/crates/sui-indexer/src/db.rs b/crates/sui-indexer/src/db.rs
index 4dfc178df8b13..ea61d9a749858 100644
--- a/crates/sui-indexer/src/db.rs
+++ b/crates/sui-indexer/src/db.rs
@@ -160,7 +160,6 @@ pub fn get_pool_connection<T: R2D2Connection + Send + 'static>(
 
 pub fn reset_database<T: R2D2Connection + Send + 'static>(
     conn: &mut PoolConnection<T>,
-    drop_all: bool,
 ) -> Result<(), anyhow::Error> {
     #[cfg(feature = "postgres-feature")]
     {
@@ -169,7 +168,7 @@ pub fn reset_database<T: R2D2Connection + Send + 'static>(
             .map_or_else(
                 || Err(anyhow!("Failed to downcast connection to PgConnection")),
                 |pg_conn| {
-                    setup_postgres::reset_database(pg_conn, drop_all)?;
+                    setup_postgres::reset_database(pg_conn)?;
                     Ok(())
                 },
             )?;
@@ -182,7 +181,7 @@ pub fn reset_database<T: R2D2Connection + Send + 'static>(
             .map_or_else(
                 || Err(anyhow!("Failed to downcast connection to PgConnection")),
                 |mysql_conn| {
-                    setup_mysql::reset_database(mysql_conn, drop_all)?;
+                    setup_mysql::reset_database(mysql_conn)?;
                     Ok(())
                 },
             )?;
@@ -200,7 +199,8 @@ pub mod setup_postgres {
     use crate::IndexerConfig;
     use anyhow::anyhow;
     use diesel::migration::MigrationSource;
-    use diesel::{PgConnection, RunQueryDsl};
+    use diesel::PgConnection;
+    use diesel::RunQueryDsl;
     use diesel_migrations::{embed_migrations, EmbeddedMigrations, MigrationHarness};
     use prometheus::Registry;
     use secrecy::ExposeSecret;
@@ -209,49 +209,62 @@ pub mod setup_postgres {
 
     const MIGRATIONS: EmbeddedMigrations = embed_migrations!("migrations/pg");
 
-    pub fn reset_database(
-        conn: &mut PoolConnection<PgConnection>,
-        drop_all: bool,
-    ) -> Result<(), anyhow::Error> {
-        info!("Resetting database ...");
-        if drop_all {
-            drop_all_tables(conn)
-                .map_err(|e| anyhow!("Encountering error when dropping all tables {e}"))?;
-        } else {
-            conn.revert_all_migrations(MIGRATIONS)
-                .map_err(|e| anyhow!("Error reverting all migrations {e}"))?;
-        }
-        conn.run_migrations(&MIGRATIONS.migrations().unwrap())
-            .map_err(|e| anyhow!("Failed to run migrations {e}"))?;
-        info!("Reset database complete.");
-        Ok(())
-    }
-
-    fn drop_all_tables(conn: &mut PgConnection) -> Result<(), diesel::result::Error> {
-        info!("Dropping all tables in the database");
-        let table_names: Vec<String> = diesel::dsl::sql::<diesel::sql_types::Text>(
-            "
-        SELECT tablename FROM pg_tables WHERE schemaname = 'public'
-    ",
-        )
-        .load(conn)?;
+    pub fn reset_database(conn: &mut PoolConnection<PgConnection>) -> Result<(), anyhow::Error> {
+        info!("Resetting PG database ...");
+
+        let drop_all_tables = "
+        DO $$ DECLARE
+            r RECORD;
+        BEGIN
+        FOR r IN (SELECT tablename FROM pg_tables WHERE schemaname = 'public')
+            LOOP
+                EXECUTE 'DROP TABLE IF EXISTS ' || quote_ident(r.tablename) || ' CASCADE';
+            END LOOP;
+        END $$;";
+        diesel::sql_query(drop_all_tables).execute(conn)?;
+        info!("Dropped all tables.");
+
+        let drop_all_procedures = "
+        DO $$ DECLARE
+            r RECORD;
+        BEGIN
+            FOR r IN (SELECT proname, oidvectortypes(proargtypes) as argtypes
+                      FROM pg_proc INNER JOIN pg_namespace ns ON (pg_proc.pronamespace = ns.oid)
+                      WHERE ns.nspname = 'public' AND prokind = 'p')
+            LOOP
+                EXECUTE 'DROP PROCEDURE IF EXISTS ' || quote_ident(r.proname) || '(' || r.argtypes || ') CASCADE';
+            END LOOP;
+        END $$;";
+        diesel::sql_query(drop_all_procedures).execute(conn)?;
+        info!("Dropped all procedures.");
+
+        let drop_all_functions = "
+        DO $$ DECLARE
+            r RECORD;
+        BEGIN
+            FOR r IN (SELECT proname, oidvectortypes(proargtypes) as argtypes
+                      FROM pg_proc INNER JOIN pg_namespace ON (pg_proc.pronamespace = pg_namespace.oid)
+                      WHERE pg_namespace.nspname = 'public' AND prokind = 'f')
+            LOOP
+                EXECUTE 'DROP FUNCTION IF EXISTS ' || quote_ident(r.proname) || '(' || r.argtypes || ') CASCADE';
+            END LOOP;
+        END $$;";
+        diesel::sql_query(drop_all_functions).execute(conn)?;
+        info!("Dropped all functions.");
 
-        for table_name in table_names {
-            let drop_table_query = format!("DROP TABLE IF EXISTS {} CASCADE", table_name);
-            diesel::sql_query(drop_table_query).execute(conn)?;
-        }
-
-        // Recreate the __diesel_schema_migrations table
         diesel::sql_query(
             "
-        CREATE TABLE __diesel_schema_migrations (
+        CREATE TABLE IF NOT EXISTS __diesel_schema_migrations (
             version VARCHAR(50) PRIMARY KEY,
             run_on TIMESTAMP NOT NULL DEFAULT NOW()
-        )
-    ",
+        )",
         )
         .execute(conn)?;
-        info!("Dropped all tables in the database");
+        info!("Created __diesel_schema_migrations table.");
+
+        conn.run_migrations(&MIGRATIONS.migrations().unwrap())
+            .map_err(|e| anyhow!("Failed to run migrations {e}"))?;
+        info!("Reset database complete.");
         Ok(())
     }
 
@@ -283,7 +296,7 @@ pub mod setup_postgres {
                 );
                 e
             })?;
-            reset_database(&mut conn, /* drop_all */ true).map_err(|e| {
+            reset_database(&mut conn).map_err(|e| {
                 let db_err_msg = format!(
                     "Failed resetting database with url: {:?} and error: {:?}",
                     db_url, e
@@ -346,7 +359,8 @@ pub mod setup_mysql {
     use crate::IndexerConfig;
     use anyhow::anyhow;
     use diesel::migration::MigrationSource;
-    use diesel::{MysqlConnection, RunQueryDsl};
+    use diesel::MysqlConnection;
+    use diesel::RunQueryDsl;
     use diesel_migrations::{embed_migrations, EmbeddedMigrations, MigrationHarness};
     use prometheus::Registry;
     use secrecy::ExposeSecret;
@@ -354,49 +368,33 @@ pub mod setup_mysql {
 
     const MIGRATIONS: EmbeddedMigrations = embed_migrations!("migrations/mysql");
 
-    pub fn reset_database(
-        conn: &mut PoolConnection<MysqlConnection>,
-        drop_all: bool,
-    ) -> Result<(), anyhow::Error> {
-        info!("Resetting database ...");
-        if drop_all {
-            crate::db::setup_mysql::drop_all_tables(conn)
-                .map_err(|e| anyhow!("Encountering error when dropping all tables {e}"))?;
-        } else {
-            conn.revert_all_migrations(MIGRATIONS)
-                .map_err(|e| anyhow!("Error reverting all migrations {e}"))?;
-        }
-        conn.run_migrations(&MIGRATIONS.migrations().unwrap())
-            .map_err(|e| anyhow!("Failed to run migrations {e}"))?;
-        info!("Reset database complete.");
-        Ok(())
-    }
+    pub fn reset_database(conn: &mut PoolConnection<MysqlConnection>) -> Result<(), anyhow::Error> {
+        info!("Resetting MySQL database ...");
 
-    fn drop_all_tables(conn: &mut MysqlConnection) -> Result<(), diesel::result::Error> {
-        info!("Dropping all tables in the database");
         let table_names: Vec<String> = diesel::dsl::sql::<diesel::sql_types::Text>(
-            "
-        SELECT TABLE_NAME FROM information_schema.tables WHERE table_schema = DATABASE()
-    ",
+            "SELECT TABLE_NAME FROM information_schema.tables WHERE table_schema = DATABASE()",
         )
         .load(conn)?;
-
         for table_name in table_names {
             let drop_table_query = format!("DROP TABLE IF EXISTS {}", table_name);
             diesel::sql_query(drop_table_query).execute(conn)?;
         }
+        info!("Drop tables complete.");
 
-        // Recreate the __diesel_schema_migrations table
         diesel::sql_query(
             "
-        CREATE TABLE __diesel_schema_migrations (
-            version VARCHAR(50) PRIMARY KEY,
-            run_on TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP()
-        )
-    ",
+            CREATE TABLE __diesel_schema_migrations (
+                version VARCHAR(50) PRIMARY KEY,
+                run_on TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP()
+            )
+        ",
         )
         .execute(conn)?;
-        info!("Dropped all tables in the database");
+        info!("Created __diesel_schema_migrations table.");
+
+        conn.run_migrations(&MIGRATIONS.migrations().unwrap())
+            .map_err(|e| anyhow!("Failed to run migrations {e}"))?;
+        info!("All migrations complete, reset database complete");
         Ok(())
     }
 
@@ -424,16 +422,14 @@ pub mod setup_mysql {
                 );
                 e
             })?;
-            crate::db::setup_mysql::reset_database(&mut conn, /* drop_all */ true).map_err(
-                |e| {
-                    let db_err_msg = format!(
-                        "Failed resetting database with url: {:?} and error: {:?}",
-                        db_url, e
-                    );
-                    error!("{}", db_err_msg);
-                    IndexerError::PostgresResetError(db_err_msg)
-                },
-            )?;
+            crate::db::setup_mysql::reset_database(&mut conn).map_err(|e| {
+                let db_err_msg = format!(
+                    "Failed resetting database with url: {:?} and error: {:?}",
+                    db_url, e
+                );
+                error!("{}", db_err_msg);
+                IndexerError::PostgresResetError(db_err_msg)
+            })?;
             info!("Reset MySQL database complete.");
         }
         let indexer_metrics = IndexerMetrics::new(&registry);
diff --git a/crates/sui-indexer/src/handlers/checkpoint_handler.rs b/crates/sui-indexer/src/handlers/checkpoint_handler.rs
index 420fc3a17041c..009df30c1cfe3 100644
--- a/crates/sui-indexer/src/handlers/checkpoint_handler.rs
+++ b/crates/sui-indexer/src/handlers/checkpoint_handler.rs
@@ -1,75 +1,69 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::handlers::committer::start_tx_checkpoint_commit_task;
-use crate::handlers::tx_processor::IndexingPackageBuffer;
-use crate::handlers::CustomCheckpointDataToCommit;
-use crate::models::display::StoredDisplay;
+use std::collections::{BTreeMap, HashMap};
+use std::sync::{Arc, Mutex};
+
 use async_trait::async_trait;
 use chrono::Utc;
+use diesel::r2d2::R2D2Connection;
 use itertools::Itertools;
-use move_core_types::annotated_value::{MoveStructLayout, MoveTypeLayout};
-use move_core_types::language_storage::{StructTag, TypeTag};
-use mysten_metrics::{get_metrics, spawn_monitored_task};
 use odin::structs::sui_notifications::{
     CoinReceived, CoinSent, CoinSwap, NftBurned, NftMinted, NftReceived, NftSent,
     SuiIndexerNotification,
 };
 use odin::sui_ws::{
     AccountObjectsUpdate, CoinCreated, CoinMutated, CoinObjectUpdateStatus, ObjectChangeUpdate,
-    ObjectUpdateStatus,
+    ObjectUpdateStatus, SuiWsApiMsg, TokenBalanceUpdate, TokenUpdate,
 };
-use odin::sui_ws::{SuiWsApiMsg, TokenBalanceUpdate, TokenUpdate};
-use std::collections::{BTreeMap, HashMap};
-use std::sync::{Arc, Mutex};
+use sui_types::gas_coin::GAS;
+use tap::tap::TapFallible;
+use tokio::sync::watch;
+use tokio_util::sync::CancellationToken;
+use tracing::{error, info, warn};
+
+use move_core_types::annotated_value::{MoveStructLayout, MoveTypeLayout};
+use move_core_types::language_storage::{StructTag, TypeTag};
+use mysten_metrics::{get_metrics, spawn_monitored_task};
+use sui_data_ingestion_core::Worker;
+use sui_json_rpc_types::{ObjectStatus, SuiMoveValue};
 use sui_package_resolver::{PackageStore, PackageStoreWithLruCache, Resolver};
 use sui_rest_api::{CheckpointData, CheckpointTransaction};
-use sui_types::base_types::ObjectRef;
+use sui_types::base_types::ObjectID;
 use sui_types::dynamic_field::DynamicFieldInfo;
 use sui_types::dynamic_field::DynamicFieldName;
 use sui_types::dynamic_field::DynamicFieldType;
-use sui_types::gas_coin::GAS;
+use sui_types::effects::{TransactionEffects, TransactionEffectsAPI};
+use sui_types::event::SystemEpochInfoEvent;
 use sui_types::messages_checkpoint::{
     CertifiedCheckpointSummary, CheckpointContents, CheckpointSequenceNumber,
 };
 use sui_types::nats_queue::{NatsQueueSender, NotificationPayload, WsPayload};
 use sui_types::object::Object;
-use tokio::sync::watch;
-use tokio_util::sync::CancellationToken;
-
-use diesel::r2d2::R2D2Connection;
-use std::collections::hash_map::Entry;
-use std::collections::HashSet;
-use sui_data_ingestion_core::Worker;
-use sui_json_rpc_types::{ObjectStatus, SuiMoveValue};
-use sui_types::base_types::SequenceNumber;
-use sui_types::effects::{TransactionEffects, TransactionEffectsAPI};
-use sui_types::event::SystemEpochInfoEvent;
 use sui_types::object::Owner;
-use sui_types::transaction::TransactionDataAPI;
-use tap::tap::TapFallible;
-use tracing::{error, info, warn};
-
-use sui_types::base_types::ObjectID;
 use sui_types::sui_system_state::sui_system_state_summary::SuiSystemStateSummary;
 use sui_types::sui_system_state::{get_sui_system_state, SuiSystemStateTrait};
+use sui_types::transaction::TransactionDataAPI;
 
+use crate::db::ConnectionPool;
 use crate::errors::IndexerError;
+use crate::handlers::committer::start_tx_checkpoint_commit_task;
+use crate::handlers::tx_processor::IndexingPackageBuffer;
 use crate::metrics::IndexerMetrics;
-
-use crate::db::ConnectionPool;
+use crate::models::display::StoredDisplay;
 use crate::store::package_resolver::{IndexerStorePackageResolver, InterimPackageResolver};
 use crate::store::{IndexerStore, PgIndexerStore};
 use crate::types::{
-    CustomIndexedTransaction, IndexedCheckpoint, IndexedDeletedObject, IndexedEpochInfo,
-    IndexedEvent, IndexedObject, IndexedPackage, IndexerResult, TransactionKind, TxIndex,
+    CustomIndexedTransaction, EventIndex, IndexedCheckpoint, IndexedDeletedObject,
+    IndexedEpochInfo, IndexedEvent, IndexedObject, IndexedPackage, IndexerResult, TransactionKind,
+    TxIndex,
 };
 
 use super::tx_processor::EpochEndIndexingObjectStore;
 use super::tx_processor::TxChangesProcessor;
-use super::CheckpointDataToCommit;
 use super::EpochToCommit;
 use super::TransactionObjectChangesToCommit;
+use super::{CheckpointDataToCommit, CustomCheckpointDataToCommit};
 
 const CHECKPOINT_QUEUE_SIZE: usize = 100;
 
@@ -245,6 +239,7 @@ where
                     0, //first_checkpoint_id
                     None,
                 ),
+                network_total_transactions: 0,
             }));
         }
 
@@ -271,7 +266,12 @@ where
         let event = bcs::from_bytes::<SystemEpochInfoEvent>(&epoch_event.contents)?;
 
         // Now we just entered epoch X, we want to calculate the diff between
-        // TotalTransactionsByEndOfEpoch(X-1) and TotalTransactionsByEndOfEpoch(X-2)
+        // TotalTransactionsByEndOfEpoch(X-1) and TotalTransactionsByEndOfEpoch(X-2). Note that on
+        // the indexer's chain-reading side, this is not guaranteed to have the latest data. Rather
+        // than impose a wait on the reading side, however, we overwrite this on the persisting
+        // side, where we can guarantee that the previous epoch's checkpoints have been written to
+        // db.
+
         let network_tx_count_prev_epoch = match system_state.epoch {
             // If first epoch change, this number is 0
             1 => Ok(0),
@@ -295,6 +295,7 @@ where
                 checkpoint_summary.sequence_number + 1, // first_checkpoint_id
                 Some(&event),
             ),
+            network_total_transactions: checkpoint_summary.network_total_transactions,
         }))
     }
 
@@ -317,20 +318,21 @@ where
         let object_history_changes: TransactionObjectChangesToCommit =
             Self::index_objects_history(data.clone(), package_resolver.clone()).await?;
 
-        let (checkpoint, db_transactions, db_events, db_indices, db_displays) = {
+        let (checkpoint, db_transactions, db_events, db_tx_indices, db_event_indices, db_displays) = {
             let CheckpointData {
                 transactions,
                 checkpoint_summary,
                 checkpoint_contents,
             } = data;
 
-            let (db_transactions, db_events, db_indices, db_displays) = Self::index_transactions(
-                transactions,
-                &checkpoint_summary,
-                &checkpoint_contents,
-                &metrics,
-            )
-            .await?;
+            let (db_transactions, db_events, db_tx_indices, db_event_indices, db_displays) =
+                Self::index_transactions(
+                    transactions,
+                    &checkpoint_summary,
+                    &checkpoint_contents,
+                    &metrics,
+                )
+                .await?;
 
             let successful_tx_num: u64 = db_transactions.iter().map(|t| t.successful_tx_num).sum();
             (
@@ -341,7 +343,8 @@ where
                 ),
                 db_transactions,
                 db_events,
-                db_indices,
+                db_tx_indices,
+                db_event_indices,
                 db_displays,
             )
         };
@@ -364,7 +367,8 @@ where
             checkpoint,
             transactions: db_transactions,
             events: db_events,
-            tx_indices: db_indices,
+            tx_indices: db_tx_indices,
+            event_indices: db_event_indices,
             display_updates: db_displays,
             object_changes,
             object_history_changes,
@@ -382,6 +386,7 @@ where
         Vec<CustomIndexedTransaction>,
         Vec<IndexedEvent>,
         Vec<TxIndex>,
+        Vec<EventIndex>,
         BTreeMap<String, StoredDisplay>,
     )> {
         let checkpoint_seq = checkpoint_summary.sequence_number();
@@ -402,7 +407,8 @@ where
         let mut db_transactions = Vec::new();
         let mut db_events = Vec::new();
         let mut db_displays = BTreeMap::new();
-        let mut db_indices = Vec::new();
+        let mut db_tx_indices = Vec::new();
+        let mut db_event_indices = Vec::new();
 
         for checkpoint_tx in transactions {
             let CheckpointTransaction {
@@ -420,6 +426,7 @@ where
                     checkpoint_seq, tx_digest, sender_signed_data.digest()
                 )));
             }
+
             let tx = sender_signed_data.transaction_data();
             let events = events
                 .as_ref()
@@ -443,6 +450,12 @@ where
                 )
             }));
 
+            db_event_indices.extend(
+                events.iter().enumerate().map(|(idx, event)| {
+                    EventIndex::from_event(tx_sequence_number, idx as u64, event)
+                }),
+            );
+
             db_displays.extend(
                 events
                     .iter()
@@ -481,7 +494,7 @@ where
                 balance_change,
                 custom_object_changes,
                 events,
-                transaction_kind,
+                transaction_kind: transaction_kind.clone(),
                 successful_tx_num: if fx.status().is_ok() {
                     tx.kind().tx_count() as u64
                 } else {
@@ -509,8 +522,8 @@ where
             // Payers
             let payers = vec![tx.gas_owner()];
 
-            // Senders
-            let senders = vec![tx.sender()];
+            // Sender
+            let sender = tx.sender();
 
             // Recipients
             let recipients = fx
@@ -530,19 +543,26 @@ where
                 .map(|(p, m, f)| (*<&ObjectID>::clone(p), m.to_string(), f.to_string()))
                 .collect();
 
-            db_indices.push(TxIndex {
+            db_tx_indices.push(TxIndex {
                 tx_sequence_number,
                 transaction_digest: tx_digest,
                 checkpoint_sequence_number: *checkpoint_seq,
                 input_objects,
                 changed_objects,
-                senders,
+                sender,
                 payers,
                 recipients,
                 move_calls,
+                tx_kind: transaction_kind,
             });
         }
-        Ok((db_transactions, db_events, db_indices, db_displays))
+        Ok((
+            db_transactions,
+            db_events,
+            db_tx_indices,
+            db_event_indices,
+            db_displays,
+        ))
     }
 
     pub(crate) async fn index_objects(
@@ -552,71 +572,41 @@ where
     ) -> Result<TransactionObjectChangesToCommit, IndexerError> {
         let _timer = metrics.indexing_objects_latency.start_timer();
         let checkpoint_seq = data.checkpoint_summary.sequence_number;
-        let deleted_objects = data
-            .transactions
-            .iter()
-            .flat_map(|tx| get_deleted_objects(&tx.effects))
-            .collect::<Vec<_>>();
-        let deleted_object_ids = deleted_objects
-            .iter()
-            .map(|o| (o.0, o.1))
-            .collect::<HashSet<_>>();
-        let indexed_deleted_objects = deleted_objects
+
+        let eventually_removed_object_refs_post_version =
+            data.eventually_removed_object_refs_post_version();
+        let indexed_eventually_removed_objects = eventually_removed_object_refs_post_version
             .into_iter()
-            .map(|o| IndexedDeletedObject {
-                object_id: o.0,
-                object_version: o.1.value(),
+            .map(|obj_ref| IndexedDeletedObject {
+                object_id: obj_ref.0,
+                object_version: obj_ref.1.into(),
                 checkpoint_sequence_number: checkpoint_seq,
             })
             .collect();
 
-        let (latest_objects, intermediate_versions) = get_latest_objects(data.output_objects());
-
-        let live_objects: Vec<Object> = data
-            .transactions
-            .iter()
-            .flat_map(|tx| {
-                let CheckpointTransaction {
-                    transaction: tx,
-                    effects: fx,
-                    ..
-                } = tx;
-                fx.all_changed_objects()
-                    .into_iter()
-                    .filter_map(|(oref, _owner, _kind)| {
-                        // We don't care about objects that are deleted or updated more than once
-                        if intermediate_versions.contains(&(oref.0, oref.1))
-                            || deleted_object_ids.contains(&(oref.0, oref.1))
-                        {
-                            return None;
-                        }
-                        let object = latest_objects.get(&(oref.0)).unwrap_or_else(|| {
-                            panic!(
-                                "object {:?} not found in CheckpointData (tx_digest: {})",
-                                oref.0,
-                                tx.digest()
-                            )
-                        });
-                        assert_eq!(oref.1, object.version());
-                        Some(object.clone())
-                    })
-                    .collect::<Vec<_>>()
-            })
-            .collect();
-
+        let latest_live_output_objects = data.latest_live_output_objects();
+        let latest_live_output_object_map = latest_live_output_objects
+            .clone()
+            .into_iter()
+            .map(|o| (o.id(), o.clone()))
+            .collect::<HashMap<_, _>>();
         let move_struct_layout_map =
-            get_move_struct_layout_map(&live_objects, package_resolver).await?;
-        let changed_objects = live_objects
+            get_move_struct_layout_map(latest_live_output_objects.clone(), package_resolver)
+                .await?;
+        let changed_objects = latest_live_output_objects
             .into_iter()
             .map(|o| {
-                let df_info =
-                    try_create_dynamic_field_info(&o, &move_struct_layout_map, &latest_objects);
-                df_info.map(|info| IndexedObject::from_object(checkpoint_seq, o, info))
+                let df_info = try_create_dynamic_field_info(
+                    o,
+                    &move_struct_layout_map,
+                    &latest_live_output_object_map,
+                );
+                df_info.map(|info| IndexedObject::from_object(checkpoint_seq, o.clone(), info))
             })
             .collect::<Result<Vec<_>, _>>()?;
         Ok(TransactionObjectChangesToCommit {
             changed_objects,
-            deleted_objects: indexed_deleted_objects,
+            deleted_objects: indexed_eventually_removed_objects,
         })
     }
 
@@ -629,59 +619,42 @@ where
         let deleted_objects = data
             .transactions
             .iter()
-            .flat_map(|tx| get_deleted_objects(&tx.effects))
+            .flat_map(|tx| tx.removed_object_refs_post_version())
             .collect::<Vec<_>>();
         let indexed_deleted_objects: Vec<IndexedDeletedObject> = deleted_objects
             .into_iter()
-            .map(|o| IndexedDeletedObject {
-                object_id: o.0,
-                object_version: o.1.value(),
+            .map(|obj_ref| IndexedDeletedObject {
+                object_id: obj_ref.0,
+                object_version: obj_ref.1.into(),
                 checkpoint_sequence_number: checkpoint_seq,
             })
             .collect();
 
-        let (latest_objects, _) = get_latest_objects(data.output_objects());
-        let history_object_map = data
-            .output_objects()
+        let latest_live_output_objects = data.latest_live_output_objects();
+        let latest_live_output_object_map = latest_live_output_objects
+            .clone()
             .into_iter()
-            .map(|o| ((o.id(), o.version()), o.clone()))
+            .map(|o| (o.id(), o.clone()))
             .collect::<HashMap<_, _>>();
 
-        let history_objects: Vec<Object> = data
+        let output_objects = data
             .transactions
             .iter()
-            .flat_map(|tx| {
-                let CheckpointTransaction {
-                    transaction: tx,
-                    effects: fx,
-                    ..
-                } = tx;
-                fx.all_changed_objects()
-                    .into_iter()
-                    .map(|(oref, _owner, _kind)| {
-                        let history_object = history_object_map.get(&(oref.0, oref.1)).unwrap_or_else(|| {
-                            panic!(
-                                "object {:?} version {:?} not found in CheckpointData (tx_digest: {})",
-                                oref.0,
-                                oref.1,
-                                tx.digest()
-                            )
-                        });
-                        assert_eq!(oref.2, history_object.digest());
-                        history_object.clone()
-                    })
-                    .collect::<Vec<_>>()
-            })
-            .collect();
-
+            .flat_map(|tx| &tx.output_objects)
+            .collect::<Vec<_>>();
+        // TODO(gegaowp): the current df_info implementation is not correct,
+        // but we have decided remove all df_* except df_kind.
         let move_struct_layout_map =
-            get_move_struct_layout_map(&history_objects, package_resolver).await?;
-        let changed_objects = history_objects
+            get_move_struct_layout_map(output_objects.clone(), package_resolver).await?;
+        let changed_objects = output_objects
             .into_iter()
             .map(|o| {
-                let df_info =
-                    try_create_dynamic_field_info(&o, &move_struct_layout_map, &latest_objects);
-                df_info.map(|info| IndexedObject::from_object(checkpoint_seq, o, info))
+                let df_info = try_create_dynamic_field_info(
+                    o,
+                    &move_struct_layout_map,
+                    &latest_live_output_object_map,
+                );
+                df_info.map(|info| IndexedObject::from_object(checkpoint_seq, o.clone(), info))
             })
             .collect::<Result<Vec<_>, _>>()?;
 
@@ -700,8 +673,9 @@ where
             .iter()
             .flat_map(|data| {
                 let checkpoint_sequence_number = data.checkpoint_summary.sequence_number;
-                data.output_objects()
+                data.transactions
                     .iter()
+                    .flat_map(|tx| &tx.output_objects)
                     .filter_map(|o| {
                         if let sui_types::object::Data::Package(p) = &o.data {
                             Some(IndexedPackage {
@@ -725,8 +699,9 @@ where
             .iter()
             .flat_map(|data| {
                 let checkpoint_sequence_number = data.checkpoint_summary.sequence_number;
-                data.output_objects()
+                data.transactions
                     .iter()
+                    .flat_map(|tx| &tx.output_objects)
                     .filter_map(|o| {
                         if let sui_types::object::Data::Package(p) = &o.data {
                             let indexed_pkg = IndexedPackage {
@@ -734,7 +709,7 @@ where
                                 move_package: p.clone(),
                                 checkpoint_sequence_number,
                             };
-                            Some((indexed_pkg, (**o).clone()))
+                            Some((indexed_pkg, o.clone()))
                         } else {
                             None
                         }
@@ -804,11 +779,11 @@ pub fn get_object_status_map(effects: &TransactionEffects) -> HashMap<ObjectID,
 }
 
 async fn get_move_struct_layout_map(
-    objects: &[Object],
+    objects: Vec<&Object>,
     package_resolver: Arc<Resolver<impl PackageStore>>,
 ) -> Result<HashMap<StructTag, MoveStructLayout>, IndexerError> {
     let struct_tags = objects
-        .iter()
+        .into_iter()
         .filter_map(|o| {
             let move_object = o.data.try_as_move().cloned();
             move_object.map(|move_object| {
@@ -859,40 +834,6 @@ async fn get_move_struct_layout_map(
     Ok(move_struct_layout_map)
 }
 
-pub fn get_deleted_objects(effects: &TransactionEffects) -> Vec<ObjectRef> {
-    let deleted = effects.deleted().into_iter();
-    let wrapped = effects.wrapped().into_iter();
-    let unwrapped_then_deleted = effects.unwrapped_then_deleted().into_iter();
-    deleted
-        .chain(wrapped)
-        .chain(unwrapped_then_deleted)
-        .collect::<Vec<_>>()
-}
-
-pub fn get_latest_objects(
-    objects: Vec<&Object>,
-) -> (
-    HashMap<ObjectID, Object>,
-    HashSet<(ObjectID, SequenceNumber)>,
-) {
-    let mut latest_objects = HashMap::new();
-    let mut discarded_versions = HashSet::new();
-    for object in objects {
-        match latest_objects.entry(object.id()) {
-            Entry::Vacant(e) => {
-                e.insert(object.clone());
-            }
-            Entry::Occupied(mut e) => {
-                if object.version() > e.get().version() {
-                    discarded_versions.insert((e.get().id(), e.get().version()));
-                    e.insert(object.clone());
-                }
-            }
-        }
-    }
-    (latest_objects, discarded_versions)
-}
-
 fn try_create_dynamic_field_info(
     o: &Object,
     struct_tag_to_move_struct_layout: &HashMap<StructTag, MoveStructLayout>,
diff --git a/crates/sui-indexer/src/handlers/committer.rs b/crates/sui-indexer/src/handlers/committer.rs
index eb1dc7365f2b8..f4e5504893f5c 100644
--- a/crates/sui-indexer/src/handlers/committer.rs
+++ b/crates/sui-indexer/src/handlers/committer.rs
@@ -89,6 +89,7 @@ async fn commit_checkpoints<S>(
     let mut tx_batch = vec![];
     let mut events_batch = vec![];
     let mut tx_indices_batch = vec![];
+    let mut event_indices_batch = vec![];
     let mut display_updates_batch = BTreeMap::new();
     let mut object_changes_batch = vec![];
     let mut object_history_changes_batch = vec![];
@@ -99,6 +100,7 @@ async fn commit_checkpoints<S>(
             checkpoint,
             transactions,
             events,
+            event_indices,
             tx_indices,
             display_updates,
             object_changes,
@@ -110,6 +112,7 @@ async fn commit_checkpoints<S>(
         tx_batch.push(transactions);
         events_batch.push(events);
         tx_indices_batch.push(tx_indices);
+        event_indices_batch.push(event_indices);
         display_updates_batch.extend(display_updates.into_iter());
         object_changes_batch.push(object_changes);
         object_history_changes_batch.push(object_history_changes);
@@ -123,6 +126,10 @@ async fn commit_checkpoints<S>(
     let tx_batch = tx_batch.into_iter().flatten().collect::<Vec<_>>();
     let tx_indices_batch = tx_indices_batch.into_iter().flatten().collect::<Vec<_>>();
     let events_batch = events_batch.into_iter().flatten().collect::<Vec<_>>();
+    let event_indices_batch = event_indices_batch
+        .into_iter()
+        .flatten()
+        .collect::<Vec<_>>();
     let packages_batch = packages_batch.into_iter().flatten().collect::<Vec<_>>();
     let checkpoint_num = checkpoint_batch.len();
     let tx_count = tx_batch.len();
@@ -133,6 +140,7 @@ async fn commit_checkpoints<S>(
             state.persist_transactions(tx_batch),
             state.persist_tx_indices(tx_indices_batch),
             state.persist_events(events_batch),
+            state.persist_event_indices(event_indices_batch),
             state.persist_displays(display_updates_batch),
             state.persist_packages(packages_batch),
             state.persist_objects(object_changes_batch.clone()),
@@ -154,6 +162,8 @@ async fn commit_checkpoints<S>(
             .expect("Persisting data into DB should not fail.");
     }
 
+    let is_epoch_end = epoch.is_some();
+
     // handle partitioning on epoch boundary
     if let Some(epoch_data) = epoch {
         state
@@ -176,6 +186,17 @@ async fn commit_checkpoints<S>(
             );
         })
         .expect("Persisting data into DB should not fail.");
+
+    if is_epoch_end {
+        // The epoch has advanced so we update the configs for the new protocol version, if it has changed.
+        let chain_id = state
+            .get_chain_identifier()
+            .await
+            .expect("Failed to get chain identifier")
+            .expect("Chain identifier should have been indexed at this point");
+        let _ = state.persist_protocol_configs_and_feature_flags(chain_id);
+    }
+
     let elapsed = guard.stop_and_record();
 
     commit_notifier
diff --git a/crates/sui-indexer/src/handlers/mod.rs b/crates/sui-indexer/src/handlers/mod.rs
index ee2e0cd98fb51..376a74043abb7 100644
--- a/crates/sui-indexer/src/handlers/mod.rs
+++ b/crates/sui-indexer/src/handlers/mod.rs
@@ -6,8 +6,8 @@ use std::collections::BTreeMap;
 use crate::{
     models::display::StoredDisplay,
     types::{
-        CustomIndexedTransaction, IndexedCheckpoint, IndexedDeletedObject, IndexedEpochInfo,
-        IndexedEvent, IndexedObject, IndexedPackage, IndexedTransaction, TxIndex,
+        CustomIndexedTransaction, EventIndex, IndexedCheckpoint, IndexedDeletedObject,
+        IndexedEpochInfo, IndexedEvent, IndexedObject, IndexedPackage, IndexedTransaction, TxIndex,
     },
 };
 
@@ -22,6 +22,7 @@ pub struct CheckpointDataToCommit {
     pub checkpoint: IndexedCheckpoint,
     pub transactions: Vec<IndexedTransaction>,
     pub events: Vec<IndexedEvent>,
+    pub event_indices: Vec<EventIndex>,
     pub tx_indices: Vec<TxIndex>,
     pub display_updates: BTreeMap<String, StoredDisplay>,
     pub object_changes: TransactionObjectChangesToCommit,
@@ -35,6 +36,7 @@ pub struct CustomCheckpointDataToCommit {
     pub checkpoint: IndexedCheckpoint,
     pub transactions: Vec<CustomIndexedTransaction>,
     pub events: Vec<IndexedEvent>,
+    pub event_indices: Vec<EventIndex>,
     pub tx_indices: Vec<TxIndex>,
     pub display_updates: BTreeMap<String, StoredDisplay>,
     pub object_changes: TransactionObjectChangesToCommit,
@@ -49,6 +51,7 @@ impl From<CustomCheckpointDataToCommit> for CheckpointDataToCommit {
             checkpoint: data.checkpoint,
             transactions: data.transactions.into_iter().map(Into::into).collect(),
             events: data.events,
+            event_indices: data.event_indices,
             tx_indices: data.tx_indices,
             display_updates: data.display_updates,
             object_changes: data.object_changes,
@@ -69,4 +72,5 @@ pub struct TransactionObjectChangesToCommit {
 pub struct EpochToCommit {
     pub last_epoch: Option<IndexedEpochInfo>,
     pub new_epoch: IndexedEpochInfo,
+    pub network_total_transactions: u64,
 }
diff --git a/crates/sui-indexer/src/handlers/tx_processor.rs b/crates/sui-indexer/src/handlers/tx_processor.rs
index 8bb36521182f7..79a49e6f0412d 100644
--- a/crates/sui-indexer/src/handlers/tx_processor.rs
+++ b/crates/sui-indexer/src/handlers/tx_processor.rs
@@ -38,7 +38,6 @@ use sui_types::messages_checkpoint::CheckpointSequenceNumber;
 
 use crate::errors::IndexerError;
 use crate::metrics::IndexerMetrics;
-
 use crate::types::IndexedPackage;
 use crate::types::{IndexedObjectChange, IndexerResult};
 
@@ -364,9 +363,8 @@ pub(crate) struct EpochEndIndexingObjectStore<'a> {
 
 impl<'a> EpochEndIndexingObjectStore<'a> {
     pub fn new(data: &'a CheckpointData) -> Self {
-        // We only care about output objects for end-of-epoch indexing
         Self {
-            objects: data.output_objects(),
+            objects: data.latest_live_output_objects(),
         }
     }
 }
diff --git a/crates/sui-indexer/src/indexer.rs b/crates/sui-indexer/src/indexer.rs
index 1164305de44c5..32435cf8e98ba 100644
--- a/crates/sui-indexer/src/indexer.rs
+++ b/crates/sui-indexer/src/indexer.rs
@@ -82,6 +82,7 @@ impl Indexer {
             .expect("Failed to get latest tx checkpoint sequence number from DB")
             .map(|seq| seq + 1)
             .unwrap_or_default();
+        // let primary_watermark = 56614153;
         let download_queue_size = env::var("DOWNLOAD_QUEUE_SIZE")
             .unwrap_or_else(|_| DOWNLOAD_QUEUE_SIZE.to_string())
             .parse::<usize>()
@@ -124,6 +125,14 @@ impl Indexer {
             spawn_monitored_task!(pruner.start(CancellationToken::new()));
         }
 
+        // If we already have chain identifier indexed (i.e. the first checkpoint has been indexed),
+        // then we persist protocol configs for protocol versions not yet in the db.
+        // Otherwise, we would do the persisting in `commit_checkpoint` while the first cp is
+        // being indexed.
+        if let Some(chain_id) = store.get_chain_identifier().await? {
+            store.persist_protocol_configs_and_feature_flags(chain_id)?;
+        }
+
         let cancel_clone = cancel.clone();
         let (exit_sender, exit_receiver) = oneshot::channel();
         // Spawn a task that links the cancellation token to the exit sender
diff --git a/crates/sui-indexer/src/indexer_reader.rs b/crates/sui-indexer/src/indexer_reader.rs
index 0363cd522b86c..003e031cf5620 100644
--- a/crates/sui-indexer/src/indexer_reader.rs
+++ b/crates/sui-indexer/src/indexer_reader.rs
@@ -777,14 +777,14 @@ impl<U: R2D2Connection> IndexerReader<U> {
                 let package = Hex::encode(package.to_vec());
                 match (module, function) {
                     (Some(module), Some(function)) => (
-                        "tx_calls".into(),
+                        "tx_calls_fun".into(),
                         format!(
                             "package = '\\x{}'::bytea AND module = '{}' AND func = '{}'",
                             package, module, function
                         ),
                     ),
                     (Some(module), None) => (
-                        "tx_calls".into(),
+                        "tx_calls_mod".into(),
                         format!(
                             "package = '\\x{}'::bytea AND module = '{}'",
                             package, module
@@ -792,11 +792,11 @@ impl<U: R2D2Connection> IndexerReader<U> {
                     ),
                     (None, Some(_)) => {
                         return Err(IndexerError::InvalidArgumentError(
-                            "Function cannot be present wihtout Module.".into(),
+                            "Function cannot be present without Module.".into(),
                         ));
                     }
                     (None, None) => (
-                        "tx_calls".into(),
+                        "tx_calls_pkg".into(),
                         format!("package = '\\x{}'::bytea", package),
                     ),
                 }
diff --git a/crates/sui-indexer/src/lib.rs b/crates/sui-indexer/src/lib.rs
index 6c1794c5f340a..c2d6b4e91e4a7 100644
--- a/crates/sui-indexer/src/lib.rs
+++ b/crates/sui-indexer/src/lib.rs
@@ -1,6 +1,6 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
-#![recursion_limit = "256"]
+#![recursion_limit = "512"]
 
 use std::net::SocketAddr;
 use std::time::Duration;
diff --git a/crates/sui-indexer/src/main.rs b/crates/sui-indexer/src/main.rs
index f57566cf3a831..b79b1be061e64 100644
--- a/crates/sui-indexer/src/main.rs
+++ b/crates/sui-indexer/src/main.rs
@@ -6,7 +6,7 @@ use std::sync::Arc;
 use clap::Parser;
 use odin::{ConnectOptions, Odin};
 use sui_types::nats_queue::nats_queue;
-use tracing::info;
+use tracing::{info, warn};
 
 use sui_indexer::errors::IndexerError;
 use sui_indexer::metrics::start_prometheus_server;
@@ -18,6 +18,7 @@ async fn main() -> Result<(), IndexerError> {
     let _guard = telemetry_subscribers::TelemetryConfig::new()
         .with_env()
         .init();
+    warn!("WARNING: Sui indexer is still experimental and we expect occasional breaking changes that require backfills.");
 
     let mut indexer_config = IndexerConfig::parse();
     // TODO: remove. Temporary safeguard to migrate to `rpc_client_url` usage
diff --git a/crates/sui-indexer/src/metrics.rs b/crates/sui-indexer/src/metrics.rs
index 67dbf7fe1ff43..34978836db5d2 100644
--- a/crates/sui-indexer/src/metrics.rs
+++ b/crates/sui-indexer/src/metrics.rs
@@ -40,10 +40,8 @@ pub fn start_prometheus_server(
         .layer(Extension(registry_service.clone()));
 
     tokio::spawn(async move {
-        axum::Server::bind(&addr)
-            .serve(app.into_make_service())
-            .await
-            .unwrap();
+        let listener = tokio::net::TcpListener::bind(&addr).await.unwrap();
+        axum::serve(listener, app).await.unwrap();
     });
     Ok((registry_service, registry))
 }
@@ -141,6 +139,8 @@ pub struct IndexerMetrics {
     pub checkpoint_db_commit_latency_objects_history_chunks: Histogram,
     pub checkpoint_db_commit_latency_events: Histogram,
     pub checkpoint_db_commit_latency_events_chunks: Histogram,
+    pub checkpoint_db_commit_latency_event_indices: Histogram,
+    pub checkpoint_db_commit_latency_event_indices_chunks: Histogram,
     pub checkpoint_db_commit_latency_packages: Histogram,
     pub checkpoint_db_commit_latency_tx_indices: Histogram,
     pub checkpoint_db_commit_latency_tx_indices_chunks: Histogram,
@@ -496,6 +496,20 @@ impl IndexerMetrics {
                 registry,
             )
             .unwrap(),
+            checkpoint_db_commit_latency_event_indices: register_histogram_with_registry!(
+                "checkpoint_db_commit_latency_event_indices",
+                "Time spent commiting event indices",
+                DATA_INGESTION_LATENCY_SEC_BUCKETS.to_vec(),
+                registry,
+            )
+            .unwrap(),
+            checkpoint_db_commit_latency_event_indices_chunks: register_histogram_with_registry!(
+                "checkpoint_db_commit_latency_event_indices_chunks",
+                "Time spent commiting event indices chunks",
+                DATA_INGESTION_LATENCY_SEC_BUCKETS.to_vec(),
+                registry,
+            )
+            .unwrap(),
             checkpoint_db_commit_latency_packages: register_histogram_with_registry!(
                 "checkpoint_db_commit_latency_packages",
                 "Time spent commiting packages",
diff --git a/crates/sui-indexer/src/models/checkpoints.rs b/crates/sui-indexer/src/models/checkpoints.rs
index ea3579eb624d9..69e2618c82297 100644
--- a/crates/sui-indexer/src/models/checkpoints.rs
+++ b/crates/sui-indexer/src/models/checkpoints.rs
@@ -9,9 +9,15 @@ use sui_types::digests::CheckpointDigest;
 use sui_types::gas::GasCostSummary;
 
 use crate::errors::IndexerError;
-use crate::schema::{checkpoints, pruner_cp_watermark};
+use crate::schema::{chain_identifier, checkpoints, pruner_cp_watermark};
 use crate::types::IndexedCheckpoint;
 
+#[derive(Queryable, Insertable, Selectable, Debug, Clone, Default)]
+#[diesel(table_name = chain_identifier)]
+pub struct StoredChainIdentifier {
+    pub checkpoint_digest: Vec<u8>,
+}
+
 #[derive(Queryable, Insertable, Selectable, Debug, Clone, Default)]
 #[diesel(table_name = checkpoints)]
 pub struct StoredCheckpoint {
@@ -36,6 +42,8 @@ pub struct StoredCheckpoint {
     pub checkpoint_commitments: Vec<u8>,
     pub validator_signature: Vec<u8>,
     pub end_of_epoch_data: Option<Vec<u8>>,
+    pub min_tx_sequence_number: Option<i64>,
+    pub max_tx_sequence_number: Option<i64>,
 }
 
 impl From<&IndexedCheckpoint> for StoredCheckpoint {
@@ -77,6 +85,8 @@ impl From<&IndexedCheckpoint> for StoredCheckpoint {
                 .as_ref()
                 .map(|d| bcs::to_bytes(d).unwrap()),
             end_of_epoch: c.end_of_epoch_data.is_some(),
+            min_tx_sequence_number: Some(c.min_tx_sequence_number as i64),
+            max_tx_sequence_number: Some(c.max_tx_sequence_number as i64),
         }
     }
 }
diff --git a/crates/sui-indexer/src/models/epoch.rs b/crates/sui-indexer/src/models/epoch.rs
index a392fafbbd4d5..0991203d5cd02 100644
--- a/crates/sui-indexer/src/models/epoch.rs
+++ b/crates/sui-indexer/src/models/epoch.rs
@@ -3,9 +3,9 @@
 
 use diesel::{Insertable, Queryable, Selectable};
 
-use crate::errors::IndexerError;
 use crate::schema::epochs;
 use crate::types::IndexedEpochInfo;
+use crate::{errors::IndexerError, schema::feature_flags, schema::protocol_configs};
 use sui_json_rpc_types::{EndOfEpochInfo, EpochInfo};
 use sui_types::sui_system_state::sui_system_state_summary::SuiSystemStateSummary;
 
@@ -33,6 +33,22 @@ pub struct StoredEpochInfo {
     pub epoch_commitments: Option<Vec<u8>>,
 }
 
+#[derive(Queryable, Insertable, Debug, Clone, Default)]
+#[diesel(table_name = protocol_configs)]
+pub struct StoredProtocolConfig {
+    pub protocol_version: i64,
+    pub config_name: String,
+    pub config_value: Option<String>,
+}
+
+#[derive(Queryable, Insertable, Debug, Clone, Default)]
+#[diesel(table_name = feature_flags)]
+pub struct StoredFeatureFlag {
+    pub protocol_version: i64,
+    pub flag_name: String,
+    pub flag_value: bool,
+}
+
 #[derive(Queryable, Selectable, Clone)]
 #[diesel(table_name = epochs)]
 pub struct QueryableEpochInfo {
diff --git a/crates/sui-indexer/src/models/event_indices.rs b/crates/sui-indexer/src/models/event_indices.rs
new file mode 100644
index 0000000000000..08f17cce339d5
--- /dev/null
+++ b/crates/sui-indexer/src/models/event_indices.rs
@@ -0,0 +1,145 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    schema::{
+        event_emit_module, event_emit_package, event_senders, event_struct_instantiation,
+        event_struct_module, event_struct_name, event_struct_package,
+    },
+    types::EventIndex,
+};
+use diesel::prelude::*;
+
+#[derive(Queryable, Insertable, Selectable, Debug, Clone, Default)]
+#[diesel(table_name = event_emit_package)]
+pub struct StoredEventEmitPackage {
+    pub tx_sequence_number: i64,
+    pub event_sequence_number: i64,
+    pub package: Vec<u8>,
+    pub sender: Vec<u8>,
+}
+
+#[derive(Queryable, Insertable, Selectable, Debug, Clone, Default)]
+#[diesel(table_name = event_emit_module)]
+pub struct StoredEventEmitModule {
+    pub tx_sequence_number: i64,
+    pub event_sequence_number: i64,
+    pub package: Vec<u8>,
+    pub module: String,
+    pub sender: Vec<u8>,
+}
+
+#[derive(Queryable, Insertable, Selectable, Debug, Clone, Default)]
+#[diesel(table_name = event_senders)]
+pub struct StoredEventSenders {
+    pub tx_sequence_number: i64,
+    pub event_sequence_number: i64,
+    pub sender: Vec<u8>,
+}
+
+#[derive(Queryable, Insertable, Selectable, Debug, Clone, Default)]
+#[diesel(table_name = event_struct_package)]
+pub struct StoredEventStructPackage {
+    pub tx_sequence_number: i64,
+    pub event_sequence_number: i64,
+    pub package: Vec<u8>,
+    pub sender: Vec<u8>,
+}
+
+#[derive(Queryable, Insertable, Selectable, Debug, Clone, Default)]
+#[diesel(table_name = event_struct_module)]
+pub struct StoredEventStructModule {
+    pub tx_sequence_number: i64,
+    pub event_sequence_number: i64,
+    pub package: Vec<u8>,
+    pub module: String,
+    pub sender: Vec<u8>,
+}
+
+#[derive(Queryable, Insertable, Selectable, Debug, Clone, Default)]
+#[diesel(table_name = event_struct_name)]
+pub struct StoredEventStructName {
+    pub tx_sequence_number: i64,
+    pub event_sequence_number: i64,
+    pub package: Vec<u8>,
+    pub module: String,
+    pub type_name: String,
+    pub sender: Vec<u8>,
+}
+
+#[derive(Queryable, Insertable, Selectable, Debug, Clone, Default)]
+#[diesel(table_name = event_struct_instantiation)]
+pub struct StoredEventStructInstantiation {
+    pub tx_sequence_number: i64,
+    pub event_sequence_number: i64,
+    pub package: Vec<u8>,
+    pub module: String,
+    pub type_instantiation: String,
+    pub sender: Vec<u8>,
+}
+
+impl EventIndex {
+    pub fn split(
+        self: EventIndex,
+    ) -> (
+        StoredEventEmitPackage,
+        StoredEventEmitModule,
+        StoredEventSenders,
+        StoredEventStructPackage,
+        StoredEventStructModule,
+        StoredEventStructName,
+        StoredEventStructInstantiation,
+    ) {
+        let tx_sequence_number = self.tx_sequence_number as i64;
+        let event_sequence_number = self.event_sequence_number as i64;
+        (
+            StoredEventEmitPackage {
+                tx_sequence_number,
+                event_sequence_number,
+                package: self.emit_package.to_vec(),
+                sender: self.sender.to_vec(),
+            },
+            StoredEventEmitModule {
+                tx_sequence_number,
+                event_sequence_number,
+                package: self.emit_package.to_vec(),
+                module: self.emit_module.clone(),
+                sender: self.sender.to_vec(),
+            },
+            StoredEventSenders {
+                tx_sequence_number,
+                event_sequence_number,
+                sender: self.sender.to_vec(),
+            },
+            StoredEventStructPackage {
+                tx_sequence_number,
+                event_sequence_number,
+                package: self.type_package.to_vec(),
+                sender: self.sender.to_vec(),
+            },
+            StoredEventStructModule {
+                tx_sequence_number,
+                event_sequence_number,
+                package: self.type_package.to_vec(),
+                module: self.type_module.clone(),
+                sender: self.sender.to_vec(),
+            },
+            StoredEventStructName {
+                tx_sequence_number,
+                event_sequence_number,
+                package: self.type_package.to_vec(),
+                module: self.type_module.clone(),
+                type_name: self.type_name.clone(),
+                sender: self.sender.to_vec(),
+            },
+            StoredEventStructInstantiation {
+                tx_sequence_number,
+                event_sequence_number,
+                package: self.type_package.to_vec(),
+                module: self.type_module.clone(),
+                type_instantiation: self.type_instantiation.clone(),
+                sender: self.sender.to_vec(),
+            },
+        )
+    }
+}
diff --git a/crates/sui-indexer/src/models/events.rs b/crates/sui-indexer/src/models/events.rs
index 455b22e1741fe..01f79c41d6ab2 100644
--- a/crates/sui-indexer/src/models/events.rs
+++ b/crates/sui-indexer/src/models/events.rs
@@ -31,9 +31,6 @@ pub struct StoredEvent {
     #[diesel(sql_type = diesel::sql_types::Binary)]
     pub transaction_digest: Vec<u8>,
 
-    #[diesel(sql_type = diesel::sql_types::BigInt)]
-    pub checkpoint_sequence_number: i64,
-
     #[cfg(feature = "postgres-feature")]
     #[diesel(sql_type = diesel::sql_types::Array<diesel::sql_types::Nullable<diesel::pg::sql_types::Bytea>>)]
     pub senders: Vec<Option<Vec<u8>>>,
@@ -52,15 +49,6 @@ pub struct StoredEvent {
     #[diesel(sql_type = diesel::sql_types::Text)]
     pub event_type: String,
 
-    #[diesel(sql_type = diesel::sql_types::Binary)]
-    pub event_type_package: Vec<u8>,
-
-    #[diesel(sql_type = diesel::sql_types::Text)]
-    pub event_type_module: String,
-
-    #[diesel(sql_type = diesel::sql_types::Text)]
-    pub event_type_name: String,
-
     #[diesel(sql_type = diesel::sql_types::BigInt)]
     pub timestamp_ms: i64,
 
@@ -81,7 +69,6 @@ impl From<IndexedEvent> for StoredEvent {
             tx_sequence_number: event.tx_sequence_number as i64,
             event_sequence_number: event.event_sequence_number as i64,
             transaction_digest: event.transaction_digest.into_inner().to_vec(),
-            checkpoint_sequence_number: event.checkpoint_sequence_number as i64,
             #[cfg(feature = "postgres-feature")]
             senders: event
                 .senders
@@ -94,9 +81,6 @@ impl From<IndexedEvent> for StoredEvent {
             package: event.package.to_vec(),
             module: event.module.clone(),
             event_type: event.event_type.clone(),
-            event_type_package: event.event_type_package.to_vec(),
-            event_type_module: event.event_type_module.clone(),
-            event_type_name: event.event_type_name.clone(),
             bcs: event.bcs.clone(),
             timestamp_ms: event.timestamp_ms as i64,
         }
diff --git a/crates/sui-indexer/src/models/mod.rs b/crates/sui-indexer/src/models/mod.rs
index 3b8233ec45021..b677e09f1aaad 100644
--- a/crates/sui-indexer/src/models/mod.rs
+++ b/crates/sui-indexer/src/models/mod.rs
@@ -4,7 +4,9 @@
 pub mod checkpoints;
 pub mod display;
 pub mod epoch;
+pub mod event_indices;
 pub mod events;
+pub mod obj_indices;
 pub mod objects;
 pub mod packages;
 pub mod transactions;
diff --git a/crates/sui-indexer/src/models/obj_indices.rs b/crates/sui-indexer/src/models/obj_indices.rs
new file mode 100644
index 0000000000000..7e5298008834c
--- /dev/null
+++ b/crates/sui-indexer/src/models/obj_indices.rs
@@ -0,0 +1,40 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use diesel::prelude::*;
+
+use crate::schema::objects_version;
+
+use super::objects::StoredDeletedObject;
+use super::objects::StoredObject;
+
+/// Model types related to tables that support efficient execution of queries on the `objects`,
+/// `objects_history` and `objects_snapshot` tables.
+
+#[derive(Queryable, Insertable, Debug, Identifiable, Clone, QueryableByName)]
+#[diesel(table_name = objects_version, primary_key(object_id, object_version))]
+pub struct StoredObjectVersion {
+    pub object_id: Vec<u8>,
+    pub object_version: i64,
+    pub cp_sequence_number: i64,
+}
+
+impl From<&StoredObject> for StoredObjectVersion {
+    fn from(o: &StoredObject) -> Self {
+        Self {
+            object_id: o.object_id.clone(),
+            object_version: o.object_version,
+            cp_sequence_number: o.checkpoint_sequence_number,
+        }
+    }
+}
+
+impl From<&StoredDeletedObject> for StoredObjectVersion {
+    fn from(o: &StoredDeletedObject) -> Self {
+        Self {
+            object_id: o.object_id.clone(),
+            object_version: o.object_version,
+            cp_sequence_number: o.checkpoint_sequence_number,
+        }
+    }
+}
diff --git a/crates/sui-indexer/src/models/objects.rs b/crates/sui-indexer/src/models/objects.rs
index a6c74f19e0ce9..03f9cc3c81299 100644
--- a/crates/sui-indexer/src/models/objects.rs
+++ b/crates/sui-indexer/src/models/objects.rs
@@ -19,7 +19,7 @@ use sui_types::object::ObjectRead;
 
 use crate::errors::IndexerError;
 use crate::schema::{objects, objects_history, objects_snapshot};
-use crate::types::{IndexedDeletedObject, IndexedObject, ObjectStatus};
+use crate::types::{owner_to_owner_info, IndexedDeletedObject, IndexedObject, ObjectStatus};
 
 #[derive(Queryable)]
 pub struct DynamicFieldColumn {
@@ -229,30 +229,43 @@ impl From<StoredDeletedObject> for StoredDeletedHistoryObject {
 
 impl From<IndexedObject> for StoredObject {
     fn from(o: IndexedObject) -> Self {
+        let IndexedObject {
+            checkpoint_sequence_number,
+            object,
+            df_info,
+        } = o;
+        let (owner_type, owner_id) = owner_to_owner_info(&object.owner);
+        let coin_type = object
+            .coin_type_maybe()
+            .map(|t| t.to_canonical_string(/* with_prefix */ true));
+        let coin_balance = if coin_type.is_some() {
+            Some(object.get_coin_value_unsafe())
+        } else {
+            None
+        };
         Self {
-            object_id: o.object_id.to_vec(),
-            object_version: o.object_version as i64,
-            object_digest: o.object_digest.into_inner().to_vec(),
-            checkpoint_sequence_number: o.checkpoint_sequence_number as i64,
-            owner_type: o.owner_type as i16,
-            owner_id: o.owner_id.map(|id| id.to_vec()),
-            object_type: o
-                .object
+            object_id: object.id().to_vec(),
+            object_version: object.version().value() as i64,
+            object_digest: object.digest().into_inner().to_vec(),
+            checkpoint_sequence_number: checkpoint_sequence_number as i64,
+            owner_type: owner_type as i16,
+            owner_id: owner_id.map(|id| id.to_vec()),
+            object_type: object
                 .type_()
                 .map(|t| t.to_canonical_string(/* with_prefix */ true)),
-            object_type_package: o.object.type_().map(|t| t.address().to_vec()),
-            object_type_module: o.object.type_().map(|t| t.module().to_string()),
-            object_type_name: o.object.type_().map(|t| t.name().to_string()),
-            serialized_object: bcs::to_bytes(&o.object).unwrap(),
-            coin_type: o.coin_type,
-            coin_balance: o.coin_balance.map(|b| b as i64),
-            df_kind: o.df_info.as_ref().map(|k| match k.type_ {
+            object_type_package: object.type_().map(|t| t.address().to_vec()),
+            object_type_module: object.type_().map(|t| t.module().to_string()),
+            object_type_name: object.type_().map(|t| t.name().to_string()),
+            serialized_object: bcs::to_bytes(&object).unwrap(),
+            coin_type,
+            coin_balance: coin_balance.map(|b| b as i64),
+            df_kind: df_info.as_ref().map(|k| match k.type_ {
                 DynamicFieldType::DynamicField => 0,
                 DynamicFieldType::DynamicObject => 1,
             }),
-            df_name: o.df_info.as_ref().map(|n| bcs::to_bytes(&n.name).unwrap()),
-            df_object_type: o.df_info.as_ref().map(|v| v.object_type.clone()),
-            df_object_id: o.df_info.as_ref().map(|v| v.object_id.to_vec()),
+            df_name: df_info.as_ref().map(|n| bcs::to_bytes(&n.name).unwrap()),
+            df_object_type: df_info.as_ref().map(|v| v.object_type.clone()),
+            df_object_id: df_info.as_ref().map(|v| v.object_id.to_vec()),
         }
     }
 }
@@ -486,7 +499,7 @@ impl TryFrom<StoredObject> for SuiCoin {
         let balance = o
             .coin_balance
             .ok_or(IndexerError::PersistentStorageDataCorruptionError(format!(
-                "Object {} is supposed to be a coin but has an empy coin_balance column",
+                "Object {} is supposed to be a coin but has an empty coin_balance column",
                 coin_object_id,
             )))?;
         Ok(SuiCoin {
diff --git a/crates/sui-indexer/src/models/packages.rs b/crates/sui-indexer/src/models/packages.rs
index 63f61f01fc428..97c8e8fc5b459 100644
--- a/crates/sui-indexer/src/models/packages.rs
+++ b/crates/sui-indexer/src/models/packages.rs
@@ -10,14 +10,20 @@ use diesel::prelude::*;
 #[diesel(table_name = packages, primary_key(package_id))]
 pub struct StoredPackage {
     pub package_id: Vec<u8>,
+    pub original_id: Vec<u8>,
+    pub package_version: i64,
     pub move_package: Vec<u8>,
+    pub checkpoint_sequence_number: i64,
 }
 
 impl From<IndexedPackage> for StoredPackage {
     fn from(p: IndexedPackage) -> Self {
         Self {
             package_id: p.package_id.to_vec(),
+            original_id: p.move_package.original_package_id().to_vec(),
+            package_version: p.move_package.version().value() as i64,
             move_package: bcs::to_bytes(&p.move_package).unwrap(),
+            checkpoint_sequence_number: p.checkpoint_sequence_number as i64,
         }
     }
 }
diff --git a/crates/sui-indexer/src/models/tx_indices.rs b/crates/sui-indexer/src/models/tx_indices.rs
index 86c4ae4c73819..4f942c2e7af0b 100644
--- a/crates/sui-indexer/src/models/tx_indices.rs
+++ b/crates/sui-indexer/src/models/tx_indices.rs
@@ -3,7 +3,8 @@
 
 use crate::{
     schema::{
-        tx_calls, tx_changed_objects, tx_digests, tx_input_objects, tx_recipients, tx_senders,
+        tx_calls_fun, tx_calls_mod, tx_calls_pkg, tx_changed_objects, tx_digests, tx_input_objects,
+        tx_kinds, tx_recipients, tx_senders,
     },
     types::TxIndex,
 };
@@ -24,7 +25,6 @@ pub struct TxDigest {
 #[derive(Queryable, Insertable, Selectable, Debug, Clone, Default)]
 #[diesel(table_name = tx_senders)]
 pub struct StoredTxSenders {
-    pub cp_sequence_number: i64,
     pub tx_sequence_number: i64,
     pub sender: Vec<u8>,
 }
@@ -32,35 +32,52 @@ pub struct StoredTxSenders {
 #[derive(Queryable, Insertable, Selectable, Debug, Clone, Default)]
 #[diesel(table_name = tx_recipients)]
 pub struct StoredTxRecipients {
-    pub cp_sequence_number: i64,
     pub tx_sequence_number: i64,
     pub recipient: Vec<u8>,
+    pub sender: Vec<u8>,
 }
 
 #[derive(Queryable, Insertable, Selectable, Debug, Clone, Default)]
 #[diesel(table_name = tx_input_objects)]
 pub struct StoredTxInputObject {
-    pub cp_sequence_number: i64,
     pub tx_sequence_number: i64,
     pub object_id: Vec<u8>,
+    pub sender: Vec<u8>,
 }
 
 #[derive(Queryable, Insertable, Selectable, Debug, Clone, Default)]
 #[diesel(table_name = tx_changed_objects)]
 pub struct StoredTxChangedObject {
-    pub cp_sequence_number: i64,
     pub tx_sequence_number: i64,
     pub object_id: Vec<u8>,
+    pub sender: Vec<u8>,
+}
+
+#[derive(Queryable, Insertable, Selectable, Debug, Clone, Default)]
+#[diesel(table_name = tx_calls_pkg)]
+pub struct StoredTxPkg {
+    pub tx_sequence_number: i64,
+    pub package: Vec<u8>,
+    pub sender: Vec<u8>,
+}
+
+#[derive(Queryable, Insertable, Selectable, Debug, Clone, Default)]
+#[diesel(table_name = tx_calls_mod)]
+pub struct StoredTxMod {
+    pub tx_sequence_number: i64,
+    pub package: Vec<u8>,
+    pub module: String,
+    pub sender: Vec<u8>,
 }
 
 #[derive(Queryable, Insertable, Selectable, Debug, Clone, Default)]
-#[diesel(table_name = tx_calls)]
-pub struct StoredTxCalls {
-    pub cp_sequence_number: i64,
+#[diesel(table_name = tx_calls_fun)]
+pub struct StoredTxFun {
     pub tx_sequence_number: i64,
     pub package: Vec<u8>,
     pub module: String,
     pub func: String,
+    pub sender: Vec<u8>,
 }
 
 #[derive(Queryable, Insertable, Selectable, Debug, Clone, Default)]
@@ -68,7 +85,13 @@ pub struct StoredTxCalls {
 pub struct StoredTxDigest {
     pub tx_digest: Vec<u8>,
     pub tx_sequence_number: i64,
-    pub cp_sequence_number: i64,
+}
+
+#[derive(Queryable, Insertable, Selectable, Debug, Clone, Default)]
+#[diesel(table_name = tx_kinds)]
+pub struct StoredTxKind {
+    pub tx_kind: i16,
+    pub tx_sequence_number: i64,
 }
 
 #[allow(clippy::type_complexity)]
@@ -80,71 +103,109 @@ impl TxIndex {
         Vec<StoredTxRecipients>,
         Vec<StoredTxInputObject>,
         Vec<StoredTxChangedObject>,
-        Vec<StoredTxCalls>,
+        Vec<StoredTxPkg>,
+        Vec<StoredTxMod>,
+        Vec<StoredTxFun>,
         Vec<StoredTxDigest>,
+        Vec<StoredTxKind>,
     ) {
         let tx_sequence_number = self.tx_sequence_number as i64;
-        let cp_sequence_number = self.checkpoint_sequence_number as i64;
-        let tx_senders = self
-            .senders
-            .iter()
-            .map(|s| StoredTxSenders {
-                cp_sequence_number,
-                tx_sequence_number,
-                sender: s.to_vec(),
-            })
-            .collect();
+        let tx_sender = StoredTxSenders {
+            tx_sequence_number,
+            sender: self.sender.to_vec(),
+        };
         let tx_recipients = self
             .recipients
             .iter()
             .map(|s| StoredTxRecipients {
-                cp_sequence_number,
                 tx_sequence_number,
                 recipient: s.to_vec(),
+                sender: self.sender.to_vec(),
             })
             .collect();
         let tx_input_objects = self
             .input_objects
             .iter()
             .map(|o| StoredTxInputObject {
-                cp_sequence_number,
                 tx_sequence_number,
                 object_id: bcs::to_bytes(&o).unwrap(),
+                sender: self.sender.to_vec(),
             })
             .collect();
         let tx_changed_objects = self
             .changed_objects
             .iter()
             .map(|o| StoredTxChangedObject {
-                cp_sequence_number,
                 tx_sequence_number,
                 object_id: bcs::to_bytes(&o).unwrap(),
+                sender: self.sender.to_vec(),
             })
             .collect();
-        let tx_calls = self
+
+        let mut packages = Vec::new();
+        let mut packages_modules = Vec::new();
+        let mut packages_modules_funcs = Vec::new();
+
+        for (pkg, pkg_mod, pkg_mod_func) in self
             .move_calls
             .iter()
-            .map(|(p, m, f)| StoredTxCalls {
-                cp_sequence_number,
+            .map(|(p, m, f)| (*p, (*p, m.clone()), (*p, m.clone(), f.clone())))
+        {
+            packages.push(pkg);
+            packages_modules.push(pkg_mod);
+            packages_modules_funcs.push(pkg_mod_func);
+        }
+
+        let tx_pkgs = packages
+            .iter()
+            .map(|p| StoredTxPkg {
+                tx_sequence_number,
+                package: p.to_vec(),
+                sender: self.sender.to_vec(),
+            })
+            .collect();
+
+        let tx_mods = packages_modules
+            .iter()
+            .map(|(p, m)| StoredTxMod {
+                tx_sequence_number,
+                package: p.to_vec(),
+                module: m.to_string(),
+                sender: self.sender.to_vec(),
+            })
+            .collect();
+
+        let tx_calls = packages_modules_funcs
+            .iter()
+            .map(|(p, m, f)| StoredTxFun {
                 tx_sequence_number,
                 package: p.to_vec(),
                 module: m.to_string(),
                 func: f.to_string(),
+                sender: self.sender.to_vec(),
             })
             .collect();
+
         let stored_tx_digest = StoredTxDigest {
             tx_digest: self.transaction_digest.into_inner().to_vec(),
             tx_sequence_number,
-            cp_sequence_number,
+        };
+
+        let tx_kind = StoredTxKind {
+            tx_kind: self.tx_kind as i16,
+            tx_sequence_number,
         };
 
         (
-            tx_senders,
+            vec![tx_sender],
             tx_recipients,
             tx_input_objects,
             tx_changed_objects,
+            tx_pkgs,
+            tx_mods,
             tx_calls,
             vec![stored_tx_digest],
+            vec![tx_kind],
         )
     }
 }
diff --git a/crates/sui-indexer/src/schema/mod.rs b/crates/sui-indexer/src/schema/mod.rs
index 2d14fe31d765f..dfba1ad7b7b43 100644
--- a/crates/sui-indexer/src/schema/mod.rs
+++ b/crates/sui-indexer/src/schema/mod.rs
@@ -12,20 +12,34 @@ mod pg;
 
 #[cfg(feature = "postgres-feature")]
 mod inner {
+    pub use crate::schema::pg::chain_identifier;
     pub use crate::schema::pg::checkpoints;
     pub use crate::schema::pg::display;
     pub use crate::schema::pg::epochs;
+    pub use crate::schema::pg::event_emit_module;
+    pub use crate::schema::pg::event_emit_package;
+    pub use crate::schema::pg::event_senders;
+    pub use crate::schema::pg::event_struct_instantiation;
+    pub use crate::schema::pg::event_struct_module;
+    pub use crate::schema::pg::event_struct_name;
+    pub use crate::schema::pg::event_struct_package;
     pub use crate::schema::pg::events;
+    pub use crate::schema::pg::feature_flags;
     pub use crate::schema::pg::objects;
     pub use crate::schema::pg::objects_history;
     pub use crate::schema::pg::objects_snapshot;
+    pub use crate::schema::pg::objects_version;
     pub use crate::schema::pg::packages;
+    pub use crate::schema::pg::protocol_configs;
     pub use crate::schema::pg::pruner_cp_watermark;
     pub use crate::schema::pg::transactions;
-    pub use crate::schema::pg::tx_calls;
+    pub use crate::schema::pg::tx_calls_fun;
+    pub use crate::schema::pg::tx_calls_mod;
+    pub use crate::schema::pg::tx_calls_pkg;
     pub use crate::schema::pg::tx_changed_objects;
     pub use crate::schema::pg::tx_digests;
     pub use crate::schema::pg::tx_input_objects;
+    pub use crate::schema::pg::tx_kinds;
     pub use crate::schema::pg::tx_recipients;
     pub use crate::schema::pg::tx_senders;
 }
@@ -33,38 +47,66 @@ mod inner {
 #[cfg(feature = "mysql-feature")]
 #[cfg(not(feature = "postgres-feature"))]
 mod inner {
+    pub use crate::schema::mysql::chain_identifier;
     pub use crate::schema::mysql::checkpoints;
     pub use crate::schema::mysql::display;
     pub use crate::schema::mysql::epochs;
+    pub use crate::schema::mysql::event_emit_module;
+    pub use crate::schema::mysql::event_emit_package;
+    pub use crate::schema::mysql::event_senders;
+    pub use crate::schema::mysql::event_struct_instantiation;
+    pub use crate::schema::mysql::event_struct_module;
+    pub use crate::schema::mysql::event_struct_name;
+    pub use crate::schema::mysql::event_struct_package;
     pub use crate::schema::mysql::events;
+    pub use crate::schema::mysql::feature_flags;
     pub use crate::schema::mysql::objects;
     pub use crate::schema::mysql::objects_history;
     pub use crate::schema::mysql::objects_snapshot;
+    pub use crate::schema::mysql::objects_version;
     pub use crate::schema::mysql::packages;
+    pub use crate::schema::mysql::protocol_configs;
     pub use crate::schema::mysql::pruner_cp_watermark;
     pub use crate::schema::mysql::transactions;
-    pub use crate::schema::mysql::tx_calls;
+    pub use crate::schema::mysql::tx_calls_fun;
+    pub use crate::schema::mysql::tx_calls_mod;
+    pub use crate::schema::mysql::tx_calls_pkg;
     pub use crate::schema::mysql::tx_changed_objects;
     pub use crate::schema::mysql::tx_digests;
     pub use crate::schema::mysql::tx_input_objects;
+    pub use crate::schema::mysql::tx_kinds;
     pub use crate::schema::mysql::tx_recipients;
     pub use crate::schema::mysql::tx_senders;
 }
 
+pub use inner::chain_identifier;
 pub use inner::checkpoints;
 pub use inner::display;
 pub use inner::epochs;
+pub use inner::event_emit_module;
+pub use inner::event_emit_package;
+pub use inner::event_senders;
+pub use inner::event_struct_instantiation;
+pub use inner::event_struct_module;
+pub use inner::event_struct_name;
+pub use inner::event_struct_package;
 pub use inner::events;
+pub use inner::feature_flags;
 pub use inner::objects;
 pub use inner::objects_history;
 pub use inner::objects_snapshot;
+pub use inner::objects_version;
 pub use inner::packages;
+pub use inner::protocol_configs;
 pub use inner::pruner_cp_watermark;
 pub use inner::transactions;
-pub use inner::tx_calls;
+pub use inner::tx_calls_fun;
+pub use inner::tx_calls_mod;
+pub use inner::tx_calls_pkg;
 pub use inner::tx_changed_objects;
 pub use inner::tx_digests;
 pub use inner::tx_input_objects;
+pub use inner::tx_kinds;
 pub use inner::tx_recipients;
 pub use inner::tx_senders;
 
diff --git a/crates/sui-indexer/src/schema/mysql.rs b/crates/sui-indexer/src/schema/mysql.rs
index fe5590929eed9..4b4799566a0d4 100644
--- a/crates/sui-indexer/src/schema/mysql.rs
+++ b/crates/sui-indexer/src/schema/mysql.rs
@@ -2,6 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 // @generated automatically by Diesel CLI.
 
+diesel::table! {
+    chain_identifier (checkpoint_digest) {
+        checkpoint_digest -> Blob,
+    }
+}
+
 diesel::table! {
     checkpoints (sequence_number) {
         sequence_number -> Bigint,
@@ -20,6 +26,8 @@ diesel::table! {
         checkpoint_commitments -> Mediumblob,
         validator_signature -> Blob,
         end_of_epoch_data -> Nullable<Blob>,
+        min_tx_sequence_number -> Nullable<Bigint>,
+        max_tx_sequence_number -> Nullable<Bigint>
     }
 }
 
@@ -74,6 +82,82 @@ diesel::table! {
     }
 }
 
+diesel::table! {
+    event_emit_module (package, module, tx_sequence_number, event_sequence_number) {
+        package -> Blob,
+        module -> Text,
+        tx_sequence_number -> Bigint,
+        event_sequence_number -> Bigint,
+        sender -> Blob,
+    }
+}
+
+diesel::table! {
+    event_emit_package (package, tx_sequence_number, event_sequence_number) {
+        package -> Blob,
+        tx_sequence_number -> Bigint,
+        event_sequence_number -> Bigint,
+        sender -> Blob,
+    }
+}
+
+diesel::table! {
+    event_senders (sender, tx_sequence_number, event_sequence_number) {
+        sender -> Blob,
+        tx_sequence_number -> Bigint,
+        event_sequence_number -> Bigint,
+    }
+}
+
+diesel::table! {
+    event_struct_instantiation (package, module, type_instantiation, tx_sequence_number, event_sequence_number) {
+        package -> Blob,
+        module -> Text,
+        type_instantiation -> Text,
+        tx_sequence_number -> Bigint,
+        event_sequence_number -> Bigint,
+        sender -> Blob,
+    }
+}
+
+diesel::table! {
+    event_struct_module (package, module, tx_sequence_number, event_sequence_number) {
+        package -> Blob,
+        module -> Text,
+        tx_sequence_number -> Bigint,
+        event_sequence_number -> Bigint,
+        sender -> Blob,
+    }
+}
+
+diesel::table! {
+    event_struct_name (package, module, type_name, tx_sequence_number, event_sequence_number) {
+        package -> Blob,
+        module -> Text,
+        type_name -> Text,
+        tx_sequence_number -> Bigint,
+        event_sequence_number -> Bigint,
+        sender -> Blob,
+    }
+}
+
+diesel::table! {
+    event_struct_package (package, tx_sequence_number, event_sequence_number) {
+        package -> Blob,
+        tx_sequence_number -> Bigint,
+        event_sequence_number -> Bigint,
+        sender -> Blob,
+    }
+}
+
+diesel::table! {
+    feature_flags (protocol_version, flag_name) {
+        protocol_version -> Bigint,
+        flag_name -> Text,
+        flag_value -> Bool,
+    }
+}
+
 diesel::table! {
     objects (object_id) {
         object_id -> Blob,
@@ -142,10 +226,29 @@ diesel::table! {
     }
 }
 
+diesel::table! {
+    objects_version (object_id, object_version) {
+        object_id -> Blob,
+        object_version -> Bigint,
+        cp_sequence_number -> Bigint,
+    }
+}
+
 diesel::table! {
     packages (package_id) {
         package_id -> Blob,
+        original_id -> Blob,
+        package_version -> Bigint,
         move_package -> Mediumblob,
+        checkpoint_sequence_number -> Bigint,
+    }
+}
+
+diesel::table! {
+    protocol_configs (protocol_version, config_name) {
+        protocol_version -> Bigint,
+        config_name -> Text,
+        config_value -> Nullable<Text>,
     }
 }
 
@@ -174,12 +277,29 @@ diesel::table! {
 }
 
 diesel::table! {
-    tx_calls (package, tx_sequence_number, cp_sequence_number) {
-        cp_sequence_number -> Bigint,
+    tx_calls_fun (package, module, func, tx_sequence_number) {
         tx_sequence_number -> Bigint,
         package -> Blob,
         module -> Text,
         func -> Text,
+        sender -> Blob,
+    }
+}
+
+diesel::table! {
+    tx_calls_mod (package, module, tx_sequence_number) {
+        tx_sequence_number -> Bigint,
+        package -> Blob,
+        module -> Text,
+        sender -> Blob,
+    }
+}
+
+diesel::table! {
+    tx_calls_pkg (package, tx_sequence_number) {
+        tx_sequence_number -> Bigint,
+        package -> Blob,
+        sender -> Blob,
     }
 }
 
@@ -188,6 +308,7 @@ diesel::table! {
         cp_sequence_number -> Bigint,
         tx_sequence_number -> Bigint,
         object_id -> Blob,
+        sender -> Blob,
     }
 }
 
@@ -204,6 +325,14 @@ diesel::table! {
         cp_sequence_number -> Bigint,
         tx_sequence_number -> Bigint,
         object_id -> Blob,
+        sender -> Blob,
+    }
+}
+
+diesel::table! {
+    tx_kinds (tx_kind, tx_sequence_number) {
+        tx_sequence_number -> Bigint,
+        tx_kind -> Smallint,
     }
 }
 
@@ -212,6 +341,7 @@ diesel::table! {
         cp_sequence_number -> Bigint,
         tx_sequence_number -> Bigint,
         recipient -> Blob,
+        sender -> Blob,
     }
 }
 
@@ -227,19 +357,32 @@ diesel::table! {
 macro_rules! for_all_tables {
     ($action:path) => {
         $action!(
+            chain_identifier,
             checkpoints,
+            pruner_cp_watermark,
+            display,
             epochs,
+            event_emit_module,
+            event_emit_package,
+            event_senders,
+            event_struct_instantiation,
+            event_struct_module,
+            event_struct_name,
+            event_struct_package,
             events,
             objects,
             objects_history,
             objects_snapshot,
+            objects_version,
             packages,
-            pruner_cp_watermark,
             transactions,
-            tx_calls,
+            tx_calls_fun,
+            tx_calls_mod,
+            tx_calls_pkg,
             tx_changed_objects,
             tx_digests,
             tx_input_objects,
+            tx_kinds,
             tx_recipients,
             tx_senders
         );
diff --git a/crates/sui-indexer/src/schema/pg.rs b/crates/sui-indexer/src/schema/pg.rs
index 68975e8584c12..cbb24fcf8d6ce 100644
--- a/crates/sui-indexer/src/schema/pg.rs
+++ b/crates/sui-indexer/src/schema/pg.rs
@@ -1,7 +1,11 @@
-// Copyright (c) Mysten Labs, Inc.
-// SPDX-License-Identifier: Apache-2.0
 // @generated automatically by Diesel CLI.
 
+diesel::table! {
+    chain_identifier (checkpoint_digest) {
+        checkpoint_digest -> Bytea,
+    }
+}
+
 diesel::table! {
     checkpoints (sequence_number) {
         sequence_number -> Int8,
@@ -20,14 +24,8 @@ diesel::table! {
         checkpoint_commitments -> Bytea,
         validator_signature -> Bytea,
         end_of_epoch_data -> Nullable<Bytea>,
-    }
-}
-
-diesel::table! {
-    pruner_cp_watermark (checkpoint_sequence_number) {
-        checkpoint_sequence_number -> Int8,
-        min_tx_sequence_number -> Int8,
-        max_tx_sequence_number -> Int8,
+        min_tx_sequence_number -> Nullable<Int8>,
+        max_tx_sequence_number -> Nullable<Int8>,
     }
 }
 
@@ -65,41 +63,109 @@ diesel::table! {
 }
 
 diesel::table! {
-    events (tx_sequence_number, event_sequence_number, checkpoint_sequence_number) {
+    event_emit_module (package, module, tx_sequence_number, event_sequence_number) {
+        package -> Bytea,
+        module -> Text,
+        tx_sequence_number -> Int8,
+        event_sequence_number -> Int8,
+        sender -> Bytea,
+    }
+}
+
+diesel::table! {
+    event_emit_package (package, tx_sequence_number, event_sequence_number) {
+        package -> Bytea,
+        tx_sequence_number -> Int8,
+        event_sequence_number -> Int8,
+        sender -> Bytea,
+    }
+}
+
+diesel::table! {
+    event_senders (sender, tx_sequence_number, event_sequence_number) {
+        sender -> Bytea,
+        tx_sequence_number -> Int8,
+        event_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    event_struct_instantiation (package, module, type_instantiation, tx_sequence_number, event_sequence_number) {
+        package -> Bytea,
+        module -> Text,
+        type_instantiation -> Text,
+        tx_sequence_number -> Int8,
+        event_sequence_number -> Int8,
+        sender -> Bytea,
+    }
+}
+
+diesel::table! {
+    event_struct_module (package, module, tx_sequence_number, event_sequence_number) {
+        package -> Bytea,
+        module -> Text,
+        tx_sequence_number -> Int8,
+        event_sequence_number -> Int8,
+        sender -> Bytea,
+    }
+}
+
+diesel::table! {
+    event_struct_name (package, module, type_name, tx_sequence_number, event_sequence_number) {
+        package -> Bytea,
+        module -> Text,
+        type_name -> Text,
+        tx_sequence_number -> Int8,
+        event_sequence_number -> Int8,
+        sender -> Bytea,
+    }
+}
+
+diesel::table! {
+    event_struct_package (package, tx_sequence_number, event_sequence_number) {
+        package -> Bytea,
+        tx_sequence_number -> Int8,
+        event_sequence_number -> Int8,
+        sender -> Bytea,
+    }
+}
+
+diesel::table! {
+    events (tx_sequence_number, event_sequence_number) {
         tx_sequence_number -> Int8,
         event_sequence_number -> Int8,
         transaction_digest -> Bytea,
-        checkpoint_sequence_number -> Int8,
         senders -> Array<Nullable<Bytea>>,
         package -> Bytea,
         module -> Text,
         event_type -> Text,
-        event_type_package -> Bytea,
-        event_type_module -> Text,
-        event_type_name -> Text,
         timestamp_ms -> Int8,
         bcs -> Bytea,
     }
 }
 
 diesel::table! {
-    events_partition_0 (tx_sequence_number, event_sequence_number, checkpoint_sequence_number) {
+    events_partition_0 (tx_sequence_number, event_sequence_number) {
         tx_sequence_number -> Int8,
         event_sequence_number -> Int8,
         transaction_digest -> Bytea,
-        checkpoint_sequence_number -> Int8,
         senders -> Array<Nullable<Bytea>>,
         package -> Bytea,
         module -> Text,
         event_type -> Text,
-        event_type_package -> Bytea,
-        event_type_module -> Text,
-        event_type_name -> Text,
         timestamp_ms -> Int8,
         bcs -> Bytea,
     }
 }
 
+diesel::table! {
+    feature_flags (protocol_version, flag_name) {
+        protocol_version -> Int8,
+        flag_name -> Text,
+        flag_value -> Bool,
+    }
+}
+
 diesel::table! {
     objects (object_id) {
         object_id -> Bytea,
@@ -192,120 +258,2479 @@ diesel::table! {
 }
 
 diesel::table! {
-    packages (package_id) {
-        package_id -> Bytea,
-        move_package -> Bytea,
+    objects_version (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
     }
 }
 
 diesel::table! {
-    transactions (tx_sequence_number, checkpoint_sequence_number) {
-        tx_sequence_number -> Int8,
-        transaction_digest -> Bytea,
-        raw_transaction -> Bytea,
-        raw_effects -> Bytea,
-        checkpoint_sequence_number -> Int8,
-        timestamp_ms -> Int8,
-        object_changes -> Array<Nullable<Bytea>>,
-        balance_changes -> Array<Nullable<Bytea>>,
-        events -> Array<Nullable<Bytea>>,
-        transaction_kind -> Int2,
-        success_command_count -> Int2,
+    objects_version_00 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
     }
 }
 
 diesel::table! {
-    transactions_partition_0 (tx_sequence_number, checkpoint_sequence_number) {
-        tx_sequence_number -> Int8,
-        transaction_digest -> Bytea,
-        raw_transaction -> Bytea,
-        raw_effects -> Bytea,
-        checkpoint_sequence_number -> Int8,
-        timestamp_ms -> Int8,
-        object_changes -> Array<Nullable<Bytea>>,
-        balance_changes -> Array<Nullable<Bytea>>,
-        events -> Array<Nullable<Bytea>>,
-        transaction_kind -> Int2,
-        success_command_count -> Int2,
+    objects_version_01 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
     }
 }
 
 diesel::table! {
-    tx_calls (package, tx_sequence_number, cp_sequence_number) {
+    objects_version_02 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
         cp_sequence_number -> Int8,
-        tx_sequence_number -> Int8,
-        package -> Bytea,
-        module -> Text,
-        func -> Text,
     }
 }
 
 diesel::table! {
-    tx_changed_objects (object_id, tx_sequence_number, cp_sequence_number) {
+    objects_version_03 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
         cp_sequence_number -> Int8,
-        tx_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_04 (object_id, object_version) {
         object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
     }
 }
 
 diesel::table! {
-    tx_digests (tx_digest) {
-        tx_digest -> Bytea,
+    objects_version_05 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
         cp_sequence_number -> Int8,
-        tx_sequence_number -> Int8,
     }
 }
 
 diesel::table! {
-    tx_input_objects (object_id, tx_sequence_number, cp_sequence_number) {
+    objects_version_06 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
         cp_sequence_number -> Int8,
-        tx_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_07 (object_id, object_version) {
         object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
     }
 }
 
 diesel::table! {
-    tx_recipients (recipient, tx_sequence_number, cp_sequence_number) {
+    objects_version_08 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_09 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_0a (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_0b (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_0c (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_0d (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_0e (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_0f (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_10 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_11 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_12 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_13 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_14 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_15 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_16 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_17 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
         cp_sequence_number -> Int8,
-        tx_sequence_number -> Int8,
-        recipient -> Bytea,
     }
 }
 
 diesel::table! {
-    tx_senders (sender, tx_sequence_number, cp_sequence_number) {
+    objects_version_18 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
         cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_19 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_1a (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_1b (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_1c (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_1d (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_1e (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_1f (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_20 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_21 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_22 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_23 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_24 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_25 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_26 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_27 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_28 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_29 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_2a (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_2b (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_2c (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_2d (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_2e (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_2f (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_30 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_31 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_32 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_33 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_34 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_35 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_36 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_37 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_38 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_39 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_3a (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_3b (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_3c (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_3d (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_3e (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_3f (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_40 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_41 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_42 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_43 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_44 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_45 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_46 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_47 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_48 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_49 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_4a (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_4b (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_4c (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_4d (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_4e (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_4f (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_50 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_51 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_52 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_53 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_54 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_55 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_56 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_57 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_58 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_59 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_5a (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_5b (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_5c (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_5d (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_5e (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_5f (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_60 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_61 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_62 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_63 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_64 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_65 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_66 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_67 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_68 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_69 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_6a (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_6b (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_6c (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_6d (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_6e (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_6f (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_70 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_71 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_72 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_73 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_74 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_75 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_76 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_77 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_78 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_79 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_7a (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_7b (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_7c (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_7d (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_7e (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_7f (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_80 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_81 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_82 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_83 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_84 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_85 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_86 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_87 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_88 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_89 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_8a (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_8b (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_8c (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_8d (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_8e (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_8f (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_90 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_91 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_92 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_93 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_94 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_95 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_96 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_97 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_98 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_99 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_9a (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_9b (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_9c (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_9d (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_9e (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_9f (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_a0 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_a1 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_a2 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_a3 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_a4 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_a5 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_a6 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_a7 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_a8 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_a9 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_aa (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_ab (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_ac (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_ad (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_ae (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_af (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_b0 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_b1 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_b2 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_b3 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_b4 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_b5 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_b6 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_b7 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_b8 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_b9 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_ba (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_bb (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_bc (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_bd (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_be (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_bf (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_c0 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_c1 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_c2 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_c3 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_c4 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_c5 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_c6 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_c7 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_c8 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_c9 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_ca (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_cb (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_cc (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_cd (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_ce (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_cf (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_d0 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_d1 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_d2 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_d3 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_d4 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_d5 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_d6 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_d7 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_d8 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_d9 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_da (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_db (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_dc (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_dd (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_de (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_df (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_e0 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_e1 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_e2 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_e3 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_e4 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_e5 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_e6 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_e7 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_e8 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_e9 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_ea (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_eb (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_ec (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_ed (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_ee (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_ef (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_f0 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_f1 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_f2 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_f3 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_f4 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_f5 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_f6 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_f7 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_f8 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_f9 (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_fa (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_fb (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_fc (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_fd (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_fe (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    objects_version_ff (object_id, object_version) {
+        object_id -> Bytea,
+        object_version -> Int8,
+        cp_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    packages (package_id, original_id, package_version) {
+        package_id -> Bytea,
+        original_id -> Bytea,
+        package_version -> Int8,
+        move_package -> Bytea,
+        checkpoint_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    protocol_configs (protocol_version, config_name) {
+        protocol_version -> Int8,
+        config_name -> Text,
+        config_value -> Nullable<Text>,
+    }
+}
+
+diesel::table! {
+    pruner_cp_watermark (checkpoint_sequence_number) {
+        checkpoint_sequence_number -> Int8,
+        min_tx_sequence_number -> Int8,
+        max_tx_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    transactions (tx_sequence_number) {
+        tx_sequence_number -> Int8,
+        transaction_digest -> Bytea,
+        raw_transaction -> Bytea,
+        raw_effects -> Bytea,
+        checkpoint_sequence_number -> Int8,
+        timestamp_ms -> Int8,
+        object_changes -> Array<Nullable<Bytea>>,
+        balance_changes -> Array<Nullable<Bytea>>,
+        events -> Array<Nullable<Bytea>>,
+        transaction_kind -> Int2,
+        success_command_count -> Int2,
+    }
+}
+
+diesel::table! {
+    transactions_partition_0 (tx_sequence_number) {
+        tx_sequence_number -> Int8,
+        transaction_digest -> Bytea,
+        raw_transaction -> Bytea,
+        raw_effects -> Bytea,
+        checkpoint_sequence_number -> Int8,
+        timestamp_ms -> Int8,
+        object_changes -> Array<Nullable<Bytea>>,
+        balance_changes -> Array<Nullable<Bytea>>,
+        events -> Array<Nullable<Bytea>>,
+        transaction_kind -> Int2,
+        success_command_count -> Int2,
+    }
+}
+
+diesel::table! {
+    tx_calls_fun (package, module, func, tx_sequence_number) {
+        tx_sequence_number -> Int8,
+        package -> Bytea,
+        module -> Text,
+        func -> Text,
+        sender -> Bytea,
+    }
+}
+
+diesel::table! {
+    tx_calls_mod (package, module, tx_sequence_number) {
+        tx_sequence_number -> Int8,
+        package -> Bytea,
+        module -> Text,
+        sender -> Bytea,
+    }
+}
+
+diesel::table! {
+    tx_calls_pkg (package, tx_sequence_number) {
+        tx_sequence_number -> Int8,
+        package -> Bytea,
+        sender -> Bytea,
+    }
+}
+
+diesel::table! {
+    tx_changed_objects (object_id, tx_sequence_number) {
+        tx_sequence_number -> Int8,
+        object_id -> Bytea,
+        sender -> Bytea,
+    }
+}
+
+diesel::table! {
+    tx_digests (tx_digest) {
+        tx_digest -> Bytea,
+        tx_sequence_number -> Int8,
+    }
+}
+
+diesel::table! {
+    tx_input_objects (object_id, tx_sequence_number) {
+        tx_sequence_number -> Int8,
+        object_id -> Bytea,
+        sender -> Bytea,
+    }
+}
+
+diesel::table! {
+    tx_kinds (tx_kind, tx_sequence_number) {
+        tx_sequence_number -> Int8,
+        tx_kind -> Int2,
+    }
+}
+
+diesel::table! {
+    tx_recipients (recipient, tx_sequence_number) {
+        tx_sequence_number -> Int8,
+        recipient -> Bytea,
+        sender -> Bytea,
+    }
+}
+
+diesel::table! {
+    tx_senders (sender, tx_sequence_number) {
         tx_sequence_number -> Int8,
         sender -> Bytea,
     }
 }
 
-#[macro_export]
-macro_rules! for_all_tables {
-    ($action:path) => {
-        $action!(
-            checkpoints,
-            pruner_cp_watermark,
-            display,
-            epochs,
-            events,
-            events_partition_0,
-            objects,
-            objects_history,
-            objects_history_partition_0,
-            objects_snapshot,
-            packages,
-            transactions,
-            transactions_partition_0,
-            tx_calls,
-            tx_changed_objects,
-            tx_digests,
-            tx_input_objects,
-            tx_recipients,
-            tx_senders
-        );
-    };
-}
-pub use for_all_tables;
-
-for_all_tables!(diesel::allow_tables_to_appear_in_same_query);
+diesel::allow_tables_to_appear_in_same_query!(
+    chain_identifier,
+    checkpoints,
+    display,
+    epochs,
+    event_emit_module,
+    event_emit_package,
+    event_senders,
+    event_struct_instantiation,
+    event_struct_module,
+    event_struct_name,
+    event_struct_package,
+    events,
+    events_partition_0,
+    feature_flags,
+    objects,
+    objects_history,
+    objects_history_partition_0,
+    objects_snapshot,
+    objects_version,
+    objects_version_00,
+    objects_version_01,
+    objects_version_02,
+    objects_version_03,
+    objects_version_04,
+    objects_version_05,
+    objects_version_06,
+    objects_version_07,
+    objects_version_08,
+    objects_version_09,
+    objects_version_0a,
+    objects_version_0b,
+    objects_version_0c,
+    objects_version_0d,
+    objects_version_0e,
+    objects_version_0f,
+    objects_version_10,
+    objects_version_11,
+    objects_version_12,
+    objects_version_13,
+    objects_version_14,
+    objects_version_15,
+    objects_version_16,
+    objects_version_17,
+    objects_version_18,
+    objects_version_19,
+    objects_version_1a,
+    objects_version_1b,
+    objects_version_1c,
+    objects_version_1d,
+    objects_version_1e,
+    objects_version_1f,
+    objects_version_20,
+    objects_version_21,
+    objects_version_22,
+    objects_version_23,
+    objects_version_24,
+    objects_version_25,
+    objects_version_26,
+    objects_version_27,
+    objects_version_28,
+    objects_version_29,
+    objects_version_2a,
+    objects_version_2b,
+    objects_version_2c,
+    objects_version_2d,
+    objects_version_2e,
+    objects_version_2f,
+    objects_version_30,
+    objects_version_31,
+    objects_version_32,
+    objects_version_33,
+    objects_version_34,
+    objects_version_35,
+    objects_version_36,
+    objects_version_37,
+    objects_version_38,
+    objects_version_39,
+    objects_version_3a,
+    objects_version_3b,
+    objects_version_3c,
+    objects_version_3d,
+    objects_version_3e,
+    objects_version_3f,
+    objects_version_40,
+    objects_version_41,
+    objects_version_42,
+    objects_version_43,
+    objects_version_44,
+    objects_version_45,
+    objects_version_46,
+    objects_version_47,
+    objects_version_48,
+    objects_version_49,
+    objects_version_4a,
+    objects_version_4b,
+    objects_version_4c,
+    objects_version_4d,
+    objects_version_4e,
+    objects_version_4f,
+    objects_version_50,
+    objects_version_51,
+    objects_version_52,
+    objects_version_53,
+    objects_version_54,
+    objects_version_55,
+    objects_version_56,
+    objects_version_57,
+    objects_version_58,
+    objects_version_59,
+    objects_version_5a,
+    objects_version_5b,
+    objects_version_5c,
+    objects_version_5d,
+    objects_version_5e,
+    objects_version_5f,
+    objects_version_60,
+    objects_version_61,
+    objects_version_62,
+    objects_version_63,
+    objects_version_64,
+    objects_version_65,
+    objects_version_66,
+    objects_version_67,
+    objects_version_68,
+    objects_version_69,
+    objects_version_6a,
+    objects_version_6b,
+    objects_version_6c,
+    objects_version_6d,
+    objects_version_6e,
+    objects_version_6f,
+    objects_version_70,
+    objects_version_71,
+    objects_version_72,
+    objects_version_73,
+    objects_version_74,
+    objects_version_75,
+    objects_version_76,
+    objects_version_77,
+    objects_version_78,
+    objects_version_79,
+    objects_version_7a,
+    objects_version_7b,
+    objects_version_7c,
+    objects_version_7d,
+    objects_version_7e,
+    objects_version_7f,
+    objects_version_80,
+    objects_version_81,
+    objects_version_82,
+    objects_version_83,
+    objects_version_84,
+    objects_version_85,
+    objects_version_86,
+    objects_version_87,
+    objects_version_88,
+    objects_version_89,
+    objects_version_8a,
+    objects_version_8b,
+    objects_version_8c,
+    objects_version_8d,
+    objects_version_8e,
+    objects_version_8f,
+    objects_version_90,
+    objects_version_91,
+    objects_version_92,
+    objects_version_93,
+    objects_version_94,
+    objects_version_95,
+    objects_version_96,
+    objects_version_97,
+    objects_version_98,
+    objects_version_99,
+    objects_version_9a,
+    objects_version_9b,
+    objects_version_9c,
+    objects_version_9d,
+    objects_version_9e,
+    objects_version_9f,
+    objects_version_a0,
+    objects_version_a1,
+    objects_version_a2,
+    objects_version_a3,
+    objects_version_a4,
+    objects_version_a5,
+    objects_version_a6,
+    objects_version_a7,
+    objects_version_a8,
+    objects_version_a9,
+    objects_version_aa,
+    objects_version_ab,
+    objects_version_ac,
+    objects_version_ad,
+    objects_version_ae,
+    objects_version_af,
+    objects_version_b0,
+    objects_version_b1,
+    objects_version_b2,
+    objects_version_b3,
+    objects_version_b4,
+    objects_version_b5,
+    objects_version_b6,
+    objects_version_b7,
+    objects_version_b8,
+    objects_version_b9,
+    objects_version_ba,
+    objects_version_bb,
+    objects_version_bc,
+    objects_version_bd,
+    objects_version_be,
+    objects_version_bf,
+    objects_version_c0,
+    objects_version_c1,
+    objects_version_c2,
+    objects_version_c3,
+    objects_version_c4,
+    objects_version_c5,
+    objects_version_c6,
+    objects_version_c7,
+    objects_version_c8,
+    objects_version_c9,
+    objects_version_ca,
+    objects_version_cb,
+    objects_version_cc,
+    objects_version_cd,
+    objects_version_ce,
+    objects_version_cf,
+    objects_version_d0,
+    objects_version_d1,
+    objects_version_d2,
+    objects_version_d3,
+    objects_version_d4,
+    objects_version_d5,
+    objects_version_d6,
+    objects_version_d7,
+    objects_version_d8,
+    objects_version_d9,
+    objects_version_da,
+    objects_version_db,
+    objects_version_dc,
+    objects_version_dd,
+    objects_version_de,
+    objects_version_df,
+    objects_version_e0,
+    objects_version_e1,
+    objects_version_e2,
+    objects_version_e3,
+    objects_version_e4,
+    objects_version_e5,
+    objects_version_e6,
+    objects_version_e7,
+    objects_version_e8,
+    objects_version_e9,
+    objects_version_ea,
+    objects_version_eb,
+    objects_version_ec,
+    objects_version_ed,
+    objects_version_ee,
+    objects_version_ef,
+    objects_version_f0,
+    objects_version_f1,
+    objects_version_f2,
+    objects_version_f3,
+    objects_version_f4,
+    objects_version_f5,
+    objects_version_f6,
+    objects_version_f7,
+    objects_version_f8,
+    objects_version_f9,
+    objects_version_fa,
+    objects_version_fb,
+    objects_version_fc,
+    objects_version_fd,
+    objects_version_fe,
+    objects_version_ff,
+    packages,
+    protocol_configs,
+    pruner_cp_watermark,
+    transactions,
+    transactions_partition_0,
+    tx_calls_fun,
+    tx_calls_mod,
+    tx_calls_pkg,
+    tx_changed_objects,
+    tx_digests,
+    tx_input_objects,
+    tx_kinds,
+    tx_recipients,
+    tx_senders,
+);
diff --git a/crates/sui-indexer/src/store/indexer_store.rs b/crates/sui-indexer/src/store/indexer_store.rs
index 868fe31416a6c..2fd2c1531b76a 100644
--- a/crates/sui-indexer/src/store/indexer_store.rs
+++ b/crates/sui-indexer/src/store/indexer_store.rs
@@ -10,7 +10,9 @@ use crate::errors::IndexerError;
 use crate::handlers::{EpochToCommit, TransactionObjectChangesToCommit};
 use crate::models::display::StoredDisplay;
 use crate::models::objects::{StoredDeletedObject, StoredObject};
-use crate::types::{IndexedCheckpoint, IndexedEvent, IndexedPackage, IndexedTransaction, TxIndex};
+use crate::types::{
+    EventIndex, IndexedCheckpoint, IndexedEvent, IndexedPackage, IndexedTransaction, TxIndex,
+};
 
 #[allow(clippy::large_enum_variant)]
 pub enum ObjectChangeToCommit {
@@ -30,6 +32,13 @@ pub trait IndexerStore: Any + Clone + Sync + Send + 'static {
         &self,
     ) -> Result<Option<u64>, IndexerError>;
 
+    async fn get_chain_identifier(&self) -> Result<Option<Vec<u8>>, IndexerError>;
+
+    fn persist_protocol_configs_and_feature_flags(
+        &self,
+        chain_id: Vec<u8>,
+    ) -> Result<(), IndexerError>;
+
     async fn persist_objects(
         &self,
         object_changes: Vec<TransactionObjectChangesToCommit>,
@@ -63,6 +72,11 @@ pub trait IndexerStore: Any + Clone + Sync + Send + 'static {
     async fn persist_tx_indices(&self, indices: Vec<TxIndex>) -> Result<(), IndexerError>;
 
     async fn persist_events(&self, events: Vec<IndexedEvent>) -> Result<(), IndexerError>;
+    async fn persist_event_indices(
+        &self,
+        event_indices: Vec<EventIndex>,
+    ) -> Result<(), IndexerError>;
+
     async fn persist_displays(
         &self,
         display_updates: BTreeMap<String, StoredDisplay>,
diff --git a/crates/sui-indexer/src/store/mod.rs b/crates/sui-indexer/src/store/mod.rs
index ae04c2ea1c1c2..f520f6afa1414 100644
--- a/crates/sui-indexer/src/store/mod.rs
+++ b/crates/sui-indexer/src/store/mod.rs
@@ -11,7 +11,7 @@ pub mod pg_partition_manager;
 
 pub mod diesel_macro {
     thread_local! {
-        pub static CALLED_FROM_BLOCKING_POOL: std::cell::RefCell<bool> = std::cell::RefCell::new(false);
+        pub static CALLED_FROM_BLOCKING_POOL: std::cell::RefCell<bool> = const { std::cell::RefCell::new(false) };
     }
 
     #[macro_export]
@@ -292,10 +292,11 @@ pub mod diesel_macro {
     /// Check that we are in a context conducive to making blocking calls.
     /// This is done by either:
     /// - Checking that we are not inside a tokio runtime context
+    ///
     /// Or:
     /// - If we are inside a tokio runtime context, ensure that the call went through
-    /// `IndexerReader::spawn_blocking` which properly moves the blocking call to a blocking thread
-    /// pool.
+    ///     `IndexerReader::spawn_blocking` which properly moves the blocking call to a blocking thread
+    ///     pool.
     #[macro_export]
     macro_rules! blocking_call_is_ok_or_panic {
         () => {{
@@ -312,6 +313,36 @@ pub mod diesel_macro {
         }};
     }
 
+    #[macro_export]
+    macro_rules! persist_chunk_into_table {
+        ($table:expr, $chunk:expr, $pool:expr) => {{
+            let now = std::time::Instant::now();
+            let chunk_len = $chunk.len();
+            transactional_blocking_with_retry!(
+                $pool,
+                |conn| {
+                    for chunk in $chunk.chunks(PG_COMMIT_CHUNK_SIZE_INTRA_DB_TX) {
+                        insert_or_ignore_into!($table, chunk, conn);
+                    }
+                    Ok::<(), IndexerError>(())
+                },
+                PG_DB_COMMIT_SLEEP_DURATION
+            )
+            .tap_ok(|_| {
+                let elapsed = now.elapsed().as_secs_f64();
+                info!(
+                    elapsed,
+                    "Persisted {} rows to {}",
+                    chunk_len,
+                    stringify!($table),
+                );
+            })
+            .tap_err(|e| {
+                tracing::error!("Failed to persist {} with error: {}", stringify!($table), e);
+            })
+        }};
+    }
+
     pub use blocking_call_is_ok_or_panic;
     pub use read_only_blocking;
     pub use read_only_repeatable_blocking;
diff --git a/crates/sui-indexer/src/store/pg_indexer_store.rs b/crates/sui-indexer/src/store/pg_indexer_store.rs
index fc4537cf73084..23080f3f1fcaa 100644
--- a/crates/sui-indexer/src/store/pg_indexer_store.rs
+++ b/crates/sui-indexer/src/store/pg_indexer_store.rs
@@ -20,6 +20,7 @@ use itertools::Itertools;
 use tap::TapFallible;
 use tracing::info;
 
+use sui_protocol_config::ProtocolConfig;
 use sui_types::base_types::ObjectID;
 
 use crate::db::ConnectionPool;
@@ -27,11 +28,14 @@ use crate::errors::{Context, IndexerError};
 use crate::handlers::EpochToCommit;
 use crate::handlers::TransactionObjectChangesToCommit;
 use crate::metrics::IndexerMetrics;
+use crate::models::checkpoints::StoredChainIdentifier;
 use crate::models::checkpoints::StoredCheckpoint;
 use crate::models::checkpoints::StoredCpTx;
 use crate::models::display::StoredDisplay;
 use crate::models::epoch::StoredEpochInfo;
+use crate::models::epoch::{StoredFeatureFlag, StoredProtocolConfig};
 use crate::models::events::StoredEvent;
+use crate::models::obj_indices::StoredObjectVersion;
 use crate::models::objects::{
     StoredDeletedHistoryObject, StoredDeletedObject, StoredHistoryObject, StoredObject,
     StoredObjectSnapshot,
@@ -39,13 +43,17 @@ use crate::models::objects::{
 use crate::models::packages::StoredPackage;
 use crate::models::transactions::StoredTransaction;
 use crate::schema::{
-    checkpoints, display, epochs, events, objects, objects_history, objects_snapshot, packages,
-    pruner_cp_watermark, transactions, tx_calls, tx_changed_objects, tx_digests, tx_input_objects,
+    chain_identifier, checkpoints, display, epochs, event_emit_module, event_emit_package,
+    event_senders, event_struct_instantiation, event_struct_module, event_struct_name,
+    event_struct_package, events, feature_flags, objects, objects_history, objects_snapshot,
+    objects_version, packages, protocol_configs, pruner_cp_watermark, transactions, tx_calls_fun,
+    tx_calls_mod, tx_calls_pkg, tx_changed_objects, tx_digests, tx_input_objects, tx_kinds,
     tx_recipients, tx_senders,
 };
+use crate::types::EventIndex;
 use crate::types::{IndexedCheckpoint, IndexedEvent, IndexedPackage, IndexedTransaction, TxIndex};
 use crate::{
-    insert_or_ignore_into, on_conflict_do_update, read_only_blocking,
+    insert_or_ignore_into, on_conflict_do_update, persist_chunk_into_table, read_only_blocking,
     transactional_blocking_with_retry,
 };
 
@@ -55,6 +63,7 @@ use super::ObjectChangeToCommit;
 
 #[cfg(feature = "postgres-feature")]
 use diesel::upsert::excluded;
+use sui_types::digests::{ChainIdentifier, CheckpointDigest};
 
 #[macro_export]
 macro_rules! chunk {
@@ -68,7 +77,7 @@ macro_rules! chunk {
     }};
 }
 
-macro_rules! prune_tx_indice_table {
+macro_rules! prune_tx_or_event_indice_table {
     ($table:ident, $conn:expr, $min_tx:expr, $max_tx:expr, $context_msg:expr) => {
         diesel::delete($table::table.filter($table::tx_sequence_number.between($min_tx, $max_tx)))
             .execute($conn)
@@ -126,6 +135,7 @@ SET object_version = EXCLUDED.object_version,
 pub struct PgIndexerStoreConfig {
     pub parallel_chunk_size: usize,
     pub parallel_objects_chunk_size: usize,
+    #[allow(unused)]
     pub epochs_to_keep: Option<u64>,
 }
 
@@ -190,6 +200,38 @@ impl<T: R2D2Connection + 'static> PgIndexerStore<T> {
         .context("Failed reading latest epoch id from PostgresDB")
     }
 
+    /// Get the range of the protocol versions that need to be indexed.
+    pub fn get_protocol_version_index_range(&self) -> Result<(i64, i64), IndexerError> {
+        // We start indexing from the next protocol version after the latest one stored in the db.
+        let start = read_only_blocking!(&self.blocking_cp, |conn| {
+            protocol_configs::dsl::protocol_configs
+                .select(max(protocol_configs::protocol_version))
+                .first::<Option<i64>>(conn)
+        })
+        .context("Failed reading latest protocol version from PostgresDB")?
+        .map_or(1, |v| v + 1);
+
+        // We end indexing at the protocol version of the latest epoch stored in the db.
+        let end = read_only_blocking!(&self.blocking_cp, |conn| {
+            epochs::dsl::epochs
+                .select(max(epochs::protocol_version))
+                .first::<Option<i64>>(conn)
+        })
+        .context("Failed reading latest epoch protocol version from PostgresDB")?
+        .unwrap_or(1);
+        Ok((start, end))
+    }
+
+    pub fn get_chain_identifier(&self) -> Result<Option<Vec<u8>>, IndexerError> {
+        read_only_blocking!(&self.blocking_cp, |conn| {
+            chain_identifier::dsl::chain_identifier
+                .select(chain_identifier::checkpoint_digest)
+                .first::<Vec<u8>>(conn)
+                .optional()
+        })
+        .context("Failed reading chain id from PostgresDB")
+    }
+
     fn get_latest_checkpoint_sequence_number(&self) -> Result<Option<u64>, IndexerError> {
         read_only_blocking!(&self.blocking_cp, |conn| {
             checkpoints::dsl::checkpoints
@@ -461,6 +503,12 @@ impl<T: R2D2Connection + 'static> PgIndexerStore<T> {
                                 .eq(excluded(objects_snapshot::checkpoint_sequence_number)),
                             objects_snapshot::owner_type.eq(excluded(objects_snapshot::owner_type)),
                             objects_snapshot::owner_id.eq(excluded(objects_snapshot::owner_id)),
+                            objects_snapshot::object_type_package
+                                .eq(excluded(objects_snapshot::object_type_package)),
+                            objects_snapshot::object_type_module
+                                .eq(excluded(objects_snapshot::object_type_module)),
+                            objects_snapshot::object_type_name
+                                .eq(excluded(objects_snapshot::object_type_name)),
                             objects_snapshot::object_type
                                 .eq(excluded(objects_snapshot::object_type)),
                             objects_snapshot::serialized_object
@@ -483,6 +531,9 @@ impl<T: R2D2Connection + 'static> PgIndexerStore<T> {
                                 .eq(excluded.checkpoint_sequence_number),
                             objects_snapshot::owner_type.eq(excluded.owner_type),
                             objects_snapshot::owner_id.eq(excluded.owner_id),
+                            objects_snapshot::object_type_package.eq(excluded.object_type_package),
+                            objects_snapshot::object_type_module.eq(excluded.object_type_module),
+                            objects_snapshot::object_type_name.eq(excluded.object_type_name),
                             objects_snapshot::object_type.eq(excluded.object_type),
                             objects_snapshot::serialized_object.eq(excluded.serialized_object),
                             objects_snapshot::coin_type.eq(excluded.coin_type),
@@ -521,13 +572,16 @@ impl<T: R2D2Connection + 'static> PgIndexerStore<T> {
             .checkpoint_db_commit_latency_objects_history_chunks
             .start_timer();
         let mut mutated_objects: Vec<StoredHistoryObject> = vec![];
+        let mut object_versions: Vec<StoredObjectVersion> = vec![];
         let mut deleted_object_ids: Vec<StoredDeletedHistoryObject> = vec![];
         for object in objects {
             match object {
                 ObjectChangeToCommit::MutatedObject(stored_object) => {
+                    object_versions.push(StoredObjectVersion::from(&stored_object));
                     mutated_objects.push(stored_object.into());
                 }
                 ObjectChangeToCommit::DeletedObject(stored_deleted_object) => {
+                    object_versions.push(StoredObjectVersion::from(&stored_deleted_object));
                     deleted_object_ids.push(stored_deleted_object.into());
                 }
             }
@@ -546,6 +600,11 @@ impl<T: R2D2Connection + 'static> PgIndexerStore<T> {
                     );
                 }
 
+                for object_version_chunk in object_versions.chunks(PG_COMMIT_CHUNK_SIZE_INTRA_DB_TX)
+                {
+                    insert_or_ignore_into!(objects_version::table, object_version_chunk, conn);
+                }
+
                 for deleted_objects_chunk in
                     deleted_object_ids.chunks(PG_COMMIT_CHUNK_SIZE_INTRA_DB_TX)
                 {
@@ -598,8 +657,29 @@ impl<T: R2D2Connection + 'static> PgIndexerStore<T> {
     }
 
     fn persist_checkpoints(&self, checkpoints: Vec<IndexedCheckpoint>) -> Result<(), IndexerError> {
-        if checkpoints.is_empty() {
+        let Some(first_checkpoint) = checkpoints.first() else {
             return Ok(());
+        };
+
+        // If the first checkpoint has sequence number 0, we need to persist the digest as
+        // chain identifier.
+        if first_checkpoint.sequence_number == 0 {
+            let checkpoint_digest = first_checkpoint.checkpoint_digest.into_inner().to_vec();
+            self.persist_protocol_configs_and_feature_flags(checkpoint_digest.clone())?;
+            transactional_blocking_with_retry!(
+                &self.blocking_cp,
+                |conn| {
+                    let checkpoint_digest =
+                        first_checkpoint.checkpoint_digest.into_inner().to_vec();
+                    insert_or_ignore_into!(
+                        chain_identifier::table,
+                        StoredChainIdentifier { checkpoint_digest },
+                        conn
+                    );
+                    Ok::<(), IndexerError>(())
+                },
+                PG_DB_COMMIT_SLEEP_DURATION
+            )?;
         }
         let guard = self
             .metrics
@@ -786,13 +866,144 @@ impl<T: R2D2Connection + 'static> PgIndexerStore<T> {
         })
     }
 
+    async fn persist_event_indices_chunk(
+        &self,
+        indices: Vec<EventIndex>,
+    ) -> Result<(), IndexerError> {
+        let guard = self
+            .metrics
+            .checkpoint_db_commit_latency_event_indices_chunks
+            .start_timer();
+        let len = indices.len();
+        let (
+            event_emit_packages,
+            event_emit_modules,
+            event_senders,
+            event_struct_packages,
+            event_struct_modules,
+            event_struct_names,
+            event_struct_instantiations,
+        ) = indices.into_iter().map(|i| i.split()).fold(
+            (
+                Vec::new(),
+                Vec::new(),
+                Vec::new(),
+                Vec::new(),
+                Vec::new(),
+                Vec::new(),
+                Vec::new(),
+            ),
+            |(
+                mut event_emit_packages,
+                mut event_emit_modules,
+                mut event_senders,
+                mut event_struct_packages,
+                mut event_struct_modules,
+                mut event_struct_names,
+                mut event_struct_instantiations,
+            ),
+             index| {
+                event_emit_packages.push(index.0);
+                event_emit_modules.push(index.1);
+                event_senders.push(index.2);
+                event_struct_packages.push(index.3);
+                event_struct_modules.push(index.4);
+                event_struct_names.push(index.5);
+                event_struct_instantiations.push(index.6);
+                (
+                    event_emit_packages,
+                    event_emit_modules,
+                    event_senders,
+                    event_struct_packages,
+                    event_struct_modules,
+                    event_struct_names,
+                    event_struct_instantiations,
+                )
+            },
+        );
+
+        // Now persist all the event indices in parallel into their tables.
+        let mut futures = vec![];
+        futures.push(self.spawn_blocking_task(move |this| {
+            persist_chunk_into_table!(
+                event_emit_package::table,
+                event_emit_packages,
+                &this.blocking_cp
+            )
+        }));
+
+        futures.push(self.spawn_blocking_task(move |this| {
+            persist_chunk_into_table!(
+                event_emit_module::table,
+                event_emit_modules,
+                &this.blocking_cp
+            )
+        }));
+
+        futures.push(self.spawn_blocking_task(move |this| {
+            persist_chunk_into_table!(event_senders::table, event_senders, &this.blocking_cp)
+        }));
+
+        futures.push(self.spawn_blocking_task(move |this| {
+            persist_chunk_into_table!(
+                event_struct_package::table,
+                event_struct_packages,
+                &this.blocking_cp
+            )
+        }));
+
+        futures.push(self.spawn_blocking_task(move |this| {
+            persist_chunk_into_table!(
+                event_struct_module::table,
+                event_struct_modules,
+                &this.blocking_cp
+            )
+        }));
+
+        futures.push(self.spawn_blocking_task(move |this| {
+            persist_chunk_into_table!(
+                event_struct_name::table,
+                event_struct_names,
+                &this.blocking_cp
+            )
+        }));
+
+        futures.push(self.spawn_blocking_task(move |this| {
+            persist_chunk_into_table!(
+                event_struct_instantiation::table,
+                event_struct_instantiations,
+                &this.blocking_cp
+            )
+        }));
+
+        futures::future::join_all(futures)
+            .await
+            .into_iter()
+            .collect::<Result<Vec<_>, _>>()
+            .map_err(|e| {
+                tracing::error!("Failed to join event indices futures in a chunk: {}", e);
+                IndexerError::from(e)
+            })?
+            .into_iter()
+            .collect::<Result<Vec<_>, _>>()
+            .map_err(|e| {
+                IndexerError::PostgresWriteError(format!(
+                    "Failed to persist all event indices in a chunk: {:?}",
+                    e
+                ))
+            })?;
+        let elapsed = guard.stop_and_record();
+        info!(elapsed, "Persisted {} chunked event indices", len);
+        Ok(())
+    }
+
     async fn persist_tx_indices_chunk(&self, indices: Vec<TxIndex>) -> Result<(), IndexerError> {
         let guard = self
             .metrics
             .checkpoint_db_commit_latency_tx_indices_chunks
             .start_timer();
         let len = indices.len();
-        let (senders, recipients, input_objects, changed_objects, calls, digests) =
+        let (senders, recipients, input_objects, changed_objects, pkgs, mods, funs, digests, kinds) =
             indices.into_iter().map(|i| i.split()).fold(
                 (
                     Vec::new(),
@@ -801,29 +1012,41 @@ impl<T: R2D2Connection + 'static> PgIndexerStore<T> {
                     Vec::new(),
                     Vec::new(),
                     Vec::new(),
+                    Vec::new(),
+                    Vec::new(),
+                    Vec::new(),
                 ),
                 |(
                     mut tx_senders,
                     mut tx_recipients,
                     mut tx_input_objects,
                     mut tx_changed_objects,
-                    mut tx_calls,
+                    mut tx_pkgs,
+                    mut tx_mods,
+                    mut tx_funs,
                     mut tx_digests,
+                    mut tx_kinds,
                 ),
                  index| {
                     tx_senders.extend(index.0);
                     tx_recipients.extend(index.1);
                     tx_input_objects.extend(index.2);
                     tx_changed_objects.extend(index.3);
-                    tx_calls.extend(index.4);
-                    tx_digests.extend(index.5);
+                    tx_pkgs.extend(index.4);
+                    tx_mods.extend(index.5);
+                    tx_funs.extend(index.6);
+                    tx_digests.extend(index.7);
+                    tx_kinds.extend(index.8);
                     (
                         tx_senders,
                         tx_recipients,
                         tx_input_objects,
                         tx_changed_objects,
-                        tx_calls,
+                        tx_pkgs,
+                        tx_mods,
+                        tx_funs,
                         tx_digests,
+                        tx_kinds,
                     )
                 },
             );
@@ -912,14 +1135,40 @@ impl<T: R2D2Connection + 'static> PgIndexerStore<T> {
                 tracing::error!("Failed to persist tx_changed_objects with error: {}", e);
             })
         }));
+
+        futures.push(self.spawn_blocking_task(move |this| {
+            let now = Instant::now();
+            let rows_len = pkgs.len();
+            transactional_blocking_with_retry!(
+                &this.blocking_cp,
+                |conn| {
+                    for chunk in pkgs.chunks(PG_COMMIT_CHUNK_SIZE_INTRA_DB_TX) {
+                        insert_or_ignore_into!(tx_calls_pkg::table, chunk, conn);
+                    }
+                    Ok::<(), IndexerError>(())
+                },
+                PG_DB_COMMIT_SLEEP_DURATION
+            )
+            .tap_ok(|_| {
+                let elapsed = now.elapsed().as_secs_f64();
+                info!(
+                    elapsed,
+                    "Persisted {} rows to tx_calls_pkg tables", rows_len
+                );
+            })
+            .tap_err(|e| {
+                tracing::error!("Failed to persist tx_calls_pkg with error: {}", e);
+            })
+        }));
+
         futures.push(self.spawn_blocking_task(move |this| {
             let now = Instant::now();
-            let calls_len = calls.len();
+            let rows_len = mods.len();
             transactional_blocking_with_retry!(
                 &this.blocking_cp,
                 |conn| {
-                    for chunk in calls.chunks(PG_COMMIT_CHUNK_SIZE_INTRA_DB_TX) {
-                        insert_or_ignore_into!(tx_calls::table, chunk, conn);
+                    for chunk in mods.chunks(PG_COMMIT_CHUNK_SIZE_INTRA_DB_TX) {
+                        insert_or_ignore_into!(tx_calls_mod::table, chunk, conn);
                     }
                     Ok::<(), IndexerError>(())
                 },
@@ -927,12 +1176,35 @@ impl<T: R2D2Connection + 'static> PgIndexerStore<T> {
             )
             .tap_ok(|_| {
                 let elapsed = now.elapsed().as_secs_f64();
-                info!(elapsed, "Persisted {} rows to tx_calls tables", calls_len);
+                info!(elapsed, "Persisted {} rows to tx_calls_mod table", rows_len);
             })
             .tap_err(|e| {
-                tracing::error!("Failed to persist tx_calls with error: {}", e);
+                tracing::error!("Failed to persist tx_calls_mod with error: {}", e);
             })
         }));
+
+        futures.push(self.spawn_blocking_task(move |this| {
+            let now = Instant::now();
+            let rows_len = funs.len();
+            transactional_blocking_with_retry!(
+                &this.blocking_cp,
+                |conn| {
+                    for chunk in funs.chunks(PG_COMMIT_CHUNK_SIZE_INTRA_DB_TX) {
+                        insert_or_ignore_into!(tx_calls_fun::table, chunk, conn);
+                    }
+                    Ok::<(), IndexerError>(())
+                },
+                PG_DB_COMMIT_SLEEP_DURATION
+            )
+            .tap_ok(|_| {
+                let elapsed = now.elapsed().as_secs_f64();
+                info!(elapsed, "Persisted {} rows to tx_calls_fun table", rows_len);
+            })
+            .tap_err(|e| {
+                tracing::error!("Failed to persist tx_calls_fun with error: {}", e);
+            })
+        }));
+
         futures.push(self.spawn_blocking_task(move |this| {
             let now = Instant::now();
             let calls_len = digests.len();
@@ -940,12 +1212,7 @@ impl<T: R2D2Connection + 'static> PgIndexerStore<T> {
                 &this.blocking_cp,
                 |conn| {
                     for chunk in digests.chunks(PG_COMMIT_CHUNK_SIZE_INTRA_DB_TX) {
-                        diesel::insert_into(tx_digests::table)
-                            .values(chunk)
-                            .on_conflict_do_nothing()
-                            .execute(conn)
-                            .map_err(IndexerError::from)
-                            .context("Failed to write tx_digests chunk to PostgresDB")?;
+                        insert_or_ignore_into!(tx_digests::table, chunk, conn);
                     }
                     Ok::<(), IndexerError>(())
                 },
@@ -960,6 +1227,28 @@ impl<T: R2D2Connection + 'static> PgIndexerStore<T> {
             })
         }));
 
+        futures.push(self.spawn_blocking_task(move |this| {
+            let now = Instant::now();
+            let rows_len = kinds.len();
+            transactional_blocking_with_retry!(
+                &this.blocking_cp,
+                |conn| {
+                    for chunk in kinds.chunks(PG_COMMIT_CHUNK_SIZE_INTRA_DB_TX) {
+                        insert_or_ignore_into!(tx_kinds::table, chunk, conn);
+                    }
+                    Ok::<(), IndexerError>(())
+                },
+                Duration::from_secs(60)
+            )
+            .tap_ok(|_| {
+                let elapsed = now.elapsed().as_secs_f64();
+                info!(elapsed, "Persisted {} rows to tx_kinds tables", rows_len);
+            })
+            .tap_err(|e| {
+                tracing::error!("Failed to persist tx_kinds with error: {}", e);
+            })
+        }));
+
         futures::future::join_all(futures)
             .await
             .into_iter()
@@ -987,12 +1276,35 @@ impl<T: R2D2Connection + 'static> PgIndexerStore<T> {
             .checkpoint_db_commit_latency_epoch
             .start_timer();
         let epoch_id = epoch.new_epoch.epoch;
+
         transactional_blocking_with_retry!(
             &self.blocking_cp,
             |conn| {
                 if let Some(last_epoch) = &epoch.last_epoch {
                     let last_epoch_id = last_epoch.epoch;
-                    let last_epoch = StoredEpochInfo::from_epoch_end_info(last_epoch);
+                    // Overwrites the `epoch_total_transactions` field on `epoch.last_epoch` because
+                    // we are not guaranteed to have the latest data in db when this is set on
+                    // indexer's chain-reading side. However, when we `persist_epoch`, the
+                    // checkpoints from an epoch ago must have been indexed.
+                    let previous_epoch_network_total_transactions = match epoch_id {
+                        0 | 1 => 0,
+                        _ => {
+                            let prev_epoch_id = epoch_id - 2;
+                            let result = checkpoints::table
+                                .filter(checkpoints::epoch.eq(prev_epoch_id as i64))
+                                .select(max(checkpoints::network_total_transactions))
+                                .first::<Option<i64>>(conn)
+                                .map(|o| o.unwrap_or(0))?;
+
+                            result as u64
+                        }
+                    };
+
+                    let epoch_total_transactions = epoch.network_total_transactions
+                        - previous_epoch_network_total_transactions;
+
+                    let mut last_epoch = StoredEpochInfo::from_epoch_end_info(last_epoch);
+                    last_epoch.epoch_total_transactions = Some(epoch_total_transactions as i64);
                     info!(last_epoch_id, "Persisting epoch end data.");
                     on_conflict_do_update!(
                         epochs::table,
@@ -1074,6 +1386,14 @@ impl<T: R2D2Connection + 'static> PgIndexerStore<T> {
                     EpochPartitionData::compose_data(epoch_to_commit, last_epoch);
                 let table_partitions = self.partition_manager.get_table_partitions()?;
                 for (table, (_, last_partition)) in table_partitions {
+                    // Only advance epoch partition for epoch partitioned tables.
+                    if !self
+                        .partition_manager
+                        .get_strategy(&table)
+                        .is_epoch_partitioned()
+                    {
+                        continue;
+                    }
                     let guard = self.metrics.advance_epoch_latency.start_timer();
                     self.partition_manager.advance_epoch(
                         table.clone(),
@@ -1127,47 +1447,121 @@ impl<T: R2D2Connection + 'static> PgIndexerStore<T> {
         )
     }
 
+    fn prune_event_indices_table(&self, min_tx: u64, max_tx: u64) -> Result<(), IndexerError> {
+        let (min_tx, max_tx) = (min_tx as i64, max_tx as i64);
+        transactional_blocking_with_retry!(
+            &self.blocking_cp,
+            |conn| {
+                prune_tx_or_event_indice_table!(
+                    event_emit_module,
+                    conn,
+                    min_tx,
+                    max_tx,
+                    "Failed to prune event_emit_module table"
+                );
+                prune_tx_or_event_indice_table!(
+                    event_emit_package,
+                    conn,
+                    min_tx,
+                    max_tx,
+                    "Failed to prune event_emit_package table"
+                );
+                prune_tx_or_event_indice_table![
+                    event_senders,
+                    conn,
+                    min_tx,
+                    max_tx,
+                    "Failed to prune event_senders table"
+                ];
+                prune_tx_or_event_indice_table![
+                    event_struct_instantiation,
+                    conn,
+                    min_tx,
+                    max_tx,
+                    "Failed to prune event_struct_instantiation table"
+                ];
+                prune_tx_or_event_indice_table![
+                    event_struct_module,
+                    conn,
+                    min_tx,
+                    max_tx,
+                    "Failed to prune event_struct_module table"
+                ];
+                prune_tx_or_event_indice_table![
+                    event_struct_name,
+                    conn,
+                    min_tx,
+                    max_tx,
+                    "Failed to prune event_struct_name table"
+                ];
+                prune_tx_or_event_indice_table![
+                    event_struct_package,
+                    conn,
+                    min_tx,
+                    max_tx,
+                    "Failed to prune event_struct_package table"
+                ];
+                Ok::<(), IndexerError>(())
+            },
+            PG_DB_COMMIT_SLEEP_DURATION
+        )
+    }
+
     fn prune_tx_indices_table(&self, min_tx: u64, max_tx: u64) -> Result<(), IndexerError> {
         let (min_tx, max_tx) = (min_tx as i64, max_tx as i64);
         transactional_blocking_with_retry!(
             &self.blocking_cp,
             |conn| {
-                prune_tx_indice_table!(
+                prune_tx_or_event_indice_table!(
                     tx_senders,
                     conn,
                     min_tx,
                     max_tx,
                     "Failed to prune tx_senders table"
                 );
-                prune_tx_indice_table!(
+                prune_tx_or_event_indice_table!(
                     tx_recipients,
                     conn,
                     min_tx,
                     max_tx,
                     "Failed to prune tx_recipients table"
                 );
-                prune_tx_indice_table![
+                prune_tx_or_event_indice_table![
                     tx_input_objects,
                     conn,
                     min_tx,
                     max_tx,
                     "Failed to prune tx_input_objects table"
                 ];
-                prune_tx_indice_table![
+                prune_tx_or_event_indice_table![
                     tx_changed_objects,
                     conn,
                     min_tx,
                     max_tx,
                     "Failed to prune tx_changed_objects table"
                 ];
-                prune_tx_indice_table![
-                    tx_calls,
+                prune_tx_or_event_indice_table![
+                    tx_calls_pkg,
                     conn,
                     min_tx,
                     max_tx,
-                    "Failed to prune tx_calls table"
+                    "Failed to prune tx_calls_pkg table"
                 ];
-                prune_tx_indice_table![
+                prune_tx_or_event_indice_table![
+                    tx_calls_mod,
+                    conn,
+                    min_tx,
+                    max_tx,
+                    "Failed to prune tx_calls_mod table"
+                ];
+                prune_tx_or_event_indice_table![
+                    tx_calls_fun,
+                    conn,
+                    min_tx,
+                    max_tx,
+                    "Failed to prune tx_calls_fun table"
+                ];
+                prune_tx_or_event_indice_table![
                     tx_digests,
                     conn,
                     min_tx,
@@ -1204,9 +1598,9 @@ impl<T: R2D2Connection + 'static> PgIndexerStore<T> {
         read_only_blocking!(&self.blocking_cp, |conn| {
             checkpoints::table
                 .filter(checkpoints::epoch.eq(epoch as i64))
-                .select(max(checkpoints::network_total_transactions))
-                .first::<Option<i64>>(conn)
-                .map(|o| o.unwrap_or(0))
+                .select(checkpoints::network_total_transactions)
+                .order_by(checkpoints::sequence_number.desc())
+                .first::<i64>(conn)
         })
         .context("Failed to get network total transactions in epoch")
         .map(|v| v as u64)
@@ -1274,6 +1668,11 @@ impl<T: R2D2Connection> IndexerStore for PgIndexerStore<T> {
             .await
     }
 
+    async fn get_chain_identifier(&self) -> Result<Option<Vec<u8>>, IndexerError> {
+        self.execute_in_blocking_worker(|this| this.get_chain_identifier())
+            .await
+    }
+
     async fn get_latest_object_snapshot_checkpoint_sequence_number(
         &self,
     ) -> Result<Option<u64>, IndexerError> {
@@ -1601,6 +2000,46 @@ impl<T: R2D2Connection> IndexerStore for PgIndexerStore<T> {
             .await
     }
 
+    async fn persist_event_indices(&self, indices: Vec<EventIndex>) -> Result<(), IndexerError> {
+        if indices.is_empty() {
+            return Ok(());
+        }
+        let len = indices.len();
+        let guard = self
+            .metrics
+            .checkpoint_db_commit_latency_event_indices
+            .start_timer();
+        let chunks = chunk!(indices, self.config.parallel_chunk_size);
+
+        let futures = chunks
+            .into_iter()
+            .map(|chunk| {
+                self.spawn_task(move |this: Self| async move {
+                    this.persist_event_indices_chunk(chunk).await
+                })
+            })
+            .collect::<Vec<_>>();
+        futures::future::join_all(futures)
+            .await
+            .into_iter()
+            .collect::<Result<Vec<_>, _>>()
+            .map_err(|e| {
+                tracing::error!("Failed to join persist_event_indices_chunk futures: {}", e);
+                IndexerError::from(e)
+            })?
+            .into_iter()
+            .collect::<Result<Vec<_>, _>>()
+            .map_err(|e| {
+                IndexerError::PostgresWriteError(format!(
+                    "Failed to persist all event_indices chunks: {:?}",
+                    e
+                ))
+            })?;
+        let elapsed = guard.stop_and_record();
+        info!(elapsed, "Persisted {} event_indices chunks", len);
+        Ok(())
+    }
+
     async fn persist_tx_indices(&self, indices: Vec<TxIndex>) -> Result<(), IndexerError> {
         if indices.is_empty() {
             return Ok(());
@@ -1696,6 +2135,21 @@ impl<T: R2D2Connection> IndexerStore for PgIndexerStore<T> {
                 "Pruned transactions for checkpoint {} from tx {} to tx {}",
                 cp, min_tx, max_tx
             );
+            self.execute_in_blocking_worker(move |this| {
+                this.prune_event_indices_table(min_tx, max_tx)
+            })
+            .await
+            .unwrap_or_else(|e| {
+                tracing::error!(
+                    "Failed to prune events of transactions for cp {}: {}",
+                    cp,
+                    e
+                );
+            });
+            info!(
+                "Pruned events of transactions for checkpoint {} from tx {} to tx {}",
+                cp, min_tx, max_tx
+            );
             self.metrics.last_pruned_transaction.set(max_tx as i64);
 
             self.execute_in_blocking_worker(move |this| this.prune_cp_tx_table(cp))
@@ -1733,6 +2187,73 @@ impl<T: R2D2Connection> IndexerStore for PgIndexerStore<T> {
     fn as_any(&self) -> &dyn StdAny {
         self
     }
+
+    /// Persist protocol configs and feature flags until the protocol version for the latest epoch
+    /// we have stored in the db, inclusive.
+    fn persist_protocol_configs_and_feature_flags(
+        &self,
+        chain_id: Vec<u8>,
+    ) -> Result<(), IndexerError> {
+        let chain_id = ChainIdentifier::from(
+            CheckpointDigest::try_from(chain_id).expect("Unable to convert chain id"),
+        );
+
+        let mut all_configs = vec![];
+        let mut all_flags = vec![];
+
+        let (start_version, end_version) = self.get_protocol_version_index_range()?;
+        info!(
+            "Persisting protocol configs with start_version: {}, end_version: {}",
+            start_version, end_version
+        );
+
+        // Gather all protocol configs and feature flags for all versions between start and end.
+        for version in start_version..=end_version {
+            let protocol_configs = ProtocolConfig::get_for_version_if_supported(
+                (version as u64).into(),
+                chain_id.chain(),
+            )
+            .ok_or(IndexerError::GenericError(format!(
+                "Unable to fetch protocol version {} and chain {:?}",
+                version,
+                chain_id.chain()
+            )))?;
+            let configs_vec = protocol_configs
+                .attr_map()
+                .into_iter()
+                .map(|(k, v)| StoredProtocolConfig {
+                    protocol_version: version,
+                    config_name: k,
+                    config_value: v.map(|v| v.to_string()),
+                })
+                .collect::<Vec<_>>();
+            all_configs.extend(configs_vec);
+
+            let feature_flags = protocol_configs
+                .feature_map()
+                .into_iter()
+                .map(|(k, v)| StoredFeatureFlag {
+                    protocol_version: version,
+                    flag_name: k,
+                    flag_value: v,
+                })
+                .collect::<Vec<_>>();
+            all_flags.extend(feature_flags);
+        }
+
+        // Now insert all of them into the db.
+        // TODO: right now the size of these updates is manageable but later we may consider batching.
+        transactional_blocking_with_retry!(
+            &self.blocking_cp,
+            |conn| {
+                insert_or_ignore_into!(protocol_configs::table, all_configs.clone(), conn);
+                insert_or_ignore_into!(feature_flags::table, all_flags.clone(), conn);
+                Ok::<(), IndexerError>(())
+            },
+            PG_DB_COMMIT_SLEEP_DURATION
+        )?;
+        Ok(())
+    }
 }
 
 /// Construct deleted objects and mutated objects to commit.
@@ -1753,15 +2274,15 @@ fn make_final_list_of_objects_to_commit(
         .flat_map(|changes| changes.changed_objects);
     let mut latest_objects = HashMap::new();
     for object in mutated_objects {
-        if deleted_objects.contains_key(&object.object_id) {
+        if deleted_objects.contains_key(&object.object.id()) {
             continue;
         }
-        match latest_objects.entry(object.object_id) {
+        match latest_objects.entry(object.object.id()) {
             Entry::Vacant(e) => {
                 e.insert(object);
             }
             Entry::Occupied(mut e) => {
-                if object.object_version > e.get().object_version {
+                if object.object.version() > e.get().object.version() {
                     e.insert(object);
                 }
             }
diff --git a/crates/sui-indexer/src/store/pg_partition_manager.rs b/crates/sui-indexer/src/store/pg_partition_manager.rs
index f67f1ed6b4041..f27078ca47048 100644
--- a/crates/sui-indexer/src/store/pg_partition_manager.rs
+++ b/crates/sui-indexer/src/store/pg_partition_manager.rs
@@ -4,7 +4,7 @@
 use diesel::r2d2::R2D2Connection;
 use diesel::sql_types::{BigInt, VarChar};
 use diesel::{QueryableByName, RunQueryDsl};
-use std::collections::BTreeMap;
+use std::collections::{BTreeMap, HashMap};
 use std::time::Duration;
 use tracing::{error, info};
 
@@ -44,22 +44,42 @@ GROUP BY table_name;
 
 pub struct PgPartitionManager<T: R2D2Connection + 'static> {
     cp: ConnectionPool<T>,
+    partition_strategies: HashMap<&'static str, PgPartitionStrategy>,
 }
 
 impl<T: R2D2Connection> Clone for PgPartitionManager<T> {
     fn clone(&self) -> PgPartitionManager<T> {
         Self {
             cp: self.cp.clone(),
+            partition_strategies: self.partition_strategies.clone(),
         }
     }
 }
 
+#[derive(Clone, Copy)]
+pub enum PgPartitionStrategy {
+    CheckpointSequenceNumber,
+    TxSequenceNumber,
+    ObjectId,
+}
+
+impl PgPartitionStrategy {
+    pub fn is_epoch_partitioned(&self) -> bool {
+        matches!(
+            self,
+            Self::CheckpointSequenceNumber | Self::TxSequenceNumber
+        )
+    }
+}
+
 #[derive(Clone, Debug)]
 pub struct EpochPartitionData {
     last_epoch: u64,
     next_epoch: u64,
     last_epoch_start_cp: u64,
     next_epoch_start_cp: u64,
+    last_epoch_start_tx: u64,
+    next_epoch_start_tx: u64,
 }
 
 impl EpochPartitionData {
@@ -68,18 +88,35 @@ impl EpochPartitionData {
         let last_epoch_start_cp = last_db_epoch.first_checkpoint_id as u64;
         let next_epoch = epoch.new_epoch.epoch;
         let next_epoch_start_cp = epoch.new_epoch.first_checkpoint_id;
+
+        // Determining the tx_sequence_number range for the epoch partition differs from the
+        // checkpoint_sequence_number range, because the former is a sum of total transactions -
+        // this sum already addresses the off-by-one.
+        let next_epoch_start_tx = epoch.network_total_transactions;
+        let last_epoch_start_tx =
+            next_epoch_start_tx - last_db_epoch.epoch_total_transactions.unwrap() as u64;
+
         Self {
             last_epoch,
             next_epoch,
             last_epoch_start_cp,
             next_epoch_start_cp,
+            last_epoch_start_tx,
+            next_epoch_start_tx,
         }
     }
 }
 
 impl<T: R2D2Connection> PgPartitionManager<T> {
     pub fn new(cp: ConnectionPool<T>) -> Result<Self, IndexerError> {
-        let manager = Self { cp };
+        let mut partition_strategies = HashMap::new();
+        partition_strategies.insert("events", PgPartitionStrategy::TxSequenceNumber);
+        partition_strategies.insert("transactions", PgPartitionStrategy::TxSequenceNumber);
+        partition_strategies.insert("objects_version", PgPartitionStrategy::ObjectId);
+        let manager = Self {
+            cp,
+            partition_strategies,
+        };
         let tables = manager.get_table_partitions()?;
         info!(
             "Found {} tables with partitions : [{:?}]",
@@ -116,12 +153,41 @@ impl<T: R2D2Connection> PgPartitionManager<T> {
         )
     }
 
+    /// Tries to fetch the partitioning strategy for the given partitioned table. Defaults to
+    /// `CheckpointSequenceNumber` as the majority of our tables are partitioned on an epoch's
+    /// checkpoints today.
+    pub fn get_strategy(&self, table_name: &str) -> PgPartitionStrategy {
+        self.partition_strategies
+            .get(table_name)
+            .copied()
+            .unwrap_or(PgPartitionStrategy::CheckpointSequenceNumber)
+    }
+
+    pub fn determine_epoch_partition_range(
+        &self,
+        table_name: &str,
+        data: &EpochPartitionData,
+    ) -> Option<(u64, u64)> {
+        match self.get_strategy(table_name) {
+            PgPartitionStrategy::CheckpointSequenceNumber => {
+                Some((data.last_epoch_start_cp, data.next_epoch_start_cp))
+            }
+            PgPartitionStrategy::TxSequenceNumber => {
+                Some((data.last_epoch_start_tx, data.next_epoch_start_tx))
+            }
+            PgPartitionStrategy::ObjectId => None,
+        }
+    }
+
     pub fn advance_epoch(
         &self,
         table: String,
         last_partition: u64,
         data: &EpochPartitionData,
     ) -> Result<(), IndexerError> {
+        let Some(partition_range) = self.determine_epoch_partition_range(&table, data) else {
+            return Ok(());
+        };
         if data.next_epoch == 0 {
             tracing::info!("Epoch 0 partition has been created in the initial setup.");
             return Ok(());
@@ -136,8 +202,8 @@ impl<T: R2D2Connection> PgPartitionManager<T> {
                             .bind::<diesel::sql_types::Text, _>(table.clone())
                             .bind::<diesel::sql_types::BigInt, _>(data.last_epoch as i64)
                             .bind::<diesel::sql_types::BigInt, _>(data.next_epoch as i64)
-                            .bind::<diesel::sql_types::BigInt, _>(data.last_epoch_start_cp as i64)
-                            .bind::<diesel::sql_types::BigInt, _>(data.next_epoch_start_cp as i64),
+                            .bind::<diesel::sql_types::BigInt, _>(partition_range.0 as i64)
+                            .bind::<diesel::sql_types::BigInt, _>(partition_range.1 as i64),
                         conn,
                     )
                 },
@@ -148,14 +214,14 @@ impl<T: R2D2Connection> PgPartitionManager<T> {
             transactional_blocking_with_retry!(
                 &self.cp,
                 |conn| {
-                    RunQueryDsl::execute(diesel::sql_query(format!("ALTER TABLE {table_name} REORGANIZE PARTITION {table_name}_partition_{last_epoch} INTO (PARTITION {table_name}_partition_{last_epoch} VALUES LESS THAN ({next_epoch_start_cp}), PARTITION {table_name}_partition_{next_epoch} VALUES LESS THAN MAXVALUE)", table_name = table.clone(), last_epoch = data.last_epoch as i64, next_epoch_start_cp = data.next_epoch_start_cp as i64, next_epoch = data.next_epoch as i64)), conn)
+                    RunQueryDsl::execute(diesel::sql_query(format!("ALTER TABLE {table_name} REORGANIZE PARTITION {table_name}_partition_{last_epoch} INTO (PARTITION {table_name}_partition_{last_epoch} VALUES LESS THAN ({next_epoch_start}), PARTITION {table_name}_partition_{next_epoch} VALUES LESS THAN MAXVALUE)", table_name = table.clone(), last_epoch = data.last_epoch as i64, next_epoch_start = partition_range.1 as i64, next_epoch = data.next_epoch as i64)), conn)
                 },
                 Duration::from_secs(10)
             )?;
 
             info!(
                 "Advanced epoch partition for table {} from {} to {}, prev partition upper bound {}",
-                table, last_partition, data.next_epoch, data.last_epoch_start_cp
+                table, last_partition, data.next_epoch, partition_range.0
             );
         } else if last_partition != data.next_epoch {
             // skip when the partition is already advanced once, which is possible when indexer
diff --git a/crates/sui-indexer/src/test_utils.rs b/crates/sui-indexer/src/test_utils.rs
index 995217d06c616..01d388b97b67b 100644
--- a/crates/sui-indexer/src/test_utils.rs
+++ b/crates/sui-indexer/src/test_utils.rs
@@ -52,7 +52,7 @@ pub async fn start_test_indexer<T: R2D2Connection + Send + 'static>(
         db_url,
         rpc_url,
         reader_writer_config,
-        None,
+        /* reset_database */ false,
         Some(data_ingestion_path),
         CancellationToken::new(),
         queue_sender,
@@ -60,11 +60,14 @@ pub async fn start_test_indexer<T: R2D2Connection + Send + 'static>(
     .await
 }
 
+/// Starts an indexer reader or writer for testing depending on the `reader_writer_config`. If
+/// `reset_database` is true, the database instance named in `db_url` will be dropped and
+/// reinstantiated.
 pub async fn start_test_indexer_impl<T: R2D2Connection + 'static>(
     db_url: Option<String>,
     rpc_url: String,
     reader_writer_config: ReaderWriterConfig,
-    new_database: Option<String>,
+    reset_database: bool,
     data_ingestion_path: Option<PathBuf>,
     cancel: CancellationToken,
     queue_sender: NatsQueueSender,
@@ -103,7 +106,8 @@ pub async fn start_test_indexer_impl<T: R2D2Connection + 'static>(
 
     let mut parsed_url = config.get_db_url().unwrap();
 
-    if let Some(new_database) = new_database {
+    if reset_database {
+        let db_name = parsed_url.expose_secret().split('/').last().unwrap();
         // Switch to default to create a new database
         let (default_db_url, _) = replace_db_name(parsed_url.expose_secret(), "postgres");
 
@@ -114,14 +118,14 @@ pub async fn start_test_indexer_impl<T: R2D2Connection + 'static>(
 
         // Delete the old db if it exists
         default_conn
-            .batch_execute(&format!("DROP DATABASE IF EXISTS {}", new_database))
+            .batch_execute(&format!("DROP DATABASE IF EXISTS {}", db_name))
             .unwrap();
 
         // Create the new db
         default_conn
-            .batch_execute(&format!("CREATE DATABASE {}", new_database))
+            .batch_execute(&format!("CREATE DATABASE {}", db_name))
             .unwrap();
-        parsed_url = replace_db_name(parsed_url.expose_secret(), &new_database)
+        parsed_url = replace_db_name(parsed_url.expose_secret(), db_name)
             .0
             .into();
     }
@@ -148,7 +152,7 @@ pub async fn start_test_indexer_impl<T: R2D2Connection + 'static>(
         }
         ReaderWriterConfig::Writer { snapshot_config } => {
             if config.reset_db {
-                crate::db::reset_database(&mut blocking_pool.get().unwrap(), true).unwrap();
+                crate::db::reset_database(&mut blocking_pool.get().unwrap()).unwrap();
             }
             let store_clone = store.clone();
 
diff --git a/crates/sui-indexer/src/types.rs b/crates/sui-indexer/src/types.rs
index 7709bcabc29d0..41998fa83d609 100644
--- a/crates/sui-indexer/src/types.rs
+++ b/crates/sui-indexer/src/types.rs
@@ -17,7 +17,8 @@ use sui_types::dynamic_field::DynamicFieldInfo;
 use sui_types::effects::TransactionEffects;
 use sui_types::event::SystemEpochInfoEvent;
 use sui_types::messages_checkpoint::{
-    CertifiedCheckpointSummary, CheckpointCommitment, CheckpointDigest, EndOfEpochData,
+    CertifiedCheckpointSummary, CheckpointCommitment, CheckpointDigest, CheckpointSequenceNumber,
+    EndOfEpochData,
 };
 use sui_types::move_package::MovePackage;
 use sui_types::object::{Object, Owner};
@@ -90,6 +91,8 @@ impl IndexedCheckpoint {
     }
 }
 
+/// Represents system state and summary info at the start and end of an epoch. Optional fields are
+/// populated at epoch boundary, since they cannot be determined at the start of the epoch.
 #[derive(Clone, Debug, Default)]
 pub struct IndexedEpochInfo {
     pub epoch: u64,
@@ -135,6 +138,9 @@ impl IndexedEpochInfo {
         }
     }
 
+    /// Creates `IndexedEpochInfo` for epoch X-1 at the boundary of epoch X-1 to X.
+    /// `network_total_tx_num_at_last_epoch_end` is needed to determine the number of transactions
+    /// that occurred in the epoch X-1.
     pub fn from_end_of_epoch_data(
         system_state_summary: &SuiSystemStateSummary,
         last_checkpoint_summary: &CertifiedCheckpointSummary,
@@ -218,6 +224,47 @@ impl IndexedEvent {
     }
 }
 
+#[derive(Debug, Clone)]
+pub struct EventIndex {
+    pub tx_sequence_number: u64,
+    pub event_sequence_number: u64,
+    pub sender: SuiAddress,
+    pub emit_package: ObjectID,
+    pub emit_module: String,
+    pub type_package: ObjectID,
+    pub type_module: String,
+    /// Struct name of the event, without type parameters.
+    pub type_name: String,
+    /// Type instantiation of the event, with type name and type parameters, if any.
+    pub type_instantiation: String,
+}
+
+impl EventIndex {
+    pub fn from_event(
+        tx_sequence_number: u64,
+        event_sequence_number: u64,
+        event: &sui_types::event::Event,
+    ) -> Self {
+        let type_instantiation = event
+            .type_
+            .to_canonical_string(/* with_prefix */ true)
+            .splitn(3, "::")
+            .collect::<Vec<_>>()[2]
+            .to_string();
+        Self {
+            tx_sequence_number,
+            event_sequence_number,
+            sender: event.sender,
+            emit_package: event.package_id,
+            emit_module: event.transaction_module.to_string(),
+            type_package: event.type_.address.into(),
+            type_module: event.type_.module.to_string(),
+            type_name: event.type_.name.to_string(),
+            type_instantiation,
+        }
+    }
+}
+
 #[derive(Debug, Copy, Clone)]
 pub enum OwnerType {
     Immutable = 0,
@@ -283,44 +330,20 @@ pub enum DynamicFieldKind {
 
 #[derive(Clone, Debug)]
 pub struct IndexedObject {
-    pub object_id: ObjectID,
-    pub object_version: u64,
-    pub object_digest: ObjectDigest,
-    pub checkpoint_sequence_number: u64,
-    pub owner_type: OwnerType,
-    pub owner_id: Option<SuiAddress>,
+    pub checkpoint_sequence_number: CheckpointSequenceNumber,
     pub object: Object,
-    pub coin_type: Option<String>,
-    pub coin_balance: Option<u64>,
     pub df_info: Option<DynamicFieldInfo>,
 }
 
 impl IndexedObject {
     pub fn from_object(
-        checkpoint_sequence_number: u64,
+        checkpoint_sequence_number: CheckpointSequenceNumber,
         object: Object,
         df_info: Option<DynamicFieldInfo>,
     ) -> Self {
-        let (owner_type, owner_id) = owner_to_owner_info(&object.owner);
-        let coin_type = object
-            .coin_type_maybe()
-            .map(|t| t.to_canonical_string(/* with_prefix */ true));
-        let coin_balance = if coin_type.is_some() {
-            Some(object.get_coin_value_unsafe())
-        } else {
-            None
-        };
-
         Self {
             checkpoint_sequence_number,
-            object_id: object.id(),
-            object_version: object.version().value(),
-            object_digest: object.digest(),
-            owner_type,
-            owner_id,
             object,
-            coin_type,
-            coin_balance,
             df_info,
         }
     }
@@ -398,12 +421,13 @@ impl From<CustomIndexedTransaction> for IndexedTransaction {
 #[derive(Debug, Clone)]
 pub struct TxIndex {
     pub tx_sequence_number: u64,
+    pub tx_kind: TransactionKind,
     pub transaction_digest: TransactionDigest,
     pub checkpoint_sequence_number: u64,
     pub input_objects: Vec<ObjectID>,
     pub changed_objects: Vec<ObjectID>,
     pub payers: Vec<SuiAddress>,
-    pub senders: Vec<SuiAddress>,
+    pub sender: SuiAddress,
     pub recipients: Vec<SuiAddress>,
     pub move_calls: Vec<(ObjectID, String, String)>,
 }
diff --git a/crates/sui-indexer/tests/ingestion_tests.rs b/crates/sui-indexer/tests/ingestion_tests.rs
index 06914eeff6471..8eee88f8bd448 100644
--- a/crates/sui-indexer/tests/ingestion_tests.rs
+++ b/crates/sui-indexer/tests/ingestion_tests.rs
@@ -5,7 +5,6 @@
 mod ingestion_tests {
     use diesel::ExpressionMethods;
     use diesel::{QueryDsl, RunQueryDsl};
-    use move_core_types::language_storage::StructTag;
     use simulacrum::Simulacrum;
     use std::net::SocketAddr;
     use std::path::PathBuf;
@@ -14,18 +13,14 @@ mod ingestion_tests {
     use sui_indexer::db::get_pool_connection;
     use sui_indexer::errors::Context;
     use sui_indexer::errors::IndexerError;
-    use sui_indexer::models::{
-        events::StoredEvent, objects::StoredObject, transactions::StoredTransaction,
-    };
-    use sui_indexer::schema::{events, objects, transactions};
+    use sui_indexer::models::{objects::StoredObject, transactions::StoredTransaction};
+    use sui_indexer::schema::{objects, transactions};
     use sui_indexer::store::{indexer_store::IndexerStore, PgIndexerStore};
     use sui_indexer::test_utils::{start_test_indexer, ReaderWriterConfig};
     use sui_types::base_types::SuiAddress;
     use sui_types::effects::TransactionEffectsAPI;
     use sui_types::gas_coin::GasCoin;
-    use sui_types::{
-        Identifier, SUI_FRAMEWORK_PACKAGE_ID, SUI_SYSTEM_ADDRESS, SUI_SYSTEM_PACKAGE_ID,
-    };
+    use sui_types::SUI_FRAMEWORK_PACKAGE_ID;
     use tempfile::tempdir;
     use tokio::task::JoinHandle;
 
@@ -58,7 +53,7 @@ mod ingestion_tests {
 
         let server_handle = tokio::spawn(async move {
             sui_rest_api::RestService::new_without_version(sim)
-                .start_service(server_url, Some("/rest".to_owned()))
+                .start_service(server_url)
                 .await;
         });
         // Starts indexer
@@ -93,24 +88,6 @@ mod ingestion_tests {
         Ok(())
     }
 
-    /// Wait for the indexer to catch up to the given epoch id.
-    async fn wait_for_epoch(
-        pg_store: &PgIndexerStore<diesel::PgConnection>,
-        epoch: u64,
-    ) -> Result<(), IndexerError> {
-        tokio::time::timeout(Duration::from_secs(10), async {
-            while {
-                let cp_opt = pg_store.get_latest_epoch_id().unwrap();
-                cp_opt.is_none() || (cp_opt.unwrap() < epoch)
-            } {
-                tokio::time::sleep(Duration::from_secs(1)).await;
-            }
-        })
-        .await
-        .expect("Timeout waiting for indexer to catchup to epoch");
-        Ok(())
-    }
-
     #[tokio::test]
     pub async fn test_transaction_table() -> Result<(), IndexerError> {
         let mut sim = Simulacrum::new();
@@ -156,46 +133,6 @@ mod ingestion_tests {
         Ok(())
     }
 
-    #[tokio::test]
-    pub async fn test_event_type() -> Result<(), IndexerError> {
-        let mut sim = Simulacrum::new();
-        let data_ingestion_path = tempdir().unwrap().into_path();
-        sim.set_data_ingestion_path(data_ingestion_path.clone());
-
-        // Advance the epoch to generate some events.
-        sim.advance_epoch(false);
-
-        let (_, pg_store, _) = set_up(Arc::new(sim), data_ingestion_path).await;
-
-        // Wait for the epoch to change so we can get some events.
-        wait_for_epoch(&pg_store, 1).await?;
-
-        // Read the event from the database directly.
-        let db_event: StoredEvent = read_only_blocking!(&pg_store.blocking_cp(), |conn| {
-            events::table
-                .filter(events::event_type_name.eq("SystemEpochInfoEvent"))
-                .first::<StoredEvent>(conn)
-        })
-        .context("Failed reading SystemEpochInfoEvent from PostgresDB")?;
-
-        let event_type_tag = StructTag {
-            address: SUI_SYSTEM_ADDRESS,
-            module: Identifier::new("sui_system_state_inner").unwrap(),
-            name: Identifier::new("SystemEpochInfoEvent").unwrap(),
-            type_params: vec![],
-        };
-
-        // Check that the different components of the event type were stored correctly.
-        assert_eq!(
-            db_event.event_type,
-            event_type_tag.to_canonical_string(true)
-        );
-        assert_eq!(db_event.event_type_package, SUI_SYSTEM_PACKAGE_ID.to_vec());
-        assert_eq!(db_event.event_type_module, "sui_system_state_inner");
-        assert_eq!(db_event.event_type_name, "SystemEpochInfoEvent");
-        Ok(())
-    }
-
     #[tokio::test]
     pub async fn test_object_type() -> Result<(), IndexerError> {
         let mut sim = Simulacrum::new();
diff --git a/crates/sui-json-rpc-tests/Cargo.toml b/crates/sui-json-rpc-tests/Cargo.toml
index af78d3ccc56df..0f688d4b455e0 100644
--- a/crates/sui-json-rpc-tests/Cargo.toml
+++ b/crates/sui-json-rpc-tests/Cargo.toml
@@ -6,6 +6,9 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 
 [dev-dependencies]
diff --git a/crates/sui-json-rpc-tests/tests/balance_changes_tests.rs b/crates/sui-json-rpc-tests/tests/balance_changes_tests.rs
index bb1dcaa8be1e7..433c8fcddd72d 100644
--- a/crates/sui-json-rpc-tests/tests/balance_changes_tests.rs
+++ b/crates/sui-json-rpc-tests/tests/balance_changes_tests.rs
@@ -26,7 +26,7 @@ async fn test_dry_run_publish_with_mocked_coin() -> Result<(), anyhow::Error> {
         .into_iter()
         .map(|b| b.to_vec().unwrap())
         .collect::<Vec<_>>();
-    let dependencies = compiled_package.get_dependency_original_package_ids();
+    let dependencies = compiled_package.get_dependency_storage_package_ids();
 
     let mut builder = ProgrammableTransactionBuilder::new();
     builder.publish_immutable(compiled_modules_bytes, dependencies);
diff --git a/crates/sui-json-rpc-tests/tests/routing_tests.rs b/crates/sui-json-rpc-tests/tests/routing_tests.rs
index 12d8c82795336..c5bc6a23edae8 100644
--- a/crates/sui-json-rpc-tests/tests/routing_tests.rs
+++ b/crates/sui-json-rpc-tests/tests/routing_tests.rs
@@ -2,11 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use async_trait::async_trait;
-use hyper::header::HeaderValue;
-use hyper::HeaderMap;
 use jsonrpsee::core::client::ClientT;
 use jsonrpsee::core::RpcResult;
 use jsonrpsee::http_client::HttpClientBuilder;
+use jsonrpsee::http_client::{HeaderMap, HeaderValue};
 use jsonrpsee::proc_macros::rpc;
 use jsonrpsee::rpc_params;
 use jsonrpsee::RpcModule;
diff --git a/crates/sui-json-rpc-tests/tests/rpc_server_tests.rs b/crates/sui-json-rpc-tests/tests/rpc_server_tests.rs
index e566183954a94..3d648666047e1 100644
--- a/crates/sui-json-rpc-tests/tests/rpc_server_tests.rs
+++ b/crates/sui-json-rpc-tests/tests/rpc_server_tests.rs
@@ -192,7 +192,7 @@ async fn test_publish() -> Result<(), anyhow::Error> {
         BuildConfig::new_for_testing().build(Path::new("../../examples/move/basics"))?;
     let compiled_modules_bytes =
         compiled_package.get_package_base64(/* with_unpublished_deps */ false);
-    let dependencies = compiled_package.get_dependency_original_package_ids();
+    let dependencies = compiled_package.get_dependency_storage_package_ids();
 
     let transaction_bytes: TransactionBlockBytes = http_client
         .publish(
@@ -453,7 +453,7 @@ async fn test_get_metadata() -> Result<(), anyhow::Error> {
     let compiled_package = BuildConfig::new_for_testing().build(&path)?;
     let compiled_modules_bytes =
         compiled_package.get_package_base64(/* with_unpublished_deps */ false);
-    let dependencies = compiled_package.get_dependency_original_package_ids();
+    let dependencies = compiled_package.get_dependency_storage_package_ids();
 
     let transaction_bytes: TransactionBlockBytes = http_client
         .publish(
@@ -537,7 +537,7 @@ async fn test_get_total_supply() -> Result<(), anyhow::Error> {
     let compiled_package = BuildConfig::default().build(&path)?;
     let compiled_modules_bytes =
         compiled_package.get_package_base64(/* with_unpublished_deps */ false);
-    let dependencies = compiled_package.get_dependency_original_package_ids();
+    let dependencies = compiled_package.get_dependency_storage_package_ids();
 
     let transaction_bytes: TransactionBlockBytes = http_client
         .publish(
diff --git a/crates/sui-json-rpc-tests/tests/transaction_tests.rs b/crates/sui-json-rpc-tests/tests/transaction_tests.rs
index f1036cbf00d7d..0ab96b4ac0210 100644
--- a/crates/sui-json-rpc-tests/tests/transaction_tests.rs
+++ b/crates/sui-json-rpc-tests/tests/transaction_tests.rs
@@ -259,24 +259,23 @@ async fn test_get_fullnode_transaction() -> Result<(), anyhow::Error> {
     assert!(second_page.data.len() > 5);
     assert!(!second_page.has_next_page);
 
-    let mut all_txs_rev = first_page.data.clone();
-    all_txs_rev.extend(second_page.data);
-    all_txs_rev.reverse();
+    let mut all_txs = first_page.data.clone();
+    all_txs.extend(second_page.data);
 
-    // test get 10 latest transactions paged
+    // test get 10 transactions paged
     let latest = client
         .read_api()
         .query_transaction_blocks(
             SuiTransactionBlockResponseQuery::default(),
             None,
             Some(10),
-            true,
+            false,
         )
         .await
         .unwrap();
     assert_eq!(10, latest.data.len());
-    assert_eq!(Some(all_txs_rev[9].digest), latest.next_cursor);
-    assert_eq!(all_txs_rev[0..10], latest.data);
+    assert_eq!(Some(all_txs[9].digest), latest.next_cursor);
+    assert_eq!(all_txs[0..10], latest.data);
     assert!(latest.has_next_page);
 
     // test get from address txs in ascending order
diff --git a/crates/sui-json-rpc-types/src/sui_transaction.rs b/crates/sui-json-rpc-types/src/sui_transaction.rs
index eff57a51290cc..8936d54831102 100644
--- a/crates/sui-json-rpc-types/src/sui_transaction.rs
+++ b/crates/sui-json-rpc-types/src/sui_transaction.rs
@@ -180,6 +180,10 @@ impl SuiTransactionBlockResponseOptions {
         }
     }
 
+    #[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
     }
@@ -1799,7 +1803,7 @@ impl SuiProgrammableTransactionBlock {
     }
 
     fn resolve_input_type(
-        inputs: &Vec<CallArg>,
+        inputs: &[CallArg],
         commands: &[Command],
         module_cache: &impl GetModule,
     ) -> Vec<Option<MoveTypeLayout>> {
diff --git a/crates/sui-json-rpc/Cargo.toml b/crates/sui-json-rpc/Cargo.toml
index de2f6f9f9e957..8704ad0a3b528 100644
--- a/crates/sui-json-rpc/Cargo.toml
+++ b/crates/sui-json-rpc/Cargo.toml
@@ -14,6 +14,7 @@ chrono.workspace = true
 fastcrypto.workspace = true
 jsonrpsee.workspace = true
 hyper.workspace = true
+http-body = "0.4"
 itertools.workspace = true
 indexmap.workspace = true
 tower.workspace = true
@@ -53,6 +54,7 @@ sui-json-rpc-types.workspace = true
 sui-macros.workspace = true
 sui-transaction-builder.workspace = true
 mysten-metrics.workspace = true
+mysten-service.workspace = true
 shared-crypto.workspace = true
 typed-store-error.workspace = true
 cached.workspace = true
diff --git a/crates/sui-json-rpc/src/axum_router.rs b/crates/sui-json-rpc/src/axum_router.rs
index c46cc04a74494..0fb6be835c835 100644
--- a/crates/sui-json-rpc/src/axum_router.rs
+++ b/crates/sui-json-rpc/src/axum_router.rs
@@ -7,6 +7,7 @@ use std::{net::SocketAddr, sync::Arc};
 use sui_types::traffic_control::RemoteFirewallConfig;
 
 use axum::extract::{ConnectInfo, Json, State};
+use axum::response::Response;
 use futures::StreamExt;
 use hyper::header::HeaderValue;
 use hyper::HeaderMap;
@@ -23,6 +24,7 @@ use serde_json::value::RawValue;
 use sui_core::traffic_controller::{
     metrics::TrafficControllerMetrics, policies::TrafficTally, TrafficController,
 };
+use sui_json_rpc_api::TRANSACTION_EXECUTION_CLIENT_ERROR_CODE;
 use sui_types::traffic_control::ClientIdSource;
 use sui_types::traffic_control::{PolicyConfig, Weight};
 use tracing::error;
@@ -101,12 +103,12 @@ impl<L: Logger> JsonRpcService<L> {
 }
 
 /// Create a response body.
-fn from_template<S: Into<hyper::Body>>(
+fn from_template<S: Into<axum::body::Body>>(
     status: hyper::StatusCode,
     body: S,
     content_type: &'static str,
-) -> hyper::Response<hyper::Body> {
-    hyper::Response::builder()
+) -> Response {
+    Response::builder()
         .status(status)
         .header(
             "content-type",
@@ -119,7 +121,7 @@ fn from_template<S: Into<hyper::Body>>(
 }
 
 /// Create a valid JSON response.
-pub(crate) fn ok_response(body: String) -> hyper::Response<hyper::Body> {
+pub(crate) fn ok_response(body: String) -> Response {
     const JSON: &str = "application/json; charset=utf-8";
     from_template(hyper::StatusCode::OK, body, JSON)
 }
@@ -277,6 +279,8 @@ fn handle_traffic_resp(
 fn normalize(err: ErrorCode) -> Weight {
     match err {
         ErrorCode::InvalidRequest | ErrorCode::InvalidParams => Weight::one(),
+        // e.g. invalid client signature
+        ErrorCode::ServerError(i) if i == TRANSACTION_EXECUTION_CLIENT_ERROR_CODE => Weight::one(),
         _ => Weight::zero(),
     }
 }
diff --git a/crates/sui-json-rpc/src/balance_changes.rs b/crates/sui-json-rpc/src/balance_changes.rs
index 4a4de9f181c74..258db2168115b 100644
--- a/crates/sui-json-rpc/src/balance_changes.rs
+++ b/crates/sui-json-rpc/src/balance_changes.rs
@@ -402,6 +402,36 @@ impl<P> ObjectProviderCache<P> {
             provider,
         }
     }
+
+    pub fn new_with_output_objects(provider: P, output_objects: Vec<Object>) -> Self {
+        let mut object_cache = BTreeMap::new();
+        let mut last_version_cache = BTreeMap::new();
+
+        for object in output_objects {
+            let object_id = object.id();
+            let version = object.version();
+
+            let key = (object_id, version);
+            object_cache.insert(key, object.clone());
+
+            match last_version_cache.get_mut(&key) {
+                Some(existing_seq_number) => {
+                    if version > *existing_seq_number {
+                        *existing_seq_number = version
+                    }
+                }
+                None => {
+                    last_version_cache.insert(key, version);
+                }
+            }
+        }
+
+        Self {
+            object_cache: RwLock::new(object_cache),
+            last_version_cache: RwLock::new(last_version_cache),
+            provider,
+        }
+    }
 }
 
 #[async_trait]
diff --git a/crates/sui-json-rpc/src/lib.rs b/crates/sui-json-rpc/src/lib.rs
index 694cb2ff3e17b..08adfcfa44469 100644
--- a/crates/sui-json-rpc/src/lib.rs
+++ b/crates/sui-json-rpc/src/lib.rs
@@ -5,9 +5,9 @@ use std::env;
 use std::net::SocketAddr;
 use std::str::FromStr;
 
+use axum::body::Body;
 use hyper::header::HeaderName;
 use hyper::header::HeaderValue;
-use hyper::Body;
 use hyper::Method;
 use hyper::Request;
 use jsonrpsee::RpcModule;
@@ -127,7 +127,7 @@ impl JsonRpcServerBuilder {
 
     fn trace_layer() -> TraceLayer<
         tower_http::classify::SharedClassifier<tower_http::classify::ServerErrorsAsFailures>,
-        impl tower_http::trace::MakeSpan<hyper::Body> + Clone,
+        impl tower_http::trace::MakeSpan<Body> + Clone,
         (),
         (),
         (),
@@ -259,13 +259,18 @@ impl JsonRpcServerBuilder {
     ) -> Result<ServerHandle, Error> {
         let app = self.to_router(server_type).await?;
 
-        let server = axum::Server::bind(&listen_address)
-            .serve(app.into_make_service_with_connect_info::<SocketAddr>());
-
-        let addr = server.local_addr();
+        let listener = tokio::net::TcpListener::bind(&listen_address)
+            .await
+            .unwrap();
+        let addr = listener.local_addr().unwrap();
 
         let handle = tokio::spawn(async move {
-            server.await.unwrap();
+            axum::serve(
+                listener,
+                app.into_make_service_with_connect_info::<SocketAddr>(),
+            )
+            .await
+            .unwrap();
             if let Some(cancel) = cancel {
                 // Signal that the server is shutting down, so other tasks can clean-up.
                 cancel.cancel();
diff --git a/crates/sui-json-rpc/src/metrics.rs b/crates/sui-json-rpc/src/metrics.rs
index d4d693301906c..26b8bd6a745f1 100644
--- a/crates/sui-json-rpc/src/metrics.rs
+++ b/crates/sui-json-rpc/src/metrics.rs
@@ -1,10 +1,10 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use hyper::body::HttpBody;
 use std::collections::HashSet;
 use std::net::SocketAddr;
 
+use http_body::Body;
 use jsonrpsee::server::logger::{HttpRequest, Logger, MethodKind, TransportProtocol};
 use jsonrpsee::types::Params;
 use prometheus::{
diff --git a/crates/sui-json-rpc/src/read_api.rs b/crates/sui-json-rpc/src/read_api.rs
index 6de1c04324208..4dfdccc1086c6 100644
--- a/crates/sui-json-rpc/src/read_api.rs
+++ b/crates/sui-json-rpc/src/read_api.rs
@@ -17,6 +17,7 @@ use move_core_types::language_storage::StructTag;
 use tap::TapFallible;
 use tracing::{debug, error, info, instrument, trace, warn};
 
+use mysten_metrics::add_server_timing;
 use mysten_metrics::spawn_monitored_task;
 use sui_core::authority::AuthorityState;
 use sui_json_rpc_api::{
@@ -721,10 +722,12 @@ impl ReadApiServer for ReadApi {
             // Fetch transaction to determine existence
             let transaction_kv_store = self.transaction_kv_store.clone();
             let transaction = spawn_monitored_task!(async move {
-                transaction_kv_store.get_tx(digest).await.map_err(|err| {
+                let ret = transaction_kv_store.get_tx(digest).await.map_err(|err| {
                     debug!(tx_digest=?digest, "Failed to get transaction: {:?}", err);
                     Error::from(err)
-                })
+                });
+                add_server_timing("tx_kv_lookup");
+                ret
             })
             .await
             .map_err(Error::from)??;
diff --git a/crates/sui-json-rpc/src/transaction_execution_api.rs b/crates/sui-json-rpc/src/transaction_execution_api.rs
index dc875e54f7059..d38a70be4c553 100644
--- a/crates/sui-json-rpc/src/transaction_execution_api.rs
+++ b/crates/sui-json-rpc/src/transaction_execution_api.rs
@@ -10,6 +10,12 @@ use fastcrypto::traits::ToFromBytes;
 use jsonrpsee::core::RpcResult;
 use jsonrpsee::RpcModule;
 
+use crate::authority_state::StateRead;
+use crate::error::{Error, SuiRpcInputError};
+use crate::{
+    get_balance_changes_from_effect, get_object_changes, with_tracing, ObjectProviderCache,
+    SuiRpcModule,
+};
 use mysten_metrics::spawn_monitored_task;
 use shared_crypto::intent::{AppId, Intent, IntentMessage, IntentScope, IntentVersion};
 use sui_core::authority::AuthorityState;
@@ -26,22 +32,16 @@ use sui_types::crypto::default_hash;
 use sui_types::digests::TransactionDigest;
 use sui_types::effects::TransactionEffectsAPI;
 use sui_types::quorum_driver_types::{
-    ExecuteTransactionRequest, ExecuteTransactionRequestType, ExecuteTransactionResponse,
+    ExecuteTransactionRequestType, ExecuteTransactionRequestV3, ExecuteTransactionResponseV3,
 };
 use sui_types::signature::GenericSignature;
+use sui_types::storage::PostExecutionPackageResolver;
 use sui_types::sui_serde::BigInt;
 use sui_types::transaction::{
     InputObjectKind, Transaction, TransactionData, TransactionDataAPI, TransactionKind,
 };
 use tracing::instrument;
 
-use crate::authority_state::StateRead;
-use crate::error::{Error, SuiRpcInputError};
-use crate::{
-    get_balance_changes_from_effect, get_object_changes, with_tracing, ObjectProviderCache,
-    SuiRpcModule,
-};
-
 pub struct TransactionExecutionApi {
     state: Arc<dyn StateRead>,
     transaction_orchestrator: Arc<TransactiondOrchestrator<NetworkAuthorityClient>>,
@@ -75,11 +75,10 @@ impl TransactionExecutionApi {
         tx_bytes: Base64,
         signatures: Vec<Base64>,
         opts: Option<SuiTransactionBlockResponseOptions>,
-        request_type: Option<ExecuteTransactionRequestType>,
     ) -> Result<
         (
+            ExecuteTransactionRequestV3,
             SuiTransactionBlockResponseOptions,
-            ExecuteTransactionRequestType,
             SuiAddress,
             Vec<InputObjectKind>,
             Transaction,
@@ -89,12 +88,7 @@ impl TransactionExecutionApi {
         SuiRpcInputError,
     > {
         let opts = opts.unwrap_or_default();
-        let request_type = match (request_type, opts.require_local_execution()) {
-            (Some(ExecuteTransactionRequestType::WaitForEffectsCert), true) => {
-                Err(SuiRpcInputError::InvalidExecuteTransactionRequestType)?
-            }
-            (t, _) => t.unwrap_or_else(|| opts.default_execution_request_type()),
-        };
+
         let tx_data: TransactionData = self.convert_bytes(tx_bytes)?;
         let sender = tx_data.sender();
         let input_objs = tx_data.input_objects().unwrap_or_default();
@@ -118,9 +112,21 @@ impl TransactionExecutionApi {
         } else {
             None
         };
+
+        let request = ExecuteTransactionRequestV3 {
+            transaction: txn.clone(),
+            include_events: opts.show_events,
+            include_input_objects: opts.show_balance_changes || opts.show_object_changes,
+            include_output_objects: opts.show_balance_changes
+                || opts.show_object_changes
+                // In order to resolve events, we may need access to the newly published packages.
+                || opts.show_events,
+            include_auxiliary_data: false,
+        };
+
         Ok((
+            request,
             opts,
-            request_type,
             sender,
             input_objs,
             txn,
@@ -136,25 +142,24 @@ impl TransactionExecutionApi {
         opts: Option<SuiTransactionBlockResponseOptions>,
         request_type: Option<ExecuteTransactionRequestType>,
     ) -> Result<SuiTransactionBlockResponse, Error> {
-        let (opts, request_type, sender, input_objs, txn, transaction, raw_transaction) =
-            self.prepare_execute_transaction_block(tx_bytes, signatures, opts, request_type)?;
+        let request_type =
+            request_type.unwrap_or(ExecuteTransactionRequestType::WaitForEffectsCert);
+        let (request, opts, sender, input_objs, txn, transaction, raw_transaction) =
+            self.prepare_execute_transaction_block(tx_bytes, signatures, opts)?;
         let digest = *txn.digest();
 
         let transaction_orchestrator = self.transaction_orchestrator.clone();
         let orch_timer = self.metrics.orchestrator_latency_ms.start_timer();
-        let response = spawn_monitored_task!(transaction_orchestrator.execute_transaction_block(
-            ExecuteTransactionRequest {
-                transaction: txn,
-                request_type,
-            },
-            None,
-        ))
+        let (response, is_executed_locally) = spawn_monitored_task!(
+            transaction_orchestrator.execute_transaction_block(request, request_type, None)
+        )
         .await?
         .map_err(Error::from)?;
         drop(orch_timer);
 
         self.handle_post_orchestration(
             response,
+            is_executed_locally,
             opts,
             digest,
             input_objs,
@@ -167,7 +172,8 @@ impl TransactionExecutionApi {
 
     async fn handle_post_orchestration(
         &self,
-        response: ExecuteTransactionResponse,
+        response: ExecuteTransactionResponseV3,
+        is_executed_locally: bool,
         opts: SuiTransactionBlockResponseOptions,
         digest: TransactionDigest,
         input_objs: Vec<InputObjectKind>,
@@ -176,49 +182,59 @@ impl TransactionExecutionApi {
         sender: SuiAddress,
     ) -> Result<SuiTransactionBlockResponse, Error> {
         let _post_orch_timer = self.metrics.post_orchestrator_latency_ms.start_timer();
-        let ExecuteTransactionResponse::EffectsCert(cert) = response;
-        let (effects, transaction_events, is_executed_locally) = *cert;
-        let mut events: Option<SuiTransactionBlockEvents> = None;
-        if opts.show_events {
+
+        let events = if opts.show_events {
             let epoch_store = self.state.load_epoch_store_one_call_per_task();
-            let backing_package_store = self.state.get_backing_package_store();
+            let backing_package_store = PostExecutionPackageResolver::new(
+                self.state.get_backing_package_store().clone(),
+                &response.output_objects,
+            );
             let mut layout_resolver = epoch_store
                 .executor()
-                .type_layout_resolver(Box::new(backing_package_store.as_ref()));
-            events = Some(SuiTransactionBlockEvents::try_from(
-                transaction_events,
+                .type_layout_resolver(Box::new(backing_package_store));
+            Some(SuiTransactionBlockEvents::try_from(
+                response.events.unwrap_or_default(),
                 digest,
                 None,
                 layout_resolver.as_mut(),
-            )?);
-        }
-
-        let object_cache = ObjectProviderCache::new(self.state.clone());
-        let balance_changes = if opts.show_balance_changes && is_executed_locally {
-            Some(
-                get_balance_changes_from_effect(&object_cache, &effects.effects, input_objs, None)
-                    .await?,
-            )
+            )?)
         } else {
             None
         };
-        let object_changes = if opts.show_object_changes && is_executed_locally {
-            Some(
+
+        let object_cache = response.output_objects.map(|output_objects| {
+            ObjectProviderCache::new_with_output_objects(self.state.clone(), output_objects)
+        });
+
+        let balance_changes = match &object_cache {
+            Some(object_cache) if opts.show_balance_changes => Some(
+                get_balance_changes_from_effect(
+                    object_cache,
+                    &response.effects.effects,
+                    input_objs,
+                    None,
+                )
+                .await?,
+            ),
+            _ => None,
+        };
+
+        let object_changes = match &object_cache {
+            Some(object_cache) if opts.show_object_changes => Some(
                 get_object_changes(
-                    &object_cache,
+                    object_cache,
                     sender,
-                    effects.effects.modified_at_versions(),
-                    effects.effects.all_changed_objects(),
-                    effects.effects.all_removed_objects(),
+                    response.effects.effects.modified_at_versions(),
+                    response.effects.effects.all_changed_objects(),
+                    response.effects.effects.all_removed_objects(),
                 )
                 .await?,
-            )
-        } else {
-            None
+            ),
+            _ => None,
         };
 
         let raw_effects = if opts.show_raw_effects {
-            bcs::to_bytes(&effects.effects)?
+            bcs::to_bytes(&response.effects.effects)?
         } else {
             vec![]
         };
@@ -227,7 +243,9 @@ impl TransactionExecutionApi {
             digest,
             transaction,
             raw_transaction,
-            effects: opts.show_effects.then_some(effects.effects.try_into()?),
+            effects: opts
+                .show_effects
+                .then_some(response.effects.effects.try_into()?),
             events,
             object_changes,
             balance_changes,
diff --git a/crates/sui-json/src/lib.rs b/crates/sui-json/src/lib.rs
index 6c367c0d6ba15..4782ed9e57116 100644
--- a/crates/sui-json/src/lib.rs
+++ b/crates/sui-json/src/lib.rs
@@ -703,7 +703,7 @@ fn resolve_object_vec_arg(idx: usize, arg: &SuiJsonValue) -> Result<Vec<ObjectID
             // representing a JSON array rather than with the array itself ("[0x42,0x7]" rather than
             // [0x42,0x7]).
             let mut object_ids = vec![];
-            for tok in s[1..s.len() - 1].to_string().split(',') {
+            for tok in s[1..s.len() - 1].split(',') {
                 let id = JsonValue::String(tok.to_string());
                 object_ids.push(resolve_object_arg(idx, &id)?);
             }
diff --git a/crates/sui-keys/src/keypair_file.rs b/crates/sui-keys/src/keypair_file.rs
index ec90a35dbcd45..a2397f57990d0 100644
--- a/crates/sui-keys/src/keypair_file.rs
+++ b/crates/sui-keys/src/keypair_file.rs
@@ -59,6 +59,7 @@ pub fn read_network_keypair_from_file<P: AsRef<std::path::Path>>(
 /// - Base64 encoded `privkey` for Raw key
 /// - Bech32 encoded private key prefixed with `suiprivkey`
 /// - Hex encoded `privkey` for Raw key
+///
 /// If `require_secp256k1` is true, it will return an error if the key is not Secp256k1.
 pub fn read_key(path: &PathBuf, require_secp256k1: bool) -> Result<SuiKeyPair, anyhow::Error> {
     if !path.exists() {
diff --git a/crates/sui-keys/src/keystore.rs b/crates/sui-keys/src/keystore.rs
index 199e0fe6f4a7f..db622a9535718 100644
--- a/crates/sui-keys/src/keystore.rs
+++ b/crates/sui-keys/src/keystore.rs
@@ -421,13 +421,10 @@ impl FileBasedKeystore {
         Ok(())
     }
 
+    /// Keys saved as Base64 with 33 bytes `flag || privkey` ($BASE64_STR).
+    /// To see Bech32 format encoding, use `sui keytool export $SUI_ADDRESS` where
+    /// $SUI_ADDRESS can be found with `sui keytool list`. Or use `sui keytool convert $BASE64_STR`
     pub fn save_keystore(&self) -> Result<(), anyhow::Error> {
-        eprintln!(
-            "Keys saved as Base64 with 33 bytes `flag || privkey` ($BASE64_STR). 
-        To see Bech32 format encoding, use `sui keytool export $SUI_ADDRESS` where 
-        $SUI_ADDRESS can be found with `sui keytool list`. Or use `sui keytool convert $BASE64_STR`."
-        );
-
         if let Some(path) = &self.path {
             let store = serde_json::to_string_pretty(
                 &self
diff --git a/crates/sui-light-client/Cargo.toml b/crates/sui-light-client/Cargo.toml
index 1cf90ea7aa48f..a18d7df4c49cd 100644
--- a/crates/sui-light-client/Cargo.toml
+++ b/crates/sui-light-client/Cargo.toml
@@ -6,6 +6,13 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lib]
+path = "src/lib.rs"
+
+[[bin]]
+name = "sui-light-client"
+path = "src/main.rs"
+
 [dependencies]
 anyhow.workspace = true
 async-trait.workspace = true
@@ -25,4 +32,3 @@ sui-sdk.workspace = true
 move-binary-format.workspace = true
 sui-json-rpc-types.workspace = true
 sui-package-resolver.workspace = true
-
diff --git a/crates/sui-light-client/example_config/15918264.chk b/crates/sui-light-client/example_config/15918264.chk
new file mode 100644
index 0000000000000..70892f9c226c1
Binary files /dev/null and b/crates/sui-light-client/example_config/15918264.chk differ
diff --git a/crates/sui-light-client/example_config/16005062.chk b/crates/sui-light-client/example_config/16005062.chk
new file mode 100644
index 0000000000000..88d1bf8ee7131
Binary files /dev/null and b/crates/sui-light-client/example_config/16005062.chk differ
diff --git a/crates/sui-light-client/example_config/20958462.chk b/crates/sui-light-client/example_config/20958462.chk
new file mode 100644
index 0000000000000..ddd4569b66247
Binary files /dev/null and b/crates/sui-light-client/example_config/20958462.chk differ
diff --git a/crates/sui-light-client/src/construct.rs b/crates/sui-light-client/src/construct.rs
new file mode 100644
index 0000000000000..7658236768daa
--- /dev/null
+++ b/crates/sui-light-client/src/construct.rs
@@ -0,0 +1,91 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::proof::{Proof, ProofTarget, TransactionProof};
+
+use anyhow::anyhow;
+use sui_rest_api::{CheckpointData, CheckpointTransaction};
+use sui_types::effects::TransactionEffectsAPI;
+
+/// Construct a proof from the given checkpoint data and proof targets.
+///
+/// Only minimal cheaper checks are performed to ensure the proof is valid. If you need guaranteed
+/// validity consider calling `verify_proof` function on the constructed proof. It either returns
+/// `Ok` with a proof, or `Err` with a description of the error.
+pub fn construct_proof(targets: ProofTarget, data: &CheckpointData) -> anyhow::Result<Proof> {
+    let checkpoint_summary = data.checkpoint_summary.clone();
+    let mut this_proof = Proof {
+        targets,
+        checkpoint_summary,
+        contents_proof: None,
+    };
+
+    // Do a minimal check that the given checkpoint data is consistent with the committee
+    if let Some(committee) = &this_proof.targets.committee {
+        // Check we have the correct epoch
+        if this_proof.checkpoint_summary.epoch() + 1 != committee.epoch {
+            return Err(anyhow!("Epoch mismatch between checkpoint and committee"));
+        }
+
+        // Check its an end of epoch checkpoint
+        if this_proof.checkpoint_summary.end_of_epoch_data.is_none() {
+            return Err(anyhow!("Expected end of epoch checkpoint"));
+        }
+    }
+
+    // If proof targets include objects or events, we need to include the contents proof
+    // Need to ensure that all targets refer to the same transaction first of all
+    let object_tx = this_proof
+        .targets
+        .objects
+        .iter()
+        .map(|(_, o)| o.previous_transaction);
+    let event_tx = this_proof
+        .targets
+        .events
+        .iter()
+        .map(|(eid, _)| eid.tx_digest);
+    let mut all_tx = object_tx.chain(event_tx);
+
+    // Get the first tx ID
+    let target_tx_id = if let Some(first_tx) = all_tx.next() {
+        first_tx
+    } else {
+        // Since there is no target we just return the summary proof
+        return Ok(this_proof);
+    };
+
+    // Basic check that all targets refer to the same transaction
+    if !all_tx.all(|tx| tx == target_tx_id) {
+        return Err(anyhow!("All targets must refer to the same transaction"));
+    }
+
+    // Find the transaction in the checkpoint data
+    let tx = data
+        .transactions
+        .iter()
+        .find(|t| t.effects.transaction_digest() == &target_tx_id)
+        .ok_or(anyhow!("Transaction not found in checkpoint data"))?
+        .clone();
+
+    let CheckpointTransaction {
+        transaction,
+        effects,
+        events,
+        ..
+    } = tx;
+
+    // Add all the transaction data in there
+    this_proof.contents_proof = Some(TransactionProof {
+        checkpoint_contents: data.checkpoint_contents.clone(),
+        transaction,
+        effects,
+        events,
+    });
+
+    // TODO: should we check that the objects & events are in the transaction, to
+    //       avoid constructing invalid proofs? I opt to not check because the check
+    //       is expensive (sequential scan of all objects).
+
+    Ok(this_proof)
+}
diff --git a/crates/sui-light-client/src/lib.rs b/crates/sui-light-client/src/lib.rs
new file mode 100644
index 0000000000000..8f5488b48be9a
--- /dev/null
+++ b/crates/sui-light-client/src/lib.rs
@@ -0,0 +1,11 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod construct;
+pub mod proof;
+
+#[doc(inline)]
+pub use proof::*;
+
+#[doc(inline)]
+pub use construct::*;
diff --git a/crates/sui-light-client/src/main.rs b/crates/sui-light-client/src/main.rs
index f62f5a45e6f4a..0dc3f586f4ee5 100644
--- a/crates/sui-light-client/src/main.rs
+++ b/crates/sui-light-client/src/main.rs
@@ -96,8 +96,8 @@ struct Config {
 }
 
 impl Config {
-    pub fn rest_url(&self) -> String {
-        format!("{}/rest", self.full_node_url)
+    pub fn rest_url(&self) -> &str {
+        &self.full_node_url
     }
 }
 
@@ -186,7 +186,7 @@ async fn download_checkpoint_summary(
 ) -> anyhow::Result<CertifiedCheckpointSummary> {
     // Download the checkpoint from the server
     let client = Client::new(config.rest_url());
-    client.get_checkpoint_summary(seq).await
+    client.get_checkpoint_summary(seq).await.map_err(Into::into)
 }
 
 /// Run binary search to for each end of epoch checkpoint that is missing
diff --git a/crates/sui-light-client/src/proof.rs b/crates/sui-light-client/src/proof.rs
new file mode 100644
index 0000000000000..8d846384e64bb
--- /dev/null
+++ b/crates/sui-light-client/src/proof.rs
@@ -0,0 +1,230 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::anyhow;
+
+use sui_types::{
+    base_types::ObjectRef,
+    committee::Committee,
+    effects::{TransactionEffects, TransactionEffectsAPI, TransactionEvents},
+    event::{Event, EventID},
+    messages_checkpoint::{CertifiedCheckpointSummary, CheckpointContents, EndOfEpochData},
+    object::Object,
+    transaction::Transaction,
+};
+
+/// Define aspect of Sui state that needs to be certified in a proof
+#[derive(Default)]
+pub struct ProofTarget {
+    /// Objects that need to be certified.
+    pub objects: Vec<(ObjectRef, Object)>,
+
+    /// Events that need to be certified.
+    pub events: Vec<(EventID, Event)>,
+
+    /// The next committee being certified.
+    pub committee: Option<Committee>,
+}
+
+impl ProofTarget {
+    /// Create a new empty proof target. An empty proof target still ensures that the
+    /// checkpoint summary is correct.
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    /// Add an object to be certified by object reference and content. A verified proof will
+    /// ensure that both the reference and content are correct. Note that some content is
+    /// metadata such as the transaction that created this object.
+    pub fn add_object(mut self, object_ref: ObjectRef, object: Object) -> Self {
+        self.objects.push((object_ref, object));
+        self
+    }
+
+    /// Add an event to be certified by event ID and content. A verified proof will ensure that
+    /// both the ID and content are correct.
+    pub fn add_event(mut self, event_id: EventID, event: Event) -> Self {
+        self.events.push((event_id, event));
+        self
+    }
+
+    /// Add the next committee to be certified. A verified proof will ensure that the next
+    /// committee is correct.
+    pub fn set_committee(mut self, committee: Committee) -> Self {
+        self.committee = Some(committee);
+        self
+    }
+}
+
+/// Part of a proof that provides evidence relating to a specific transaction to
+/// certify objects and events.
+pub struct TransactionProof {
+    /// Checkpoint contents including this transaction.
+    pub checkpoint_contents: CheckpointContents,
+
+    /// The transaction being certified.
+    pub transaction: Transaction,
+
+    /// The effects of the transaction being certified.
+    pub effects: TransactionEffects,
+
+    /// The events of the transaction being certified.
+    pub events: Option<TransactionEvents>,
+}
+
+/// A proof for specific targets. It certifies a checkpoint summary and optionally includes
+/// transaction evidence to certify objects and events.
+pub struct Proof {
+    /// Targets of the proof are a committee, objects, or events that need to be certified.
+    pub targets: ProofTarget,
+
+    /// A summary of the checkpoint being certified.
+    pub checkpoint_summary: CertifiedCheckpointSummary,
+
+    /// Optional transaction proof to certify objects and events.
+    pub contents_proof: Option<TransactionProof>,
+}
+
+/// Verify a proof against a committee. A proof is valid if it certifies the checkpoint summary
+/// and optionally includes transaction evidence to certify objects and events.
+///
+/// If the result is `Ok(())` then the proof is valid. If Err is returned then the proof is invalid
+/// and the error message will describe the reason. Once a proof is verified it can be trusted,
+/// and information in `targets` as well as `checkpoint_summary` or `contents_proof` can be
+/// trusted as being authentic.
+///
+/// The authoritative committee is required to verify the proof. The sequence of committees can be
+/// verified through a Committee proof target on the last checkpoint of each epoch,
+/// sequentially since the first epoch.
+pub fn verify_proof(committee: &Committee, proof: &Proof) -> anyhow::Result<()> {
+    // Get checkpoint summary and optional contents
+    let summary = &proof.checkpoint_summary;
+    let contents_ref = proof
+        .contents_proof
+        .as_ref()
+        .map(|x| &x.checkpoint_contents);
+
+    // Verify the checkpoint summary using the committee
+    summary.verify_with_contents(committee, contents_ref)?;
+
+    // MILESTONE 1 : summary and contents is correct
+    // Note: this is unconditional on the proof targets, and always checked.
+
+    // If the proof target is the next committee check it
+    if let Some(committee) = &proof.targets.committee {
+        match &summary.end_of_epoch_data {
+            Some(EndOfEpochData {
+                next_epoch_committee,
+                ..
+            }) => {
+                // Extract the end of epoch committee
+                let next_committee_data = next_epoch_committee.iter().cloned().collect();
+                let new_committee =
+                    Committee::new(summary.epoch().checked_add(1).unwrap(), next_committee_data);
+
+                if new_committee != *committee {
+                    return Err(anyhow!(
+                        "Given committee does not match the end of epoch committee"
+                    ));
+                }
+            }
+            None => {
+                return Err(anyhow!(
+                    "No end of epoch committee in the checkpoint summary"
+                ));
+            }
+        }
+    }
+
+    // MILESTONE 2: committee if requested is correct
+
+    // Non empty object or event targets require the optional contents proof
+    // If it is not present return an error
+
+    if (!proof.targets.objects.is_empty() || !proof.targets.events.is_empty())
+        && proof.contents_proof.is_none()
+    {
+        return Err(anyhow!("Contents proof is missing"));
+    }
+
+    // MILESTONE 3: contents proof is present if required
+
+    if let Some(contents_proof) = &proof.contents_proof {
+        // Extract Transaction Digests and check they are in contents
+        let digests = contents_proof.effects.execution_digests();
+        if contents_proof.transaction.digest() != &digests.transaction {
+            return Err(anyhow!(
+                "Transaction digest does not match the execution digest"
+            ));
+        }
+
+        // Ensure the digests are in the checkpoint contents
+        if !contents_proof
+            .checkpoint_contents
+            .enumerate_transactions(summary)
+            .any(|x| x.1 == &digests)
+        {
+            // Could not find the digest in the checkpoint contents
+            return Err(anyhow!(
+                "Transaction digest not found in the checkpoint contents"
+            ));
+        }
+
+        // MILESTONE 4: Transaction & Effect correct and in contents
+
+        if contents_proof.effects.events_digest()
+            != contents_proof.events.as_ref().map(|e| e.digest()).as_ref()
+        {
+            return Err(anyhow!("Events digest does not match the execution digest"));
+        }
+
+        // If the target includes any events ensure the events digest is not None
+        if !proof.targets.events.is_empty() && contents_proof.events.is_none() {
+            return Err(anyhow!("Events digest is missing"));
+        }
+
+        // MILESTONE 5: Events digest & Events are correct and present if required
+
+        // Now we verify the content of any target events
+
+        for (event_id, event) in &proof.targets.events {
+            // Check the event corresponds to the transaction
+            if event_id.tx_digest != digests.transaction {
+                return Err(anyhow!("Event does not belong to the transaction"));
+            }
+
+            // The sequence number must be a valid index
+            // Note: safe to unwrap as we have checked that its not None above
+            if event_id.event_seq as usize >= contents_proof.events.as_ref().unwrap().data.len() {
+                return Err(anyhow!("Event sequence number out of bounds"));
+            }
+
+            // Now check that the contents of the event are the same
+            if &contents_proof.events.as_ref().unwrap().data[event_id.event_seq as usize] != event {
+                return Err(anyhow!("Event contents do not match"));
+            }
+        }
+
+        // MILESTONE 6: Event contents are correct
+
+        // Now check all object references are correct and in the effects
+        let changed_objects = contents_proof.effects.all_changed_objects();
+
+        for (object_ref, object) in &proof.targets.objects {
+            // Is the given reference correct?
+            if object_ref != &object.compute_object_reference() {
+                return Err(anyhow!("Object reference does not match the object"));
+            }
+
+            // Has this object been created in these effects?
+            changed_objects
+                .iter()
+                .find(|effects_object_ref| &effects_object_ref.0 == object_ref)
+                .ok_or(anyhow!("Object not found"))?;
+        }
+
+        // MILESTONE 7: Object references are correct and in the effects
+    }
+
+    Ok(())
+}
diff --git a/crates/sui-light-client/tests/check_proof.rs b/crates/sui-light-client/tests/check_proof.rs
new file mode 100644
index 0000000000000..b02cd3e627398
--- /dev/null
+++ b/crates/sui-light-client/tests/check_proof.rs
@@ -0,0 +1,273 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::anyhow;
+
+use sui_light_client::construct::construct_proof;
+use sui_light_client::proof::{verify_proof, Proof, ProofTarget};
+
+use sui_types::event::{Event, EventID};
+
+use sui_types::{committee::Committee, effects::TransactionEffectsAPI, object::Object};
+
+use sui_rest_api::CheckpointData;
+
+use std::io::Read;
+use std::{fs, path::PathBuf};
+
+async fn read_full_checkpoint(checkpoint_path: &PathBuf) -> anyhow::Result<CheckpointData> {
+    println!("Reading checkpoint from {:?}", checkpoint_path);
+    let mut reader = fs::File::open(checkpoint_path.clone())?;
+    let mut buffer = Vec::new();
+    reader.read_to_end(&mut buffer)?;
+    let (_, data): (u8, CheckpointData) =
+        bcs::from_bytes(&buffer).map_err(|e| anyhow!("Unable to parse checkpoint file: {}", e))?;
+    Ok(data)
+}
+
+async fn read_data(committee_seq: u64, seq: u64) -> (Committee, CheckpointData) {
+    let mut d = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    d.push(format!("example_config/{}.chk", committee_seq));
+
+    let committee_checkpoint = read_full_checkpoint(&d).await.unwrap();
+
+    let prev_committee = committee_checkpoint
+        .checkpoint_summary
+        .end_of_epoch_data
+        .as_ref()
+        .ok_or(anyhow!("Expected checkpoint to be end-of-epoch"))
+        .unwrap()
+        .next_epoch_committee
+        .iter()
+        .cloned()
+        .collect();
+
+    // Make a committee object using this
+    let committee = Committee::new(
+        committee_checkpoint
+            .checkpoint_summary
+            .epoch()
+            .checked_add(1)
+            .unwrap(),
+        prev_committee,
+    );
+
+    let mut d = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    d.push(format!("example_config/{}.chk", seq));
+
+    let full_checkpoint = read_full_checkpoint(&d).await.unwrap();
+
+    (committee, full_checkpoint)
+}
+
+#[tokio::test]
+async fn check_can_read_test_data() {
+    let (_committee, full_checkpoint) = read_data(15918264, 16005062).await;
+    assert!(full_checkpoint
+        .checkpoint_summary
+        .end_of_epoch_data
+        .is_some());
+}
+
+#[tokio::test]
+async fn test_new_committee() {
+    let (committee, full_checkpoint) = read_data(15918264, 16005062).await;
+
+    let new_committee_data = full_checkpoint
+        .checkpoint_summary
+        .end_of_epoch_data
+        .as_ref()
+        .ok_or(anyhow!("Expected checkpoint to be end-of-epoch"))
+        .unwrap()
+        .next_epoch_committee
+        .iter()
+        .cloned()
+        .collect();
+
+    // Make a committee object using this
+    let new_committee = Committee::new(
+        full_checkpoint
+            .checkpoint_summary
+            .epoch()
+            .checked_add(1)
+            .unwrap(),
+        new_committee_data,
+    );
+
+    let committee_proof = Proof {
+        checkpoint_summary: full_checkpoint.checkpoint_summary.clone(),
+        contents_proof: None,
+        targets: ProofTarget::new().set_committee(new_committee.clone()),
+    };
+
+    assert!(verify_proof(&committee, &committee_proof).is_ok());
+}
+
+// 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(15918264, 16005062).await;
+
+    let committee_proof = Proof {
+        checkpoint_summary: full_checkpoint.checkpoint_summary.clone(),
+        contents_proof: None,
+        targets: ProofTarget::new().set_committee(committee.clone()), // WRONG
+    };
+
+    assert!(verify_proof(&committee, &committee_proof).is_err());
+}
+
+// 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(15918264, 16005062).await;
+
+    let new_committee_data = full_checkpoint
+        .checkpoint_summary
+        .end_of_epoch_data
+        .as_ref()
+        .ok_or(anyhow!("Expected checkpoint to be end-of-epoch"))
+        .unwrap()
+        .next_epoch_committee
+        .iter()
+        .cloned()
+        .collect();
+
+    // Make a committee object using this
+    let new_committee = Committee::new(
+        full_checkpoint
+            .checkpoint_summary
+            .epoch()
+            .checked_add(1)
+            .unwrap(),
+        new_committee_data,
+    );
+
+    let committee_proof = Proof {
+        checkpoint_summary: full_checkpoint.checkpoint_summary.clone(),
+        contents_proof: None,
+        targets: ProofTarget::new(),
+    };
+
+    assert!(verify_proof(
+        &new_committee, // WRONG
+        &committee_proof
+    )
+    .is_err());
+}
+
+#[tokio::test]
+async fn test_object_target_fail_no_data() {
+    let (committee, full_checkpoint) = read_data(15918264, 16005062).await;
+
+    let sample_object: Object = full_checkpoint.transactions[0].output_objects[0].clone();
+    let sample_ref = sample_object.compute_object_reference();
+
+    let bad_proof = Proof {
+        checkpoint_summary: full_checkpoint.checkpoint_summary.clone(),
+        contents_proof: None, // WRONG
+        targets: ProofTarget::new().add_object(sample_ref, sample_object),
+    };
+
+    assert!(verify_proof(&committee, &bad_proof).is_err());
+}
+
+#[tokio::test]
+async fn test_object_target_success() {
+    let (committee, full_checkpoint) = read_data(15918264, 16005062).await;
+
+    let sample_object: Object = full_checkpoint.transactions[0].output_objects[0].clone();
+    let sample_ref = sample_object.compute_object_reference();
+
+    let target = ProofTarget::new().add_object(sample_ref, sample_object);
+    let object_proof = construct_proof(target, &full_checkpoint).unwrap();
+
+    assert!(verify_proof(&committee, &object_proof).is_ok());
+}
+
+#[tokio::test]
+async fn test_object_target_fail_wrong_object() {
+    let (committee, full_checkpoint) = read_data(15918264, 16005062).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();
+    let mut sample_ref = sample_object.compute_object_reference();
+    let wrong_ref = wrong_object.compute_object_reference();
+
+    let target = ProofTarget::new().add_object(wrong_ref, sample_object.clone()); // WRONG
+    let object_proof = construct_proof(target, &full_checkpoint).unwrap();
+    assert!(verify_proof(&committee, &object_proof).is_err());
+
+    // Does not exist
+    sample_ref.1 = sample_ref.1.next(); // WRONG
+
+    let target = ProofTarget::new().add_object(sample_ref, sample_object);
+    let object_proof = construct_proof(target, &full_checkpoint).unwrap();
+    assert!(verify_proof(&committee, &object_proof).is_err());
+}
+
+#[tokio::test]
+async fn test_event_target_fail_no_data() {
+    let (committee, full_checkpoint) = read_data(15918264, 16005062).await;
+
+    let sample_event: Event = full_checkpoint.transactions[1]
+        .events
+        .as_ref()
+        .unwrap()
+        .data[0]
+        .clone();
+    let sample_eid = EventID::from((
+        *full_checkpoint.transactions[1].effects.transaction_digest(),
+        0,
+    ));
+
+    let bad_proof = Proof {
+        checkpoint_summary: full_checkpoint.checkpoint_summary.clone(),
+        contents_proof: None, // WRONG
+        targets: ProofTarget::new().add_event(sample_eid, sample_event),
+    };
+
+    assert!(verify_proof(&committee, &bad_proof).is_err());
+}
+
+#[tokio::test]
+async fn test_event_target_success() {
+    let (committee, full_checkpoint) = read_data(15918264, 16005062).await;
+
+    let sample_event: Event = full_checkpoint.transactions[1]
+        .events
+        .as_ref()
+        .unwrap()
+        .data[0]
+        .clone();
+    let sample_eid = EventID::from((
+        *full_checkpoint.transactions[1].effects.transaction_digest(),
+        0,
+    ));
+
+    let target = ProofTarget::new().add_event(sample_eid, sample_event);
+    let event_proof = construct_proof(target, &full_checkpoint).unwrap();
+
+    assert!(verify_proof(&committee, &event_proof).is_ok());
+}
+
+#[tokio::test]
+async fn test_event_target_fail_bad_event() {
+    let (committee, full_checkpoint) = read_data(15918264, 16005062).await;
+
+    let sample_event: Event = full_checkpoint.transactions[1]
+        .events
+        .as_ref()
+        .unwrap()
+        .data[0]
+        .clone();
+    let sample_eid = EventID::from((
+        *full_checkpoint.transactions[1].effects.transaction_digest(),
+        1, // WRONG
+    ));
+
+    let target = ProofTarget::new().add_event(sample_eid, sample_event);
+    let event_proof = construct_proof(target, &full_checkpoint).unwrap();
+
+    assert!(verify_proof(&committee, &event_proof).is_err());
+}
diff --git a/crates/sui-macros/Cargo.toml b/crates/sui-macros/Cargo.toml
index c7e99bd255f69..cb274a3af898c 100644
--- a/crates/sui-macros/Cargo.toml
+++ b/crates/sui-macros/Cargo.toml
@@ -6,6 +6,9 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 sui-proc-macros.workspace = true
 once_cell.workspace = true
diff --git a/crates/sui-macros/src/lib.rs b/crates/sui-macros/src/lib.rs
index 6e3cd85ca19be..a036a3dbfcfb0 100644
--- a/crates/sui-macros/src/lib.rs
+++ b/crates/sui-macros/src/lib.rs
@@ -528,7 +528,7 @@ mod test {
         assert_eq!(Foo::new(1, 2).b, 2);
         assert_eq!(new_foo(1).a, 1);
 
-        let v = vec![Foo::new(1, 2), Foo::new(3, 2)];
+        let v = [Foo::new(1, 2), Foo::new(3, 2)];
 
         assert_eq!(v[0].a, 1);
         assert_eq!(v[1].b, 2);
@@ -720,7 +720,7 @@ mod test {
             assert_eq!(Foo::new(1, 2).b, 2);
             assert_eq!(new_foo(1).a, 1);
 
-            let v = vec![Foo::new(1, 2), Foo::new(3, 2)];
+            let v = [Foo::new(1, 2), Foo::new(3, 2)];
 
             assert_eq!(v[0].a, 1);
             assert_eq!(v[1].b, 2);
diff --git a/crates/sui-move-build/src/lib.rs b/crates/sui-move-build/src/lib.rs
index 9584bcd4998fb..26ba9a08eb734 100644
--- a/crates/sui-move-build/src/lib.rs
+++ b/crates/sui-move-build/src/lib.rs
@@ -347,19 +347,9 @@ impl CompiledPackage {
     }
 
     /// Return the set of Object IDs corresponding to this package's transitive dependencies'
-    /// original package IDs.
-    pub fn get_dependency_original_package_ids(&self) -> Vec<ObjectID> {
-        let mut ids: BTreeSet<_> = self
-            .package
-            .deps_compiled_units
-            .iter()
-            .map(|(_, m)| ObjectID::from(*m.unit.module.address()))
-            .collect();
-
-        // `0x0` is not a real dependency ID -- it means that the package has unpublished
-        // dependencies.
-        ids.remove(&ObjectID::ZERO);
-        ids.into_iter().collect()
+    /// storage package IDs (where to load those packages on-chain).
+    pub fn get_dependency_storage_package_ids(&self) -> Vec<ObjectID> {
+        self.dependency_ids.published.values().cloned().collect()
     }
 
     pub fn get_package_digest(&self, with_unpublished_deps: bool) -> [u8; 32] {
@@ -391,14 +381,6 @@ impl CompiledPackage {
             .collect()
     }
 
-    pub fn get_package_dependencies_hex(&self) -> Vec<String> {
-        self.dependency_ids
-            .published
-            .values()
-            .map(|object_id| object_id.to_hex_uncompressed())
-            .collect()
-    }
-
     /// Get bytecode modules from DeepBook that are used by this package
     pub fn get_deepbook_modules(&self) -> impl Iterator<Item = &CompiledModule> {
         self.get_modules_and_deps()
@@ -645,7 +627,7 @@ pub struct PackageDependencies {
     pub invalid: BTreeMap<Symbol, String>,
     /// Set of dependencies that have conflicting `published-at` addresses. The key refers to
     /// the package, and the tuple refers to the address in the (Move.lock, Move.toml) respectively.
-    pub conflicting: BTreeMap<Symbol, (String, String)>,
+    pub conflicting: BTreeMap<Symbol, (ObjectID, ObjectID)>,
 }
 
 /// Partition packages in `resolution_graph` into one of four groups:
diff --git a/crates/sui-move/src/build.rs b/crates/sui-move/src/build.rs
index 421ff6ca964fe..1d765e49e8120 100644
--- a/crates/sui-move/src/build.rs
+++ b/crates/sui-move/src/build.rs
@@ -29,6 +29,11 @@ pub struct Build {
     /// and events.
     #[clap(long, global = true)]
     pub generate_struct_layouts: bool,
+    /// The chain ID, if resolved. Required when the dump_bytecode_as_base64 is true,
+    /// for automated address management, where package addresses are resolved for the
+    /// respective chain in the Move.lock file.
+    #[clap(skip)]
+    pub chain_id: Option<String>,
 }
 
 impl Build {
@@ -45,6 +50,7 @@ impl Build {
             self.with_unpublished_dependencies,
             self.dump_bytecode_as_base64,
             self.generate_struct_layouts,
+            self.chain_id.clone(),
         )
     }
 
@@ -54,12 +60,13 @@ impl Build {
         with_unpublished_deps: bool,
         dump_bytecode_as_base64: bool,
         generate_struct_layouts: bool,
+        chain_id: Option<String>,
     ) -> anyhow::Result<()> {
         let pkg = BuildConfig {
             config,
             run_bytecode_verifier: true,
             print_diags_to_stderr: true,
-            chain_id: None,
+            chain_id,
         }
         .build(rerooted_path)?;
         if dump_bytecode_as_base64 {
@@ -68,12 +75,11 @@ impl Build {
                 check_unpublished_dependencies(&pkg.dependency_ids.unpublished)?;
             }
 
-            let package_dependencies = pkg.get_package_dependencies_hex();
             println!(
                 "{}",
                 json!({
                     "modules": pkg.get_package_base64(with_unpublished_deps),
-                    "dependencies": json!(package_dependencies),
+                    "dependencies": pkg.get_dependency_storage_package_ids(),
                     "digest": pkg.get_package_digest(with_unpublished_deps),
                 })
             )
diff --git a/crates/sui-move/src/unit_test.rs b/crates/sui-move/src/unit_test.rs
index 3bb4da1f2da0f..78ae1e5260a52 100644
--- a/crates/sui-move/src/unit_test.rs
+++ b/crates/sui-move/src/unit_test.rs
@@ -20,13 +20,8 @@ use sui_move_natives::test_scenario::InMemoryTestStore;
 use sui_move_natives::{object_runtime::ObjectRuntime, NativesCostTable};
 use sui_protocol_config::ProtocolConfig;
 use sui_types::{
-    base_types::{ObjectID, SequenceNumber},
-    error::SuiResult,
-    gas_model::tables::initial_cost_schedule_for_unit_tests,
-    in_memory_storage::InMemoryStorage,
+    gas_model::tables::initial_cost_schedule_for_unit_tests, in_memory_storage::InMemoryStorage,
     metrics::LimitsMetrics,
-    object::Object,
-    storage::ChildObjectResolver,
 };
 
 // Move unit tests will halt after executing this many steps. This is a protection to avoid divergence
@@ -63,28 +58,6 @@ impl Test {
     }
 }
 
-struct DummyChildObjectStore {}
-
-impl ChildObjectResolver for DummyChildObjectStore {
-    fn read_child_object(
-        &self,
-        _parent: &ObjectID,
-        _child: &ObjectID,
-        _child_version_upper_bound: SequenceNumber,
-    ) -> SuiResult<Option<Object>> {
-        Ok(None)
-    }
-    fn get_object_received_at_version(
-        &self,
-        _owner: &ObjectID,
-        _receiving_object_id: &ObjectID,
-        _receive_object_at_version: SequenceNumber,
-        _epoch_id: sui_types::committee::EpochId,
-    ) -> SuiResult<Option<Object>> {
-        Ok(None)
-    }
-}
-
 static TEST_STORE_INNER: Lazy<RwLock<InMemoryStorage>> =
     Lazy::new(|| RwLock::new(InMemoryStorage::default()));
 
diff --git a/crates/sui-network/src/state_sync/server.rs b/crates/sui-network/src/state_sync/server.rs
index f7e24b5a5202f..4e6b32cff059e 100644
--- a/crates/sui-network/src/state_sync/server.rs
+++ b/crates/sui-network/src/state_sync/server.rs
@@ -221,7 +221,7 @@ where
                 }
             })?;
 
-            struct SemaphoreExtension(OwnedSemaphorePermit);
+            struct SemaphoreExtension(#[allow(unused)] OwnedSemaphorePermit);
             inner.call(req).await.map(move |mut response| {
                 // Insert permit as extension so it's not dropped until the response is sent.
                 response
diff --git a/crates/sui-node/Cargo.toml b/crates/sui-node/Cargo.toml
index 2159ad62b713b..1e3449067aaf3 100644
--- a/crates/sui-node/Cargo.toml
+++ b/crates/sui-node/Cargo.toml
@@ -6,6 +6,9 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 anemo.workspace = true
 anemo-tower.workspace = true
@@ -19,6 +22,7 @@ prometheus.workspace = true
 tokio = { workspace = true, features = ["full"] }
 tracing.workspace = true
 futures.workspace = true
+parking_lot.workspace = true
 tower.workspace = true
 reqwest.workspace = true
 tap.workspace = true
@@ -43,6 +47,7 @@ sui-snapshot.workspace = true
 sui-telemetry.workspace = true
 sui-types.workspace = true
 mysten-metrics.workspace = true
+mysten-service.workspace = true
 mysten-common.workspace = true
 narwhal-network.workspace = true
 narwhal-worker.workspace = true
diff --git a/crates/sui-node/src/admin.rs b/crates/sui-node/src/admin.rs
index af0d710e229b4..3c867e2f994a0 100644
--- a/crates/sui-node/src/admin.rs
+++ b/crates/sui-node/src/admin.rs
@@ -128,10 +128,15 @@ pub async fn run_admin_server(node: Arc<SuiNode>, port: u16, tracing_handle: Tra
         "starting admin server"
     );
 
-    axum::Server::bind(&socket_address)
-        .serve(app.into_make_service_with_connect_info::<SocketAddr>())
+    let listener = tokio::net::TcpListener::bind(&socket_address)
         .await
-        .unwrap()
+        .unwrap();
+    axum::serve(
+        listener,
+        app.into_make_service_with_connect_info::<SocketAddr>(),
+    )
+    .await
+    .unwrap();
 }
 
 #[derive(Deserialize)]
@@ -236,12 +241,12 @@ async fn capabilities(State(state): State<Arc<AppState>>) -> (StatusCode, String
     // Only one of v1 or v2 will be populated at a time
     let capabilities = epoch_store.get_capabilities_v1();
     let mut output = String::new();
-    for capability in &capabilities {
+    for capability in capabilities.unwrap_or_default() {
         output.push_str(&format!("{:?}\n", capability));
     }
 
     let capabilities = epoch_store.get_capabilities_v2();
-    for capability in &capabilities {
+    for capability in capabilities.unwrap_or_default() {
         output.push_str(&format!("{:?}\n", capability));
     }
 
diff --git a/crates/sui-node/src/lib.rs b/crates/sui-node/src/lib.rs
index 46badb2d4ce1f..1f4f881d26f1f 100644
--- a/crates/sui-node/src/lib.rs
+++ b/crates/sui-node/src/lib.rs
@@ -55,6 +55,7 @@ use fastcrypto_zkp::bn254::zk_login::JWK;
 pub use handle::SuiNodeHandle;
 use mysten_metrics::{spawn_monitored_task, RegistryService};
 use mysten_network::server::ServerBuilder;
+use mysten_service::server_timing::server_timing_middleware;
 use narwhal_network::metrics::MetricsMakeCallbackHandler;
 use narwhal_network::metrics::{NetworkConnectionMetrics, NetworkMetrics};
 use sui_archival::reader::ArchiveReaderBalancer;
@@ -85,7 +86,7 @@ use sui_core::consensus_throughput_calculator::{
 use sui_core::consensus_validator::{SuiTxValidator, SuiTxValidatorMetrics};
 use sui_core::db_checkpoint_handler::DBCheckpointHandler;
 use sui_core::epoch::committee_store::CommitteeStore;
-use sui_core::epoch::data_removal::EpochDataRemover;
+use sui_core::epoch::consensus_store_pruner::ConsensusStorePruner;
 use sui_core::epoch::epoch_metrics::EpochMetrics;
 use sui_core::epoch::reconfiguration::ReconfigurationInitiator;
 use sui_core::module_cache_metrics::ResolverMetrics;
@@ -146,7 +147,7 @@ pub struct ValidatorComponents {
     validator_server_handle: JoinHandle<Result<()>>,
     validator_overload_monitor_handle: Option<JoinHandle<()>>,
     consensus_manager: ConsensusManager,
-    consensus_epoch_data_remover: EpochDataRemover,
+    consensus_store_pruner: ConsensusStorePruner,
     consensus_adapter: Arc<ConsensusAdapter>,
     // dropping this will eventually stop checkpoint tasks. The receiver side of this channel
     // is copied into each checkpoint service task, and they are listening to any change to this
@@ -657,11 +658,14 @@ impl SuiNode {
         }
 
         let authority_name = config.protocol_public_key();
-        let enable_validator_tx_finalizer =
-            config.enable_validator_tx_finalizer && chain_identifier.chain() != Chain::Mainnet;
-        let validator_tx_finalizer = enable_validator_tx_finalizer.then_some(Arc::new(
-            ValidatorTxFinalizer::new(auth_agg.clone(), authority_name, &prometheus_registry),
-        ));
+        let validator_tx_finalizer =
+            config
+                .enable_validator_tx_finalizer
+                .then_some(Arc::new(ValidatorTxFinalizer::new(
+                    auth_agg.clone(),
+                    authority_name,
+                    &prometheus_registry,
+                )));
 
         info!("create authority state");
         let state = AuthorityState::new(
@@ -1178,11 +1182,13 @@ impl SuiNode {
         let consensus_manager =
             ConsensusManager::new(&config, consensus_config, registry_service, client);
 
-        let mut consensus_epoch_data_remover =
-            EpochDataRemover::new(consensus_manager.get_storage_base_path());
-
         // This only gets started up once, not on every epoch. (Make call to remove every epoch.)
-        consensus_epoch_data_remover.run().await;
+        let consensus_store_pruner = ConsensusStorePruner::new(
+            consensus_manager.get_storage_base_path(),
+            consensus_config.db_retention_epochs(),
+            consensus_config.db_pruner_period(),
+            &registry_service.default_registry(),
+        );
 
         let checkpoint_metrics = CheckpointMetrics::new(&registry_service.default_registry());
         let sui_tx_validator_metrics =
@@ -1223,7 +1229,7 @@ impl SuiNode {
             state_sync_handle,
             randomness_handle,
             consensus_manager,
-            consensus_epoch_data_remover,
+            consensus_store_pruner,
             accumulator,
             validator_server_handle,
             validator_overload_monitor_handle,
@@ -1243,7 +1249,7 @@ impl SuiNode {
         state_sync_handle: state_sync::Handle,
         randomness_handle: randomness::Handle,
         consensus_manager: ConsensusManager,
-        consensus_epoch_data_remover: EpochDataRemover,
+        consensus_store_pruner: ConsensusStorePruner,
         accumulator: Weak<StateAccumulator>,
         validator_server_handle: JoinHandle<Result<()>>,
         validator_overload_monitor_handle: Option<JoinHandle<()>>,
@@ -1335,7 +1341,7 @@ impl SuiNode {
             validator_server_handle,
             validator_overload_monitor_handle,
             consensus_manager,
-            consensus_epoch_data_remover,
+            consensus_store_pruner,
             consensus_adapter,
             checkpoint_service_exit,
             checkpoint_metrics,
@@ -1644,7 +1650,7 @@ impl SuiNode {
                 validator_server_handle,
                 validator_overload_monitor_handle,
                 consensus_manager,
-                consensus_epoch_data_remover,
+                consensus_store_pruner,
                 consensus_adapter,
                 checkpoint_service_exit,
                 checkpoint_metrics,
@@ -1680,9 +1686,7 @@ impl SuiNode {
                 let weak_accumulator = Arc::downgrade(&new_accumulator);
                 *accumulator_guard = Some(new_accumulator);
 
-                consensus_epoch_data_remover
-                    .remove_old_data(next_epoch - 1)
-                    .await;
+                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.
@@ -1696,7 +1700,7 @@ impl SuiNode {
                             self.state_sync_handle.clone(),
                             self.randomness_handle.clone(),
                             consensus_manager,
-                            consensus_epoch_data_remover,
+                            consensus_store_pruner,
                             weak_accumulator,
                             validator_server_handle,
                             validator_overload_monitor_handle,
@@ -2038,17 +2042,24 @@ pub async fn build_http_server(
             rest_service.with_executor(transaction_orchestrator.clone())
         }
 
-        let rest_router = rest_service.into_router();
-        router = router
-            .nest("/rest", rest_router.clone())
-            .nest("/v2", rest_router);
+        router = router.merge(rest_service.into_router());
     }
 
-    let server = axum::Server::bind(&config.json_rpc_address)
-        .serve(router.into_make_service_with_connect_info::<SocketAddr>());
+    let listener = tokio::net::TcpListener::bind(&config.json_rpc_address)
+        .await
+        .unwrap();
+    let addr = listener.local_addr().unwrap();
+
+    router = router.layer(axum::middleware::from_fn(server_timing_middleware));
 
-    let addr = server.local_addr();
-    let handle = tokio::spawn(async move { server.await.unwrap() });
+    let handle = tokio::spawn(async move {
+        axum::serve(
+            listener,
+            router.into_make_service_with_connect_info::<SocketAddr>(),
+        )
+        .await
+        .unwrap()
+    });
 
     info!(local_addr =? addr, "Sui JSON-RPC server listening on {addr}");
 
diff --git a/crates/sui-open-rpc-macros/src/lib.rs b/crates/sui-open-rpc-macros/src/lib.rs
index 6fa99cc211998..ccf58a392286a 100644
--- a/crates/sui-open-rpc-macros/src/lib.rs
+++ b/crates/sui-open-rpc-macros/src/lib.rs
@@ -121,10 +121,6 @@ pub fn open_rpc(attr: TokenStream, item: TokenStream) -> TokenStream {
 
 trait OptionalQuote {
     fn to_quote(&self) -> TokenStream2;
-
-    fn unwrap_quote<F>(&self, quote: F) -> TokenStream2
-    where
-        F: FnOnce(LitStr) -> TokenStream2;
 }
 
 impl OptionalQuote for Option<LitStr> {
@@ -135,17 +131,6 @@ impl OptionalQuote for Option<LitStr> {
             quote!(None)
         }
     }
-
-    fn unwrap_quote<F>(&self, quote: F) -> TokenStream2
-    where
-        F: FnOnce(LitStr) -> TokenStream2,
-    {
-        if let Some(lit_str) = self {
-            quote(lit_str.clone())
-        } else {
-            quote!()
-        }
-    }
 }
 
 struct RpcDefinition {
diff --git a/crates/sui-open-rpc/Cargo.toml b/crates/sui-open-rpc/Cargo.toml
index 3bbe0f53ab5d7..e6000fe18d0e2 100644
--- a/crates/sui-open-rpc/Cargo.toml
+++ b/crates/sui-open-rpc/Cargo.toml
@@ -6,6 +6,9 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 schemars.workspace = true
 serde.workspace = true
diff --git a/crates/sui-open-rpc/spec/openrpc.json b/crates/sui-open-rpc/spec/openrpc.json
index 49fefa68258ef..a2482768bebec 100644
--- a/crates/sui-open-rpc/spec/openrpc.json
+++ b/crates/sui-open-rpc/spec/openrpc.json
@@ -12,7 +12,7 @@
       "name": "Apache-2.0",
       "url": "https://raw.githubusercontent.com/MystenLabs/sui/main/LICENSE"
     },
-    "version": "1.30.1"
+    "version": "1.32.3"
   },
   "methods": [
     {
@@ -1293,7 +1293,7 @@
             "name": "Result",
             "value": {
               "minSupportedProtocolVersion": "1",
-              "maxSupportedProtocolVersion": "53",
+              "maxSupportedProtocolVersion": "56",
               "protocolVersion": "6",
               "featureFlags": {
                 "accept_zklogin_in_multisig": false,
@@ -1341,6 +1341,7 @@
                 "reject_mutable_random_on_entry_functions": false,
                 "reshare_at_same_initial_version": false,
                 "resolve_abort_locations_to_package_id": false,
+                "rethrow_serialization_type_layout_errors": false,
                 "scoring_decision_with_validity_cutoff": true,
                 "shared_object_deletion": false,
                 "simple_conservation_checks": false,
@@ -1417,6 +1418,7 @@
                 "config_read_setting_impl_cost_base": null,
                 "config_read_setting_impl_cost_per_byte": null,
                 "consensus_bad_nodes_stake_threshold": null,
+                "consensus_max_num_transactions_in_block": null,
                 "consensus_max_transaction_size_bytes": null,
                 "consensus_max_transactions_in_block_bytes": null,
                 "crypto_invalid_arguments_cost": {
diff --git a/crates/sui-open-rpc/src/examples.rs b/crates/sui-open-rpc/src/examples.rs
index 70805b5ae12d9..8647efabfd7bd 100644
--- a/crates/sui-open-rpc/src/examples.rs
+++ b/crates/sui-open-rpc/src/examples.rs
@@ -69,11 +69,6 @@ struct Examples {
     examples: Vec<ExamplePairing>,
 }
 
-#[derive(serde::Serialize)]
-struct Value {
-    value: String,
-}
-
 impl Examples {
     fn new(name: &str, examples: Vec<ExamplePairing>) -> Self {
         Self {
diff --git a/crates/sui-oracle/tests/integration_tests.rs b/crates/sui-oracle/tests/integration_tests.rs
index 6800a53461740..23232b87a3591 100644
--- a/crates/sui-oracle/tests/integration_tests.rs
+++ b/crates/sui-oracle/tests/integration_tests.rs
@@ -466,7 +466,7 @@ async fn publish_package(
 ) -> ObjectID {
     let compiled_package = BuildConfig::new_for_testing().build(path).unwrap();
     let all_module_bytes = compiled_package.get_package_bytes(false);
-    let dependencies = compiled_package.get_dependency_original_package_ids();
+    let dependencies = compiled_package.get_dependency_storage_package_ids();
     let gas = client
         .coin_read_api()
         .get_coins(sender, None, None, Some(1))
diff --git a/crates/sui-package-dump/Cargo.toml b/crates/sui-package-dump/Cargo.toml
new file mode 100644
index 0000000000000..92632519a9877
--- /dev/null
+++ b/crates/sui-package-dump/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "sui-package-dump"
+version.workspace = true
+authors = ["Mysten Labs <build@mystenlabs.com"]
+license = "Apache-2.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+anyhow.workspace = true
+bcs.workspace = true
+cynic.workspace = true
+fastcrypto.workspace = true
+move-core-types.workspace = true
+reqwest.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+sui-types.workspace = true
+tracing.workspace = true
+
+[build-dependencies]
+cynic-codegen.workspace = true
diff --git a/crates/sui-package-dump/build.rs b/crates/sui-package-dump/build.rs
new file mode 100644
index 0000000000000..cbf5d78e3261d
--- /dev/null
+++ b/crates/sui-package-dump/build.rs
@@ -0,0 +1,10 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+fn main() {
+    cynic_codegen::register_schema("sui")
+        .from_sdl_file("../sui-graphql-rpc/schema.graphql")
+        .unwrap()
+        .as_default()
+        .unwrap();
+}
diff --git a/crates/sui-package-dump/src/client.rs b/crates/sui-package-dump/src/client.rs
new file mode 100644
index 0000000000000..7b595eaa08b62
--- /dev/null
+++ b/crates/sui-package-dump/src/client.rs
@@ -0,0 +1,39 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use anyhow::{anyhow, Context, Result};
+use cynic::{http::ReqwestExt, Operation, QueryBuilder};
+use reqwest::IntoUrl;
+use serde::{de::DeserializeOwned, Serialize};
+
+pub(crate) struct Client {
+    inner: reqwest::Client,
+    url: reqwest::Url,
+}
+
+impl Client {
+    /// Create a new GraphQL client, talking to a Sui GraphQL service at `url`.
+    pub(crate) fn new(url: impl IntoUrl) -> Result<Self> {
+        Ok(Self {
+            inner: reqwest::Client::builder()
+                .user_agent(concat!("sui-package-dump/", env!("CARGO_PKG_VERSION")))
+                .build()
+                .context("Failed to create GraphQL client")?,
+            url: url.into_url().context("Invalid RPC URL")?,
+        })
+    }
+
+    pub(crate) async fn query<Q, V>(&self, query: Operation<Q, V>) -> Result<Q>
+    where
+        V: Serialize,
+        Q: DeserializeOwned + QueryBuilder<V> + 'static,
+    {
+        self.inner
+            .post(self.url.clone())
+            .run_graphql(query)
+            .await
+            .context("Failed to send GraphQL query")?
+            .data
+            .ok_or_else(|| anyhow!("Empty response to query"))
+    }
+}
diff --git a/crates/sui-package-dump/src/lib.rs b/crates/sui-package-dump/src/lib.rs
new file mode 100644
index 0000000000000..ea70db5fd927a
--- /dev/null
+++ b/crates/sui-package-dump/src/lib.rs
@@ -0,0 +1,252 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{
+    collections::BTreeMap,
+    fs,
+    path::{Path, PathBuf},
+};
+
+use anyhow::{bail, ensure, Context, Result};
+use client::Client;
+use fastcrypto::encoding::{Base64, Encoding};
+use query::{limits, packages, SuiAddress, UInt53};
+use sui_types::object::Object;
+use tracing::info;
+
+mod client;
+mod query;
+
+/// Ensure all packages created before `before_checkpoint` are written to the `output_dir`ectory,
+/// from the GraphQL service at `rpc_url`.
+///
+/// `output_dir` can be a path to a non-existent directory, an existing empty directory, or an
+/// existing directory written to in the past. If the path is non-existent, the invocation creates
+/// it. If the path exists but is empty, the invocation writes to the directory. If the directory
+/// has been written to in the past, the invocation picks back up where the previous invocation
+/// left off.
+pub async fn dump(
+    rpc_url: String,
+    output_dir: PathBuf,
+    before_checkpoint: Option<u64>,
+) -> Result<()> {
+    ensure_output_directory(&output_dir)?;
+
+    let client = Client::new(rpc_url)?;
+    let after_checkpoint = read_last_checkpoint(&output_dir)?;
+    let limit = max_page_size(&client).await?;
+    let (last_checkpoint, packages) =
+        fetch_packages(&client, limit, after_checkpoint, before_checkpoint).await?;
+
+    for package in &packages {
+        let SuiAddress(address) = &package.address;
+        dump_package(&output_dir, package)
+            .with_context(|| format!("Failed to dump package {address}"))?;
+    }
+
+    if let Some(last_checkpoint) = last_checkpoint {
+        write_last_checkpoint(&output_dir, last_checkpoint)?;
+    }
+
+    Ok(())
+}
+
+/// Ensure the output directory exists, either because it already exists as a writable directory, or
+/// by creating a new directory.
+fn ensure_output_directory(path: impl Into<PathBuf>) -> Result<()> {
+    let path: PathBuf = path.into();
+    if !path.exists() {
+        fs::create_dir_all(&path).context("Making output directory")?;
+        return Ok(());
+    }
+
+    ensure!(
+        path.is_dir(),
+        "Output path is not a directory: {}",
+        path.display()
+    );
+
+    let metadata = fs::metadata(&path).context("Getting metadata for output path")?;
+
+    ensure!(
+        !metadata.permissions().readonly(),
+        "Output directory is not writable: {}",
+        path.display()
+    );
+
+    Ok(())
+}
+
+/// Load the last checkpoint that was loaded by a previous run of the tool, if there is a previous
+/// run.
+fn read_last_checkpoint(output: &Path) -> Result<Option<u64>> {
+    let path = output.join("last-checkpoint");
+    if !path.exists() {
+        return Ok(None);
+    }
+
+    let content = fs::read_to_string(&path).context("Failed to read last checkpoint")?;
+    let checkpoint: u64 =
+        serde_json::from_str(&content).context("Failed to parse last checkpoint")?;
+
+    info!("Resuming download after checkpoint {checkpoint}");
+
+    Ok(Some(checkpoint))
+}
+
+/// Write the max checkpoint that we have seen a package from back to the output directory.
+fn write_last_checkpoint(output: &Path, checkpoint: u64) -> Result<()> {
+    let path = output.join("last-checkpoint");
+    let content =
+        serde_json::to_string(&checkpoint).context("Failed to serialize last checkpoint")?;
+
+    fs::write(path, content).context("Failed to write last checkpoint")?;
+    Ok(())
+}
+
+/// Read the max page size supported by the GraphQL service.
+async fn max_page_size(client: &Client) -> Result<i32> {
+    Ok(client
+        .query(limits::build())
+        .await
+        .context("Failed to fetch max page size")?
+        .service_config
+        .max_page_size)
+}
+
+/// Read all the packages between `after_checkpoint` and `before_checkpoint`, in batches of
+/// `page_size` from the `client` connected to a GraphQL service.
+///
+/// If `after_checkpoint` is not provided, packages are read from genesis. If `before_checkpoint`
+/// is not provided, packages are read until the latest checkpoint.
+///
+/// Returns the latest checkpoint that was read from in this fetch, and a list of all the packages
+/// that were read.
+async fn fetch_packages(
+    client: &Client,
+    page_size: i32,
+    after_checkpoint: Option<u64>,
+    before_checkpoint: Option<u64>,
+) -> Result<(Option<u64>, Vec<packages::MovePackage>)> {
+    let packages::Query {
+        checkpoint: checkpoint_viewed_at,
+        packages:
+            packages::MovePackageConnection {
+                mut page_info,
+                mut nodes,
+            },
+    } = client
+        .query(packages::build(
+            page_size,
+            None,
+            after_checkpoint.map(UInt53),
+            before_checkpoint.map(UInt53),
+        ))
+        .await
+        .with_context(|| "Failed to fetch page 1 of packages.")?;
+
+    for i in 2.. {
+        if !page_info.has_next_page {
+            break;
+        }
+
+        let packages = client
+            .query(packages::build(
+                page_size,
+                page_info.end_cursor,
+                after_checkpoint.map(UInt53),
+                before_checkpoint.map(UInt53),
+            ))
+            .await
+            .with_context(|| format!("Failed to fetch page {i} of packages."))?
+            .packages;
+
+        nodes.extend(packages.nodes);
+        page_info = packages.page_info;
+
+        info!(
+            "Fetched page {i} ({} package{} so far).",
+            nodes.len(),
+            if nodes.len() == 1 { "" } else { "s" },
+        );
+    }
+
+    use packages::Checkpoint as C;
+    let last_checkpoint = match (checkpoint_viewed_at, before_checkpoint) {
+        (
+            Some(C {
+                sequence_number: UInt53(v),
+            }),
+            Some(b),
+        ) if b > 0 => Some(v.min(b - 1)),
+        (
+            Some(C {
+                sequence_number: UInt53(c),
+            }),
+            _,
+        )
+        | (_, Some(c)) => Some(c),
+        _ => None,
+    };
+
+    Ok((last_checkpoint, nodes))
+}
+
+/// Write out `pkg` to the `output_dir`ectory, using the package's address and name as the directory
+/// name. The following files are written for each directory:
+///
+/// - `object.bcs` -- the BCS serialized form of the `Object` type containing the package.
+///
+/// - `linkage.json` -- a JSON serialization of the package's linkage table, mapping dependency
+///   original IDs to the version of the dependency being depended on and the ID of the object
+///   on chain that contains that version.
+///
+/// - `origins.json` -- a JSON serialization of the type origin table, mapping type names contained
+///   in this package to the version of the package that first introduced that type.
+///
+/// - `*.mv` -- a BCS serialization of each compiled module in the package.
+fn dump_package(output_dir: &Path, pkg: &packages::MovePackage) -> Result<()> {
+    let Some(query::Base64(bcs)) = &pkg.bcs else {
+        bail!("Missing BCS");
+    };
+
+    let bytes = Base64::decode(bcs).context("Failed to decode BCS")?;
+
+    let object = bcs::from_bytes::<Object>(&bytes).context("Failed to deserialize")?;
+    let id = object.id();
+    let Some(package) = object.data.try_as_package() else {
+        bail!("Not a package");
+    };
+
+    let origins: BTreeMap<_, _> = package
+        .type_origin_table()
+        .iter()
+        .map(|o| {
+            (
+                format!("{}::{}", o.module_name, o.datatype_name),
+                o.package.to_string(),
+            )
+        })
+        .collect();
+
+    let package_dir = output_dir.join(format!("{}.{}", id, package.version().value()));
+    fs::create_dir(&package_dir).context("Failed to make output directory")?;
+
+    let linkage_json = serde_json::to_string_pretty(package.linkage_table())
+        .context("Failed to serialize linkage")?;
+    let origins_json =
+        serde_json::to_string_pretty(&origins).context("Failed to serialize type origins")?;
+
+    fs::write(package_dir.join("object.bcs"), bytes).context("Failed to write object BCS")?;
+    fs::write(package_dir.join("linkage.json"), linkage_json).context("Failed to write linkage")?;
+    fs::write(package_dir.join("origins.json"), origins_json)
+        .context("Failed to write type origins")?;
+
+    for (module_name, module_bytes) in package.serialized_module_map() {
+        let module_path = package_dir.join(format!("{module_name}.mv"));
+        fs::write(module_path, module_bytes)
+            .with_context(|| format!("Failed to write module: {module_name}"))?
+    }
+
+    Ok(())
+}
diff --git a/crates/sui-package-dump/src/query.rs b/crates/sui-package-dump/src/query.rs
new file mode 100644
index 0000000000000..a0d2c0ae391d5
--- /dev/null
+++ b/crates/sui-package-dump/src/query.rs
@@ -0,0 +1,105 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use cynic::Operation;
+use cynic::QueryBuilder;
+
+#[cynic::schema("sui")]
+mod schema {}
+
+#[derive(cynic::Scalar, Debug)]
+pub(crate) struct SuiAddress(pub String);
+
+#[derive(cynic::Scalar, Debug)]
+pub(crate) struct Base64(pub String);
+
+#[derive(cynic::Scalar, Debug)]
+pub(crate) struct UInt53(pub u64);
+
+/// Query types related to GraphQL service limits.
+pub(crate) mod limits {
+    use super::*;
+
+    pub(crate) fn build() -> Operation<Query> {
+        Query::build(())
+    }
+
+    #[derive(cynic::QueryFragment, Debug)]
+    pub(crate) struct Query {
+        pub(crate) service_config: ServiceConfig,
+    }
+
+    #[derive(cynic::QueryFragment, Debug)]
+    pub(crate) struct ServiceConfig {
+        pub(crate) max_page_size: i32,
+    }
+}
+
+/// Query types related to fetching packages.
+pub(crate) mod packages {
+    use super::*;
+
+    pub(crate) fn build(
+        first: i32,
+        after: Option<String>,
+        after_checkpoint: Option<UInt53>,
+        before_checkpoint: Option<UInt53>,
+    ) -> Operation<Query, Vars> {
+        Query::build(Vars {
+            first,
+            after,
+            filter: Some(MovePackageCheckpointFilter {
+                after_checkpoint,
+                before_checkpoint,
+            }),
+        })
+    }
+
+    #[derive(cynic::QueryVariables, Debug)]
+    pub(crate) struct Vars {
+        pub(crate) first: i32,
+        pub(crate) after: Option<String>,
+        pub(crate) filter: Option<MovePackageCheckpointFilter>,
+    }
+
+    #[derive(cynic::InputObject, Debug)]
+    pub(crate) struct MovePackageCheckpointFilter {
+        pub(crate) after_checkpoint: Option<UInt53>,
+        pub(crate) before_checkpoint: Option<UInt53>,
+    }
+
+    #[derive(cynic::QueryFragment, Debug)]
+    #[cynic(variables = "Vars")]
+    pub(crate) struct Query {
+        pub(crate) checkpoint: Option<Checkpoint>,
+        #[arguments(
+            first: $first,
+            after: $after,
+            filter: $filter,
+        )]
+        pub(crate) packages: MovePackageConnection,
+    }
+
+    #[derive(cynic::QueryFragment, Debug)]
+    pub(crate) struct Checkpoint {
+        pub(crate) sequence_number: UInt53,
+    }
+
+    #[derive(cynic::QueryFragment, Debug)]
+    pub(crate) struct MovePackageConnection {
+        pub(crate) page_info: PageInfo,
+        pub(crate) nodes: Vec<MovePackage>,
+    }
+
+    #[derive(cynic::QueryFragment, Debug)]
+    pub(crate) struct PageInfo {
+        pub(crate) has_next_page: bool,
+        pub(crate) end_cursor: Option<String>,
+    }
+
+    #[derive(cynic::QueryFragment, Debug)]
+    pub(crate) struct MovePackage {
+        pub(crate) address: SuiAddress,
+        pub(crate) bcs: Option<Base64>,
+    }
+}
diff --git a/crates/sui-package-management/Cargo.toml b/crates/sui-package-management/Cargo.toml
index 9e2149fb36d7e..a4b775c1209f5 100644
--- a/crates/sui-package-management/Cargo.toml
+++ b/crates/sui-package-management/Cargo.toml
@@ -11,6 +11,7 @@ path = "src/lib.rs"
 
 [dependencies]
 anyhow.workspace = true
+thiserror.workspace = true
 tracing.workspace = true
 
 sui-json-rpc-types.workspace = true
diff --git a/crates/sui-package-management/src/lib.rs b/crates/sui-package-management/src/lib.rs
index e472578c7746a..43aa2f914711c 100644
--- a/crates/sui-package-management/src/lib.rs
+++ b/crates/sui-package-management/src/lib.rs
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use anyhow::{bail, Context};
+use std::collections::HashMap;
 use std::fs::File;
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
@@ -24,13 +25,21 @@ pub enum LockCommand {
     Upgrade,
 }
 
-#[derive(Debug, Clone)]
+#[derive(thiserror::Error, Debug, Clone)]
 pub enum PublishedAtError {
+    #[error("The 'published-at' field in Move.toml or Move.lock is invalid: {0:?}")]
     Invalid(String),
+
+    #[error("The 'published-at' field is not present in Move.toml or Move.lock")]
     NotPresent,
+
+    #[error(
+        "Conflicting 'published-at' addresses between Move.toml -- {id_manifest} -- and \
+         Move.lock -- {id_lock}"
+    )]
     Conflict {
-        id_lock: String,
-        id_manifest: String,
+        id_lock: ObjectID,
+        id_manifest: ObjectID,
     },
 }
 
@@ -140,45 +149,42 @@ pub fn resolve_published_id(
 ) -> Result<ObjectID, PublishedAtError> {
     // Look up a valid `published-at` in the `Move.toml` first, which we'll
     // return if the Move.lock does not manage addresses.
-    let published_id_in_manifest = match published_at_property(package) {
-        Ok(v) => Some(v),
-        Err(PublishedAtError::NotPresent) => None,
-        Err(e) => return Err(e), // An existing but invalid `published-at` in `Move.toml` should fail early.
-    };
+    let published_id_in_manifest = manifest_published_at(package);
+
+    match published_id_in_manifest {
+        Ok(_) | Err(PublishedAtError::NotPresent) => { /* nop */ }
+        Err(e) => {
+            return Err(e);
+        }
+    }
 
     let lock = package.package_path.join(SourcePackageLayout::Lock.path());
     let Ok(mut lock_file) = File::open(lock.clone()) else {
-        return match published_id_in_manifest {
-            Some(v) => {
-                ObjectID::from_str(v.as_str()).map_err(|_| PublishedAtError::Invalid(v.to_owned()))
-            }
-            None => Err(PublishedAtError::NotPresent),
-        };
+        return published_id_in_manifest;
     };
-    let managed_packages = ManagedPackage::read(&mut lock_file).ok();
+
     // Find the environment and ManagedPackage data for this chain_id.
-    let id_in_lock_for_chain_id = managed_packages.and_then(|m| {
-        let chain_id = chain_id.as_ref()?;
-        m.into_iter()
-            .find_map(|(_, v)| (v.chain_id == *chain_id).then_some(v.latest_published_id))
-    });
-
-    let package_id = match (id_in_lock_for_chain_id, published_id_in_manifest) {
-        (Some(id_lock), Some(id_manifest)) if id_lock != id_manifest => {
-            return Err(PublishedAtError::Conflict {
+    let id_in_lock_for_chain_id =
+        lock_published_at(ManagedPackage::read(&mut lock_file).ok(), chain_id.as_ref());
+
+    match (id_in_lock_for_chain_id, published_id_in_manifest) {
+        (Ok(id_lock), Ok(id_manifest)) if id_lock != id_manifest => {
+            Err(PublishedAtError::Conflict {
                 id_lock,
                 id_manifest,
             })
         }
-        (Some(id_lock), _) => id_lock,
-        (None, Some(id_manifest)) => id_manifest, /* No info in Move.lock: Fall back to manifest */
-        _ => return Err(PublishedAtError::NotPresent), /* Neither in Move.toml nor Move.lock */
-    };
-    ObjectID::from_str(package_id.as_str())
-        .map_err(|_| PublishedAtError::Invalid(package_id.to_owned()))
+
+        (Ok(id), _) | (_, Ok(id)) => Ok(id),
+
+        // We return early (above) if we failed to read the ID from the manifest for some reason
+        // other than it not being present, so at this point, we can defer to whatever error came
+        // from the lock file (Ok case is handled above).
+        (from_lock, Err(_)) => from_lock,
+    }
 }
 
-fn published_at_property(package: &Package) -> Result<String, PublishedAtError> {
+fn manifest_published_at(package: &Package) -> Result<ObjectID, PublishedAtError> {
     let Some(value) = package
         .source_package
         .package
@@ -187,5 +193,36 @@ fn published_at_property(package: &Package) -> Result<String, PublishedAtError>
     else {
         return Err(PublishedAtError::NotPresent);
     };
-    Ok(value.to_string())
+
+    let id =
+        ObjectID::from_str(value.as_str()).map_err(|_| PublishedAtError::Invalid(value.clone()))?;
+
+    if id == ObjectID::ZERO {
+        Err(PublishedAtError::NotPresent)
+    } else {
+        Ok(id)
+    }
+}
+
+fn lock_published_at(
+    lock: Option<HashMap<String, ManagedPackage>>,
+    chain_id: Option<&String>,
+) -> Result<ObjectID, PublishedAtError> {
+    let (Some(lock), Some(chain_id)) = (lock, chain_id) else {
+        return Err(PublishedAtError::NotPresent);
+    };
+
+    let managed_package = lock
+        .into_values()
+        .find(|v| v.chain_id == *chain_id)
+        .ok_or(PublishedAtError::NotPresent)?;
+
+    let id = ObjectID::from_str(managed_package.latest_published_id.as_str())
+        .map_err(|_| PublishedAtError::Invalid(managed_package.latest_published_id.clone()))?;
+
+    if id == ObjectID::ZERO {
+        Err(PublishedAtError::NotPresent)
+    } else {
+        Ok(id)
+    }
 }
diff --git a/crates/sui-package-resolver/src/lib.rs b/crates/sui-package-resolver/src/lib.rs
index e23916ec8ffd4..a6c1f3d3c0043 100644
--- a/crates/sui-package-resolver/src/lib.rs
+++ b/crates/sui-package-resolver/src/lib.rs
@@ -126,12 +126,13 @@ pub enum ErrorConstants {
     /// No constant information is available, only a line number.
     None,
     /// The error is a complete error, with an error identifier and constant that can be rendered.
-    /// The the rendered string representation of the constant is returned only when the contant
+    /// The rendered string representation of the constant is returned only when the contant
     /// value is one of the following types:
     /// * A vector of bytes convertible to a valid UTF-8 string; or
     /// * A numeric value (u8, u16, u32, u64, u128, u256); or
     /// * A boolean value; or
     /// * An address value
+    ///
     /// Otherwise, the `Raw` bytes of the error constant are returned.
     Rendered {
         /// The name of the error constant.
@@ -1547,7 +1548,7 @@ impl<'l> ResolutionContext<'l> {
 
             O::Datatype(key, params) => {
                 // SAFETY: `add_signature` ensures `datatypes` has an element with this key.
-                let def = &self.datatypes[&key];
+                let def = &self.datatypes[key];
 
                 let param_layouts = params
                     .iter()
@@ -1639,7 +1640,7 @@ impl<'l> ResolutionContext<'l> {
 
             O::Datatype(key, params) => {
                 // SAFETY: `add_signature` ensures `datatypes` has an element with this key.
-                let defining_id = &self.datatypes[&key].defining_id;
+                let defining_id = &self.datatypes[key].defining_id;
                 for param in params {
                     self.relocate_signature(param)?;
                 }
diff --git a/crates/sui-proc-macros/Cargo.toml b/crates/sui-proc-macros/Cargo.toml
index 0ccf1b0d77060..cb3bf09505604 100644
--- a/crates/sui-proc-macros/Cargo.toml
+++ b/crates/sui-proc-macros/Cargo.toml
@@ -6,6 +6,9 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lints]
+workspace = true
+
 [lib]
 proc-macro = true
 
diff --git a/crates/sui-protocol-config/Cargo.toml b/crates/sui-protocol-config/Cargo.toml
index edcea7bd5ba8b..f8a8dfec81551 100644
--- a/crates/sui-protocol-config/Cargo.toml
+++ b/crates/sui-protocol-config/Cargo.toml
@@ -6,6 +6,9 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 serde.workspace = true
 tracing.workspace = true
diff --git a/crates/sui-protocol-config/src/lib.rs b/crates/sui-protocol-config/src/lib.rs
index 0a1ddec049c8b..5dd0524410fbc 100644
--- a/crates/sui-protocol-config/src/lib.rs
+++ b/crates/sui-protocol-config/src/lib.rs
@@ -16,7 +16,7 @@ use tracing::{info, warn};
 
 /// The minimum and maximum protocol versions supported by this build.
 const MIN_PROTOCOL_VERSION: u64 = 1;
-const MAX_PROTOCOL_VERSION: u64 = 53;
+const MAX_PROTOCOL_VERSION: u64 = 56;
 
 // Record history of protocol version allocations here:
 //
@@ -165,6 +165,11 @@ const MAX_PROTOCOL_VERSION: u64 = 53;
 //             Enable consensus commit prologue V3 on testnet.
 //             Turn on shared object congestion control in testnet.
 //             Update stdlib natives costs
+// Version 54: Enable random beacon on mainnet.
+//             Enable soft bundle on mainnet.
+// Version 55: Enable enums on mainnet.
+//             Rethrow serialization type layout errors instead of converting them.
+// Version 56: Enable bridge on mainnet.
 
 #[derive(Copy, Clone, Debug, Hash, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
 pub struct ProtocolVersion(u64);
@@ -503,6 +508,10 @@ struct FeatureFlags {
     // Use AuthorityCapabilitiesV2
     #[serde(skip_serializing_if = "is_false")]
     authority_capabilities_v2: bool,
+
+    // Rethrow type layout errors during serialization instead of trying to convert them.
+    #[serde(skip_serializing_if = "is_false")]
+    rethrow_serialization_type_layout_errors: bool,
 }
 
 fn is_false(b: &bool) -> bool {
@@ -692,7 +701,7 @@ pub struct ProtocolConfig {
     /// Max number of publish or upgrade commands allowed in a programmable transaction block.
     max_publish_or_upgrade_per_ptb: Option<u64>,
 
-    /// Maximum number of gas units that a single MoveCall transaction can use. Enforced by the Sui adapter.
+    /// Maximum gas budget in MIST that a transaction can use.
     max_tx_gas: Option<u64>,
 
     /// Maximum amount of the proposed gas price in MIST (defined in the transaction).
@@ -1181,8 +1190,10 @@ pub struct ProtocolConfig {
     /// The maximum serialised transaction size (in bytes) accepted by consensus. That should be bigger than the
     /// `max_tx_size_bytes` with some additional headroom.
     consensus_max_transaction_size_bytes: Option<u64>,
-    /// The maximum size of transactions included in a consensus proposed block
+    /// The maximum size of transactions included in a consensus block.
     consensus_max_transactions_in_block_bytes: Option<u64>,
+    /// 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.
@@ -1526,6 +1537,15 @@ impl ProtocolConfig {
     pub fn authority_capabilities_v2(&self) -> bool {
         self.feature_flags.authority_capabilities_v2
     }
+
+    pub fn max_num_transactions_in_block(&self) -> u64 {
+        // 500 is the value used before this field is introduced.
+        self.consensus_max_num_transactions_in_block.unwrap_or(500)
+    }
+
+    pub fn rethrow_serialization_type_layout_errors(&self) -> bool {
+        self.feature_flags.rethrow_serialization_type_layout_errors
+    }
 }
 
 #[cfg(not(msim))]
@@ -2013,6 +2033,8 @@ impl ProtocolConfig {
 
             consensus_max_transactions_in_block_bytes: None,
 
+            consensus_max_num_transactions_in_block: None,
+
             max_accumulated_txn_cost_per_object_in_narwhal_commit: None,
 
             max_deferral_rounds_for_congestion_control: None,
@@ -2633,6 +2655,40 @@ impl ProtocolConfig {
                     cfg.vector_destroy_empty_base_cost = Some(52);
                     cfg.vector_swap_base_cost = Some(52);
                 }
+                54 => {
+                    // Enable random beacon on mainnet.
+                    cfg.feature_flags.random_beacon = true;
+                    cfg.random_beacon_reduction_lower_bound = Some(1000);
+                    cfg.random_beacon_dkg_timeout_round = Some(3000);
+                    cfg.random_beacon_min_round_interval_ms = Some(500);
+
+                    // Turns on shared object congestion control on mainnet.
+                    cfg.max_accumulated_txn_cost_per_object_in_narwhal_commit = Some(100);
+                    cfg.max_accumulated_txn_cost_per_object_in_mysticeti_commit = Some(10);
+                    cfg.feature_flags.per_object_congestion_control_mode =
+                        PerObjectCongestionControlMode::TotalTxCount;
+
+                    // Enable soft bundle on mainnet.
+                    cfg.feature_flags.soft_bundle = true;
+                    cfg.max_soft_bundle_size = Some(5);
+                }
+                55 => {
+                    // Turn on enums mainnet
+                    cfg.move_binary_format_version = Some(7);
+
+                    // Assume 1KB per transaction and 500 transactions per block.
+                    cfg.consensus_max_transactions_in_block_bytes = Some(512 * 1024);
+                    // Assume 20_000 TPS * 5% max stake per validator / (minimum) 4 blocks per round = 250 transactions per block maximum
+                    // Using a higher limit that is 512, to account for bursty traffic and system transactions.
+                    cfg.consensus_max_num_transactions_in_block = Some(512);
+
+                    cfg.feature_flags.rethrow_serialization_type_layout_errors = true;
+                }
+                56 => {
+                    if chain == Chain::Mainnet {
+                        cfg.feature_flags.bridge = true;
+                    }
+                }
                 // Use this template when making changes:
                 //
                 //     // modify an existing constant.
@@ -2686,16 +2742,13 @@ impl ProtocolConfig {
         }
     }
 
-    pub fn meter_config(&self) -> MeterConfig {
+    /// MeterConfig for metering packages during signing. It is NOT stable between binaries and
+    /// cannot used during execution.
+    pub fn meter_config_for_signing(&self) -> MeterConfig {
         MeterConfig {
-            max_per_fun_meter_units: Some(self.max_verifier_meter_ticks_per_function() as u128),
-            max_per_mod_meter_units: Some(self.max_meter_ticks_per_module() as u128),
-            max_per_pkg_meter_units: Some(
-                // Until the per-package limit was introduced, the per-module limit played double
-                // duty.
-                self.max_meter_ticks_per_package_as_option()
-                    .unwrap_or_else(|| self.max_meter_ticks_per_module()) as u128,
-            ),
+            max_per_fun_meter_units: Some(2_200_000),
+            max_per_mod_meter_units: Some(2_200_000),
+            max_per_pkg_meter_units: Some(2_200_000),
         }
     }
 
diff --git a/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Mainnet_version_54.snap b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Mainnet_version_54.snap
new file mode 100644
index 0000000000000..0cecbe2c40a3d
--- /dev/null
+++ b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Mainnet_version_54.snap
@@ -0,0 +1,320 @@
+---
+source: crates/sui-protocol-config/src/lib.rs
+expression: "ProtocolConfig::get_for_version(cur, *chain_id)"
+---
+version: 54
+feature_flags:
+  package_upgrades: true
+  commit_root_state_digest: true
+  advance_epoch_start_time_in_safe_mode: true
+  loaded_child_objects_fixed: true
+  missing_type_is_compatibility_error: true
+  scoring_decision_with_validity_cutoff: true
+  consensus_order_end_of_epoch_last: true
+  disallow_adding_abilities_on_upgrade: true
+  disable_invariant_violation_check_in_swap_loc: true
+  advance_to_highest_supported_protocol_version: true
+  ban_entry_init: true
+  package_digest_hash_module: true
+  disallow_change_struct_type_params_on_upgrade: true
+  no_extraneous_module_bytes: true
+  narwhal_versioned_metadata: true
+  zklogin_auth: true
+  consensus_transaction_ordering: ByGasPrice
+  simplified_unwrap_then_delete: true
+  upgraded_multisig_supported: true
+  txn_base_cost_as_multiplier: true
+  shared_object_deletion: true
+  narwhal_new_leader_election_schedule: true
+  loaded_child_object_format: true
+  enable_jwk_consensus_updates: true
+  end_of_epoch_transaction_supported: true
+  simple_conservation_checks: true
+  loaded_child_object_format_type: true
+  receive_objects: true
+  random_beacon: true
+  enable_effects_v2: true
+  narwhal_certificate_v2: true
+  verify_legacy_zklogin_address: true
+  recompute_has_public_transfer_in_execution: true
+  accept_zklogin_in_multisig: true
+  include_consensus_digest_in_prologue: true
+  hardened_otw_check: true
+  allow_receiving_object_id: true
+  enable_coin_deny_list: true
+  enable_group_ops_native_functions: true
+  reject_mutable_random_on_entry_functions: true
+  per_object_congestion_control_mode: TotalTxCount
+  consensus_choice: Mysticeti
+  consensus_network: Tonic
+  zklogin_max_epoch_upper_bound_delta: 30
+  mysticeti_leader_scoring_and_schedule: true
+  reshare_at_same_initial_version: true
+  resolve_abort_locations_to_package_id: true
+  mysticeti_use_committed_subdag_digest: true
+  record_consensus_determined_version_assignments_in_prologue: true
+  fresh_vm_on_framework_upgrade: true
+  prepend_prologue_tx_in_consensus_commit_in_checkpoints: true
+  mysticeti_num_leaders_per_round: 1
+  soft_bundle: true
+  enable_coin_deny_list_v2: true
+max_tx_size_bytes: 131072
+max_input_objects: 2048
+max_size_written_objects: 5000000
+max_size_written_objects_system_tx: 50000000
+max_serialized_tx_effects_size_bytes: 524288
+max_serialized_tx_effects_size_bytes_system_tx: 8388608
+max_gas_payment_objects: 256
+max_modules_in_publish: 64
+max_package_dependencies: 32
+max_arguments: 512
+max_type_arguments: 16
+max_type_argument_depth: 16
+max_pure_argument_size: 16384
+max_programmable_tx_commands: 1024
+move_binary_format_version: 6
+min_move_binary_format_version: 6
+binary_module_handles: 100
+binary_struct_handles: 300
+binary_function_handles: 1500
+binary_function_instantiations: 750
+binary_signatures: 1000
+binary_constant_pool: 4000
+binary_identifiers: 10000
+binary_address_identifiers: 100
+binary_struct_defs: 200
+binary_struct_def_instantiations: 100
+binary_function_defs: 1000
+binary_field_handles: 500
+binary_field_instantiations: 250
+binary_friend_decls: 100
+max_move_object_size: 256000
+max_move_package_size: 102400
+max_publish_or_upgrade_per_ptb: 5
+max_tx_gas: 50000000000
+max_gas_price: 100000
+max_gas_computation_bucket: 5000000
+gas_rounding_step: 1000
+max_loop_depth: 5
+max_generic_instantiation_length: 32
+max_function_parameters: 128
+max_basic_blocks: 1024
+max_value_stack_size: 1024
+max_type_nodes: 256
+max_push_size: 10000
+max_struct_definitions: 200
+max_function_definitions: 1000
+max_fields_in_struct: 32
+max_dependency_depth: 100
+max_num_event_emit: 1024
+max_num_new_move_object_ids: 2048
+max_num_new_move_object_ids_system_tx: 32768
+max_num_deleted_move_object_ids: 2048
+max_num_deleted_move_object_ids_system_tx: 32768
+max_num_transferred_move_object_ids: 2048
+max_num_transferred_move_object_ids_system_tx: 32768
+max_event_emit_size: 256000
+max_event_emit_size_total: 65536000
+max_move_vector_len: 262144
+max_move_identifier_len: 128
+max_move_value_depth: 128
+max_back_edges_per_function: 10000
+max_back_edges_per_module: 10000
+max_verifier_meter_ticks_per_function: 16000000
+max_meter_ticks_per_module: 16000000
+max_meter_ticks_per_package: 16000000
+object_runtime_max_num_cached_objects: 1000
+object_runtime_max_num_cached_objects_system_tx: 16000
+object_runtime_max_num_store_entries: 1000
+object_runtime_max_num_store_entries_system_tx: 16000
+base_tx_cost_fixed: 1000
+package_publish_cost_fixed: 1000
+base_tx_cost_per_byte: 0
+package_publish_cost_per_byte: 80
+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
+obj_data_cost_refundable: 100
+obj_metadata_cost_non_refundable: 50
+storage_rebate_rate: 9900
+storage_fund_reinvest_rate: 500
+reward_slashing_rate: 10000
+storage_gas_price: 76
+max_transactions_per_checkpoint: 10000
+max_checkpoint_size_bytes: 31457280
+buffer_stake_for_protocol_upgrade_bps: 5000
+address_from_bytes_cost_base: 52
+address_to_u256_cost_base: 52
+address_from_u256_cost_base: 52
+config_read_setting_impl_cost_base: 100
+config_read_setting_impl_cost_per_byte: 40
+dynamic_field_hash_type_and_key_cost_base: 100
+dynamic_field_hash_type_and_key_type_cost_per_byte: 2
+dynamic_field_hash_type_and_key_value_cost_per_byte: 2
+dynamic_field_hash_type_and_key_type_tag_cost_per_byte: 2
+dynamic_field_add_child_object_cost_base: 100
+dynamic_field_add_child_object_type_cost_per_byte: 10
+dynamic_field_add_child_object_value_cost_per_byte: 10
+dynamic_field_add_child_object_struct_tag_cost_per_byte: 10
+dynamic_field_borrow_child_object_cost_base: 100
+dynamic_field_borrow_child_object_child_ref_cost_per_byte: 10
+dynamic_field_borrow_child_object_type_cost_per_byte: 10
+dynamic_field_remove_child_object_cost_base: 100
+dynamic_field_remove_child_object_child_cost_per_byte: 2
+dynamic_field_remove_child_object_type_cost_per_byte: 2
+dynamic_field_has_child_object_cost_base: 100
+dynamic_field_has_child_object_with_ty_cost_base: 100
+dynamic_field_has_child_object_with_ty_type_cost_per_byte: 2
+dynamic_field_has_child_object_with_ty_type_tag_cost_per_byte: 2
+event_emit_cost_base: 52
+event_emit_value_size_derivation_cost_per_byte: 2
+event_emit_tag_size_derivation_cost_per_byte: 5
+event_emit_output_cost_per_byte: 10
+object_borrow_uid_cost_base: 52
+object_delete_impl_cost_base: 52
+object_record_new_uid_cost_base: 52
+transfer_transfer_internal_cost_base: 52
+transfer_freeze_object_cost_base: 52
+transfer_share_object_cost_base: 52
+transfer_receive_object_cost_base: 52
+tx_context_derive_id_cost_base: 52
+types_is_one_time_witness_cost_base: 52
+types_is_one_time_witness_type_tag_cost_per_byte: 2
+types_is_one_time_witness_type_cost_per_byte: 2
+validator_validate_metadata_cost_base: 52
+validator_validate_metadata_data_cost_per_byte: 2
+crypto_invalid_arguments_cost: 100
+bls12381_bls12381_min_sig_verify_cost_base: 52
+bls12381_bls12381_min_sig_verify_msg_cost_per_byte: 2
+bls12381_bls12381_min_sig_verify_msg_cost_per_block: 2
+bls12381_bls12381_min_pk_verify_cost_base: 52
+bls12381_bls12381_min_pk_verify_msg_cost_per_byte: 2
+bls12381_bls12381_min_pk_verify_msg_cost_per_block: 2
+ecdsa_k1_ecrecover_keccak256_cost_base: 52
+ecdsa_k1_ecrecover_keccak256_msg_cost_per_byte: 2
+ecdsa_k1_ecrecover_keccak256_msg_cost_per_block: 2
+ecdsa_k1_ecrecover_sha256_cost_base: 52
+ecdsa_k1_ecrecover_sha256_msg_cost_per_byte: 2
+ecdsa_k1_ecrecover_sha256_msg_cost_per_block: 2
+ecdsa_k1_decompress_pubkey_cost_base: 52
+ecdsa_k1_secp256k1_verify_keccak256_cost_base: 52
+ecdsa_k1_secp256k1_verify_keccak256_msg_cost_per_byte: 2
+ecdsa_k1_secp256k1_verify_keccak256_msg_cost_per_block: 2
+ecdsa_k1_secp256k1_verify_sha256_cost_base: 52
+ecdsa_k1_secp256k1_verify_sha256_msg_cost_per_byte: 2
+ecdsa_k1_secp256k1_verify_sha256_msg_cost_per_block: 2
+ecdsa_r1_ecrecover_keccak256_cost_base: 52
+ecdsa_r1_ecrecover_keccak256_msg_cost_per_byte: 2
+ecdsa_r1_ecrecover_keccak256_msg_cost_per_block: 2
+ecdsa_r1_ecrecover_sha256_cost_base: 52
+ecdsa_r1_ecrecover_sha256_msg_cost_per_byte: 2
+ecdsa_r1_ecrecover_sha256_msg_cost_per_block: 2
+ecdsa_r1_secp256r1_verify_keccak256_cost_base: 52
+ecdsa_r1_secp256r1_verify_keccak256_msg_cost_per_byte: 2
+ecdsa_r1_secp256r1_verify_keccak256_msg_cost_per_block: 2
+ecdsa_r1_secp256r1_verify_sha256_cost_base: 52
+ecdsa_r1_secp256r1_verify_sha256_msg_cost_per_byte: 2
+ecdsa_r1_secp256r1_verify_sha256_msg_cost_per_block: 2
+ecvrf_ecvrf_verify_cost_base: 52
+ecvrf_ecvrf_verify_alpha_string_cost_per_byte: 2
+ecvrf_ecvrf_verify_alpha_string_cost_per_block: 2
+ed25519_ed25519_verify_cost_base: 52
+ed25519_ed25519_verify_msg_cost_per_byte: 2
+ed25519_ed25519_verify_msg_cost_per_block: 2
+groth16_prepare_verifying_key_bls12381_cost_base: 52
+groth16_prepare_verifying_key_bn254_cost_base: 52
+groth16_verify_groth16_proof_internal_bls12381_cost_base: 52
+groth16_verify_groth16_proof_internal_bls12381_cost_per_public_input: 2
+groth16_verify_groth16_proof_internal_bn254_cost_base: 52
+groth16_verify_groth16_proof_internal_bn254_cost_per_public_input: 2
+groth16_verify_groth16_proof_internal_public_input_cost_per_byte: 2
+hash_blake2b256_cost_base: 52
+hash_blake2b256_data_cost_per_byte: 2
+hash_blake2b256_data_cost_per_block: 2
+hash_keccak256_cost_base: 52
+hash_keccak256_data_cost_per_byte: 2
+hash_keccak256_data_cost_per_block: 2
+group_ops_bls12381_decode_scalar_cost: 52
+group_ops_bls12381_decode_g1_cost: 52
+group_ops_bls12381_decode_g2_cost: 52
+group_ops_bls12381_decode_gt_cost: 52
+group_ops_bls12381_scalar_add_cost: 52
+group_ops_bls12381_g1_add_cost: 52
+group_ops_bls12381_g2_add_cost: 52
+group_ops_bls12381_gt_add_cost: 52
+group_ops_bls12381_scalar_sub_cost: 52
+group_ops_bls12381_g1_sub_cost: 52
+group_ops_bls12381_g2_sub_cost: 52
+group_ops_bls12381_gt_sub_cost: 52
+group_ops_bls12381_scalar_mul_cost: 52
+group_ops_bls12381_g1_mul_cost: 52
+group_ops_bls12381_g2_mul_cost: 52
+group_ops_bls12381_gt_mul_cost: 52
+group_ops_bls12381_scalar_div_cost: 52
+group_ops_bls12381_g1_div_cost: 52
+group_ops_bls12381_g2_div_cost: 52
+group_ops_bls12381_gt_div_cost: 52
+group_ops_bls12381_g1_hash_to_base_cost: 52
+group_ops_bls12381_g2_hash_to_base_cost: 52
+group_ops_bls12381_g1_hash_to_cost_per_byte: 2
+group_ops_bls12381_g2_hash_to_cost_per_byte: 2
+group_ops_bls12381_g1_msm_base_cost: 52
+group_ops_bls12381_g2_msm_base_cost: 52
+group_ops_bls12381_g1_msm_base_cost_per_input: 52
+group_ops_bls12381_g2_msm_base_cost_per_input: 52
+group_ops_bls12381_msm_max_len: 32
+group_ops_bls12381_pairing_cost: 52
+hmac_hmac_sha3_256_cost_base: 52
+hmac_hmac_sha3_256_input_cost_per_byte: 2
+hmac_hmac_sha3_256_input_cost_per_block: 2
+check_zklogin_id_cost_base: 200
+check_zklogin_issuer_cost_base: 200
+bcs_per_byte_serialized_cost: 2
+bcs_legacy_min_output_size_cost: 1
+bcs_failure_cost: 52
+hash_sha2_256_base_cost: 52
+hash_sha2_256_per_byte_cost: 2
+hash_sha2_256_legacy_min_input_len_cost: 1
+hash_sha3_256_base_cost: 52
+hash_sha3_256_per_byte_cost: 2
+hash_sha3_256_legacy_min_input_len_cost: 1
+type_name_get_base_cost: 52
+type_name_get_per_byte_cost: 2
+string_check_utf8_base_cost: 52
+string_check_utf8_per_byte_cost: 2
+string_is_char_boundary_base_cost: 52
+string_sub_string_base_cost: 52
+string_sub_string_per_byte_cost: 2
+string_index_of_base_cost: 52
+string_index_of_per_byte_pattern_cost: 2
+string_index_of_per_byte_searched_cost: 2
+vector_empty_base_cost: 52
+vector_length_base_cost: 52
+vector_push_back_base_cost: 52
+vector_push_back_legacy_per_abstract_memory_unit_cost: 2
+vector_borrow_base_cost: 52
+vector_pop_back_base_cost: 52
+vector_destroy_empty_base_cost: 52
+vector_swap_base_cost: 52
+debug_print_base_cost: 52
+debug_print_stack_trace_base_cost: 52
+execution_version: 3
+consensus_bad_nodes_stake_threshold: 20
+max_jwk_votes_per_validator_per_epoch: 240
+max_age_of_jwk_in_epochs: 1
+random_beacon_reduction_allowed_delta: 800
+random_beacon_reduction_lower_bound: 1000
+random_beacon_dkg_timeout_round: 3000
+random_beacon_min_round_interval_ms: 500
+random_beacon_dkg_version: 1
+consensus_max_transaction_size_bytes: 262144
+consensus_max_transactions_in_block_bytes: 6291456
+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
+max_soft_bundle_size: 5
+bridge_should_try_to_finalize_committee: false
+max_accumulated_txn_cost_per_object_in_mysticeti_commit: 10
diff --git a/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Mainnet_version_55.snap b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Mainnet_version_55.snap
new file mode 100644
index 0000000000000..6d8a2e27dc2b0
--- /dev/null
+++ b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Mainnet_version_55.snap
@@ -0,0 +1,323 @@
+---
+source: crates/sui-protocol-config/src/lib.rs
+expression: "ProtocolConfig::get_for_version(cur, *chain_id)"
+---
+version: 55
+feature_flags:
+  package_upgrades: true
+  commit_root_state_digest: true
+  advance_epoch_start_time_in_safe_mode: true
+  loaded_child_objects_fixed: true
+  missing_type_is_compatibility_error: true
+  scoring_decision_with_validity_cutoff: true
+  consensus_order_end_of_epoch_last: true
+  disallow_adding_abilities_on_upgrade: true
+  disable_invariant_violation_check_in_swap_loc: true
+  advance_to_highest_supported_protocol_version: true
+  ban_entry_init: true
+  package_digest_hash_module: true
+  disallow_change_struct_type_params_on_upgrade: true
+  no_extraneous_module_bytes: true
+  narwhal_versioned_metadata: true
+  zklogin_auth: true
+  consensus_transaction_ordering: ByGasPrice
+  simplified_unwrap_then_delete: true
+  upgraded_multisig_supported: true
+  txn_base_cost_as_multiplier: true
+  shared_object_deletion: true
+  narwhal_new_leader_election_schedule: true
+  loaded_child_object_format: true
+  enable_jwk_consensus_updates: true
+  end_of_epoch_transaction_supported: true
+  simple_conservation_checks: true
+  loaded_child_object_format_type: true
+  receive_objects: true
+  random_beacon: true
+  enable_effects_v2: true
+  narwhal_certificate_v2: true
+  verify_legacy_zklogin_address: true
+  recompute_has_public_transfer_in_execution: true
+  accept_zklogin_in_multisig: true
+  include_consensus_digest_in_prologue: true
+  hardened_otw_check: true
+  allow_receiving_object_id: true
+  enable_coin_deny_list: true
+  enable_group_ops_native_functions: true
+  reject_mutable_random_on_entry_functions: true
+  per_object_congestion_control_mode: TotalTxCount
+  consensus_choice: Mysticeti
+  consensus_network: Tonic
+  zklogin_max_epoch_upper_bound_delta: 30
+  mysticeti_leader_scoring_and_schedule: true
+  reshare_at_same_initial_version: true
+  resolve_abort_locations_to_package_id: true
+  mysticeti_use_committed_subdag_digest: true
+  record_consensus_determined_version_assignments_in_prologue: true
+  fresh_vm_on_framework_upgrade: true
+  prepend_prologue_tx_in_consensus_commit_in_checkpoints: true
+  mysticeti_num_leaders_per_round: 1
+  soft_bundle: true
+  enable_coin_deny_list_v2: true
+  rethrow_serialization_type_layout_errors: true
+max_tx_size_bytes: 131072
+max_input_objects: 2048
+max_size_written_objects: 5000000
+max_size_written_objects_system_tx: 50000000
+max_serialized_tx_effects_size_bytes: 524288
+max_serialized_tx_effects_size_bytes_system_tx: 8388608
+max_gas_payment_objects: 256
+max_modules_in_publish: 64
+max_package_dependencies: 32
+max_arguments: 512
+max_type_arguments: 16
+max_type_argument_depth: 16
+max_pure_argument_size: 16384
+max_programmable_tx_commands: 1024
+move_binary_format_version: 7
+min_move_binary_format_version: 6
+binary_module_handles: 100
+binary_struct_handles: 300
+binary_function_handles: 1500
+binary_function_instantiations: 750
+binary_signatures: 1000
+binary_constant_pool: 4000
+binary_identifiers: 10000
+binary_address_identifiers: 100
+binary_struct_defs: 200
+binary_struct_def_instantiations: 100
+binary_function_defs: 1000
+binary_field_handles: 500
+binary_field_instantiations: 250
+binary_friend_decls: 100
+max_move_object_size: 256000
+max_move_package_size: 102400
+max_publish_or_upgrade_per_ptb: 5
+max_tx_gas: 50000000000
+max_gas_price: 100000
+max_gas_computation_bucket: 5000000
+gas_rounding_step: 1000
+max_loop_depth: 5
+max_generic_instantiation_length: 32
+max_function_parameters: 128
+max_basic_blocks: 1024
+max_value_stack_size: 1024
+max_type_nodes: 256
+max_push_size: 10000
+max_struct_definitions: 200
+max_function_definitions: 1000
+max_fields_in_struct: 32
+max_dependency_depth: 100
+max_num_event_emit: 1024
+max_num_new_move_object_ids: 2048
+max_num_new_move_object_ids_system_tx: 32768
+max_num_deleted_move_object_ids: 2048
+max_num_deleted_move_object_ids_system_tx: 32768
+max_num_transferred_move_object_ids: 2048
+max_num_transferred_move_object_ids_system_tx: 32768
+max_event_emit_size: 256000
+max_event_emit_size_total: 65536000
+max_move_vector_len: 262144
+max_move_identifier_len: 128
+max_move_value_depth: 128
+max_back_edges_per_function: 10000
+max_back_edges_per_module: 10000
+max_verifier_meter_ticks_per_function: 16000000
+max_meter_ticks_per_module: 16000000
+max_meter_ticks_per_package: 16000000
+object_runtime_max_num_cached_objects: 1000
+object_runtime_max_num_cached_objects_system_tx: 16000
+object_runtime_max_num_store_entries: 1000
+object_runtime_max_num_store_entries_system_tx: 16000
+base_tx_cost_fixed: 1000
+package_publish_cost_fixed: 1000
+base_tx_cost_per_byte: 0
+package_publish_cost_per_byte: 80
+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
+obj_data_cost_refundable: 100
+obj_metadata_cost_non_refundable: 50
+storage_rebate_rate: 9900
+storage_fund_reinvest_rate: 500
+reward_slashing_rate: 10000
+storage_gas_price: 76
+max_transactions_per_checkpoint: 10000
+max_checkpoint_size_bytes: 31457280
+buffer_stake_for_protocol_upgrade_bps: 5000
+address_from_bytes_cost_base: 52
+address_to_u256_cost_base: 52
+address_from_u256_cost_base: 52
+config_read_setting_impl_cost_base: 100
+config_read_setting_impl_cost_per_byte: 40
+dynamic_field_hash_type_and_key_cost_base: 100
+dynamic_field_hash_type_and_key_type_cost_per_byte: 2
+dynamic_field_hash_type_and_key_value_cost_per_byte: 2
+dynamic_field_hash_type_and_key_type_tag_cost_per_byte: 2
+dynamic_field_add_child_object_cost_base: 100
+dynamic_field_add_child_object_type_cost_per_byte: 10
+dynamic_field_add_child_object_value_cost_per_byte: 10
+dynamic_field_add_child_object_struct_tag_cost_per_byte: 10
+dynamic_field_borrow_child_object_cost_base: 100
+dynamic_field_borrow_child_object_child_ref_cost_per_byte: 10
+dynamic_field_borrow_child_object_type_cost_per_byte: 10
+dynamic_field_remove_child_object_cost_base: 100
+dynamic_field_remove_child_object_child_cost_per_byte: 2
+dynamic_field_remove_child_object_type_cost_per_byte: 2
+dynamic_field_has_child_object_cost_base: 100
+dynamic_field_has_child_object_with_ty_cost_base: 100
+dynamic_field_has_child_object_with_ty_type_cost_per_byte: 2
+dynamic_field_has_child_object_with_ty_type_tag_cost_per_byte: 2
+event_emit_cost_base: 52
+event_emit_value_size_derivation_cost_per_byte: 2
+event_emit_tag_size_derivation_cost_per_byte: 5
+event_emit_output_cost_per_byte: 10
+object_borrow_uid_cost_base: 52
+object_delete_impl_cost_base: 52
+object_record_new_uid_cost_base: 52
+transfer_transfer_internal_cost_base: 52
+transfer_freeze_object_cost_base: 52
+transfer_share_object_cost_base: 52
+transfer_receive_object_cost_base: 52
+tx_context_derive_id_cost_base: 52
+types_is_one_time_witness_cost_base: 52
+types_is_one_time_witness_type_tag_cost_per_byte: 2
+types_is_one_time_witness_type_cost_per_byte: 2
+validator_validate_metadata_cost_base: 52
+validator_validate_metadata_data_cost_per_byte: 2
+crypto_invalid_arguments_cost: 100
+bls12381_bls12381_min_sig_verify_cost_base: 52
+bls12381_bls12381_min_sig_verify_msg_cost_per_byte: 2
+bls12381_bls12381_min_sig_verify_msg_cost_per_block: 2
+bls12381_bls12381_min_pk_verify_cost_base: 52
+bls12381_bls12381_min_pk_verify_msg_cost_per_byte: 2
+bls12381_bls12381_min_pk_verify_msg_cost_per_block: 2
+ecdsa_k1_ecrecover_keccak256_cost_base: 52
+ecdsa_k1_ecrecover_keccak256_msg_cost_per_byte: 2
+ecdsa_k1_ecrecover_keccak256_msg_cost_per_block: 2
+ecdsa_k1_ecrecover_sha256_cost_base: 52
+ecdsa_k1_ecrecover_sha256_msg_cost_per_byte: 2
+ecdsa_k1_ecrecover_sha256_msg_cost_per_block: 2
+ecdsa_k1_decompress_pubkey_cost_base: 52
+ecdsa_k1_secp256k1_verify_keccak256_cost_base: 52
+ecdsa_k1_secp256k1_verify_keccak256_msg_cost_per_byte: 2
+ecdsa_k1_secp256k1_verify_keccak256_msg_cost_per_block: 2
+ecdsa_k1_secp256k1_verify_sha256_cost_base: 52
+ecdsa_k1_secp256k1_verify_sha256_msg_cost_per_byte: 2
+ecdsa_k1_secp256k1_verify_sha256_msg_cost_per_block: 2
+ecdsa_r1_ecrecover_keccak256_cost_base: 52
+ecdsa_r1_ecrecover_keccak256_msg_cost_per_byte: 2
+ecdsa_r1_ecrecover_keccak256_msg_cost_per_block: 2
+ecdsa_r1_ecrecover_sha256_cost_base: 52
+ecdsa_r1_ecrecover_sha256_msg_cost_per_byte: 2
+ecdsa_r1_ecrecover_sha256_msg_cost_per_block: 2
+ecdsa_r1_secp256r1_verify_keccak256_cost_base: 52
+ecdsa_r1_secp256r1_verify_keccak256_msg_cost_per_byte: 2
+ecdsa_r1_secp256r1_verify_keccak256_msg_cost_per_block: 2
+ecdsa_r1_secp256r1_verify_sha256_cost_base: 52
+ecdsa_r1_secp256r1_verify_sha256_msg_cost_per_byte: 2
+ecdsa_r1_secp256r1_verify_sha256_msg_cost_per_block: 2
+ecvrf_ecvrf_verify_cost_base: 52
+ecvrf_ecvrf_verify_alpha_string_cost_per_byte: 2
+ecvrf_ecvrf_verify_alpha_string_cost_per_block: 2
+ed25519_ed25519_verify_cost_base: 52
+ed25519_ed25519_verify_msg_cost_per_byte: 2
+ed25519_ed25519_verify_msg_cost_per_block: 2
+groth16_prepare_verifying_key_bls12381_cost_base: 52
+groth16_prepare_verifying_key_bn254_cost_base: 52
+groth16_verify_groth16_proof_internal_bls12381_cost_base: 52
+groth16_verify_groth16_proof_internal_bls12381_cost_per_public_input: 2
+groth16_verify_groth16_proof_internal_bn254_cost_base: 52
+groth16_verify_groth16_proof_internal_bn254_cost_per_public_input: 2
+groth16_verify_groth16_proof_internal_public_input_cost_per_byte: 2
+hash_blake2b256_cost_base: 52
+hash_blake2b256_data_cost_per_byte: 2
+hash_blake2b256_data_cost_per_block: 2
+hash_keccak256_cost_base: 52
+hash_keccak256_data_cost_per_byte: 2
+hash_keccak256_data_cost_per_block: 2
+group_ops_bls12381_decode_scalar_cost: 52
+group_ops_bls12381_decode_g1_cost: 52
+group_ops_bls12381_decode_g2_cost: 52
+group_ops_bls12381_decode_gt_cost: 52
+group_ops_bls12381_scalar_add_cost: 52
+group_ops_bls12381_g1_add_cost: 52
+group_ops_bls12381_g2_add_cost: 52
+group_ops_bls12381_gt_add_cost: 52
+group_ops_bls12381_scalar_sub_cost: 52
+group_ops_bls12381_g1_sub_cost: 52
+group_ops_bls12381_g2_sub_cost: 52
+group_ops_bls12381_gt_sub_cost: 52
+group_ops_bls12381_scalar_mul_cost: 52
+group_ops_bls12381_g1_mul_cost: 52
+group_ops_bls12381_g2_mul_cost: 52
+group_ops_bls12381_gt_mul_cost: 52
+group_ops_bls12381_scalar_div_cost: 52
+group_ops_bls12381_g1_div_cost: 52
+group_ops_bls12381_g2_div_cost: 52
+group_ops_bls12381_gt_div_cost: 52
+group_ops_bls12381_g1_hash_to_base_cost: 52
+group_ops_bls12381_g2_hash_to_base_cost: 52
+group_ops_bls12381_g1_hash_to_cost_per_byte: 2
+group_ops_bls12381_g2_hash_to_cost_per_byte: 2
+group_ops_bls12381_g1_msm_base_cost: 52
+group_ops_bls12381_g2_msm_base_cost: 52
+group_ops_bls12381_g1_msm_base_cost_per_input: 52
+group_ops_bls12381_g2_msm_base_cost_per_input: 52
+group_ops_bls12381_msm_max_len: 32
+group_ops_bls12381_pairing_cost: 52
+hmac_hmac_sha3_256_cost_base: 52
+hmac_hmac_sha3_256_input_cost_per_byte: 2
+hmac_hmac_sha3_256_input_cost_per_block: 2
+check_zklogin_id_cost_base: 200
+check_zklogin_issuer_cost_base: 200
+bcs_per_byte_serialized_cost: 2
+bcs_legacy_min_output_size_cost: 1
+bcs_failure_cost: 52
+hash_sha2_256_base_cost: 52
+hash_sha2_256_per_byte_cost: 2
+hash_sha2_256_legacy_min_input_len_cost: 1
+hash_sha3_256_base_cost: 52
+hash_sha3_256_per_byte_cost: 2
+hash_sha3_256_legacy_min_input_len_cost: 1
+type_name_get_base_cost: 52
+type_name_get_per_byte_cost: 2
+string_check_utf8_base_cost: 52
+string_check_utf8_per_byte_cost: 2
+string_is_char_boundary_base_cost: 52
+string_sub_string_base_cost: 52
+string_sub_string_per_byte_cost: 2
+string_index_of_base_cost: 52
+string_index_of_per_byte_pattern_cost: 2
+string_index_of_per_byte_searched_cost: 2
+vector_empty_base_cost: 52
+vector_length_base_cost: 52
+vector_push_back_base_cost: 52
+vector_push_back_legacy_per_abstract_memory_unit_cost: 2
+vector_borrow_base_cost: 52
+vector_pop_back_base_cost: 52
+vector_destroy_empty_base_cost: 52
+vector_swap_base_cost: 52
+debug_print_base_cost: 52
+debug_print_stack_trace_base_cost: 52
+execution_version: 3
+consensus_bad_nodes_stake_threshold: 20
+max_jwk_votes_per_validator_per_epoch: 240
+max_age_of_jwk_in_epochs: 1
+random_beacon_reduction_allowed_delta: 800
+random_beacon_reduction_lower_bound: 1000
+random_beacon_dkg_timeout_round: 3000
+random_beacon_min_round_interval_ms: 500
+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
+max_soft_bundle_size: 5
+bridge_should_try_to_finalize_committee: false
+max_accumulated_txn_cost_per_object_in_mysticeti_commit: 10
+
diff --git a/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Mainnet_version_56.snap b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Mainnet_version_56.snap
new file mode 100644
index 0000000000000..235fecc0da919
--- /dev/null
+++ b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Mainnet_version_56.snap
@@ -0,0 +1,324 @@
+---
+source: crates/sui-protocol-config/src/lib.rs
+expression: "ProtocolConfig::get_for_version(cur, *chain_id)"
+---
+version: 56
+feature_flags:
+  package_upgrades: true
+  commit_root_state_digest: true
+  advance_epoch_start_time_in_safe_mode: true
+  loaded_child_objects_fixed: true
+  missing_type_is_compatibility_error: true
+  scoring_decision_with_validity_cutoff: true
+  consensus_order_end_of_epoch_last: true
+  disallow_adding_abilities_on_upgrade: true
+  disable_invariant_violation_check_in_swap_loc: true
+  advance_to_highest_supported_protocol_version: true
+  ban_entry_init: true
+  package_digest_hash_module: true
+  disallow_change_struct_type_params_on_upgrade: true
+  no_extraneous_module_bytes: true
+  narwhal_versioned_metadata: true
+  zklogin_auth: true
+  consensus_transaction_ordering: ByGasPrice
+  simplified_unwrap_then_delete: true
+  upgraded_multisig_supported: true
+  txn_base_cost_as_multiplier: true
+  shared_object_deletion: true
+  narwhal_new_leader_election_schedule: true
+  loaded_child_object_format: true
+  enable_jwk_consensus_updates: true
+  end_of_epoch_transaction_supported: true
+  simple_conservation_checks: true
+  loaded_child_object_format_type: true
+  receive_objects: true
+  random_beacon: true
+  bridge: true
+  enable_effects_v2: true
+  narwhal_certificate_v2: true
+  verify_legacy_zklogin_address: true
+  recompute_has_public_transfer_in_execution: true
+  accept_zklogin_in_multisig: true
+  include_consensus_digest_in_prologue: true
+  hardened_otw_check: true
+  allow_receiving_object_id: true
+  enable_coin_deny_list: true
+  enable_group_ops_native_functions: true
+  reject_mutable_random_on_entry_functions: true
+  per_object_congestion_control_mode: TotalTxCount
+  consensus_choice: Mysticeti
+  consensus_network: Tonic
+  zklogin_max_epoch_upper_bound_delta: 30
+  mysticeti_leader_scoring_and_schedule: true
+  reshare_at_same_initial_version: true
+  resolve_abort_locations_to_package_id: true
+  mysticeti_use_committed_subdag_digest: true
+  record_consensus_determined_version_assignments_in_prologue: true
+  fresh_vm_on_framework_upgrade: true
+  prepend_prologue_tx_in_consensus_commit_in_checkpoints: true
+  mysticeti_num_leaders_per_round: 1
+  soft_bundle: true
+  enable_coin_deny_list_v2: true
+  rethrow_serialization_type_layout_errors: true
+max_tx_size_bytes: 131072
+max_input_objects: 2048
+max_size_written_objects: 5000000
+max_size_written_objects_system_tx: 50000000
+max_serialized_tx_effects_size_bytes: 524288
+max_serialized_tx_effects_size_bytes_system_tx: 8388608
+max_gas_payment_objects: 256
+max_modules_in_publish: 64
+max_package_dependencies: 32
+max_arguments: 512
+max_type_arguments: 16
+max_type_argument_depth: 16
+max_pure_argument_size: 16384
+max_programmable_tx_commands: 1024
+move_binary_format_version: 7
+min_move_binary_format_version: 6
+binary_module_handles: 100
+binary_struct_handles: 300
+binary_function_handles: 1500
+binary_function_instantiations: 750
+binary_signatures: 1000
+binary_constant_pool: 4000
+binary_identifiers: 10000
+binary_address_identifiers: 100
+binary_struct_defs: 200
+binary_struct_def_instantiations: 100
+binary_function_defs: 1000
+binary_field_handles: 500
+binary_field_instantiations: 250
+binary_friend_decls: 100
+max_move_object_size: 256000
+max_move_package_size: 102400
+max_publish_or_upgrade_per_ptb: 5
+max_tx_gas: 50000000000
+max_gas_price: 100000
+max_gas_computation_bucket: 5000000
+gas_rounding_step: 1000
+max_loop_depth: 5
+max_generic_instantiation_length: 32
+max_function_parameters: 128
+max_basic_blocks: 1024
+max_value_stack_size: 1024
+max_type_nodes: 256
+max_push_size: 10000
+max_struct_definitions: 200
+max_function_definitions: 1000
+max_fields_in_struct: 32
+max_dependency_depth: 100
+max_num_event_emit: 1024
+max_num_new_move_object_ids: 2048
+max_num_new_move_object_ids_system_tx: 32768
+max_num_deleted_move_object_ids: 2048
+max_num_deleted_move_object_ids_system_tx: 32768
+max_num_transferred_move_object_ids: 2048
+max_num_transferred_move_object_ids_system_tx: 32768
+max_event_emit_size: 256000
+max_event_emit_size_total: 65536000
+max_move_vector_len: 262144
+max_move_identifier_len: 128
+max_move_value_depth: 128
+max_back_edges_per_function: 10000
+max_back_edges_per_module: 10000
+max_verifier_meter_ticks_per_function: 16000000
+max_meter_ticks_per_module: 16000000
+max_meter_ticks_per_package: 16000000
+object_runtime_max_num_cached_objects: 1000
+object_runtime_max_num_cached_objects_system_tx: 16000
+object_runtime_max_num_store_entries: 1000
+object_runtime_max_num_store_entries_system_tx: 16000
+base_tx_cost_fixed: 1000
+package_publish_cost_fixed: 1000
+base_tx_cost_per_byte: 0
+package_publish_cost_per_byte: 80
+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
+obj_data_cost_refundable: 100
+obj_metadata_cost_non_refundable: 50
+storage_rebate_rate: 9900
+storage_fund_reinvest_rate: 500
+reward_slashing_rate: 10000
+storage_gas_price: 76
+max_transactions_per_checkpoint: 10000
+max_checkpoint_size_bytes: 31457280
+buffer_stake_for_protocol_upgrade_bps: 5000
+address_from_bytes_cost_base: 52
+address_to_u256_cost_base: 52
+address_from_u256_cost_base: 52
+config_read_setting_impl_cost_base: 100
+config_read_setting_impl_cost_per_byte: 40
+dynamic_field_hash_type_and_key_cost_base: 100
+dynamic_field_hash_type_and_key_type_cost_per_byte: 2
+dynamic_field_hash_type_and_key_value_cost_per_byte: 2
+dynamic_field_hash_type_and_key_type_tag_cost_per_byte: 2
+dynamic_field_add_child_object_cost_base: 100
+dynamic_field_add_child_object_type_cost_per_byte: 10
+dynamic_field_add_child_object_value_cost_per_byte: 10
+dynamic_field_add_child_object_struct_tag_cost_per_byte: 10
+dynamic_field_borrow_child_object_cost_base: 100
+dynamic_field_borrow_child_object_child_ref_cost_per_byte: 10
+dynamic_field_borrow_child_object_type_cost_per_byte: 10
+dynamic_field_remove_child_object_cost_base: 100
+dynamic_field_remove_child_object_child_cost_per_byte: 2
+dynamic_field_remove_child_object_type_cost_per_byte: 2
+dynamic_field_has_child_object_cost_base: 100
+dynamic_field_has_child_object_with_ty_cost_base: 100
+dynamic_field_has_child_object_with_ty_type_cost_per_byte: 2
+dynamic_field_has_child_object_with_ty_type_tag_cost_per_byte: 2
+event_emit_cost_base: 52
+event_emit_value_size_derivation_cost_per_byte: 2
+event_emit_tag_size_derivation_cost_per_byte: 5
+event_emit_output_cost_per_byte: 10
+object_borrow_uid_cost_base: 52
+object_delete_impl_cost_base: 52
+object_record_new_uid_cost_base: 52
+transfer_transfer_internal_cost_base: 52
+transfer_freeze_object_cost_base: 52
+transfer_share_object_cost_base: 52
+transfer_receive_object_cost_base: 52
+tx_context_derive_id_cost_base: 52
+types_is_one_time_witness_cost_base: 52
+types_is_one_time_witness_type_tag_cost_per_byte: 2
+types_is_one_time_witness_type_cost_per_byte: 2
+validator_validate_metadata_cost_base: 52
+validator_validate_metadata_data_cost_per_byte: 2
+crypto_invalid_arguments_cost: 100
+bls12381_bls12381_min_sig_verify_cost_base: 52
+bls12381_bls12381_min_sig_verify_msg_cost_per_byte: 2
+bls12381_bls12381_min_sig_verify_msg_cost_per_block: 2
+bls12381_bls12381_min_pk_verify_cost_base: 52
+bls12381_bls12381_min_pk_verify_msg_cost_per_byte: 2
+bls12381_bls12381_min_pk_verify_msg_cost_per_block: 2
+ecdsa_k1_ecrecover_keccak256_cost_base: 52
+ecdsa_k1_ecrecover_keccak256_msg_cost_per_byte: 2
+ecdsa_k1_ecrecover_keccak256_msg_cost_per_block: 2
+ecdsa_k1_ecrecover_sha256_cost_base: 52
+ecdsa_k1_ecrecover_sha256_msg_cost_per_byte: 2
+ecdsa_k1_ecrecover_sha256_msg_cost_per_block: 2
+ecdsa_k1_decompress_pubkey_cost_base: 52
+ecdsa_k1_secp256k1_verify_keccak256_cost_base: 52
+ecdsa_k1_secp256k1_verify_keccak256_msg_cost_per_byte: 2
+ecdsa_k1_secp256k1_verify_keccak256_msg_cost_per_block: 2
+ecdsa_k1_secp256k1_verify_sha256_cost_base: 52
+ecdsa_k1_secp256k1_verify_sha256_msg_cost_per_byte: 2
+ecdsa_k1_secp256k1_verify_sha256_msg_cost_per_block: 2
+ecdsa_r1_ecrecover_keccak256_cost_base: 52
+ecdsa_r1_ecrecover_keccak256_msg_cost_per_byte: 2
+ecdsa_r1_ecrecover_keccak256_msg_cost_per_block: 2
+ecdsa_r1_ecrecover_sha256_cost_base: 52
+ecdsa_r1_ecrecover_sha256_msg_cost_per_byte: 2
+ecdsa_r1_ecrecover_sha256_msg_cost_per_block: 2
+ecdsa_r1_secp256r1_verify_keccak256_cost_base: 52
+ecdsa_r1_secp256r1_verify_keccak256_msg_cost_per_byte: 2
+ecdsa_r1_secp256r1_verify_keccak256_msg_cost_per_block: 2
+ecdsa_r1_secp256r1_verify_sha256_cost_base: 52
+ecdsa_r1_secp256r1_verify_sha256_msg_cost_per_byte: 2
+ecdsa_r1_secp256r1_verify_sha256_msg_cost_per_block: 2
+ecvrf_ecvrf_verify_cost_base: 52
+ecvrf_ecvrf_verify_alpha_string_cost_per_byte: 2
+ecvrf_ecvrf_verify_alpha_string_cost_per_block: 2
+ed25519_ed25519_verify_cost_base: 52
+ed25519_ed25519_verify_msg_cost_per_byte: 2
+ed25519_ed25519_verify_msg_cost_per_block: 2
+groth16_prepare_verifying_key_bls12381_cost_base: 52
+groth16_prepare_verifying_key_bn254_cost_base: 52
+groth16_verify_groth16_proof_internal_bls12381_cost_base: 52
+groth16_verify_groth16_proof_internal_bls12381_cost_per_public_input: 2
+groth16_verify_groth16_proof_internal_bn254_cost_base: 52
+groth16_verify_groth16_proof_internal_bn254_cost_per_public_input: 2
+groth16_verify_groth16_proof_internal_public_input_cost_per_byte: 2
+hash_blake2b256_cost_base: 52
+hash_blake2b256_data_cost_per_byte: 2
+hash_blake2b256_data_cost_per_block: 2
+hash_keccak256_cost_base: 52
+hash_keccak256_data_cost_per_byte: 2
+hash_keccak256_data_cost_per_block: 2
+group_ops_bls12381_decode_scalar_cost: 52
+group_ops_bls12381_decode_g1_cost: 52
+group_ops_bls12381_decode_g2_cost: 52
+group_ops_bls12381_decode_gt_cost: 52
+group_ops_bls12381_scalar_add_cost: 52
+group_ops_bls12381_g1_add_cost: 52
+group_ops_bls12381_g2_add_cost: 52
+group_ops_bls12381_gt_add_cost: 52
+group_ops_bls12381_scalar_sub_cost: 52
+group_ops_bls12381_g1_sub_cost: 52
+group_ops_bls12381_g2_sub_cost: 52
+group_ops_bls12381_gt_sub_cost: 52
+group_ops_bls12381_scalar_mul_cost: 52
+group_ops_bls12381_g1_mul_cost: 52
+group_ops_bls12381_g2_mul_cost: 52
+group_ops_bls12381_gt_mul_cost: 52
+group_ops_bls12381_scalar_div_cost: 52
+group_ops_bls12381_g1_div_cost: 52
+group_ops_bls12381_g2_div_cost: 52
+group_ops_bls12381_gt_div_cost: 52
+group_ops_bls12381_g1_hash_to_base_cost: 52
+group_ops_bls12381_g2_hash_to_base_cost: 52
+group_ops_bls12381_g1_hash_to_cost_per_byte: 2
+group_ops_bls12381_g2_hash_to_cost_per_byte: 2
+group_ops_bls12381_g1_msm_base_cost: 52
+group_ops_bls12381_g2_msm_base_cost: 52
+group_ops_bls12381_g1_msm_base_cost_per_input: 52
+group_ops_bls12381_g2_msm_base_cost_per_input: 52
+group_ops_bls12381_msm_max_len: 32
+group_ops_bls12381_pairing_cost: 52
+hmac_hmac_sha3_256_cost_base: 52
+hmac_hmac_sha3_256_input_cost_per_byte: 2
+hmac_hmac_sha3_256_input_cost_per_block: 2
+check_zklogin_id_cost_base: 200
+check_zklogin_issuer_cost_base: 200
+bcs_per_byte_serialized_cost: 2
+bcs_legacy_min_output_size_cost: 1
+bcs_failure_cost: 52
+hash_sha2_256_base_cost: 52
+hash_sha2_256_per_byte_cost: 2
+hash_sha2_256_legacy_min_input_len_cost: 1
+hash_sha3_256_base_cost: 52
+hash_sha3_256_per_byte_cost: 2
+hash_sha3_256_legacy_min_input_len_cost: 1
+type_name_get_base_cost: 52
+type_name_get_per_byte_cost: 2
+string_check_utf8_base_cost: 52
+string_check_utf8_per_byte_cost: 2
+string_is_char_boundary_base_cost: 52
+string_sub_string_base_cost: 52
+string_sub_string_per_byte_cost: 2
+string_index_of_base_cost: 52
+string_index_of_per_byte_pattern_cost: 2
+string_index_of_per_byte_searched_cost: 2
+vector_empty_base_cost: 52
+vector_length_base_cost: 52
+vector_push_back_base_cost: 52
+vector_push_back_legacy_per_abstract_memory_unit_cost: 2
+vector_borrow_base_cost: 52
+vector_pop_back_base_cost: 52
+vector_destroy_empty_base_cost: 52
+vector_swap_base_cost: 52
+debug_print_base_cost: 52
+debug_print_stack_trace_base_cost: 52
+execution_version: 3
+consensus_bad_nodes_stake_threshold: 20
+max_jwk_votes_per_validator_per_epoch: 240
+max_age_of_jwk_in_epochs: 1
+random_beacon_reduction_allowed_delta: 800
+random_beacon_reduction_lower_bound: 1000
+random_beacon_dkg_timeout_round: 3000
+random_beacon_min_round_interval_ms: 500
+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
+max_soft_bundle_size: 5
+bridge_should_try_to_finalize_committee: false
+max_accumulated_txn_cost_per_object_in_mysticeti_commit: 10
+
diff --git a/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Testnet_version_54.snap b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Testnet_version_54.snap
new file mode 100644
index 0000000000000..40241a8b59b3d
--- /dev/null
+++ b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Testnet_version_54.snap
@@ -0,0 +1,322 @@
+---
+source: crates/sui-protocol-config/src/lib.rs
+expression: "ProtocolConfig::get_for_version(cur, *chain_id)"
+---
+version: 54
+feature_flags:
+  package_upgrades: true
+  commit_root_state_digest: true
+  advance_epoch_start_time_in_safe_mode: true
+  loaded_child_objects_fixed: true
+  missing_type_is_compatibility_error: true
+  scoring_decision_with_validity_cutoff: true
+  consensus_order_end_of_epoch_last: true
+  disallow_adding_abilities_on_upgrade: true
+  disable_invariant_violation_check_in_swap_loc: true
+  advance_to_highest_supported_protocol_version: true
+  ban_entry_init: true
+  package_digest_hash_module: true
+  disallow_change_struct_type_params_on_upgrade: true
+  no_extraneous_module_bytes: true
+  narwhal_versioned_metadata: true
+  zklogin_auth: true
+  consensus_transaction_ordering: ByGasPrice
+  simplified_unwrap_then_delete: true
+  upgraded_multisig_supported: true
+  txn_base_cost_as_multiplier: true
+  shared_object_deletion: true
+  narwhal_new_leader_election_schedule: true
+  loaded_child_object_format: true
+  enable_jwk_consensus_updates: true
+  end_of_epoch_transaction_supported: true
+  simple_conservation_checks: true
+  loaded_child_object_format_type: true
+  receive_objects: true
+  random_beacon: true
+  bridge: true
+  enable_effects_v2: true
+  narwhal_certificate_v2: true
+  verify_legacy_zklogin_address: true
+  recompute_has_public_transfer_in_execution: true
+  accept_zklogin_in_multisig: true
+  include_consensus_digest_in_prologue: true
+  hardened_otw_check: true
+  allow_receiving_object_id: true
+  enable_coin_deny_list: true
+  enable_group_ops_native_functions: true
+  reject_mutable_random_on_entry_functions: true
+  per_object_congestion_control_mode: TotalTxCount
+  consensus_choice: Mysticeti
+  consensus_network: Tonic
+  zklogin_max_epoch_upper_bound_delta: 30
+  mysticeti_leader_scoring_and_schedule: true
+  reshare_at_same_initial_version: true
+  resolve_abort_locations_to_package_id: true
+  mysticeti_use_committed_subdag_digest: true
+  record_consensus_determined_version_assignments_in_prologue: true
+  fresh_vm_on_framework_upgrade: true
+  prepend_prologue_tx_in_consensus_commit_in_checkpoints: true
+  mysticeti_num_leaders_per_round: 1
+  soft_bundle: true
+  enable_coin_deny_list_v2: true
+max_tx_size_bytes: 131072
+max_input_objects: 2048
+max_size_written_objects: 5000000
+max_size_written_objects_system_tx: 50000000
+max_serialized_tx_effects_size_bytes: 524288
+max_serialized_tx_effects_size_bytes_system_tx: 8388608
+max_gas_payment_objects: 256
+max_modules_in_publish: 64
+max_package_dependencies: 32
+max_arguments: 512
+max_type_arguments: 16
+max_type_argument_depth: 16
+max_pure_argument_size: 16384
+max_programmable_tx_commands: 1024
+move_binary_format_version: 7
+min_move_binary_format_version: 6
+binary_module_handles: 100
+binary_struct_handles: 300
+binary_function_handles: 1500
+binary_function_instantiations: 750
+binary_signatures: 1000
+binary_constant_pool: 4000
+binary_identifiers: 10000
+binary_address_identifiers: 100
+binary_struct_defs: 200
+binary_struct_def_instantiations: 100
+binary_function_defs: 1000
+binary_field_handles: 500
+binary_field_instantiations: 250
+binary_friend_decls: 100
+max_move_object_size: 256000
+max_move_package_size: 102400
+max_publish_or_upgrade_per_ptb: 5
+max_tx_gas: 50000000000
+max_gas_price: 100000
+max_gas_computation_bucket: 5000000
+gas_rounding_step: 1000
+max_loop_depth: 5
+max_generic_instantiation_length: 32
+max_function_parameters: 128
+max_basic_blocks: 1024
+max_value_stack_size: 1024
+max_type_nodes: 256
+max_push_size: 10000
+max_struct_definitions: 200
+max_function_definitions: 1000
+max_fields_in_struct: 32
+max_dependency_depth: 100
+max_num_event_emit: 1024
+max_num_new_move_object_ids: 2048
+max_num_new_move_object_ids_system_tx: 32768
+max_num_deleted_move_object_ids: 2048
+max_num_deleted_move_object_ids_system_tx: 32768
+max_num_transferred_move_object_ids: 2048
+max_num_transferred_move_object_ids_system_tx: 32768
+max_event_emit_size: 256000
+max_event_emit_size_total: 65536000
+max_move_vector_len: 262144
+max_move_identifier_len: 128
+max_move_value_depth: 128
+max_back_edges_per_function: 10000
+max_back_edges_per_module: 10000
+max_verifier_meter_ticks_per_function: 16000000
+max_meter_ticks_per_module: 16000000
+max_meter_ticks_per_package: 16000000
+object_runtime_max_num_cached_objects: 1000
+object_runtime_max_num_cached_objects_system_tx: 16000
+object_runtime_max_num_store_entries: 1000
+object_runtime_max_num_store_entries_system_tx: 16000
+base_tx_cost_fixed: 1000
+package_publish_cost_fixed: 1000
+base_tx_cost_per_byte: 0
+package_publish_cost_per_byte: 80
+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
+obj_data_cost_refundable: 100
+obj_metadata_cost_non_refundable: 50
+storage_rebate_rate: 9900
+storage_fund_reinvest_rate: 500
+reward_slashing_rate: 10000
+storage_gas_price: 76
+max_transactions_per_checkpoint: 10000
+max_checkpoint_size_bytes: 31457280
+buffer_stake_for_protocol_upgrade_bps: 5000
+address_from_bytes_cost_base: 52
+address_to_u256_cost_base: 52
+address_from_u256_cost_base: 52
+config_read_setting_impl_cost_base: 100
+config_read_setting_impl_cost_per_byte: 40
+dynamic_field_hash_type_and_key_cost_base: 100
+dynamic_field_hash_type_and_key_type_cost_per_byte: 2
+dynamic_field_hash_type_and_key_value_cost_per_byte: 2
+dynamic_field_hash_type_and_key_type_tag_cost_per_byte: 2
+dynamic_field_add_child_object_cost_base: 100
+dynamic_field_add_child_object_type_cost_per_byte: 10
+dynamic_field_add_child_object_value_cost_per_byte: 10
+dynamic_field_add_child_object_struct_tag_cost_per_byte: 10
+dynamic_field_borrow_child_object_cost_base: 100
+dynamic_field_borrow_child_object_child_ref_cost_per_byte: 10
+dynamic_field_borrow_child_object_type_cost_per_byte: 10
+dynamic_field_remove_child_object_cost_base: 100
+dynamic_field_remove_child_object_child_cost_per_byte: 2
+dynamic_field_remove_child_object_type_cost_per_byte: 2
+dynamic_field_has_child_object_cost_base: 100
+dynamic_field_has_child_object_with_ty_cost_base: 100
+dynamic_field_has_child_object_with_ty_type_cost_per_byte: 2
+dynamic_field_has_child_object_with_ty_type_tag_cost_per_byte: 2
+event_emit_cost_base: 52
+event_emit_value_size_derivation_cost_per_byte: 2
+event_emit_tag_size_derivation_cost_per_byte: 5
+event_emit_output_cost_per_byte: 10
+object_borrow_uid_cost_base: 52
+object_delete_impl_cost_base: 52
+object_record_new_uid_cost_base: 52
+transfer_transfer_internal_cost_base: 52
+transfer_freeze_object_cost_base: 52
+transfer_share_object_cost_base: 52
+transfer_receive_object_cost_base: 52
+tx_context_derive_id_cost_base: 52
+types_is_one_time_witness_cost_base: 52
+types_is_one_time_witness_type_tag_cost_per_byte: 2
+types_is_one_time_witness_type_cost_per_byte: 2
+validator_validate_metadata_cost_base: 52
+validator_validate_metadata_data_cost_per_byte: 2
+crypto_invalid_arguments_cost: 100
+bls12381_bls12381_min_sig_verify_cost_base: 52
+bls12381_bls12381_min_sig_verify_msg_cost_per_byte: 2
+bls12381_bls12381_min_sig_verify_msg_cost_per_block: 2
+bls12381_bls12381_min_pk_verify_cost_base: 52
+bls12381_bls12381_min_pk_verify_msg_cost_per_byte: 2
+bls12381_bls12381_min_pk_verify_msg_cost_per_block: 2
+ecdsa_k1_ecrecover_keccak256_cost_base: 52
+ecdsa_k1_ecrecover_keccak256_msg_cost_per_byte: 2
+ecdsa_k1_ecrecover_keccak256_msg_cost_per_block: 2
+ecdsa_k1_ecrecover_sha256_cost_base: 52
+ecdsa_k1_ecrecover_sha256_msg_cost_per_byte: 2
+ecdsa_k1_ecrecover_sha256_msg_cost_per_block: 2
+ecdsa_k1_decompress_pubkey_cost_base: 52
+ecdsa_k1_secp256k1_verify_keccak256_cost_base: 52
+ecdsa_k1_secp256k1_verify_keccak256_msg_cost_per_byte: 2
+ecdsa_k1_secp256k1_verify_keccak256_msg_cost_per_block: 2
+ecdsa_k1_secp256k1_verify_sha256_cost_base: 52
+ecdsa_k1_secp256k1_verify_sha256_msg_cost_per_byte: 2
+ecdsa_k1_secp256k1_verify_sha256_msg_cost_per_block: 2
+ecdsa_r1_ecrecover_keccak256_cost_base: 52
+ecdsa_r1_ecrecover_keccak256_msg_cost_per_byte: 2
+ecdsa_r1_ecrecover_keccak256_msg_cost_per_block: 2
+ecdsa_r1_ecrecover_sha256_cost_base: 52
+ecdsa_r1_ecrecover_sha256_msg_cost_per_byte: 2
+ecdsa_r1_ecrecover_sha256_msg_cost_per_block: 2
+ecdsa_r1_secp256r1_verify_keccak256_cost_base: 52
+ecdsa_r1_secp256r1_verify_keccak256_msg_cost_per_byte: 2
+ecdsa_r1_secp256r1_verify_keccak256_msg_cost_per_block: 2
+ecdsa_r1_secp256r1_verify_sha256_cost_base: 52
+ecdsa_r1_secp256r1_verify_sha256_msg_cost_per_byte: 2
+ecdsa_r1_secp256r1_verify_sha256_msg_cost_per_block: 2
+ecvrf_ecvrf_verify_cost_base: 52
+ecvrf_ecvrf_verify_alpha_string_cost_per_byte: 2
+ecvrf_ecvrf_verify_alpha_string_cost_per_block: 2
+ed25519_ed25519_verify_cost_base: 52
+ed25519_ed25519_verify_msg_cost_per_byte: 2
+ed25519_ed25519_verify_msg_cost_per_block: 2
+groth16_prepare_verifying_key_bls12381_cost_base: 52
+groth16_prepare_verifying_key_bn254_cost_base: 52
+groth16_verify_groth16_proof_internal_bls12381_cost_base: 52
+groth16_verify_groth16_proof_internal_bls12381_cost_per_public_input: 2
+groth16_verify_groth16_proof_internal_bn254_cost_base: 52
+groth16_verify_groth16_proof_internal_bn254_cost_per_public_input: 2
+groth16_verify_groth16_proof_internal_public_input_cost_per_byte: 2
+hash_blake2b256_cost_base: 52
+hash_blake2b256_data_cost_per_byte: 2
+hash_blake2b256_data_cost_per_block: 2
+hash_keccak256_cost_base: 52
+hash_keccak256_data_cost_per_byte: 2
+hash_keccak256_data_cost_per_block: 2
+group_ops_bls12381_decode_scalar_cost: 52
+group_ops_bls12381_decode_g1_cost: 52
+group_ops_bls12381_decode_g2_cost: 52
+group_ops_bls12381_decode_gt_cost: 52
+group_ops_bls12381_scalar_add_cost: 52
+group_ops_bls12381_g1_add_cost: 52
+group_ops_bls12381_g2_add_cost: 52
+group_ops_bls12381_gt_add_cost: 52
+group_ops_bls12381_scalar_sub_cost: 52
+group_ops_bls12381_g1_sub_cost: 52
+group_ops_bls12381_g2_sub_cost: 52
+group_ops_bls12381_gt_sub_cost: 52
+group_ops_bls12381_scalar_mul_cost: 52
+group_ops_bls12381_g1_mul_cost: 52
+group_ops_bls12381_g2_mul_cost: 52
+group_ops_bls12381_gt_mul_cost: 52
+group_ops_bls12381_scalar_div_cost: 52
+group_ops_bls12381_g1_div_cost: 52
+group_ops_bls12381_g2_div_cost: 52
+group_ops_bls12381_gt_div_cost: 52
+group_ops_bls12381_g1_hash_to_base_cost: 52
+group_ops_bls12381_g2_hash_to_base_cost: 52
+group_ops_bls12381_g1_hash_to_cost_per_byte: 2
+group_ops_bls12381_g2_hash_to_cost_per_byte: 2
+group_ops_bls12381_g1_msm_base_cost: 52
+group_ops_bls12381_g2_msm_base_cost: 52
+group_ops_bls12381_g1_msm_base_cost_per_input: 52
+group_ops_bls12381_g2_msm_base_cost_per_input: 52
+group_ops_bls12381_msm_max_len: 32
+group_ops_bls12381_pairing_cost: 52
+hmac_hmac_sha3_256_cost_base: 52
+hmac_hmac_sha3_256_input_cost_per_byte: 2
+hmac_hmac_sha3_256_input_cost_per_block: 2
+check_zklogin_id_cost_base: 200
+check_zklogin_issuer_cost_base: 200
+bcs_per_byte_serialized_cost: 2
+bcs_legacy_min_output_size_cost: 1
+bcs_failure_cost: 52
+hash_sha2_256_base_cost: 52
+hash_sha2_256_per_byte_cost: 2
+hash_sha2_256_legacy_min_input_len_cost: 1
+hash_sha3_256_base_cost: 52
+hash_sha3_256_per_byte_cost: 2
+hash_sha3_256_legacy_min_input_len_cost: 1
+type_name_get_base_cost: 52
+type_name_get_per_byte_cost: 2
+string_check_utf8_base_cost: 52
+string_check_utf8_per_byte_cost: 2
+string_is_char_boundary_base_cost: 52
+string_sub_string_base_cost: 52
+string_sub_string_per_byte_cost: 2
+string_index_of_base_cost: 52
+string_index_of_per_byte_pattern_cost: 2
+string_index_of_per_byte_searched_cost: 2
+vector_empty_base_cost: 52
+vector_length_base_cost: 52
+vector_push_back_base_cost: 52
+vector_push_back_legacy_per_abstract_memory_unit_cost: 2
+vector_borrow_base_cost: 52
+vector_pop_back_base_cost: 52
+vector_destroy_empty_base_cost: 52
+vector_swap_base_cost: 52
+debug_print_base_cost: 52
+debug_print_stack_trace_base_cost: 52
+execution_version: 3
+consensus_bad_nodes_stake_threshold: 20
+max_jwk_votes_per_validator_per_epoch: 240
+max_age_of_jwk_in_epochs: 1
+random_beacon_reduction_allowed_delta: 800
+random_beacon_reduction_lower_bound: 1000
+random_beacon_dkg_timeout_round: 3000
+random_beacon_min_round_interval_ms: 500
+random_beacon_dkg_version: 1
+consensus_max_transaction_size_bytes: 262144
+consensus_max_transactions_in_block_bytes: 6291456
+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
+max_soft_bundle_size: 5
+bridge_should_try_to_finalize_committee: true
+max_accumulated_txn_cost_per_object_in_mysticeti_commit: 10
+
diff --git a/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Testnet_version_55.snap b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Testnet_version_55.snap
new file mode 100644
index 0000000000000..223b9b68af4c3
--- /dev/null
+++ b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Testnet_version_55.snap
@@ -0,0 +1,324 @@
+---
+source: crates/sui-protocol-config/src/lib.rs
+expression: "ProtocolConfig::get_for_version(cur, *chain_id)"
+---
+version: 55
+feature_flags:
+  package_upgrades: true
+  commit_root_state_digest: true
+  advance_epoch_start_time_in_safe_mode: true
+  loaded_child_objects_fixed: true
+  missing_type_is_compatibility_error: true
+  scoring_decision_with_validity_cutoff: true
+  consensus_order_end_of_epoch_last: true
+  disallow_adding_abilities_on_upgrade: true
+  disable_invariant_violation_check_in_swap_loc: true
+  advance_to_highest_supported_protocol_version: true
+  ban_entry_init: true
+  package_digest_hash_module: true
+  disallow_change_struct_type_params_on_upgrade: true
+  no_extraneous_module_bytes: true
+  narwhal_versioned_metadata: true
+  zklogin_auth: true
+  consensus_transaction_ordering: ByGasPrice
+  simplified_unwrap_then_delete: true
+  upgraded_multisig_supported: true
+  txn_base_cost_as_multiplier: true
+  shared_object_deletion: true
+  narwhal_new_leader_election_schedule: true
+  loaded_child_object_format: true
+  enable_jwk_consensus_updates: true
+  end_of_epoch_transaction_supported: true
+  simple_conservation_checks: true
+  loaded_child_object_format_type: true
+  receive_objects: true
+  random_beacon: true
+  bridge: true
+  enable_effects_v2: true
+  narwhal_certificate_v2: true
+  verify_legacy_zklogin_address: true
+  recompute_has_public_transfer_in_execution: true
+  accept_zklogin_in_multisig: true
+  include_consensus_digest_in_prologue: true
+  hardened_otw_check: true
+  allow_receiving_object_id: true
+  enable_coin_deny_list: true
+  enable_group_ops_native_functions: true
+  reject_mutable_random_on_entry_functions: true
+  per_object_congestion_control_mode: TotalTxCount
+  consensus_choice: Mysticeti
+  consensus_network: Tonic
+  zklogin_max_epoch_upper_bound_delta: 30
+  mysticeti_leader_scoring_and_schedule: true
+  reshare_at_same_initial_version: true
+  resolve_abort_locations_to_package_id: true
+  mysticeti_use_committed_subdag_digest: true
+  record_consensus_determined_version_assignments_in_prologue: true
+  fresh_vm_on_framework_upgrade: true
+  prepend_prologue_tx_in_consensus_commit_in_checkpoints: true
+  mysticeti_num_leaders_per_round: 1
+  soft_bundle: true
+  enable_coin_deny_list_v2: true
+  rethrow_serialization_type_layout_errors: true
+max_tx_size_bytes: 131072
+max_input_objects: 2048
+max_size_written_objects: 5000000
+max_size_written_objects_system_tx: 50000000
+max_serialized_tx_effects_size_bytes: 524288
+max_serialized_tx_effects_size_bytes_system_tx: 8388608
+max_gas_payment_objects: 256
+max_modules_in_publish: 64
+max_package_dependencies: 32
+max_arguments: 512
+max_type_arguments: 16
+max_type_argument_depth: 16
+max_pure_argument_size: 16384
+max_programmable_tx_commands: 1024
+move_binary_format_version: 7
+min_move_binary_format_version: 6
+binary_module_handles: 100
+binary_struct_handles: 300
+binary_function_handles: 1500
+binary_function_instantiations: 750
+binary_signatures: 1000
+binary_constant_pool: 4000
+binary_identifiers: 10000
+binary_address_identifiers: 100
+binary_struct_defs: 200
+binary_struct_def_instantiations: 100
+binary_function_defs: 1000
+binary_field_handles: 500
+binary_field_instantiations: 250
+binary_friend_decls: 100
+max_move_object_size: 256000
+max_move_package_size: 102400
+max_publish_or_upgrade_per_ptb: 5
+max_tx_gas: 50000000000
+max_gas_price: 100000
+max_gas_computation_bucket: 5000000
+gas_rounding_step: 1000
+max_loop_depth: 5
+max_generic_instantiation_length: 32
+max_function_parameters: 128
+max_basic_blocks: 1024
+max_value_stack_size: 1024
+max_type_nodes: 256
+max_push_size: 10000
+max_struct_definitions: 200
+max_function_definitions: 1000
+max_fields_in_struct: 32
+max_dependency_depth: 100
+max_num_event_emit: 1024
+max_num_new_move_object_ids: 2048
+max_num_new_move_object_ids_system_tx: 32768
+max_num_deleted_move_object_ids: 2048
+max_num_deleted_move_object_ids_system_tx: 32768
+max_num_transferred_move_object_ids: 2048
+max_num_transferred_move_object_ids_system_tx: 32768
+max_event_emit_size: 256000
+max_event_emit_size_total: 65536000
+max_move_vector_len: 262144
+max_move_identifier_len: 128
+max_move_value_depth: 128
+max_back_edges_per_function: 10000
+max_back_edges_per_module: 10000
+max_verifier_meter_ticks_per_function: 16000000
+max_meter_ticks_per_module: 16000000
+max_meter_ticks_per_package: 16000000
+object_runtime_max_num_cached_objects: 1000
+object_runtime_max_num_cached_objects_system_tx: 16000
+object_runtime_max_num_store_entries: 1000
+object_runtime_max_num_store_entries_system_tx: 16000
+base_tx_cost_fixed: 1000
+package_publish_cost_fixed: 1000
+base_tx_cost_per_byte: 0
+package_publish_cost_per_byte: 80
+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
+obj_data_cost_refundable: 100
+obj_metadata_cost_non_refundable: 50
+storage_rebate_rate: 9900
+storage_fund_reinvest_rate: 500
+reward_slashing_rate: 10000
+storage_gas_price: 76
+max_transactions_per_checkpoint: 10000
+max_checkpoint_size_bytes: 31457280
+buffer_stake_for_protocol_upgrade_bps: 5000
+address_from_bytes_cost_base: 52
+address_to_u256_cost_base: 52
+address_from_u256_cost_base: 52
+config_read_setting_impl_cost_base: 100
+config_read_setting_impl_cost_per_byte: 40
+dynamic_field_hash_type_and_key_cost_base: 100
+dynamic_field_hash_type_and_key_type_cost_per_byte: 2
+dynamic_field_hash_type_and_key_value_cost_per_byte: 2
+dynamic_field_hash_type_and_key_type_tag_cost_per_byte: 2
+dynamic_field_add_child_object_cost_base: 100
+dynamic_field_add_child_object_type_cost_per_byte: 10
+dynamic_field_add_child_object_value_cost_per_byte: 10
+dynamic_field_add_child_object_struct_tag_cost_per_byte: 10
+dynamic_field_borrow_child_object_cost_base: 100
+dynamic_field_borrow_child_object_child_ref_cost_per_byte: 10
+dynamic_field_borrow_child_object_type_cost_per_byte: 10
+dynamic_field_remove_child_object_cost_base: 100
+dynamic_field_remove_child_object_child_cost_per_byte: 2
+dynamic_field_remove_child_object_type_cost_per_byte: 2
+dynamic_field_has_child_object_cost_base: 100
+dynamic_field_has_child_object_with_ty_cost_base: 100
+dynamic_field_has_child_object_with_ty_type_cost_per_byte: 2
+dynamic_field_has_child_object_with_ty_type_tag_cost_per_byte: 2
+event_emit_cost_base: 52
+event_emit_value_size_derivation_cost_per_byte: 2
+event_emit_tag_size_derivation_cost_per_byte: 5
+event_emit_output_cost_per_byte: 10
+object_borrow_uid_cost_base: 52
+object_delete_impl_cost_base: 52
+object_record_new_uid_cost_base: 52
+transfer_transfer_internal_cost_base: 52
+transfer_freeze_object_cost_base: 52
+transfer_share_object_cost_base: 52
+transfer_receive_object_cost_base: 52
+tx_context_derive_id_cost_base: 52
+types_is_one_time_witness_cost_base: 52
+types_is_one_time_witness_type_tag_cost_per_byte: 2
+types_is_one_time_witness_type_cost_per_byte: 2
+validator_validate_metadata_cost_base: 52
+validator_validate_metadata_data_cost_per_byte: 2
+crypto_invalid_arguments_cost: 100
+bls12381_bls12381_min_sig_verify_cost_base: 52
+bls12381_bls12381_min_sig_verify_msg_cost_per_byte: 2
+bls12381_bls12381_min_sig_verify_msg_cost_per_block: 2
+bls12381_bls12381_min_pk_verify_cost_base: 52
+bls12381_bls12381_min_pk_verify_msg_cost_per_byte: 2
+bls12381_bls12381_min_pk_verify_msg_cost_per_block: 2
+ecdsa_k1_ecrecover_keccak256_cost_base: 52
+ecdsa_k1_ecrecover_keccak256_msg_cost_per_byte: 2
+ecdsa_k1_ecrecover_keccak256_msg_cost_per_block: 2
+ecdsa_k1_ecrecover_sha256_cost_base: 52
+ecdsa_k1_ecrecover_sha256_msg_cost_per_byte: 2
+ecdsa_k1_ecrecover_sha256_msg_cost_per_block: 2
+ecdsa_k1_decompress_pubkey_cost_base: 52
+ecdsa_k1_secp256k1_verify_keccak256_cost_base: 52
+ecdsa_k1_secp256k1_verify_keccak256_msg_cost_per_byte: 2
+ecdsa_k1_secp256k1_verify_keccak256_msg_cost_per_block: 2
+ecdsa_k1_secp256k1_verify_sha256_cost_base: 52
+ecdsa_k1_secp256k1_verify_sha256_msg_cost_per_byte: 2
+ecdsa_k1_secp256k1_verify_sha256_msg_cost_per_block: 2
+ecdsa_r1_ecrecover_keccak256_cost_base: 52
+ecdsa_r1_ecrecover_keccak256_msg_cost_per_byte: 2
+ecdsa_r1_ecrecover_keccak256_msg_cost_per_block: 2
+ecdsa_r1_ecrecover_sha256_cost_base: 52
+ecdsa_r1_ecrecover_sha256_msg_cost_per_byte: 2
+ecdsa_r1_ecrecover_sha256_msg_cost_per_block: 2
+ecdsa_r1_secp256r1_verify_keccak256_cost_base: 52
+ecdsa_r1_secp256r1_verify_keccak256_msg_cost_per_byte: 2
+ecdsa_r1_secp256r1_verify_keccak256_msg_cost_per_block: 2
+ecdsa_r1_secp256r1_verify_sha256_cost_base: 52
+ecdsa_r1_secp256r1_verify_sha256_msg_cost_per_byte: 2
+ecdsa_r1_secp256r1_verify_sha256_msg_cost_per_block: 2
+ecvrf_ecvrf_verify_cost_base: 52
+ecvrf_ecvrf_verify_alpha_string_cost_per_byte: 2
+ecvrf_ecvrf_verify_alpha_string_cost_per_block: 2
+ed25519_ed25519_verify_cost_base: 52
+ed25519_ed25519_verify_msg_cost_per_byte: 2
+ed25519_ed25519_verify_msg_cost_per_block: 2
+groth16_prepare_verifying_key_bls12381_cost_base: 52
+groth16_prepare_verifying_key_bn254_cost_base: 52
+groth16_verify_groth16_proof_internal_bls12381_cost_base: 52
+groth16_verify_groth16_proof_internal_bls12381_cost_per_public_input: 2
+groth16_verify_groth16_proof_internal_bn254_cost_base: 52
+groth16_verify_groth16_proof_internal_bn254_cost_per_public_input: 2
+groth16_verify_groth16_proof_internal_public_input_cost_per_byte: 2
+hash_blake2b256_cost_base: 52
+hash_blake2b256_data_cost_per_byte: 2
+hash_blake2b256_data_cost_per_block: 2
+hash_keccak256_cost_base: 52
+hash_keccak256_data_cost_per_byte: 2
+hash_keccak256_data_cost_per_block: 2
+group_ops_bls12381_decode_scalar_cost: 52
+group_ops_bls12381_decode_g1_cost: 52
+group_ops_bls12381_decode_g2_cost: 52
+group_ops_bls12381_decode_gt_cost: 52
+group_ops_bls12381_scalar_add_cost: 52
+group_ops_bls12381_g1_add_cost: 52
+group_ops_bls12381_g2_add_cost: 52
+group_ops_bls12381_gt_add_cost: 52
+group_ops_bls12381_scalar_sub_cost: 52
+group_ops_bls12381_g1_sub_cost: 52
+group_ops_bls12381_g2_sub_cost: 52
+group_ops_bls12381_gt_sub_cost: 52
+group_ops_bls12381_scalar_mul_cost: 52
+group_ops_bls12381_g1_mul_cost: 52
+group_ops_bls12381_g2_mul_cost: 52
+group_ops_bls12381_gt_mul_cost: 52
+group_ops_bls12381_scalar_div_cost: 52
+group_ops_bls12381_g1_div_cost: 52
+group_ops_bls12381_g2_div_cost: 52
+group_ops_bls12381_gt_div_cost: 52
+group_ops_bls12381_g1_hash_to_base_cost: 52
+group_ops_bls12381_g2_hash_to_base_cost: 52
+group_ops_bls12381_g1_hash_to_cost_per_byte: 2
+group_ops_bls12381_g2_hash_to_cost_per_byte: 2
+group_ops_bls12381_g1_msm_base_cost: 52
+group_ops_bls12381_g2_msm_base_cost: 52
+group_ops_bls12381_g1_msm_base_cost_per_input: 52
+group_ops_bls12381_g2_msm_base_cost_per_input: 52
+group_ops_bls12381_msm_max_len: 32
+group_ops_bls12381_pairing_cost: 52
+hmac_hmac_sha3_256_cost_base: 52
+hmac_hmac_sha3_256_input_cost_per_byte: 2
+hmac_hmac_sha3_256_input_cost_per_block: 2
+check_zklogin_id_cost_base: 200
+check_zklogin_issuer_cost_base: 200
+bcs_per_byte_serialized_cost: 2
+bcs_legacy_min_output_size_cost: 1
+bcs_failure_cost: 52
+hash_sha2_256_base_cost: 52
+hash_sha2_256_per_byte_cost: 2
+hash_sha2_256_legacy_min_input_len_cost: 1
+hash_sha3_256_base_cost: 52
+hash_sha3_256_per_byte_cost: 2
+hash_sha3_256_legacy_min_input_len_cost: 1
+type_name_get_base_cost: 52
+type_name_get_per_byte_cost: 2
+string_check_utf8_base_cost: 52
+string_check_utf8_per_byte_cost: 2
+string_is_char_boundary_base_cost: 52
+string_sub_string_base_cost: 52
+string_sub_string_per_byte_cost: 2
+string_index_of_base_cost: 52
+string_index_of_per_byte_pattern_cost: 2
+string_index_of_per_byte_searched_cost: 2
+vector_empty_base_cost: 52
+vector_length_base_cost: 52
+vector_push_back_base_cost: 52
+vector_push_back_legacy_per_abstract_memory_unit_cost: 2
+vector_borrow_base_cost: 52
+vector_pop_back_base_cost: 52
+vector_destroy_empty_base_cost: 52
+vector_swap_base_cost: 52
+debug_print_base_cost: 52
+debug_print_stack_trace_base_cost: 52
+execution_version: 3
+consensus_bad_nodes_stake_threshold: 20
+max_jwk_votes_per_validator_per_epoch: 240
+max_age_of_jwk_in_epochs: 1
+random_beacon_reduction_allowed_delta: 800
+random_beacon_reduction_lower_bound: 1000
+random_beacon_dkg_timeout_round: 3000
+random_beacon_min_round_interval_ms: 500
+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
+max_soft_bundle_size: 5
+bridge_should_try_to_finalize_committee: true
+max_accumulated_txn_cost_per_object_in_mysticeti_commit: 10
+
diff --git a/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Testnet_version_56.snap b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Testnet_version_56.snap
new file mode 100644
index 0000000000000..4a06336c6fde4
--- /dev/null
+++ b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__Testnet_version_56.snap
@@ -0,0 +1,324 @@
+---
+source: crates/sui-protocol-config/src/lib.rs
+expression: "ProtocolConfig::get_for_version(cur, *chain_id)"
+---
+version: 56
+feature_flags:
+  package_upgrades: true
+  commit_root_state_digest: true
+  advance_epoch_start_time_in_safe_mode: true
+  loaded_child_objects_fixed: true
+  missing_type_is_compatibility_error: true
+  scoring_decision_with_validity_cutoff: true
+  consensus_order_end_of_epoch_last: true
+  disallow_adding_abilities_on_upgrade: true
+  disable_invariant_violation_check_in_swap_loc: true
+  advance_to_highest_supported_protocol_version: true
+  ban_entry_init: true
+  package_digest_hash_module: true
+  disallow_change_struct_type_params_on_upgrade: true
+  no_extraneous_module_bytes: true
+  narwhal_versioned_metadata: true
+  zklogin_auth: true
+  consensus_transaction_ordering: ByGasPrice
+  simplified_unwrap_then_delete: true
+  upgraded_multisig_supported: true
+  txn_base_cost_as_multiplier: true
+  shared_object_deletion: true
+  narwhal_new_leader_election_schedule: true
+  loaded_child_object_format: true
+  enable_jwk_consensus_updates: true
+  end_of_epoch_transaction_supported: true
+  simple_conservation_checks: true
+  loaded_child_object_format_type: true
+  receive_objects: true
+  random_beacon: true
+  bridge: true
+  enable_effects_v2: true
+  narwhal_certificate_v2: true
+  verify_legacy_zklogin_address: true
+  recompute_has_public_transfer_in_execution: true
+  accept_zklogin_in_multisig: true
+  include_consensus_digest_in_prologue: true
+  hardened_otw_check: true
+  allow_receiving_object_id: true
+  enable_coin_deny_list: true
+  enable_group_ops_native_functions: true
+  reject_mutable_random_on_entry_functions: true
+  per_object_congestion_control_mode: TotalTxCount
+  consensus_choice: Mysticeti
+  consensus_network: Tonic
+  zklogin_max_epoch_upper_bound_delta: 30
+  mysticeti_leader_scoring_and_schedule: true
+  reshare_at_same_initial_version: true
+  resolve_abort_locations_to_package_id: true
+  mysticeti_use_committed_subdag_digest: true
+  record_consensus_determined_version_assignments_in_prologue: true
+  fresh_vm_on_framework_upgrade: true
+  prepend_prologue_tx_in_consensus_commit_in_checkpoints: true
+  mysticeti_num_leaders_per_round: 1
+  soft_bundle: true
+  enable_coin_deny_list_v2: true
+  rethrow_serialization_type_layout_errors: true
+max_tx_size_bytes: 131072
+max_input_objects: 2048
+max_size_written_objects: 5000000
+max_size_written_objects_system_tx: 50000000
+max_serialized_tx_effects_size_bytes: 524288
+max_serialized_tx_effects_size_bytes_system_tx: 8388608
+max_gas_payment_objects: 256
+max_modules_in_publish: 64
+max_package_dependencies: 32
+max_arguments: 512
+max_type_arguments: 16
+max_type_argument_depth: 16
+max_pure_argument_size: 16384
+max_programmable_tx_commands: 1024
+move_binary_format_version: 7
+min_move_binary_format_version: 6
+binary_module_handles: 100
+binary_struct_handles: 300
+binary_function_handles: 1500
+binary_function_instantiations: 750
+binary_signatures: 1000
+binary_constant_pool: 4000
+binary_identifiers: 10000
+binary_address_identifiers: 100
+binary_struct_defs: 200
+binary_struct_def_instantiations: 100
+binary_function_defs: 1000
+binary_field_handles: 500
+binary_field_instantiations: 250
+binary_friend_decls: 100
+max_move_object_size: 256000
+max_move_package_size: 102400
+max_publish_or_upgrade_per_ptb: 5
+max_tx_gas: 50000000000
+max_gas_price: 100000
+max_gas_computation_bucket: 5000000
+gas_rounding_step: 1000
+max_loop_depth: 5
+max_generic_instantiation_length: 32
+max_function_parameters: 128
+max_basic_blocks: 1024
+max_value_stack_size: 1024
+max_type_nodes: 256
+max_push_size: 10000
+max_struct_definitions: 200
+max_function_definitions: 1000
+max_fields_in_struct: 32
+max_dependency_depth: 100
+max_num_event_emit: 1024
+max_num_new_move_object_ids: 2048
+max_num_new_move_object_ids_system_tx: 32768
+max_num_deleted_move_object_ids: 2048
+max_num_deleted_move_object_ids_system_tx: 32768
+max_num_transferred_move_object_ids: 2048
+max_num_transferred_move_object_ids_system_tx: 32768
+max_event_emit_size: 256000
+max_event_emit_size_total: 65536000
+max_move_vector_len: 262144
+max_move_identifier_len: 128
+max_move_value_depth: 128
+max_back_edges_per_function: 10000
+max_back_edges_per_module: 10000
+max_verifier_meter_ticks_per_function: 16000000
+max_meter_ticks_per_module: 16000000
+max_meter_ticks_per_package: 16000000
+object_runtime_max_num_cached_objects: 1000
+object_runtime_max_num_cached_objects_system_tx: 16000
+object_runtime_max_num_store_entries: 1000
+object_runtime_max_num_store_entries_system_tx: 16000
+base_tx_cost_fixed: 1000
+package_publish_cost_fixed: 1000
+base_tx_cost_per_byte: 0
+package_publish_cost_per_byte: 80
+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
+obj_data_cost_refundable: 100
+obj_metadata_cost_non_refundable: 50
+storage_rebate_rate: 9900
+storage_fund_reinvest_rate: 500
+reward_slashing_rate: 10000
+storage_gas_price: 76
+max_transactions_per_checkpoint: 10000
+max_checkpoint_size_bytes: 31457280
+buffer_stake_for_protocol_upgrade_bps: 5000
+address_from_bytes_cost_base: 52
+address_to_u256_cost_base: 52
+address_from_u256_cost_base: 52
+config_read_setting_impl_cost_base: 100
+config_read_setting_impl_cost_per_byte: 40
+dynamic_field_hash_type_and_key_cost_base: 100
+dynamic_field_hash_type_and_key_type_cost_per_byte: 2
+dynamic_field_hash_type_and_key_value_cost_per_byte: 2
+dynamic_field_hash_type_and_key_type_tag_cost_per_byte: 2
+dynamic_field_add_child_object_cost_base: 100
+dynamic_field_add_child_object_type_cost_per_byte: 10
+dynamic_field_add_child_object_value_cost_per_byte: 10
+dynamic_field_add_child_object_struct_tag_cost_per_byte: 10
+dynamic_field_borrow_child_object_cost_base: 100
+dynamic_field_borrow_child_object_child_ref_cost_per_byte: 10
+dynamic_field_borrow_child_object_type_cost_per_byte: 10
+dynamic_field_remove_child_object_cost_base: 100
+dynamic_field_remove_child_object_child_cost_per_byte: 2
+dynamic_field_remove_child_object_type_cost_per_byte: 2
+dynamic_field_has_child_object_cost_base: 100
+dynamic_field_has_child_object_with_ty_cost_base: 100
+dynamic_field_has_child_object_with_ty_type_cost_per_byte: 2
+dynamic_field_has_child_object_with_ty_type_tag_cost_per_byte: 2
+event_emit_cost_base: 52
+event_emit_value_size_derivation_cost_per_byte: 2
+event_emit_tag_size_derivation_cost_per_byte: 5
+event_emit_output_cost_per_byte: 10
+object_borrow_uid_cost_base: 52
+object_delete_impl_cost_base: 52
+object_record_new_uid_cost_base: 52
+transfer_transfer_internal_cost_base: 52
+transfer_freeze_object_cost_base: 52
+transfer_share_object_cost_base: 52
+transfer_receive_object_cost_base: 52
+tx_context_derive_id_cost_base: 52
+types_is_one_time_witness_cost_base: 52
+types_is_one_time_witness_type_tag_cost_per_byte: 2
+types_is_one_time_witness_type_cost_per_byte: 2
+validator_validate_metadata_cost_base: 52
+validator_validate_metadata_data_cost_per_byte: 2
+crypto_invalid_arguments_cost: 100
+bls12381_bls12381_min_sig_verify_cost_base: 52
+bls12381_bls12381_min_sig_verify_msg_cost_per_byte: 2
+bls12381_bls12381_min_sig_verify_msg_cost_per_block: 2
+bls12381_bls12381_min_pk_verify_cost_base: 52
+bls12381_bls12381_min_pk_verify_msg_cost_per_byte: 2
+bls12381_bls12381_min_pk_verify_msg_cost_per_block: 2
+ecdsa_k1_ecrecover_keccak256_cost_base: 52
+ecdsa_k1_ecrecover_keccak256_msg_cost_per_byte: 2
+ecdsa_k1_ecrecover_keccak256_msg_cost_per_block: 2
+ecdsa_k1_ecrecover_sha256_cost_base: 52
+ecdsa_k1_ecrecover_sha256_msg_cost_per_byte: 2
+ecdsa_k1_ecrecover_sha256_msg_cost_per_block: 2
+ecdsa_k1_decompress_pubkey_cost_base: 52
+ecdsa_k1_secp256k1_verify_keccak256_cost_base: 52
+ecdsa_k1_secp256k1_verify_keccak256_msg_cost_per_byte: 2
+ecdsa_k1_secp256k1_verify_keccak256_msg_cost_per_block: 2
+ecdsa_k1_secp256k1_verify_sha256_cost_base: 52
+ecdsa_k1_secp256k1_verify_sha256_msg_cost_per_byte: 2
+ecdsa_k1_secp256k1_verify_sha256_msg_cost_per_block: 2
+ecdsa_r1_ecrecover_keccak256_cost_base: 52
+ecdsa_r1_ecrecover_keccak256_msg_cost_per_byte: 2
+ecdsa_r1_ecrecover_keccak256_msg_cost_per_block: 2
+ecdsa_r1_ecrecover_sha256_cost_base: 52
+ecdsa_r1_ecrecover_sha256_msg_cost_per_byte: 2
+ecdsa_r1_ecrecover_sha256_msg_cost_per_block: 2
+ecdsa_r1_secp256r1_verify_keccak256_cost_base: 52
+ecdsa_r1_secp256r1_verify_keccak256_msg_cost_per_byte: 2
+ecdsa_r1_secp256r1_verify_keccak256_msg_cost_per_block: 2
+ecdsa_r1_secp256r1_verify_sha256_cost_base: 52
+ecdsa_r1_secp256r1_verify_sha256_msg_cost_per_byte: 2
+ecdsa_r1_secp256r1_verify_sha256_msg_cost_per_block: 2
+ecvrf_ecvrf_verify_cost_base: 52
+ecvrf_ecvrf_verify_alpha_string_cost_per_byte: 2
+ecvrf_ecvrf_verify_alpha_string_cost_per_block: 2
+ed25519_ed25519_verify_cost_base: 52
+ed25519_ed25519_verify_msg_cost_per_byte: 2
+ed25519_ed25519_verify_msg_cost_per_block: 2
+groth16_prepare_verifying_key_bls12381_cost_base: 52
+groth16_prepare_verifying_key_bn254_cost_base: 52
+groth16_verify_groth16_proof_internal_bls12381_cost_base: 52
+groth16_verify_groth16_proof_internal_bls12381_cost_per_public_input: 2
+groth16_verify_groth16_proof_internal_bn254_cost_base: 52
+groth16_verify_groth16_proof_internal_bn254_cost_per_public_input: 2
+groth16_verify_groth16_proof_internal_public_input_cost_per_byte: 2
+hash_blake2b256_cost_base: 52
+hash_blake2b256_data_cost_per_byte: 2
+hash_blake2b256_data_cost_per_block: 2
+hash_keccak256_cost_base: 52
+hash_keccak256_data_cost_per_byte: 2
+hash_keccak256_data_cost_per_block: 2
+group_ops_bls12381_decode_scalar_cost: 52
+group_ops_bls12381_decode_g1_cost: 52
+group_ops_bls12381_decode_g2_cost: 52
+group_ops_bls12381_decode_gt_cost: 52
+group_ops_bls12381_scalar_add_cost: 52
+group_ops_bls12381_g1_add_cost: 52
+group_ops_bls12381_g2_add_cost: 52
+group_ops_bls12381_gt_add_cost: 52
+group_ops_bls12381_scalar_sub_cost: 52
+group_ops_bls12381_g1_sub_cost: 52
+group_ops_bls12381_g2_sub_cost: 52
+group_ops_bls12381_gt_sub_cost: 52
+group_ops_bls12381_scalar_mul_cost: 52
+group_ops_bls12381_g1_mul_cost: 52
+group_ops_bls12381_g2_mul_cost: 52
+group_ops_bls12381_gt_mul_cost: 52
+group_ops_bls12381_scalar_div_cost: 52
+group_ops_bls12381_g1_div_cost: 52
+group_ops_bls12381_g2_div_cost: 52
+group_ops_bls12381_gt_div_cost: 52
+group_ops_bls12381_g1_hash_to_base_cost: 52
+group_ops_bls12381_g2_hash_to_base_cost: 52
+group_ops_bls12381_g1_hash_to_cost_per_byte: 2
+group_ops_bls12381_g2_hash_to_cost_per_byte: 2
+group_ops_bls12381_g1_msm_base_cost: 52
+group_ops_bls12381_g2_msm_base_cost: 52
+group_ops_bls12381_g1_msm_base_cost_per_input: 52
+group_ops_bls12381_g2_msm_base_cost_per_input: 52
+group_ops_bls12381_msm_max_len: 32
+group_ops_bls12381_pairing_cost: 52
+hmac_hmac_sha3_256_cost_base: 52
+hmac_hmac_sha3_256_input_cost_per_byte: 2
+hmac_hmac_sha3_256_input_cost_per_block: 2
+check_zklogin_id_cost_base: 200
+check_zklogin_issuer_cost_base: 200
+bcs_per_byte_serialized_cost: 2
+bcs_legacy_min_output_size_cost: 1
+bcs_failure_cost: 52
+hash_sha2_256_base_cost: 52
+hash_sha2_256_per_byte_cost: 2
+hash_sha2_256_legacy_min_input_len_cost: 1
+hash_sha3_256_base_cost: 52
+hash_sha3_256_per_byte_cost: 2
+hash_sha3_256_legacy_min_input_len_cost: 1
+type_name_get_base_cost: 52
+type_name_get_per_byte_cost: 2
+string_check_utf8_base_cost: 52
+string_check_utf8_per_byte_cost: 2
+string_is_char_boundary_base_cost: 52
+string_sub_string_base_cost: 52
+string_sub_string_per_byte_cost: 2
+string_index_of_base_cost: 52
+string_index_of_per_byte_pattern_cost: 2
+string_index_of_per_byte_searched_cost: 2
+vector_empty_base_cost: 52
+vector_length_base_cost: 52
+vector_push_back_base_cost: 52
+vector_push_back_legacy_per_abstract_memory_unit_cost: 2
+vector_borrow_base_cost: 52
+vector_pop_back_base_cost: 52
+vector_destroy_empty_base_cost: 52
+vector_swap_base_cost: 52
+debug_print_base_cost: 52
+debug_print_stack_trace_base_cost: 52
+execution_version: 3
+consensus_bad_nodes_stake_threshold: 20
+max_jwk_votes_per_validator_per_epoch: 240
+max_age_of_jwk_in_epochs: 1
+random_beacon_reduction_allowed_delta: 800
+random_beacon_reduction_lower_bound: 1000
+random_beacon_dkg_timeout_round: 3000
+random_beacon_min_round_interval_ms: 500
+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
+max_soft_bundle_size: 5
+bridge_should_try_to_finalize_committee: true
+max_accumulated_txn_cost_per_object_in_mysticeti_commit: 10
+
diff --git a/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__version_54.snap b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__version_54.snap
new file mode 100644
index 0000000000000..3e39160917226
--- /dev/null
+++ b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__version_54.snap
@@ -0,0 +1,330 @@
+---
+source: crates/sui-protocol-config/src/lib.rs
+expression: "ProtocolConfig::get_for_version(cur, *chain_id)"
+---
+version: 54
+feature_flags:
+  package_upgrades: true
+  commit_root_state_digest: true
+  advance_epoch_start_time_in_safe_mode: true
+  loaded_child_objects_fixed: true
+  missing_type_is_compatibility_error: true
+  scoring_decision_with_validity_cutoff: true
+  consensus_order_end_of_epoch_last: true
+  disallow_adding_abilities_on_upgrade: true
+  disable_invariant_violation_check_in_swap_loc: true
+  advance_to_highest_supported_protocol_version: true
+  ban_entry_init: true
+  package_digest_hash_module: true
+  disallow_change_struct_type_params_on_upgrade: true
+  no_extraneous_module_bytes: true
+  narwhal_versioned_metadata: true
+  zklogin_auth: true
+  consensus_transaction_ordering: ByGasPrice
+  simplified_unwrap_then_delete: true
+  upgraded_multisig_supported: true
+  txn_base_cost_as_multiplier: true
+  shared_object_deletion: true
+  narwhal_new_leader_election_schedule: true
+  loaded_child_object_format: true
+  enable_jwk_consensus_updates: true
+  end_of_epoch_transaction_supported: true
+  simple_conservation_checks: true
+  loaded_child_object_format_type: true
+  receive_objects: true
+  random_beacon: true
+  bridge: true
+  enable_effects_v2: true
+  narwhal_certificate_v2: true
+  verify_legacy_zklogin_address: true
+  recompute_has_public_transfer_in_execution: true
+  accept_zklogin_in_multisig: true
+  include_consensus_digest_in_prologue: true
+  hardened_otw_check: true
+  allow_receiving_object_id: true
+  enable_poseidon: true
+  enable_coin_deny_list: true
+  enable_group_ops_native_functions: true
+  enable_group_ops_native_function_msm: true
+  reject_mutable_random_on_entry_functions: true
+  per_object_congestion_control_mode: TotalTxCount
+  consensus_choice: Mysticeti
+  consensus_network: Tonic
+  zklogin_max_epoch_upper_bound_delta: 30
+  mysticeti_leader_scoring_and_schedule: true
+  reshare_at_same_initial_version: true
+  resolve_abort_locations_to_package_id: true
+  mysticeti_use_committed_subdag_digest: true
+  enable_vdf: true
+  record_consensus_determined_version_assignments_in_prologue: true
+  fresh_vm_on_framework_upgrade: true
+  prepend_prologue_tx_in_consensus_commit_in_checkpoints: true
+  mysticeti_num_leaders_per_round: 1
+  soft_bundle: true
+  enable_coin_deny_list_v2: true
+  passkey_auth: true
+  authority_capabilities_v2: true
+max_tx_size_bytes: 131072
+max_input_objects: 2048
+max_size_written_objects: 5000000
+max_size_written_objects_system_tx: 50000000
+max_serialized_tx_effects_size_bytes: 524288
+max_serialized_tx_effects_size_bytes_system_tx: 8388608
+max_gas_payment_objects: 256
+max_modules_in_publish: 64
+max_package_dependencies: 32
+max_arguments: 512
+max_type_arguments: 16
+max_type_argument_depth: 16
+max_pure_argument_size: 16384
+max_programmable_tx_commands: 1024
+move_binary_format_version: 7
+min_move_binary_format_version: 6
+binary_module_handles: 100
+binary_struct_handles: 300
+binary_function_handles: 1500
+binary_function_instantiations: 750
+binary_signatures: 1000
+binary_constant_pool: 4000
+binary_identifiers: 10000
+binary_address_identifiers: 100
+binary_struct_defs: 200
+binary_struct_def_instantiations: 100
+binary_function_defs: 1000
+binary_field_handles: 500
+binary_field_instantiations: 250
+binary_friend_decls: 100
+max_move_object_size: 256000
+max_move_package_size: 102400
+max_publish_or_upgrade_per_ptb: 5
+max_tx_gas: 50000000000
+max_gas_price: 100000
+max_gas_computation_bucket: 5000000
+gas_rounding_step: 1000
+max_loop_depth: 5
+max_generic_instantiation_length: 32
+max_function_parameters: 128
+max_basic_blocks: 1024
+max_value_stack_size: 1024
+max_type_nodes: 256
+max_push_size: 10000
+max_struct_definitions: 200
+max_function_definitions: 1000
+max_fields_in_struct: 32
+max_dependency_depth: 100
+max_num_event_emit: 1024
+max_num_new_move_object_ids: 2048
+max_num_new_move_object_ids_system_tx: 32768
+max_num_deleted_move_object_ids: 2048
+max_num_deleted_move_object_ids_system_tx: 32768
+max_num_transferred_move_object_ids: 2048
+max_num_transferred_move_object_ids_system_tx: 32768
+max_event_emit_size: 256000
+max_event_emit_size_total: 65536000
+max_move_vector_len: 262144
+max_move_identifier_len: 128
+max_move_value_depth: 128
+max_back_edges_per_function: 10000
+max_back_edges_per_module: 10000
+max_verifier_meter_ticks_per_function: 16000000
+max_meter_ticks_per_module: 16000000
+max_meter_ticks_per_package: 16000000
+object_runtime_max_num_cached_objects: 1000
+object_runtime_max_num_cached_objects_system_tx: 16000
+object_runtime_max_num_store_entries: 1000
+object_runtime_max_num_store_entries_system_tx: 16000
+base_tx_cost_fixed: 1000
+package_publish_cost_fixed: 1000
+base_tx_cost_per_byte: 0
+package_publish_cost_per_byte: 80
+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
+obj_data_cost_refundable: 100
+obj_metadata_cost_non_refundable: 50
+storage_rebate_rate: 9900
+storage_fund_reinvest_rate: 500
+reward_slashing_rate: 10000
+storage_gas_price: 76
+max_transactions_per_checkpoint: 10000
+max_checkpoint_size_bytes: 31457280
+buffer_stake_for_protocol_upgrade_bps: 5000
+address_from_bytes_cost_base: 52
+address_to_u256_cost_base: 52
+address_from_u256_cost_base: 52
+config_read_setting_impl_cost_base: 100
+config_read_setting_impl_cost_per_byte: 40
+dynamic_field_hash_type_and_key_cost_base: 100
+dynamic_field_hash_type_and_key_type_cost_per_byte: 2
+dynamic_field_hash_type_and_key_value_cost_per_byte: 2
+dynamic_field_hash_type_and_key_type_tag_cost_per_byte: 2
+dynamic_field_add_child_object_cost_base: 100
+dynamic_field_add_child_object_type_cost_per_byte: 10
+dynamic_field_add_child_object_value_cost_per_byte: 10
+dynamic_field_add_child_object_struct_tag_cost_per_byte: 10
+dynamic_field_borrow_child_object_cost_base: 100
+dynamic_field_borrow_child_object_child_ref_cost_per_byte: 10
+dynamic_field_borrow_child_object_type_cost_per_byte: 10
+dynamic_field_remove_child_object_cost_base: 100
+dynamic_field_remove_child_object_child_cost_per_byte: 2
+dynamic_field_remove_child_object_type_cost_per_byte: 2
+dynamic_field_has_child_object_cost_base: 100
+dynamic_field_has_child_object_with_ty_cost_base: 100
+dynamic_field_has_child_object_with_ty_type_cost_per_byte: 2
+dynamic_field_has_child_object_with_ty_type_tag_cost_per_byte: 2
+event_emit_cost_base: 52
+event_emit_value_size_derivation_cost_per_byte: 2
+event_emit_tag_size_derivation_cost_per_byte: 5
+event_emit_output_cost_per_byte: 10
+object_borrow_uid_cost_base: 52
+object_delete_impl_cost_base: 52
+object_record_new_uid_cost_base: 52
+transfer_transfer_internal_cost_base: 52
+transfer_freeze_object_cost_base: 52
+transfer_share_object_cost_base: 52
+transfer_receive_object_cost_base: 52
+tx_context_derive_id_cost_base: 52
+types_is_one_time_witness_cost_base: 52
+types_is_one_time_witness_type_tag_cost_per_byte: 2
+types_is_one_time_witness_type_cost_per_byte: 2
+validator_validate_metadata_cost_base: 52
+validator_validate_metadata_data_cost_per_byte: 2
+crypto_invalid_arguments_cost: 100
+bls12381_bls12381_min_sig_verify_cost_base: 52
+bls12381_bls12381_min_sig_verify_msg_cost_per_byte: 2
+bls12381_bls12381_min_sig_verify_msg_cost_per_block: 2
+bls12381_bls12381_min_pk_verify_cost_base: 52
+bls12381_bls12381_min_pk_verify_msg_cost_per_byte: 2
+bls12381_bls12381_min_pk_verify_msg_cost_per_block: 2
+ecdsa_k1_ecrecover_keccak256_cost_base: 52
+ecdsa_k1_ecrecover_keccak256_msg_cost_per_byte: 2
+ecdsa_k1_ecrecover_keccak256_msg_cost_per_block: 2
+ecdsa_k1_ecrecover_sha256_cost_base: 52
+ecdsa_k1_ecrecover_sha256_msg_cost_per_byte: 2
+ecdsa_k1_ecrecover_sha256_msg_cost_per_block: 2
+ecdsa_k1_decompress_pubkey_cost_base: 52
+ecdsa_k1_secp256k1_verify_keccak256_cost_base: 52
+ecdsa_k1_secp256k1_verify_keccak256_msg_cost_per_byte: 2
+ecdsa_k1_secp256k1_verify_keccak256_msg_cost_per_block: 2
+ecdsa_k1_secp256k1_verify_sha256_cost_base: 52
+ecdsa_k1_secp256k1_verify_sha256_msg_cost_per_byte: 2
+ecdsa_k1_secp256k1_verify_sha256_msg_cost_per_block: 2
+ecdsa_r1_ecrecover_keccak256_cost_base: 52
+ecdsa_r1_ecrecover_keccak256_msg_cost_per_byte: 2
+ecdsa_r1_ecrecover_keccak256_msg_cost_per_block: 2
+ecdsa_r1_ecrecover_sha256_cost_base: 52
+ecdsa_r1_ecrecover_sha256_msg_cost_per_byte: 2
+ecdsa_r1_ecrecover_sha256_msg_cost_per_block: 2
+ecdsa_r1_secp256r1_verify_keccak256_cost_base: 52
+ecdsa_r1_secp256r1_verify_keccak256_msg_cost_per_byte: 2
+ecdsa_r1_secp256r1_verify_keccak256_msg_cost_per_block: 2
+ecdsa_r1_secp256r1_verify_sha256_cost_base: 52
+ecdsa_r1_secp256r1_verify_sha256_msg_cost_per_byte: 2
+ecdsa_r1_secp256r1_verify_sha256_msg_cost_per_block: 2
+ecvrf_ecvrf_verify_cost_base: 52
+ecvrf_ecvrf_verify_alpha_string_cost_per_byte: 2
+ecvrf_ecvrf_verify_alpha_string_cost_per_block: 2
+ed25519_ed25519_verify_cost_base: 52
+ed25519_ed25519_verify_msg_cost_per_byte: 2
+ed25519_ed25519_verify_msg_cost_per_block: 2
+groth16_prepare_verifying_key_bls12381_cost_base: 52
+groth16_prepare_verifying_key_bn254_cost_base: 52
+groth16_verify_groth16_proof_internal_bls12381_cost_base: 52
+groth16_verify_groth16_proof_internal_bls12381_cost_per_public_input: 2
+groth16_verify_groth16_proof_internal_bn254_cost_base: 52
+groth16_verify_groth16_proof_internal_bn254_cost_per_public_input: 2
+groth16_verify_groth16_proof_internal_public_input_cost_per_byte: 2
+hash_blake2b256_cost_base: 52
+hash_blake2b256_data_cost_per_byte: 2
+hash_blake2b256_data_cost_per_block: 2
+hash_keccak256_cost_base: 52
+hash_keccak256_data_cost_per_byte: 2
+hash_keccak256_data_cost_per_block: 2
+poseidon_bn254_cost_base: 260
+poseidon_bn254_cost_per_block: 10
+group_ops_bls12381_decode_scalar_cost: 52
+group_ops_bls12381_decode_g1_cost: 52
+group_ops_bls12381_decode_g2_cost: 52
+group_ops_bls12381_decode_gt_cost: 52
+group_ops_bls12381_scalar_add_cost: 52
+group_ops_bls12381_g1_add_cost: 52
+group_ops_bls12381_g2_add_cost: 52
+group_ops_bls12381_gt_add_cost: 52
+group_ops_bls12381_scalar_sub_cost: 52
+group_ops_bls12381_g1_sub_cost: 52
+group_ops_bls12381_g2_sub_cost: 52
+group_ops_bls12381_gt_sub_cost: 52
+group_ops_bls12381_scalar_mul_cost: 52
+group_ops_bls12381_g1_mul_cost: 52
+group_ops_bls12381_g2_mul_cost: 52
+group_ops_bls12381_gt_mul_cost: 52
+group_ops_bls12381_scalar_div_cost: 52
+group_ops_bls12381_g1_div_cost: 52
+group_ops_bls12381_g2_div_cost: 52
+group_ops_bls12381_gt_div_cost: 52
+group_ops_bls12381_g1_hash_to_base_cost: 52
+group_ops_bls12381_g2_hash_to_base_cost: 52
+group_ops_bls12381_g1_hash_to_cost_per_byte: 2
+group_ops_bls12381_g2_hash_to_cost_per_byte: 2
+group_ops_bls12381_g1_msm_base_cost: 52
+group_ops_bls12381_g2_msm_base_cost: 52
+group_ops_bls12381_g1_msm_base_cost_per_input: 52
+group_ops_bls12381_g2_msm_base_cost_per_input: 52
+group_ops_bls12381_msm_max_len: 32
+group_ops_bls12381_pairing_cost: 52
+hmac_hmac_sha3_256_cost_base: 52
+hmac_hmac_sha3_256_input_cost_per_byte: 2
+hmac_hmac_sha3_256_input_cost_per_block: 2
+check_zklogin_id_cost_base: 200
+check_zklogin_issuer_cost_base: 200
+vdf_verify_vdf_cost: 1500
+vdf_hash_to_input_cost: 100
+bcs_per_byte_serialized_cost: 2
+bcs_legacy_min_output_size_cost: 1
+bcs_failure_cost: 52
+hash_sha2_256_base_cost: 52
+hash_sha2_256_per_byte_cost: 2
+hash_sha2_256_legacy_min_input_len_cost: 1
+hash_sha3_256_base_cost: 52
+hash_sha3_256_per_byte_cost: 2
+hash_sha3_256_legacy_min_input_len_cost: 1
+type_name_get_base_cost: 52
+type_name_get_per_byte_cost: 2
+string_check_utf8_base_cost: 52
+string_check_utf8_per_byte_cost: 2
+string_is_char_boundary_base_cost: 52
+string_sub_string_base_cost: 52
+string_sub_string_per_byte_cost: 2
+string_index_of_base_cost: 52
+string_index_of_per_byte_pattern_cost: 2
+string_index_of_per_byte_searched_cost: 2
+vector_empty_base_cost: 52
+vector_length_base_cost: 52
+vector_push_back_base_cost: 52
+vector_push_back_legacy_per_abstract_memory_unit_cost: 2
+vector_borrow_base_cost: 52
+vector_pop_back_base_cost: 52
+vector_destroy_empty_base_cost: 52
+vector_swap_base_cost: 52
+debug_print_base_cost: 52
+debug_print_stack_trace_base_cost: 52
+execution_version: 3
+consensus_bad_nodes_stake_threshold: 20
+max_jwk_votes_per_validator_per_epoch: 240
+max_age_of_jwk_in_epochs: 1
+random_beacon_reduction_allowed_delta: 800
+random_beacon_reduction_lower_bound: 1000
+random_beacon_dkg_timeout_round: 3000
+random_beacon_min_round_interval_ms: 500
+random_beacon_dkg_version: 1
+consensus_max_transaction_size_bytes: 262144
+consensus_max_transactions_in_block_bytes: 6291456
+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
+max_soft_bundle_size: 5
+bridge_should_try_to_finalize_committee: true
+max_accumulated_txn_cost_per_object_in_mysticeti_commit: 10
diff --git a/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__version_55.snap b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__version_55.snap
new file mode 100644
index 0000000000000..69b7747d1bb49
--- /dev/null
+++ b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__version_55.snap
@@ -0,0 +1,333 @@
+---
+source: crates/sui-protocol-config/src/lib.rs
+expression: "ProtocolConfig::get_for_version(cur, *chain_id)"
+---
+version: 55
+feature_flags:
+  package_upgrades: true
+  commit_root_state_digest: true
+  advance_epoch_start_time_in_safe_mode: true
+  loaded_child_objects_fixed: true
+  missing_type_is_compatibility_error: true
+  scoring_decision_with_validity_cutoff: true
+  consensus_order_end_of_epoch_last: true
+  disallow_adding_abilities_on_upgrade: true
+  disable_invariant_violation_check_in_swap_loc: true
+  advance_to_highest_supported_protocol_version: true
+  ban_entry_init: true
+  package_digest_hash_module: true
+  disallow_change_struct_type_params_on_upgrade: true
+  no_extraneous_module_bytes: true
+  narwhal_versioned_metadata: true
+  zklogin_auth: true
+  consensus_transaction_ordering: ByGasPrice
+  simplified_unwrap_then_delete: true
+  upgraded_multisig_supported: true
+  txn_base_cost_as_multiplier: true
+  shared_object_deletion: true
+  narwhal_new_leader_election_schedule: true
+  loaded_child_object_format: true
+  enable_jwk_consensus_updates: true
+  end_of_epoch_transaction_supported: true
+  simple_conservation_checks: true
+  loaded_child_object_format_type: true
+  receive_objects: true
+  random_beacon: true
+  bridge: true
+  enable_effects_v2: true
+  narwhal_certificate_v2: true
+  verify_legacy_zklogin_address: true
+  recompute_has_public_transfer_in_execution: true
+  accept_zklogin_in_multisig: true
+  include_consensus_digest_in_prologue: true
+  hardened_otw_check: true
+  allow_receiving_object_id: true
+  enable_poseidon: true
+  enable_coin_deny_list: true
+  enable_group_ops_native_functions: true
+  enable_group_ops_native_function_msm: true
+  reject_mutable_random_on_entry_functions: true
+  per_object_congestion_control_mode: TotalTxCount
+  consensus_choice: Mysticeti
+  consensus_network: Tonic
+  zklogin_max_epoch_upper_bound_delta: 30
+  mysticeti_leader_scoring_and_schedule: true
+  reshare_at_same_initial_version: true
+  resolve_abort_locations_to_package_id: true
+  mysticeti_use_committed_subdag_digest: true
+  enable_vdf: true
+  record_consensus_determined_version_assignments_in_prologue: true
+  fresh_vm_on_framework_upgrade: true
+  prepend_prologue_tx_in_consensus_commit_in_checkpoints: true
+  mysticeti_num_leaders_per_round: 1
+  soft_bundle: true
+  enable_coin_deny_list_v2: true
+  passkey_auth: true
+  authority_capabilities_v2: true
+  rethrow_serialization_type_layout_errors: true
+max_tx_size_bytes: 131072
+max_input_objects: 2048
+max_size_written_objects: 5000000
+max_size_written_objects_system_tx: 50000000
+max_serialized_tx_effects_size_bytes: 524288
+max_serialized_tx_effects_size_bytes_system_tx: 8388608
+max_gas_payment_objects: 256
+max_modules_in_publish: 64
+max_package_dependencies: 32
+max_arguments: 512
+max_type_arguments: 16
+max_type_argument_depth: 16
+max_pure_argument_size: 16384
+max_programmable_tx_commands: 1024
+move_binary_format_version: 7
+min_move_binary_format_version: 6
+binary_module_handles: 100
+binary_struct_handles: 300
+binary_function_handles: 1500
+binary_function_instantiations: 750
+binary_signatures: 1000
+binary_constant_pool: 4000
+binary_identifiers: 10000
+binary_address_identifiers: 100
+binary_struct_defs: 200
+binary_struct_def_instantiations: 100
+binary_function_defs: 1000
+binary_field_handles: 500
+binary_field_instantiations: 250
+binary_friend_decls: 100
+max_move_object_size: 256000
+max_move_package_size: 102400
+max_publish_or_upgrade_per_ptb: 5
+max_tx_gas: 50000000000
+max_gas_price: 100000
+max_gas_computation_bucket: 5000000
+gas_rounding_step: 1000
+max_loop_depth: 5
+max_generic_instantiation_length: 32
+max_function_parameters: 128
+max_basic_blocks: 1024
+max_value_stack_size: 1024
+max_type_nodes: 256
+max_push_size: 10000
+max_struct_definitions: 200
+max_function_definitions: 1000
+max_fields_in_struct: 32
+max_dependency_depth: 100
+max_num_event_emit: 1024
+max_num_new_move_object_ids: 2048
+max_num_new_move_object_ids_system_tx: 32768
+max_num_deleted_move_object_ids: 2048
+max_num_deleted_move_object_ids_system_tx: 32768
+max_num_transferred_move_object_ids: 2048
+max_num_transferred_move_object_ids_system_tx: 32768
+max_event_emit_size: 256000
+max_event_emit_size_total: 65536000
+max_move_vector_len: 262144
+max_move_identifier_len: 128
+max_move_value_depth: 128
+max_back_edges_per_function: 10000
+max_back_edges_per_module: 10000
+max_verifier_meter_ticks_per_function: 16000000
+max_meter_ticks_per_module: 16000000
+max_meter_ticks_per_package: 16000000
+object_runtime_max_num_cached_objects: 1000
+object_runtime_max_num_cached_objects_system_tx: 16000
+object_runtime_max_num_store_entries: 1000
+object_runtime_max_num_store_entries_system_tx: 16000
+base_tx_cost_fixed: 1000
+package_publish_cost_fixed: 1000
+base_tx_cost_per_byte: 0
+package_publish_cost_per_byte: 80
+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
+obj_data_cost_refundable: 100
+obj_metadata_cost_non_refundable: 50
+storage_rebate_rate: 9900
+storage_fund_reinvest_rate: 500
+reward_slashing_rate: 10000
+storage_gas_price: 76
+max_transactions_per_checkpoint: 10000
+max_checkpoint_size_bytes: 31457280
+buffer_stake_for_protocol_upgrade_bps: 5000
+address_from_bytes_cost_base: 52
+address_to_u256_cost_base: 52
+address_from_u256_cost_base: 52
+config_read_setting_impl_cost_base: 100
+config_read_setting_impl_cost_per_byte: 40
+dynamic_field_hash_type_and_key_cost_base: 100
+dynamic_field_hash_type_and_key_type_cost_per_byte: 2
+dynamic_field_hash_type_and_key_value_cost_per_byte: 2
+dynamic_field_hash_type_and_key_type_tag_cost_per_byte: 2
+dynamic_field_add_child_object_cost_base: 100
+dynamic_field_add_child_object_type_cost_per_byte: 10
+dynamic_field_add_child_object_value_cost_per_byte: 10
+dynamic_field_add_child_object_struct_tag_cost_per_byte: 10
+dynamic_field_borrow_child_object_cost_base: 100
+dynamic_field_borrow_child_object_child_ref_cost_per_byte: 10
+dynamic_field_borrow_child_object_type_cost_per_byte: 10
+dynamic_field_remove_child_object_cost_base: 100
+dynamic_field_remove_child_object_child_cost_per_byte: 2
+dynamic_field_remove_child_object_type_cost_per_byte: 2
+dynamic_field_has_child_object_cost_base: 100
+dynamic_field_has_child_object_with_ty_cost_base: 100
+dynamic_field_has_child_object_with_ty_type_cost_per_byte: 2
+dynamic_field_has_child_object_with_ty_type_tag_cost_per_byte: 2
+event_emit_cost_base: 52
+event_emit_value_size_derivation_cost_per_byte: 2
+event_emit_tag_size_derivation_cost_per_byte: 5
+event_emit_output_cost_per_byte: 10
+object_borrow_uid_cost_base: 52
+object_delete_impl_cost_base: 52
+object_record_new_uid_cost_base: 52
+transfer_transfer_internal_cost_base: 52
+transfer_freeze_object_cost_base: 52
+transfer_share_object_cost_base: 52
+transfer_receive_object_cost_base: 52
+tx_context_derive_id_cost_base: 52
+types_is_one_time_witness_cost_base: 52
+types_is_one_time_witness_type_tag_cost_per_byte: 2
+types_is_one_time_witness_type_cost_per_byte: 2
+validator_validate_metadata_cost_base: 52
+validator_validate_metadata_data_cost_per_byte: 2
+crypto_invalid_arguments_cost: 100
+bls12381_bls12381_min_sig_verify_cost_base: 52
+bls12381_bls12381_min_sig_verify_msg_cost_per_byte: 2
+bls12381_bls12381_min_sig_verify_msg_cost_per_block: 2
+bls12381_bls12381_min_pk_verify_cost_base: 52
+bls12381_bls12381_min_pk_verify_msg_cost_per_byte: 2
+bls12381_bls12381_min_pk_verify_msg_cost_per_block: 2
+ecdsa_k1_ecrecover_keccak256_cost_base: 52
+ecdsa_k1_ecrecover_keccak256_msg_cost_per_byte: 2
+ecdsa_k1_ecrecover_keccak256_msg_cost_per_block: 2
+ecdsa_k1_ecrecover_sha256_cost_base: 52
+ecdsa_k1_ecrecover_sha256_msg_cost_per_byte: 2
+ecdsa_k1_ecrecover_sha256_msg_cost_per_block: 2
+ecdsa_k1_decompress_pubkey_cost_base: 52
+ecdsa_k1_secp256k1_verify_keccak256_cost_base: 52
+ecdsa_k1_secp256k1_verify_keccak256_msg_cost_per_byte: 2
+ecdsa_k1_secp256k1_verify_keccak256_msg_cost_per_block: 2
+ecdsa_k1_secp256k1_verify_sha256_cost_base: 52
+ecdsa_k1_secp256k1_verify_sha256_msg_cost_per_byte: 2
+ecdsa_k1_secp256k1_verify_sha256_msg_cost_per_block: 2
+ecdsa_r1_ecrecover_keccak256_cost_base: 52
+ecdsa_r1_ecrecover_keccak256_msg_cost_per_byte: 2
+ecdsa_r1_ecrecover_keccak256_msg_cost_per_block: 2
+ecdsa_r1_ecrecover_sha256_cost_base: 52
+ecdsa_r1_ecrecover_sha256_msg_cost_per_byte: 2
+ecdsa_r1_ecrecover_sha256_msg_cost_per_block: 2
+ecdsa_r1_secp256r1_verify_keccak256_cost_base: 52
+ecdsa_r1_secp256r1_verify_keccak256_msg_cost_per_byte: 2
+ecdsa_r1_secp256r1_verify_keccak256_msg_cost_per_block: 2
+ecdsa_r1_secp256r1_verify_sha256_cost_base: 52
+ecdsa_r1_secp256r1_verify_sha256_msg_cost_per_byte: 2
+ecdsa_r1_secp256r1_verify_sha256_msg_cost_per_block: 2
+ecvrf_ecvrf_verify_cost_base: 52
+ecvrf_ecvrf_verify_alpha_string_cost_per_byte: 2
+ecvrf_ecvrf_verify_alpha_string_cost_per_block: 2
+ed25519_ed25519_verify_cost_base: 52
+ed25519_ed25519_verify_msg_cost_per_byte: 2
+ed25519_ed25519_verify_msg_cost_per_block: 2
+groth16_prepare_verifying_key_bls12381_cost_base: 52
+groth16_prepare_verifying_key_bn254_cost_base: 52
+groth16_verify_groth16_proof_internal_bls12381_cost_base: 52
+groth16_verify_groth16_proof_internal_bls12381_cost_per_public_input: 2
+groth16_verify_groth16_proof_internal_bn254_cost_base: 52
+groth16_verify_groth16_proof_internal_bn254_cost_per_public_input: 2
+groth16_verify_groth16_proof_internal_public_input_cost_per_byte: 2
+hash_blake2b256_cost_base: 52
+hash_blake2b256_data_cost_per_byte: 2
+hash_blake2b256_data_cost_per_block: 2
+hash_keccak256_cost_base: 52
+hash_keccak256_data_cost_per_byte: 2
+hash_keccak256_data_cost_per_block: 2
+poseidon_bn254_cost_base: 260
+poseidon_bn254_cost_per_block: 10
+group_ops_bls12381_decode_scalar_cost: 52
+group_ops_bls12381_decode_g1_cost: 52
+group_ops_bls12381_decode_g2_cost: 52
+group_ops_bls12381_decode_gt_cost: 52
+group_ops_bls12381_scalar_add_cost: 52
+group_ops_bls12381_g1_add_cost: 52
+group_ops_bls12381_g2_add_cost: 52
+group_ops_bls12381_gt_add_cost: 52
+group_ops_bls12381_scalar_sub_cost: 52
+group_ops_bls12381_g1_sub_cost: 52
+group_ops_bls12381_g2_sub_cost: 52
+group_ops_bls12381_gt_sub_cost: 52
+group_ops_bls12381_scalar_mul_cost: 52
+group_ops_bls12381_g1_mul_cost: 52
+group_ops_bls12381_g2_mul_cost: 52
+group_ops_bls12381_gt_mul_cost: 52
+group_ops_bls12381_scalar_div_cost: 52
+group_ops_bls12381_g1_div_cost: 52
+group_ops_bls12381_g2_div_cost: 52
+group_ops_bls12381_gt_div_cost: 52
+group_ops_bls12381_g1_hash_to_base_cost: 52
+group_ops_bls12381_g2_hash_to_base_cost: 52
+group_ops_bls12381_g1_hash_to_cost_per_byte: 2
+group_ops_bls12381_g2_hash_to_cost_per_byte: 2
+group_ops_bls12381_g1_msm_base_cost: 52
+group_ops_bls12381_g2_msm_base_cost: 52
+group_ops_bls12381_g1_msm_base_cost_per_input: 52
+group_ops_bls12381_g2_msm_base_cost_per_input: 52
+group_ops_bls12381_msm_max_len: 32
+group_ops_bls12381_pairing_cost: 52
+hmac_hmac_sha3_256_cost_base: 52
+hmac_hmac_sha3_256_input_cost_per_byte: 2
+hmac_hmac_sha3_256_input_cost_per_block: 2
+check_zklogin_id_cost_base: 200
+check_zklogin_issuer_cost_base: 200
+vdf_verify_vdf_cost: 1500
+vdf_hash_to_input_cost: 100
+bcs_per_byte_serialized_cost: 2
+bcs_legacy_min_output_size_cost: 1
+bcs_failure_cost: 52
+hash_sha2_256_base_cost: 52
+hash_sha2_256_per_byte_cost: 2
+hash_sha2_256_legacy_min_input_len_cost: 1
+hash_sha3_256_base_cost: 52
+hash_sha3_256_per_byte_cost: 2
+hash_sha3_256_legacy_min_input_len_cost: 1
+type_name_get_base_cost: 52
+type_name_get_per_byte_cost: 2
+string_check_utf8_base_cost: 52
+string_check_utf8_per_byte_cost: 2
+string_is_char_boundary_base_cost: 52
+string_sub_string_base_cost: 52
+string_sub_string_per_byte_cost: 2
+string_index_of_base_cost: 52
+string_index_of_per_byte_pattern_cost: 2
+string_index_of_per_byte_searched_cost: 2
+vector_empty_base_cost: 52
+vector_length_base_cost: 52
+vector_push_back_base_cost: 52
+vector_push_back_legacy_per_abstract_memory_unit_cost: 2
+vector_borrow_base_cost: 52
+vector_pop_back_base_cost: 52
+vector_destroy_empty_base_cost: 52
+vector_swap_base_cost: 52
+debug_print_base_cost: 52
+debug_print_stack_trace_base_cost: 52
+execution_version: 3
+consensus_bad_nodes_stake_threshold: 20
+max_jwk_votes_per_validator_per_epoch: 240
+max_age_of_jwk_in_epochs: 1
+random_beacon_reduction_allowed_delta: 800
+random_beacon_reduction_lower_bound: 1000
+random_beacon_dkg_timeout_round: 3000
+random_beacon_min_round_interval_ms: 500
+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
+max_soft_bundle_size: 5
+bridge_should_try_to_finalize_committee: true
+max_accumulated_txn_cost_per_object_in_mysticeti_commit: 10
+
diff --git a/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__version_56.snap b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__version_56.snap
new file mode 100644
index 0000000000000..a18a84ddf856b
--- /dev/null
+++ b/crates/sui-protocol-config/src/snapshots/sui_protocol_config__test__version_56.snap
@@ -0,0 +1,333 @@
+---
+source: crates/sui-protocol-config/src/lib.rs
+expression: "ProtocolConfig::get_for_version(cur, *chain_id)"
+---
+version: 56
+feature_flags:
+  package_upgrades: true
+  commit_root_state_digest: true
+  advance_epoch_start_time_in_safe_mode: true
+  loaded_child_objects_fixed: true
+  missing_type_is_compatibility_error: true
+  scoring_decision_with_validity_cutoff: true
+  consensus_order_end_of_epoch_last: true
+  disallow_adding_abilities_on_upgrade: true
+  disable_invariant_violation_check_in_swap_loc: true
+  advance_to_highest_supported_protocol_version: true
+  ban_entry_init: true
+  package_digest_hash_module: true
+  disallow_change_struct_type_params_on_upgrade: true
+  no_extraneous_module_bytes: true
+  narwhal_versioned_metadata: true
+  zklogin_auth: true
+  consensus_transaction_ordering: ByGasPrice
+  simplified_unwrap_then_delete: true
+  upgraded_multisig_supported: true
+  txn_base_cost_as_multiplier: true
+  shared_object_deletion: true
+  narwhal_new_leader_election_schedule: true
+  loaded_child_object_format: true
+  enable_jwk_consensus_updates: true
+  end_of_epoch_transaction_supported: true
+  simple_conservation_checks: true
+  loaded_child_object_format_type: true
+  receive_objects: true
+  random_beacon: true
+  bridge: true
+  enable_effects_v2: true
+  narwhal_certificate_v2: true
+  verify_legacy_zklogin_address: true
+  recompute_has_public_transfer_in_execution: true
+  accept_zklogin_in_multisig: true
+  include_consensus_digest_in_prologue: true
+  hardened_otw_check: true
+  allow_receiving_object_id: true
+  enable_poseidon: true
+  enable_coin_deny_list: true
+  enable_group_ops_native_functions: true
+  enable_group_ops_native_function_msm: true
+  reject_mutable_random_on_entry_functions: true
+  per_object_congestion_control_mode: TotalTxCount
+  consensus_choice: Mysticeti
+  consensus_network: Tonic
+  zklogin_max_epoch_upper_bound_delta: 30
+  mysticeti_leader_scoring_and_schedule: true
+  reshare_at_same_initial_version: true
+  resolve_abort_locations_to_package_id: true
+  mysticeti_use_committed_subdag_digest: true
+  enable_vdf: true
+  record_consensus_determined_version_assignments_in_prologue: true
+  fresh_vm_on_framework_upgrade: true
+  prepend_prologue_tx_in_consensus_commit_in_checkpoints: true
+  mysticeti_num_leaders_per_round: 1
+  soft_bundle: true
+  enable_coin_deny_list_v2: true
+  passkey_auth: true
+  authority_capabilities_v2: true
+  rethrow_serialization_type_layout_errors: true
+max_tx_size_bytes: 131072
+max_input_objects: 2048
+max_size_written_objects: 5000000
+max_size_written_objects_system_tx: 50000000
+max_serialized_tx_effects_size_bytes: 524288
+max_serialized_tx_effects_size_bytes_system_tx: 8388608
+max_gas_payment_objects: 256
+max_modules_in_publish: 64
+max_package_dependencies: 32
+max_arguments: 512
+max_type_arguments: 16
+max_type_argument_depth: 16
+max_pure_argument_size: 16384
+max_programmable_tx_commands: 1024
+move_binary_format_version: 7
+min_move_binary_format_version: 6
+binary_module_handles: 100
+binary_struct_handles: 300
+binary_function_handles: 1500
+binary_function_instantiations: 750
+binary_signatures: 1000
+binary_constant_pool: 4000
+binary_identifiers: 10000
+binary_address_identifiers: 100
+binary_struct_defs: 200
+binary_struct_def_instantiations: 100
+binary_function_defs: 1000
+binary_field_handles: 500
+binary_field_instantiations: 250
+binary_friend_decls: 100
+max_move_object_size: 256000
+max_move_package_size: 102400
+max_publish_or_upgrade_per_ptb: 5
+max_tx_gas: 50000000000
+max_gas_price: 100000
+max_gas_computation_bucket: 5000000
+gas_rounding_step: 1000
+max_loop_depth: 5
+max_generic_instantiation_length: 32
+max_function_parameters: 128
+max_basic_blocks: 1024
+max_value_stack_size: 1024
+max_type_nodes: 256
+max_push_size: 10000
+max_struct_definitions: 200
+max_function_definitions: 1000
+max_fields_in_struct: 32
+max_dependency_depth: 100
+max_num_event_emit: 1024
+max_num_new_move_object_ids: 2048
+max_num_new_move_object_ids_system_tx: 32768
+max_num_deleted_move_object_ids: 2048
+max_num_deleted_move_object_ids_system_tx: 32768
+max_num_transferred_move_object_ids: 2048
+max_num_transferred_move_object_ids_system_tx: 32768
+max_event_emit_size: 256000
+max_event_emit_size_total: 65536000
+max_move_vector_len: 262144
+max_move_identifier_len: 128
+max_move_value_depth: 128
+max_back_edges_per_function: 10000
+max_back_edges_per_module: 10000
+max_verifier_meter_ticks_per_function: 16000000
+max_meter_ticks_per_module: 16000000
+max_meter_ticks_per_package: 16000000
+object_runtime_max_num_cached_objects: 1000
+object_runtime_max_num_cached_objects_system_tx: 16000
+object_runtime_max_num_store_entries: 1000
+object_runtime_max_num_store_entries_system_tx: 16000
+base_tx_cost_fixed: 1000
+package_publish_cost_fixed: 1000
+base_tx_cost_per_byte: 0
+package_publish_cost_per_byte: 80
+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
+obj_data_cost_refundable: 100
+obj_metadata_cost_non_refundable: 50
+storage_rebate_rate: 9900
+storage_fund_reinvest_rate: 500
+reward_slashing_rate: 10000
+storage_gas_price: 76
+max_transactions_per_checkpoint: 10000
+max_checkpoint_size_bytes: 31457280
+buffer_stake_for_protocol_upgrade_bps: 5000
+address_from_bytes_cost_base: 52
+address_to_u256_cost_base: 52
+address_from_u256_cost_base: 52
+config_read_setting_impl_cost_base: 100
+config_read_setting_impl_cost_per_byte: 40
+dynamic_field_hash_type_and_key_cost_base: 100
+dynamic_field_hash_type_and_key_type_cost_per_byte: 2
+dynamic_field_hash_type_and_key_value_cost_per_byte: 2
+dynamic_field_hash_type_and_key_type_tag_cost_per_byte: 2
+dynamic_field_add_child_object_cost_base: 100
+dynamic_field_add_child_object_type_cost_per_byte: 10
+dynamic_field_add_child_object_value_cost_per_byte: 10
+dynamic_field_add_child_object_struct_tag_cost_per_byte: 10
+dynamic_field_borrow_child_object_cost_base: 100
+dynamic_field_borrow_child_object_child_ref_cost_per_byte: 10
+dynamic_field_borrow_child_object_type_cost_per_byte: 10
+dynamic_field_remove_child_object_cost_base: 100
+dynamic_field_remove_child_object_child_cost_per_byte: 2
+dynamic_field_remove_child_object_type_cost_per_byte: 2
+dynamic_field_has_child_object_cost_base: 100
+dynamic_field_has_child_object_with_ty_cost_base: 100
+dynamic_field_has_child_object_with_ty_type_cost_per_byte: 2
+dynamic_field_has_child_object_with_ty_type_tag_cost_per_byte: 2
+event_emit_cost_base: 52
+event_emit_value_size_derivation_cost_per_byte: 2
+event_emit_tag_size_derivation_cost_per_byte: 5
+event_emit_output_cost_per_byte: 10
+object_borrow_uid_cost_base: 52
+object_delete_impl_cost_base: 52
+object_record_new_uid_cost_base: 52
+transfer_transfer_internal_cost_base: 52
+transfer_freeze_object_cost_base: 52
+transfer_share_object_cost_base: 52
+transfer_receive_object_cost_base: 52
+tx_context_derive_id_cost_base: 52
+types_is_one_time_witness_cost_base: 52
+types_is_one_time_witness_type_tag_cost_per_byte: 2
+types_is_one_time_witness_type_cost_per_byte: 2
+validator_validate_metadata_cost_base: 52
+validator_validate_metadata_data_cost_per_byte: 2
+crypto_invalid_arguments_cost: 100
+bls12381_bls12381_min_sig_verify_cost_base: 52
+bls12381_bls12381_min_sig_verify_msg_cost_per_byte: 2
+bls12381_bls12381_min_sig_verify_msg_cost_per_block: 2
+bls12381_bls12381_min_pk_verify_cost_base: 52
+bls12381_bls12381_min_pk_verify_msg_cost_per_byte: 2
+bls12381_bls12381_min_pk_verify_msg_cost_per_block: 2
+ecdsa_k1_ecrecover_keccak256_cost_base: 52
+ecdsa_k1_ecrecover_keccak256_msg_cost_per_byte: 2
+ecdsa_k1_ecrecover_keccak256_msg_cost_per_block: 2
+ecdsa_k1_ecrecover_sha256_cost_base: 52
+ecdsa_k1_ecrecover_sha256_msg_cost_per_byte: 2
+ecdsa_k1_ecrecover_sha256_msg_cost_per_block: 2
+ecdsa_k1_decompress_pubkey_cost_base: 52
+ecdsa_k1_secp256k1_verify_keccak256_cost_base: 52
+ecdsa_k1_secp256k1_verify_keccak256_msg_cost_per_byte: 2
+ecdsa_k1_secp256k1_verify_keccak256_msg_cost_per_block: 2
+ecdsa_k1_secp256k1_verify_sha256_cost_base: 52
+ecdsa_k1_secp256k1_verify_sha256_msg_cost_per_byte: 2
+ecdsa_k1_secp256k1_verify_sha256_msg_cost_per_block: 2
+ecdsa_r1_ecrecover_keccak256_cost_base: 52
+ecdsa_r1_ecrecover_keccak256_msg_cost_per_byte: 2
+ecdsa_r1_ecrecover_keccak256_msg_cost_per_block: 2
+ecdsa_r1_ecrecover_sha256_cost_base: 52
+ecdsa_r1_ecrecover_sha256_msg_cost_per_byte: 2
+ecdsa_r1_ecrecover_sha256_msg_cost_per_block: 2
+ecdsa_r1_secp256r1_verify_keccak256_cost_base: 52
+ecdsa_r1_secp256r1_verify_keccak256_msg_cost_per_byte: 2
+ecdsa_r1_secp256r1_verify_keccak256_msg_cost_per_block: 2
+ecdsa_r1_secp256r1_verify_sha256_cost_base: 52
+ecdsa_r1_secp256r1_verify_sha256_msg_cost_per_byte: 2
+ecdsa_r1_secp256r1_verify_sha256_msg_cost_per_block: 2
+ecvrf_ecvrf_verify_cost_base: 52
+ecvrf_ecvrf_verify_alpha_string_cost_per_byte: 2
+ecvrf_ecvrf_verify_alpha_string_cost_per_block: 2
+ed25519_ed25519_verify_cost_base: 52
+ed25519_ed25519_verify_msg_cost_per_byte: 2
+ed25519_ed25519_verify_msg_cost_per_block: 2
+groth16_prepare_verifying_key_bls12381_cost_base: 52
+groth16_prepare_verifying_key_bn254_cost_base: 52
+groth16_verify_groth16_proof_internal_bls12381_cost_base: 52
+groth16_verify_groth16_proof_internal_bls12381_cost_per_public_input: 2
+groth16_verify_groth16_proof_internal_bn254_cost_base: 52
+groth16_verify_groth16_proof_internal_bn254_cost_per_public_input: 2
+groth16_verify_groth16_proof_internal_public_input_cost_per_byte: 2
+hash_blake2b256_cost_base: 52
+hash_blake2b256_data_cost_per_byte: 2
+hash_blake2b256_data_cost_per_block: 2
+hash_keccak256_cost_base: 52
+hash_keccak256_data_cost_per_byte: 2
+hash_keccak256_data_cost_per_block: 2
+poseidon_bn254_cost_base: 260
+poseidon_bn254_cost_per_block: 10
+group_ops_bls12381_decode_scalar_cost: 52
+group_ops_bls12381_decode_g1_cost: 52
+group_ops_bls12381_decode_g2_cost: 52
+group_ops_bls12381_decode_gt_cost: 52
+group_ops_bls12381_scalar_add_cost: 52
+group_ops_bls12381_g1_add_cost: 52
+group_ops_bls12381_g2_add_cost: 52
+group_ops_bls12381_gt_add_cost: 52
+group_ops_bls12381_scalar_sub_cost: 52
+group_ops_bls12381_g1_sub_cost: 52
+group_ops_bls12381_g2_sub_cost: 52
+group_ops_bls12381_gt_sub_cost: 52
+group_ops_bls12381_scalar_mul_cost: 52
+group_ops_bls12381_g1_mul_cost: 52
+group_ops_bls12381_g2_mul_cost: 52
+group_ops_bls12381_gt_mul_cost: 52
+group_ops_bls12381_scalar_div_cost: 52
+group_ops_bls12381_g1_div_cost: 52
+group_ops_bls12381_g2_div_cost: 52
+group_ops_bls12381_gt_div_cost: 52
+group_ops_bls12381_g1_hash_to_base_cost: 52
+group_ops_bls12381_g2_hash_to_base_cost: 52
+group_ops_bls12381_g1_hash_to_cost_per_byte: 2
+group_ops_bls12381_g2_hash_to_cost_per_byte: 2
+group_ops_bls12381_g1_msm_base_cost: 52
+group_ops_bls12381_g2_msm_base_cost: 52
+group_ops_bls12381_g1_msm_base_cost_per_input: 52
+group_ops_bls12381_g2_msm_base_cost_per_input: 52
+group_ops_bls12381_msm_max_len: 32
+group_ops_bls12381_pairing_cost: 52
+hmac_hmac_sha3_256_cost_base: 52
+hmac_hmac_sha3_256_input_cost_per_byte: 2
+hmac_hmac_sha3_256_input_cost_per_block: 2
+check_zklogin_id_cost_base: 200
+check_zklogin_issuer_cost_base: 200
+vdf_verify_vdf_cost: 1500
+vdf_hash_to_input_cost: 100
+bcs_per_byte_serialized_cost: 2
+bcs_legacy_min_output_size_cost: 1
+bcs_failure_cost: 52
+hash_sha2_256_base_cost: 52
+hash_sha2_256_per_byte_cost: 2
+hash_sha2_256_legacy_min_input_len_cost: 1
+hash_sha3_256_base_cost: 52
+hash_sha3_256_per_byte_cost: 2
+hash_sha3_256_legacy_min_input_len_cost: 1
+type_name_get_base_cost: 52
+type_name_get_per_byte_cost: 2
+string_check_utf8_base_cost: 52
+string_check_utf8_per_byte_cost: 2
+string_is_char_boundary_base_cost: 52
+string_sub_string_base_cost: 52
+string_sub_string_per_byte_cost: 2
+string_index_of_base_cost: 52
+string_index_of_per_byte_pattern_cost: 2
+string_index_of_per_byte_searched_cost: 2
+vector_empty_base_cost: 52
+vector_length_base_cost: 52
+vector_push_back_base_cost: 52
+vector_push_back_legacy_per_abstract_memory_unit_cost: 2
+vector_borrow_base_cost: 52
+vector_pop_back_base_cost: 52
+vector_destroy_empty_base_cost: 52
+vector_swap_base_cost: 52
+debug_print_base_cost: 52
+debug_print_stack_trace_base_cost: 52
+execution_version: 3
+consensus_bad_nodes_stake_threshold: 20
+max_jwk_votes_per_validator_per_epoch: 240
+max_age_of_jwk_in_epochs: 1
+random_beacon_reduction_allowed_delta: 800
+random_beacon_reduction_lower_bound: 1000
+random_beacon_dkg_timeout_round: 3000
+random_beacon_min_round_interval_ms: 500
+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
+max_soft_bundle_size: 5
+bridge_should_try_to_finalize_committee: true
+max_accumulated_txn_cost_per_object_in_mysticeti_commit: 10
+
diff --git a/crates/sui-proxy/Cargo.toml b/crates/sui-proxy/Cargo.toml
index 1441e047fa56c..2a05739c8491a 100644
--- a/crates/sui-proxy/Cargo.toml
+++ b/crates/sui-proxy/Cargo.toml
@@ -8,6 +8,7 @@ edition = "2021"
 
 [dependencies]
 axum.workspace = true
+axum-extra.workspace = true
 axum-server.workspace = true
 anyhow.workspace = true
 bytes.workspace = true
@@ -37,7 +38,6 @@ rustls.workspace = true
 rustls-pemfile.workspace = true
 prost.workspace = true
 once_cell.workspace = true
-http-body.workspace = true
 hex.workspace = true
 ipnetwork.workspace = true
 
diff --git a/crates/sui-proxy/src/admin.rs b/crates/sui-proxy/src/admin.rs
index 5516c98ab16f1..d6f149d043a51 100644
--- a/crates/sui-proxy/src/admin.rs
+++ b/crates/sui-proxy/src/admin.rs
@@ -166,28 +166,26 @@ pub fn generate_self_cert(hostname: String) -> CertKeyPair {
 }
 
 /// Load a certificate for use by the listening service
-fn load_certs(filename: &str) -> Vec<rustls::Certificate> {
+fn load_certs(filename: &str) -> Vec<rustls::pki_types::CertificateDer<'static>> {
     let certfile = fs::File::open(filename)
         .unwrap_or_else(|e| panic!("cannot open certificate file: {}; {}", filename, e));
     let mut reader = BufReader::new(certfile);
     rustls_pemfile::certs(&mut reader)
+        .collect::<Result<Vec<_>, _>>()
         .unwrap()
-        .iter()
-        .map(|v| rustls::Certificate(v.clone()))
-        .collect()
 }
 
 /// Load a private key
-fn load_private_key(filename: &str) -> rustls::PrivateKey {
+fn load_private_key(filename: &str) -> rustls::pki_types::PrivateKeyDer<'static> {
     let keyfile = fs::File::open(filename)
         .unwrap_or_else(|e| panic!("cannot open private key file {}; {}", filename, e));
     let mut reader = BufReader::new(keyfile);
 
     loop {
         match rustls_pemfile::read_one(&mut reader).expect("cannot parse private key .pem file") {
-            Some(rustls_pemfile::Item::RSAKey(key)) => return rustls::PrivateKey(key),
-            Some(rustls_pemfile::Item::PKCS8Key(key)) => return rustls::PrivateKey(key),
-            Some(rustls_pemfile::Item::ECKey(key)) => return rustls::PrivateKey(key),
+            Some(rustls_pemfile::Item::Pkcs1Key(key)) => return key.into(),
+            Some(rustls_pemfile::Item::Pkcs8Key(key)) => return key.into(),
+            Some(rustls_pemfile::Item::Sec1Key(key)) => return key.into(),
             None => break,
             _ => {}
         }
diff --git a/crates/sui-proxy/src/consumer.rs b/crates/sui-proxy/src/consumer.rs
index 7135c5eaa670b..c4b3af8ad9770 100644
--- a/crates/sui-proxy/src/consumer.rs
+++ b/crates/sui-proxy/src/consumer.rs
@@ -242,7 +242,7 @@ async fn check_response(
 async fn convert(
     mfs: Vec<MetricFamily>,
 ) -> Result<impl Iterator<Item = WriteRequest>, (StatusCode, &'static str)> {
-    let result = match tokio::task::spawn_blocking(|| {
+    let result = tokio::task::spawn_blocking(|| {
         let timer = CONSUMER_OPERATION_DURATION
             .with_label_values(&["convert_to_remote_write_task"])
             .start_timer();
@@ -250,8 +250,9 @@ async fn convert(
         timer.observe_duration();
         result.into_iter()
     })
-    .await
-    {
+    .await;
+
+    let result = match result {
         Ok(v) => v,
         Err(err) => {
             error!("unable to convert to remote_write; {err}");
diff --git a/crates/sui-proxy/src/histogram_relay.rs b/crates/sui-proxy/src/histogram_relay.rs
index 5ed3e302cce6c..41635819fefb9 100644
--- a/crates/sui-proxy/src/histogram_relay.rs
+++ b/crates/sui-proxy/src/histogram_relay.rs
@@ -45,7 +45,7 @@ static RELAY_DURATION: Lazy<HistogramVec> = Lazy::new(|| {
 // Creates a new http server that has as a sole purpose to expose
 // and endpoint that prometheus agent can use to poll for the metrics.
 // A RegistryService is returned that can be used to get access in prometheus Registries.
-pub fn start_prometheus_server(addr: TcpListener) -> HistogramRelay {
+pub fn start_prometheus_server(listener: TcpListener) -> HistogramRelay {
     let relay = HistogramRelay::new();
     let app = Router::new()
         .route(METRICS_ROUTE, get(metrics))
@@ -61,11 +61,9 @@ pub fn start_prometheus_server(addr: TcpListener) -> HistogramRelay {
         );
 
     tokio::spawn(async move {
-        axum::Server::from_tcp(addr)
-            .unwrap()
-            .serve(app.into_make_service())
-            .await
-            .unwrap();
+        listener.set_nonblocking(true).unwrap();
+        let listener = tokio::net::TcpListener::from_std(listener).unwrap();
+        axum::serve(listener, app).await.unwrap();
     });
     relay
 }
diff --git a/crates/sui-proxy/src/lib.rs b/crates/sui-proxy/src/lib.rs
index c858b4568ef2d..149eba1a31156 100644
--- a/crates/sui-proxy/src/lib.rs
+++ b/crates/sui-proxy/src/lib.rs
@@ -61,11 +61,9 @@ mod tests {
         let app = Router::new().route("/v1/push", post(handler));
 
         // run it
-        axum::Server::from_tcp(listener)
-            .unwrap()
-            .serve(app.into_make_service())
-            .await
-            .unwrap();
+        listener.set_nonblocking(true).unwrap();
+        let listener = tokio::net::TcpListener::from_std(listener).unwrap();
+        axum::serve(listener, app).await.unwrap();
     }
 
     /// axum_acceptor is a basic e2e test that creates a mock remote_write post endpoint and has a simple
diff --git a/crates/sui-proxy/src/metrics.rs b/crates/sui-proxy/src/metrics.rs
index 5ee5110e9db30..063d7fefd967c 100644
--- a/crates/sui-proxy/src/metrics.rs
+++ b/crates/sui-proxy/src/metrics.rs
@@ -14,7 +14,7 @@ const METRICS_ROUTE: &str = "/metrics";
 // Creates a new http server that has as a sole purpose to expose
 // and endpoint that prometheus agent can use to poll for the metrics.
 // A RegistryService is returned that can be used to get access in prometheus Registries.
-pub fn start_prometheus_server(addr: TcpListener) -> RegistryService {
+pub fn start_prometheus_server(listener: TcpListener) -> RegistryService {
     let registry = Registry::new();
 
     let registry_service = RegistryService::new(registry);
@@ -33,11 +33,9 @@ pub fn start_prometheus_server(addr: TcpListener) -> RegistryService {
         );
 
     tokio::spawn(async move {
-        axum::Server::from_tcp(addr)
-            .unwrap()
-            .serve(app.into_make_service())
-            .await
-            .unwrap();
+        listener.set_nonblocking(true).unwrap();
+        let listener = tokio::net::TcpListener::from_std(listener).unwrap();
+        axum::serve(listener, app).await.unwrap();
     });
 
     registry_service
diff --git a/crates/sui-proxy/src/middleware.rs b/crates/sui-proxy/src/middleware.rs
index 6af09d11ed6ae..840deb9ef1a20 100644
--- a/crates/sui-proxy/src/middleware.rs
+++ b/crates/sui-proxy/src/middleware.rs
@@ -3,14 +3,15 @@
 use crate::{consumer::ProtobufDecoder, peers::SuiNodeProvider};
 use axum::{
     async_trait,
+    body::Body,
     body::Bytes,
     extract::{Extension, FromRequest},
-    headers::{ContentLength, ContentType},
     http::{Request, StatusCode},
     middleware::Next,
     response::Response,
-    BoxError, TypedHeader,
 };
+use axum_extra::headers::{ContentLength, ContentType};
+use axum_extra::typed_header::TypedHeader;
 use bytes::Buf;
 use hyper::header::CONTENT_ENCODING;
 use once_cell::sync::Lazy;
@@ -38,20 +39,20 @@ static MIDDLEWARE_HEADERS: Lazy<CounterVec> = Lazy::new(|| {
 });
 
 /// we expect sui-node to send us an http header content-length encoding.
-pub async fn expect_content_length<B>(
+pub async fn expect_content_length(
     TypedHeader(content_length): TypedHeader<ContentLength>,
-    request: Request<B>,
-    next: Next<B>,
+    request: Request<Body>,
+    next: Next,
 ) -> Result<Response, (StatusCode, &'static str)> {
     MIDDLEWARE_HEADERS.with_label_values(&["content-length", &format!("{}", content_length.0)]);
     Ok(next.run(request).await)
 }
 
 /// we expect sui-node to send us an http header content-type encoding.
-pub async fn expect_mysten_proxy_header<B>(
+pub async fn expect_mysten_proxy_header(
     TypedHeader(content_type): TypedHeader<ContentType>,
-    request: Request<B>,
-    next: Next<B>,
+    request: Request<Body>,
+    next: Next,
 ) -> Result<Response, (StatusCode, &'static str)> {
     match format!("{content_type}").as_str() {
         prometheus::PROTOBUF_FORMAT => Ok(next.run(request).await),
@@ -67,11 +68,11 @@ pub async fn expect_mysten_proxy_header<B>(
 
 /// we expect that calling sui-nodes are known on the blockchain and we enforce
 /// their pub key tls creds here
-pub async fn expect_valid_public_key<B>(
+pub async fn expect_valid_public_key(
     Extension(allower): Extension<Arc<SuiNodeProvider>>,
     Extension(tls_connect_info): Extension<TlsConnectionInfo>,
-    mut request: Request<B>,
-    next: Next<B>,
+    mut request: Request<Body>,
+    next: Next,
 ) -> Result<Response, (StatusCode, &'static str)> {
     let Some(public_key) = tls_connect_info.public_key() else {
         error!("unable to obtain public key from connecting client");
@@ -99,16 +100,16 @@ pub async fn expect_valid_public_key<B>(
 pub struct LenDelimProtobuf(pub Vec<MetricFamily>);
 
 #[async_trait]
-impl<S, B> FromRequest<S, B> for LenDelimProtobuf
+impl<S> FromRequest<S> for LenDelimProtobuf
 where
     S: Send + Sync,
-    B: http_body::Body + Send + 'static,
-    B::Data: Send,
-    B::Error: Into<BoxError>,
 {
     type Rejection = (StatusCode, String);
 
-    async fn from_request(req: Request<B>, state: &S) -> Result<Self, Self::Rejection> {
+    async fn from_request(
+        req: Request<axum::body::Body>,
+        state: &S,
+    ) -> Result<Self, Self::Rejection> {
         let should_be_snappy = req
             .headers()
             .get(CONTENT_ENCODING)
diff --git a/crates/sui-replay/src/lib.rs b/crates/sui-replay/src/lib.rs
index 4d139661dd794..26a27cf828767 100644
--- a/crates/sui-replay/src/lib.rs
+++ b/crates/sui-replay/src/lib.rs
@@ -586,9 +586,8 @@ pub(crate) fn chain_from_chain_id(chain: &str) -> Chain {
 fn parse_configs_versions(
     configs_and_versions: Option<Vec<String>>,
 ) -> Option<Vec<(ObjectID, SequenceNumber)>> {
-    let Some(configs_and_versions) = configs_and_versions else {
-        return None;
-    };
+    let configs_and_versions = configs_and_versions?;
+
     assert!(configs_and_versions.len() % 2 == 0, "Invalid number of arguments for configs and version -- you must supply a version for each config");
     Some(
         configs_and_versions
diff --git a/crates/sui-replay/src/replay.rs b/crates/sui-replay/src/replay.rs
index 8ccbf693d98f6..b41e0eddf3b0e 100644
--- a/crates/sui-replay/src/replay.rs
+++ b/crates/sui-replay/src/replay.rs
@@ -635,6 +635,12 @@ impl LocalExec {
                 error!("Object {id} {version} {digest} was deleted on RPC server.");
                 Ok(None)
             }
+            // This is a child object which was not found in the store (e.g., due to exists
+            // check before creating the dynamic field).
+            Err(ReplayEngineError::ObjectVersionNotFound { id, version }) => {
+                info!("Object {id} {version} not found on RPC server -- this may have been pruned or never existed.");
+                Ok(None)
+            }
             Err(err) => Err(ReplayEngineError::SuiRpcError {
                 err: err.to_string(),
             }),
diff --git a/crates/sui-rest-api/Cargo.toml b/crates/sui-rest-api/Cargo.toml
index eb9e78ab71dfe..aa046b7c70b2a 100644
--- a/crates/sui-rest-api/Cargo.toml
+++ b/crates/sui-rest-api/Cargo.toml
@@ -12,12 +12,14 @@ axum = { workspace = true, features = ["matched-path"] }
 bcs.workspace = true
 rand.workspace = true
 reqwest.workspace = true
+url.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 serde_yaml.workspace = true
 serde_with.workspace = true
 tap.workspace = true
 thiserror.workspace = true
+tokio.workspace = true
 async-trait.workspace = true
 itertools.workspace = true
 sui-sdk2.workspace = true
@@ -30,7 +32,5 @@ sui-types.workspace = true
 mysten-network.workspace = true
 sui-protocol-config.workspace = true
 
-
 [dev-dependencies]
-tokio.workspace = true
 diffy = "0.3"
diff --git a/crates/sui-rest-api/openapi/openapi.json b/crates/sui-rest-api/openapi/openapi.json
index 2e4ff81d8f3b2..ced704ee4d2c5 100644
--- a/crates/sui-rest-api/openapi/openapi.json
+++ b/crates/sui-rest-api/openapi/openapi.json
@@ -368,6 +368,9 @@
           },
           "404": {
             "description": ""
+          },
+          "410": {
+            "description": ""
           }
         }
       }
@@ -2654,6 +2657,85 @@
                 ]
               }
             }
+          },
+          {
+            "description": "Certificate is cancelled due to congestion on shared objects",
+            "type": "object",
+            "required": [
+              "congested_objects",
+              "error"
+            ],
+            "properties": {
+              "congested_objects": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/ObjectId"
+                }
+              },
+              "error": {
+                "type": "string",
+                "enum": [
+                  "execution_cancelled_due_to_shared_object_congestion"
+                ]
+              }
+            }
+          },
+          {
+            "description": "Address is denied for this coin type",
+            "type": "object",
+            "required": [
+              "address",
+              "coin_type",
+              "error"
+            ],
+            "properties": {
+              "address": {
+                "$ref": "#/components/schemas/Address"
+              },
+              "coin_type": {
+                "type": "string"
+              },
+              "error": {
+                "type": "string",
+                "enum": [
+                  "address_denied_for_coin"
+                ]
+              }
+            }
+          },
+          {
+            "description": "Coin type is globally paused for use",
+            "type": "object",
+            "required": [
+              "coin_type",
+              "error"
+            ],
+            "properties": {
+              "coin_type": {
+                "type": "string"
+              },
+              "error": {
+                "type": "string",
+                "enum": [
+                  "coin_type_global_pause"
+                ]
+              }
+            }
+          },
+          {
+            "description": "Certificate is cancelled because randomness could not be generated this epoch",
+            "type": "object",
+            "required": [
+              "error"
+            ],
+            "properties": {
+              "error": {
+                "type": "string",
+                "enum": [
+                  "execution_cancelled_due_to_randomness_unavailable"
+                ]
+              }
+            }
           }
         ]
       },
@@ -5195,6 +5277,37 @@
                 "$ref": "#/components/schemas/SimpleSignature"
               }
             }
+          },
+          {
+            "type": "object",
+            "required": [
+              "authenticator_data",
+              "client_data_json",
+              "scheme",
+              "signature"
+            ],
+            "properties": {
+              "authenticator_data": {
+                "type": "array",
+                "items": {
+                  "type": "integer",
+                  "format": "uint8",
+                  "minimum": 0.0
+                }
+              },
+              "client_data_json": {
+                "type": "string"
+              },
+              "scheme": {
+                "type": "string",
+                "enum": [
+                  "passkey"
+                ]
+              },
+              "signature": {
+                "$ref": "#/components/schemas/SimpleSignature"
+              }
+            }
           }
         ]
       },
diff --git a/crates/sui-rest-api/src/accept.rs b/crates/sui-rest-api/src/accept.rs
index 0348388cc60ba..b4a0d954660cd 100644
--- a/crates/sui-rest-api/src/accept.rs
+++ b/crates/sui-rest-api/src/accept.rs
@@ -96,7 +96,7 @@ mod tests {
                 header::ACCEPT,
                 "text/html, text/yaml;q=0.5, application/xhtml+xml, application/xml;q=0.9, */*;q=0.1",
             )
-            .body(())
+            .body(axum::body::Body::empty())
             .unwrap();
         let accept = Accept::from_request(req, &()).await.unwrap();
         assert_eq!(
@@ -115,14 +115,14 @@ mod tests {
     async fn test_accept_format() {
         let req = Request::builder()
             .header(header::ACCEPT, "*/*, application/bcs")
-            .body(())
+            .body(axum::body::Body::empty())
             .unwrap();
         let accept = AcceptFormat::from_request(req, &()).await.unwrap();
         assert_eq!(accept, AcceptFormat::Bcs);
 
         let req = Request::builder()
             .header(header::ACCEPT, "*/*")
-            .body(())
+            .body(axum::body::Body::empty())
             .unwrap();
         let accept = AcceptFormat::from_request(req, &()).await.unwrap();
         assert_eq!(accept, AcceptFormat::Json);
diff --git a/crates/sui-rest-api/src/checkpoints.rs b/crates/sui-rest-api/src/checkpoints.rs
index ff11549529862..334e1b4cebbe0 100644
--- a/crates/sui-rest-api/src/checkpoints.rs
+++ b/crates/sui-rest-api/src/checkpoints.rs
@@ -46,6 +46,7 @@ impl ApiEndpoint<RestService> for GetCheckpointFull {
                     .build(),
             )
             .response(404, ResponseBuilder::new().build())
+            .response(410, ResponseBuilder::new().build())
             .build()
     }
 
@@ -58,9 +59,21 @@ async fn get_checkpoint_full(
     Path(checkpoint_id): Path<CheckpointId>,
     accept: AcceptFormat,
     State(state): State<StateReader>,
-) -> Result<ResponseContent<CheckpointData>> {
+) -> Result<ResponseContent<sui_types::full_checkpoint_content::CheckpointData>> {
     let verified_summary = match checkpoint_id {
-        CheckpointId::SequenceNumber(s) => state.inner().get_checkpoint_by_sequence_number(s),
+        CheckpointId::SequenceNumber(s) => {
+            // Since we need object contents we need to check for the lowest available checkpoint
+            // with objects that hasn't been pruned
+            let oldest_checkpoint = state.inner().get_lowest_available_checkpoint_objects()?;
+            if s < oldest_checkpoint {
+                return Err(crate::RestError::new(
+                    axum::http::StatusCode::GONE,
+                    "Old checkpoints have been pruned",
+                ));
+            }
+
+            state.inner().get_checkpoint_by_sequence_number(s)
+        }
         CheckpointId::Digest(d) => state.inner().get_checkpoint_by_digest(&d.into()),
     }?
     .ok_or(CheckpointNotFoundError(checkpoint_id))?;
@@ -72,8 +85,7 @@ async fn get_checkpoint_full(
 
     let checkpoint_data = state
         .inner()
-        .get_checkpoint_data(verified_summary, checkpoint_contents)?
-        .into();
+        .get_checkpoint_data(verified_summary, checkpoint_contents)?;
 
     match accept {
         AcceptFormat::Json => ResponseContent::Json(checkpoint_data),
@@ -109,6 +121,7 @@ impl ApiEndpoint<RestService> for GetCheckpoint {
                     .build(),
             )
             .response(404, ResponseBuilder::new().build())
+            .response(410, ResponseBuilder::new().build())
             .build()
     }
 
@@ -123,7 +136,17 @@ async fn get_checkpoint(
     State(state): State<StateReader>,
 ) -> Result<ResponseContent<SignedCheckpointSummary>> {
     let summary = match checkpoint_id {
-        CheckpointId::SequenceNumber(s) => state.inner().get_checkpoint_by_sequence_number(s),
+        CheckpointId::SequenceNumber(s) => {
+            let oldest_checkpoint = state.inner().get_lowest_available_checkpoint()?;
+            if s < oldest_checkpoint {
+                return Err(crate::RestError::new(
+                    axum::http::StatusCode::GONE,
+                    "Old checkpoints have been pruned",
+                ));
+            }
+
+            state.inner().get_checkpoint_by_sequence_number(s)
+        }
         CheckpointId::Digest(d) => state.inner().get_checkpoint_by_digest(&d.into()),
     }?
     .ok_or(CheckpointNotFoundError(checkpoint_id))?
diff --git a/crates/sui-rest-api/src/client.rs b/crates/sui-rest-api/src/client/mod.rs
similarity index 55%
rename from crates/sui-rest-api/src/client.rs
rename to crates/sui-rest-api/src/client/mod.rs
index 15aa09dfcfc52..915563b0798bc 100644
--- a/crates/sui-rest-api/src/client.rs
+++ b/crates/sui-rest-api/src/client/mod.rs
@@ -1,9 +1,12 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::checkpoints::ListCheckpointsQueryParameters;
+pub mod sdk;
+use sdk::Result;
+
+pub use reqwest;
+
 use crate::transactions::ExecuteTransactionQueryParameters;
-use anyhow::{anyhow, Result};
 use sui_types::base_types::{ObjectID, SequenceNumber, SuiAddress};
 use sui_types::crypto::AuthorityStrongQuorumSignInfo;
 use sui_types::effects::{TransactionEffects, TransactionEvents};
@@ -13,89 +16,65 @@ use sui_types::object::Object;
 use sui_types::transaction::Transaction;
 use sui_types::TypeTag;
 
+use self::sdk::Response;
+
 #[derive(Clone)]
 pub struct Client {
-    inner: reqwest::Client,
-    base_url: String,
+    inner: sdk::Client,
 }
 
 impl Client {
-    pub fn new<S: Into<String>>(base_url: S) -> Self {
+    pub fn new<S: AsRef<str>>(base_url: S) -> Self {
         Self {
-            inner: reqwest::Client::new(),
-            base_url: base_url.into(),
+            inner: sdk::Client::new(base_url.as_ref()).unwrap(),
         }
     }
 
     pub async fn get_latest_checkpoint(&self) -> Result<CertifiedCheckpointSummary> {
-        let url = format!("{}/checkpoints", self.base_url);
-
-        let query = ListCheckpointsQueryParameters {
-            limit: Some(1),
-            start: None,
-            direction: None,
-        };
-
-        let response = self
-            .inner
-            .get(url)
-            .query(&query)
-            .header(reqwest::header::ACCEPT, crate::APPLICATION_BCS)
-            .send()
-            .await?;
-
-        let mut page: Vec<CertifiedCheckpointSummary> = self.bcs(response).await?;
-
-        page.pop()
-            .ok_or_else(|| anyhow!("server returned empty checkpoint list"))
+        self.inner
+            .get_latest_checkpoint()
+            .await
+            .map(Response::into_inner)
+            .map(Into::into)
     }
 
     pub async fn get_full_checkpoint(
         &self,
         checkpoint_sequence_number: CheckpointSequenceNumber,
     ) -> Result<CheckpointData> {
-        let url = format!(
-            "{}/checkpoints/{checkpoint_sequence_number}/full",
-            self.base_url
-        );
+        let url = self
+            .inner
+            .url()
+            .join(&format!("checkpoints/{checkpoint_sequence_number}/full"))?;
 
         let response = self
             .inner
+            .client()
             .get(url)
             .header(reqwest::header::ACCEPT, crate::APPLICATION_BCS)
             .send()
             .await?;
 
-        self.bcs(response).await
+        self.inner.bcs(response).await.map(Response::into_inner)
     }
 
     pub async fn get_checkpoint_summary(
         &self,
         checkpoint_sequence_number: CheckpointSequenceNumber,
     ) -> Result<CertifiedCheckpointSummary> {
-        let url = format!("{}/checkpoints/{checkpoint_sequence_number}", self.base_url);
-
-        let response = self
-            .inner
-            .get(url)
-            .header(reqwest::header::ACCEPT, crate::APPLICATION_BCS)
-            .send()
-            .await?;
-
-        self.bcs(response).await
+        self.inner
+            .get_checkpoint(checkpoint_sequence_number)
+            .await
+            .map(Response::into_inner)
+            .map(Into::into)
     }
 
     pub async fn get_object(&self, object_id: ObjectID) -> Result<Object> {
-        let url = format!("{}/objects/{object_id}", self.base_url);
-
-        let response = self
-            .inner
-            .get(url)
-            .header(reqwest::header::ACCEPT, crate::APPLICATION_BCS)
-            .send()
-            .await?;
-
-        self.bcs(response).await
+        self.inner
+            .get_object(object_id.into())
+            .await
+            .map(Response::into_inner)
+            .map(Into::into)
     }
 
     pub async fn get_object_with_version(
@@ -103,16 +82,11 @@ impl Client {
         object_id: ObjectID,
         version: SequenceNumber,
     ) -> Result<Object> {
-        let url = format!("{}/objects/{object_id}/version/{version}", self.base_url);
-
-        let response = self
-            .inner
-            .get(url)
-            .header(reqwest::header::ACCEPT, crate::APPLICATION_BCS)
-            .send()
-            .await?;
-
-        self.bcs(response).await
+        self.inner
+            .get_object_with_version(object_id.into(), version.into())
+            .await
+            .map(Response::into_inner)
+            .map(Into::into)
     }
 
     pub async fn execute_transaction(
@@ -126,7 +100,7 @@ impl Client {
             signatures: &'a [sui_types::signature::GenericSignature],
         }
 
-        let url = format!("{}/transactions", self.base_url);
+        let url = self.inner.url().join("transactions")?;
         let body = bcs::to_bytes(&SignedTransaction {
             transaction: &transaction.inner().intent_message.value,
             signatures: &transaction.inner().tx_signatures,
@@ -134,6 +108,7 @@ impl Client {
 
         let response = self
             .inner
+            .client()
             .post(url)
             .query(parameters)
             .header(reqwest::header::ACCEPT, crate::APPLICATION_BCS)
@@ -142,32 +117,7 @@ impl Client {
             .send()
             .await?;
 
-        self.bcs(response).await
-    }
-
-    fn check_response(&self, response: reqwest::Response) -> Result<reqwest::Response> {
-        if !response.status().is_success() {
-            let status = response.status();
-            return Err(anyhow::anyhow!("request failed with status {status}"));
-        }
-
-        Ok(response)
-    }
-
-    #[allow(unused)]
-    async fn json<T: serde::de::DeserializeOwned>(&self, response: reqwest::Response) -> Result<T> {
-        let response = self.check_response(response)?;
-
-        let json = response.json().await?;
-        Ok(json)
-    }
-
-    async fn bcs<T: serde::de::DeserializeOwned>(&self, response: reqwest::Response) -> Result<T> {
-        let response = self.check_response(response)?;
-
-        let bytes = response.bytes().await?;
-        let bcs = bcs::from_bytes(&bytes)?;
-        Ok(bcs)
+        self.inner.bcs(response).await.map(Response::into_inner)
     }
 }
 
diff --git a/crates/sui-rest-api/src/client/sdk.rs b/crates/sui-rest-api/src/client/sdk.rs
new file mode 100644
index 0000000000000..892c0d2c4835e
--- /dev/null
+++ b/crates/sui-rest-api/src/client/sdk.rs
@@ -0,0 +1,668 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use reqwest::header::HeaderValue;
+use reqwest::StatusCode;
+use reqwest::Url;
+use sui_sdk2::types::Address;
+use sui_sdk2::types::CheckpointData;
+use sui_sdk2::types::CheckpointDigest;
+use sui_sdk2::types::CheckpointSequenceNumber;
+use sui_sdk2::types::EpochId;
+use sui_sdk2::types::Object;
+use sui_sdk2::types::ObjectId;
+use sui_sdk2::types::SignedCheckpointSummary;
+use sui_sdk2::types::SignedTransaction;
+use sui_sdk2::types::StructTag;
+use sui_sdk2::types::TransactionDigest;
+use sui_sdk2::types::ValidatorCommittee;
+use sui_sdk2::types::Version;
+use tap::Pipe;
+
+use crate::accounts::AccountOwnedObjectInfo;
+use crate::accounts::ListAccountOwnedObjectsQueryParameters;
+use crate::checkpoints::ListCheckpointsQueryParameters;
+use crate::coins::CoinInfo;
+use crate::health::Threshold;
+use crate::info::NodeInfo;
+use crate::objects::DynamicFieldInfo;
+use crate::objects::ListDynamicFieldsQueryParameters;
+use crate::system::GasInfo;
+use crate::system::ProtocolConfigResponse;
+use crate::system::SystemStateSummary;
+use crate::system::X_SUI_MAX_SUPPORTED_PROTOCOL_VERSION;
+use crate::system::X_SUI_MIN_SUPPORTED_PROTOCOL_VERSION;
+use crate::transactions::ListTransactionsQueryParameters;
+use crate::transactions::TransactionExecutionResponse;
+use crate::transactions::TransactionResponse;
+use crate::types::X_SUI_CHAIN;
+use crate::types::X_SUI_CHAIN_ID;
+use crate::types::X_SUI_CHECKPOINT_HEIGHT;
+use crate::types::X_SUI_CURSOR;
+use crate::types::X_SUI_EPOCH;
+use crate::types::X_SUI_LOWEST_AVAILABLE_CHECKPOINT;
+use crate::types::X_SUI_LOWEST_AVAILABLE_CHECKPOINT_OBJECTS;
+use crate::types::X_SUI_TIMESTAMP_MS;
+use crate::ExecuteTransactionQueryParameters;
+
+static USER_AGENT: &str = concat!(env!("CARGO_PKG_NAME"), "/", env!("CARGO_PKG_VERSION"),);
+
+#[derive(Clone, Debug)]
+pub struct Client {
+    inner: reqwest::Client,
+    url: Box<reqwest::Url>, // Boxed to save space
+}
+
+impl Client {
+    pub fn new(url: &str) -> Result<Self> {
+        let mut url = Url::parse(url).map_err(Error::from_error)?;
+
+        if url.cannot_be_a_base() {
+            return Err(Error::new_message(format!(
+                "provided url '{url}' cannot be used as a base"
+            )));
+        }
+
+        url.set_path("/v2/");
+
+        let inner = reqwest::ClientBuilder::new()
+            .user_agent(USER_AGENT)
+            .http2_prior_knowledge()
+            .build()?;
+
+        Self {
+            inner,
+            url: Box::new(url),
+        }
+        .pipe(Ok)
+    }
+
+    pub(super) fn client(&self) -> &reqwest::Client {
+        &self.inner
+    }
+
+    pub fn url(&self) -> &Url {
+        &self.url
+    }
+
+    pub async fn node_info(&self) -> Result<Response<NodeInfo>> {
+        let url = self.url().join("")?;
+
+        let response = self
+            .inner
+            .get(url)
+            .header(reqwest::header::ACCEPT, crate::APPLICATION_JSON)
+            .send()
+            .await?;
+
+        self.json(response).await
+    }
+
+    pub async fn health_check(&self, threshold_seconds: Option<u32>) -> Result<Response<()>> {
+        let url = self.url().join("health")?;
+        let query = Threshold { threshold_seconds };
+
+        let response = self.inner.get(url).query(&query).send().await?;
+
+        self.empty(response).await
+    }
+
+    pub async fn get_coin_info(&self, coin_type: &StructTag) -> Result<Response<CoinInfo>> {
+        let url = self.url().join(&format!("coins/{coin_type}"))?;
+
+        let response = self
+            .inner
+            .get(url)
+            .header(reqwest::header::ACCEPT, crate::APPLICATION_JSON)
+            .send()
+            .await?;
+
+        self.json(response).await
+    }
+
+    pub async fn list_account_objects(
+        &self,
+        account: Address,
+        parameters: &ListAccountOwnedObjectsQueryParameters,
+    ) -> Result<Response<Vec<AccountOwnedObjectInfo>>> {
+        let url = self.url().join(&format!("account/{account}/objects"))?;
+
+        let response = self
+            .inner
+            .get(url)
+            .query(parameters)
+            .header(reqwest::header::ACCEPT, crate::APPLICATION_JSON)
+            .send()
+            .await?;
+
+        self.json(response).await
+    }
+
+    pub async fn get_object(&self, object_id: ObjectId) -> Result<Response<Object>> {
+        let url = self.url().join(&format!("objects/{object_id}"))?;
+
+        let response = self
+            .inner
+            .get(url)
+            .header(reqwest::header::ACCEPT, crate::APPLICATION_BCS)
+            .send()
+            .await?;
+
+        self.bcs(response).await
+    }
+
+    pub async fn get_object_with_version(
+        &self,
+        object_id: ObjectId,
+        version: Version,
+    ) -> Result<Response<Object>> {
+        let url = self
+            .url()
+            .join(&format!("objects/{object_id}/version/{version}"))?;
+
+        let response = self
+            .inner
+            .get(url)
+            .header(reqwest::header::ACCEPT, crate::APPLICATION_BCS)
+            .send()
+            .await?;
+
+        self.bcs(response).await
+    }
+
+    pub async fn list_dynamic_fields(
+        &self,
+        object_id: ObjectId,
+        parameters: &ListDynamicFieldsQueryParameters,
+    ) -> Result<Response<Vec<DynamicFieldInfo>>> {
+        let url = self.url().join(&format!("objects/{object_id}"))?;
+
+        let response = self
+            .inner
+            .get(url)
+            .query(parameters)
+            .header(reqwest::header::ACCEPT, crate::APPLICATION_JSON)
+            .send()
+            .await?;
+
+        self.json(response).await
+    }
+
+    pub async fn get_gas_info(&self) -> Result<Response<GasInfo>> {
+        let url = self.url().join("system/gas")?;
+
+        let response = self
+            .inner
+            .get(url)
+            .header(reqwest::header::ACCEPT, crate::APPLICATION_JSON)
+            .send()
+            .await?;
+
+        self.json(response).await
+    }
+
+    pub async fn get_reference_gas_price(&self) -> Result<u64> {
+        self.get_gas_info()
+            .await
+            .map(Response::into_inner)
+            .map(|info| info.reference_gas_price)
+    }
+
+    pub async fn get_current_protocol_config(&self) -> Result<Response<ProtocolConfigResponse>> {
+        let url = self.url().join("system/protocol")?;
+
+        let response = self
+            .inner
+            .get(url)
+            .header(reqwest::header::ACCEPT, crate::APPLICATION_JSON)
+            .send()
+            .await?;
+
+        self.json(response).await
+    }
+
+    pub async fn get_protocol_config(
+        &self,
+        version: u64,
+    ) -> Result<Response<ProtocolConfigResponse>> {
+        let url = self.url().join(&format!("system/protocol/{version}"))?;
+
+        let response = self
+            .inner
+            .get(url)
+            .header(reqwest::header::ACCEPT, crate::APPLICATION_JSON)
+            .send()
+            .await?;
+
+        self.json(response).await
+    }
+
+    pub async fn get_system_state_summary(&self) -> Result<Response<SystemStateSummary>> {
+        let url = self.url().join("system")?;
+
+        let response = self
+            .inner
+            .get(url)
+            .header(reqwest::header::ACCEPT, crate::APPLICATION_JSON)
+            .send()
+            .await?;
+
+        self.json(response).await
+    }
+
+    pub async fn get_current_committee(&self) -> Result<Response<ValidatorCommittee>> {
+        let url = self.url().join("system/committee")?;
+
+        let response = self
+            .inner
+            .get(url)
+            .header(reqwest::header::ACCEPT, crate::APPLICATION_BCS)
+            .send()
+            .await?;
+
+        self.bcs(response).await
+    }
+
+    pub async fn get_committee(&self, epoch: EpochId) -> Result<Response<ValidatorCommittee>> {
+        let url = self.url().join(&format!("system/committee/{epoch}"))?;
+
+        let response = self
+            .inner
+            .get(url)
+            .header(reqwest::header::ACCEPT, crate::APPLICATION_BCS)
+            .send()
+            .await?;
+
+        self.bcs(response).await
+    }
+
+    pub async fn get_checkpoint(
+        &self,
+        checkpoint_sequence_number: CheckpointSequenceNumber,
+    ) -> Result<Response<SignedCheckpointSummary>> {
+        let url = self
+            .url()
+            .join(&format!("checkpoints/{checkpoint_sequence_number}"))?;
+
+        let response = self
+            .inner
+            .get(url)
+            .header(reqwest::header::ACCEPT, crate::APPLICATION_BCS)
+            .send()
+            .await?;
+
+        self.bcs(response).await
+    }
+
+    pub async fn get_latest_checkpoint(&self) -> Result<Response<SignedCheckpointSummary>> {
+        let parameters = ListCheckpointsQueryParameters {
+            limit: Some(1),
+            start: None,
+            direction: None,
+        };
+
+        let (mut page, parts) = self.list_checkpoints(&parameters).await?.into_parts();
+
+        let checkpoint = page
+            .pop()
+            .ok_or_else(|| Error::new_message("server returned empty checkpoint list"))?;
+
+        Ok(Response::new(checkpoint, parts))
+    }
+
+    pub async fn list_checkpoints(
+        &self,
+        parameters: &ListCheckpointsQueryParameters,
+    ) -> Result<Response<Vec<SignedCheckpointSummary>>> {
+        let url = self.url().join("checkpoints")?;
+
+        let response = self
+            .inner
+            .get(url)
+            .query(parameters)
+            .header(reqwest::header::ACCEPT, crate::APPLICATION_BCS)
+            .send()
+            .await?;
+
+        self.bcs(response).await
+    }
+
+    pub async fn get_full_checkpoint(
+        &self,
+        checkpoint_sequence_number: CheckpointSequenceNumber,
+    ) -> Result<Response<CheckpointData>> {
+        let url = self
+            .url()
+            .join(&format!("checkpoints/{checkpoint_sequence_number}/full"))?;
+
+        let response = self
+            .inner
+            .get(url)
+            .header(reqwest::header::ACCEPT, crate::APPLICATION_BCS)
+            .send()
+            .await?;
+
+        self.bcs(response).await
+    }
+
+    pub async fn get_transaction(
+        &self,
+        transaction: &TransactionDigest,
+    ) -> Result<Response<TransactionResponse>> {
+        let url = self.url().join(&format!("transactions/{transaction}"))?;
+
+        let response = self
+            .inner
+            .get(url)
+            .header(reqwest::header::ACCEPT, crate::APPLICATION_BCS)
+            .send()
+            .await?;
+
+        self.bcs(response).await
+    }
+
+    pub async fn list_transactions(
+        &self,
+        parameters: &ListTransactionsQueryParameters,
+    ) -> Result<Response<Vec<TransactionResponse>>> {
+        let url = self.url().join("transactions")?;
+
+        let response = self
+            .inner
+            .get(url)
+            .query(parameters)
+            .header(reqwest::header::ACCEPT, crate::APPLICATION_BCS)
+            .send()
+            .await?;
+
+        self.bcs(response).await
+    }
+
+    pub async fn execute_transaction(
+        &self,
+        parameters: &ExecuteTransactionQueryParameters,
+        transaction: &SignedTransaction,
+    ) -> Result<Response<TransactionExecutionResponse>> {
+        let url = self.url().join("transactions")?;
+
+        let body = bcs::to_bytes(transaction)?;
+
+        let response = self
+            .inner
+            .post(url)
+            .query(parameters)
+            .header(reqwest::header::ACCEPT, crate::APPLICATION_BCS)
+            .header(reqwest::header::CONTENT_TYPE, crate::APPLICATION_BCS)
+            .body(body)
+            .send()
+            .await?;
+
+        self.bcs(response).await
+    }
+
+    async fn check_response(
+        &self,
+        response: reqwest::Response,
+    ) -> Result<(reqwest::Response, ResponseParts)> {
+        let parts = ResponseParts::from_reqwest_response(&response);
+
+        if !response.status().is_success() {
+            let error = match response.text().await {
+                Ok(body) => Error::new_message(body),
+                Err(e) => Error::from_error(e),
+            }
+            .pipe(|e| e.with_parts(parts));
+
+            return Err(error);
+        }
+
+        Ok((response, parts))
+    }
+
+    async fn empty(&self, response: reqwest::Response) -> Result<Response<()>> {
+        let (_response, parts) = self.check_response(response).await?;
+        Ok(Response::new((), parts))
+    }
+
+    async fn json<T: serde::de::DeserializeOwned>(
+        &self,
+        response: reqwest::Response,
+    ) -> Result<Response<T>> {
+        let (response, parts) = self.check_response(response).await?;
+
+        let json = response.json().await?;
+        Ok(Response::new(json, parts))
+    }
+
+    pub(super) async fn bcs<T: serde::de::DeserializeOwned>(
+        &self,
+        response: reqwest::Response,
+    ) -> Result<Response<T>> {
+        let (response, parts) = self.check_response(response).await?;
+
+        let bytes = response.bytes().await?;
+        match bcs::from_bytes(&bytes) {
+            Ok(bcs) => Ok(Response::new(bcs, parts)),
+            Err(e) => Err(Error::from_error(e).with_parts(parts)),
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct ResponseParts {
+    pub status: StatusCode,
+    pub chain_id: Option<CheckpointDigest>,
+    pub chain: Option<String>,
+    pub epoch: Option<EpochId>,
+    pub checkpoint_height: Option<CheckpointSequenceNumber>,
+    pub timestamp_ms: Option<u64>,
+    pub lowest_available_checkpoint: Option<CheckpointSequenceNumber>,
+    pub lowest_available_checkpoint_objects: Option<CheckpointSequenceNumber>,
+    pub cursor: Option<String>,
+    pub min_supported_protocol_version: Option<u64>,
+    pub max_supported_protocol_version: Option<u64>,
+}
+
+impl ResponseParts {
+    fn from_reqwest_response(response: &reqwest::Response) -> Self {
+        let headers = response.headers();
+        let status = response.status();
+        let chain_id = headers
+            .get(X_SUI_CHAIN_ID)
+            .map(HeaderValue::as_bytes)
+            .and_then(|s| CheckpointDigest::from_base58(s).ok());
+        let chain = headers
+            .get(X_SUI_CHAIN)
+            .and_then(|h| h.to_str().ok())
+            .map(ToOwned::to_owned);
+        let epoch = headers
+            .get(X_SUI_EPOCH)
+            .and_then(|h| h.to_str().ok())
+            .and_then(|s| s.parse().ok());
+        let checkpoint_height = headers
+            .get(X_SUI_CHECKPOINT_HEIGHT)
+            .and_then(|h| h.to_str().ok())
+            .and_then(|s| s.parse().ok());
+        let timestamp_ms = headers
+            .get(X_SUI_TIMESTAMP_MS)
+            .and_then(|h| h.to_str().ok())
+            .and_then(|s| s.parse().ok());
+        let lowest_available_checkpoint = headers
+            .get(X_SUI_LOWEST_AVAILABLE_CHECKPOINT)
+            .and_then(|h| h.to_str().ok())
+            .and_then(|s| s.parse().ok());
+        let lowest_available_checkpoint_objects = headers
+            .get(X_SUI_LOWEST_AVAILABLE_CHECKPOINT_OBJECTS)
+            .and_then(|h| h.to_str().ok())
+            .and_then(|s| s.parse().ok());
+        let cursor = headers
+            .get(X_SUI_CURSOR)
+            .and_then(|h| h.to_str().ok())
+            .map(ToOwned::to_owned);
+        let min_supported_protocol_version = headers
+            .get(X_SUI_MIN_SUPPORTED_PROTOCOL_VERSION)
+            .and_then(|h| h.to_str().ok())
+            .and_then(|s| s.parse().ok());
+        let max_supported_protocol_version = headers
+            .get(X_SUI_MAX_SUPPORTED_PROTOCOL_VERSION)
+            .and_then(|h| h.to_str().ok())
+            .and_then(|s| s.parse().ok());
+
+        Self {
+            status,
+            chain_id,
+            chain,
+            epoch,
+            checkpoint_height,
+            timestamp_ms,
+            lowest_available_checkpoint,
+            lowest_available_checkpoint_objects,
+            cursor,
+            min_supported_protocol_version,
+            max_supported_protocol_version,
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct Response<T> {
+    inner: T,
+
+    parts: ResponseParts,
+}
+
+impl<T> Response<T> {
+    pub fn new(inner: T, parts: ResponseParts) -> Self {
+        Self { inner, parts }
+    }
+
+    pub fn inner(&self) -> &T {
+        &self.inner
+    }
+
+    pub fn into_inner(self) -> T {
+        self.inner
+    }
+
+    pub fn parts(&self) -> &ResponseParts {
+        &self.parts
+    }
+
+    pub fn into_parts(self) -> (T, ResponseParts) {
+        (self.inner, self.parts)
+    }
+
+    pub fn map<U, F>(self, f: F) -> Response<U>
+    where
+        F: FnOnce(T) -> U,
+    {
+        let (inner, state) = self.into_parts();
+        Response::new(f(inner), state)
+    }
+}
+
+pub type Result<T, E = Error> = std::result::Result<T, E>;
+
+type BoxError = Box<dyn std::error::Error + Send + Sync + 'static>;
+
+#[derive(Debug)]
+pub struct Error {
+    inner: Box<InnerError>,
+}
+
+#[derive(Debug)]
+struct InnerError {
+    parts: Option<ResponseParts>,
+    message: Option<String>,
+    source: Option<BoxError>,
+}
+
+impl Error {
+    fn empty() -> Self {
+        Self {
+            inner: Box::new(InnerError {
+                parts: None,
+                message: None,
+                source: None,
+            }),
+        }
+    }
+
+    fn from_error<E: Into<BoxError>>(error: E) -> Self {
+        Self::empty().with_error(error.into())
+    }
+
+    fn new_message<M: Into<String>>(message: M) -> Self {
+        Self::empty().with_message(message.into())
+    }
+
+    fn with_parts(mut self, parts: ResponseParts) -> Self {
+        self.inner.parts.replace(parts);
+        self
+    }
+
+    fn with_message(mut self, message: String) -> Self {
+        self.inner.message.replace(message);
+        self
+    }
+
+    fn with_error(mut self, error: BoxError) -> Self {
+        self.inner.source.replace(error);
+        self
+    }
+
+    pub fn status(&self) -> Option<StatusCode> {
+        self.parts().map(|parts| parts.status)
+    }
+
+    pub fn parts(&self) -> Option<&ResponseParts> {
+        self.inner.parts.as_ref()
+    }
+
+    pub fn message(&self) -> Option<&str> {
+        self.inner.message.as_deref()
+    }
+}
+
+impl std::fmt::Display for Error {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "Rest Client Error:")?;
+        if let Some(status) = self.status() {
+            write!(f, " {status}")?;
+        }
+
+        if let Some(message) = self.message() {
+            write!(f, " '{message}'")?;
+        }
+
+        if let Some(source) = &self.inner.source {
+            write!(f, " '{source}'")?;
+        }
+
+        Ok(())
+    }
+}
+
+impl std::error::Error for Error {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        self.inner.source.as_deref().map(|e| e as _)
+    }
+}
+
+impl From<reqwest::Error> for Error {
+    fn from(error: reqwest::Error) -> Self {
+        Self::from_error(error)
+    }
+}
+
+impl From<bcs::Error> for Error {
+    fn from(error: bcs::Error) -> Self {
+        Self::from_error(error)
+    }
+}
+
+impl From<url::ParseError> for Error {
+    fn from(error: url::ParseError) -> Self {
+        Self::from_error(error)
+    }
+}
diff --git a/crates/sui-rest-api/src/lib.rs b/crates/sui-rest-api/src/lib.rs
index f0926fe79e6cc..18993abb1b23e 100644
--- a/crates/sui-rest-api/src/lib.rs
+++ b/crates/sui-rest-api/src/lib.rs
@@ -1,12 +1,13 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use axum::Router;
+use axum::{response::Redirect, routing::get, Router};
 use mysten_network::callback::CallbackLayer;
 use openapi::ApiEndpoint;
 use reader::StateReader;
 use std::sync::Arc;
 use sui_types::storage::RestStateReader;
+use sui_types::transaction_executor::TransactionExecutor;
 use tap::Pipe;
 
 pub mod accept;
@@ -32,7 +33,7 @@ pub use client::Client;
 pub use error::{RestError, Result};
 pub use metrics::RestMetrics;
 pub use sui_types::full_checkpoint_content::{CheckpointData, CheckpointTransaction};
-pub use transactions::{ExecuteTransactionQueryParameters, TransactionExecutor};
+pub use transactions::ExecuteTransactionQueryParameters;
 
 pub const TEXT_PLAIN_UTF_8: &str = "text/plain; charset=utf-8";
 pub const APPLICATION_BCS: &str = "application/bcs";
@@ -45,6 +46,7 @@ pub enum Direction {
     Descending,
 }
 
+#[derive(Debug)]
 pub struct Page<T, C> {
     pub entries: response::ResponseContent<Vec<T>>,
     pub cursor: Option<C>,
@@ -145,8 +147,14 @@ impl RestService {
 
         api.register_endpoints(ENDPOINTS.to_owned());
 
-        api.to_router()
-            .with_state(self.clone())
+        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/") }))
             .layer(axum::middleware::map_response_with_state(
                 self,
                 response::append_info_headers,
@@ -162,17 +170,9 @@ impl RestService {
             })
     }
 
-    pub async fn start_service(self, socket_address: std::net::SocketAddr, base: Option<String>) {
-        let mut app = self.into_router();
-
-        if let Some(base) = base {
-            app = Router::new().nest(&base, app);
-        }
-
-        axum::Server::bind(&socket_address)
-            .serve(app.into_make_service())
-            .await
-            .unwrap();
+    pub async fn start_service(self, socket_address: std::net::SocketAddr) {
+        let listener = tokio::net::TcpListener::bind(socket_address).await.unwrap();
+        axum::serve(listener, self.into_router()).await.unwrap();
     }
 }
 
@@ -198,6 +198,10 @@ 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::schema::InstanceType;
     use schemars::schema::Metadata;
@@ -285,9 +289,9 @@ mod test {
 
         let router = openapi::OpenApiDocument::new(openapi).into_router();
 
-        axum::Server::bind(&"127.0.0.1:8000".parse().unwrap())
-            .serve(router.into_make_service())
+        let listener = tokio::net::TcpListener::bind("127.0.0.1:8000")
             .await
             .unwrap();
+        axum::serve(listener, router).await.unwrap();
     }
 }
diff --git a/crates/sui-rest-api/src/reader.rs b/crates/sui-rest-api/src/reader.rs
index dd07ba57ae88f..30b2f8c2271b7 100644
--- a/crates/sui-rest-api/src/reader.rs
+++ b/crates/sui-rest-api/src/reader.rs
@@ -260,6 +260,7 @@ impl Iterator for CheckpointTransactionsIter {
 pub struct CursorInfo {
     pub checkpoint: CheckpointSequenceNumber,
     pub timestamp_ms: u64,
+    #[allow(unused)]
     pub index: u64,
 
     // None if there are no more transactions in the store
diff --git a/crates/sui-rest-api/src/response.rs b/crates/sui-rest-api/src/response.rs
index deb57c8dd5dcf..cc30c9935cd1c 100644
--- a/crates/sui-rest-api/src/response.rs
+++ b/crates/sui-rest-api/src/response.rs
@@ -19,6 +19,7 @@ use crate::{
 
 pub struct Bcs<T>(pub T);
 
+#[derive(Debug)]
 pub enum ResponseContent<T, J = T> {
     Bcs(T),
     Json(J),
@@ -52,17 +53,17 @@ where
 }
 
 #[axum::async_trait]
-impl<T, S, B> axum::extract::FromRequest<S, B> for Bcs<T>
+impl<T, S> axum::extract::FromRequest<S> for Bcs<T>
 where
     T: serde::de::DeserializeOwned,
     S: Send + Sync,
-    B: axum::body::HttpBody + Send + 'static,
-    B::Data: Send,
-    B::Error: Into<axum::BoxError>,
 {
     type Rejection = BcsRejection;
 
-    async fn from_request(req: axum::http::Request<B>, state: &S) -> Result<Self, Self::Rejection> {
+    async fn from_request(
+        req: axum::http::Request<axum::body::Body>,
+        state: &S,
+    ) -> Result<Self, Self::Rejection> {
         if bcs_content_type(req.headers()) {
             let bytes = axum::body::Bytes::from_request(req, state)
                 .await
@@ -101,9 +102,9 @@ impl axum::response::IntoResponse for BcsRejection {
                 "Expected request with `Content-Type: application/bcs`",
             )
                 .into_response(),
-            BcsRejection::DeserializationError(_) => (
+            BcsRejection::DeserializationError(e) => (
                 StatusCode::UNPROCESSABLE_ENTITY,
-                "Failed to deserialize the BCS body into the target type",
+                format!("Failed to deserialize the BCS body into the target type: {e}"),
             )
                 .into_response(),
             BcsRejection::BytesRejection(bytes_rejection) => bytes_rejection.into_response(),
diff --git a/crates/sui-rest-api/src/system.rs b/crates/sui-rest-api/src/system.rs
index e358a895350e8..2a4fd9994b2bc 100644
--- a/crates/sui-rest-api/src/system.rs
+++ b/crates/sui-rest-api/src/system.rs
@@ -779,5 +779,5 @@ async fn get_gas_info(
 pub struct GasInfo {
     #[serde(with = "serde_with::As::<serde_with::DisplayFromStr>")]
     #[schemars(with = "crate::_schemars::U64")]
-    reference_gas_price: u64,
+    pub reference_gas_price: u64,
 }
diff --git a/crates/sui-rest-api/src/transactions/execution.rs b/crates/sui-rest-api/src/transactions/execution.rs
index c075ad6a3de99..9611b82c4bf15 100644
--- a/crates/sui-rest-api/src/transactions/execution.rs
+++ b/crates/sui-rest-api/src/transactions/execution.rs
@@ -11,6 +11,7 @@ use sui_sdk2::types::{
     Address, BalanceChange, CheckpointSequenceNumber, Object, Owner, SignedTransaction,
     TransactionEffects, TransactionEvents, ValidatorAggregatedSignature,
 };
+use sui_types::transaction_executor::TransactionExecutor;
 use tap::Pipe;
 
 use crate::openapi::{
@@ -20,22 +21,6 @@ use crate::response::Bcs;
 use crate::{accept::AcceptFormat, response::ResponseContent};
 use crate::{RestService, Result};
 
-/// Trait to define the interface for how the REST service interacts with a a QuorumDriver or a
-/// simulated transaction executor.
-#[async_trait::async_trait]
-pub trait TransactionExecutor: Send + Sync {
-    async fn execute_transaction(
-        &self,
-        request: sui_types::quorum_driver_types::ExecuteTransactionRequestV3,
-        client_addr: Option<std::net::SocketAddr>,
-    ) -> Result<
-        sui_types::quorum_driver_types::ExecuteTransactionResponseV3,
-        sui_types::quorum_driver_types::QuorumDriverError,
-    >;
-
-    //TODO include Simulate functionality
-}
-
 pub struct ExecuteTransaction;
 
 impl ApiEndpoint<RestService> for ExecuteTransaction {
diff --git a/crates/sui-rest-api/src/transactions/mod.rs b/crates/sui-rest-api/src/transactions/mod.rs
index 5eab49a8897d6..6e9ffed21492d 100644
--- a/crates/sui-rest-api/src/transactions/mod.rs
+++ b/crates/sui-rest-api/src/transactions/mod.rs
@@ -2,9 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 mod execution;
+pub use execution::EffectsFinality;
 pub use execution::ExecuteTransaction;
 pub use execution::ExecuteTransactionQueryParameters;
-pub use execution::TransactionExecutor;
+pub use execution::TransactionExecutionResponse;
 
 use axum::extract::{Path, Query, State};
 use axum::http::StatusCode;
diff --git a/crates/sui-rosetta/src/construction.rs b/crates/sui-rosetta/src/construction.rs
index 45eaaef6abe57..d67c37ce34a94 100644
--- a/crates/sui-rosetta/src/construction.rs
+++ b/crates/sui-rosetta/src/construction.rs
@@ -74,7 +74,7 @@ pub async fn payloads(
     let intent_msg_bytes = bcs::to_bytes(&intent_msg)?;
 
     let mut hasher = DefaultHash::default();
-    hasher.update(&bcs::to_bytes(&intent_msg).expect("Message serialization should not fail"));
+    hasher.update(bcs::to_bytes(&intent_msg).expect("Message serialization should not fail"));
     let digest = hasher.finalize().digest;
 
     Ok(ConstructionPayloadsResponse {
diff --git a/crates/sui-rosetta/src/lib.rs b/crates/sui-rosetta/src/lib.rs
index 1a1cbd34e07a2..9887a8b95a8ca 100644
--- a/crates/sui-rosetta/src/lib.rs
+++ b/crates/sui-rosetta/src/lib.rs
@@ -7,10 +7,8 @@ use std::sync::Arc;
 use axum::routing::post;
 use axum::{Extension, Router};
 use once_cell::sync::Lazy;
-use tokio::task::JoinHandle;
 use tracing::info;
 
-use mysten_metrics::spawn_monitored_task;
 use sui_sdk::SuiClient;
 
 use crate::errors::Error;
@@ -46,7 +44,7 @@ impl RosettaOnlineServer {
         }
     }
 
-    pub fn serve(self, addr: SocketAddr) -> JoinHandle<hyper::Result<()>> {
+    pub async fn serve(self, addr: SocketAddr) {
         // Online endpoints
         let app = Router::new()
             .route("/account/balance", post(account::balance))
@@ -60,12 +58,14 @@ impl RosettaOnlineServer {
             .route("/network/options", post(network::options))
             .layer(Extension(self.env))
             .with_state(self.context);
-        let server = axum::Server::bind(&addr).serve(app.into_make_service());
+
+        let listener = tokio::net::TcpListener::bind(&addr).await.unwrap();
+
         info!(
             "Sui Rosetta online server listening on {}",
-            server.local_addr()
+            listener.local_addr().unwrap()
         );
-        spawn_monitored_task!(server)
+        axum::serve(listener, app).await.unwrap();
     }
 }
 
@@ -78,7 +78,7 @@ impl RosettaOfflineServer {
         Self { env }
     }
 
-    pub fn serve(self, addr: SocketAddr) -> JoinHandle<hyper::Result<()>> {
+    pub async fn serve(self, addr: SocketAddr) {
         // Online endpoints
         let app = Router::new()
             .route("/construction/derive", post(construction::derive))
@@ -90,11 +90,12 @@ impl RosettaOfflineServer {
             .route("/network/list", post(network::list))
             .route("/network/options", post(network::options))
             .layer(Extension(self.env));
-        let server = axum::Server::bind(&addr).serve(app.into_make_service());
+        let listener = tokio::net::TcpListener::bind(&addr).await.unwrap();
+
         info!(
             "Sui Rosetta offline server listening on {}",
-            server.local_addr()
+            listener.local_addr().unwrap()
         );
-        spawn_monitored_task!(server)
+        axum::serve(listener, app).await.unwrap();
     }
 }
diff --git a/crates/sui-rosetta/src/main.rs b/crates/sui-rosetta/src/main.rs
index 2ef4d8e0b7efb..e666929c546df 100644
--- a/crates/sui-rosetta/src/main.rs
+++ b/crates/sui-rosetta/src/main.rs
@@ -129,7 +129,7 @@ impl RosettaServerCommand {
             RosettaServerCommand::StartOfflineServer { env, addr } => {
                 info!("Starting Rosetta Offline Server.");
                 let server = RosettaOfflineServer::new(env);
-                server.serve(addr).await??;
+                server.serve(addr).await;
             }
             RosettaServerCommand::StartOnlineRemoteServer {
                 env,
@@ -144,7 +144,7 @@ impl RosettaServerCommand {
                 let rosetta_path = data_path.join("rosetta_db");
                 info!("Rosetta db path : {rosetta_path:?}");
                 let rosetta = RosettaOnlineServer::new(env, sui_client);
-                rosetta.serve(addr).await??;
+                rosetta.serve(addr).await;
             }
 
             RosettaServerCommand::StartOnlineServer {
@@ -177,7 +177,7 @@ impl RosettaServerCommand {
                 let rosetta_path = data_path.join("rosetta_db");
                 info!("Rosetta db path : {rosetta_path:?}");
                 let rosetta = RosettaOnlineServer::new(env, sui_client);
-                rosetta.serve(addr).await??;
+                rosetta.serve(addr).await;
             }
         };
         Ok(())
diff --git a/crates/sui-rosetta/src/unit_tests/balance_changing_tx_tests.rs b/crates/sui-rosetta/src/unit_tests/balance_changing_tx_tests.rs
index b0dba64531281..3fcf3044a3ee7 100644
--- a/crates/sui-rosetta/src/unit_tests/balance_changing_tx_tests.rs
+++ b/crates/sui-rosetta/src/unit_tests/balance_changing_tx_tests.rs
@@ -144,7 +144,7 @@ async fn test_publish_and_move_call() {
     let compiled_package = BuildConfig::new_for_testing().build(&path).unwrap();
     let compiled_modules_bytes =
         compiled_package.get_package_bytes(/* with_unpublished_deps */ false);
-    let dependencies = compiled_package.get_dependency_original_package_ids();
+    let dependencies = compiled_package.get_dependency_storage_package_ids();
 
     let pt = {
         let mut builder = ProgrammableTransactionBuilder::new();
diff --git a/crates/sui-rosetta/tests/gas_budget_tests.rs b/crates/sui-rosetta/tests/gas_budget_tests.rs
index ead522c111354..f5666298bdd58 100644
--- a/crates/sui-rosetta/tests/gas_budget_tests.rs
+++ b/crates/sui-rosetta/tests/gas_budget_tests.rs
@@ -28,6 +28,7 @@ mod rosetta_client;
 #[derive(Deserialize, Debug)]
 #[serde(untagged)]
 enum TransactionIdentifierResponseResult {
+    #[allow(unused)]
     Success(TransactionIdentifierResponse),
     Error(RosettaSubmitGasError),
 }
diff --git a/crates/sui-rosetta/tests/rosetta_client.rs b/crates/sui-rosetta/tests/rosetta_client.rs
index 855fb4d86dcbe..05c3703c0a584 100644
--- a/crates/sui-rosetta/tests/rosetta_client.rs
+++ b/crates/sui-rosetta/tests/rosetta_client.rs
@@ -28,18 +28,24 @@ use sui_sdk::SuiClient;
 use sui_types::base_types::SuiAddress;
 use sui_types::crypto::SuiSignature;
 
-pub async fn start_rosetta_test_server(
-    client: SuiClient,
-) -> (RosettaClient, Vec<JoinHandle<hyper::Result<()>>>) {
+pub async fn start_rosetta_test_server(client: SuiClient) -> (RosettaClient, Vec<JoinHandle<()>>) {
     let online_server = RosettaOnlineServer::new(SuiEnv::LocalNet, client);
     let offline_server = RosettaOfflineServer::new(SuiEnv::LocalNet);
     let local_ip = local_ip_utils::localhost_for_testing();
     let port = local_ip_utils::get_available_port(&local_ip);
     let rosetta_address = format!("{}:{}", local_ip, port);
-    let online_handle = online_server.serve(SocketAddr::from_str(&rosetta_address).unwrap());
+    let online_handle = tokio::spawn(async move {
+        online_server
+            .serve(SocketAddr::from_str(&rosetta_address).unwrap())
+            .await
+    });
     let offline_port = local_ip_utils::get_available_port(&local_ip);
     let offline_address = format!("{}:{}", local_ip, offline_port);
-    let offline_handle = offline_server.serve(SocketAddr::from_str(&offline_address).unwrap());
+    let offline_handle = tokio::spawn(async move {
+        offline_server
+            .serve(SocketAddr::from_str(&offline_address).unwrap())
+            .await
+    });
 
     // allow rosetta to process the genesis block.
     tokio::task::yield_now().await;
diff --git a/crates/sui-rpc-loadgen/src/payload/query_transactions.rs b/crates/sui-rpc-loadgen/src/payload/query_transactions.rs
index b4abb519fee19..5482372cdd812 100644
--- a/crates/sui-rpc-loadgen/src/payload/query_transactions.rs
+++ b/crates/sui-rpc-loadgen/src/payload/query_transactions.rs
@@ -82,7 +82,7 @@ impl<'a> ProcessPayload<'a, &'a QueryTransactionBlocks> for RpcCommandProcessor
                     }
                 };
 
-                results = join_all(clients.iter().enumerate().map(|(_i, client)| {
+                results = join_all(clients.iter().map(|client| {
                     let with_query = query.clone();
                     async move {
                         query_transaction_blocks(client, with_query, cursor, None)
diff --git a/crates/sui-rpc-loadgen/src/payload/validation.rs b/crates/sui-rpc-loadgen/src/payload/validation.rs
index 00656da736ed7..8204692c73ab1 100644
--- a/crates/sui-rpc-loadgen/src/payload/validation.rs
+++ b/crates/sui-rpc-loadgen/src/payload/validation.rs
@@ -16,7 +16,7 @@ use tracing::log::warn;
 
 const LOADGEN_QUERY_MAX_RESULT_LIMIT: usize = 25;
 
-pub(crate) fn cross_validate_entities<U>(entities: &Vec<Vec<U>>, entity_name: &str)
+pub(crate) fn cross_validate_entities<U>(entities: &[Vec<U>], entity_name: &str)
 where
     U: PartialEq + Debug,
 {
diff --git a/crates/sui-sdk/src/apis.rs b/crates/sui-sdk/src/apis.rs
index 835701c5c6444..e6c6219ec4b6d 100644
--- a/crates/sui-sdk/src/apis.rs
+++ b/crates/sui-sdk/src/apis.rs
@@ -10,6 +10,7 @@ use std::collections::BTreeMap;
 use std::collections::HashMap;
 use std::future;
 use std::sync::Arc;
+use std::time::Duration;
 use std::time::Instant;
 use sui_json_rpc_types::DevInspectArgs;
 use sui_json_rpc_types::SuiData;
@@ -40,7 +41,9 @@ use sui_types::sui_serde::BigInt;
 use sui_types::sui_system_state::sui_system_state_summary::SuiSystemStateSummary;
 use sui_types::transaction::{Transaction, TransactionData, TransactionKind};
 
-const WAIT_FOR_LOCAL_EXECUTION_RETRY_COUNT: u8 = 3;
+const WAIT_FOR_LOCAL_EXECUTION_TIMEOUT: Duration = Duration::from_secs(60);
+const WAIT_FOR_LOCAL_EXECUTION_DELAY: Duration = Duration::from_millis(200);
+const WAIT_FOR_LOCAL_EXECUTION_INTERVAL: Duration = Duration::from_secs(2);
 
 /// The main read API structure with functions for retrieving data about different objects and transactions
 #[derive(Debug)]
@@ -1141,39 +1144,49 @@ impl QuorumDriverApi {
     ) -> SuiRpcResult<SuiTransactionBlockResponse> {
         let (tx_bytes, signatures) = tx.to_tx_bytes_and_signatures();
         let request_type = request_type.unwrap_or_else(|| options.default_execution_request_type());
-        let mut retry_count = 0;
+
         let start = Instant::now();
-        while retry_count < WAIT_FOR_LOCAL_EXECUTION_RETRY_COUNT {
-            let response: SuiTransactionBlockResponse = self
-                .api
-                .http
-                .execute_transaction_block(
-                    tx_bytes.clone(),
-                    signatures.clone(),
-                    Some(options.clone()),
-                    Some(request_type.clone()),
-                )
-                .await?;
+        let response = self
+            .api
+            .http
+            .execute_transaction_block(
+                tx_bytes.clone(),
+                signatures.clone(),
+                Some(options.clone()),
+                Some(request_type.clone()),
+            )
+            .await?;
 
-            match request_type {
-                ExecuteTransactionRequestType::WaitForEffectsCert => {
-                    return Ok(response);
-                }
-                ExecuteTransactionRequestType::WaitForLocalExecution => {
-                    if let Some(true) = response.confirmed_local_execution {
-                        return Ok(response);
-                    } else {
-                        // If fullnode executed the cert in the network but did not confirm local
-                        // execution, it must have timed out and hence we could retry.
-                        retry_count += 1;
-                    }
+        if let ExecuteTransactionRequestType::WaitForEffectsCert = request_type {
+            return Ok(response);
+        }
+
+        // JSON-RPC ignores WaitForLocalExecution, so simulate it by polling for the transaction.
+        let mut poll_response = tokio::time::timeout(WAIT_FOR_LOCAL_EXECUTION_TIMEOUT, async {
+            // Apply a short delay to give the full node a chance to catch up.
+            tokio::time::sleep(WAIT_FOR_LOCAL_EXECUTION_DELAY).await;
+
+            let mut interval = tokio::time::interval(WAIT_FOR_LOCAL_EXECUTION_INTERVAL);
+            loop {
+                interval.tick().await;
+
+                if let Ok(poll_response) = self
+                    .api
+                    .http
+                    .get_transaction_block(*tx.digest(), Some(options.clone()))
+                    .await
+                {
+                    break poll_response;
                 }
             }
-        }
-        Err(Error::FailToConfirmTransactionStatus(
-            *tx.digest(),
-            start.elapsed().as_secs(),
-        ))
+        })
+        .await
+        .map_err(|_| {
+            Error::FailToConfirmTransactionStatus(*tx.digest(), start.elapsed().as_secs())
+        })?;
+
+        poll_response.confirmed_local_execution = Some(true);
+        Ok(poll_response)
     }
 }
 
diff --git a/crates/sui-sdk/src/lib.rs b/crates/sui-sdk/src/lib.rs
index 945a0e0ba5c86..9200d8451e5fc 100644
--- a/crates/sui-sdk/src/lib.rs
+++ b/crates/sui-sdk/src/lib.rs
@@ -14,9 +14,9 @@
 //! * [EventApi] - provides event related functions functions to
 //! * [GovernanceApi] - provides functionality related to staking
 //! * [QuorumDriverApi] - provides functionality to execute a transaction
-//! block and submit it to the fullnode(s)
+//!     block and submit it to the fullnode(s)
 //! * [ReadApi] - provides functions for retrieving data about different
-//! objects and transactions
+//!     objects and transactions
 //! * <a href="../sui_transaction_builder/struct.TransactionBuilder.html" title="struct sui_transaction_builder::TransactionBuilder">TransactionBuilder</a> - provides functions for building transactions
 //!
 //! # Usage
diff --git a/crates/sui-sdk/src/wallet_context.rs b/crates/sui-sdk/src/wallet_context.rs
index a14ce9564c203..863f2ebeafb16 100644
--- a/crates/sui-sdk/src/wallet_context.rs
+++ b/crates/sui-sdk/src/wallet_context.rs
@@ -183,7 +183,7 @@ impl WalletContext {
         budget: u64,
         forbidden_gas_objects: BTreeSet<ObjectID>,
     ) -> Result<(u64, SuiObjectData), anyhow::Error> {
-        for o in self.gas_objects(address).await.unwrap() {
+        for o in self.gas_objects(address).await? {
             if o.0 >= budget && !forbidden_gas_objects.contains(&o.1.object_id) {
                 return Ok((o.0, o.1));
             }
diff --git a/crates/sui-security-watchdog/src/query_runner.rs b/crates/sui-security-watchdog/src/query_runner.rs
index a0ab4ec1054e5..37e1fd95a9815 100644
--- a/crates/sui-security-watchdog/src/query_runner.rs
+++ b/crates/sui-security-watchdog/src/query_runner.rs
@@ -214,7 +214,8 @@ impl QueryRunner for SnowflakeQueryRunner {
         let res = self.make_snowflake_api()?.exec(query).await?;
         match res {
             QueryResult::Arrow(records) => self.parse_record_batches(records),
-            // Handle other result types (Json, Empty) with a unified error message
+            QueryResult::Empty => Ok(Vec::new()),
+            // Handle other result types Json with a unified error message
             _ => Err(anyhow!("Unexpected query result type")),
         }
     }
diff --git a/crates/sui-simulator/Cargo.toml b/crates/sui-simulator/Cargo.toml
index 5d2f864250cc3..4d12c46ef42a4 100644
--- a/crates/sui-simulator/Cargo.toml
+++ b/crates/sui-simulator/Cargo.toml
@@ -6,6 +6,9 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 move-package.workspace = true
 
diff --git a/crates/sui-simulator/src/lib.rs b/crates/sui-simulator/src/lib.rs
index 086d2f1282184..91fa6b5937d26 100644
--- a/crates/sui-simulator/src/lib.rs
+++ b/crates/sui-simulator/src/lib.rs
@@ -110,7 +110,7 @@ pub mod configs {
 }
 
 thread_local! {
-    static NODE_COUNT: AtomicUsize = AtomicUsize::new(0);
+    static NODE_COUNT: AtomicUsize = const { AtomicUsize::new(0) };
 }
 
 pub struct NodeLeakDetector(());
diff --git a/crates/sui-single-node-benchmark/Cargo.toml b/crates/sui-single-node-benchmark/Cargo.toml
index 8cad1f304ca72..33cdf4cc24138 100644
--- a/crates/sui-single-node-benchmark/Cargo.toml
+++ b/crates/sui-single-node-benchmark/Cargo.toml
@@ -10,6 +10,7 @@ move-binary-format.workspace = true
 move-bytecode-utils.workspace = true
 move-core-types.workspace = true
 move-package.workspace = true
+move-symbol-pool.workspace = true
 sui-config.workspace = true
 sui-core = { workspace = true, features = ["test-utils"] }
 sui-move-build.workspace = true
diff --git a/crates/sui-single-node-benchmark/src/tx_generator/package_publish_tx_generator.rs b/crates/sui-single-node-benchmark/src/tx_generator/package_publish_tx_generator.rs
index 6912994e75093..fcf15e3a71a52 100644
--- a/crates/sui-single-node-benchmark/src/tx_generator/package_publish_tx_generator.rs
+++ b/crates/sui-single-node-benchmark/src/tx_generator/package_publish_tx_generator.rs
@@ -5,8 +5,9 @@ use crate::benchmark_context::BenchmarkContext;
 use crate::mock_account::Account;
 use crate::tx_generator::TxGenerator;
 use move_package::source_package::manifest_parser::parse_move_manifest_from_file;
+use move_symbol_pool::Symbol;
 use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
+use std::collections::BTreeMap;
 use std::fs;
 use std::path::PathBuf;
 use sui_move_build::{BuildConfig, CompiledPackage};
@@ -27,13 +28,14 @@ impl PackagePublishTxGenerator {
             dependencies,
             root_package,
         } = manifest;
-        let mut dep_map = HashMap::new();
+        let mut dep_map = BTreeMap::new();
         for dependency in dependencies {
             let Package {
                 name,
                 path,
                 is_source_code,
             } = dependency;
+
             info!("Publishing dependent package {}", name);
             let target_path = dir.join(&path);
             let module_bytes = if is_source_code {
@@ -68,23 +70,32 @@ impl PackagePublishTxGenerator {
                 .await
                 .0;
             info!("Published dependent package {}", package_id);
-            dep_map.insert(name, package_id);
+            dep_map.insert(Symbol::from(name), package_id);
         }
+
         let Package {
             name,
             path,
             is_source_code,
         } = root_package;
+
         info!("Compiling root package {}", name);
         assert!(
             is_source_code,
             "Only support building root package from source code"
         );
+
         let target_path = dir.join(path);
-        dep_map.insert(name, ObjectID::ZERO);
-        let compiled_package = BuildConfig::new_for_testing_replace_addresses(dep_map)
-            .build(&target_path)
-            .unwrap();
+        let published_deps = dep_map.clone();
+
+        dep_map.insert(Symbol::from(name), ObjectID::ZERO);
+        let mut compiled_package = BuildConfig::new_for_testing_replace_addresses(
+            dep_map.into_iter().map(|(k, v)| (k.to_string(), v)),
+        )
+        .build(&target_path)
+        .unwrap();
+
+        compiled_package.dependency_ids.published = published_deps;
         Self { compiled_package }
     }
 }
diff --git a/crates/sui-snapshot/src/lib.rs b/crates/sui-snapshot/src/lib.rs
index a19a090770d5c..ac083f021efe1 100644
--- a/crates/sui-snapshot/src/lib.rs
+++ b/crates/sui-snapshot/src/lib.rs
@@ -72,6 +72,7 @@ use tokio::time::Instant;
 ///     - epoch_1/
 ///       - 1_1.obj
 ///       - ...
+///
 /// Object File Disk Format
 ///┌──────────────────────────────┐
 ///│  magic(0x00B7EC75) <4 byte>  │
diff --git a/crates/sui-snapshot/src/reader.rs b/crates/sui-snapshot/src/reader.rs
index e6f9d19a747ed..23617301e97a4 100644
--- a/crates/sui-snapshot/src/reader.rs
+++ b/crates/sui-snapshot/src/reader.rs
@@ -389,8 +389,9 @@ impl StateSnapshotReaderV1 {
                                         );
                                         if timeout > max_timeout {
                                             panic!(
-                                                "Failed to get obj file after {} attempts",
-                                                attempts
+                                                "Failed to get obj file {} after {} attempts",
+                                                file_metadata.file_path(&epoch_dir),
+                                                attempts,
                                             );
                                         } else {
                                             attempts += 1;
diff --git a/crates/sui-source-validation-service/Cargo.toml b/crates/sui-source-validation-service/Cargo.toml
index 56b3b24c04e8b..53dc311ffc3d2 100644
--- a/crates/sui-source-validation-service/Cargo.toml
+++ b/crates/sui-source-validation-service/Cargo.toml
@@ -16,7 +16,7 @@ name = "sui-source-validation-service"
 [dependencies]
 anyhow = { version = "1.0.64", features = ["backtrace"] }
 clap.workspace = true
-hyper = "0.14"
+hyper.workspace = true
 jsonrpsee.workspace = true
 tempfile = "3.3.0"
 tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
diff --git a/crates/sui-source-validation-service/src/lib.rs b/crates/sui-source-validation-service/src/lib.rs
index c866ad899012d..ff95996921ea5 100644
--- a/crates/sui-source-validation-service/src/lib.rs
+++ b/crates/sui-source-validation-service/src/lib.rs
@@ -14,11 +14,10 @@ use tokio::sync::oneshot::Sender;
 use anyhow::{anyhow, bail};
 use axum::extract::{Query, State};
 use axum::response::{IntoResponse, Response};
-use axum::routing::{get, IntoMakeService};
+use axum::routing::get;
 use axum::Extension;
-use axum::{Json, Router, Server};
+use axum::{Json, Router};
 use hyper::http::{HeaderName, HeaderValue, Method};
-use hyper::server::conn::AddrIncoming;
 use hyper::{HeaderMap, StatusCode};
 use mysten_metrics::RegistryService;
 use prometheus::{register_int_counter_with_registry, IntCounter, Registry};
@@ -35,7 +34,7 @@ use sui_move_build::{BuildConfig, SuiPackageHooks};
 use sui_sdk::rpc_types::SuiTransactionBlockEffects;
 use sui_sdk::types::base_types::ObjectID;
 use sui_sdk::SuiClientBuilder;
-use sui_source_validation::{BytecodeSourceVerifier, SourceMode};
+use sui_source_validation::{BytecodeSourceVerifier, ValidationMode};
 
 pub const HOST_PORT_ENV: &str = "HOST_PORT";
 pub const SUI_SOURCE_VALIDATION_VERSION_HEADER: &str = "x-sui-source-validation-version";
@@ -173,11 +172,7 @@ pub async fn verify_package(
     let compiled_package = build_config.build(package_path.as_ref())?;
 
     BytecodeSourceVerifier::new(client.read_api())
-        .verify_package(
-            &compiled_package,
-            /* verify_deps */ false,
-            SourceMode::Verify,
-        )
+        .verify(&compiled_package, ValidationMode::root())
         .await
         .map_err(|e| anyhow!("Network {network}: {e}"))?;
 
@@ -445,9 +440,7 @@ pub struct AppState {
     pub sources_list: NetworkLookup,
 }
 
-pub fn serve(
-    app_state: Arc<RwLock<AppState>>,
-) -> anyhow::Result<Server<AddrIncoming, IntoMakeService<Router>>> {
+pub async fn serve(app_state: Arc<RwLock<AppState>>) -> anyhow::Result<()> {
     let app = Router::new()
         .route("/api", get(api_route))
         .route("/api/list", get(list_route))
@@ -462,7 +455,10 @@ pub fn serve(
         )
         .with_state(app_state);
     let listener = TcpListener::bind(host_port())?;
-    Ok(Server::from_tcp(listener)?.serve(app.into_make_service()))
+    listener.set_nonblocking(true).unwrap();
+    let listener = tokio::net::TcpListener::from_std(listener)?;
+    axum::serve(listener, app).await?;
+    Ok(())
 }
 
 #[derive(Deserialize)]
@@ -535,10 +531,10 @@ async fn api_route(
     }
 }
 
-async fn check_version_header<B>(
+async fn check_version_header(
     headers: HeaderMap,
-    req: hyper::Request<B>,
-    next: Next<B>,
+    req: hyper::Request<axum::body::Body>,
+    next: Next,
 ) -> Response {
     let version = headers
         .get(SUI_SOURCE_VALIDATION_VERSION_HEADER)
@@ -599,7 +595,7 @@ impl SourceServiceMetrics {
     }
 }
 
-pub fn start_prometheus_server(addr: TcpListener) -> RegistryService {
+pub fn start_prometheus_server(listener: TcpListener) -> RegistryService {
     let registry = Registry::new();
 
     let registry_service = RegistryService::new(registry);
@@ -609,11 +605,9 @@ pub fn start_prometheus_server(addr: TcpListener) -> RegistryService {
         .layer(Extension(registry_service.clone()));
 
     tokio::spawn(async move {
-        axum::Server::from_tcp(addr)
-            .unwrap()
-            .serve(app.into_make_service())
-            .await
-            .unwrap();
+        listener.set_nonblocking(true).unwrap();
+        let listener = tokio::net::TcpListener::from_std(listener).unwrap();
+        axum::serve(listener, app).await.unwrap();
     });
 
     registry_service
diff --git a/crates/sui-source-validation-service/src/main.rs b/crates/sui-source-validation-service/src/main.rs
index a49fe85017f18..2039976e950d7 100644
--- a/crates/sui-source-validation-service/src/main.rs
+++ b/crates/sui-source-validation-service/src/main.rs
@@ -80,7 +80,7 @@ pub async fn main() -> anyhow::Result<()> {
     }
 
     let app_state_copy = app_state.clone();
-    let server = tokio::spawn(async { serve(app_state_copy)?.await.map_err(anyhow::Error::from) });
+    let server = tokio::spawn(async { serve(app_state_copy).await });
     threads.push(server);
     info!("serving on {}", host_port());
     for t in threads {
diff --git a/crates/sui-source-validation-service/tests/tests.rs b/crates/sui-source-validation-service/tests/tests.rs
index 3fe162b11ccdd..bc6c06c2190b2 100644
--- a/crates/sui-source-validation-service/tests/tests.rs
+++ b/crates/sui-source-validation-service/tests/tests.rs
@@ -299,7 +299,8 @@ async fn test_api_route() -> anyhow::Result<()> {
         metrics: None,
         sources_list,
     }));
-    tokio::spawn(serve(app_state).expect("Cannot start service."));
+    tokio::spawn(async move { serve(app_state).await.expect("Cannot start service.") });
+    tokio::time::sleep(std::time::Duration::from_secs(1)).await;
 
     let client = Client::new();
 
diff --git a/crates/sui-source-validation/Cargo.toml b/crates/sui-source-validation/Cargo.toml
index a1b1918889e1a..8dc2ef1f07b17 100644
--- a/crates/sui-source-validation/Cargo.toml
+++ b/crates/sui-source-validation/Cargo.toml
@@ -17,9 +17,10 @@ tracing.workspace = true
 futures.workspace = true
 
 sui-json-rpc-types.workspace = true
+sui-move-build.workspace = true
+sui-package-management.workspace = true
 sui-types.workspace = true
 sui-sdk.workspace = true
-sui-move-build.workspace = true
 
 move-binary-format.workspace = true
 move-bytecode-source-map.workspace = true
diff --git a/crates/sui-source-validation/src/error.rs b/crates/sui-source-validation/src/error.rs
new file mode 100644
index 0000000000000..15466b0b67eae
--- /dev/null
+++ b/crates/sui-source-validation/src/error.rs
@@ -0,0 +1,95 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use std::fmt;
+
+use move_core_types::account_address::AccountAddress;
+use move_symbol_pool::Symbol;
+use sui_json_rpc_types::SuiRawMoveObject;
+use sui_package_management::PublishedAtError;
+use sui_sdk::error::Error as SdkError;
+use sui_types::{base_types::ObjectID, error::SuiObjectResponseError};
+
+#[derive(Debug, thiserror::Error)]
+pub struct AggregateError(pub(crate) Vec<Error>);
+
+#[derive(Debug, thiserror::Error)]
+pub enum Error {
+    #[error("Cannot check local module for {package}: {message}")]
+    CannotCheckLocalModules { package: Symbol, message: String },
+
+    #[error("Could not read a dependency's on-chain object: {0:?}")]
+    DependencyObjectReadFailure(SdkError),
+
+    #[error("On-chain package {0} is empty")]
+    EmptyOnChainPackage(AccountAddress),
+
+    #[error("Invalid module {name} with error: {message}")]
+    InvalidModuleFailure { name: String, message: String },
+
+    #[error("Local version of dependency {address}::{module} was not found.")]
+    LocalDependencyNotFound {
+        address: AccountAddress,
+        module: Symbol,
+    },
+
+    #[error("Source package depends on {0} which is not in the linkage table.")]
+    MissingDependencyInLinkageTable(AccountAddress),
+
+    #[error("On-chain package depends on {0} which is not a source dependency.")]
+    MissingDependencyInSourcePackage(AccountAddress),
+
+    #[error(
+        "Local dependency did not match its on-chain version at {address}::{package}::{module}"
+    )]
+    ModuleBytecodeMismatch {
+        address: AccountAddress,
+        package: Symbol,
+        module: Symbol,
+    },
+
+    #[error("Dependency ID contains a Sui object, not a Move package: {0}")]
+    ObjectFoundWhenPackageExpected(ObjectID, SuiRawMoveObject),
+
+    #[error("Could not deserialize on-chain dependency {address}::{module}.")]
+    OnChainDependencyDeserializationError {
+        address: AccountAddress,
+        module: Symbol,
+    },
+
+    #[error("On-chain version of dependency {package}::{module} was not found.")]
+    OnChainDependencyNotFound { package: Symbol, module: Symbol },
+
+    #[error("{0}. Please supply an explicit on-chain address for the package")]
+    PublishedAt(#[from] PublishedAtError),
+
+    #[error("Dependency object does not exist or was deleted: {0:?}")]
+    SuiObjectRefFailure(SuiObjectResponseError),
+
+    #[error("On-chain address cannot be zero")]
+    ZeroOnChainAddresSpecifiedFailure,
+}
+
+impl fmt::Display for AggregateError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let Self(errors) = self;
+        match &errors[..] {
+            [] => unreachable!("Aggregate error with no errors"),
+            [error] => write!(f, "{}", error)?,
+            errors => {
+                writeln!(f, "Multiple source verification errors found:")?;
+                for error in errors {
+                    write!(f, "\n- {}", error)?;
+                }
+                return Ok(());
+            }
+        };
+        Ok(())
+    }
+}
+
+impl From<Error> for AggregateError {
+    fn from(error: Error) -> Self {
+        Self(vec![error])
+    }
+}
diff --git a/crates/sui-source-validation/src/lib.rs b/crates/sui-source-validation/src/lib.rs
index 03911a2e00d82..a692974c68a3f 100644
--- a/crates/sui-source-validation/src/lib.rs
+++ b/crates/sui-source-validation/src/lib.rs
@@ -1,140 +1,41 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use anyhow::{anyhow, bail, ensure};
-use colored::Colorize;
-use core::fmt;
+use crate::error::{AggregateError, Error};
 use futures::future;
 use move_binary_format::CompiledModule;
-use move_bytecode_source_map::utils::source_map_from_file;
-use move_compiler::editions::{Edition, Flavor};
-use move_compiler::shared::NumericalAddress;
-use move_package::compilation::package_layout::CompiledPackageLayout;
-use move_package::lock_file::schema::{Header, ToolchainVersion};
-use move_package::source_package::layout::SourcePackageLayout;
-use move_package::source_package::parsed_manifest::{FileName, PackageName};
-use std::ffi::OsStr;
-use std::fs::File;
-use std::io::{self, Seek};
-use std::path::{Path, PathBuf};
-use std::process::Command;
-use std::{collections::HashMap, fmt::Debug};
-use sui_move_build::CompiledPackage;
-use sui_types::error::SuiObjectResponseError;
-use tar::Archive;
-use tempfile::TempDir;
-use thiserror::Error;
-use tracing::{debug, info};
-
-use move_command_line_common::env::MOVE_HOME;
-use move_command_line_common::files::MOVE_COMPILED_EXTENSION;
-use move_command_line_common::files::{
-    extension_equals, find_filenames, MOVE_EXTENSION, SOURCE_MAP_EXTENSION,
-};
 use move_compiler::compiled_unit::NamedCompiledModule;
 use move_core_types::account_address::AccountAddress;
-use move_package::compilation::compiled_package::{
-    CompiledPackage as MoveCompiledPackage, CompiledUnitWithSource,
-};
 use move_symbol_pool::Symbol;
+use std::collections::{HashMap, HashSet};
+use sui_move_build::CompiledPackage;
 use sui_sdk::apis::ReadApi;
-use sui_sdk::error::Error;
-
-use sui_sdk::rpc_types::{SuiObjectDataOptions, SuiRawData, SuiRawMoveObject, SuiRawMovePackage};
+use sui_sdk::error::Error as SdkError;
+use sui_sdk::rpc_types::{SuiObjectDataOptions, SuiRawData, SuiRawMovePackage};
 use sui_types::base_types::ObjectID;
+use toolchain::units_for_toolchain;
+
+pub mod error;
+mod toolchain;
 
 #[cfg(test)]
 mod tests;
 
-const CURRENT_COMPILER_VERSION: &str = env!("CARGO_PKG_VERSION");
-const LEGACY_COMPILER_VERSION: &str = CURRENT_COMPILER_VERSION; // TODO: update this when Move 2024 is released
-const PRE_TOOLCHAIN_MOVE_LOCK_VERSION: u64 = 0; // Used to detect lockfiles pre-toolchain versioning support
-const CANONICAL_UNIX_BINARY_NAME: &str = "sui";
-const CANONICAL_WIN_BINARY_NAME: &str = "sui.exe";
+/// Details of what to verify
+pub enum ValidationMode {
+    /// Validate only the dependencies
+    Deps,
 
-#[derive(Debug, Error)]
-pub enum SourceVerificationError {
-    #[error("Could not read a dependency's on-chain object: {0:?}")]
-    DependencyObjectReadFailure(Error),
+    /// Validate the root package, and its linkage.
+    Root {
+        /// Additionally validate the dependencies, and make sure the runtime and storage IDs in
+        /// dependency source code matches the root package's on-chain linkage table.
+        deps: bool,
 
-    #[error("Dependency object does not exist or was deleted: {0:?}")]
-    SuiObjectRefFailure(SuiObjectResponseError),
-
-    #[error("Dependency ID contains a Sui object, not a Move package: {0}")]
-    ObjectFoundWhenPackageExpected(ObjectID, SuiRawMoveObject),
-
-    #[error("On-chain version of dependency {package}::{module} was not found.")]
-    OnChainDependencyNotFound { package: Symbol, module: Symbol },
-
-    #[error("Could not deserialize on-chain dependency {address}::{module}.")]
-    OnChainDependencyDeserializationError {
-        address: AccountAddress,
-        module: Symbol,
+        /// Look for the root package on-chain at the specified address, rather than the address in
+        /// its manifest.
+        at: Option<AccountAddress>,
     },
-
-    #[error("Local version of dependency {address}::{module} was not found.")]
-    LocalDependencyNotFound {
-        address: AccountAddress,
-        module: Symbol,
-    },
-
-    #[error(
-        "Local dependency did not match its on-chain version at {address}::{package}::{module}"
-    )]
-    ModuleBytecodeMismatch {
-        address: AccountAddress,
-        package: Symbol,
-        module: Symbol,
-    },
-
-    #[error("Cannot check local module for {package}: {message}")]
-    CannotCheckLocalModules { package: Symbol, message: String },
-
-    #[error("On-chain address cannot be zero")]
-    ZeroOnChainAddresSpecifiedFailure,
-
-    #[error("Invalid module {name} with error: {message}")]
-    InvalidModuleFailure { name: String, message: String },
-}
-
-#[derive(Debug, Error)]
-pub struct AggregateSourceVerificationError(Vec<SourceVerificationError>);
-
-impl From<SourceVerificationError> for AggregateSourceVerificationError {
-    fn from(error: SourceVerificationError) -> Self {
-        AggregateSourceVerificationError(vec![error])
-    }
-}
-
-impl fmt::Display for AggregateSourceVerificationError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let AggregateSourceVerificationError(errors) = self;
-        match &errors[..] {
-            [] => unreachable!("Aggregate error with no errors"),
-            [error] => write!(f, "{}", error)?,
-            errors => {
-                writeln!(f, "Multiple source verification errors found:")?;
-                for error in errors {
-                    write!(f, "\n- {}", error)?;
-                }
-                return Ok(());
-            }
-        };
-        Ok(())
-    }
-}
-
-/// How to handle package source during bytecode verification.
-#[derive(PartialEq, Eq)]
-pub enum SourceMode {
-    /// Don't verify source.
-    Skip,
-
-    /// Verify source at the address specified in its manifest.
-    Verify,
-
-    /// Verify source at an overridden address (only works if the package is not published)
-    VerifyAt(AccountAddress),
 }
 
 pub struct BytecodeSourceVerifier<'a> {
@@ -143,669 +44,396 @@ pub struct BytecodeSourceVerifier<'a> {
 
 /// Map package addresses and module names to package names and bytecode.
 type LocalModules = HashMap<(AccountAddress, Symbol), (Symbol, CompiledModule)>;
-/// Map package addresses and modules names to bytecode (package names are gone in the on-chain
-/// representation).
-type OnChainModules = HashMap<(AccountAddress, Symbol), CompiledModule>;
 
-impl<'a> BytecodeSourceVerifier<'a> {
-    pub fn new(rpc_client: &'a ReadApi) -> Self {
-        BytecodeSourceVerifier { rpc_client }
-    }
-
-    /// Helper wrapper to verify that all local Move package dependencies' and root bytecode matches
-    /// the bytecode at the address specified on the Sui network we are publishing to.
-    pub async fn verify_package_root_and_deps(
-        &self,
-        compiled_package: &CompiledPackage,
-        root_on_chain_address: AccountAddress,
-    ) -> Result<(), AggregateSourceVerificationError> {
-        self.verify_package(
-            compiled_package,
-            /* verify_deps */ true,
-            SourceMode::VerifyAt(root_on_chain_address),
-        )
-        .await
-    }
+#[derive(Default)]
+struct OnChainRepresentation {
+    /// Storage IDs from the root package's on-chain linkage table. This will only be present if
+    /// root package verification was requested, in which case the keys from this mapping must
+    /// match the source package's dependencies.
+    on_chain_dependencies: Option<HashSet<AccountAddress>>,
 
-    /// Helper wrapper to verify that all local Move package root bytecode matches
-    /// the bytecode at the address specified on the Sui network we are publishing to.
-    pub async fn verify_package_root(
-        &self,
-        compiled_package: &CompiledPackage,
-        root_on_chain_address: AccountAddress,
-    ) -> Result<(), AggregateSourceVerificationError> {
-        self.verify_package(
-            compiled_package,
-            /* verify_deps */ false,
-            SourceMode::VerifyAt(root_on_chain_address),
-        )
-        .await
-    }
+    /// Map package addresses and module names to bytecode (package names are gone in the on-chain
+    /// representation).
+    modules: HashMap<(AccountAddress, Symbol), CompiledModule>,
+}
 
-    /// Helper wrapper to verify that all local Move package dependencies' matches
-    /// the bytecode at the address specified on the Sui network we are publishing to.
-    pub async fn verify_package_deps(
-        &self,
-        compiled_package: &CompiledPackage,
-    ) -> Result<(), AggregateSourceVerificationError> {
-        self.verify_package(
-            compiled_package,
-            /* verify_deps */ true,
-            SourceMode::Skip,
-        )
-        .await
+impl ValidationMode {
+    /// Only verify that source dependencies match their on-chain versions.
+    pub fn deps() -> Self {
+        Self::Deps
     }
 
-    /// Verify that all local Move package dependencies' and/or root bytecode matches the bytecode
-    /// at the address specified on the Sui network we are publishing to.  If `verify_deps` is true,
-    /// the dependencies are verified.  If `root_on_chain_address` is specified, the root is
-    /// verified against a package at `root_on_chain_address`.
-    pub async fn verify_package(
-        &self,
-        compiled_package: &CompiledPackage,
-        verify_deps: bool,
-        source_mode: SourceMode,
-    ) -> Result<(), AggregateSourceVerificationError> {
-        let mut on_chain_pkgs = vec![];
-        match &source_mode {
-            SourceMode::Skip => (),
-            // On-chain address for matching root package cannot be zero
-            SourceMode::VerifyAt(AccountAddress::ZERO) => {
-                return Err(SourceVerificationError::ZeroOnChainAddresSpecifiedFailure.into())
-            }
-            SourceMode::VerifyAt(root_address) => on_chain_pkgs.push(*root_address),
-            SourceMode::Verify => {
-                on_chain_pkgs.extend(compiled_package.published_at.as_ref().map(|id| **id))
-            }
-        };
-
-        if verify_deps {
-            on_chain_pkgs.extend(
-                compiled_package
-                    .dependency_ids
-                    .published
-                    .values()
-                    .map(|id| **id),
-            );
+    /// Only verify that the root package matches its on-chain version (requires that the root
+    /// package is published with its address available in the manifest).
+    pub fn root() -> Self {
+        Self::Root {
+            deps: false,
+            at: None,
         }
+    }
 
-        let local_modules = local_modules(&compiled_package.package, verify_deps, source_mode)?;
-        let mut on_chain_modules = self.on_chain_modules(on_chain_pkgs.into_iter()).await?;
-
-        let mut errors = Vec::new();
-        for ((address, module), (package, local_module)) in local_modules {
-            let Some(on_chain_module) = on_chain_modules.remove(&(address, module)) else {
-                errors.push(SourceVerificationError::OnChainDependencyNotFound { package, module });
-                continue;
-            };
-
-            // compare local bytecode to on-chain bytecode to ensure integrity of our
-            // dependencies
-            if local_module != on_chain_module {
-                errors.push(SourceVerificationError::ModuleBytecodeMismatch {
-                    address,
-                    package,
-                    module,
-                });
-            }
+    /// Only verify that the root package matches its on-chain version, but override the location
+    /// to look for the root package to `address`.
+    pub fn root_at(address: AccountAddress) -> Self {
+        Self::Root {
+            deps: false,
+            at: Some(address),
         }
+    }
 
-        if let Some(((address, module), _)) = on_chain_modules.into_iter().next() {
-            errors.push(SourceVerificationError::LocalDependencyNotFound { address, module });
+    /// Verify both the root package and its dependencies (requires that the root package is
+    /// published with its address available in the manifest).
+    pub fn root_and_deps() -> Self {
+        Self::Root {
+            deps: true,
+            at: None,
         }
+    }
 
-        if !errors.is_empty() {
-            return Err(AggregateSourceVerificationError(errors));
+    /// Verify both the root package and its dependencies, but override the location to look for
+    /// the root package to `address`.
+    pub fn root_and_deps_at(address: AccountAddress) -> Self {
+        Self::Root {
+            deps: true,
+            at: Some(address),
         }
-
-        Ok(())
     }
 
-    async fn pkg_for_address(
-        &self,
-        addr: AccountAddress,
-    ) -> Result<SuiRawMovePackage, SourceVerificationError> {
-        // Move packages are specified with an AccountAddress, but are
-        // fetched from a sui network via sui_getObject, which takes an object ID
-        let obj_id = ObjectID::from(addr);
-
-        // fetch the Sui object at the address specified for the package in the local resolution table
-        // if future packages with a large set of dependency packages prove too slow to verify,
-        // batched object fetching should be added to the ReadApi & used here
-        let obj_read = self
-            .rpc_client
-            .get_object_with_options(obj_id, SuiObjectDataOptions::new().with_bcs())
-            .await
-            .map_err(SourceVerificationError::DependencyObjectReadFailure)?;
-
-        let obj = obj_read
-            .into_object()
-            .map_err(SourceVerificationError::SuiObjectRefFailure)?
-            .bcs
-            .ok_or_else(|| {
-                SourceVerificationError::DependencyObjectReadFailure(Error::DataError(
-                    "Bcs field is not found".to_string(),
-                ))
-            })?;
+    /// Should we verify dependencies?
+    fn verify_deps(&self) -> bool {
+        matches!(self, Self::Deps | Self::Root { deps: true, .. })
+    }
 
-        match obj {
-            SuiRawData::Package(pkg) => Ok(pkg),
-            SuiRawData::MoveObject(move_obj) => Err(
-                SourceVerificationError::ObjectFoundWhenPackageExpected(obj_id, move_obj),
-            ),
+    /// If the root package needs to be verified, what address should it be fetched from?
+    fn root_address(&self, package: &CompiledPackage) -> Result<Option<AccountAddress>, Error> {
+        match self {
+            Self::Root { at: Some(addr), .. } => Ok(Some(*addr)),
+            Self::Root { at: None, .. } => Ok(Some(*package.published_at.clone()?)),
+            Self::Deps => Ok(None),
         }
     }
 
-    async fn on_chain_modules(
-        &self,
-        addresses: impl Iterator<Item = AccountAddress> + Clone,
-    ) -> Result<OnChainModules, AggregateSourceVerificationError> {
-        let resp = future::join_all(addresses.clone().map(|addr| self.pkg_for_address(addr))).await;
-        let mut map = OnChainModules::new();
-        let mut err = vec![];
-
-        for (storage_id, pkg) in addresses.zip(resp) {
-            let SuiRawMovePackage { module_map, .. } = pkg?;
-            for (name, bytes) in module_map {
-                let Ok(module) = CompiledModule::deserialize_with_defaults(&bytes) else {
-                    err.push(
-                        SourceVerificationError::OnChainDependencyDeserializationError {
-                            address: storage_id,
-                            module: name.into(),
-                        },
-                    );
-                    continue;
-                };
+    /// All the on-chain addresses that we need to fetch to build on-chain addresses.
+    fn on_chain_addresses(&self, package: &CompiledPackage) -> Result<Vec<AccountAddress>, Error> {
+        let mut addrs = vec![];
 
-                let runtime_id = *module.self_id().address();
-                map.insert((runtime_id, Symbol::from(name)), module);
-            }
+        if let Some(addr) = self.root_address(package)? {
+            addrs.push(addr);
         }
 
-        if !err.is_empty() {
-            return Err(AggregateSourceVerificationError(err));
+        if self.verify_deps() {
+            addrs.extend(dependency_addresses(package));
         }
 
-        Ok(map)
+        Ok(addrs)
     }
-}
 
-fn substitute_root_address(
-    named_module: &NamedCompiledModule,
-    root: AccountAddress,
-) -> Result<CompiledModule, SourceVerificationError> {
-    let mut module = named_module.module.clone();
-    let address_idx = module.self_handle().address;
+    /// On-chain representation of the package and dependencies compiled to `package`, including
+    /// linkage information.
+    async fn on_chain(
+        &self,
+        package: &CompiledPackage,
+        verifier: &BytecodeSourceVerifier<'_>,
+    ) -> Result<OnChainRepresentation, AggregateError> {
+        let mut on_chain = OnChainRepresentation::default();
+        let mut errs: Vec<Error> = vec![];
+
+        let root = self.root_address(package)?;
+        let addrs = self.on_chain_addresses(package)?;
+
+        let resps =
+            future::join_all(addrs.iter().copied().map(|a| verifier.pkg_for_address(a))).await;
+
+        for (storage_id, pkg) in addrs.into_iter().zip(resps) {
+            let SuiRawMovePackage {
+                module_map,
+                linkage_table,
+                ..
+            } = pkg?;
+
+            let mut modules = module_map
+                .into_iter()
+                .map(|(name, bytes)| {
+                    let Ok(module) = CompiledModule::deserialize_with_defaults(&bytes) else {
+                        return Err(Error::OnChainDependencyDeserializationError {
+                            address: storage_id,
+                            module: name.into(),
+                        });
+                    };
 
-    let Some(addr) = module.address_identifiers.get_mut(address_idx.0 as usize) else {
-        return Err(SourceVerificationError::InvalidModuleFailure {
-            name: named_module.name.to_string(),
-            message: "Self address field missing".into(),
-        });
-    };
+                    Ok::<_, Error>((Symbol::from(name), module))
+                })
+                .peekable();
 
-    if *addr != AccountAddress::ZERO {
-        return Err(SourceVerificationError::InvalidModuleFailure {
-            name: named_module.name.to_string(),
-            message: "Self address already populated".to_string(),
-        });
-    }
+            let runtime_id = match modules.peek() {
+                Some(Ok((_, module))) => *module.self_id().address(),
 
-    *addr = root;
-    Ok(module)
-}
+                Some(Err(_)) => {
+                    // SAFETY: The error type does not implement `Clone` so we need to take the
+                    // error by value. We do that by calling `next` to take the value we just
+                    // peeked, which we know is an error type.
+                    errs.push(modules.next().unwrap().unwrap_err());
+                    continue;
+                }
 
-fn local_modules(
-    compiled_package: &MoveCompiledPackage,
-    include_deps: bool,
-    source_mode: SourceMode,
-) -> Result<LocalModules, SourceVerificationError> {
-    let mut map = LocalModules::new();
-
-    if include_deps {
-        // Compile dependencies with prior compilers if needed.
-        let deps_compiled_units = units_for_toolchain(&compiled_package.deps_compiled_units)
-            .map_err(|e| SourceVerificationError::CannotCheckLocalModules {
-                package: compiled_package.compiled_package_info.package_name,
-                message: e.to_string(),
-            })?;
+                None => {
+                    errs.push(Error::EmptyOnChainPackage(storage_id));
+                    continue;
+                }
+            };
 
-        for (package, local_unit) in deps_compiled_units {
-            let m = &local_unit.unit;
-            let module = m.name;
-            let address = m.address.into_inner();
-            if address == AccountAddress::ZERO {
-                continue;
+            for module in modules {
+                match module {
+                    Ok((name, module)) => {
+                        on_chain.modules.insert((runtime_id, name), module);
+                    }
+
+                    Err(e) => {
+                        errs.push(e);
+                        continue;
+                    }
+                }
             }
 
-            map.insert((address, module), (package, m.module.clone()));
+            if root.is_some_and(|r| r == storage_id) {
+                on_chain.on_chain_dependencies = Some(HashSet::from_iter(
+                    linkage_table.into_values().map(|info| *info.upgraded_id),
+                ));
+            }
         }
+
+        Ok(on_chain)
     }
 
-    let root_package = compiled_package.compiled_package_info.package_name;
-    match source_mode {
-        SourceMode::Skip => { /* nop */ }
-
-        // Include the root compiled units, at their current addresses.
-        SourceMode::Verify => {
-            // Compile root modules with prior compiler if needed.
-            let root_compiled_units = {
-                let root_compiled_units = compiled_package
-                    .root_compiled_units
-                    .iter()
-                    .map(|u| ("root".into(), u.clone()))
-                    .collect::<Vec<_>>();
-
-                units_for_toolchain(&root_compiled_units).map_err(|e| {
-                    SourceVerificationError::CannotCheckLocalModules {
-                        package: compiled_package.compiled_package_info.package_name,
+    /// Local representation of the modules in `package`. If the validation mode requires verifying
+    /// dependencies, then the dependencies' modules are also included in the output.
+    ///
+    /// For the purposes of this function, a module is considered a dependency if it is from a
+    /// different source package, and that source package has already been published. Conversely, a
+    /// module that is from a different source package, but that has not been published is
+    /// considered part of the root package.
+    ///
+    /// If the validation mode requires verifying the root package at a specific address, then the
+    /// modules from the root package will be expected at address `0x0` and this address will be
+    /// substituted with the specified address.
+    fn local(&self, package: &CompiledPackage) -> Result<LocalModules, Error> {
+        let package = &package.package;
+        let root_package = package.compiled_package_info.package_name;
+        let mut map = LocalModules::new();
+
+        if self.verify_deps() {
+            let deps_compiled_units =
+                units_for_toolchain(&package.deps_compiled_units).map_err(|e| {
+                    Error::CannotCheckLocalModules {
+                        package: package.compiled_package_info.package_name,
                         message: e.to_string(),
                     }
-                })?
-            };
+                })?;
 
-            for (_, local_unit) in root_compiled_units {
+            for (package, local_unit) in deps_compiled_units {
                 let m = &local_unit.unit;
-
                 let module = m.name;
                 let address = m.address.into_inner();
+
+                // Skip modules with on 0x0 because they are treated as part of the root package,
+                // even if they are a source dependency.
                 if address == AccountAddress::ZERO {
-                    return Err(SourceVerificationError::InvalidModuleFailure {
-                        name: module.to_string(),
-                        message: "Can't verify unpublished source".to_string(),
-                    });
+                    continue;
                 }
 
-                map.insert((address, module), (root_package, m.module.clone()));
+                map.insert((address, module), (package, m.module.clone()));
             }
         }
 
-        // Include the root compiled units, and any unpublished dependencies with their
-        // addresses substituted
-        SourceMode::VerifyAt(root_address) => {
-            // Compile root modules with prior compiler if needed.
-            let root_compiled_units = {
-                let root_compiled_units = compiled_package
-                    .root_compiled_units
-                    .iter()
-                    .map(|u| ("root".into(), u.clone()))
-                    .collect::<Vec<_>>();
-
-                units_for_toolchain(&root_compiled_units).map_err(|e| {
-                    SourceVerificationError::CannotCheckLocalModules {
-                        package: compiled_package.compiled_package_info.package_name,
-                        message: e.to_string(),
-                    }
-                })?
-            };
+        let Self::Root { at, .. } = self else {
+            return Ok(map);
+        };
 
-            for (_, local_unit) in root_compiled_units {
-                let m = &local_unit.unit;
+        // Potentially rebuild according to the toolchain that the package was originally built
+        // with.
+        let root_compiled_units = units_for_toolchain(
+            &package
+                .root_compiled_units
+                .iter()
+                .map(|u| ("root".into(), u.clone()))
+                .collect(),
+        )
+        .map_err(|e| Error::CannotCheckLocalModules {
+            package: package.compiled_package_info.package_name,
+            message: e.to_string(),
+        })?;
 
-                let module = m.name;
-                map.insert(
-                    (root_address, module),
-                    (root_package, substitute_root_address(m, root_address)?),
-                );
-            }
+        // Add the root modules, potentially remapping 0x0 if we have been supplied an address to
+        // substitute with.
+        for (_, local_unit) in root_compiled_units {
+            let m = &local_unit.unit;
+            let module = m.name;
+            let address = m.address.into_inner();
+
+            let (address, compiled_module) = if let Some(root_address) = at {
+                (*root_address, substitute_root_address(m, *root_address)?)
+            } else if address == AccountAddress::ZERO {
+                return Err(Error::InvalidModuleFailure {
+                    name: module.to_string(),
+                    message: "Can't verify unpublished source".to_string(),
+                });
+            } else {
+                (address, m.module.clone())
+            };
 
-            for (package, local_unit) in &compiled_package.deps_compiled_units {
+            map.insert((address, module), (root_package, compiled_module));
+        }
+
+        // If we have a root address to substitute, we need to find unpublished dependencies that
+        // would have gone into the root package as well.
+        if let Some(root_address) = at {
+            for (package, local_unit) in &package.deps_compiled_units {
                 let m = &local_unit.unit;
                 let module = m.name;
                 let address = m.address.into_inner();
+
                 if address != AccountAddress::ZERO {
                     continue;
                 }
 
                 map.insert(
-                    (root_address, module),
-                    (*package, substitute_root_address(m, root_address)?),
+                    (*root_address, module),
+                    (*package, substitute_root_address(m, *root_address)?),
                 );
             }
         }
-    }
 
-    Ok(map)
-}
-
-fn current_toolchain() -> ToolchainVersion {
-    ToolchainVersion {
-        compiler_version: CURRENT_COMPILER_VERSION.into(),
-        edition: Edition::LEGACY, /* does not matter, unused for current_toolchain */
-        flavor: Flavor::Sui,      /* does not matter, unused for current_toolchain */
+        Ok(map)
     }
 }
 
-fn legacy_toolchain() -> ToolchainVersion {
-    ToolchainVersion {
-        compiler_version: LEGACY_COMPILER_VERSION.into(),
-        edition: Edition::LEGACY,
-        flavor: Flavor::Sui,
+impl<'a> BytecodeSourceVerifier<'a> {
+    pub fn new(rpc_client: &'a ReadApi) -> Self {
+        BytecodeSourceVerifier { rpc_client }
     }
-}
 
-/// Ensures `compiled_units` are compiled with the right compiler version, based on
-/// Move.lock contents. This works by detecting if a compiled unit requires a prior compiler version:
-/// - If so, download the compiler, recompile the unit, and return that unit in the result.
-/// - If not, simply keep the current compiled unit.
-fn units_for_toolchain(
-    compiled_units: &Vec<(PackageName, CompiledUnitWithSource)>,
-) -> anyhow::Result<Vec<(PackageName, CompiledUnitWithSource)>> {
-    if std::env::var("SUI_RUN_TOOLCHAIN_BUILD").is_err() {
-        return Ok(compiled_units.clone());
-    }
-    let mut package_version_map: HashMap<Symbol, (ToolchainVersion, Vec<CompiledUnitWithSource>)> =
-        HashMap::new();
-    // First iterate over packages, mapping the required version for each package in `package_version_map`.
-    for (package, local_unit) in compiled_units {
-        if let Some((_, units)) = package_version_map.get_mut(package) {
-            // We've processed this package's required version.
-            units.push(local_unit.clone());
-            continue;
+    /// Verify that the `compiled_package` matches its on-chain representation.
+    ///
+    /// See [`ValidationMode`] for more details on what is verified.
+    pub async fn verify(
+        &self,
+        package: &CompiledPackage,
+        mode: ValidationMode,
+    ) -> Result<(), AggregateError> {
+        if matches!(
+            mode,
+            ValidationMode::Root {
+                at: Some(AccountAddress::ZERO),
+                ..
+            }
+        ) {
+            return Err(Error::ZeroOnChainAddresSpecifiedFailure.into());
         }
 
-        if sui_types::is_system_package(local_unit.unit.address.into_inner()) {
-            // System packages are always compiled with the current compiler.
-            package_version_map.insert(*package, (current_toolchain(), vec![local_unit.clone()]));
-            continue;
-        }
+        let local = mode.local(package)?;
+        let mut chain = mode.on_chain(package, self).await?;
+        let mut errs = vec![];
 
-        let package_root = SourcePackageLayout::try_find_root(&local_unit.source_path)?;
-        let lock_file = package_root.join(SourcePackageLayout::Lock.path());
-        if !lock_file.exists() {
-            // No lock file implies current compiler for this package.
-            package_version_map.insert(*package, (current_toolchain(), vec![local_unit.clone()]));
-            continue;
+        // Check that the transitive dependencies listed on chain match the dependencies listed in
+        // source code. Ignore 0x0 becaus this signifies an unpublished dependency.
+        if let Some(on_chain_deps) = &mut chain.on_chain_dependencies {
+            for dependency_id in dependency_addresses(package) {
+                if dependency_id != AccountAddress::ZERO && !on_chain_deps.remove(&dependency_id) {
+                    errs.push(Error::MissingDependencyInLinkageTable(dependency_id));
+                }
+            }
         }
 
-        let mut lock_file = File::open(lock_file)?;
-        let lock_version = Header::read(&mut lock_file)?.version;
-        if lock_version == PRE_TOOLCHAIN_MOVE_LOCK_VERSION {
-            // No need to attempt reading lock file toolchain
-            debug!("{package} on legacy compiler",);
-            package_version_map.insert(*package, (legacy_toolchain(), vec![local_unit.clone()]));
-            continue;
+        for on_chain_dep_id in chain.on_chain_dependencies.take().into_iter().flatten() {
+            errs.push(Error::MissingDependencyInSourcePackage(on_chain_dep_id));
         }
 
-        // Read lock file toolchain info
-        lock_file.rewind()?;
-        let toolchain_version = ToolchainVersion::read(&mut lock_file)?;
-        match toolchain_version {
-            // No ToolchainVersion and new Move.lock version implies current compiler.
-            None => {
-                debug!("{package} on current compiler @ {CURRENT_COMPILER_VERSION}",);
-                package_version_map
-                    .insert(*package, (current_toolchain(), vec![local_unit.clone()]));
-            }
-            // This dependency uses the current compiler.
-            Some(ToolchainVersion {
-                compiler_version, ..
-            }) if compiler_version == CURRENT_COMPILER_VERSION => {
-                debug!("{package} on current compiler @ {CURRENT_COMPILER_VERSION}",);
-                package_version_map
-                    .insert(*package, (current_toolchain(), vec![local_unit.clone()]));
-            }
-            // This dependency needs a prior compiler. Mark it and compile.
-            Some(toolchain_version) => {
-                println!(
-                    "{} {package} compiler @ {}",
-                    "REQUIRE".bold().green(),
-                    toolchain_version.compiler_version.yellow(),
-                );
-                package_version_map.insert(*package, (toolchain_version, vec![local_unit.clone()]));
+        // Check that the contents of bytecode matches between modules.
+        for ((address, module), (package, local_module)) in local {
+            let Some(on_chain_module) = chain.modules.remove(&(address, module)) else {
+                errs.push(Error::OnChainDependencyNotFound { package, module });
+                continue;
+            };
+
+            if local_module != on_chain_module {
+                errs.push(Error::ModuleBytecodeMismatch {
+                    address,
+                    package,
+                    module,
+                })
             }
         }
-    }
 
-    let mut units = vec![];
-    // Iterate over compiled units, and check if they need to be recompiled and replaced by a prior compiler's output.
-    for (package, (toolchain_version, local_units)) in package_version_map {
-        if toolchain_version.compiler_version == CURRENT_COMPILER_VERSION {
-            let local_units: Vec<_> = local_units.iter().map(|u| (package, u.clone())).collect();
-            units.extend(local_units);
-            continue;
+        for (address, module) in chain.modules.into_keys() {
+            errs.push(Error::LocalDependencyNotFound { address, module });
         }
 
-        if local_units.is_empty() {
-            bail!("Expected one or more modules, but none found");
-        }
-        let package_root = SourcePackageLayout::try_find_root(&local_units[0].source_path)?;
-        let install_dir = tempfile::tempdir()?; // place compiled packages in this temp dir, don't pollute this packages build dir
-        download_and_compile(
-            package_root.clone(),
-            &install_dir,
-            &toolchain_version,
-            &package,
-        )?;
-
-        let compiled_unit_paths = vec![package_root.clone()];
-        let compiled_units = find_filenames(&compiled_unit_paths, |path| {
-            extension_equals(path, MOVE_COMPILED_EXTENSION)
-        })?;
-        let build_path = install_dir
-            .path()
-            .join(CompiledPackageLayout::path(&CompiledPackageLayout::Root))
-            .join(package.as_str());
-        debug!("build path is {}", build_path.display());
-
-        // Add all units compiled with the previous compiler.
-        for bytecode_path in compiled_units {
-            info!("bytecode path {bytecode_path}, {package}");
-            let local_unit = decode_bytecode_file(build_path.clone(), &package, &bytecode_path)?;
-            units.push((package, local_unit))
+        if !errs.is_empty() {
+            return Err(AggregateError(errs));
         }
-    }
-    Ok(units)
-}
 
-fn download_and_compile(
-    root: PathBuf,
-    install_dir: &TempDir,
-    ToolchainVersion {
-        compiler_version,
-        edition,
-        flavor,
-    }: &ToolchainVersion,
-    dep_name: &Symbol,
-) -> anyhow::Result<()> {
-    let dest_dir = PathBuf::from_iter([&*MOVE_HOME, "binaries"]); // E.g., ~/.move/binaries
-    let dest_version = dest_dir.join(compiler_version);
-    let mut dest_canonical_path = dest_version.clone();
-    dest_canonical_path.extend(["target", "release"]);
-    let mut dest_canonical_binary = dest_canonical_path.clone();
-
-    let platform = detect_platform(&root, compiler_version, &dest_canonical_path)?;
-    if platform == "windows-x86_64" {
-        dest_canonical_binary.push(CANONICAL_WIN_BINARY_NAME);
-    } else {
-        dest_canonical_binary.push(CANONICAL_UNIX_BINARY_NAME);
+        Ok(())
     }
 
-    if !dest_canonical_binary.exists() {
-        // Check the platform and proceed if we can download a binary. If not, the user should follow error instructions to sideload the binary.
-        // Download if binary does not exist.
-        let mainnet_url = format!(
-            "https://github.com/MystenLabs/sui/releases/download/mainnet-v{compiler_version}/sui-mainnet-v{compiler_version}-{platform}.tgz",
-        );
-
-        println!(
-            "{} mainnet compiler @ {} (this may take a while)",
-            "DOWNLOADING".bold().green(),
-            compiler_version.yellow()
-        );
-
-        let mut response = match ureq::get(&mainnet_url).call() {
-            Ok(response) => response,
-            Err(ureq::Error::Status(404, _)) => {
-                println!(
-                    "{} sui mainnet compiler {} not available, attempting to download testnet compiler release...",
-                    "WARNING".bold().yellow(),
-                    compiler_version.yellow()
-                );
-                println!(
-                    "{} testnet compiler @ {} (this may take a while)",
-                    "DOWNLOADING".bold().green(),
-                    compiler_version.yellow()
-                );
-                let testnet_url = format!("https://github.com/MystenLabs/sui/releases/download/testnet-v{compiler_version}/sui-testnet-v{compiler_version}-{platform}.tgz");
-                ureq::get(&testnet_url).call()?
+    async fn pkg_for_address(&self, addr: AccountAddress) -> Result<SuiRawMovePackage, Error> {
+        // Move packages are specified with an AccountAddress, but are
+        // fetched from a sui network via sui_getObject, which takes an object ID
+        let obj_id = ObjectID::from(addr);
+
+        // fetch the Sui object at the address specified for the package in the local resolution table
+        // if future packages with a large set of dependency packages prove too slow to verify,
+        // batched object fetching should be added to the ReadApi & used here
+        let obj_read = self
+            .rpc_client
+            .get_object_with_options(obj_id, SuiObjectDataOptions::new().with_bcs())
+            .await
+            .map_err(Error::DependencyObjectReadFailure)?;
+
+        let obj = obj_read
+            .into_object()
+            .map_err(Error::SuiObjectRefFailure)?
+            .bcs
+            .ok_or_else(|| {
+                Error::DependencyObjectReadFailure(SdkError::DataError(
+                    "Bcs field is not found".to_string(),
+                ))
+            })?;
+
+        match obj {
+            SuiRawData::Package(pkg) => Ok(pkg),
+            SuiRawData::MoveObject(move_obj) => {
+                Err(Error::ObjectFoundWhenPackageExpected(obj_id, move_obj))
             }
-            Err(e) => return Err(e.into()),
-        }.into_reader();
-
-        let dest_tarball = dest_version.join(format!("{}.tgz", compiler_version));
-        debug!("tarball destination: {} ", dest_tarball.display());
-        if let Some(parent) = dest_tarball.parent() {
-            std::fs::create_dir_all(parent)
-                .map_err(|e| anyhow!("failed to create directory for tarball: {e}"))?;
-        }
-        let mut dest_file = File::create(&dest_tarball)?;
-        io::copy(&mut response, &mut dest_file)?;
-
-        // Extract the tarball using the tar crate
-        let tar_gz = File::open(&dest_tarball)?;
-        let tar = flate2::read::GzDecoder::new(tar_gz);
-        let mut archive = Archive::new(tar);
-        archive
-            .unpack(&dest_version)
-            .map_err(|e| anyhow!("failed to untar compiler binary: {e}"))?;
-
-        let mut dest_binary = dest_version.clone();
-        dest_binary.extend(["target", "release"]);
-        if platform == "windows-x86_64" {
-            dest_binary.push(&format!("sui-{platform}.exe"));
-        } else {
-            dest_binary.push(&format!("sui-{platform}"));
         }
-        let dest_binary_os = OsStr::new(dest_binary.as_path());
-        set_executable_permission(dest_binary_os)?;
-        std::fs::rename(dest_binary_os, dest_canonical_binary.clone())?;
     }
-
-    debug!(
-        "{} move build --default-move-edition {} --default-move-flavor {} -p {} --install-dir {}",
-        dest_canonical_binary.display(),
-        edition.to_string().as_str(),
-        flavor.to_string().as_str(),
-        root.display(),
-        install_dir.path().display(),
-    );
-    info!(
-        "{} {} (compiler @ {})",
-        "BUILDING".bold().green(),
-        dep_name.as_str(),
-        compiler_version.yellow()
-    );
-    Command::new(dest_canonical_binary)
-        .args([
-            OsStr::new("move"),
-            OsStr::new("build"),
-            OsStr::new("--default-move-edition"),
-            OsStr::new(edition.to_string().as_str()),
-            OsStr::new("--default-move-flavor"),
-            OsStr::new(flavor.to_string().as_str()),
-            OsStr::new("-p"),
-            OsStr::new(root.as_path()),
-            OsStr::new("--install-dir"),
-            OsStr::new(install_dir.path()),
-        ])
-        .output()
-        .map_err(|e| {
-            anyhow!("failed to build package from compiler binary {compiler_version}: {e}",)
-        })?;
-    Ok(())
 }
 
-fn detect_platform(
-    package_path: &Path,
-    compiler_version: &String,
-    dest_dir: &Path,
-) -> anyhow::Result<String> {
-    let s = match (std::env::consts::OS, std::env::consts::ARCH) {
-        ("macos", "aarch64") => "macos-arm64",
-        ("macos", "x86_64") => "macos-x86_64",
-        ("linux", "x86_64") => "ubuntu-x86_64",
-        ("windows", "x86_64") => "windows-x86_64",
-        (os, arch) => {
-            let mut binary_name = CANONICAL_UNIX_BINARY_NAME;
-            if os == "windows" {
-                binary_name = CANONICAL_WIN_BINARY_NAME;
-            };
-            bail!(
-                "The package {} needs to be built with sui compiler version {compiler_version} but there \
-                 is no binary release available to download for your platform:\n\
-                 Operating System: {os}\n\
-                 Architecture: {arch}\n\
-                 You can manually put a {binary_name} binary for your platform in {} and rerun your command to continue.",
-                package_path.display(),
-                dest_dir.display(),
-            )
-        }
+fn substitute_root_address(
+    named_module: &NamedCompiledModule,
+    root: AccountAddress,
+) -> Result<CompiledModule, Error> {
+    let mut module = named_module.module.clone();
+    let address_idx = module.self_handle().address;
+
+    let Some(addr) = module.address_identifiers.get_mut(address_idx.0 as usize) else {
+        return Err(Error::InvalidModuleFailure {
+            name: named_module.name.to_string(),
+            message: "Self address field missing".into(),
+        });
     };
-    Ok(s.into())
-}
 
-#[cfg(unix)]
-fn set_executable_permission(path: &OsStr) -> anyhow::Result<()> {
-    use std::fs;
-    use std::os::unix::prelude::PermissionsExt;
-    let mut perms = fs::metadata(path)?.permissions();
-    perms.set_mode(0o755);
-    fs::set_permissions(path, perms)?;
-    Ok(())
-}
+    if *addr != AccountAddress::ZERO {
+        return Err(Error::InvalidModuleFailure {
+            name: named_module.name.to_string(),
+            message: "Self address already populated".to_string(),
+        });
+    }
 
-#[cfg(not(unix))]
-fn set_executable_permission(path: &OsStr) -> anyhow::Result<()> {
-    Command::new("icacls")
-        .args([path, OsStr::new("/grant"), OsStr::new("Everyone:(RX)")])
-        .status()?;
-    Ok(())
+    *addr = root;
+    Ok(module)
 }
 
-fn decode_bytecode_file(
-    root_path: PathBuf,
-    package_name: &Symbol,
-    bytecode_path_str: &str,
-) -> anyhow::Result<CompiledUnitWithSource> {
-    let package_name_opt = Some(*package_name);
-    let bytecode_path = Path::new(bytecode_path_str);
-    let path_to_file = CompiledPackageLayout::path_to_file_after_category(bytecode_path);
-    let bytecode_bytes = std::fs::read(bytecode_path)?;
-    let source_map = source_map_from_file(
-        &root_path
-            .join(CompiledPackageLayout::SourceMaps.path())
-            .join(&path_to_file)
-            .with_extension(SOURCE_MAP_EXTENSION),
-    )?;
-    let source_path = &root_path
-        .join(CompiledPackageLayout::Sources.path())
-        .join(path_to_file)
-        .with_extension(MOVE_EXTENSION);
-    ensure!(
-        source_path.is_file(),
-        "Error decoding package: Unable to find corresponding source file for '{bytecode_path_str}' in package {package_name}"
-    );
-    let module = CompiledModule::deserialize_with_defaults(&bytecode_bytes)?;
-    let (address_bytes, module_name) = {
-        let id = module.self_id();
-        let parsed_addr = NumericalAddress::new(
-            id.address().into_bytes(),
-            move_compiler::shared::NumberFormat::Hex,
-        );
-        let module_name = FileName::from(id.name().as_str());
-        (parsed_addr, module_name)
-    };
-    let unit = NamedCompiledModule {
-        package_name: package_name_opt,
-        address: address_bytes,
-        name: module_name,
-        module,
-        source_map,
-        address_name: None,
-    };
-    Ok(CompiledUnitWithSource {
-        unit,
-        source_path: source_path.clone(),
-    })
+/// The on-chain addresses for a source package's dependencies
+fn dependency_addresses(package: &CompiledPackage) -> impl Iterator<Item = AccountAddress> + '_ {
+    package.dependency_ids.published.values().map(|id| **id)
 }
diff --git a/crates/sui-source-validation/src/tests.rs b/crates/sui-source-validation/src/tests.rs
index 596771fb78013..620b209e43d5b 100644
--- a/crates/sui-source-validation/src/tests.rs
+++ b/crates/sui-source-validation/src/tests.rs
@@ -21,7 +21,8 @@ use sui_types::{
 };
 use test_cluster::TestClusterBuilder;
 
-use crate::{BytecodeSourceVerifier, SourceMode, CURRENT_COMPILER_VERSION};
+use crate::toolchain::CURRENT_COMPILER_VERSION;
+use crate::{BytecodeSourceVerifier, ValidationMode};
 
 #[tokio::test]
 async fn successful_verification() -> anyhow::Result<()> {
@@ -53,30 +54,27 @@ async fn successful_verification() -> anyhow::Result<()> {
     let client = context.get_client().await?;
     let verifier = BytecodeSourceVerifier::new(client.read_api());
 
-    // Skip deps and root
+    // Verify root without updating the address
     verifier
-        .verify_package(&a_pkg, /* verify_deps */ false, SourceMode::Skip)
+        .verify(&b_pkg, ValidationMode::root())
         .await
         .unwrap();
 
-    // Verify root without updating the address
+    // Verify deps but skip root
     verifier
-        .verify_package(&b_pkg, /* verify_deps */ false, SourceMode::Verify)
+        .verify(&a_pkg, ValidationMode::deps())
         .await
         .unwrap();
 
-    // Verify deps but skip root
-    verifier.verify_package_deps(&a_pkg).await.unwrap();
-
     // Skip deps but verify root
     verifier
-        .verify_package_root(&a_pkg, a_ref.0.into())
+        .verify(&a_pkg, ValidationMode::root_at(a_ref.0.into()))
         .await
         .unwrap();
 
     // Verify both deps and root
     verifier
-        .verify_package_root_and_deps(&a_pkg, a_ref.0.into())
+        .verify(&a_pkg, ValidationMode::root_and_deps_at(a_ref.0.into()))
         .await
         .unwrap();
 
@@ -102,7 +100,7 @@ async fn successful_verification_unpublished_deps() -> anyhow::Result<()> {
 
     // Verify the root package which now includes dependency modules
     verifier
-        .verify_package_root(&a_pkg, a_ref.0.into())
+        .verify(&a_pkg, ValidationMode::root_at(a_ref.0.into()))
         .await
         .unwrap();
 
@@ -135,11 +133,8 @@ async fn successful_verification_module_ordering() -> anyhow::Result<()> {
     };
 
     let client = context.get_client().await?;
-    let verifier = BytecodeSourceVerifier::new(client.read_api());
-
-    let verify_deps = false;
-    verifier
-        .verify_package(&z_pkg, verify_deps, SourceMode::Verify)
+    BytecodeSourceVerifier::new(client.read_api())
+        .verify(&z_pkg, ValidationMode::root())
         .await
         .unwrap();
 
@@ -175,14 +170,16 @@ async fn successful_verification_upgrades() -> anyhow::Result<()> {
     let verifier = BytecodeSourceVerifier::new(client.read_api());
 
     // Verify the upgraded package b-v2 as the root.
-    let verify_deps = false;
     verifier
-        .verify_package(&b_pkg, verify_deps, SourceMode::Verify)
+        .verify(&b_pkg, ValidationMode::root())
         .await
         .unwrap();
 
     // Verify the upgraded package b-v2 as a dep of e.
-    verifier.verify_package_deps(&e_pkg).await.unwrap();
+    verifier
+        .verify(&e_pkg, ValidationMode::deps())
+        .await
+        .unwrap();
 
     Ok(())
 }
@@ -207,12 +204,13 @@ async fn fail_verification_bad_address() -> anyhow::Result<()> {
     };
 
     let client = context.get_client().await?;
-    let verifier = BytecodeSourceVerifier::new(client.read_api());
-
     let expected = expect!["On-chain address cannot be zero"];
     expected.assert_eq(
-        &verifier
-            .verify_package_root_and_deps(&a_pkg, AccountAddress::ZERO)
+        &BytecodeSourceVerifier::new(client.read_api())
+            .verify(
+                &a_pkg,
+                ValidationMode::root_and_deps_at(AccountAddress::ZERO),
+            )
             .await
             .unwrap_err()
             .to_string(),
@@ -233,14 +231,13 @@ async fn fail_to_verify_unpublished_root() -> anyhow::Result<()> {
     };
 
     let client = context.get_client().await?;
-    let verifier = BytecodeSourceVerifier::new(client.read_api());
 
     // Trying to verify the root package, which hasn't been published -- this is going to fail
     // because there is no on-chain package to verify against.
     let expected = expect!["Invalid module b with error: Can't verify unpublished source"];
     expected.assert_eq(
-        &verifier
-            .verify_package(&b_pkg, /* verify_deps */ false, SourceMode::Verify)
+        &BytecodeSourceVerifier::new(client.read_api())
+            .verify(&b_pkg, ValidationMode::root())
             .await
             .unwrap_err()
             .to_string(),
@@ -319,7 +316,7 @@ async fn package_not_found() -> anyhow::Result<()> {
     let client = context.get_client().await?;
     let verifier = BytecodeSourceVerifier::new(client.read_api());
 
-    let Err(err) = verifier.verify_package_deps(&a_pkg).await else {
+    let Err(err) = verifier.verify(&a_pkg, ValidationMode::deps()).await else {
         panic!("Expected verification to fail");
     };
 
@@ -330,7 +327,7 @@ async fn package_not_found() -> anyhow::Result<()> {
     let package_root = AccountAddress::random();
     stable_addrs.insert(SuiAddress::from(package_root), "<id>");
     let Err(err) = verifier
-        .verify_package_root_and_deps(&a_pkg, package_root)
+        .verify(&a_pkg, ValidationMode::root_and_deps_at(package_root))
         .await
     else {
         panic!("Expected verification to fail");
@@ -344,7 +341,10 @@ async fn package_not_found() -> anyhow::Result<()> {
 
     let package_root = AccountAddress::random();
     stable_addrs.insert(SuiAddress::from(package_root), "<id>");
-    let Err(err) = verifier.verify_package_root(&a_pkg, package_root).await else {
+    let Err(err) = verifier
+        .verify(&a_pkg, ValidationMode::root_at(package_root))
+        .await
+    else {
         panic!("Expected verification to fail");
     };
 
@@ -367,13 +367,12 @@ async fn dependency_is_an_object() -> anyhow::Result<()> {
         let a_src = copy_published_package(&a_pkg_fixtures, "a", SuiAddress::ZERO).await?;
         compile_package(a_src)
     };
-    let client = context.get_client().await?;
-    let verifier = BytecodeSourceVerifier::new(client.read_api());
 
+    let client = context.get_client().await?;
     let expected = expect!["Dependency ID contains a Sui object, not a Move package: 0x0000000000000000000000000000000000000000000000000000000000000005"];
     expected.assert_eq(
-        &verifier
-            .verify_package_deps(&a_pkg)
+        &BytecodeSourceVerifier::new(client.read_api())
+            .verify(&a_pkg, ValidationMode::deps())
             .await
             .unwrap_err()
             .to_string(),
@@ -400,10 +399,12 @@ async fn module_not_found_on_chain() -> anyhow::Result<()> {
         let a_src = copy_published_package(&a_pkg_fixtures, "a", SuiAddress::ZERO).await?;
         compile_package(a_src)
     };
-    let client = context.get_client().await?;
-    let verifier = BytecodeSourceVerifier::new(client.read_api());
 
-    let Err(err) = verifier.verify_package_deps(&a_pkg).await else {
+    let client = context.get_client().await?;
+    let Err(err) = BytecodeSourceVerifier::new(client.read_api())
+        .verify(&a_pkg, ValidationMode::deps())
+        .await
+    else {
         panic!("Expected verification to fail");
     };
 
@@ -436,9 +437,10 @@ async fn module_not_found_locally() -> anyhow::Result<()> {
     };
 
     let client = context.get_client().await?;
-    let verifier = BytecodeSourceVerifier::new(client.read_api());
-
-    let Err(err) = verifier.verify_package_deps(&a_pkg).await else {
+    let Err(err) = BytecodeSourceVerifier::new(client.read_api())
+        .verify(&a_pkg, ValidationMode::deps())
+        .await
+    else {
         panic!("Expected verification to fail");
     };
 
@@ -491,14 +493,17 @@ async fn module_bytecode_mismatch() -> anyhow::Result<()> {
     let client = context.get_client().await?;
     let verifier = BytecodeSourceVerifier::new(client.read_api());
 
-    let Err(err) = verifier.verify_package_deps(&a_pkg).await else {
+    let Err(err) = verifier.verify(&a_pkg, ValidationMode::deps()).await else {
         panic!("Expected verification to fail");
     };
 
     let expected = expect!["Local dependency did not match its on-chain version at <b_id>::b::c"];
     expected.assert_eq(&sanitize_id(err.to_string(), &stable_addrs));
 
-    let Err(err) = verifier.verify_package_root(&a_pkg, a_addr.into()).await else {
+    let Err(err) = verifier
+        .verify(&a_pkg, ValidationMode::root_at(a_addr.into()))
+        .await
+    else {
         panic!("Expected verification to fail");
     };
 
@@ -508,6 +513,73 @@ async fn module_bytecode_mismatch() -> anyhow::Result<()> {
     Ok(())
 }
 
+#[tokio::test]
+async fn linkage_differs() -> anyhow::Result<()> {
+    let mut cluster = TestClusterBuilder::new().build().await;
+    let context = &mut cluster.wallet;
+
+    let b_v1_fixtures = tempfile::tempdir()?;
+    let (b_v1, b_cap) = {
+        let b_src = copy_published_package(&b_v1_fixtures, "b", SuiAddress::ZERO).await?;
+        publish_package(context, b_src).await
+    };
+
+    let b_v2_fixtures = tempfile::tempdir()?;
+    let b_v2 = {
+        let b_src =
+            copy_upgraded_package(&b_v2_fixtures, "b-v2", b_v1.0.into(), SuiAddress::ZERO).await?;
+        upgrade_package(context, b_v1.0, b_cap.0, b_src).await
+    };
+
+    // Publish b-v2 a second time, to create a third version of the package that is othewise
+    // byte-for-byte identical with the second version;
+    let b_v3_fixtures = tempfile::tempdir()?;
+    let b_v3 = {
+        let b_src =
+            copy_upgraded_package(&b_v3_fixtures, "b-v2", b_v2.0.into(), SuiAddress::ZERO).await?;
+        upgrade_package(context, b_v2.0, b_cap.0, b_src).await
+    };
+
+    // Publish E pointing at v2 of B.
+    let e_v1_fixtures = tempfile::tempdir()?;
+    let (e_v1, _) = {
+        copy_upgraded_package(&e_v1_fixtures, "b-v2", b_v2.0.into(), b_v1.0.into()).await?;
+        let e_src = copy_published_package(&e_v1_fixtures, "e", SuiAddress::ZERO).await?;
+        publish_package(context, e_src).await
+    };
+
+    // Compile E pointing at v3 of B, which is byte-for-byte identical with v2, but nevertheless
+    // has a different address.
+    let e_v2_fixtures = tempfile::tempdir()?;
+    let e_pkg = {
+        copy_upgraded_package(&e_v2_fixtures, "b-v2", b_v3.0.into(), b_v1.0.into()).await?;
+        let e_src = copy_published_package(&e_v2_fixtures, "e", e_v1.0.into()).await?;
+        compile_package(e_src)
+    };
+
+    let client = context.get_client().await?;
+    let stable_ids = HashMap::from_iter([
+        (b_v1.0.into(), "<b1>"),
+        (b_v2.0.into(), "<b2>"),
+        (b_v3.0.into(), "<b3>"),
+    ]);
+
+    let error = BytecodeSourceVerifier::new(client.read_api())
+        .verify(&e_pkg, ValidationMode::root())
+        .await
+        .unwrap_err()
+        .to_string();
+
+    let expected = expect![[r#"
+        Multiple source verification errors found:
+
+        - Source package depends on <b3> which is not in the linkage table.
+        - On-chain package depends on <b2> which is not a source dependency."#]];
+    expected.assert_eq(&sanitize_id(error, &stable_ids));
+
+    Ok(())
+}
+
 #[tokio::test]
 async fn multiple_failures() -> anyhow::Result<()> {
     let mut cluster = TestClusterBuilder::new().build().await;
@@ -546,9 +618,10 @@ async fn multiple_failures() -> anyhow::Result<()> {
     };
 
     let client = context.get_client().await?;
-    let verifier = BytecodeSourceVerifier::new(client.read_api());
-
-    let Err(err) = verifier.verify_package_deps(&d_pkg).await else {
+    let Err(err) = BytecodeSourceVerifier::new(client.read_api())
+        .verify(&d_pkg, ValidationMode::deps())
+        .await
+    else {
         panic!("Expected verification to fail");
     };
 
@@ -584,10 +657,12 @@ async fn successful_versioned_dependency_verification() -> anyhow::Result<()> {
     };
 
     let client = context.get_client().await?;
-    let verifier = BytecodeSourceVerifier::new(client.read_api());
 
     // Verify versioned dependency
-    verifier.verify_package_deps(&a_pkg).await.unwrap();
+    BytecodeSourceVerifier::new(client.read_api())
+        .verify(&a_pkg, ValidationMode::deps())
+        .await
+        .unwrap();
 
     Ok(())
 }
diff --git a/crates/sui-source-validation/src/toolchain.rs b/crates/sui-source-validation/src/toolchain.rs
new file mode 100644
index 0000000000000..54f87f2e1b83a
--- /dev/null
+++ b/crates/sui-source-validation/src/toolchain.rs
@@ -0,0 +1,387 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use std::{
+    collections::HashMap,
+    ffi::OsStr,
+    fs::File,
+    io::{self, Seek},
+    path::{Path, PathBuf},
+    process::Command,
+};
+
+use anyhow::{anyhow, bail, ensure};
+use colored::Colorize;
+use move_binary_format::CompiledModule;
+use move_bytecode_source_map::utils::source_map_from_file;
+use move_command_line_common::{
+    env::MOVE_HOME,
+    files::{
+        extension_equals, find_filenames, MOVE_COMPILED_EXTENSION, MOVE_EXTENSION,
+        SOURCE_MAP_EXTENSION,
+    },
+};
+use move_compiler::{
+    compiled_unit::NamedCompiledModule,
+    editions::{Edition, Flavor},
+    shared::{files::FileName, NumericalAddress},
+};
+use move_package::{
+    compilation::{
+        compiled_package::CompiledUnitWithSource, package_layout::CompiledPackageLayout,
+    },
+    lock_file::schema::{Header, ToolchainVersion},
+    source_package::{layout::SourcePackageLayout, parsed_manifest::PackageName},
+};
+use move_symbol_pool::Symbol;
+use tar::Archive;
+use tempfile::TempDir;
+use tracing::{debug, info};
+
+pub(crate) const CURRENT_COMPILER_VERSION: &str = env!("CARGO_PKG_VERSION");
+const LEGACY_COMPILER_VERSION: &str = CURRENT_COMPILER_VERSION; // TODO: update this when Move 2024 is released
+const PRE_TOOLCHAIN_MOVE_LOCK_VERSION: u64 = 0; // Used to detect lockfiles pre-toolchain versioning support
+const CANONICAL_UNIX_BINARY_NAME: &str = "sui";
+const CANONICAL_WIN_BINARY_NAME: &str = "sui.exe";
+
+pub(crate) fn current_toolchain() -> ToolchainVersion {
+    ToolchainVersion {
+        compiler_version: CURRENT_COMPILER_VERSION.into(),
+        edition: Edition::LEGACY, /* does not matter, unused for current_toolchain */
+        flavor: Flavor::Sui,      /* does not matter, unused for current_toolchain */
+    }
+}
+
+pub(crate) fn legacy_toolchain() -> ToolchainVersion {
+    ToolchainVersion {
+        compiler_version: LEGACY_COMPILER_VERSION.into(),
+        edition: Edition::LEGACY,
+        flavor: Flavor::Sui,
+    }
+}
+
+/// Ensures `compiled_units` are compiled with the right compiler version, based on
+/// Move.lock contents. This works by detecting if a compiled unit requires a prior compiler version:
+/// - If so, download the compiler, recompile the unit, and return that unit in the result.
+/// - If not, simply keep the current compiled unit.
+pub(crate) fn units_for_toolchain(
+    compiled_units: &Vec<(PackageName, CompiledUnitWithSource)>,
+) -> anyhow::Result<Vec<(PackageName, CompiledUnitWithSource)>> {
+    if std::env::var("SUI_RUN_TOOLCHAIN_BUILD").is_err() {
+        return Ok(compiled_units.clone());
+    }
+    let mut package_version_map: HashMap<Symbol, (ToolchainVersion, Vec<CompiledUnitWithSource>)> =
+        HashMap::new();
+    // First iterate over packages, mapping the required version for each package in `package_version_map`.
+    for (package, local_unit) in compiled_units {
+        if let Some((_, units)) = package_version_map.get_mut(package) {
+            // We've processed this package's required version.
+            units.push(local_unit.clone());
+            continue;
+        }
+
+        if sui_types::is_system_package(local_unit.unit.address.into_inner()) {
+            // System packages are always compiled with the current compiler.
+            package_version_map.insert(*package, (current_toolchain(), vec![local_unit.clone()]));
+            continue;
+        }
+
+        let package_root = SourcePackageLayout::try_find_root(&local_unit.source_path)?;
+        let lock_file = package_root.join(SourcePackageLayout::Lock.path());
+        if !lock_file.exists() {
+            // No lock file implies current compiler for this package.
+            package_version_map.insert(*package, (current_toolchain(), vec![local_unit.clone()]));
+            continue;
+        }
+
+        let mut lock_file = File::open(lock_file)?;
+        let lock_version = Header::read(&mut lock_file)?.version;
+        if lock_version == PRE_TOOLCHAIN_MOVE_LOCK_VERSION {
+            // No need to attempt reading lock file toolchain
+            debug!("{package} on legacy compiler",);
+            package_version_map.insert(*package, (legacy_toolchain(), vec![local_unit.clone()]));
+            continue;
+        }
+
+        // Read lock file toolchain info
+        lock_file.rewind()?;
+        let toolchain_version = ToolchainVersion::read(&mut lock_file)?;
+        match toolchain_version {
+            // No ToolchainVersion and new Move.lock version implies current compiler.
+            None => {
+                debug!("{package} on current compiler @ {CURRENT_COMPILER_VERSION}",);
+                package_version_map
+                    .insert(*package, (current_toolchain(), vec![local_unit.clone()]));
+            }
+            // This dependency uses the current compiler.
+            Some(ToolchainVersion {
+                compiler_version, ..
+            }) if compiler_version == CURRENT_COMPILER_VERSION => {
+                debug!("{package} on current compiler @ {CURRENT_COMPILER_VERSION}",);
+                package_version_map
+                    .insert(*package, (current_toolchain(), vec![local_unit.clone()]));
+            }
+            // This dependency needs a prior compiler. Mark it and compile.
+            Some(toolchain_version) => {
+                println!(
+                    "{} {package} compiler @ {}",
+                    "REQUIRE".bold().green(),
+                    toolchain_version.compiler_version.yellow(),
+                );
+                package_version_map.insert(*package, (toolchain_version, vec![local_unit.clone()]));
+            }
+        }
+    }
+
+    let mut units = vec![];
+    // Iterate over compiled units, and check if they need to be recompiled and replaced by a prior compiler's output.
+    for (package, (toolchain_version, local_units)) in package_version_map {
+        if toolchain_version.compiler_version == CURRENT_COMPILER_VERSION {
+            let local_units: Vec<_> = local_units.iter().map(|u| (package, u.clone())).collect();
+            units.extend(local_units);
+            continue;
+        }
+
+        if local_units.is_empty() {
+            bail!("Expected one or more modules, but none found");
+        }
+        let package_root = SourcePackageLayout::try_find_root(&local_units[0].source_path)?;
+        let install_dir = tempfile::tempdir()?; // place compiled packages in this temp dir, don't pollute this packages build dir
+        download_and_compile(
+            package_root.clone(),
+            &install_dir,
+            &toolchain_version,
+            &package,
+        )?;
+
+        let compiled_unit_paths = vec![package_root.clone()];
+        let compiled_units = find_filenames(&compiled_unit_paths, |path| {
+            extension_equals(path, MOVE_COMPILED_EXTENSION)
+        })?;
+        let build_path = install_dir
+            .path()
+            .join(CompiledPackageLayout::path(&CompiledPackageLayout::Root))
+            .join(package.as_str());
+        debug!("build path is {}", build_path.display());
+
+        // Add all units compiled with the previous compiler.
+        for bytecode_path in compiled_units {
+            info!("bytecode path {bytecode_path}, {package}");
+            let local_unit = decode_bytecode_file(build_path.clone(), &package, &bytecode_path)?;
+            units.push((package, local_unit))
+        }
+    }
+    Ok(units)
+}
+
+fn download_and_compile(
+    root: PathBuf,
+    install_dir: &TempDir,
+    ToolchainVersion {
+        compiler_version,
+        edition,
+        flavor,
+    }: &ToolchainVersion,
+    dep_name: &Symbol,
+) -> anyhow::Result<()> {
+    let dest_dir = PathBuf::from_iter([&*MOVE_HOME, "binaries"]); // E.g., ~/.move/binaries
+    let dest_version = dest_dir.join(compiler_version);
+    let mut dest_canonical_path = dest_version.clone();
+    dest_canonical_path.extend(["target", "release"]);
+    let mut dest_canonical_binary = dest_canonical_path.clone();
+
+    let platform = detect_platform(&root, compiler_version, &dest_canonical_path)?;
+    if platform == "windows-x86_64" {
+        dest_canonical_binary.push(CANONICAL_WIN_BINARY_NAME);
+    } else {
+        dest_canonical_binary.push(CANONICAL_UNIX_BINARY_NAME);
+    }
+
+    if !dest_canonical_binary.exists() {
+        // Check the platform and proceed if we can download a binary. If not, the user should follow error instructions to sideload the binary.
+        // Download if binary does not exist.
+        let mainnet_url = format!(
+            "https://github.com/MystenLabs/sui/releases/download/mainnet-v{compiler_version}/sui-mainnet-v{compiler_version}-{platform}.tgz",
+        );
+
+        println!(
+            "{} mainnet compiler @ {} (this may take a while)",
+            "DOWNLOADING".bold().green(),
+            compiler_version.yellow()
+        );
+
+        let mut response = match ureq::get(&mainnet_url).call() {
+            Ok(response) => response,
+            Err(ureq::Error::Status(404, _)) => {
+                println!(
+                    "{} sui mainnet compiler {} not available, attempting to download testnet compiler release...",
+                    "WARNING".bold().yellow(),
+                    compiler_version.yellow()
+                );
+                println!(
+                    "{} testnet compiler @ {} (this may take a while)",
+                    "DOWNLOADING".bold().green(),
+                    compiler_version.yellow()
+                );
+                let testnet_url = format!("https://github.com/MystenLabs/sui/releases/download/testnet-v{compiler_version}/sui-testnet-v{compiler_version}-{platform}.tgz");
+                ureq::get(&testnet_url).call()?
+            }
+            Err(e) => return Err(e.into()),
+        }.into_reader();
+
+        let dest_tarball = dest_version.join(format!("{}.tgz", compiler_version));
+        debug!("tarball destination: {} ", dest_tarball.display());
+        if let Some(parent) = dest_tarball.parent() {
+            std::fs::create_dir_all(parent)
+                .map_err(|e| anyhow!("failed to create directory for tarball: {e}"))?;
+        }
+        let mut dest_file = File::create(&dest_tarball)?;
+        io::copy(&mut response, &mut dest_file)?;
+
+        // Extract the tarball using the tar crate
+        let tar_gz = File::open(&dest_tarball)?;
+        let tar = flate2::read::GzDecoder::new(tar_gz);
+        let mut archive = Archive::new(tar);
+        archive
+            .unpack(&dest_version)
+            .map_err(|e| anyhow!("failed to untar compiler binary: {e}"))?;
+
+        let mut dest_binary = dest_version.clone();
+        dest_binary.extend(["target", "release"]);
+        if platform == "windows-x86_64" {
+            dest_binary.push(&format!("sui-{platform}.exe"));
+        } else {
+            dest_binary.push(&format!("sui-{platform}"));
+        }
+        let dest_binary_os = OsStr::new(dest_binary.as_path());
+        set_executable_permission(dest_binary_os)?;
+        std::fs::rename(dest_binary_os, dest_canonical_binary.clone())?;
+    }
+
+    debug!(
+        "{} move build --default-move-edition {} --default-move-flavor {} -p {} --install-dir {}",
+        dest_canonical_binary.display(),
+        edition.to_string().as_str(),
+        flavor.to_string().as_str(),
+        root.display(),
+        install_dir.path().display(),
+    );
+    info!(
+        "{} {} (compiler @ {})",
+        "BUILDING".bold().green(),
+        dep_name.as_str(),
+        compiler_version.yellow()
+    );
+    Command::new(dest_canonical_binary)
+        .args([
+            OsStr::new("move"),
+            OsStr::new("build"),
+            OsStr::new("--default-move-edition"),
+            OsStr::new(edition.to_string().as_str()),
+            OsStr::new("--default-move-flavor"),
+            OsStr::new(flavor.to_string().as_str()),
+            OsStr::new("-p"),
+            OsStr::new(root.as_path()),
+            OsStr::new("--install-dir"),
+            OsStr::new(install_dir.path()),
+        ])
+        .output()
+        .map_err(|e| {
+            anyhow!("failed to build package from compiler binary {compiler_version}: {e}",)
+        })?;
+    Ok(())
+}
+
+fn detect_platform(
+    package_path: &Path,
+    compiler_version: &String,
+    dest_dir: &Path,
+) -> anyhow::Result<String> {
+    let s = match (std::env::consts::OS, std::env::consts::ARCH) {
+        ("macos", "aarch64") => "macos-arm64",
+        ("macos", "x86_64") => "macos-x86_64",
+        ("linux", "x86_64") => "ubuntu-x86_64",
+        ("windows", "x86_64") => "windows-x86_64",
+        (os, arch) => {
+            let mut binary_name = CANONICAL_UNIX_BINARY_NAME;
+            if os == "windows" {
+                binary_name = CANONICAL_WIN_BINARY_NAME;
+            };
+            bail!(
+                "The package {} needs to be built with sui compiler version {compiler_version} but there \
+                 is no binary release available to download for your platform:\n\
+                 Operating System: {os}\n\
+                 Architecture: {arch}\n\
+                 You can manually put a {binary_name} binary for your platform in {} and rerun your command to continue.",
+                package_path.display(),
+                dest_dir.display(),
+            )
+        }
+    };
+    Ok(s.into())
+}
+
+#[cfg(unix)]
+fn set_executable_permission(path: &OsStr) -> anyhow::Result<()> {
+    use std::fs;
+    use std::os::unix::prelude::PermissionsExt;
+    let mut perms = fs::metadata(path)?.permissions();
+    perms.set_mode(0o755);
+    fs::set_permissions(path, perms)?;
+    Ok(())
+}
+
+#[cfg(not(unix))]
+fn set_executable_permission(path: &OsStr) -> anyhow::Result<()> {
+    Command::new("icacls")
+        .args([path, OsStr::new("/grant"), OsStr::new("Everyone:(RX)")])
+        .status()?;
+    Ok(())
+}
+
+fn decode_bytecode_file(
+    root_path: PathBuf,
+    package_name: &Symbol,
+    bytecode_path_str: &str,
+) -> anyhow::Result<CompiledUnitWithSource> {
+    let package_name_opt = Some(*package_name);
+    let bytecode_path = Path::new(bytecode_path_str);
+    let path_to_file = CompiledPackageLayout::path_to_file_after_category(bytecode_path);
+    let bytecode_bytes = std::fs::read(bytecode_path)?;
+    let source_map = source_map_from_file(
+        &root_path
+            .join(CompiledPackageLayout::SourceMaps.path())
+            .join(&path_to_file)
+            .with_extension(SOURCE_MAP_EXTENSION),
+    )?;
+    let source_path = &root_path
+        .join(CompiledPackageLayout::Sources.path())
+        .join(path_to_file)
+        .with_extension(MOVE_EXTENSION);
+    ensure!(
+        source_path.is_file(),
+        "Error decoding package: Unable to find corresponding source file for '{bytecode_path_str}' in package {package_name}"
+    );
+    let module = CompiledModule::deserialize_with_defaults(&bytecode_bytes)?;
+    let (address_bytes, module_name) = {
+        let id = module.self_id();
+        let parsed_addr = NumericalAddress::new(
+            id.address().into_bytes(),
+            move_compiler::shared::NumberFormat::Hex,
+        );
+        let module_name = FileName::from(id.name().as_str());
+        (parsed_addr, module_name)
+    };
+    let unit = NamedCompiledModule {
+        package_name: package_name_opt,
+        address: address_bytes,
+        name: module_name,
+        module,
+        source_map,
+        address_name: None,
+    };
+    Ok(CompiledUnitWithSource {
+        unit,
+        source_path: source_path.clone(),
+    })
+}
diff --git a/crates/sui-storage/Cargo.toml b/crates/sui-storage/Cargo.toml
index 77a34512daf46..ff541a7b7e962 100644
--- a/crates/sui-storage/Cargo.toml
+++ b/crates/sui-storage/Cargo.toml
@@ -6,6 +6,9 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 integer-encoding.workspace = true
 async-trait.workspace = true
@@ -14,7 +17,6 @@ num_enum.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 tokio = { workspace = true, features = ["full", "tracing"] }
-rocksdb.workspace = true
 tracing.workspace = true
 byteorder.workspace = true
 anyhow.workspace = true
@@ -47,7 +49,6 @@ sui-json-rpc-types.workspace = true
 sui-protocol-config.workspace = true
 sui-config.workspace = true
 typed-store.workspace = true
-typed-store-derive.workspace = true
 eyre.workspace = true
 lru.workspace = true
 
@@ -55,6 +56,7 @@ move-binary-format.workspace = true
 move-bytecode-utils.workspace = true
 
 [dev-dependencies]
+axum.workspace = true
 anyhow.workspace = true
 criterion.workspace = true
 tempfile.workspace = true
diff --git a/crates/sui-storage/src/http_key_value_store.rs b/crates/sui-storage/src/http_key_value_store.rs
index 9232bdfb1bc50..461a441cd2a02 100644
--- a/crates/sui-storage/src/http_key_value_store.rs
+++ b/crates/sui-storage/src/http_key_value_store.rs
@@ -148,12 +148,7 @@ impl HttpKVStore {
 
     async fn multi_fetch(&self, uris: Vec<Key>) -> Vec<SuiResult<Option<Bytes>>> {
         let uris_vec = uris.to_vec();
-        let fetches = stream::iter(
-            uris_vec
-                .into_iter()
-                .enumerate()
-                .map(|(_i, url)| self.fetch(url)),
-        );
+        let fetches = stream::iter(uris_vec.into_iter().map(|url| self.fetch(url)));
         fetches.buffered(uris.len()).collect::<Vec<_>>().await
     }
 
@@ -221,7 +216,7 @@ fn multi_split_slice<'a, T>(slice: &'a [T], lengths: &'a [usize]) -> Vec<&'a [T]
         .collect()
 }
 
-fn deser_check_digest<T, D: std::fmt::Debug>(
+fn deser_check_digest<T, D>(
     digest: &D,
     bytes: &Bytes,
     get_expected_digest: impl FnOnce(&T) -> D,
diff --git a/crates/sui-storage/src/indexes.rs b/crates/sui-storage/src/indexes.rs
index a38eeded07958..4519cedbaaa3a 100644
--- a/crates/sui-storage/src/indexes.rs
+++ b/crates/sui-storage/src/indexes.rs
@@ -39,7 +39,7 @@ use typed_store::rocks::{
 };
 use typed_store::traits::Map;
 use typed_store::traits::{TableSummary, TypedStoreDebug};
-use typed_store_derive::DBMapUtils;
+use typed_store::DBMapUtils;
 
 type OwnerIndexKey = (SuiAddress, ObjectID);
 type CoinIndexKey = (SuiAddress, String, ObjectID);
diff --git a/crates/sui-storage/src/write_path_pending_tx_log.rs b/crates/sui-storage/src/write_path_pending_tx_log.rs
index 622aff93432d6..c974127745458 100644
--- a/crates/sui-storage/src/write_path_pending_tx_log.rs
+++ b/crates/sui-storage/src/write_path_pending_tx_log.rs
@@ -14,8 +14,8 @@ use sui_types::message_envelope::TrustedEnvelope;
 use sui_types::transaction::{SenderSignedData, VerifiedTransaction};
 use typed_store::rocks::MetricConf;
 use typed_store::traits::{TableSummary, TypedStoreDebug};
+use typed_store::DBMapUtils;
 use typed_store::{rocks::DBMap, traits::Map};
-use typed_store_derive::DBMapUtils;
 
 pub type IsFirstRecord = bool;
 
diff --git a/crates/sui-storage/tests/key_value_tests.rs b/crates/sui-storage/tests/key_value_tests.rs
index 8d3fb1b051917..5e2957c290d14 100644
--- a/crates/sui-storage/tests/key_value_tests.rs
+++ b/crates/sui-storage/tests/key_value_tests.rs
@@ -428,13 +428,9 @@ async fn test_get_tx_from_fallback() {
 
 #[cfg(msim)]
 mod simtests {
-
     use super::*;
-    use hyper::{
-        service::{make_service_fn, service_fn},
-        Body, Request, Response, Server,
-    };
-    use std::convert::Infallible;
+    use axum::routing::get;
+    use axum::{body::Body, extract::Request, extract::State, response::Response};
     use std::net::SocketAddr;
     use std::sync::Mutex;
     use std::time::{Duration, Instant};
@@ -443,6 +439,23 @@ mod simtests {
     use sui_storage::http_key_value_store::*;
     use tracing::info;
 
+    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 = sui_simulator::runtime::Handle::current();
         let builder = handle.create_node();
@@ -456,41 +469,12 @@ mod simtests {
                 let data = data.clone();
                 let startup_sender = startup_sender.clone();
                 async move {
-                    let make_svc = make_service_fn(move |_| {
-                        let data = data.clone();
-                        async {
-                            Ok::<_, Infallible>(service_fn(move |req: Request<Body>| {
-                                let data = data.clone();
-                                async move {
-                                    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);
-                                    match value {
-                                        Some(v) => {
-                                            Ok::<_, Infallible>(Response::new(Body::from(v)))
-                                        }
-                                        None => Ok::<_, Infallible>(
-                                            Response::builder()
-                                                .status(hyper::StatusCode::NOT_FOUND)
-                                                .body(Body::empty())
-                                                .unwrap(),
-                                        ),
-                                    }
-                                }
-                            }))
-                        }
-                    });
-
+                    let router = get(svc).with_state(data);
                     let addr = SocketAddr::from(([10, 10, 10, 10], 8080));
-                    let server = Server::bind(&addr).serve(make_svc);
-
-                    let graceful = server.with_graceful_shutdown(async {
-                        tokio::time::sleep(Duration::from_secs(86400)).await;
-                    });
+                    let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
 
                     tokio::spawn(async {
-                        let _ = graceful.await;
+                        axum::serve(listener, router).await.unwrap();
                     });
 
                     startup_sender.send(true).ok();
diff --git a/crates/sui-swarm-config/Cargo.toml b/crates/sui-swarm-config/Cargo.toml
index 8c6561469549f..12a367ccbd6c4 100644
--- a/crates/sui-swarm-config/Cargo.toml
+++ b/crates/sui-swarm-config/Cargo.toml
@@ -6,6 +6,9 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 anemo.workspace = true
 anyhow.workspace = true
diff --git a/crates/sui-swarm-config/src/node_config_builder.rs b/crates/sui-swarm-config/src/node_config_builder.rs
index 5ae24ec616cda..8e4859249deb1 100644
--- a/crates/sui-swarm-config/src/node_config_builder.rs
+++ b/crates/sui-swarm-config/src/node_config_builder.rs
@@ -135,6 +135,8 @@ impl ValidatorConfigBuilder {
         let consensus_config = ConsensusConfig {
             address: consensus_address,
             db_path: consensus_db_path,
+            db_retention_epochs: None,
+            db_pruner_period_secs: None,
             max_pending_transactions: None,
             max_submit_position: self.max_submit_position,
             submit_delay_step_override_millis: self.submit_delay_step_override_millis,
diff --git a/crates/sui-swarm-config/tests/snapshots/snapshot_tests__genesis_config_snapshot_matches.snap b/crates/sui-swarm-config/tests/snapshots/snapshot_tests__genesis_config_snapshot_matches.snap
index efd127f0aa8f0..4bf528401e530 100644
--- a/crates/sui-swarm-config/tests/snapshots/snapshot_tests__genesis_config_snapshot_matches.snap
+++ b/crates/sui-swarm-config/tests/snapshots/snapshot_tests__genesis_config_snapshot_matches.snap
@@ -6,7 +6,7 @@ ssfn_config_info: ~
 validator_config_info: ~
 parameters:
   chain_start_timestamp_ms: 0
-  protocol_version: 53
+  protocol_version: 56
   allow_insertion_of_extra_objects: true
   epoch_duration_ms: 86400000
   stake_subsidy_start_epoch: 0
diff --git a/crates/sui-swarm-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap b/crates/sui-swarm-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap
index 61811145ed2a6..929df5b6b20b9 100644
--- a/crates/sui-swarm-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap
+++ b/crates/sui-swarm-config/tests/snapshots/snapshot_tests__network_config_snapshot_matches.snap
@@ -19,6 +19,8 @@ validator_configs:
     admin-interface-port: 8888
     consensus-config:
       db-path: /tmp/foo/
+      db-retention-epochs: ~
+      db-pruner-period-secs: ~
       max-pending-transactions: ~
       max-submit-position: ~
       submit-delay-step-override-millis: ~
@@ -97,13 +99,19 @@ validator_configs:
     zklogin-oauth-providers:
       Mainnet:
         - Apple
+        - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8"
+        - Credenza3
         - Facebook
         - Google
+        - KarrierOne
         - Twitch
       Testnet:
         - Apple
+        - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8"
+        - Credenza3
         - Facebook
         - Google
+        - KarrierOne
         - Twitch
       Unknown:
         - Apple
@@ -156,6 +164,8 @@ validator_configs:
     admin-interface-port: 8888
     consensus-config:
       db-path: /tmp/foo/
+      db-retention-epochs: ~
+      db-pruner-period-secs: ~
       max-pending-transactions: ~
       max-submit-position: ~
       submit-delay-step-override-millis: ~
@@ -234,13 +244,19 @@ validator_configs:
     zklogin-oauth-providers:
       Mainnet:
         - Apple
+        - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8"
+        - Credenza3
         - Facebook
         - Google
+        - KarrierOne
         - Twitch
       Testnet:
         - Apple
+        - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8"
+        - Credenza3
         - Facebook
         - Google
+        - KarrierOne
         - Twitch
       Unknown:
         - Apple
@@ -293,6 +309,8 @@ validator_configs:
     admin-interface-port: 8888
     consensus-config:
       db-path: /tmp/foo/
+      db-retention-epochs: ~
+      db-pruner-period-secs: ~
       max-pending-transactions: ~
       max-submit-position: ~
       submit-delay-step-override-millis: ~
@@ -371,13 +389,19 @@ validator_configs:
     zklogin-oauth-providers:
       Mainnet:
         - Apple
+        - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8"
+        - Credenza3
         - Facebook
         - Google
+        - KarrierOne
         - Twitch
       Testnet:
         - Apple
+        - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8"
+        - Credenza3
         - Facebook
         - Google
+        - KarrierOne
         - Twitch
       Unknown:
         - Apple
@@ -430,6 +454,8 @@ validator_configs:
     admin-interface-port: 8888
     consensus-config:
       db-path: /tmp/foo/
+      db-retention-epochs: ~
+      db-pruner-period-secs: ~
       max-pending-transactions: ~
       max-submit-position: ~
       submit-delay-step-override-millis: ~
@@ -508,13 +534,19 @@ validator_configs:
     zklogin-oauth-providers:
       Mainnet:
         - Apple
+        - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8"
+        - Credenza3
         - Facebook
         - Google
+        - KarrierOne
         - Twitch
       Testnet:
         - Apple
+        - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8"
+        - Credenza3
         - Facebook
         - Google
+        - KarrierOne
         - Twitch
       Unknown:
         - Apple
@@ -567,6 +599,8 @@ validator_configs:
     admin-interface-port: 8888
     consensus-config:
       db-path: /tmp/foo/
+      db-retention-epochs: ~
+      db-pruner-period-secs: ~
       max-pending-transactions: ~
       max-submit-position: ~
       submit-delay-step-override-millis: ~
@@ -645,13 +679,19 @@ validator_configs:
     zklogin-oauth-providers:
       Mainnet:
         - Apple
+        - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8"
+        - Credenza3
         - Facebook
         - Google
+        - KarrierOne
         - Twitch
       Testnet:
         - Apple
+        - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8"
+        - Credenza3
         - Facebook
         - Google
+        - KarrierOne
         - Twitch
       Unknown:
         - Apple
@@ -704,6 +744,8 @@ validator_configs:
     admin-interface-port: 8888
     consensus-config:
       db-path: /tmp/foo/
+      db-retention-epochs: ~
+      db-pruner-period-secs: ~
       max-pending-transactions: ~
       max-submit-position: ~
       submit-delay-step-override-millis: ~
@@ -782,13 +824,19 @@ validator_configs:
     zklogin-oauth-providers:
       Mainnet:
         - Apple
+        - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8"
+        - Credenza3
         - Facebook
         - Google
+        - KarrierOne
         - Twitch
       Testnet:
         - Apple
+        - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8"
+        - Credenza3
         - Facebook
         - Google
+        - KarrierOne
         - Twitch
       Unknown:
         - Apple
@@ -841,6 +889,8 @@ validator_configs:
     admin-interface-port: 8888
     consensus-config:
       db-path: /tmp/foo/
+      db-retention-epochs: ~
+      db-pruner-period-secs: ~
       max-pending-transactions: ~
       max-submit-position: ~
       submit-delay-step-override-millis: ~
@@ -919,13 +969,19 @@ validator_configs:
     zklogin-oauth-providers:
       Mainnet:
         - Apple
+        - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8"
+        - Credenza3
         - Facebook
         - Google
+        - KarrierOne
         - Twitch
       Testnet:
         - Apple
+        - "AwsTenant-region:us-east-1-tenant_id:us-east-1_qPsZxYqd8"
+        - Credenza3
         - Facebook
         - Google
+        - KarrierOne
         - Twitch
       Unknown:
         - Apple
diff --git a/crates/sui-swarm-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-2.snap b/crates/sui-swarm-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-2.snap
index f6754250664f3..5447c9d000d0c 100644
--- a/crates/sui-swarm-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-2.snap
+++ b/crates/sui-swarm-config/tests/snapshots/snapshot_tests__populated_genesis_snapshot_matches-2.snap
@@ -3,7 +3,7 @@ source: crates/sui-swarm-config/tests/snapshot_tests.rs
 expression: genesis.sui_system_object().into_genesis_version_for_tooling()
 ---
 epoch: 0
-protocol_version: 53
+protocol_version: 56
 system_state_version: 1
 validators:
   total_stake: 20000000000000000
@@ -240,13 +240,13 @@ validators:
         next_epoch_worker_address: ~
         extra_fields:
           id:
-            id: "0x68e2fb2256436f2df5a9410d9e219b97eaa5765cabd2969c23d8083836a5ba79"
+            id: "0x9df15aec1e3398f9894d68a8b9e419d66ff924991a376081456866c6528a2c72"
           size: 0
       voting_power: 10000
-      operation_cap_id: "0x9af5ab9c8057218b799125d1b5cbaeb044b585ff66bd3e944a28a23f2873333e"
+      operation_cap_id: "0xbd965c0ebe2a666754e13a1b9812beb608097e78494013237388535f8a227929"
       gas_price: 1000
       staking_pool:
-        id: "0x872082092168ee3579ef4abe820d2dc56b6b1ceab95f4c894bde019aa229dccb"
+        id: "0x5fa1b7daa7553ca1025c1f5168650d13bfb2b0f626ed186649649ec24a57813f"
         activation_epoch: 0
         deactivation_epoch: ~
         sui_balance: 20000000000000000
@@ -254,14 +254,14 @@ validators:
           value: 0
         pool_token_balance: 20000000000000000
         exchange_rates:
-          id: "0x7b6a8b50a9137072addd7c6751d40f60695ca6095f37620642c6c8d108319abb"
+          id: "0xbf9aa86783f7120325e8723deaaf863c36581193509fd84b48ee372de6588523"
           size: 1
         pending_stake: 0
         pending_total_sui_withdraw: 0
         pending_pool_token_withdraw: 0
         extra_fields:
           id:
-            id: "0x294aab97d986bc780637eab36f9d840a1dcc5c386cc5b1fe426a2057d6d918b5"
+            id: "0x3f21afb58ceeb5e2ce9f90698dfa697ba8a339998107863131f1a170b781eefd"
           size: 0
       commission_rate: 200
       next_epoch_stake: 20000000000000000
@@ -269,27 +269,27 @@ validators:
       next_epoch_commission_rate: 200
       extra_fields:
         id:
-          id: "0xbe42bcfc164349cc63f5793998d8fdced1c3c270b44b39f20a7f6c07d9911533"
+          id: "0x4a1e374de1e8276992f7394e0f26b7b3e6f417900dd2b2a45ebb848230f070ac"
         size: 0
   pending_active_validators:
     contents:
-      id: "0x2669d3abbacd114f098a6d9beb9e58be32156043cc4a9106d9c3e6ec8ef465f0"
+      id: "0xbc0069fc9fe1841e10b1b11bc17fbdd8ec32e6c82a6e0a485c6ee1aea0c7ea0f"
       size: 0
   pending_removals: []
   staking_pool_mappings:
-    id: "0x8a232136668f3855addb49f6b94382511fa2d9b43e6bb1facfccca20b763fa2b"
+    id: "0x949ea822e8280160fb7c7451c8ed7fbcb3df16341128b7e2755fe5d50d5b2e23"
     size: 1
   inactive_validators:
-    id: "0xbadbf4e81386838963b4cd6dbc0f7ccf674483b29f2fb9cbdf8f777bc54bd411"
+    id: "0xf369d485f7548ed0b8f83a3e4b9dc73789a9e979a7c44399bb2e4d2e96963327"
     size: 0
   validator_candidates:
-    id: "0x20466198424f3999e695e1de69ce4717a1e9ea2a35470c1c4d0dc4aff0a4e17e"
+    id: "0x46f59e9e59177fb0cf7aa3ecf9ba3559e91aea74638db0b208182d82cf523227"
     size: 0
   at_risk_validators:
     contents: []
   extra_fields:
     id:
-      id: "0x0ca591b7872ccc03715ea3acba3e36dcf7d92bf016bc7f6b270e94424508cb83"
+      id: "0x742a57b52a250f0e271b053f69701bb8584494295bf7125431f6d75418854063"
     size: 0
 storage_fund:
   total_object_storage_rebates:
@@ -306,7 +306,7 @@ parameters:
   validator_low_stake_grace_period: 7
   extra_fields:
     id:
-      id: "0x1790455a80f35cd81783a20e3cb078b7fc6f8d6feb4825c4d23577ea7a38682d"
+      id: "0x6b9f36ccd31f88afae0f3b97a7b8cd7602ce503c6cca9e21d5def22afb4aeeca"
     size: 0
 reference_gas_price: 1000
 validator_report_records:
@@ -320,7 +320,7 @@ stake_subsidy:
   stake_subsidy_decrease_rate: 1000
   extra_fields:
     id:
-      id: "0x6b15ef4e5abf6d83d7689d748c6e235749e9500ad456af501740a05fa8e86660"
+      id: "0xfe2aef7de84880d24134dcc31990be0b8876a1bcfe380200c74150503aa85c7f"
     size: 0
 safe_mode: false
 safe_mode_storage_rewards:
@@ -332,6 +332,6 @@ safe_mode_non_refundable_storage_fee: 0
 epoch_start_timestamp_ms: 10
 extra_fields:
   id:
-    id: "0x3a28788f0c093f4750c2f1766056930b486fd6154073e4fb69358d0f3296e523"
+    id: "0x1e140e4970cac0e58e7b7ed01adbc11b64072eb10e20b3295dd483e7bd196f27"
   size: 0
 
diff --git a/crates/sui-swarm/Cargo.toml b/crates/sui-swarm/Cargo.toml
index b67f22a309465..51caeadf3b797 100644
--- a/crates/sui-swarm/Cargo.toml
+++ b/crates/sui-swarm/Cargo.toml
@@ -6,6 +6,9 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 anyhow.workspace = true
 rand.workspace = true
diff --git a/crates/sui-swarm/src/memory/container.rs b/crates/sui-swarm/src/memory/container.rs
index 9833d150421a4..b763fc7893cbc 100644
--- a/crates/sui-swarm/src/memory/container.rs
+++ b/crates/sui-swarm/src/memory/container.rs
@@ -43,8 +43,11 @@ impl Container {
     pub async fn spawn(config: NodeConfig, runtime: RuntimeType) -> Self {
         let (startup_sender, startup_receiver) = tokio::sync::oneshot::channel();
         let (cancel_sender, cancel_receiver) = tokio::sync::oneshot::channel();
+        let name = AuthorityPublicKeyBytes::from(config.protocol_key_pair().public())
+            .concise()
+            .to_string();
 
-        let thread = thread::spawn(move || {
+        let thread = thread::Builder::new().name(name).spawn(move || {
             let span = if get_global_telemetry_config()
                 .map(|c| c.enable_otlp_tracing)
                 .unwrap_or(false)
@@ -66,7 +69,7 @@ impl Container {
                 RuntimeType::MultiThreaded => {
                     thread_local! {
                         static SPAN: std::cell::RefCell<Option<tracing::span::EnteredSpan>> =
-                            std::cell::RefCell::new(None);
+                            const { std::cell::RefCell::new(None) };
                     }
                     let mut builder = tokio::runtime::Builder::new_multi_thread();
                     let span = span.clone();
@@ -103,7 +106,7 @@ impl Container {
 
                 trace!("cancellation received; shutting down thread");
             });
-        });
+        }).unwrap();
 
         let node = startup_receiver.await.unwrap();
 
diff --git a/crates/sui-swarm/src/memory/node.rs b/crates/sui-swarm/src/memory/node.rs
index 2c92966d74ca7..5cc10a6b1f7b5 100644
--- a/crates/sui-swarm/src/memory/node.rs
+++ b/crates/sui-swarm/src/memory/node.rs
@@ -72,6 +72,7 @@ impl Node {
     pub fn stop(&self) {
         info!(name =% self.name().concise(), "stopping in-memory node");
         *self.container.lock().unwrap() = None;
+        info!(name =% self.name().concise(), "node stopped");
     }
 
     /// If this Node is currently running
diff --git a/crates/sui-swarm/src/memory/swarm.rs b/crates/sui-swarm/src/memory/swarm.rs
index d6a4cb2c7911b..5c0df441d2a03 100644
--- a/crates/sui-swarm/src/memory/swarm.rs
+++ b/crates/sui-swarm/src/memory/swarm.rs
@@ -578,5 +578,7 @@ mod test {
         for fullnode in swarm.fullnodes() {
             fullnode.health_check(false).await.unwrap();
         }
+
+        println!("hello");
     }
 }
diff --git a/crates/sui-test-transaction-builder/src/lib.rs b/crates/sui-test-transaction-builder/src/lib.rs
index 6b79fdef33b4f..b0d91e127b5ed 100644
--- a/crates/sui-test-transaction-builder/src/lib.rs
+++ b/crates/sui-test-transaction-builder/src/lib.rs
@@ -331,13 +331,13 @@ impl TestTransactionBuilder {
                         let compiled_package = BuildConfig::new_for_testing().build(&path).unwrap();
                         let all_module_bytes =
                             compiled_package.get_package_bytes(with_unpublished_deps);
-                        let dependencies = compiled_package.get_dependency_original_package_ids();
+                        let dependencies = compiled_package.get_dependency_storage_package_ids();
                         (all_module_bytes, dependencies)
                     }
                     PublishData::ModuleBytes(bytecode) => (bytecode, vec![]),
                     PublishData::CompiledPackage(compiled_package) => {
                         let all_module_bytes = compiled_package.get_package_bytes(false);
-                        let dependencies = compiled_package.get_dependency_original_package_ids();
+                        let dependencies = compiled_package.get_dependency_storage_package_ids();
                         (all_module_bytes, dependencies)
                     }
                 };
diff --git a/crates/sui-tls/src/acceptor.rs b/crates/sui-tls/src/acceptor.rs
index 8ea59cc62a052..04f84346199b7 100644
--- a/crates/sui-tls/src/acceptor.rs
+++ b/crates/sui-tls/src/acceptor.rs
@@ -7,6 +7,7 @@ use axum_server::{
     tls_rustls::{RustlsAcceptor, RustlsConfig},
 };
 use fastcrypto::ed25519::Ed25519PublicKey;
+use rustls::pki_types::CertificateDer;
 use std::{io, sync::Arc};
 use tokio::io::{AsyncRead, AsyncWrite};
 use tokio_rustls::server::TlsStream;
@@ -15,7 +16,7 @@ use tower_layer::Layer;
 #[derive(Debug, Clone)]
 pub struct TlsConnectionInfo {
     sni_hostname: Option<Arc<str>>,
-    peer_certificates: Option<Arc<[rustls::Certificate]>>,
+    peer_certificates: Option<Arc<[CertificateDer<'static>]>>,
     public_key: Option<Ed25519PublicKey>,
 }
 
@@ -24,7 +25,7 @@ impl TlsConnectionInfo {
         self.sni_hostname.as_deref()
     }
 
-    pub fn peer_certificates(&self) -> Option<&[rustls::Certificate]> {
+    pub fn peer_certificates(&self) -> Option<&[CertificateDer<'static>]> {
         self.peer_certificates.as_deref()
     }
 
diff --git a/crates/sui-tls/src/certgen.rs b/crates/sui-tls/src/certgen.rs
index 80f8c8d494485..89ee06a4126ad 100644
--- a/crates/sui-tls/src/certgen.rs
+++ b/crates/sui-tls/src/certgen.rs
@@ -3,44 +3,43 @@
 
 use fastcrypto::ed25519::{Ed25519PrivateKey, Ed25519PublicKey};
 use pkcs8::EncodePrivateKey;
-use rcgen::{CertificateParams, KeyPair, SignatureAlgorithm};
+use rcgen::{CertificateParams, KeyPair};
+use rustls::pki_types::CertificateDer;
+use rustls::pki_types::PrivateKeyDer;
 
 pub struct SelfSignedCertificate {
     inner: rcgen::Certificate,
+    key: KeyPair,
 }
 
 impl SelfSignedCertificate {
     pub fn new(private_key: Ed25519PrivateKey, server_name: &str) -> Self {
-        Self {
-            inner: generate_self_signed_tls_certificate(private_key, server_name),
-        }
+        let (cert, key) = generate_self_signed_tls_certificate(private_key, server_name);
+        Self { inner: cert, key }
     }
 
-    pub fn rustls_certificate(&self) -> rustls::Certificate {
-        let cert_bytes = self.inner.serialize_der().unwrap();
-        rustls::Certificate(cert_bytes)
+    pub fn rustls_certificate(&self) -> CertificateDer<'static> {
+        self.inner.der().to_owned()
     }
 
-    pub fn rustls_private_key(&self) -> rustls::PrivateKey {
-        let private_key_bytes = self.inner.serialize_private_key_der();
-        rustls::PrivateKey(private_key_bytes)
+    pub fn rustls_private_key(&self) -> PrivateKeyDer<'static> {
+        PrivateKeyDer::Pkcs8(self.key.serialize_der().into())
     }
 
     pub fn reqwest_identity(&self) -> reqwest::tls::Identity {
-        let pem = self.inner.serialize_pem().unwrap() + &self.inner.serialize_private_key_pem();
+        let pem = self.inner.pem() + &self.key.serialize_pem();
         reqwest::tls::Identity::from_pem(pem.as_ref()).unwrap()
     }
 
     pub fn reqwest_certificate(&self) -> reqwest::tls::Certificate {
-        let cert = self.inner.serialize_der().unwrap();
-        reqwest::tls::Certificate::from_der(&cert).unwrap()
+        reqwest::tls::Certificate::from_der(self.inner.der()).unwrap()
     }
 }
 
 fn generate_self_signed_tls_certificate(
     private_key: Ed25519PrivateKey,
     server_name: &str,
-) -> rcgen::Certificate {
+) -> (rcgen::Certificate, KeyPair) {
     let keypair = ed25519::KeypairBytes {
         secret_key: private_key.0.to_bytes(),
         // ring cannot handle the optional public key that would be legal der here
@@ -48,49 +47,29 @@ fn generate_self_signed_tls_certificate(
         public_key: None,
     };
 
-    generate_cert(&keypair, server_name)
-}
-
-fn generate_cert(keypair: &ed25519::KeypairBytes, server_name: &str) -> rcgen::Certificate {
     let pkcs8 = keypair.to_pkcs8_der().unwrap();
-    let key_der = rustls::PrivateKey(pkcs8.as_bytes().to_vec());
-    private_key_to_certificate(vec![server_name.to_owned()], &key_der).unwrap()
-}
+    let key_der = PrivateKeyDer::Pkcs8(pkcs8.as_bytes().to_vec().into());
+    let keypair = KeyPair::from_der_and_sign_algo(&key_der, &rcgen::PKCS_ED25519).unwrap();
 
-fn private_key_to_certificate(
-    subject_names: impl Into<Vec<String>>,
-    private_key: &rustls::PrivateKey,
-) -> Result<rcgen::Certificate, anyhow::Error> {
-    let alg = &rcgen::PKCS_ED25519;
-
-    let certificate = gen_certificate(subject_names, (private_key.0.as_ref(), alg))?;
-    Ok(certificate)
+    (generate_cert(&keypair, server_name), keypair)
 }
 
-fn gen_certificate(
-    subject_names: impl Into<Vec<String>>,
-    key_pair: (&[u8], &'static SignatureAlgorithm),
-) -> Result<rcgen::Certificate, anyhow::Error> {
-    let kp = KeyPair::from_der_and_sign_algo(key_pair.0, key_pair.1)?;
-
-    let mut cert_params = CertificateParams::new(subject_names);
-    cert_params.key_pair = Some(kp);
-    cert_params.distinguished_name = rcgen::DistinguishedName::new();
-    cert_params.alg = key_pair.1;
-
-    let cert = rcgen::Certificate::from_params(cert_params).expect(
-        "unreachable! from_params should only fail if the key is incompatible with params.algo",
-    );
-    Ok(cert)
+fn generate_cert(keypair: &KeyPair, server_name: &str) -> rcgen::Certificate {
+    CertificateParams::new(vec![server_name.to_owned()])
+        .unwrap()
+        .self_signed(keypair)
+        .expect(
+            "unreachable! from_params should only fail if the key is incompatible with params.algo",
+        )
 }
 
 pub(crate) fn public_key_from_certificate(
-    certificate: &rustls::Certificate,
+    certificate: &CertificateDer,
 ) -> Result<Ed25519PublicKey, anyhow::Error> {
     use fastcrypto::traits::ToFromBytes;
     use x509_parser::{certificate::X509Certificate, prelude::FromDer};
 
-    let cert = X509Certificate::from_der(certificate.0.as_ref())
+    let cert = X509Certificate::from_der(certificate.as_ref())
         .map_err(|e| rustls::Error::General(e.to_string()))?;
     let spki = cert.1.public_key();
     let public_key_bytes =
diff --git a/crates/sui-tls/src/lib.rs b/crates/sui-tls/src/lib.rs
index 39d576959ab2b..91a6cb666b267 100644
--- a/crates/sui-tls/src/lib.rs
+++ b/crates/sui-tls/src/lib.rs
@@ -21,8 +21,10 @@ mod tests {
     use super::*;
     use fastcrypto::ed25519::Ed25519KeyPair;
     use fastcrypto::traits::KeyPair;
-    use rustls::client::ServerCertVerifier as _;
-    use rustls::server::ClientCertVerifier as _;
+    use rustls::client::danger::ServerCertVerifier as _;
+    use rustls::pki_types::ServerName;
+    use rustls::pki_types::UnixTime;
+    use rustls::server::danger::ClientCertVerifier as _;
 
     #[test]
     fn verify_allowall() {
@@ -38,11 +40,7 @@ mod tests {
 
         // The bob passes validation
         verifier
-            .verify_client_cert(
-                &random_cert_bob.rustls_certificate(),
-                &[],
-                std::time::SystemTime::now(),
-            )
+            .verify_client_cert(&random_cert_bob.rustls_certificate(), &[], UnixTime::now())
             .unwrap();
 
         // The alice passes validation
@@ -50,7 +48,7 @@ mod tests {
             .verify_client_cert(
                 &random_cert_alice.rustls_certificate(),
                 &[],
-                std::time::SystemTime::now(),
+                UnixTime::now(),
             )
             .unwrap();
     }
@@ -74,10 +72,9 @@ mod tests {
             .verify_server_cert(
                 &random_cert_bob.rustls_certificate(),
                 &[],
-                &rustls::ServerName::try_from("example.com").unwrap(),
-                &mut Vec::<&[u8]>::new().iter().cloned(),
+                &ServerName::try_from("example.com").unwrap(),
                 &[],
-                std::time::SystemTime::now(),
+                UnixTime::now(),
             )
             .unwrap();
 
@@ -86,10 +83,9 @@ mod tests {
             .verify_server_cert(
                 &random_cert_alice.rustls_certificate(),
                 &[],
-                &rustls::ServerName::try_from("example.com").unwrap(),
-                &mut Vec::<&[u8]>::new().iter().cloned(),
+                &ServerName::try_from("example.com").unwrap(),
                 &[],
-                std::time::SystemTime::now(),
+                UnixTime::now(),
             )
             .unwrap_err();
         assert!(
@@ -123,20 +119,12 @@ mod tests {
 
         // The allowed cert passes validation
         verifier
-            .verify_client_cert(
-                &allowed_cert.rustls_certificate(),
-                &[],
-                std::time::SystemTime::now(),
-            )
+            .verify_client_cert(&allowed_cert.rustls_certificate(), &[], UnixTime::now())
             .unwrap();
 
         // The disallowed cert fails validation
         let err = verifier
-            .verify_client_cert(
-                &disallowed_cert.rustls_certificate(),
-                &[],
-                std::time::SystemTime::now(),
-            )
+            .verify_client_cert(&disallowed_cert.rustls_certificate(), &[], UnixTime::now())
             .unwrap_err();
         assert!(
             matches!(err, rustls::Error::General(_)),
@@ -146,11 +134,7 @@ mod tests {
         // After removing the allowed public key from the set it now fails validation
         allowlist.inner_mut().write().unwrap().clear();
         let err = verifier
-            .verify_client_cert(
-                &allowed_cert.rustls_certificate(),
-                &[],
-                std::time::SystemTime::now(),
-            )
+            .verify_client_cert(&allowed_cert.rustls_certificate(), &[], UnixTime::now())
             .unwrap_err();
         assert!(
             matches!(err, rustls::Error::General(_)),
@@ -178,11 +162,7 @@ mod tests {
 
         // Allowed public key but the server-name in the cert is not the required "sui"
         let err = client_verifier
-            .verify_client_cert(
-                &cert.rustls_certificate(),
-                &[],
-                std::time::SystemTime::now(),
-            )
+            .verify_client_cert(&cert.rustls_certificate(), &[], UnixTime::now())
             .unwrap_err();
         assert_eq!(
             err,
@@ -198,10 +178,9 @@ mod tests {
             .verify_server_cert(
                 &cert.rustls_certificate(),
                 &[],
-                &rustls::ServerName::try_from("example.com").unwrap(),
-                &mut Vec::<&[u8]>::new().iter().cloned(),
+                &ServerName::try_from("example.com").unwrap(),
                 &[],
-                std::time::SystemTime::now(),
+                UnixTime::now(),
             )
             .unwrap_err();
         assert_eq!(
diff --git a/crates/sui-tls/src/verifier.rs b/crates/sui-tls/src/verifier.rs
index e3cb37ef717c0..b2dff221ffd7c 100644
--- a/crates/sui-tls/src/verifier.rs
+++ b/crates/sui-tls/src/verifier.rs
@@ -3,12 +3,24 @@
 
 use fastcrypto::ed25519::Ed25519PublicKey;
 use fastcrypto::traits::ToFromBytes;
+use rustls::crypto::WebPkiSupportedAlgorithms;
+use rustls::pki_types::CertificateDer;
+use rustls::pki_types::PrivateKeyDer;
+use rustls::pki_types::ServerName;
+use rustls::pki_types::SignatureVerificationAlgorithm;
+use rustls::pki_types::TrustAnchor;
+use rustls::pki_types::UnixTime;
 use std::{
     collections::HashSet,
     sync::{Arc, RwLock},
 };
 
-static SUPPORTED_SIG_ALGS: &[&webpki::SignatureAlgorithm] = &[&webpki::ED25519];
+static SUPPORTED_SIG_ALGS: &[&dyn SignatureVerificationAlgorithm] = &[webpki::ring::ED25519];
+
+static SUPPORTED_ALGORITHMS: WebPkiSupportedAlgorithms = WebPkiSupportedAlgorithms {
+    all: SUPPORTED_SIG_ALGS,
+    mapping: &[(rustls::SignatureScheme::ED25519, SUPPORTED_SIG_ALGS)],
+};
 
 pub type ValidatorAllowlist = Arc<RwLock<HashSet<Ed25519PublicKey>>>;
 
@@ -16,12 +28,12 @@ pub type ValidatorAllowlist = Arc<RwLock<HashSet<Ed25519PublicKey>>>;
 /// to allow a cert to be verified or not.  This does not prform actual cert validation
 /// it only acts as a gatekeeper to decide if we should even try.  For example, we may want
 /// to filter our actions to well known public keys.
-pub trait Allower: Send + Sync {
+pub trait Allower: std::fmt::Debug + Send + Sync {
     fn allowed(&self, key: &Ed25519PublicKey) -> bool;
 }
 
 /// AllowAll will allow all public certificates to be validated, it fails open
-#[derive(Clone, Default)]
+#[derive(Debug, Clone, Default)]
 pub struct AllowAll;
 
 impl Allower for AllowAll {
@@ -32,7 +44,7 @@ impl Allower for AllowAll {
 
 /// HashSetAllow restricts keys to those that are found in the member set. non-members will not be
 /// allowed.
-#[derive(Clone, Default)]
+#[derive(Debug, Clone, Default)]
 pub struct HashSetAllow {
     inner: ValidatorAllowlist,
 }
@@ -76,20 +88,22 @@ impl<A> ClientCertVerifier<A> {
 impl<A: Allower + 'static> ClientCertVerifier<A> {
     pub fn rustls_server_config(
         self,
-        certificates: Vec<rustls::Certificate>,
-        private_key: rustls::PrivateKey,
+        certificates: Vec<CertificateDer<'static>>,
+        private_key: PrivateKeyDer<'static>,
     ) -> Result<rustls::ServerConfig, rustls::Error> {
-        let mut config = rustls::ServerConfig::builder()
-            .with_safe_defaults()
-            .with_client_cert_verifier(std::sync::Arc::new(self))
-            .with_single_cert(certificates, private_key)?;
+        let mut config = rustls::ServerConfig::builder_with_provider(Arc::new(
+            rustls::crypto::ring::default_provider(),
+        ))
+        .with_safe_default_protocol_versions()?
+        .with_client_cert_verifier(std::sync::Arc::new(self))
+        .with_single_cert(certificates, private_key)?;
         config.alpn_protocols = vec![b"h2".to_vec(), b"http/1.1".to_vec()];
 
         Ok(config)
     }
 }
 
-impl<A: Allower> rustls::server::ClientCertVerifier for ClientCertVerifier<A> {
+impl<A: Allower> rustls::server::danger::ClientCertVerifier for ClientCertVerifier<A> {
     fn offer_client_auth(&self) -> bool {
         true
     }
@@ -98,7 +112,7 @@ impl<A: Allower> rustls::server::ClientCertVerifier for ClientCertVerifier<A> {
         true
     }
 
-    fn client_auth_root_subjects(&self) -> &[rustls::DistinguishedName] {
+    fn root_hint_subjects(&self) -> &[rustls::DistinguishedName] {
         // Since we're relying on self-signed certificates and not on CAs, continue the handshake
         // without passing a list of CA DNs
         &[]
@@ -110,10 +124,10 @@ impl<A: Allower> rustls::server::ClientCertVerifier for ClientCertVerifier<A> {
     // 2. we call webpki's certificate verification
     fn verify_client_cert(
         &self,
-        end_entity: &rustls::Certificate,
-        intermediates: &[rustls::Certificate],
-        now: std::time::SystemTime,
-    ) -> Result<rustls::server::ClientCertVerified, rustls::Error> {
+        end_entity: &CertificateDer,
+        intermediates: &[CertificateDer],
+        now: UnixTime,
+    ) -> Result<rustls::server::danger::ClientCertVerified, rustls::Error> {
         // Step 1: Check this matches the key we expect
         let public_key = public_key_from_certificate(end_entity)?;
         if !self.allower.allowed(&public_key) {
@@ -131,7 +145,29 @@ impl<A: Allower> rustls::server::ClientCertVerifier for ClientCertVerifier<A> {
             &self.name,
             now,
         )
-        .map(|_| rustls::server::ClientCertVerified::assertion())
+        .map(|_| rustls::server::danger::ClientCertVerified::assertion())
+    }
+
+    fn verify_tls12_signature(
+        &self,
+        message: &[u8],
+        cert: &CertificateDer<'_>,
+        dss: &rustls::DigitallySignedStruct,
+    ) -> Result<rustls::client::danger::HandshakeSignatureValid, rustls::Error> {
+        rustls::crypto::verify_tls12_signature(message, cert, dss, &SUPPORTED_ALGORITHMS)
+    }
+
+    fn verify_tls13_signature(
+        &self,
+        message: &[u8],
+        cert: &CertificateDer<'_>,
+        dss: &rustls::DigitallySignedStruct,
+    ) -> Result<rustls::client::danger::HandshakeSignatureValid, rustls::Error> {
+        rustls::crypto::verify_tls13_signature(message, cert, dss, &SUPPORTED_ALGORITHMS)
+    }
+
+    fn supported_verify_schemes(&self) -> Vec<rustls::SignatureScheme> {
+        SUPPORTED_ALGORITHMS.supported_schemes()
     }
 }
 
@@ -150,28 +186,30 @@ impl ServerCertVerifier {
 
     pub fn rustls_client_config(
         self,
-        certificates: Vec<rustls::Certificate>,
-        private_key: rustls::PrivateKey,
+        certificates: Vec<CertificateDer<'static>>,
+        private_key: PrivateKeyDer<'static>,
     ) -> Result<rustls::ClientConfig, rustls::Error> {
-        let mut config = rustls::ClientConfig::builder()
-            .with_safe_defaults()
-            .with_custom_certificate_verifier(std::sync::Arc::new(self))
-            .with_client_auth_cert(certificates, private_key)?;
+        let mut config = rustls::ClientConfig::builder_with_provider(Arc::new(
+            rustls::crypto::ring::default_provider(),
+        ))
+        .with_safe_default_protocol_versions()?
+        .dangerous()
+        .with_custom_certificate_verifier(std::sync::Arc::new(self))
+        .with_client_auth_cert(certificates, private_key)?;
         config.alpn_protocols = vec![b"h2".to_vec()];
         Ok(config)
     }
 }
 
-impl rustls::client::ServerCertVerifier for ServerCertVerifier {
+impl rustls::client::danger::ServerCertVerifier for ServerCertVerifier {
     fn verify_server_cert(
         &self,
-        end_entity: &rustls::Certificate,
-        intermediates: &[rustls::Certificate],
-        _server_name: &rustls::ServerName,
-        _scts: &mut dyn Iterator<Item = &[u8]>,
+        end_entity: &CertificateDer<'_>,
+        intermediates: &[CertificateDer<'_>],
+        _server_name: &ServerName,
         _ocsp_response: &[u8],
-        now: std::time::SystemTime,
-    ) -> Result<rustls::client::ServerCertVerified, rustls::Error> {
+        now: UnixTime,
+    ) -> Result<rustls::client::danger::ServerCertVerified, rustls::Error> {
         let public_key = public_key_from_certificate(end_entity)?;
         if public_key != self.public_key {
             return Err(rustls::Error::General(format!(
@@ -187,7 +225,29 @@ impl rustls::client::ServerCertVerifier for ServerCertVerifier {
             &self.name,
             now,
         )
-        .map(|_| rustls::client::ServerCertVerified::assertion())
+        .map(|_| rustls::client::danger::ServerCertVerified::assertion())
+    }
+
+    fn verify_tls12_signature(
+        &self,
+        message: &[u8],
+        cert: &CertificateDer<'_>,
+        dss: &rustls::DigitallySignedStruct,
+    ) -> Result<rustls::client::danger::HandshakeSignatureValid, rustls::Error> {
+        rustls::crypto::verify_tls12_signature(message, cert, dss, &SUPPORTED_ALGORITHMS)
+    }
+
+    fn verify_tls13_signature(
+        &self,
+        message: &[u8],
+        cert: &CertificateDer<'_>,
+        dss: &rustls::DigitallySignedStruct,
+    ) -> Result<rustls::client::danger::HandshakeSignatureValid, rustls::Error> {
+        rustls::crypto::verify_tls13_signature(message, cert, dss, &SUPPORTED_ALGORITHMS)
+    }
+
+    fn supported_verify_schemes(&self) -> Vec<rustls::SignatureScheme> {
+        SUPPORTED_ALGORITHMS.supported_schemes()
     }
 }
 
@@ -196,49 +256,55 @@ impl rustls::client::ServerCertVerifier for ServerCertVerifier {
 //    placing the public key at the root of the certificate chain (as it should be for a self-signed certificate)
 // 2. we call webpki's certificate verification
 fn verify_self_signed_cert(
-    end_entity: &rustls::Certificate,
-    intermediates: &[rustls::Certificate],
+    end_entity: &CertificateDer,
+    intermediates: &[CertificateDer],
     usage: webpki::KeyUsage,
     name: &str,
-    now: std::time::SystemTime,
+    now: UnixTime,
 ) -> Result<(), rustls::Error> {
     // Check we're receiving correctly signed data with the expected key
     // Step 1: prepare arguments
     let (cert, chain, trustroots) = prepare_for_self_signed(end_entity, intermediates)?;
-    let now = webpki::Time::try_from(now).map_err(|_| rustls::Error::FailedToGetCurrentTime)?;
 
     // Step 2: call verification from webpki
-    let cert = cert
-        .verify_for_usage(SUPPORTED_SIG_ALGS, &trustroots, &chain, now, usage, &[])
-        .map_err(pki_error)
-        .map(|_| cert)?;
+    let verified_cert = cert
+        .verify_for_usage(
+            SUPPORTED_SIG_ALGS,
+            &trustroots,
+            chain,
+            now,
+            usage,
+            None,
+            None,
+        )
+        .map_err(pki_error)?;
 
     // Ensure the cert is valid for the network name
-    let dns_nameref = webpki::SubjectNameRef::try_from_ascii_str(name)
-        .map_err(|_| rustls::Error::UnsupportedNameType)?;
-    cert.verify_is_valid_for_subject_name(dns_nameref)
+    let subject_name =
+        ServerName::try_from(name).map_err(|_| rustls::Error::UnsupportedNameType)?;
+    verified_cert
+        .end_entity()
+        .verify_is_valid_for_subject_name(&subject_name)
         .map_err(pki_error)
 }
 
 type CertChainAndRoots<'a> = (
     webpki::EndEntityCert<'a>,
-    Vec<&'a [u8]>,
-    Vec<webpki::TrustAnchor<'a>>,
+    &'a [CertificateDer<'a>],
+    Vec<TrustAnchor<'a>>,
 );
 
 // This prepares arguments for webpki, including a trust anchor which is the end entity of the certificate
 // (which embodies a self-signed certificate by definition)
 fn prepare_for_self_signed<'a>(
-    end_entity: &'a rustls::Certificate,
-    intermediates: &'a [rustls::Certificate],
+    end_entity: &'a CertificateDer,
+    intermediates: &'a [CertificateDer],
 ) -> Result<CertChainAndRoots<'a>, rustls::Error> {
     // EE cert must appear first.
-    let cert = webpki::EndEntityCert::try_from(end_entity.0.as_ref()).map_err(pki_error)?;
-
-    let intermediates: Vec<&'a [u8]> = intermediates.iter().map(|cert| cert.0.as_ref()).collect();
+    let cert = webpki::EndEntityCert::try_from(end_entity).map_err(pki_error)?;
 
     // reinterpret the certificate as a root, materializing the self-signed policy
-    let root = webpki::TrustAnchor::try_from_cert_der(end_entity.0.as_ref()).map_err(pki_error)?;
+    let root = webpki::anchor_from_trusted_cert(end_entity).map_err(pki_error)?;
 
     Ok((cert, intermediates, vec![root]))
 }
@@ -263,11 +329,11 @@ fn pki_error(error: webpki::Error) -> rustls::Error {
 
 /// Extracts the public key from a certificate.
 pub fn public_key_from_certificate(
-    certificate: &rustls::Certificate,
+    certificate: &CertificateDer,
 ) -> Result<Ed25519PublicKey, rustls::Error> {
     use x509_parser::{certificate::X509Certificate, prelude::FromDer};
 
-    let cert = X509Certificate::from_der(certificate.0.as_ref())
+    let cert = X509Certificate::from_der(certificate.as_ref())
         .map_err(|e| rustls::Error::General(e.to_string()))?;
     let spki = cert.1.public_key();
     let public_key_bytes =
diff --git a/crates/sui-tool/Cargo.toml b/crates/sui-tool/Cargo.toml
index 74d8bf96fa62d..a19bfaa194b94 100644
--- a/crates/sui-tool/Cargo.toml
+++ b/crates/sui-tool/Cargo.toml
@@ -13,13 +13,11 @@ bcs.workspace = true
 clap = { version = "4.1.4", features = ["derive"] }
 colored.workspace = true
 comfy-table.workspace = true
-diesel.workspace = true
 eyre.workspace = true
 futures.workspace = true
 hex.workspace = true
 move-core-types.workspace = true
 itertools.workspace = true
-rocksdb.workspace = true
 ron.workspace = true
 serde.workspace = true
 serde_json.workspace = true
@@ -42,7 +40,6 @@ narwhal-storage.workspace = true
 narwhal-types.workspace = true
 sui-config.workspace = true
 sui-core.workspace = true
-sui-indexer.workspace = true
 sui-network.workspace = true
 sui-snapshot.workspace = true
 sui-protocol-config.workspace = true
@@ -51,4 +48,5 @@ sui-sdk.workspace = true
 sui-storage.workspace = true
 sui-types.workspace = true
 sui-archival.workspace = true
+sui-package-dump.workspace = true
 bin-version.workspace = true
diff --git a/crates/sui-tool/src/commands.rs b/crates/sui-tool/src/commands.rs
index 95b39183c96f6..d4a6eb83facfc 100644
--- a/crates/sui-tool/src/commands.rs
+++ b/crates/sui-tool/src/commands.rs
@@ -5,7 +5,7 @@ use crate::{
     check_completed_snapshot,
     db_tool::{execute_db_tool_command, print_db_all_tables, DbToolCommand},
     download_db_snapshot, download_formal_snapshot, dump_checkpoints_from_archive,
-    get_latest_available_epoch, get_object, get_transaction_block, make_clients, pkg_dump,
+    get_latest_available_epoch, get_object, get_transaction_block, make_clients,
     restore_from_db_checkpoint, verify_archive, verify_archive_by_checksum, ConciseObjectOutput,
     GroupedObjectOutput, SnapshotVerifyMode, VerboseObjectOutput,
 };
@@ -22,7 +22,6 @@ use telemetry_subscribers::TracingHandle;
 
 use sui_types::{
     base_types::*, crypto::AuthorityPublicKeyBytes, messages_grpc::TransactionInfoRequest,
-    object::Owner,
 };
 
 use clap::*;
@@ -177,21 +176,26 @@ pub enum ToolCommand {
         max_content_length: usize,
     },
 
-    /// Download all packages to the local filesystem from an indexer database. Each package gets
-    /// its own sub-directory, named for its ID on-chain, containing two metadata files
-    /// (linkage.json and origins.json) as well as a file for every module it contains. Each module
-    /// file is named for its module name, with a .mv suffix, and contains Move bytecode (suitable
-    /// for passing into a disassembler).
+    /// Download all packages to the local filesystem from a GraphQL service. Each package gets its
+    /// own sub-directory, named for its ID on chain and version containing two metadata files
+    /// (linkage.json and origins.json), a file containing the overall object and a file for every
+    /// module it contains. Each module file is named for its module name, with a .mv suffix, and
+    /// contains Move bytecode (suitable for passing into a disassembler).
     #[command(name = "dump-packages")]
     DumpPackages {
-        /// Connection information for the Indexer's Postgres DB.
+        /// Connection information for a GraphQL service.
         #[clap(long, short)]
-        db_url: String,
+        rpc_url: String,
 
         /// Path to a non-existent directory that can be created and filled with package information.
         #[clap(long, short)]
         output_dir: PathBuf,
 
+        /// Only fetch packages that were created before this checkpoint (given by its sequence
+        /// number).
+        #[clap(long)]
+        before_checkpoint: Option<u64>,
+
         /// If false (default), log level will be overridden to "off", and output will be reduced to
         /// necessary status information.
         #[clap(short, long = "verbose")]
@@ -414,59 +418,6 @@ pub enum ToolCommand {
     },
 }
 
-trait OptionDebug<T> {
-    fn opt_debug(&self, def_str: &str) -> String;
-}
-trait OptionDisplay<T> {
-    fn opt_display(&self, def_str: &str) -> String;
-}
-
-impl<T> OptionDebug<T> for Option<T>
-where
-    T: std::fmt::Debug,
-{
-    fn opt_debug(&self, def_str: &str) -> String {
-        match self {
-            None => def_str.to_string(),
-            Some(t) => format!("{:?}", t),
-        }
-    }
-}
-
-impl<T> OptionDisplay<T> for Option<T>
-where
-    T: std::fmt::Display,
-{
-    fn opt_display(&self, def_str: &str) -> String {
-        match self {
-            None => def_str.to_string(),
-            Some(t) => format!("{}", t),
-        }
-    }
-}
-
-struct OwnerOutput(Owner);
-
-// grep/awk-friendly output for Owner
-impl std::fmt::Display for OwnerOutput {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match &self.0 {
-            Owner::AddressOwner(address) => {
-                write!(f, "address({})", address)
-            }
-            Owner::ObjectOwner(address) => {
-                write!(f, "object({})", address)
-            }
-            Owner::Immutable => {
-                write!(f, "immutable")
-            }
-            Owner::Shared { .. } => {
-                write!(f, "shared")
-            }
-        }
-    }
-}
-
 async fn check_locked_object(
     sui_client: &Arc<SuiClient>,
     committee: Arc<BTreeMap<AuthorityPublicKeyBytes, u64>>,
@@ -633,8 +584,9 @@ impl ToolCommand {
                 }
             }
             ToolCommand::DumpPackages {
-                db_url,
+                rpc_url,
                 output_dir,
+                before_checkpoint,
                 verbose,
             } => {
                 if !verbose {
@@ -643,7 +595,7 @@ impl ToolCommand {
                         .expect("Failed to update log level");
                 }
 
-                pkg_dump::dump(db_url, output_dir).await?;
+                sui_package_dump::dump(rpc_url, output_dir, before_checkpoint).await?;
             }
             ToolCommand::DumpValidators { genesis, concise } => {
                 let genesis = Genesis::load(genesis).unwrap();
diff --git a/crates/sui-tool/src/db_tool/db_dump.rs b/crates/sui-tool/src/db_tool/db_dump.rs
index b0c3a4c19c75c..2e95e756f625e 100644
--- a/crates/sui-tool/src/db_tool/db_dump.rs
+++ b/crates/sui-tool/src/db_tool/db_dump.rs
@@ -5,7 +5,6 @@ use anyhow::{anyhow, Ok};
 use clap::{Parser, ValueEnum};
 use comfy_table::{Cell, ContentArrangement, Row, Table};
 use prometheus::Registry;
-use rocksdb::MultiThreaded;
 use std::collections::{BTreeMap, HashMap};
 use std::path::PathBuf;
 use std::str;
@@ -27,6 +26,7 @@ use sui_storage::IndexStoreTables;
 use sui_types::base_types::{EpochId, ObjectID};
 use tracing::info;
 use typed_store::rocks::{default_db_options, MetricConf};
+use typed_store::rocksdb::MultiThreaded;
 use typed_store::traits::{Map, TableSummary};
 
 #[derive(EnumString, Clone, Parser, Debug, ValueEnum)]
@@ -43,20 +43,23 @@ impl std::fmt::Display for StoreName {
 }
 
 pub fn list_tables(path: PathBuf) -> anyhow::Result<Vec<String>> {
-    rocksdb::DBWithThreadMode::<MultiThreaded>::list_cf(&default_db_options().options, path)
-        .map_err(|e| e.into())
-        .map(|q| {
-            q.iter()
-                .filter_map(|s| {
-                    // The `default` table is not used
-                    if s != "default" {
-                        Some(s.clone())
-                    } else {
-                        None
-                    }
-                })
-                .collect()
-        })
+    typed_store::rocksdb::DBWithThreadMode::<MultiThreaded>::list_cf(
+        &default_db_options().options,
+        path,
+    )
+    .map_err(|e| e.into())
+    .map(|q| {
+        q.iter()
+            .filter_map(|s| {
+                // The `default` table is not used
+                if s != "default" {
+                    Some(s.clone())
+                } else {
+                    None
+                }
+            })
+            .collect()
+    })
 }
 
 pub fn table_summary(
diff --git a/crates/sui-tool/src/lib.rs b/crates/sui-tool/src/lib.rs
index 574eb87a64f1b..a49ac1b5e9498 100644
--- a/crates/sui-tool/src/lib.rs
+++ b/crates/sui-tool/src/lib.rs
@@ -71,7 +71,6 @@ use typed_store::rocks::MetricConf;
 
 pub mod commands;
 pub mod db_tool;
-pub mod pkg_dump;
 
 #[derive(
     Clone, Serialize, Deserialize, Debug, PartialEq, Copy, PartialOrd, Ord, Eq, ValueEnum, Default,
@@ -128,9 +127,6 @@ pub struct ObjectData {
 trait OptionDebug<T> {
     fn opt_debug(&self, def_str: &str) -> String;
 }
-trait OptionDisplay<T> {
-    fn opt_display(&self, def_str: &str) -> String;
-}
 
 impl<T> OptionDebug<T> for Option<T>
 where
@@ -144,40 +140,6 @@ where
     }
 }
 
-impl<T> OptionDisplay<T> for Option<T>
-where
-    T: std::fmt::Display,
-{
-    fn opt_display(&self, def_str: &str) -> String {
-        match self {
-            None => def_str.to_string(),
-            Some(t) => format!("{}", t),
-        }
-    }
-}
-
-struct OwnerOutput(Owner);
-
-// grep/awk-friendly output for Owner
-impl std::fmt::Display for OwnerOutput {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match &self.0 {
-            Owner::AddressOwner(address) => {
-                write!(f, "address({})", address)
-            }
-            Owner::ObjectOwner(address) => {
-                write!(f, "object({})", address)
-            }
-            Owner::Immutable => {
-                write!(f, "immutable")
-            }
-            Owner::Shared { .. } => {
-                write!(f, "shared")
-            }
-        }
-    }
-}
-
 #[allow(clippy::type_complexity)]
 pub struct GroupedObjectOutput {
     pub grouped_results: BTreeMap<
diff --git a/crates/sui-tool/src/pkg_dump.rs b/crates/sui-tool/src/pkg_dump.rs
deleted file mode 100644
index bd78cbf2b4b87..0000000000000
--- a/crates/sui-tool/src/pkg_dump.rs
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-use std::{
-    collections::BTreeMap,
-    fs,
-    path::{Path, PathBuf},
-    time::Duration,
-};
-
-use anyhow::{anyhow, ensure, Context, Result};
-use diesel::{
-    r2d2::{ConnectionManager, Pool},
-    PgConnection, RunQueryDsl,
-};
-use sui_indexer::{models::packages::StoredPackage, schema::packages};
-use sui_types::{base_types::SuiAddress, move_package::MovePackage};
-use tracing::info;
-
-type PgPool = Pool<ConnectionManager<PgConnection>>;
-
-pub(crate) async fn dump(db_url: String, output_dir: PathBuf) -> Result<()> {
-    ensure_output_directory(&output_dir)?;
-
-    let conn = ConnectionManager::<PgConnection>::new(db_url);
-    let pool = Pool::builder()
-        .max_size(1)
-        .connection_timeout(Duration::from_secs(30))
-        .build(conn)
-        .context("Failed to create connection pool.")?;
-
-    info!("Querying Indexer...");
-    let pkgs = query_packages(&pool)?;
-    let total = pkgs.len();
-
-    let mut progress = 0;
-    for (i, pkg) in pkgs.into_iter().enumerate() {
-        let pct = (100 * i) / total;
-        if pct % 5 == 0 && pct > progress {
-            info!("Dumping packages ({total}): {pct: >3}%");
-            progress = pct;
-        }
-
-        let id = SuiAddress::from_bytes(&pkg.package_id).context("Parsing package ID")?;
-        dump_package(&output_dir, id, &pkg.move_package)
-            .with_context(|| format!("Dumping package: {id}"))?;
-    }
-
-    info!("Dumping packages ({total}): 100%, Done.");
-    Ok(())
-}
-
-/// Ensure the output directory exists, either because it already exists as an empty, writable
-/// directory, or by creating a new directory.
-fn ensure_output_directory(path: impl Into<PathBuf>) -> Result<()> {
-    let path: PathBuf = path.into();
-    if path.exists() {
-        ensure!(
-            path.is_dir(),
-            "Output path is not a directory: {}",
-            path.display()
-        );
-        ensure!(
-            path.read_dir().is_ok_and(|mut d| d.next().is_none()),
-            "Output directory is not empty: {}",
-            path.display(),
-        );
-
-        let metadata = fs::metadata(&path).context("Getting metadata for output path")?;
-
-        ensure!(
-            !metadata.permissions().readonly(),
-            "Output directory is not writable: {}",
-            path.display()
-        )
-    } else {
-        fs::create_dir_all(&path).context("Making output directory")?;
-    }
-
-    Ok(())
-}
-
-fn query_packages(pool: &PgPool) -> Result<Vec<StoredPackage>> {
-    let mut conn = pool
-        .get()
-        .map_err(|e| anyhow!("Failed to get connection: {e}"))?;
-    Ok(packages::dsl::packages.load::<StoredPackage>(&mut conn)?)
-}
-
-fn dump_package(output_dir: &Path, id: SuiAddress, pkg: &[u8]) -> Result<()> {
-    let package = bcs::from_bytes::<MovePackage>(pkg).context("Deserializing")?;
-    let origins: BTreeMap<_, _> = package
-        .type_origin_table()
-        .iter()
-        .map(|o| {
-            (
-                format!("{}::{}", o.module_name, o.datatype_name),
-                o.package.to_string(),
-            )
-        })
-        .collect();
-
-    let package_dir = output_dir.join(format!("{}.{}", id, package.version().value()));
-    fs::create_dir(&package_dir).context("Making output directory")?;
-
-    let linkage_json =
-        serde_json::to_string_pretty(package.linkage_table()).context("Serializing linkage")?;
-    let origins_json =
-        serde_json::to_string_pretty(&origins).context("Serializing type origins")?;
-
-    fs::write(package_dir.join("package.bcs"), pkg).context("Writing package BCS")?;
-    fs::write(package_dir.join("linkage.json"), linkage_json).context("Writing linkage")?;
-    fs::write(package_dir.join("origins.json"), origins_json).context("Writing type origins")?;
-
-    for (module_name, module_bytes) in package.serialized_module_map() {
-        let module_path = package_dir.join(format!("{module_name}.mv"));
-        fs::write(module_path, module_bytes)
-            .with_context(|| format!("Writing module: {module_name}"))?
-    }
-
-    Ok(())
-}
diff --git a/crates/sui-transaction-checks/src/lib.rs b/crates/sui-transaction-checks/src/lib.rs
index 2e399e24b9820..1188850a135b2 100644
--- a/crates/sui-transaction-checks/src/lib.rs
+++ b/crates/sui-transaction-checks/src/lib.rs
@@ -562,7 +562,7 @@ mod checked {
         // Use the same verifier and meter for all packages, custom configured for signing.
         let for_signing = true;
         let mut verifier = sui_execution::verifier(protocol_config, for_signing, metrics);
-        let mut meter = verifier.meter(protocol_config.meter_config());
+        let mut meter = verifier.meter(protocol_config.meter_config_for_signing());
 
         // Measure time for verifying all packages in the PTB
         let shared_meter_verifier_timer = metrics
diff --git a/crates/sui-transactional-test-runner/Cargo.toml b/crates/sui-transactional-test-runner/Cargo.toml
index dc7ded4a21f22..fed0ee7ef631c 100644
--- a/crates/sui-transactional-test-runner/Cargo.toml
+++ b/crates/sui-transactional-test-runner/Cargo.toml
@@ -7,6 +7,9 @@ description = "Move framework for Sui platform"
 license = "Apache-2.0"
 publish = false
 
+[lints]
+workspace = true
+
 [dependencies]
 anyhow.workspace = true
 bcs.workspace = true
@@ -36,23 +39,21 @@ telemetry-subscribers.workspace = true
 move-stdlib = { path = "../../external-crates/move/crates/move-stdlib" }
 move-vm-runtime = { path = "../../external-crates/move/crates/move-vm-runtime" }
 
-rocksdb.workspace = true
 simulacrum.workspace = true
-sui-graphql-rpc.workspace = true
+# sui-graphql-rpc.workspace = true
 sui-rest-api.workspace = true
 sui-swarm-config.workspace = true
 sui-config.workspace = true
 sui-core = { workspace = true, features = ["test-utils"] }
 sui-framework.workspace = true
 sui-protocol-config.workspace = true
-sui-types = { workspace = true, features = ["test-utils"]}
+sui-types = { workspace = true, features = ["test-utils"] }
 sui-json-rpc-types.workspace = true
 sui-json-rpc.workspace = true
 sui-json-rpc-api.workspace = true
 sui-framework-snapshot.workspace = true
 sui-storage.workspace = true
 typed-store.workspace = true
-typed-store-derive.workspace = true
 
 [target.'cfg(msim)'.dependencies]
 msim.workspace = true
diff --git a/crates/sui-transactional-test-runner/src/lib.rs b/crates/sui-transactional-test-runner/src/lib.rs
index fc4b5d7b22bfb..854ab9d096d81 100644
--- a/crates/sui-transactional-test-runner/src/lib.rs
+++ b/crates/sui-transactional-test-runner/src/lib.rs
@@ -142,9 +142,7 @@ impl TransactionalAdapter for ValidatorWithFullnode {
         );
 
         let epoch_store = self.validator.load_epoch_store_one_call_per_task().clone();
-        self.validator
-            .read_objects_for_execution(&tx, &epoch_store)
-            .await
+        self.validator.read_objects_for_execution(&tx, &epoch_store)
     }
 
     fn prepare_txn(
diff --git a/crates/sui-transactional-test-runner/src/simulator_persisted_store.rs b/crates/sui-transactional-test-runner/src/simulator_persisted_store.rs
index 394f808f9db74..64606fa58dc0d 100644
--- a/crates/sui-transactional-test-runner/src/simulator_persisted_store.rs
+++ b/crates/sui-transactional-test-runner/src/simulator_persisted_store.rs
@@ -35,12 +35,12 @@ use sui_types::{
 use tempfile::tempdir;
 use typed_store::traits::TableSummary;
 use typed_store::traits::TypedStoreDebug;
+use typed_store::DBMapUtils;
 use typed_store::Map;
 use typed_store::{
     metrics::SamplingInterval,
     rocks::{DBMap, MetricConf},
 };
-use typed_store_derive::DBMapUtils;
 
 use super::SimulatorStore;
 
@@ -313,16 +313,12 @@ impl SimulatorStore for PersistedStore {
     fn insert_committee(&mut self, committee: Committee) {
         let epoch = committee.epoch as usize;
 
-        let mut committees = if let Some(c) = self
+        let mut committees = self
             .read_write
             .epoch_to_committee
             .get(&())
             .expect("Fatal: DB read failed")
-        {
-            c
-        } else {
-            vec![]
-        };
+            .unwrap_or_default();
 
         if committees.get(epoch).is_some() {
             return;
@@ -397,16 +393,12 @@ impl SimulatorStore for PersistedStore {
                 .live_objects
                 .insert(&object_id, &version)
                 .expect("Fatal: DB write failed");
-            let mut q = if let Some(x) = self
+            let mut q = self
                 .read_write
                 .objects
                 .get(&object_id)
                 .expect("Fatal: DB read failed")
-            {
-                x
-            } else {
-                BTreeMap::new()
-            };
+                .unwrap_or_default();
             q.insert(version, object);
             self.read_write
                 .objects
diff --git a/crates/sui-types/Cargo.toml b/crates/sui-types/Cargo.toml
index cba80cf40ea6c..6769e8e1b410a 100644
--- a/crates/sui-types/Cargo.toml
+++ b/crates/sui-types/Cargo.toml
@@ -6,10 +6,14 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 odin = { workspace = true, version = "0.1.0" }
 tokio.workspace = true
 
+async-trait.workspace = true
 anemo.workspace = true
 anyhow.workspace = true
 bincode.workspace = true
diff --git a/crates/sui-types/src/bridge.rs b/crates/sui-types/src/bridge.rs
index e00c9cc3bb3da..84e65ed53fdd5 100644
--- a/crates/sui-types/src/bridge.rs
+++ b/crates/sui-types/src/bridge.rs
@@ -34,6 +34,8 @@ pub type BridgeRecordDyanmicField = Field<
 >;
 
 pub const BRIDGE_MODULE_NAME: &IdentStr = ident_str!("bridge");
+pub const BRIDGE_TREASURY_MODULE_NAME: &IdentStr = ident_str!("treasury");
+pub const BRIDGE_LIMITER_MODULE_NAME: &IdentStr = ident_str!("limiter");
 pub const BRIDGE_COMMITTEE_MODULE_NAME: &IdentStr = ident_str!("committee");
 pub const BRIDGE_MESSAGE_MODULE_NAME: &IdentStr = ident_str!("message");
 pub const BRIDGE_CREATE_FUNCTION_NAME: &IdentStr = ident_str!("create");
diff --git a/crates/sui-types/src/crypto.rs b/crates/sui-types/src/crypto.rs
index 16c83f6fa2493..792906ce4f05e 100644
--- a/crates/sui-types/src/crypto.rs
+++ b/crates/sui-types/src/crypto.rs
@@ -730,7 +730,7 @@ impl Signature {
         // itself that computes the BCS hash of the Rust type prefix and `struct TransactionData`.
         // (See `fn digest` in `impl Message for SenderSignedData`).
         let mut hasher = DefaultHash::default();
-        hasher.update(&bcs::to_bytes(&value).expect("Message serialization should not fail"));
+        hasher.update(bcs::to_bytes(&value).expect("Message serialization should not fail"));
 
         Signer::sign(secret, &hasher.finalize().digest)
     }
@@ -999,7 +999,7 @@ impl<S: SuiSignatureInner + Sized> SuiSignature for S {
         T: Serialize,
     {
         let mut hasher = DefaultHash::default();
-        hasher.update(&bcs::to_bytes(&value).expect("Message serialization should not fail"));
+        hasher.update(bcs::to_bytes(&value).expect("Message serialization should not fail"));
         let digest = hasher.finalize().digest;
 
         let (sig, pk) = &self.get_verification_inputs()?;
diff --git a/crates/sui-types/src/deny_list_v2.rs b/crates/sui-types/src/deny_list_v2.rs
index 6ac9f049acb95..ebe0e982d030c 100644
--- a/crates/sui-types/src/deny_list_v2.rs
+++ b/crates/sui-types/src/deny_list_v2.rs
@@ -109,7 +109,7 @@ pub fn check_coin_deny_list_v2_during_signing(
     let coin_types = input_object_coin_types_for_denylist_check(input_objects, receiving_objects);
     for coin_type in coin_types {
         let Some(deny_list) = get_per_type_coin_deny_list_v2(&coin_type, object_store) else {
-            return Ok(());
+            continue;
         };
         if check_global_pause(&deny_list, object_store, None) {
             return Err(UserInputError::CoinTypeGlobalPause { coin_type });
diff --git a/crates/sui-types/src/execution.rs b/crates/sui-types/src/execution.rs
index c4bcf7ba293b8..53dbcfbd74797 100644
--- a/crates/sui-types/src/execution.rs
+++ b/crates/sui-types/src/execution.rs
@@ -175,18 +175,21 @@ impl ExecutionResultsV2 {
 /// gas smashing). Because this list is not gated by protocol version, there are a few important
 /// criteria for adding a digest to this list:
 /// 1. The certificate must be causing all validators to either panic or hang forever deterministically.
-/// 2. If we ever ship a fix to make it no longer panic or hang when executing such transaction,
-/// we must make sure the transaction is already in this list. Otherwise nodes running the newer version
-/// without these transactions in the list will generate forked result.
+/// 2. If we ever ship a fix to make it no longer panic or hang when executing such transaction, we
+///    must make sure the transaction is already in this list. Otherwise nodes running the newer
+///    version without these transactions in the list will generate forked result.
+///
 /// Below is a scenario of when we need to use this list:
 /// 1. We detect that a specific transaction is causing all validators to either panic or hang forever deterministically.
 /// 2. We push a CertificateDenyConfig to deny such transaction to all validators asap.
-/// 3. To make sure that all fullnodes are able to sync to the latest version, we need to add the transaction digest
-/// to this list as well asap, and ship this binary to all fullnodes, so that they can sync past this transaction.
+/// 3. To make sure that all fullnodes are able to sync to the latest version, we need to add the
+///    transaction digest to this list as well asap, and ship this binary to all fullnodes, so that
+///    they can sync past this transaction.
 /// 4. We then can start fixing the issue, and ship the fix to all nodes.
-/// 5. Unfortunately, we can't remove the transaction digest from this list, because if we do so, any future
-/// node that sync from genesis will fork on this transaction. We may be able to remove it once
-/// we have stable snapshots and the binary has a minimum supported protocol version past the epoch.
+/// 5. Unfortunately, we can't remove the transaction digest from this list, because if we do so,
+///    any future node that sync from genesis will fork on this transaction. We may be able to
+///    remove it once we have stable snapshots and the binary has a minimum supported protocol
+///    version past the epoch.
 pub fn get_denied_certificates() -> &'static HashSet<TransactionDigest> {
     static DENIED_CERTIFICATES: Lazy<HashSet<TransactionDigest>> = Lazy::new(|| HashSet::from([]));
     Lazy::force(&DENIED_CERTIFICATES)
diff --git a/crates/sui-types/src/full_checkpoint_content.rs b/crates/sui-types/src/full_checkpoint_content.rs
index 02b7a897c3bed..2c8eef47f237e 100644
--- a/crates/sui-types/src/full_checkpoint_content.rs
+++ b/crates/sui-types/src/full_checkpoint_content.rs
@@ -1,7 +1,12 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::effects::{IDOperation, ObjectIn, ObjectOut, TransactionEffects, TransactionEvents};
+use std::collections::BTreeMap;
+
+use crate::base_types::ObjectRef;
+use crate::effects::{
+    IDOperation, ObjectIn, ObjectOut, TransactionEffects, TransactionEffectsAPI, TransactionEvents,
+};
 use crate::messages_checkpoint::{CertifiedCheckpointSummary, CheckpointContents};
 use crate::object::Object;
 use crate::storage::BackingPackageStore;
@@ -18,11 +23,32 @@ pub struct CheckpointData {
 }
 
 impl CheckpointData {
-    pub fn output_objects(&self) -> Vec<&Object> {
-        self.transactions
-            .iter()
-            .flat_map(|tx| &tx.output_objects)
-            .collect()
+    // returns the latest versions of the output objects that still exist at the end of the checkpoint
+    pub fn latest_live_output_objects(&self) -> Vec<&Object> {
+        let mut latest_live_objects = BTreeMap::new();
+        for tx in self.transactions.iter() {
+            for obj in tx.output_objects.iter() {
+                latest_live_objects.insert(obj.id(), obj);
+            }
+            for obj_ref in tx.removed_object_refs_post_version() {
+                latest_live_objects.remove(&(obj_ref.0));
+            }
+        }
+        latest_live_objects.into_values().collect()
+    }
+
+    // returns the object refs that are eventually deleted or wrapped in the current checkpoint
+    pub fn eventually_removed_object_refs_post_version(&self) -> Vec<ObjectRef> {
+        let mut eventually_removed_object_refs = BTreeMap::new();
+        for tx in self.transactions.iter() {
+            for obj_ref in tx.removed_object_refs_post_version() {
+                eventually_removed_object_refs.insert(obj_ref.0, obj_ref);
+            }
+            for obj in tx.output_objects.iter() {
+                eventually_removed_object_refs.remove(&(obj.id()));
+            }
+        }
+        eventually_removed_object_refs.into_values().collect()
     }
 
     pub fn input_objects(&self) -> Vec<&Object> {
@@ -51,19 +77,21 @@ pub struct CheckpointTransaction {
     pub events: Option<TransactionEvents>,
     /// The state of all inputs to this transaction as they were prior to execution.
     pub input_objects: Vec<Object>,
-    /// The state of all output objects created or mutated by this transaction.
+    /// The state of all output objects created or mutated or unwrapped by this transaction.
     pub output_objects: Vec<Object>,
 }
 
 impl CheckpointTransaction {
     // provide an iterator over all deleted or wrapped objects in this transaction
-    pub fn removed_objects(&self) -> impl Iterator<Item = &Object> {
+    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 delted 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
@@ -108,6 +136,13 @@ impl CheckpointTransaction {
         })
     }
 
+    pub fn removed_object_refs_post_version(&self) -> impl Iterator<Item = ObjectRef> {
+        let deleted = self.effects.deleted().into_iter();
+        let wrapped = self.effects.wrapped().into_iter();
+        let unwrapped_then_deleted = self.effects.unwrapped_then_deleted().into_iter();
+        deleted.chain(wrapped).chain(unwrapped_then_deleted)
+    }
+
     pub fn changed_objects(&self) -> impl Iterator<Item = (&Object, Option<&Object>)> {
         // Iterator over ((ObjectId, new version), Option<old version>)
         match &self.effects {
@@ -142,7 +177,7 @@ impl CheckpointTransaction {
                             ObjectIn::NotExist,
                             ObjectOut::PackageWrite((version, _)),
                             IDOperation::Created,
-                        ) => Some(((id, &version), None)),
+                        ) => Some(((id, version), None)),
 
                         // Unwrapped Objects
                         (ObjectIn::NotExist, ObjectOut::ObjectWrite(_), IDOperation::None) => {
@@ -206,7 +241,7 @@ impl CheckpointTransaction {
                             ObjectIn::NotExist,
                             ObjectOut::PackageWrite((version, _)),
                             IDOperation::Created,
-                        ) => Some((id, &version)),
+                        ) => Some((id, version)),
 
                         _ => None,
                     }
diff --git a/crates/sui-types/src/lib.rs b/crates/sui-types/src/lib.rs
index 70420e40bfaf8..c97dd06ec3687 100644
--- a/crates/sui-types/src/lib.rs
+++ b/crates/sui-types/src/lib.rs
@@ -83,6 +83,7 @@ pub mod sui_system_state;
 pub mod supported_protocol_versions;
 pub mod traffic_control;
 pub mod transaction;
+pub mod transaction_executor;
 pub mod transfer;
 pub mod versioned;
 pub mod zk_login_authenticator;
diff --git a/crates/sui-types/src/messages_grpc.rs b/crates/sui-types/src/messages_grpc.rs
index f29707cca75b7..ffe8001980e68 100644
--- a/crates/sui-types/src/messages_grpc.rs
+++ b/crates/sui-types/src/messages_grpc.rs
@@ -233,6 +233,7 @@ impl From<HandleCertificateResponseV3> for HandleCertificateResponseV2 {
 /// If `wait_for_effects` is true, it is guaranteed that:
 ///  - Number of responses will be equal to the number of input transactions.
 ///  - The order of the responses matches the order of the input transactions.
+///
 /// Otherwise, `responses` will be empty.
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct HandleSoftBundleCertificatesResponseV3 {
diff --git a/crates/sui-types/src/storage/mod.rs b/crates/sui-types/src/storage/mod.rs
index c9de3fd31080a..93cb31330eb24 100644
--- a/crates/sui-types/src/storage/mod.rs
+++ b/crates/sui-types/src/storage/mod.rs
@@ -22,6 +22,10 @@ use itertools::Itertools;
 use move_binary_format::CompiledModule;
 use move_core_types::language_storage::ModuleId;
 pub use object_store_trait::ObjectStore;
+pub use read_store::AccountOwnedObjectInfo;
+pub use read_store::CoinInfo;
+pub use read_store::DynamicFieldIndexInfo;
+pub use read_store::DynamicFieldKey;
 pub use read_store::ReadStore;
 pub use read_store::RestStateReader;
 use serde::{Deserialize, Serialize};
@@ -33,11 +37,6 @@ use std::fmt::{Display, Formatter};
 use std::sync::Arc;
 pub use write_store::WriteStore;
 
-pub use read_store::AccountOwnedObjectInfo;
-pub use read_store::CoinInfo;
-pub use read_store::DynamicFieldIndexInfo;
-pub use read_store::DynamicFieldKey;
-
 /// A potential input to a transaction.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub enum InputKey {
@@ -340,6 +339,48 @@ pub fn get_module_by_id<S: BackingPackageStore>(
         .map(|bytes| CompiledModule::deserialize_with_defaults(&bytes).unwrap()))
 }
 
+/// A `BackingPackageStore` that resolves packages from a backing store, but also includes any
+/// packages that were published in the current transaction execution. This can be used to resolve
+/// Move modules right after transaction execution, but newly published packages have not yet been
+/// committed to the backing store on a fullnode.
+pub struct PostExecutionPackageResolver {
+    backing_store: Arc<dyn BackingPackageStore>,
+    new_packages: BTreeMap<ObjectID, PackageObject>,
+}
+
+impl PostExecutionPackageResolver {
+    pub fn new(
+        backing_store: Arc<dyn BackingPackageStore>,
+        output_objects: &Option<Vec<Object>>,
+    ) -> Self {
+        let new_packages = output_objects
+            .iter()
+            .flatten()
+            .filter_map(|o| {
+                if o.is_package() {
+                    Some((o.id(), PackageObject::new(o.clone())))
+                } else {
+                    None
+                }
+            })
+            .collect();
+        Self {
+            backing_store,
+            new_packages,
+        }
+    }
+}
+
+impl BackingPackageStore for PostExecutionPackageResolver {
+    fn get_package_object(&self, package_id: &ObjectID) -> SuiResult<Option<PackageObject>> {
+        if let Some(package) = self.new_packages.get(package_id) {
+            Ok(Some(package.clone()))
+        } else {
+            self.backing_store.get_package_object(package_id)
+        }
+    }
+}
+
 pub trait ParentSync {
     /// This function is only called by older protocol versions.
     /// It creates an explicit dependency to tombstones, which is not desired.
diff --git a/crates/sui-types/src/sui_sdk2_conversions.rs b/crates/sui-types/src/sui_sdk2_conversions.rs
index 6b64a26fb5110..88a73019cd19d 100644
--- a/crates/sui-types/src/sui_sdk2_conversions.rs
+++ b/crates/sui-types/src/sui_sdk2_conversions.rs
@@ -50,6 +50,7 @@ bcs_convert_impl!(
 );
 bcs_convert_impl!(crate::signature::GenericSignature, UserSignature);
 bcs_convert_impl!(crate::effects::TransactionEvents, TransactionEvents);
+bcs_convert_impl!(crate::transaction::Command, Command);
 
 impl<const T: bool> From<crate::crypto::AuthorityQuorumSignInfo<T>>
     for ValidatorAggregatedSignature
@@ -384,3 +385,21 @@ impl From<crate::effects::UnchangedSharedKind> for UnchangedSharedKind {
         }
     }
 }
+
+impl From<crate::transaction::TransactionExpiration> for TransactionExpiration {
+    fn from(value: crate::transaction::TransactionExpiration) -> Self {
+        match value {
+            crate::transaction::TransactionExpiration::None => Self::None,
+            crate::transaction::TransactionExpiration::Epoch(epoch) => Self::Epoch(epoch),
+        }
+    }
+}
+
+impl From<TransactionExpiration> for crate::transaction::TransactionExpiration {
+    fn from(value: TransactionExpiration) -> Self {
+        match value {
+            TransactionExpiration::None => Self::None,
+            TransactionExpiration::Epoch(epoch) => Self::Epoch(epoch),
+        }
+    }
+}
diff --git a/crates/sui-types/src/transaction.rs b/crates/sui-types/src/transaction.rs
index a2e37eddbd138..be40bcd989d8b 100644
--- a/crates/sui-types/src/transaction.rs
+++ b/crates/sui-types/src/transaction.rs
@@ -1902,6 +1902,10 @@ impl TransactionData {
             .iter()
             .any(|obj| obj.id() == SUI_RANDOMNESS_STATE_OBJECT_ID)
     }
+
+    pub fn digest(&self) -> TransactionDigest {
+        TransactionDigest::new(default_hash(self))
+    }
 }
 
 #[enum_dispatch]
@@ -2378,7 +2382,7 @@ impl Message for SenderSignedData {
 
     /// Computes the tx digest that encodes the Rust type prefix from Signable trait.
     fn digest(&self) -> Self::DigestType {
-        TransactionDigest::new(default_hash(&self.intent_message().value))
+        self.intent_message().value.digest()
     }
 }
 
diff --git a/crates/sui-types/src/transaction_executor.rs b/crates/sui-types/src/transaction_executor.rs
new file mode 100644
index 0000000000000..8fd2ebc742a28
--- /dev/null
+++ b/crates/sui-types/src/transaction_executor.rs
@@ -0,0 +1,17 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::quorum_driver_types::ExecuteTransactionRequestV3;
+use crate::quorum_driver_types::ExecuteTransactionResponseV3;
+use crate::quorum_driver_types::QuorumDriverError;
+
+/// Trait to define the interface for how the REST service interacts with a a QuorumDriver or a
+/// simulated transaction executor.
+#[async_trait::async_trait]
+pub trait TransactionExecutor: Send + Sync {
+    async fn execute_transaction(
+        &self,
+        request: ExecuteTransactionRequestV3,
+        client_addr: Option<std::net::SocketAddr>,
+    ) -> Result<ExecuteTransactionResponseV3, QuorumDriverError>;
+}
diff --git a/crates/sui-types/tests/serde_tests.rs b/crates/sui-types/tests/serde_tests.rs
index cd7056857b06b..2343c90b91329 100644
--- a/crates/sui-types/tests/serde_tests.rs
+++ b/crates/sui-types/tests/serde_tests.rs
@@ -18,7 +18,7 @@ fn test_struct_tag_serde() {
     struct TestStructTag(#[serde_as(as = "SuiStructTag")] StructTag);
 
     // serialize to json should not trim the leading 0
-    let Value::String(json) = serde_json::to_value(&TestStructTag(tag.clone())).unwrap() else {
+    let Value::String(json) = serde_json::to_value(TestStructTag(tag.clone())).unwrap() else {
         panic!()
     };
     assert_eq!(json, "0x07f89cdffd8968affa0b47bef91adc5314e19509080470c45bfd434cd83a766b::suifrens::SuiFren<0x07f89cdffd8968affa0b47bef91adc5314e19509080470c45bfd434cd83a766b::capy::Capy>");
diff --git a/crates/sui-verifier-transactional-tests/Cargo.toml b/crates/sui-verifier-transactional-tests/Cargo.toml
index 12d9944ec1e9a..302b64e93c033 100644
--- a/crates/sui-verifier-transactional-tests/Cargo.toml
+++ b/crates/sui-verifier-transactional-tests/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 
 [dev-dependencies]
 datatest-stable.workspace = true
-sui-transactional-test-runner.workspace = true
+# sui-transactional-test-runner.workspace = true
 
 [[test]]
 name = "tests"
diff --git a/crates/sui/Cargo.toml b/crates/sui/Cargo.toml
index 0c2872feefab4..f13a9ea08aad1 100644
--- a/crates/sui/Cargo.toml
+++ b/crates/sui/Cargo.toml
@@ -6,6 +6,9 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 anemo.workspace = true
 anyhow.workspace = true
diff --git a/crates/sui/src/client_commands.rs b/crates/sui/src/client_commands.rs
index 09907f0941ede..aec1751251eb1 100644
--- a/crates/sui/src/client_commands.rs
+++ b/crates/sui/src/client_commands.rs
@@ -36,7 +36,7 @@ use serde::Serialize;
 use serde_json::{json, Value};
 use sui_move::manage_package::resolve_lock_file_path;
 use sui_protocol_config::{Chain, ProtocolConfig, ProtocolVersion};
-use sui_source_validation::{BytecodeSourceVerifier, SourceMode};
+use sui_source_validation::{BytecodeSourceVerifier, ValidationMode};
 
 use shared_crypto::intent::Intent;
 use sui_json::SuiJsonValue;
@@ -1106,7 +1106,7 @@ impl SuiClientCommands {
                 let mut used_ticks = meter.accumulator(Scope::Package).clone();
                 used_ticks.name = pkg_name;
 
-                let meter_config = protocol_config.meter_config();
+                let meter_config = protocol_config.meter_config_for_signing();
 
                 let exceeded = matches!(
                     meter_config.max_per_pkg_meter_units,
@@ -1605,11 +1605,17 @@ impl SuiClientCommands {
                 skip_source,
                 address_override,
             } => {
-                if skip_source && !verify_deps {
-                    return Err(anyhow!(
-                        "Source skipped and not verifying deps: Nothing to verify."
-                    ));
-                }
+                let mode = match (!skip_source, verify_deps, address_override) {
+                    (false, false, _) => {
+                        bail!("Source skipped and not verifying deps: Nothing to verify.")
+                    }
+
+                    (false, true, _) => ValidationMode::deps(),
+                    (true, false, None) => ValidationMode::root(),
+                    (true, true, None) => ValidationMode::root_and_deps(),
+                    (true, false, Some(at)) => ValidationMode::root_at(*at),
+                    (true, true, Some(at)) => ValidationMode::root_and_deps_at(*at),
+                };
 
                 let build_config = resolve_lock_file_path(build_config, Some(&package_path))?;
                 let chain_id = context
@@ -1627,17 +1633,8 @@ impl SuiClientCommands {
                 .build(&package_path)?;
 
                 let client = context.get_client().await?;
-
                 BytecodeSourceVerifier::new(client.read_api())
-                    .verify_package(
-                        &compiled_package,
-                        verify_deps,
-                        match (skip_source, address_override) {
-                            (true, _) => SourceMode::Skip,
-                            (false, None) => SourceMode::Verify,
-                            (false, Some(addr)) => SourceMode::VerifyAt(addr.into()),
-                        },
-                    )
+                    .verify(&compiled_package, mode)
                     .await?;
 
                 SuiClientCommandResult::VerifySource
@@ -1860,7 +1857,10 @@ pub(crate) async fn compile_package(
     let compiled_modules = compiled_package.get_package_bytes(with_unpublished_dependencies);
     if !skip_dependency_verification {
         let verifier = BytecodeSourceVerifier::new(read_api);
-        if let Err(e) = verifier.verify_package_deps(&compiled_package).await {
+        if let Err(e) = verifier
+            .verify(&compiled_package, ValidationMode::deps())
+            .await
+        {
             return Err(SuiError::ModulePublishFailure {
                 error: format!(
                     "[warning] {e}\n\
@@ -2715,6 +2715,7 @@ pub async fn execute_dry_run(
 /// Call a dry run with the transaction data to estimate the gas budget.
 /// The estimated gas budget is computed as following:
 /// * the maximum between A and B, where:
+///
 /// A = computation cost + GAS_SAFE_OVERHEAD * reference gas price
 /// B = computation cost + storage cost - storage rebate + GAS_SAFE_OVERHEAD * reference gas price
 /// overhead
diff --git a/crates/sui/src/client_ptb/lexer.rs b/crates/sui/src/client_ptb/lexer.rs
index 749e8f724ada6..2338683ffadad 100644
--- a/crates/sui/src/client_ptb/lexer.rs
+++ b/crates/sui/src/client_ptb/lexer.rs
@@ -17,9 +17,7 @@ pub struct Lexer<'l, I: Iterator<Item = &'l str>> {
 
 impl<'l, I: Iterator<Item = &'l str>> Lexer<'l, I> {
     pub fn new(mut tokens: I) -> Option<Self> {
-        let Some(buf) = tokens.next() else {
-            return None;
-        };
+        let buf = tokens.next()?;
 
         Some(Self {
             buf,
@@ -63,9 +61,7 @@ impl<'l, I: Iterator<Item = &'l str>> Lexer<'l, I> {
     fn eat_prefix(&mut self, patt: &str) -> Option<Spanned<&'l str>> {
         let start = self.offset;
 
-        let Some(rest) = self.buf.strip_prefix(patt) else {
-            return None;
-        };
+        let rest = self.buf.strip_prefix(patt)?;
 
         let len = self.buf.len() - rest.len();
         let value = &self.buf[..len];
@@ -120,9 +116,7 @@ impl<'l, I: Iterator<Item = &'l str>> Lexer<'l, I> {
     /// Look at the next character in the current shell token without consuming it, if it exists.
     fn peek(&self) -> Option<Spanned<&'l str>> {
         let start = self.offset;
-        let Some((ix, _)) = self.next_char_boundary() else {
-            return None;
-        };
+        let (ix, _) = self.next_char_boundary()?;
 
         let value = &self.buf[..ix];
         let span = Span {
diff --git a/crates/sui/src/sui_commands.rs b/crates/sui/src/sui_commands.rs
index b59ca8a50ad86..3b6aed25f268e 100644
--- a/crates/sui/src/sui_commands.rs
+++ b/crates/sui/src/sui_commands.rs
@@ -287,6 +287,10 @@ pub enum SuiCommand {
         /// Path to a package which the command should be run with respect to.
         #[clap(long = "path", short = 'p', global = true)]
         package_path: Option<PathBuf>,
+        /// Sets the file storing the state of our user accounts (an empty one will be created if missing)
+        /// Only used when the `--dump-bytecode-as-base64` is set.
+        #[clap(long = "client.config")]
+        config: Option<PathBuf>,
         /// Package build options
         #[clap(flatten)]
         build_config: BuildConfig,
@@ -448,8 +452,27 @@ impl SuiCommand {
             SuiCommand::Move {
                 package_path,
                 build_config,
-                cmd,
-            } => execute_move_command(package_path.as_deref(), build_config, cmd),
+                mut cmd,
+                config: client_config,
+            } => {
+                match &mut cmd {
+                    sui_move::Command::Build(build) if build.dump_bytecode_as_base64 => {
+                        // `sui move build` does not ordinarily require a network connection.
+                        // The exception is when --dump-bytecode-as-base64 is specified: In this
+                        // case, we should resolve the correct addresses for the respective chain
+                        // (e.g., testnet, mainnet) from the Move.lock under automated address management.
+                        let config =
+                            client_config.unwrap_or(sui_config_dir()?.join(SUI_CLIENT_CONFIG));
+                        prompt_if_no_config(&config, false).await?;
+                        let context = WalletContext::new(&config, None, None)?;
+                        let client = context.get_client().await?;
+                        let chain_id = client.read_api().get_chain_identifier().await.ok();
+                        build.chain_id = chain_id.clone();
+                    }
+                    _ => (),
+                };
+                execute_move_command(package_path.as_deref(), build_config, cmd)
+            }
             SuiCommand::BridgeInitialize {
                 network_config,
                 client_config,
diff --git a/crates/sui/tests/cli_tests.rs b/crates/sui/tests/cli_tests.rs
index 59a13bc6e4c7e..7d0c374dce9df 100644
--- a/crates/sui/tests/cli_tests.rs
+++ b/crates/sui/tests/cli_tests.rs
@@ -7,6 +7,7 @@ use std::net::SocketAddr;
 use std::os::unix::prelude::FileExt;
 use std::{fmt::Write, fs::read_dir, path::PathBuf, str, thread, time::Duration};
 
+use std::env;
 #[cfg(not(msim))]
 use std::str::FromStr;
 
@@ -690,7 +691,7 @@ async fn test_move_call_args_linter_command() -> Result<(), anyhow::Error> {
 
     // Try a transfer
     // This should fail due to mismatch of object being sent
-    let args = vec![
+    let args = [
         SuiJsonValue::new(json!(obj))?,
         SuiJsonValue::new(json!(address2))?,
     ];
@@ -711,7 +712,7 @@ async fn test_move_call_args_linter_command() -> Result<(), anyhow::Error> {
 
     // Try a transfer with explicitly set gas price.
     // It should fail due to that gas price is below RGP.
-    let args = vec![
+    let args = [
         SuiJsonValue::new(json!(created_obj))?,
         SuiJsonValue::new(json!(address2))?,
     ];
@@ -739,7 +740,7 @@ async fn test_move_call_args_linter_command() -> Result<(), anyhow::Error> {
     // assert!(err_string.contains(&format!("Expected argument of type {package_addr}::object_basics::Object, but found type {framework_addr}::coin::Coin<{framework_addr}::sui::SUI>")));
 
     // Try a proper transfer
-    let args = vec![
+    let args = [
         SuiJsonValue::new(json!(created_obj))?,
         SuiJsonValue::new(json!(address2))?,
     ];
@@ -2079,7 +2080,7 @@ async fn test_package_management_on_upgrade_command_conflict() -> Result<(), any
     let err_string = err_string.replace(&package.object_id().to_string(), "<elided-for-test>");
 
     let expect = expect![[r#"
-        Conflicting published package address: `Move.toml` contains published-at address 0xbad but `Move.lock` file contains published-at address <elided-for-test>. You may want to:
+        Conflicting published package address: `Move.toml` contains published-at address 0x0000000000000000000000000000000000000000000000000000000000000bad but `Move.lock` file contains published-at address <elided-for-test>. You may want to:
 
                          - delete the published-at address in the `Move.toml` if the `Move.lock` address is correct; OR
                          - update the `Move.lock` address using the `sui manage-package` command to be the same as the `Move.toml`; OR
@@ -3934,6 +3935,59 @@ async fn test_clever_errors() -> Result<(), anyhow::Error> {
     Ok(())
 }
 
+#[tokio::test]
+async fn test_move_build_bytecode_with_address_resolution() -> Result<(), anyhow::Error> {
+    let test_cluster = TestClusterBuilder::new().build().await;
+    let config_path = test_cluster.swarm.dir().join(SUI_CLIENT_CONFIG);
+
+    // Package setup: a simple package depends on another and copied to tmpdir
+    let mut simple_package_path = PathBuf::from(TEST_DATA_DIR);
+    simple_package_path.push("simple");
+
+    let mut depends_on_simple_package_path = PathBuf::from(TEST_DATA_DIR);
+    depends_on_simple_package_path.push("depends_on_simple");
+
+    let tmp_dir = tempfile::tempdir().unwrap();
+
+    fs_extra::dir::copy(
+        &simple_package_path,
+        &tmp_dir,
+        &fs_extra::dir::CopyOptions::default(),
+    )?;
+
+    fs_extra::dir::copy(
+        &depends_on_simple_package_path,
+        &tmp_dir,
+        &fs_extra::dir::CopyOptions::default(),
+    )?;
+
+    // Publish simple package.
+    let simple_tmp_dir = tmp_dir.path().join("simple");
+    test_with_sui_binary(&[
+        "client",
+        "--client.config",
+        config_path.to_str().unwrap(),
+        "publish",
+        simple_tmp_dir.to_str().unwrap(),
+    ])
+    .await?;
+
+    // Build the package that depends on 'simple' package. Addresses must resolve successfully
+    // from the `Move.lock` for this command to succeed at all.
+    let depends_on_simple_tmp_dir = tmp_dir.path().join("depends_on_simple");
+    test_with_sui_binary(&[
+        "move",
+        "--client.config",
+        config_path.to_str().unwrap(),
+        "build",
+        "--dump-bytecode-as-base64",
+        "--path",
+        depends_on_simple_tmp_dir.to_str().unwrap(),
+    ])
+    .await?;
+    Ok(())
+}
+
 #[tokio::test]
 async fn test_parse_host_port() {
     let input = "127.0.0.0";
diff --git a/crates/sui/tests/data/depends_on_simple/Move.toml b/crates/sui/tests/data/depends_on_simple/Move.toml
new file mode 100644
index 0000000000000..0688373ff4de6
--- /dev/null
+++ b/crates/sui/tests/data/depends_on_simple/Move.toml
@@ -0,0 +1,9 @@
+[package]
+name = "depends_on_simple"
+edition = "2024.beta"
+
+[dependencies]
+simple = { local = "../simple" }
+
+[addresses]
+depends_on_simple = "0x0"
diff --git a/crates/sui/tests/data/depends_on_simple/sources/depends_on_simple.move b/crates/sui/tests/data/depends_on_simple/sources/depends_on_simple.move
new file mode 100644
index 0000000000000..dee8c33579f69
--- /dev/null
+++ b/crates/sui/tests/data/depends_on_simple/sources/depends_on_simple.move
@@ -0,0 +1,4 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+module depends_on_simple::depends_on_simple {}
diff --git a/crates/sui/tests/data/simple/Move.toml b/crates/sui/tests/data/simple/Move.toml
new file mode 100644
index 0000000000000..1775a6b3741ef
--- /dev/null
+++ b/crates/sui/tests/data/simple/Move.toml
@@ -0,0 +1,8 @@
+[package]
+name = "simple"
+edition = "2024.beta"
+
+[dependencies]
+
+[addresses]
+simple = "0x0"
diff --git a/crates/sui/tests/data/simple/sources/simple.move b/crates/sui/tests/data/simple/sources/simple.move
new file mode 100644
index 0000000000000..40d3377133359
--- /dev/null
+++ b/crates/sui/tests/data/simple/sources/simple.move
@@ -0,0 +1,4 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+module simple::simple {}
diff --git a/crates/suiop-cli/Cargo.lock b/crates/suiop-cli/Cargo.lock
deleted file mode 100644
index deb5cfb996e0b..0000000000000
--- a/crates/suiop-cli/Cargo.lock
+++ /dev/null
@@ -1,2458 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "addr2line"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "aho-corasick"
-version = "0.7.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.75"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
-
-[[package]]
-name = "asynchronous-codec"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06a0daa378f5fd10634e44b0a29b2a87b890657658e072a30d6f26e57ddee182"
-dependencies = [
- "bytes",
- "futures-sink",
- "futures-util",
- "memchr",
- "pin-project-lite",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "backtrace"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide 0.7.1",
- "object",
- "rustc-demangle",
-]
-
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
-[[package]]
-name = "base64"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
-
-[[package]]
-name = "bumpalo"
-version = "3.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "bytes"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
-
-[[package]]
-name = "cc"
-version = "1.0.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
-dependencies = [
- "jobserver",
- "libc",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chrono"
-version = "0.4.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "js-sys",
- "num-traits",
- "serde",
- "wasm-bindgen",
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "clap"
-version = "4.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76"
-dependencies = [
- "bitflags 1.3.2",
- "clap_derive",
- "clap_lex",
- "is-terminal",
- "once_cell",
- "strsim",
- "termcolor",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8"
-dependencies = [
- "heck",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade"
-dependencies = [
- "os_str_bytes",
-]
-
-[[package]]
-name = "codespan-reporting"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
-dependencies = [
- "termcolor",
- "unicode-width",
-]
-
-[[package]]
-name = "colored"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6"
-dependencies = [
- "is-terminal",
- "lazy_static",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "containers-api"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56082e32f18a6d60f06c736b49e234deffb93b13cb87091a39e0dec053d03819"
-dependencies = [
- "chrono",
- "flate2",
- "futures-util",
- "http",
- "hyper",
- "hyperlocal",
- "log",
- "mime",
- "paste",
- "pin-project",
- "serde",
- "serde_json",
- "tar",
- "thiserror",
- "tokio",
- "url",
-]
-
-[[package]]
-name = "core-foundation"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc"
-
-[[package]]
-name = "crc32fast"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "crossterm"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
-dependencies = [
- "bitflags 1.3.2",
- "crossterm_winapi",
- "libc",
- "mio",
- "parking_lot",
- "signal-hook",
- "signal-hook-mio",
- "winapi",
-]
-
-[[package]]
-name = "crossterm_winapi"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "csv"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
-dependencies = [
- "csv-core",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "csv-core"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "cxx"
-version = "1.0.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc831ee6a32dd495436e317595e639a587aa9907bef96fe6e6abc290ab6204e9"
-dependencies = [
- "cc",
- "cxxbridge-flags",
- "cxxbridge-macro",
- "link-cplusplus",
-]
-
-[[package]]
-name = "cxx-build"
-version = "1.0.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94331d54f1b1a8895cd81049f7eaaaef9d05a7dcb4d1fd08bf3ff0806246789d"
-dependencies = [
- "cc",
- "codespan-reporting",
- "once_cell",
- "proc-macro2",
- "quote",
- "scratch",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "cxxbridge-flags"
-version = "1.0.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48dcd35ba14ca9b40d6e4b4b39961f23d835dbb8eed74565ded361d93e1feb8a"
-
-[[package]]
-name = "cxxbridge-macro"
-version = "1.0.89"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81bbeb29798b407ccd82a3324ade1a7286e0d29851475990b612670f6f5124d2"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "darling"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
-dependencies = [
- "darling_core 0.13.4",
- "darling_macro 0.13.4",
-]
-
-[[package]]
-name = "darling"
-version = "0.14.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0808e1bd8671fb44a113a14e13497557533369847788fa2ae912b6ebfce9fa8"
-dependencies = [
- "darling_core 0.14.3",
- "darling_macro 0.14.3",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.14.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "001d80444f28e193f30c2f293455da62dcf9a6b29918a4253152ae2b1de592cb"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
-dependencies = [
- "darling_core 0.13.4",
- "quote",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "darling_macro"
-version = "0.14.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b36230598a2d5de7ec1c6f51f72d8a99a9208daff41de2084d06e3fd3ea56685"
-dependencies = [
- "darling_core 0.14.3",
- "quote",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "dirs-next"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
-dependencies = [
- "cfg-if",
- "dirs-sys-next",
-]
-
-[[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
-dependencies = [
- "libc",
- "redox_users",
- "winapi",
-]
-
-[[package]]
-name = "docker-api"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "522a3ae33cf4fc165de192eb9c563b755bc43cda9bd6f442b2d511b84514b917"
-dependencies = [
- "asynchronous-codec",
- "base64 0.13.1",
- "byteorder",
- "bytes",
- "chrono",
- "containers-api",
- "docker-api-stubs",
- "futures-util",
- "http",
- "hyper",
- "log",
- "paste",
- "serde",
- "serde_json",
- "tar",
- "thiserror",
- "url",
-]
-
-[[package]]
-name = "docker-api-stubs"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5872f5e057625a972acce1a51b461284eab32b7e594e18f8fc2f63724075da47"
-dependencies = [
- "chrono",
- "serde",
- "serde_json",
- "serde_with",
-]
-
-[[package]]
-name = "dyn-clone"
-version = "1.0.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d"
-
-[[package]]
-name = "encode_unicode"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "errno"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "field_names"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cca4fdab1b9b7e274e7de51202e37f9cfa542b28c77f8d09b817d77a726b4807"
-dependencies = [
- "darling 0.13.4",
- "proc-macro2",
- "quote",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "filetime"
-version = "0.2.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall 0.2.16",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "flate2"
-version = "1.0.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
-dependencies = [
- "crc32fast",
- "miniz_oxide 0.6.2",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-
-[[package]]
-name = "futures-channel"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5"
-dependencies = [
- "futures-core",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608"
-
-[[package]]
-name = "futures-io"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95a73af87da33b5acf53acfebdc339fe592ecf5357ac7c0a7734ab9d8c876a70"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364"
-
-[[package]]
-name = "futures-task"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366"
-
-[[package]]
-name = "futures-util"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1"
-dependencies = [
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "gimli"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
-
-[[package]]
-name = "git2"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc"
-dependencies = [
- "bitflags 1.3.2",
- "libc",
- "libgit2-sys",
- "log",
- "openssl-probe",
- "openssl-sys",
- "url",
-]
-
-[[package]]
-name = "h2"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http",
- "indexmap 1.9.2",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "hashbrown"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
-
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
-[[package]]
-name = "hermit-abi"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "http"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http-body"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
-dependencies = [
- "bytes",
- "http",
- "pin-project-lite",
-]
-
-[[package]]
-name = "httparse"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
-
-[[package]]
-name = "httpdate"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
-
-[[package]]
-name = "hyper"
-version = "0.14.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
-dependencies = [
- "futures-util",
- "http",
- "hyper",
- "rustls",
- "tokio",
- "tokio-rustls",
-]
-
-[[package]]
-name = "hyperlocal"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fafdf7b2b2de7c9784f76e02c0935e65a8117ec3b768644379983ab333ac98c"
-dependencies = [
- "futures-util",
- "hex",
- "hyper",
- "pin-project",
- "tokio",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.53"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "winapi",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
-dependencies = [
- "cxx",
- "cxx-build",
-]
-
-[[package]]
-name = "ident_case"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
-
-[[package]]
-name = "idna"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
- "serde",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
-dependencies = [
- "equivalent",
- "hashbrown 0.14.2",
-]
-
-[[package]]
-name = "inquire"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c33e7c1ddeb15c9abcbfef6029d8e29f69b52b6d6c891031b88ed91b5065803b"
-dependencies = [
- "bitflags 1.3.2",
- "crossterm",
- "dyn-clone",
- "lazy_static",
- "newline-converter",
- "thiserror",
- "unicode-segmentation",
- "unicode-width",
-]
-
-[[package]]
-name = "io-lifetimes"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3"
-dependencies = [
- "libc",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "ipnet"
-version = "2.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146"
-
-[[package]]
-name = "is-terminal"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef"
-dependencies = [
- "hermit-abi 0.3.1",
- "io-lifetimes",
- "rustix",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
-
-[[package]]
-name = "jobserver"
-version = "0.1.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "js-sys"
-version = "0.3.61"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libc"
-version = "0.2.150"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
-
-[[package]]
-name = "libgit2-sys"
-version = "0.14.2+1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4"
-dependencies = [
- "cc",
- "libc",
- "libssh2-sys",
- "libz-sys",
- "openssl-sys",
- "pkg-config",
-]
-
-[[package]]
-name = "libredox"
-version = "0.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
-dependencies = [
- "bitflags 2.4.1",
- "libc",
- "redox_syscall 0.4.1",
-]
-
-[[package]]
-name = "libssh2-sys"
-version = "0.2.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca"
-dependencies = [
- "cc",
- "libc",
- "libz-sys",
- "openssl-sys",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "libz-sys"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf"
-dependencies = [
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "link-cplusplus"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
-
-[[package]]
-name = "lock_api"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "maplit"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
-
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata",
-]
-
-[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
-[[package]]
-name = "mime"
-version = "0.3.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "mio"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
-dependencies = [
- "libc",
- "log",
- "wasi",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "newline-converter"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f71d09d5c87634207f894c6b31b6a2b2c64ea3bdcf71bd5599fdbbe1600c00f"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "nu-ansi-term"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
-dependencies = [
- "overload",
- "winapi",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
-dependencies = [
- "hermit-abi 0.2.6",
- "libc",
-]
-
-[[package]]
-name = "object"
-version = "0.32.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
-
-[[package]]
-name = "openssl-probe"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
-
-[[package]]
-name = "openssl-sys"
-version = "0.9.80"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7"
-dependencies = [
- "autocfg",
- "cc",
- "libc",
- "pkg-config",
- "vcpkg",
-]
-
-[[package]]
-name = "os_str_bytes"
-version = "6.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
-
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
-[[package]]
-name = "parking_lot"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall 0.2.16",
- "smallvec",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
-
-[[package]]
-name = "percent-encoding"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
-
-[[package]]
-name = "pin-project"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
-dependencies = [
- "pin-project-internal",
-]
-
-[[package]]
-name = "pin-project-internal"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
-
-[[package]]
-name = "prettytable"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46480520d1b77c9a3482d39939fcf96831537a250ec62d4fd8fbdf8e0302e781"
-dependencies = [
- "csv",
- "encode_unicode",
- "is-terminal",
- "lazy_static",
- "term",
- "unicode-width",
-]
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.107",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
-dependencies = [
- "fuchsia-cprng",
- "libc",
- "rand_core 0.3.1",
- "rdrand",
- "winapi",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-dependencies = [
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-
-[[package]]
-name = "rdrand"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
-dependencies = [
- "getrandom",
- "libredox",
- "thiserror",
-]
-
-[[package]]
-name = "regex"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "reqwest"
-version = "0.11.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
-dependencies = [
- "base64 0.21.0",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
- "hyper-rustls",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls",
- "rustls-pemfile",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "system-configuration",
- "tokio",
- "tokio-rustls",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "webpki-roots",
- "winreg",
-]
-
-[[package]]
-name = "ring"
-version = "0.17.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b"
-dependencies = [
- "cc",
- "getrandom",
- "libc",
- "spin",
- "untrusted",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
-
-[[package]]
-name = "rustix"
-version = "0.36.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644"
-dependencies = [
- "bitflags 1.3.2",
- "errno",
- "io-lifetimes",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.45.0",
-]
-
-[[package]]
-name = "rustls"
-version = "0.21.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c"
-dependencies = [
- "log",
- "ring",
- "rustls-webpki",
- "sct",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
-dependencies = [
- "base64 0.21.0",
-]
-
-[[package]]
-name = "rustls-webpki"
-version = "0.101.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
-
-[[package]]
-name = "ryu"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"
-
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "scratch"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2"
-
-[[package]]
-name = "sct"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a"
-
-[[package]]
-name = "serde"
-version = "1.0.191"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a834c4821019838224821468552240d4d95d14e751986442c816572d39a080c9"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.191"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46fa52d5646bce91b680189fe5b1c049d2ea38dabb4e2e7c8d00ca12cfbfbcfd"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.39",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.108"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_with"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d904179146de381af4c93d3af6ca4984b3152db687dacb9c3c35e86f39809c"
-dependencies = [
- "base64 0.13.1",
- "chrono",
- "hex",
- "indexmap 1.9.2",
- "serde",
- "serde_json",
- "serde_with_macros",
- "time",
-]
-
-[[package]]
-name = "serde_with_macros"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1966009f3c05f095697c537312f5415d1e3ed31ce0a56942bac4c771c5c335e"
-dependencies = [
- "darling 0.14.3",
- "proc-macro2",
- "quote",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "serde_yaml"
-version = "0.9.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c"
-dependencies = [
- "indexmap 2.1.0",
- "itoa",
- "ryu",
- "serde",
- "unsafe-libyaml",
-]
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "signal-hook"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
-[[package]]
-name = "signal-hook-mio"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
-dependencies = [
- "libc",
- "mio",
- "signal-hook",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
-
-[[package]]
-name = "socket2"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-
-[[package]]
-name = "spinners"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08615eea740067d9899969bc2891c68a19c315cb1f66640af9a9ecb91b13bcab"
-dependencies = [
- "lazy_static",
- "maplit",
- "strum",
-]
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "strum"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
-dependencies = [
- "strum_macros",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "suiop"
-version = "0.1.4"
-dependencies = [
- "anyhow",
- "chrono",
- "clap",
- "colored",
- "docker-api",
- "field_names",
- "git2",
- "inquire",
- "prettytable",
- "regex",
- "reqwest",
- "semver",
- "serde",
- "serde_json",
- "serde_yaml",
- "spinners",
- "strum",
- "tempdir",
- "tokio",
- "toml_edit",
- "tracing",
- "tracing-subscriber",
- "vultr-api",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.107"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "tar"
-version = "0.4.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6"
-dependencies = [
- "filetime",
- "libc",
- "xattr",
-]
-
-[[package]]
-name = "tempdir"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
-dependencies = [
- "rand",
- "remove_dir_all",
-]
-
-[[package]]
-name = "term"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
-dependencies = [
- "dirs-next",
- "rustversion",
- "winapi",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "time"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
-dependencies = [
- "itoa",
- "serde",
- "time-core",
- "time-macros",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
-
-[[package]]
-name = "time-macros"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2"
-dependencies = [
- "time-core",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
-[[package]]
-name = "tokio"
-version = "1.29.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
-dependencies = [
- "autocfg",
- "backtrace",
- "bytes",
- "libc",
- "mio",
- "num_cpus",
- "parking_lot",
- "pin-project-lite",
- "signal-hook-registry",
- "socket2",
- "tokio-macros",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.39",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
-dependencies = [
- "rustls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc6a3b08b64e6dfad376fa2432c7b1f01522e37a623c3050bc95db2d3ff21583"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
-
-[[package]]
-name = "toml_edit"
-version = "0.19.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
-dependencies = [
- "indexmap 2.1.0",
- "toml_datetime",
- "winnow",
-]
-
-[[package]]
-name = "tower-service"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
-
-[[package]]
-name = "tracing"
-version = "0.1.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
-dependencies = [
- "cfg-if",
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.107",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
-dependencies = [
- "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
-dependencies = [
- "lazy_static",
- "log",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70"
-dependencies = [
- "matchers",
- "nu-ansi-term",
- "once_cell",
- "regex",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
-
-[[package]]
-name = "unsafe-libyaml"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa"
-
-[[package]]
-name = "untrusted"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
-
-[[package]]
-name = "url"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
-]
-
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
-[[package]]
-name = "vcpkg"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "vultr-api"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "field_names",
- "reqwest",
- "serde",
- "serde_json",
- "tokio",
-]
-
-[[package]]
-name = "want"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
-dependencies = [
- "log",
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.84"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.84"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn 1.0.107",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.84"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.84"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.107",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.84"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
-
-[[package]]
-name = "web-sys"
-version = "0.3.61"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.25.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.1",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.1",
- "windows_aarch64_msvc 0.42.1",
- "windows_i686_gnu 0.42.1",
- "windows_i686_msvc 0.42.1",
- "windows_x86_64_gnu 0.42.1",
- "windows_x86_64_gnullvm 0.42.1",
- "windows_x86_64_msvc 0.42.1",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
-[[package]]
-name = "winnow"
-version = "0.5.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "winreg"
-version = "0.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "xattr"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc"
-dependencies = [
- "libc",
-]
diff --git a/crates/suiop-cli/Cargo.toml b/crates/suiop-cli/Cargo.toml
index 456a0330054c6..9682481012b17 100644
--- a/crates/suiop-cli/Cargo.toml
+++ b/crates/suiop-cli/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 license = "Apache-2.0"
 name = "suiop-cli"
 publish = false
-version = "0.2.5"
+version.workspace = true
 
 [lib]
 name = "suioplib"
diff --git a/crates/suiop-cli/src/cli/ci/image.rs b/crates/suiop-cli/src/cli/ci/image.rs
index 52539a5cbc807..9486cbfaf4358 100644
--- a/crates/suiop-cli/src/cli/ci/image.rs
+++ b/crates/suiop-cli/src/cli/ci/image.rs
@@ -136,11 +136,11 @@ pub enum ImageAction {
         #[arg(short = 'v', long)]
         ref_val: Option<String>,
     },
-    #[command(name = "list")]
+    #[command(name = "list", aliases = &["ls"])]
     List {
-        #[arg(short, long)]
+        #[arg(short, long, aliases = &["repo"])]
         repo_name: String,
-        #[arg(short, long)]
+        #[arg(short, long, aliases = &["image"])]
         image_name: Option<String>,
         #[arg(short, long)]
         limit: Option<i32>,
diff --git a/crates/suiop-cli/src/cli/ci/mod.rs b/crates/suiop-cli/src/cli/ci/mod.rs
index 351d45809d8d0..ecbae85e75a19 100644
--- a/crates/suiop-cli/src/cli/ci/mod.rs
+++ b/crates/suiop-cli/src/cli/ci/mod.rs
@@ -20,7 +20,7 @@ pub struct CIArgs {
 pub(crate) enum CIAction {
     #[clap(aliases = ["k", "key"])]
     Keys(KeyArgs),
-    #[clap(aliases = ["i", "image"])]
+    #[clap(aliases = ["i"])]
     Image(ImageArgs),
 }
 
diff --git a/crates/suiop-cli/src/cli/lib/oauth/mod.rs b/crates/suiop-cli/src/cli/lib/oauth/mod.rs
index f33908e25c5f6..d882d0029efd8 100644
--- a/crates/suiop-cli/src/cli/lib/oauth/mod.rs
+++ b/crates/suiop-cli/src/cli/lib/oauth/mod.rs
@@ -10,7 +10,6 @@ use axum::response::IntoResponse;
 use axum::{extract::Query, routing::get, Router};
 use chrono;
 use dirs;
-use reqwest;
 use reqwest::header::{HeaderMap, HeaderValue};
 use serde::{Deserialize, Serialize};
 use std::fs::{self, File};
@@ -155,8 +154,8 @@ fn spawn_local_server(
         );
         let addr = SocketAddr::from(([127, 0, 0, 1], 17846));
 
-        axum::Server::bind(&addr)
-            .serve(app.into_make_service())
+        let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
+        axum::serve(listener, app)
             .await
             .expect("couldn't start local auth server on port 17846");
     })
diff --git a/crates/suiop-cli/src/command.rs b/crates/suiop-cli/src/command.rs
index c14c39cb3e4f2..8247dbb9938f1 100644
--- a/crates/suiop-cli/src/command.rs
+++ b/crates/suiop-cli/src/command.rs
@@ -38,11 +38,7 @@ impl Default for CommandOptions {
 
 pub fn run_cmd(cmd_in: Vec<&str>, options: Option<CommandOptions>) -> Result<Output> {
     debug!("attempting to run {}", cmd_in.join(" "));
-    let opts = if let Some(opts) = options {
-        opts
-    } else {
-        CommandOptions::default()
-    };
+    let opts = options.unwrap_or_default();
 
     let mut cmd = Command::new(cmd_in[0]);
     // add extra args
diff --git a/crates/suiop-cli/tests/integration_tests.rs b/crates/suiop-cli/tests/integration_tests.rs
index ff4d84a4a5083..205bab2e32d0a 100644
--- a/crates/suiop-cli/tests/integration_tests.rs
+++ b/crates/suiop-cli/tests/integration_tests.rs
@@ -26,7 +26,7 @@ fn test_initialize_service_ext() -> Result<()> {
         .current_dir(svc_dir)
         .output()?;
 
-    debug!("cargo build output: {:?}", output);
+    println!("cargo build output: {:?}", output);
     assert!(output.status.success());
     Ok(())
 }
diff --git a/crates/telemetry-subscribers/src/lib.rs b/crates/telemetry-subscribers/src/lib.rs
index c320ad39d5b97..7221034ad9273 100644
--- a/crates/telemetry-subscribers/src/lib.rs
+++ b/crates/telemetry-subscribers/src/lib.rs
@@ -380,6 +380,7 @@ impl TelemetryConfig {
         let mut file_output = CachedOpenFile::new::<&str>(None).unwrap();
         let mut provider = None;
         let sampler = SamplingFilter::new(config.sample_rate);
+        let service_name = env::var("OTEL_SERVICE_NAME").unwrap_or("sui-node".to_owned());
 
         if config.enable_otlp_tracing {
             let trace_file = env::var("TRACE_FILE").ok();
@@ -387,7 +388,7 @@ impl TelemetryConfig {
             let config = sdk::trace::config()
                 .with_resource(Resource::new(vec![opentelemetry::KeyValue::new(
                     "service.name",
-                    "sui-node",
+                    service_name.clone(),
                 )]))
                 .with_sampler(Sampler::ParentBased(Box::new(sampler.clone())));
 
@@ -404,7 +405,7 @@ impl TelemetryConfig {
                     .with_span_processor(processor)
                     .build();
 
-                let tracer = p.tracer("sui-node");
+                let tracer = p.tracer(service_name);
                 provider = Some(p);
 
                 tracing_opentelemetry::layer().with_tracer(tracer)
@@ -499,7 +500,7 @@ impl SamplingFilter {
 
     fn clamp(sample_rate: f64) -> f64 {
         // clamp sample rate to between 0.0001 and 1.0
-        sample_rate.max(0.0001).min(1.0)
+        sample_rate.clamp(0.0001, 1.0)
     }
 
     fn update_sampling_rate(&self, sample_rate: f64) {
diff --git a/crates/telemetry-subscribers/src/span_latency_prom.rs b/crates/telemetry-subscribers/src/span_latency_prom.rs
index a42783d84684b..476bf30151980 100644
--- a/crates/telemetry-subscribers/src/span_latency_prom.rs
+++ b/crates/telemetry-subscribers/src/span_latency_prom.rs
@@ -10,6 +10,7 @@
 //! - tracing-timing does not output to Prometheus, and extracting data from its histograms takes extra CPU
 //! - tracing-timing records latencies using HDRHistogram, which is great, but uses extra memory when one
 //!   is already using Prometheus
+//!
 //! Thus this is a much smaller and more focused module.
 //!
 //! ## Making spans visible
diff --git a/crates/test-cluster/Cargo.toml b/crates/test-cluster/Cargo.toml
index 826433cb330f2..6f967e93389b8 100644
--- a/crates/test-cluster/Cargo.toml
+++ b/crates/test-cluster/Cargo.toml
@@ -6,6 +6,9 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 anyhow.workspace = true
 bcs.workspace = true
diff --git a/crates/test-cluster/src/lib.rs b/crates/test-cluster/src/lib.rs
index 8740c39577349..0e730eadfda0e 100644
--- a/crates/test-cluster/src/lib.rs
+++ b/crates/test-cluster/src/lib.rs
@@ -5,8 +5,6 @@ use futures::Future;
 use futures::{future::join_all, StreamExt};
 use jsonrpsee::core::RpcResult;
 use jsonrpsee::http_client::{HttpClient, HttpClientBuilder};
-use jsonrpsee::ws_client::WsClient;
-use jsonrpsee::ws_client::WsClientBuilder;
 use rand::{distributions::*, rngs::OsRng, seq::SliceRandom};
 use std::collections::BTreeMap;
 use std::collections::HashMap;
@@ -88,7 +86,6 @@ pub struct FullNodeHandle {
     pub sui_client: SuiClient,
     pub rpc_client: HttpClient,
     pub rpc_url: String,
-    pub ws_url: String,
 }
 
 impl FullNodeHandle {
@@ -96,7 +93,6 @@ impl FullNodeHandle {
         let rpc_url = format!("http://{}", json_rpc_address);
         let rpc_client = HttpClientBuilder::default().build(&rpc_url).unwrap();
 
-        let ws_url = format!("ws://{}", json_rpc_address);
         let sui_client = SuiClientBuilder::default().build(&rpc_url).await.unwrap();
 
         Self {
@@ -104,16 +100,8 @@ impl FullNodeHandle {
             sui_client,
             rpc_client,
             rpc_url,
-            ws_url,
         }
     }
-
-    pub async fn ws_client(&self) -> WsClient {
-        WsClientBuilder::default()
-            .build(&self.ws_url)
-            .await
-            .unwrap()
-    }
 }
 
 pub struct TestCluster {
diff --git a/crates/transaction-fuzzer/Cargo.toml b/crates/transaction-fuzzer/Cargo.toml
index 15fe64e0735b4..106bebdf5a8d1 100644
--- a/crates/transaction-fuzzer/Cargo.toml
+++ b/crates/transaction-fuzzer/Cargo.toml
@@ -7,6 +7,9 @@ description = "Tool to fuzz the system with randomly generated transactions"
 license = "Apache-2.0"
 publish = false
 
+[lints]
+workspace = true
+
 [dependencies]
 proptest.workspace = true
 proptest-derive.workspace = true
diff --git a/crates/transaction-fuzzer/src/programmable_transaction_gen.rs b/crates/transaction-fuzzer/src/programmable_transaction_gen.rs
index 85de6eabbe2a6..3526a02009d61 100644
--- a/crates/transaction-fuzzer/src/programmable_transaction_gen.rs
+++ b/crates/transaction-fuzzer/src/programmable_transaction_gen.rs
@@ -404,7 +404,7 @@ pub fn gen_move_vec_input(
 
 /// A helper function to generate enough input coins for a command (transfer, merge, or create vector)
 /// - either collect them all from previous command or generate additional ones if the previous
-/// command does not deliver enough.
+///     command does not deliver enough.
 fn gen_enough_arguments(
     builder: &mut ProgrammableTransactionBuilder,
     prev_cmd_num: i64,
diff --git a/crates/typed-store-derive/Cargo.toml b/crates/typed-store-derive/Cargo.toml
index 9c81aca331e0d..d5c85a106b276 100644
--- a/crates/typed-store-derive/Cargo.toml
+++ b/crates/typed-store-derive/Cargo.toml
@@ -16,10 +16,3 @@ proc-macro2.workspace = true
 quote.workspace = true
 syn.workspace = true
 itertools.workspace = true
-
-[dev-dependencies]
-eyre.workspace = true
-rocksdb.workspace = true
-tempfile.workspace = true
-tokio = { workspace = true, features = ["test-util"] }
-typed-store.workspace = true
diff --git a/crates/typed-store-derive/src/lib.rs b/crates/typed-store-derive/src/lib.rs
index 907db02f06f95..be1d81862cb8d 100644
--- a/crates/typed-store-derive/src/lib.rs
+++ b/crates/typed-store-derive/src/lib.rs
@@ -93,7 +93,7 @@ fn extract_struct_info(
                 } else {
                     field_name.clone()
                 };
-                if attrs.get(DB_OPTIONS_DEPRECATE).is_some() {
+                if attrs.contains_key(DB_OPTIONS_DEPRECATE) {
                     deprecated_cfs.push(field_name.clone());
                 }
 
@@ -175,136 +175,6 @@ fn extract_generics_names(generics: &Generics) -> Vec<Ident> {
         .collect()
 }
 
-/// A helper macro to simplify common operations for opening and debugging TypedStore (currently internally structs of DBMaps)
-/// It operates on a struct where all the members are of Store<K, V> or DBMap<K, V>
-/// `TypedStoreDebug` traits are then derived
-/// The main features are:
-/// 1. Flexible configuration of each table (column family) via defaults and overrides
-/// 2. Auto-generated `open` routine
-/// 3. Auto-generated `read_only_mode` handle
-/// 4. Auto-generated memory stats method
-/// 5. Other convenience features
-///
-/// 1. Flexible configuration:
-/// a. Static options specified at struct definition
-/// The definer of the struct can specify the default options for each table using annotations
-/// We can also supply column family options on the default ones
-/// A user defined function of signature () -> Options can be provided for each table
-/// If a an override function is not specified, the default in `typed_store::rocks::default_db_options` is used
-/// ```
-/// use typed_store::rocks::DBOptions;
-/// use typed_store::rocks::DBMap;
-/// use typed_store::rocks::MetricConf;
-/// use typed_store_derive::DBMapUtils;
-/// use typed_store::traits::TypedStoreDebug;
-/// use typed_store::traits::TableSummary;
-/// use core::fmt::Error;
-/// /// Define a struct with all members having type DBMap<K, V>
-///
-/// fn custom_fn_name1() -> DBOptions {DBOptions::default()}
-/// fn custom_fn_name2() -> DBOptions {
-///     let mut op = custom_fn_name1();
-///     op.options.set_write_buffer_size(123456);
-///     op
-/// }
-/// #[derive(DBMapUtils)]
-/// struct Tables {
-///     /// Specify custom options function `custom_fn_name1`
-///     #[default_options_override_fn = "custom_fn_name1"]
-///     table1: DBMap<String, String>,
-///     #[default_options_override_fn = "custom_fn_name2"]
-///     table2: DBMap<i32, String>,
-///     // Nothing specified so `typed_store::rocks::default_db_options` is used
-///     table3: DBMap<i32, String>,
-///     #[default_options_override_fn = "custom_fn_name1"]
-///     table4: DBMap<i32, String>,
-/// }
-///
-/// // b. Options specified by DB opener
-/// // For finer control, we also allow the opener of the DB to specify their own options which override the defaults set by the definer
-/// // This is done via a configurator which gives one a struct with field similarly named as that of the DB, but of type Options
-///
-/// #[tokio::main]
-/// async fn main() -> Result<(), Error> {
-/// // Get a configurator for this table
-/// let mut config = Tables::configurator();
-/// // Config table 1
-/// config.table1 = DBOptions::default();
-/// config.table1.options.create_if_missing(true);
-/// config.table1.options.set_write_buffer_size(123456);
-///
-/// let primary_path = tempfile::tempdir().expect("Failed to open temporary directory").into_path();
-///
-/// // We can then open the DB with the configs
-/// let _ = Tables::open_tables_read_write(primary_path, MetricConf::default(), None, Some(config.build()));
-/// Ok(())
-/// }
-///
-///```
-///
-/// 2. Auto-generated `open` routine
-/// The function `open_tables_read_write` is generated which allows for specifying DB wide options and custom table configs as mentioned above
-///
-/// 3. Auto-generated `read_only_mode` handle
-/// This mode provides handle struct which opens the DB in read only mode and has certain features like dumping and counting the keys in the tables
-///
-/// Use the function `Tables::get_read_only_handle` which returns a handle that only allows read only features
-///```
-/// use typed_store::rocks::DBOptions;
-/// use typed_store::rocks::DBMap;
-/// use typed_store_derive::DBMapUtils;
-/// use typed_store::traits::TypedStoreDebug;
-/// use core::fmt::Error;
-/// use typed_store::traits::TableSummary;
-/// /// Define a struct with all members having type DBMap<K, V>
-///
-/// fn custom_fn_name1() -> DBOptions {DBOptions::default()}
-/// fn custom_fn_name2() -> DBOptions {
-///     let mut op = custom_fn_name1();
-///     op.options.set_write_buffer_size(123456);
-///     op
-/// }
-/// #[derive(DBMapUtils)]
-/// struct Tables {
-///     /// Specify custom options function `custom_fn_name1`
-///     #[default_options_override_fn = "custom_fn_name1"]
-///     table1: DBMap<String, String>,
-///     #[default_options_override_fn = "custom_fn_name2"]
-///     table2: DBMap<i32, String>,
-///     // Nothing specified so `typed_store::rocks::default_db_options` is used
-///     table3: DBMap<i32, String>,
-///     #[default_options_override_fn = "custom_fn_name1"]
-///     table4: DBMap<i32, String>,
-/// }
-/// #[tokio::main]
-/// async fn main() -> Result<(), Error> {
-///
-/// use typed_store::rocks::MetricConf;let primary_path = tempfile::tempdir().expect("Failed to open temporary directory").into_path();
-/// let _ = Tables::open_tables_read_write(primary_path.clone(), typed_store::rocks::MetricConf::default(), None, None);
-///
-/// // Get the read only handle
-/// let read_only_handle = Tables::get_read_only_handle(primary_path, None, None, MetricConf::default());
-/// // Use this handle for dumping
-/// let ret = read_only_handle.dump("table2", 100, 0).unwrap();
-/// let key_count = read_only_handle.count_keys("table1").unwrap();
-/// Ok(())
-/// }
-/// ```
-/// 4. Auto-generated memory stats method
-/// `self.get_memory_usage` is derived to provide memory and cache usage
-///
-/// 5. Other convenience features
-/// `Tables::describe_tables` is used to get a list of the table names and key-value types as string in a BTreeMap
-///
-/// // Bad usage example
-/// // Structs fields most only be of type Store<K, V> or DMBap<K, V>
-/// // This will fail to compile with error `All struct members must be of type Store<K, V> or DMBap<K, V>`
-/// // #[derive(DBMapUtils)]
-/// // struct BadTables {
-/// //     table1: Store<String, String>,
-/// //     bad_field: u32,
-/// // #}
-
 struct ExtractedStructInfo {
     field_names: Vec<Ident>,
     cf_names: Vec<Ident>,
@@ -437,7 +307,7 @@ pub fn derive_dbmap_utils_general(input: TokenStream) -> TokenStream {
                 as_secondary_with_path: Option<std::path::PathBuf>,
                 is_transaction: bool,
                 metric_conf: typed_store::rocks::MetricConf,
-                global_db_options_override: Option<rocksdb::Options>,
+                global_db_options_override: Option<typed_store::rocksdb::Options>,
                 tables_db_options_override: Option<typed_store::rocks::DBMapTableConfigMap>,
                 remove_deprecated_tables: bool,
             ) -> Self {
@@ -503,7 +373,7 @@ pub fn derive_dbmap_utils_general(input: TokenStream) -> TokenStream {
             pub fn open_tables_read_write(
                 path: std::path::PathBuf,
                 metric_conf: typed_store::rocks::MetricConf,
-                global_db_options_override: Option<rocksdb::Options>,
+                global_db_options_override: Option<typed_store::rocksdb::Options>,
                 tables_db_options_override: Option<typed_store::rocks::DBMapTableConfigMap>
             ) -> Self {
                 let inner = #intermediate_db_map_struct_name::open_tables_impl(path, None, false, metric_conf, global_db_options_override, tables_db_options_override, false);
@@ -518,7 +388,7 @@ pub fn derive_dbmap_utils_general(input: TokenStream) -> TokenStream {
             pub fn open_tables_read_write_with_deprecation_option(
                 path: std::path::PathBuf,
                 metric_conf: typed_store::rocks::MetricConf,
-                global_db_options_override: Option<rocksdb::Options>,
+                global_db_options_override: Option<typed_store::rocksdb::Options>,
                 tables_db_options_override: Option<typed_store::rocks::DBMapTableConfigMap>,
                 remove_deprecated_tables: bool,
             ) -> Self {
@@ -538,7 +408,7 @@ pub fn derive_dbmap_utils_general(input: TokenStream) -> TokenStream {
             pub fn open_tables_transactional(
                 path: std::path::PathBuf,
                 metric_conf: typed_store::rocks::MetricConf,
-                global_db_options_override: Option<rocksdb::Options>,
+                global_db_options_override: Option<typed_store::rocksdb::Options>,
                 tables_db_options_override: Option<typed_store::rocks::DBMapTableConfigMap>
             ) -> Self {
                 let inner = #intermediate_db_map_struct_name::open_tables_impl(path, None, true, metric_conf, global_db_options_override, tables_db_options_override, false);
@@ -560,7 +430,7 @@ pub fn derive_dbmap_utils_general(input: TokenStream) -> TokenStream {
             pub fn get_read_only_handle (
                 primary_path: std::path::PathBuf,
                 with_secondary_path: Option<std::path::PathBuf>,
-                global_db_options_override: Option<rocksdb::Options>,
+                global_db_options_override: Option<typed_store::rocksdb::Options>,
                 metric_conf: typed_store::rocks::MetricConf,
                 ) -> #secondary_db_map_struct_name #generics {
                 #secondary_db_map_struct_name::open_tables_read_only(primary_path, with_secondary_path, metric_conf, global_db_options_override)
@@ -587,7 +457,7 @@ pub fn derive_dbmap_utils_general(input: TokenStream) -> TokenStream {
                 primary_path: std::path::PathBuf,
                 with_secondary_path: Option<std::path::PathBuf>,
                 metric_conf: typed_store::rocks::MetricConf,
-                global_db_options_override: Option<rocksdb::Options>,
+                global_db_options_override: Option<typed_store::rocksdb::Options>,
             ) -> Self {
                 let inner = match with_secondary_path {
                     Some(q) => #intermediate_db_map_struct_name::open_tables_impl(primary_path, Some(q), false, metric_conf, global_db_options_override, None, false),
diff --git a/crates/typed-store-workspace-hack/.gitattributes b/crates/typed-store-workspace-hack/.gitattributes
new file mode 100644
index 0000000000000..3e9dba4b64b5c
--- /dev/null
+++ b/crates/typed-store-workspace-hack/.gitattributes
@@ -0,0 +1,4 @@
+# Avoid putting conflict markers in the generated Cargo.toml file, since their presence breaks
+# Cargo.
+# Also do not check out the file as CRLF on Windows, as that's what hakari needs.
+Cargo.toml merge=binary -crlf
diff --git a/crates/typed-store-workspace-hack/Cargo.toml b/crates/typed-store-workspace-hack/Cargo.toml
new file mode 100644
index 0000000000000..2fa755d1fe310
--- /dev/null
+++ b/crates/typed-store-workspace-hack/Cargo.toml
@@ -0,0 +1,36 @@
+# This file is generated is used by the typed-store crate in order to force
+# rocksdb to be built a single time, regaurdless of where in the workspace a
+# package is being built.
+#
+# This was generated using `cargo hakari` plus `cargo tree` to select only the
+# dependencies that were relevant for rocksdb.
+
+[package]
+name = "typed-store-workspace-hack"
+version = "0.0.0"
+license = "Apache-2.0"
+publish = false
+
+[dependencies]
+libc = { version = "0.2", features = ["extra_traits"] }
+zstd-sys = { version = "2", features = ["std"] }
+nom = { version = "7" }
+memchr = { version = "2" }
+lazy_static = { version = "1", default-features = false, features = ["spin_no_std"] }
+proc-macro2 = { version = "1", features = ["span-locations"] }
+quote = { version = "1" }
+regex = { version = "1" }
+regex-syntax = { version = "0.7" }
+
+[build-dependencies]
+memchr = { version = "2" }
+nom = { version = "7" }
+libc = { version = "0.2", features = ["extra_traits"] }
+cc = { version = "1", default-features = false, features = ["parallel"] }
+zstd-sys = { version = "2", features = ["std"] }
+lazy_static = { version = "1", default-features = false, features = ["spin_no_std"] }
+proc-macro2 = { version = "1", features = ["span-locations"] }
+syn-f595c2ba2a3f28df = { package = "syn", version = "2", features = ["extra-traits", "fold", "full", "visit", "visit-mut"] }
+quote = { version = "1" }
+regex = { version = "1" }
+regex-syntax = { version = "0.7" }
diff --git a/crates/typed-store-workspace-hack/build.rs b/crates/typed-store-workspace-hack/build.rs
new file mode 100644
index 0000000000000..e428f403f115e
--- /dev/null
+++ b/crates/typed-store-workspace-hack/build.rs
@@ -0,0 +1,5 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+// A build script is required for cargo to consider build dependencies.
+fn main() {}
diff --git a/crates/typed-store-workspace-hack/src/lib.rs b/crates/typed-store-workspace-hack/src/lib.rs
new file mode 100644
index 0000000000000..36ebc440df39f
--- /dev/null
+++ b/crates/typed-store-workspace-hack/src/lib.rs
@@ -0,0 +1,4 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+// This is a stub lib.rs.
diff --git a/crates/typed-store/Cargo.toml b/crates/typed-store/Cargo.toml
index b345928c8022e..382206480e7d1 100644
--- a/crates/typed-store/Cargo.toml
+++ b/crates/typed-store/Cargo.toml
@@ -18,12 +18,14 @@ once_cell.workspace = true
 tap.workspace = true
 prometheus.workspace = true
 hdrhistogram.workspace = true
-rocksdb.workspace = true
+rocksdb = { version = "0.21.0", default-features = false, features = ["snappy", "lz4", "zstd", "zlib", "multi-threaded-cf"] }
 serde.workspace = true
 thiserror.workspace = true
 tokio = { workspace = true, features = ["full", "test-util"] }
 tracing.workspace = true
 typed-store-error.workspace = true
+typed-store-derive = { path = "../typed-store-derive" }
+typed-store-workspace-hack = { path = "../typed-store-workspace-hack" }
 sui-macros.workspace = true
 ouroboros.workspace = true
 rand.workspace = true
@@ -38,7 +40,6 @@ quote.workspace = true
 rstest.workspace = true
 rand.workspace = true
 syn.workspace = true
-typed-store-derive.workspace = true
 uint.workspace = true
 
 # Most packages should depend on sui-simulator instead of directly on msim, but for typed-store
diff --git a/crates/typed-store/src/lib.rs b/crates/typed-store/src/lib.rs
index cf4e453866991..00743e16fd65c 100644
--- a/crates/typed-store/src/lib.rs
+++ b/crates/typed-store/src/lib.rs
@@ -8,6 +8,9 @@
     rust_2021_compatibility
 )]
 
+// Re-export rocksdb so that consumers can use the version of rocksdb via typed-store
+pub use rocksdb;
+
 pub mod traits;
 pub use traits::Map;
 pub mod metrics;
@@ -18,3 +21,137 @@ pub mod test_db;
 pub use metrics::DBMetrics;
 
 pub type StoreError = typed_store_error::TypedStoreError;
+
+/// A helper macro to simplify common operations for opening and debugging TypedStore (currently internally structs of DBMaps)
+/// It operates on a struct where all the members are of Store<K, V> or DBMap<K, V>
+/// `TypedStoreDebug` traits are then derived
+/// The main features are:
+/// 1. Flexible configuration of each table (column family) via defaults and overrides
+/// 2. Auto-generated `open` routine
+/// 3. Auto-generated `read_only_mode` handle
+/// 4. Auto-generated memory stats method
+/// 5. Other convenience features
+///
+/// 1. Flexible configuration:
+///     a. Static options specified at struct definition
+///
+/// The definer of the struct can specify the default options for each table using annotations
+/// We can also supply column family options on the default ones
+/// A user defined function of signature () -> Options can be provided for each table
+/// If a an override function is not specified, the default in `typed_store::rocks::default_db_options` is used
+/// ```
+/// use typed_store::rocks::DBOptions;
+/// use typed_store::rocks::DBMap;
+/// use typed_store::rocks::MetricConf;
+/// use typed_store::DBMapUtils;
+/// use typed_store::traits::TypedStoreDebug;
+/// use typed_store::traits::TableSummary;
+/// use core::fmt::Error;
+/// /// Define a struct with all members having type DBMap<K, V>
+///
+/// fn custom_fn_name1() -> DBOptions {DBOptions::default()}
+/// fn custom_fn_name2() -> DBOptions {
+///     let mut op = custom_fn_name1();
+///     op.options.set_write_buffer_size(123456);
+///     op
+/// }
+/// #[derive(DBMapUtils)]
+/// struct Tables {
+///     /// Specify custom options function `custom_fn_name1`
+///     #[default_options_override_fn = "custom_fn_name1"]
+///     table1: DBMap<String, String>,
+///     #[default_options_override_fn = "custom_fn_name2"]
+///     table2: DBMap<i32, String>,
+///     // Nothing specified so `typed_store::rocks::default_db_options` is used
+///     table3: DBMap<i32, String>,
+///     #[default_options_override_fn = "custom_fn_name1"]
+///     table4: DBMap<i32, String>,
+/// }
+///
+/// // b. Options specified by DB opener
+/// // For finer control, we also allow the opener of the DB to specify their own options which override the defaults set by the definer
+/// // This is done via a configurator which gives one a struct with field similarly named as that of the DB, but of type Options
+///
+/// #[tokio::main]
+/// async fn main() -> Result<(), Error> {
+/// // Get a configurator for this table
+/// let mut config = Tables::configurator();
+/// // Config table 1
+/// config.table1 = DBOptions::default();
+/// config.table1.options.create_if_missing(true);
+/// config.table1.options.set_write_buffer_size(123456);
+///
+/// let primary_path = tempfile::tempdir().expect("Failed to open temporary directory").into_path();
+///
+/// // We can then open the DB with the configs
+/// let _ = Tables::open_tables_read_write(primary_path, MetricConf::default(), None, Some(config.build()));
+/// Ok(())
+/// }
+///
+///```
+///
+/// 2. Auto-generated `open` routine
+///     The function `open_tables_read_write` is generated which allows for specifying DB wide options and custom table configs as mentioned above
+///
+/// 3. Auto-generated `read_only_mode` handle
+///     This mode provides handle struct which opens the DB in read only mode and has certain features like dumping and counting the keys in the tables
+///
+/// Use the function `Tables::get_read_only_handle` which returns a handle that only allows read only features
+///```
+/// use typed_store::rocks::DBOptions;
+/// use typed_store::rocks::DBMap;
+/// use typed_store::DBMapUtils;
+/// use typed_store::traits::TypedStoreDebug;
+/// use core::fmt::Error;
+/// use typed_store::traits::TableSummary;
+/// /// Define a struct with all members having type DBMap<K, V>
+///
+/// fn custom_fn_name1() -> DBOptions {DBOptions::default()}
+/// fn custom_fn_name2() -> DBOptions {
+///     let mut op = custom_fn_name1();
+///     op.options.set_write_buffer_size(123456);
+///     op
+/// }
+/// #[derive(DBMapUtils)]
+/// struct Tables {
+///     /// Specify custom options function `custom_fn_name1`
+///     #[default_options_override_fn = "custom_fn_name1"]
+///     table1: DBMap<String, String>,
+///     #[default_options_override_fn = "custom_fn_name2"]
+///     table2: DBMap<i32, String>,
+///     // Nothing specified so `typed_store::rocks::default_db_options` is used
+///     table3: DBMap<i32, String>,
+///     #[default_options_override_fn = "custom_fn_name1"]
+///     table4: DBMap<i32, String>,
+/// }
+/// #[tokio::main]
+/// async fn main() -> Result<(), Error> {
+///
+/// use typed_store::rocks::MetricConf;let primary_path = tempfile::tempdir().expect("Failed to open temporary directory").into_path();
+/// let _ = Tables::open_tables_read_write(primary_path.clone(), typed_store::rocks::MetricConf::default(), None, None);
+///
+/// // Get the read only handle
+/// let read_only_handle = Tables::get_read_only_handle(primary_path, None, None, MetricConf::default());
+/// // Use this handle for dumping
+/// let ret = read_only_handle.dump("table2", 100, 0).unwrap();
+/// let key_count = read_only_handle.count_keys("table1").unwrap();
+/// Ok(())
+/// }
+/// ```
+/// 4. Auto-generated memory stats method
+///     `self.get_memory_usage` is derived to provide memory and cache usage
+///
+/// 5. Other convenience features
+///     `Tables::describe_tables` is used to get a list of the table names and key-value types as string in a BTreeMap
+///
+/// // Bad usage example
+/// // Structs fields most only be of type Store<K, V> or DMBap<K, V>
+/// // This will fail to compile with error `All struct members must be of type Store<K, V> or DMBap<K, V>`
+/// // #[derive(DBMapUtils)]
+/// // struct BadTables {
+/// //     table1: Store<String, String>,
+/// //     bad_field: u32,
+/// // #}
+pub use typed_store_derive::DBMapUtils;
+
+pub use typed_store_derive::SallyDB;
diff --git a/crates/typed-store/src/metrics.rs b/crates/typed-store/src/metrics.rs
index 8b92fe983832c..f7049d8d63768 100644
--- a/crates/typed-store/src/metrics.rs
+++ b/crates/typed-store/src/metrics.rs
@@ -77,6 +77,7 @@ impl SamplingInterval {
 pub struct ColumnFamilyMetrics {
     pub rocksdb_total_sst_files_size: IntGaugeVec,
     pub rocksdb_total_blob_files_size: IntGaugeVec,
+    pub rocksdb_current_size_active_mem_tables: IntGaugeVec,
     pub rocksdb_size_all_mem_tables: IntGaugeVec,
     pub rocksdb_num_snapshots: IntGaugeVec,
     pub rocksdb_oldest_snapshot_time: IntGaugeVec,
@@ -85,14 +86,17 @@ pub struct ColumnFamilyMetrics {
     pub rocksdb_block_cache_capacity: IntGaugeVec,
     pub rocksdb_block_cache_usage: IntGaugeVec,
     pub rocksdb_block_cache_pinned_usage: IntGaugeVec,
-    pub rocskdb_estimate_table_readers_mem: IntGaugeVec,
+    pub rocksdb_estimate_table_readers_mem: IntGaugeVec,
+    pub rocksdb_num_immutable_mem_tables: IntGaugeVec,
     pub rocksdb_mem_table_flush_pending: IntGaugeVec,
-    pub rocskdb_compaction_pending: IntGaugeVec,
-    pub rocskdb_num_running_compactions: IntGaugeVec,
+    pub rocksdb_compaction_pending: IntGaugeVec,
+    pub rocksdb_estimate_pending_compaction_bytes: IntGaugeVec,
+    pub rocksdb_num_running_compactions: IntGaugeVec,
     pub rocksdb_num_running_flushes: IntGaugeVec,
     pub rocksdb_estimate_oldest_key_time: IntGaugeVec,
-    pub rocskdb_background_errors: IntGaugeVec,
+    pub rocksdb_background_errors: IntGaugeVec,
     pub rocksdb_estimated_num_keys: IntGaugeVec,
+    pub rocksdb_base_level: IntGaugeVec,
 }
 
 impl ColumnFamilyMetrics {
@@ -112,6 +116,13 @@ impl ColumnFamilyMetrics {
                 registry,
             )
             .unwrap(),
+            rocksdb_current_size_active_mem_tables: register_int_gauge_vec_with_registry!(
+                "rocksdb_current_size_active_mem_tables",
+                "The current approximate size of active memtable (bytes).",
+                &["cf_name"],
+                registry,
+            )
+            .unwrap(),
             rocksdb_size_all_mem_tables: register_int_gauge_vec_with_registry!(
                 "rocksdb_size_all_mem_tables",
                 "The memory size occupied by the column family's in-memory buffer",
@@ -168,8 +179,8 @@ impl ColumnFamilyMetrics {
                 registry,
             )
             .unwrap(),
-            rocskdb_estimate_table_readers_mem: register_int_gauge_vec_with_registry!(
-                "rocskdb_estimate_table_readers_mem",
+            rocksdb_estimate_table_readers_mem: register_int_gauge_vec_with_registry!(
+                "rocksdb_estimate_table_readers_mem",
                 "The estimated memory size used for reading SST tables in this column
                 family such as filters and index blocks. Note that this number does not
                 include the memory used in block cache.",
@@ -177,6 +188,13 @@ impl ColumnFamilyMetrics {
                 registry,
             )
             .unwrap(),
+            rocksdb_num_immutable_mem_tables: register_int_gauge_vec_with_registry!(
+                "rocksdb_num_immutable_mem_tables",
+                "The number of immutable memtables that have not yet been flushed.",
+                &["cf_name"],
+                registry,
+            )
+            .unwrap(),
             rocksdb_mem_table_flush_pending: register_int_gauge_vec_with_registry!(
                 "rocksdb_mem_table_flush_pending",
                 "A 1 or 0 flag indicating whether a memtable flush is pending.
@@ -186,8 +204,8 @@ impl ColumnFamilyMetrics {
                 registry,
             )
             .unwrap(),
-            rocskdb_compaction_pending: register_int_gauge_vec_with_registry!(
-                "rocskdb_compaction_pending",
+            rocksdb_compaction_pending: register_int_gauge_vec_with_registry!(
+                "rocksdb_compaction_pending",
                 "A 1 or 0 flag indicating whether a compaction job is pending.
                 If this number is 1, it means some part of the column family requires
                 compaction in order to maintain shape of LSM tree, but the compaction
@@ -198,8 +216,16 @@ impl ColumnFamilyMetrics {
                 registry,
             )
             .unwrap(),
-            rocskdb_num_running_compactions: register_int_gauge_vec_with_registry!(
-                "rocskdb_num_running_compactions",
+            rocksdb_estimate_pending_compaction_bytes: register_int_gauge_vec_with_registry!(
+                "rocksdb_estimate_pending_compaction_bytes",
+                "Estimated total number of bytes compaction needs to rewrite to get all levels down
+                to under target size. Not valid for other compactions than level-based.",
+                &["cf_name"],
+                registry,
+            )
+            .unwrap(),
+            rocksdb_num_running_compactions: register_int_gauge_vec_with_registry!(
+                "rocksdb_num_running_compactions",
                 "The number of compactions that are currently running for the column family.",
                 &["cf_name"],
                 registry,
@@ -227,14 +253,20 @@ impl ColumnFamilyMetrics {
                 registry,
             )
             .unwrap(),
-            rocskdb_background_errors: register_int_gauge_vec_with_registry!(
-                "rocskdb_background_errors",
+            rocksdb_background_errors: register_int_gauge_vec_with_registry!(
+                "rocksdb_background_errors",
                 "The accumulated number of RocksDB background errors.",
                 &["cf_name"],
                 registry,
             )
             .unwrap(),
-
+            rocksdb_base_level: register_int_gauge_vec_with_registry!(
+                "rocksdb_base_level",
+                "The number of level to which L0 data will be compacted.",
+                &["cf_name"],
+                registry,
+            )
+            .unwrap(),
         }
     }
 }
@@ -250,6 +282,7 @@ pub struct OperationMetrics {
     pub rocksdb_multiget_bytes: HistogramVec,
     pub rocksdb_put_latency_seconds: HistogramVec,
     pub rocksdb_put_bytes: HistogramVec,
+    pub rocksdb_batch_put_bytes: HistogramVec,
     pub rocksdb_delete_latency_seconds: HistogramVec,
     pub rocksdb_deletes: IntCounterVec,
     pub rocksdb_batch_commit_latency_seconds: HistogramVec,
@@ -343,6 +376,16 @@ impl OperationMetrics {
                 registry,
             )
             .unwrap(),
+            rocksdb_batch_put_bytes: register_histogram_vec_with_registry!(
+                "rocksdb_batch_put_bytes",
+                "Rocksdb batch put call puts data size in bytes",
+                &["cf_name"],
+                prometheus::exponential_buckets(1.0, 4.0, 15)
+                    .unwrap()
+                    .to_vec(),
+                registry,
+            )
+            .unwrap(),
             rocksdb_delete_latency_seconds: register_histogram_vec_with_registry!(
                 "rocksdb_delete_latency_seconds",
                 "Rocksdb delete latency in seconds",
diff --git a/crates/typed-store/src/rocks/mod.rs b/crates/typed-store/src/rocks/mod.rs
index 6b759c340e064..6bf550f4aa131 100644
--- a/crates/typed-store/src/rocks/mod.rs
+++ b/crates/typed-store/src/rocks/mod.rs
@@ -60,7 +60,7 @@ const DEFAULT_DB_WAL_SIZE: usize = 1024;
 
 // Environment variable to control behavior of write throughput optimized tables.
 const ENV_VAR_L0_NUM_FILES_COMPACTION_TRIGGER: &str = "L0_NUM_FILES_COMPACTION_TRIGGER";
-const DEFAULT_L0_NUM_FILES_COMPACTION_TRIGGER: usize = 6;
+const DEFAULT_L0_NUM_FILES_COMPACTION_TRIGGER: usize = 4;
 const ENV_VAR_MAX_WRITE_BUFFER_SIZE_MB: &str = "MAX_WRITE_BUFFER_SIZE_MB";
 const DEFAULT_MAX_WRITE_BUFFER_SIZE_MB: usize = 256;
 const ENV_VAR_MAX_WRITE_BUFFER_NUMBER: &str = "MAX_WRITE_BUFFER_NUMBER";
@@ -88,9 +88,8 @@ mod tests;
 /// # Arguments
 ///
 /// * `db` - a reference to a rocks DB object
-/// * `cf;<ty,ty>` - a comma separated list of column families to open. For each
-/// column family a concatenation of column family name (cf) and Key-Value <ty, ty>
-/// should be provided.
+/// * `cf;<ty,ty>` - a comma separated list of column families to open. For each column family a
+///     concatenation of column family name (cf) and Key-Value <ty, ty> should be provided.
 ///
 /// # Examples
 ///
@@ -705,7 +704,7 @@ impl MetricConf {
         }
     }
 }
-const CF_METRICS_REPORT_PERIOD_MILLIS: u64 = 1000;
+const CF_METRICS_REPORT_PERIOD_SECS: u64 = 30;
 const METRICS_ERROR: i64 = -1;
 
 /// An interface to a rocksDB database, keyed by a columnfamily
@@ -741,7 +740,7 @@ impl<K, V> DBMap<K, V> {
         if !is_deprecated {
             tokio::task::spawn(async move {
                 let mut interval =
-                    tokio::time::interval(Duration::from_millis(CF_METRICS_REPORT_PERIOD_MILLIS));
+                    tokio::time::interval(Duration::from_secs(CF_METRICS_REPORT_PERIOD_SECS));
                 loop {
                     tokio::select! {
                         _ = interval.tick() => {
@@ -984,6 +983,14 @@ impl<K, V> DBMap<K, V> {
                 Self::get_int_property(rocksdb, &cf, ROCKSDB_PROPERTY_TOTAL_BLOB_FILES_SIZE)
                     .unwrap_or(METRICS_ERROR),
             );
+        db_metrics
+            .cf_metrics
+            .rocksdb_current_size_active_mem_tables
+            .with_label_values(&[cf_name])
+            .set(
+                Self::get_int_property(rocksdb, &cf, properties::CUR_SIZE_ACTIVE_MEM_TABLE)
+                    .unwrap_or(METRICS_ERROR),
+            );
         db_metrics
             .cf_metrics
             .rocksdb_size_all_mem_tables
@@ -1050,7 +1057,7 @@ impl<K, V> DBMap<K, V> {
             );
         db_metrics
             .cf_metrics
-            .rocskdb_estimate_table_readers_mem
+            .rocksdb_estimate_table_readers_mem
             .with_label_values(&[cf_name])
             .set(
                 Self::get_int_property(rocksdb, &cf, properties::ESTIMATE_TABLE_READERS_MEM)
@@ -1064,6 +1071,14 @@ impl<K, V> DBMap<K, V> {
                 Self::get_int_property(rocksdb, &cf, properties::ESTIMATE_NUM_KEYS)
                     .unwrap_or(METRICS_ERROR),
             );
+        db_metrics
+            .cf_metrics
+            .rocksdb_num_immutable_mem_tables
+            .with_label_values(&[cf_name])
+            .set(
+                Self::get_int_property(rocksdb, &cf, properties::NUM_IMMUTABLE_MEM_TABLE)
+                    .unwrap_or(METRICS_ERROR),
+            );
         db_metrics
             .cf_metrics
             .rocksdb_mem_table_flush_pending
@@ -1074,7 +1089,7 @@ impl<K, V> DBMap<K, V> {
             );
         db_metrics
             .cf_metrics
-            .rocskdb_compaction_pending
+            .rocksdb_compaction_pending
             .with_label_values(&[cf_name])
             .set(
                 Self::get_int_property(rocksdb, &cf, properties::COMPACTION_PENDING)
@@ -1082,7 +1097,15 @@ impl<K, V> DBMap<K, V> {
             );
         db_metrics
             .cf_metrics
-            .rocskdb_num_running_compactions
+            .rocksdb_estimate_pending_compaction_bytes
+            .with_label_values(&[cf_name])
+            .set(
+                Self::get_int_property(rocksdb, &cf, properties::ESTIMATE_PENDING_COMPACTION_BYTES)
+                    .unwrap_or(METRICS_ERROR),
+            );
+        db_metrics
+            .cf_metrics
+            .rocksdb_num_running_compactions
             .with_label_values(&[cf_name])
             .set(
                 Self::get_int_property(rocksdb, &cf, properties::NUM_RUNNING_COMPACTIONS)
@@ -1106,12 +1129,20 @@ impl<K, V> DBMap<K, V> {
             );
         db_metrics
             .cf_metrics
-            .rocskdb_background_errors
+            .rocksdb_background_errors
             .with_label_values(&[cf_name])
             .set(
                 Self::get_int_property(rocksdb, &cf, properties::BACKGROUND_ERRORS)
                     .unwrap_or(METRICS_ERROR),
             );
+        db_metrics
+            .cf_metrics
+            .rocksdb_base_level
+            .with_label_values(&[cf_name])
+            .set(
+                Self::get_int_property(rocksdb, &cf, properties::BASE_LEVEL)
+                    .unwrap_or(METRICS_ERROR),
+            );
     }
 
     pub fn transaction(&self) -> Result<DBTransaction<'_>, TypedStoreError> {
@@ -1451,15 +1482,21 @@ impl DBBatch {
         if !Arc::ptr_eq(&db.rocksdb, &self.rocksdb) {
             return Err(TypedStoreError::CrossDBBatch);
         }
-
+        let mut total = 0usize;
         new_vals
             .into_iter()
             .try_for_each::<_, Result<_, TypedStoreError>>(|(k, v)| {
                 let k_buf = be_fix_int_ser(k.borrow())?;
                 let v_buf = bcs::to_bytes(v.borrow()).map_err(typed_store_err_from_bcs_err)?;
+                total += k_buf.len() + v_buf.len();
                 self.batch.put_cf(&db.cf(), k_buf, v_buf);
                 Ok(())
             })?;
+        self.db_metrics
+            .op_metrics
+            .rocksdb_batch_put_bytes
+            .with_label_values(&[&db.cf])
+            .observe(total as f64);
         Ok(self)
     }
 
@@ -2346,7 +2383,7 @@ impl DBOptions {
         let target_file_size_base = 64 << 20;
         self.options
             .set_target_file_size_base(target_file_size_base);
-        // Level 1 default to 64MiB * 6 ~ 384MiB.
+        // Level 1 default to 64MiB * 4 ~ 256MiB.
         let max_level_zero_file_num = read_size_from_env(ENV_VAR_L0_NUM_FILES_COMPACTION_TRIGGER)
             .unwrap_or(DEFAULT_L0_NUM_FILES_COMPACTION_TRIGGER);
         self.options
@@ -2395,10 +2432,10 @@ impl DBOptions {
             max_level_zero_file_num.try_into().unwrap(),
         );
         self.options.set_level_zero_slowdown_writes_trigger(
-            (max_level_zero_file_num * 4).try_into().unwrap(),
+            (max_level_zero_file_num * 12).try_into().unwrap(),
         );
         self.options
-            .set_level_zero_stop_writes_trigger((max_level_zero_file_num * 5).try_into().unwrap());
+            .set_level_zero_stop_writes_trigger((max_level_zero_file_num * 16).try_into().unwrap());
 
         // Increase sst file size to 128MiB.
         self.options.set_target_file_size_base(
@@ -2729,7 +2766,7 @@ fn populate_missing_cfs(
 /// Given a vec<u8>, find the value which is one more than the vector
 /// if the vector was a big endian number.
 /// If the vector is already minimum, don't change it.
-fn big_endian_saturating_add_one(v: &mut Vec<u8>) {
+fn big_endian_saturating_add_one(v: &mut [u8]) {
     if is_max(v) {
         return;
     }
@@ -2763,7 +2800,6 @@ fn test_helpers() {
 
     uint::construct_uint! {
         // 32 byte number
-        #[cfg_attr(feature = "scale-info", derive(TypeInfo))]
         struct Num32(4);
     }
 
diff --git a/crates/typed-store/src/sally/mod.rs b/crates/typed-store/src/sally/mod.rs
index 170e5abf8561a..a73e36370bd0e 100644
--- a/crates/typed-store/src/sally/mod.rs
+++ b/crates/typed-store/src/sally/mod.rs
@@ -13,7 +13,7 @@
 //! use typed_store::*;
 //! use typed_store::test_db::*;
 //! use typed_store::sally::SallyDBOptions;
-//! use typed_store_derive::SallyDB;
+//! use typed_store::SallyDB;
 //! use typed_store::sally::SallyColumn;
 //! use typed_store::traits::TypedStoreDebug;
 //! use typed_store::traits::TableSummary;
diff --git a/crates/typed-store/tests/macro_tests.rs b/crates/typed-store/tests/macro_tests.rs
index 87215665b563e..dc8252864c144 100644
--- a/crates/typed-store/tests/macro_tests.rs
+++ b/crates/typed-store/tests/macro_tests.rs
@@ -21,8 +21,8 @@ use typed_store::sally::SallyReadOnlyDBOptions;
 use typed_store::traits::Map;
 use typed_store::traits::TableSummary;
 use typed_store::traits::TypedStoreDebug;
-use typed_store_derive::DBMapUtils;
-use typed_store_derive::SallyDB;
+use typed_store::DBMapUtils;
+use typed_store::SallyDB;
 
 fn temp_dir() -> std::path::PathBuf {
     tempfile::tempdir()
@@ -166,13 +166,13 @@ async fn macro_test() {
     // Test pagination
     let m = tbls_secondary.dump("table1", 2, 0).unwrap();
     assert_eq!(2, m.len());
-    assert_eq!(format!("\"1\""), *m.get(&"\"1\"".to_string()).unwrap());
-    assert_eq!(format!("\"2\""), *m.get(&"\"2\"".to_string()).unwrap());
+    assert_eq!(format!("\"1\""), *m.get("\"1\"").unwrap());
+    assert_eq!(format!("\"2\""), *m.get("\"2\"").unwrap());
 
     let m = tbls_secondary.dump("table1", 3, 2).unwrap();
     assert_eq!(3, m.len());
-    assert_eq!(format!("\"7\""), *m.get(&"\"7\"".to_string()).unwrap());
-    assert_eq!(format!("\"8\""), *m.get(&"\"8\"".to_string()).unwrap());
+    assert_eq!(format!("\"7\""), *m.get("\"7\"").unwrap());
+    assert_eq!(format!("\"8\""), *m.get("\"8\"").unwrap());
 }
 
 #[tokio::test]
@@ -306,13 +306,13 @@ async fn test_sallydb() {
     // Test pagination
     let m = example_db_secondary.dump("col1", 2, 0).unwrap();
     assert_eq!(2, m.len());
-    assert_eq!(format!("\"1\""), *m.get(&"\"1\"".to_string()).unwrap());
-    assert_eq!(format!("\"2\""), *m.get(&"\"2\"".to_string()).unwrap());
+    assert_eq!(format!("\"1\""), *m.get("\"1\"").unwrap());
+    assert_eq!(format!("\"2\""), *m.get("\"2\"").unwrap());
 
     let m = example_db_secondary.dump("col1", 3, 2).unwrap();
     assert_eq!(3, m.len());
-    assert_eq!(format!("\"7\""), *m.get(&"\"7\"".to_string()).unwrap());
-    assert_eq!(format!("\"8\""), *m.get(&"\"8\"".to_string()).unwrap());
+    assert_eq!(format!("\"7\""), *m.get("\"7\"").unwrap());
+    assert_eq!(format!("\"8\""), *m.get("\"8\"").unwrap());
 }
 
 #[tokio::test]
diff --git a/dapps/multisig-toolkit/src/components/connect.tsx b/dapps/multisig-toolkit/src/components/connect.tsx
index 1dcddd002c47d..7f750bcb285a4 100644
--- a/dapps/multisig-toolkit/src/components/connect.tsx
+++ b/dapps/multisig-toolkit/src/components/connect.tsx
@@ -15,7 +15,14 @@ import { useState } from 'react';
 import { cn } from '@/lib/utils';
 
 import { Button } from './ui/button';
-import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem } from './ui/command';
+import {
+	Command,
+	CommandEmpty,
+	CommandGroup,
+	CommandInput,
+	CommandItem,
+	CommandList,
+} from './ui/command';
 import { Popover, PopoverContent, PopoverTrigger } from './ui/popover';
 
 function ConnectedButton() {
@@ -41,37 +48,39 @@ function ConnectedButton() {
 			<PopoverContent className="w-[180px] p-0">
 				<Command>
 					<CommandInput placeholder="Search accounts..." />
-					<CommandEmpty>No account found.</CommandEmpty>
-					<CommandGroup>
-						{accounts.map((account) => (
+					<CommandList>
+						<CommandEmpty>No account found.</CommandEmpty>
+						<CommandGroup>
+							{accounts.map((account) => (
+								<CommandItem
+									key={account.address}
+									value={account.address}
+									className="cursor-pointer"
+									onSelect={() => {
+										switchAccount({ account });
+										setOpen(false);
+									}}
+								>
+									<Check
+										className={cn(
+											'mr-2 h-4 w-4',
+											currentAccount?.address === account.address ? 'opacity-100' : 'opacity-0',
+										)}
+									/>
+									{formatAddress(account.address)}
+								</CommandItem>
+							))}
+
 							<CommandItem
-								key={account.address}
-								value={account.address}
 								className="cursor-pointer"
 								onSelect={() => {
-									switchAccount({ account });
-									setOpen(false);
+									disconnect();
 								}}
 							>
-								<Check
-									className={cn(
-										'mr-2 h-4 w-4',
-										currentAccount?.address === account.address ? 'opacity-100' : 'opacity-0',
-									)}
-								/>
-								{formatAddress(account.address)}
+								Disconnect
 							</CommandItem>
-						))}
-
-						<CommandItem
-							className="cursor-pointer"
-							onSelect={() => {
-								disconnect();
-							}}
-						>
-							Disconnect
-						</CommandItem>
-					</CommandGroup>
+						</CommandGroup>
+					</CommandList>
 				</Command>
 			</PopoverContent>
 		</Popover>
diff --git a/dapps/multisig-toolkit/src/components/ui/command.tsx b/dapps/multisig-toolkit/src/components/ui/command.tsx
index 8a160da4d7ab2..5226361fda57d 100644
--- a/dapps/multisig-toolkit/src/components/ui/command.tsx
+++ b/dapps/multisig-toolkit/src/components/ui/command.tsx
@@ -1,6 +1,6 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
-import { DialogProps } from '@radix-ui/react-dialog';
+import { type DialogProps } from '@radix-ui/react-dialog';
 import { Command as CommandPrimitive } from 'cmdk';
 import { Search } from 'lucide-react';
 import * as React from 'react';
@@ -113,7 +113,7 @@ const CommandItem = React.forwardRef<
 	<CommandPrimitive.Item
 		ref={ref}
 		className={cn(
-			'relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none aria-selected:bg-accent aria-selected:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
+			"relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none data-[disabled=true]:pointer-events-none data-[selected='true']:bg-accent data-[selected=true]:text-accent-foreground data-[disabled=true]:opacity-50",
 			className,
 		)}
 		{...props}
diff --git a/deny.toml b/deny.toml
index 372fba7ae9b05..b1f837e63143e 100644
--- a/deny.toml
+++ b/deny.toml
@@ -9,42 +9,15 @@
 # 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]
+version = 2
 # 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 = [
@@ -55,19 +28,12 @@ ignore = [
     "RUSTSEC-2022-0071",
     # `tui` is unmaintained; use `ratatui` instead
     "RUSTSEC-2023-0049",
-    # ansi_term is Unmaintained
-    "RUSTSEC-2021-0139",
-    # atty
-    # "RUSTSEC-2021-0145",
-    # webpki
-    "RUSTSEC-2023-0052",
     # we don't do RSA signing on Sui (only verifying for zklogin)
     "RUSTSEC-2023-0071",
-    # Sui does not use object_store with authentication.
-    # Upgrade to object_store >= 10.2 to fix.
-    "RUSTSEC-2024-0358",
     # A few dependencies use unpatched rustls.
     "RUSTSEC-2024-0336",
+    # allow yaml-rust being unmaintained
+    "RUSTSEC-2024-0320",
 ]
 # Threshold for security vulnerabilities, any vulnerability with a CVSS score
 # lower than the range specified will be ignored. Note that ignored advisories
@@ -83,8 +49,7 @@ ignore = [
 # 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"
+version = 2
 # 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)].
@@ -103,26 +68,6 @@ allow = [
     "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 = "deny"
-# 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.
@@ -197,7 +142,7 @@ registries = [
 # 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"
+multiple-versions = "allow"
 # Lint level for when a crate version requirement is `*`
 wildcards = "allow"
 # The graph highlighting used when creating dotgraphs for crates
@@ -246,6 +191,16 @@ unknown-git = "warn"
 # 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 = []
+allow-git = [
+    "https://github.com/asonnino/prometheus-parser",
+    "https://github.com/zhiburt/tabled",
+]
 
 [sources.allow-org]
+github = [
+    "mystenmark",
+    "bmwill",
+    "mystenlabs",
+    "nextest-rs",
+    "wlmyng", # jsonrpsee fork
+]
diff --git a/docker/deterministic-canary/Dockerfile b/docker/deterministic-canary/Dockerfile
index 67f253135d3b6..5ebdef630f182 100644
--- a/docker/deterministic-canary/Dockerfile
+++ b/docker/deterministic-canary/Dockerfile
@@ -1,7 +1,7 @@
 ARG PROFILE=release
 # ARG BUILD_DATE
 # ARG GIT_REVISION
-ARG RUST_VERSION=1.76.0
+ARG RUST_VERSION=1.80.1
 
 FROM scratch AS base
 
diff --git a/docker/sui-bridge-indexer/Dockerfile b/docker/sui-bridge-indexer/Dockerfile
index 3be48a6e006cb..4f0fcde7b9c42 100644
--- a/docker/sui-bridge-indexer/Dockerfile
+++ b/docker/sui-bridge-indexer/Dockerfile
@@ -2,7 +2,7 @@
 #
 # Copy in all crates, Cargo.toml and Cargo.lock unmodified,
 # and build the application.
-FROM rust:1.75-bullseye AS builder
+FROM rust:1.80.1-bullseye AS builder
 ARG PROFILE=release
 ARG GIT_REVISION
 ENV GIT_REVISION=$GIT_REVISION
diff --git a/docker/sui-graphql-rpc/Dockerfile b/docker/sui-graphql-rpc/Dockerfile
index 0035b8268bd81..049b8603e39c8 100644
--- a/docker/sui-graphql-rpc/Dockerfile
+++ b/docker/sui-graphql-rpc/Dockerfile
@@ -2,7 +2,7 @@
 #
 # Copy in all crates, Cargo.toml and Cargo.lock unmodified,
 # and build the application.
-FROM rust:1.75-bullseye AS builder
+FROM rust:1.80.1-bullseye AS builder
 ARG PROFILE=release
 ENV PROFILE=$PROFILE
 ARG GIT_REVISION
diff --git a/docker/sui-indexer-tidb/Dockerfile b/docker/sui-indexer-tidb/Dockerfile
new file mode 100644
index 0000000000000..6d11dc569bd60
--- /dev/null
+++ b/docker/sui-indexer-tidb/Dockerfile
@@ -0,0 +1,37 @@
+# Build application
+#
+# Copy in all crates, Cargo.toml and Cargo.lock unmodified,
+# and build the application.
+FROM rust:1.80.1-bullseye AS builder
+ARG PROFILE=release
+ARG GIT_REVISION
+ENV GIT_REVISION=$GIT_REVISION
+WORKDIR "$WORKDIR/sui"
+
+# sui-indexer needs postgres libpq5 and ca-certificates
+RUN apt update && apt install -y libpq5 ca-certificates libpq-dev postgresql
+
+RUN apt-get update && apt-get install -y cmake clang
+
+COPY Cargo.toml Cargo.lock ./
+COPY consensus consensus
+COPY crates crates
+COPY sui-execution sui-execution
+COPY narwhal narwhal
+COPY external-crates external-crates
+
+RUN cargo build --profile ${PROFILE} --bin sui-indexer --features mysql-feature --no-default-features
+
+# Production Image
+FROM debian:bullseye-slim AS runtime
+# Use jemalloc as memory allocator
+RUN apt-get update && apt-get install -y libjemalloc-dev ca-certificates curl
+ENV LD_PRELOAD /usr/lib/x86_64-linux-gnu/libjemalloc.so
+WORKDIR "$WORKDIR/sui"
+COPY --from=builder /sui/target/release/sui-indexer /usr/local/bin
+RUN apt update && apt install -y libpq5 ca-certificates libpq-dev postgresql
+
+ARG BUILD_DATE
+ARG GIT_REVISION
+LABEL build-date=$BUILD_DATE
+LABEL git-revision=$GIT_REVISION
diff --git a/docker/sui-indexer/Dockerfile b/docker/sui-indexer/Dockerfile
index db27235841255..98635444f78c3 100644
--- a/docker/sui-indexer/Dockerfile
+++ b/docker/sui-indexer/Dockerfile
@@ -2,7 +2,7 @@
 #
 # Copy in all crates, Cargo.toml and Cargo.lock unmodified,
 # and build the application.
-FROM rust:1.75-bullseye AS builder
+FROM rust:1.80.1-bullseye AS builder
 ARG PROFILE=release
 ARG GIT_REVISION
 ENV GIT_REVISION=$GIT_REVISION
diff --git a/docker/sui-network/docker-compose-antithesis.yaml b/docker/sui-network/docker-compose-antithesis.yaml
index eada610c7c315..1e67f2884507c 100644
--- a/docker/sui-network/docker-compose-antithesis.yaml
+++ b/docker/sui-network/docker-compose-antithesis.yaml
@@ -22,7 +22,7 @@ services:
       - ./dbs/validator1:/opt/sui/db:rw
       - ./logs/validator1:/opt/sui/logs
     command:
-        "bash -c '/usr/local/bin/sui-node-inst --config-path /opt/sui/config/validator.yaml > /opt/sui/logs/full_logs.log 2>&1'"
+        "bash -c '/usr/local/bin/sui-node-inst --config-path /opt/sui/config/validator.yaml >> /opt/sui/logs/full_logs.log 2>&1'"
     restart: on-failure
     logging:
       driver: "json-file"
@@ -50,7 +50,7 @@ services:
       - ./dbs/validator2:/opt/sui/db:rw
       - ./logs/validator2:/opt/sui/logs
     command:
-        "bash -c '/usr/local/bin/sui-node-inst --config-path /opt/sui/config/validator.yaml > /opt/sui/logs/full_logs.log 2>&1'"
+        "bash -c '/usr/local/bin/sui-node-inst --config-path /opt/sui/config/validator.yaml >> /opt/sui/logs/full_logs.log 2>&1'"
     restart: on-failure
     logging:
       driver: "json-file"
@@ -77,7 +77,7 @@ services:
       - ./dbs/validator3:/opt/sui/db:rw
       - ./logs/validator3:/opt/sui/logs
     command:
-        "bash -c '/usr/local/bin/sui-node-inst --config-path /opt/sui/config/validator.yaml > /opt/sui/logs/full_logs.log 2>&1'"
+        "bash -c '/usr/local/bin/sui-node-inst --config-path /opt/sui/config/validator.yaml >> /opt/sui/logs/full_logs.log 2>&1'"
     restart: on-failure
     logging:
       driver: "json-file"
@@ -104,7 +104,7 @@ services:
       - ./dbs/validator4:/opt/sui/db:rw
       - ./logs/validator4:/opt/sui/logs
     command:
-        "bash -c '/usr/local/bin/sui-node-inst --config-path /opt/sui/config/validator.yaml > /opt/sui/logs/full_logs.log 2>&1'"
+        "bash -c '/usr/local/bin/sui-node-inst --config-path /opt/sui/config/validator.yaml >> /opt/sui/logs/full_logs.log 2>&1'"
     restart: on-failure
     logging:
       driver: "json-file"
diff --git a/docker/sui-node/Dockerfile b/docker/sui-node/Dockerfile
index 190e352cc6da6..e9557b7698adc 100644
--- a/docker/sui-node/Dockerfile
+++ b/docker/sui-node/Dockerfile
@@ -2,7 +2,7 @@
 #
 # Copy in all crates, Cargo.toml and Cargo.lock unmodified,
 # and build the application.
-FROM rust:1.75-bullseye AS builder
+FROM rust:1.80.1-bullseye AS builder
 ARG PROFILE=release
 ARG GIT_REVISION
 ENV GIT_REVISION=$GIT_REVISION
diff --git a/docker/sui-services/Dockerfile b/docker/sui-services/Dockerfile
index dd9cc69f5edda..2002fe6b9140b 100644
--- a/docker/sui-services/Dockerfile
+++ b/docker/sui-services/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.75-bullseye  AS chef
+FROM rust:1.80.1-bullseye  AS chef
 WORKDIR sui
 ARG GIT_REVISION
 ENV GIT_REVISION=$GIT_REVISION
diff --git a/docker/sui-source-service/Dockerfile b/docker/sui-source-service/Dockerfile
index bb73ef2e3e0d5..0936bd0562256 100644
--- a/docker/sui-source-service/Dockerfile
+++ b/docker/sui-source-service/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.75-bullseye  AS chef
+FROM rust:1.80.1-bullseye  AS chef
 WORKDIR sui
 ARG GIT_REVISION
 ENV GIT_REVISION=$GIT_REVISION
diff --git a/docker/sui-tools/Dockerfile b/docker/sui-tools/Dockerfile
index e475fd2abf160..4f800e03b01e6 100644
--- a/docker/sui-tools/Dockerfile
+++ b/docker/sui-tools/Dockerfile
@@ -2,7 +2,7 @@
 #
 # Copy in all crates, Cargo.toml and Cargo.lock unmodified,
 # and build the application.
-FROM rust:1.75-bullseye AS builder
+FROM rust:1.80.1-bullseye AS builder
 ARG PROFILE=release
 ARG GIT_REVISION
 ENV GIT_REVISION=$GIT_REVISION
diff --git a/docs/content/concepts/object-model.mdx b/docs/content/concepts/object-model.mdx
index 63bb248c8a1bf..4b3b242a9e785 100644
--- a/docs/content/concepts/object-model.mdx
+++ b/docs/content/concepts/object-model.mdx
@@ -3,6 +3,8 @@ title: Object Model
 description: Everything on the Sui blockchain is an object, with metadata, type of ownership, and a referencing scheme. 
 ---
 
+import ProtocolConfig from "@site/src/components/ProtocolConfig";
+
 The basic unit of storage in Sui is the object. In contrast to many other blockchains where storage is centered around accounts containing key-value stores, Sui's storage is centered around objects addressable on-chain by unique IDs. A smart contract is an object (called a Sui Move package), and these smart contracts manipulate objects on the Sui network:
 
 - Sui Move Package: a set of Sui Move bytecode modules. Each module has a name that's unique within the containing package. The combination of the package's on-chain ID and the name of a module uniquely identify the module. When you publish smart contracts to Sui, a package is the unit of publishing. After you publish a package object, it is immutable and can never be changed or removed. A package object can depend on other package objects that were previously published to Sui.
@@ -13,7 +15,7 @@ The basic unit of storage in Sui is the object. In contrast to many other blockc
 Each Sui object has the following metadata:
 
 - A 32-byte globally unique ID. An object ID is derived from the digest of the transaction that created the object and from a counter encoding the number of IDs generated by the transaction.
-- An 8-byte unsigned integer version that monotonically increases with every transaction that modifies it (see [Object and package versioning](./versioning.mdx)).
+- An 8-byte unsigned integer version that monotonically increases with every transaction that modifies it (see [Object and Package Versioning](./versioning.mdx)).
 - A 32-byte transaction digest indicating the last transaction that included this object as an output.
 - A 32-byte owner field that indicates how this object can be accessed. See [Object Ownership](./object-ownership.mdx) for more information.
 
@@ -44,4 +46,24 @@ When this DAG contains all committed transactions in the system, it forms a comp
 
 ## Limits on transactions, objects, and data 
 
-Sui has some limits on transactions and data used in transactions, such as a maximum size and number of objects used. 
+Sui has some limits on transactions and data used in transactions, such as a maximum size and number of objects used. For more information on limits, see [Building against Limits](https://move-book.com/guides/building-against-limits.html) in The Move Book.
+
+The `ProtocolConfig` struct in the [`sui-protocol-config` crate](https://github.com/MystenLabs/sui/blob/main/crates/sui-protocol-config/src/lib.rs) itemizes these limits. Expand the following code to see the `ProtocolConfig` struct and the comments that explain each parameter.
+
+<details>
+<summary>
+Toggle source code
+</summary>
+{@inject: crates/sui-protocol-config/src/lib.rs#struct=ProtocolConfig}
+</details>
+
+Select a network from the following tabs to see the currently configured limits and values.
+
+<ProtocolConfig/>
+
+## Related links
+
+- [Object and Package Versioning](./versioning.mdx): Versioning provides the ability to upgrade packages and objects on the Sui network.
+- [Object Ownership](./object-ownership.mdx): Every object has an owner field that dictates how you can use it in transactions.
+- [`sui-protocol-config`](https://github.com/MystenLabs/sui/blob/main/crates/sui-protocol-config/src/lib.rs): Crate that defines the `ProtocolConfig` struct with limit definitions.
+- [Building against Limits](https://move-book.com/guides/building-against-limits.html): The Move Book provides a concise overview for limits most projects deal with.
\ No newline at end of file
diff --git a/docs/content/concepts/object-ownership.mdx b/docs/content/concepts/object-ownership.mdx
index 9a1e9e15a88ec..a2ab513c6e644 100644
--- a/docs/content/concepts/object-ownership.mdx
+++ b/docs/content/concepts/object-ownership.mdx
@@ -1,5 +1,6 @@
 ---
 title: Object Ownership
+description: Every object has an owner field that dictates how you can use it in transactions. Each object is either address-owned, dynamic fields, immutable, shared, or wrapped.
 ---
 
 Every object has an owner field that dictates how you can use it in transactions. Objects can have the following types of ownership:
diff --git a/docs/content/concepts/tokenomics.mdx b/docs/content/concepts/tokenomics.mdx
index e005f0605d55f..08c545def53ef 100644
--- a/docs/content/concepts/tokenomics.mdx
+++ b/docs/content/concepts/tokenomics.mdx
@@ -4,7 +4,7 @@ title: Sui Tokenomics
 
 The collective ideation that the term tokenomics encompasses includes a wide range of concepts that define the science and behavior of blockchain economies. In basic terms, tokenomics are the financial foundation of blockchains. Much the same way a building with a poor foundation is doomed to fail, a blockchain without a well-researched, extensively planned, and painstakingly implemented token economy eventually crumbles.
 
-Sui tokenomics are based on sound financial concepts informed by extensive blockchain research. Designed for scale, the Sui tokenomic structure is designed to support the financial needs of web3 now and into the future. 
+Sui tokenomics are based on sound financial concepts informed by extensive blockchain research. Designed for scale, the Sui tokenomics structure is designed to support the financial needs of web3 now and into the future. 
 
 ## The Sui economy
 
@@ -34,4 +34,4 @@ The following flowchart presents the tokenomic flow of Sui at a high level. Refe
 
 ## Tokenomics whitepaper
 
-Beyond the topics in this section of the documentation, you can read [The Sui Smart Contracts Platform: Economics and Incentives](/paper/tokenomics.pdf) whitepaper to learn more about tokenomic design on Sui.
+Beyond the topics in this section of the documentation, you can read [The Sui Smart Contracts Platform: Economics and Incentives](/paper/tokenomics.pdf) whitepaper to learn more about tokenomics design on Sui.
diff --git a/docs/content/concepts/tokenomics/gas-in-sui.mdx b/docs/content/concepts/tokenomics/gas-in-sui.mdx
index 4a33dbb6d547b..9e7505248eca6 100644
--- a/docs/content/concepts/tokenomics/gas-in-sui.mdx
+++ b/docs/content/concepts/tokenomics/gas-in-sui.mdx
@@ -13,7 +13,7 @@ Finally, Sui [Storage mechanics](storage-fund.mdx#storage-fund-rewards) provide
 
 `net_gas_fees = computation_gas_fee + storage_gas_fee - storage_rebate`
 
-The information on net gas fees displays in a Sui network explorer for each transaction block:
+The information on net gas fees is displayed in a Sui network explorer for each transaction block:
 
 ![Gas Fees displayed on a Sui network explorer](images/gas-fees-explorer.png "The Gas Fees section displayed on a Sui network explorer")
 _The Gas Fees section for a transaction block displayed on a Sui network explorer_
diff --git a/docs/content/concepts/tokenomics/staking-unstaking.mdx b/docs/content/concepts/tokenomics/staking-unstaking.mdx
index 4fbacb7789b47..593f91aa59376 100644
--- a/docs/content/concepts/tokenomics/staking-unstaking.mdx
+++ b/docs/content/concepts/tokenomics/staking-unstaking.mdx
@@ -19,7 +19,7 @@ Similar to staking, a user withdraws stake from a validator by sending a transac
 
 When you stake on Sui, you have to choose a specific validator you would like to stake with. The choice of validator can potentially impact the amount of staking rewards you receive. The factors determining this amount include, but are not limited to:
 
-- Validator commission rate: a validator can choose to set a non-zero commission rate specifying the percentage of staking rewards they are taking from the stakers. For example, if a validator has the commission rate of 10%, then 10% of every staker's staking rewards is given to the validator. Understand that a validator can choose its commission at a future moment in time without prior notice.
+- Validator commission rate: a validator can choose to set a non-zero commission rate specifying the percentage of staking rewards they are taking from the stakers. For example, if a validator has a commission rate of 10%, then 10% of every staker's staking rewards is given to the validator. Understand that a validator can choose its commission at a future moment in time without prior notice.
 - Validator performance: a validator with bad performance might be punished according to the [tallying rule](./gas-pricing.mdx#tallying-rule). Punished validators do not receive any staking rewards for the epoch during which they are punished, and you also do not receive that epoch's rewards when you withdraw your stake from that validator. 
 
 Sui-compatible crypto wallets and explorers typically provide validator information such as commission and APY. See the respective documentation for these tools for information on how to retrieve this data.
diff --git a/docs/content/concepts/tokenomics/storage-fund.mdx b/docs/content/concepts/tokenomics/storage-fund.mdx
index 23cc36707bfc3..69500cbec1836 100644
--- a/docs/content/concepts/tokenomics/storage-fund.mdx
+++ b/docs/content/concepts/tokenomics/storage-fund.mdx
@@ -40,5 +40,5 @@ The key property of the rebate function is that it limits storage fund outflows
 The storage fund introduces various desirable incentives into the Sui economy:
 
 - Its mechanics incentivize users to delete data and obtain a rebate on their storage fees when the cost of storing such data exceeds the value obtained from maintaining that data on-chain. This introduces a useful market-based mechanism where users free storage when it becomes uneconomical for them to keep it.
-- It creates deflationary pressure over the SUI token in that increased activity leads to larger storage requirements and to more SUI removed from circulation.
+- It creates deflationary pressure over the SUI token in that increased activity leads to larger storage requirements and to more SUI being removed from circulation.
 - It is capital efficient in that it is economically equivalent to a rent model where users pay for storage through a pay-per-period model.
diff --git a/docs/content/guides/developer/advanced/custom-indexer.mdx b/docs/content/guides/developer/advanced/custom-indexer.mdx
index eb325e53a2825..7eb800f4108d2 100644
--- a/docs/content/guides/developer/advanced/custom-indexer.mdx
+++ b/docs/content/guides/developer/advanced/custom-indexer.mdx
@@ -37,6 +37,8 @@ The most straightforward stream source is to subscribe to a remote store of chec
 - Testnet: `https://checkpoints.testnet.sui.io`
 - Mainnet: `https://checkpoints.mainnet.sui.io`
 
+The checkpoint files are stored in the following format: `https://checkpoints.testnet.sui.io/<checkpoint_id>.chk`. You can download the checkpoint file by sending an HTTP GET request to the relevant URL. Try it yourself for checkpoint 1 at [https://checkpoints.testnet.sui.io/1.chk](https://checkpoints.testnet.sui.io/1.chk).
+
 ```mermaid
 flowchart LR
   A("fa:fa-cloud Cloud storage(S3, GCP)");
@@ -53,6 +55,12 @@ flowchart LR
   B-->External
 ```
 
+The Sui data ingestion framework provides a helper function to quickly bootstrap an indexer workflow.
+
+{@inject: examples/custom-indexer/rust/remote_reader.rs}
+
+This is suitable for setups with a single ingestion pipeline where progress tracking is managed outside of the framework.
+
 ### Local reader
 
 Colocate the data ingestion daemon with a Full node and enable checkpoint dumping on the latter to set up a local stream source. After enabling, the Full node starts dumping executed checkpoints as files to a local directory, and the data ingestion daemon subscribes to changes in the directory through an inotify-like mechanism. This approach allows minimizing ingestion latency (checkpoint are processed immediately after a checkpoint executor on a Full node) and getting rid of dependency on an externally managed bucket.
@@ -84,77 +92,12 @@ flowchart LR
   C<-->D("fa:fa-floppy-disk Progress store");
 ```
 
-
-### Hybrid mode
-
-Specify both a local and remote store as a fallback to ensure constant data flow. The framework always prioritizes locally available checkpoint data over remote data. It's useful when you want to start utilizing your own Full node for data ingestion but need to partially backfill historical data or just have a failover. 
-
-
-## Examples
-
-The Sui data ingestion framework provides a helper function to quickly bootstrap an indexer workflow.
-```rust
-struct CustomWorker;
-
-#[async_trait]
-impl Worker for CustomWorker {
-    async fn process_checkpoint(&self, checkpoint: CheckpointData) -> Result<()> {
-        // custom processing logic
-        ...
-        Ok(())
-    }
-}
-
-#[tokio::main]
-async fn main() -> Result<()> {
-    let (executor, term_sender) = setup_single_workflow(
-        CustomWorker,
-        "https://checkpoints.mainnet.sui.io".to_string(),
-        0, /* initial checkpoint number */
-        5, /* concurrency */
-        None, /* extra reader options */
-    ).await?;
-    executor.await?;
-    Ok(())
-}
-```
-This is suitable for setups with a single ingestion pipeline where progress tracking is managed outside of the framework.
-
-For more complex setups, refer to the following example:
-```rust
-struct CustomWorker;
-
-#[async_trait]
-impl Worker for CustomWorker {
-    async fn process_checkpoint(&self, checkpoint: CheckpointData) -> Result<()> {
-        // custom processing logic
-        ...
-        Ok(())
-    }
-}
-
-#[tokio::main]
-async fn main() -> Result<()> {
-  let (exit_sender, exit_receiver) = oneshot::channel();
-  let metrics = DataIngestionMetrics::new(&Registry::new());
-  let progress_store = FileProgressStore::new("path_to_file");
-  let mut executor = IndexerExecutor::new(progress_store, 1 /* number of workflow types */, metrics);
-  let worker_pool = WorkerPool::new(CustomWorker, "custom worker", 100);
-  executor.register(worker_pool).await?;
-  executor.run(
-      PathBuf::from("..."), // path to a local directory
-      Some("https://checkpoints.mainnet.sui.io".to_string()),
-      vec![], // optional remote store access options
-      exit_receiver,
-  ).await?;
-  Ok(())
-}
-```
+{@inject: examples/custom-indexer/rust/local_reader.rs}
 
 Let's highlight a couple lines of code:
 
 ```rust
-let worker_pool = WorkerPool::new(CustomWorker, "custom worker", 100);
+let worker_pool = WorkerPool::new(CustomWorker, "local_reader".to_string(), concurrency);
 executor.register(worker_pool).await?;
 ```
 
@@ -162,21 +105,30 @@ The data ingestion executor can run multiple workflows simultaneously. For each
 
 The concurrency parameter specifies how many threads the workflow uses. Having a concurrency value greater than 1 is helpful when tasks are idempotent and can be processed in parallel and out of order. The executor only updates the progress/watermark to a certain checkpoint when all preceding checkpoints are processed.
 
-## Source code for an implementation {#source-code}
+### Hybrid mode
+
+Specify both a local and remote store as a fallback to ensure constant data flow. The framework always prioritizes locally available checkpoint data over remote data. It's useful when you want to start utilizing your own Full node for data ingestion but need to partially backfill historical data or just have a failover. 
+```rust
+executor.run(
+    PathBuf::from("./chk".to_string()), // path to a local directory
+    Some("https://checkpoints.testnet.sui.io".to_string()), // Remote Checkpoint Store
+    vec![], // optional remote store access options
+    ReaderOptions::default(),
+    exit_receiver,
+    ).await?;
+```
 
-Find the following source code in the [Sui repo](https://github.com/mystenlabs/sui/tree/main/examples/custom-indexer/rust). 
 
 ### Manifest 
 
 Code for the cargo.toml manifest file for the custom indexer.
 
-{@inject: examples/custom-indexer/rust/cargo.toml}
+{@inject: examples/custom-indexer/rust/Cargo.toml}
 
-### Rust source
+## Source code for an implementation {#source-code}
 
-Code for the main.rs file that creates the custom indexer.
+Find the following source code in the [Sui repo](https://github.com/mystenlabs/sui/tree/main/examples/custom-indexer/rust). 
 
-{@inject: examples/custom-indexer/rust/main.rs}
 
 ## Related links
 
diff --git a/docs/content/guides/developer/first-app/write-package.mdx b/docs/content/guides/developer/first-app/write-package.mdx
index fc494923c92a2..c3754cd1fbac5 100644
--- a/docs/content/guides/developer/first-app/write-package.mdx
+++ b/docs/content/guides/developer/first-app/write-package.mdx
@@ -17,7 +17,7 @@ The manifest file contents include available sections of the manifest and commen
 
 - **[package]:** Contains metadata for the package. By default, the `sui move new` command populates only the `name` value of the metadata. In this case, the example passes `my_first_package` to the command, which becomes the name of the package. You can delete the first `#` of subsequent lines of the `[package]` section to provide values for the other available metadata fields.
 - **[dependencies]:** Lists the other packages that your package depends on to run. By default, the `sui move new` command lists the `Sui` package on GitHub (Testnet version) as the lone dependency.
-- **[addresses]:** Declares named addresses that your package uses. By default, the section includes the package you create with the `sui move new` command and an address of `0x0`. The publish process replaces the `0x0` address with an actual on-chain address.
+- **[addresses]:** Declares named addresses that your package uses. By default, the section includes the package you create with the `sui move new` command and an address of `0x0`. This value can be left as-is and indicates that [package addresses are automatically managed](../../../../concepts/sui-move-concepts/packages/automated-address-management) when published and upgraded.
 - **[dev-dependencies]:** Includes only comments that describe the section.
 - **[dev-addresses]:** Includes only comments that describe the section.
 
diff --git a/docs/content/guides/developer/getting-started/get-address.mdx b/docs/content/guides/developer/getting-started/get-address.mdx
index 005941c82ee87..7c94530484e27 100644
--- a/docs/content/guides/developer/getting-started/get-address.mdx
+++ b/docs/content/guides/developer/getting-started/get-address.mdx
@@ -7,7 +7,7 @@ An address is a way to uniquely and anonymously identify an account that exists
 
 The Sui address is unique, similarly to the way a social security number or a personal identification number is unique to one person. However, in Sui you can create and own multiple addresses, all of which are unique. 
 
-In Sui, an address is 32 bytes and is often encoded in base58 with a `0x` prefix. For example, this is a valid Sui address: `0x02a212de6a9dfa3a69e22387acfbafbb1a9e591bd9d636e7895dcfc8de05f331`. You can use a Sui network explorer to find more information about this address and the objects it owns.
+In Sui, an address is 32 bytes and is often encoded in hexadecimal with a `0x` prefix. For example, this is a valid Sui address: `0x02a212de6a9dfa3a69e22387acfbafbb1a9e591bd9d636e7895dcfc8de05f331`. You can use a Sui network explorer to find more information about this address and the objects it owns.
 
 If you'd like to understand how a Sui address is derived from private keys and other cryptography related topics, see the [Keys and Addresses](/concepts/cryptography/transaction-auth/keys-addresses.mdx) topic.
 
diff --git a/docs/content/guides/developer/sui-101/using-events.mdx b/docs/content/guides/developer/sui-101/using-events.mdx
index 79a788b75d069..00797838a7d7d 100644
--- a/docs/content/guides/developer/sui-101/using-events.mdx
+++ b/docs/content/guides/developer/sui-101/using-events.mdx
@@ -119,11 +119,11 @@ Move smart contracts can call other smart contracts that emit events. For exampl
 
 ## Examples
 
-## Subscribe to event
+### Subscribe to event
 
 This example leverages the Sui TypeScript SDK to subscribe to events the package with ID `<PACKAGE_ID>` emits. Each time the event fires, the code displays the response to the console.
 
-### TypeScript
+#### TypeScript
 
 To create the event subscription, you can use a basic Node.js app. You need the Sui TypeScript SDK, so install the module using `npm install @mysten/sui` at the root of your project. In your TypeScript code, import `JsonRpcProvider` and a connection from the library.
 
@@ -161,7 +161,7 @@ process.on('SIGINT', async () => {
 });
 ```
 
-### Response
+#### Response
 
 When the subscribed to event fires, the example displays the following JSON representation of the event.
 
@@ -186,7 +186,7 @@ subscribeEvent {
 }
 ```
 
-### Rust SDK
+#### Rust SDK
 
 ```rust
 use futures::StreamExt;
@@ -207,7 +207,7 @@ async fn main() -> Result<()> {
 }
 ```
 
-## Filtering event queries
+### Filtering event queries
 
 To filter the events returned from your queries, use the following data structures.
 
@@ -230,7 +230,13 @@ This set of filters applies only to event querying APIs. It differs from the fil
 | `Object`          | Return events associated with the given object           | `{"Object":"0x727b37454ab13d5c1dbb22e8741bff72b145d1e660f71b275c01f24e7860e5e5"}`                     |
 | `TimeRange`       | Return events emitted in [start_time, end_time] interval | `{"TimeRange":{"startTime":1669039504014, "endTime":1669039604014}}`                                  |
 
-## Filtering events for subscription
+### Filtering events for subscription (deprecated)
+
+:::warning
+
+This section is deprecated beginning with Sui client version 1.28. Use the [custom indexer](../advanced/custom-indexer.mdx) section to learn about how to stream checkpoints and filter events continuously.
+
+:::
 
 To create a subscription, you can set a filter to return only the set of events you're interested in listening for. 
 
@@ -241,6 +247,7 @@ This set of filters applies only to event subscription APIs. It differs from the
 :::
 
 
+
 | Filter            | Description                                           | JSON-RPC Parameter Example                                                                   |
 | ----------------- | ----------------------------------------------------- | -------------------------------------------------------------------------------------------- |
 | `Package`         | Move package ID                                       | `{"Package":"<PACKAGE-ID>"}`                                                                 |
diff --git a/docs/content/guides/operator/snapshots.mdx b/docs/content/guides/operator/snapshots.mdx
index f0cf266ddc63a..b545803218a96 100644
--- a/docs/content/guides/operator/snapshots.mdx
+++ b/docs/content/guides/operator/snapshots.mdx
@@ -60,9 +60,9 @@ To restore from a RocksDB snapshot, follow these steps:
    - `--latest`: Rather than explicitly passing a epoch via `--epoch`, you can pass the `--latest` flag, which will automatically select the latest snapshot`
    - `--network`: Network to download snapshot for. Defaults to "mainnet".
    - `--path`: Path to snapshot directory on local filesystem.
-   - `--no-sign-request`: If set, `--snapshot-bucket` and `--snapshot-bucket-type` are ignored, and Cloudflare R2 is used.
-   - `--snapshot-bucket`: Source snapshot bucket name, eg `mysten-mainnet-snapshots`.
-   - `--snapshot-bucket-type`: Snapshot bucket type. GCS and S3 currently supported.
+   - `--no-sign-request`: If set, `--snapshot-bucket` and `--snapshot-bucket-type` are ignored, and a static Cloudflare R2 bucket is used.
+   - `--snapshot-bucket`: Source snapshot bucket name, eg `mysten-mainnet-snapshots`. This cannot be used with `--no-sign-request`.
+   - `--snapshot-bucket-type`: Snapshot bucket type. GCS and S3 currently supported. This cannot be used with `--no-sign-request`.
    - `--skip-indexes`: Skips downloading the very large `indexes/` dir, used by jsonrpc on the fullnode
 
    The following environment variables are used if `--no-sign-request` is not set:
@@ -77,7 +77,7 @@ To restore from a RocksDB snapshot, follow these steps:
 
 :::info
 
-When you restore a Full node from a snapshot, write it to the path `/opt/sui/db/authorities_db/full_node_db/live`. To restore a Validator node, use the path `/opt/sui/db/authorities_db/live`.
+When you restore a Full node from a snapshot, write it to the path `/opt/sui/db/authorities_db/full_node_db/live`. When restoring a Validator node, you can shorten the database destination to `/opt/sui/db/authorities_db/live`.
 
 :::
 
@@ -101,8 +101,8 @@ The following steps can be used to restore a node from a Formal snapshot:
    - `--network`: Network to download snapshot for. Defaults to "mainnet".
    - `--path`: Path to snapshot directory on local filesystem.
    - `--no-sign-request`: If set, `--snapshot-bucket` and `--snapshot-bucket-type` are ignored, and Cloudflare R2 is used.
-   - `--snapshot-bucket`: Source snapshot bucket name, eg `mysten-mainnet-snapshots`.
-   - `--snapshot-bucket-type`: Snapshot bucket type. GCS and S3 currently supported.
+   - `--snapshot-bucket`: Source snapshot bucket name, eg `mysten-mainnet-snapshots`. This cannot be used with `--no-sign-request`.
+   - `--snapshot-bucket-type`: Snapshot bucket type. GCS and S3 currently supported. This cannot be used with `--no-sign-request`.
 
    The following environment variables are used if `--no-sign-request` is not set:
    * *AWS*: `AWS_SNAPSHOT_ACCESS_KEY_ID`, `AWS_SNAPSHOT_SECRET_ACCESS_KEY`, `AWS_SNAPSHOT_REGION`
diff --git a/docs/content/sidebars/standards.js b/docs/content/sidebars/standards.js
index ad0727dd351f2..30d2c307668cc 100644
--- a/docs/content/sidebars/standards.js
+++ b/docs/content/sidebars/standards.js
@@ -31,7 +31,7 @@ const standards = [
 		items: [
 			{
 				type: 'category',
-				label: 'DeepBook V3',
+				label: 'DeepBookV3',
 				link: {
 					type: 'doc',
 					id: 'standards/deepbookv3',
@@ -48,7 +48,22 @@ const standards = [
 			},
 			{
 				type: 'category',
-				label: 'DeepBook V2',
+				label: 'DeepBookV3 SDK',
+				link: {
+					type: 'doc',
+					id: 'standards/deepbookv3-sdk',
+				},
+				items: [
+					'standards/deepbookv3-sdk/flash-loans',
+					'standards/deepbookv3-sdk/orders',
+					'standards/deepbookv3-sdk/pools',
+					'standards/deepbookv3-sdk/staking-governance',
+					'standards/deepbookv3-sdk/swaps',
+				],
+			},
+			{
+				type: 'category',
+				label: 'DeepBookV2',
 				link: {
 					type: 'doc',
 					id: 'standards/deepbookv2',
diff --git a/docs/content/standards/deepbookv3-sdk.mdx b/docs/content/standards/deepbookv3-sdk.mdx
new file mode 100644
index 0000000000000..c3fce39509e79
--- /dev/null
+++ b/docs/content/standards/deepbookv3-sdk.mdx
@@ -0,0 +1,355 @@
+---
+title: DeepBookV3 SDK
+---
+
+The DeepBook typescript SDK abstracts away the transaction calls, allowing for direct interactions with the DeepBook package. To use the SDK in your projects, install the `@mysten/deepbook` package.
+
+```sh npm2yarn
+npm install @mysten/deepbook-v3
+```
+
+## Constants
+
+The DeepBookV3 SDK includes a constants file (`/utils/constants.ts`) that maintains the latest deployed addresses for DeepBook, as well as a few staple coins and pools. 
+
+<details>
+<summary>
+Toggle constants.ts code
+</summary>
+{@inject: sdk/deepbook/src/utils/constants.ts}
+</details>
+
+## DeepBookClient
+
+To work with DeepBook, you must create a `DeepBookClient`. To construct the `DeepBookClient`, pass in a `SuiClient`, the sender address, and environment. The [Sui TypeScript SDK](https://sdk.mystenlabs.com/typescript) provides the `SuiClient` and key functionality necessary to process transactions. The following example imports those libraries, as well. 
+
+```tsx
+import { SuiClient, getFullnodeUrl } from "@mysten/sui/client";
+import { Ed25519Keypair } from "@mysten/sui/keypairs/ed25519";
+import { decodeSuiPrivateKey } from "@mysten/sui/cryptography";
+
+import { DeepBookClient } from "@mysten/deepbook";
+
+class DeepBookMarketMaker {
+    dbClient: DeepBookClient; // For building transactions
+    suiClient: SuiClient; // For executing transactions
+    keypair: Ed25519Keypair; // For signing transactions
+
+    constructor(privateKey: string, env: 'testnet' | 'mainnet') {
+        this.keypair = this.getSignerFromPK(privateKey);
+        this.suiClient = new SuiClient({
+            url: getFullnodeUrl(env)
+        })
+        this.dbClient = new DeepBookClient({
+            address: this.getActiveAddress(),
+            env: env,
+            client: this.suiClient,
+        });
+    }
+
+    getSignerFromPK = (privateKey: string): Ed25519Keypair => {
+      const { schema, secretKey } = decodeSuiPrivateKey(privateKey);
+      if (schema === 'ED25519') return Ed25519Keypair.fromSecretKey(secretKey);
+  
+      throw new Error(`Unsupported schema: ${schema}`);
+    };
+
+    getActiveAddress() {
+        return this.keypair.toSuiAddress();
+    }
+}
+```
+
+## Keys: Coin, Pool, and Manager {#keys}
+
+Functions that require the input of a coin, pool, or a manager require the key of any such object as the parameter. The SDK manages a key:value relationship of this data in memory. Some default data comes with the SDK (as seen in `utils/constants.ts`). Coins are stored in a `CoinMap` and pools in a `PoolMap` in the config.
+
+### Balance manager
+
+Before placing any trade, you must supply a balance manager address to the client. The manager key points to an object defined by the `BalanceManager` interface in the client. [BalanceManager docs](./deepbookv3/balance-manager.mdx). Initialize the balance manager with the client. If you don't create a balance manager, you can rely on the client to create one, but then the user must reinitialize the client.
+
+Example using an existing balance manager:
+    
+```tsx
+import { SuiClient, getFullnodeUrl } from "@mysten/sui/client";
+import { Ed25519Keypair } from "@mysten/sui/keypairs/ed25519";
+import { decodeSuiPrivateKey } from "@mysten/sui/cryptography";
+import { config } from 'dotenv';
+config();
+
+import { DeepBookClient } from "../src";
+import { BalanceManager } from "./types";
+
+// Used wherever balance manager key is required
+const BALANCE_MANAGER_KEY = 'MANAGER_1';
+
+class DeepBookMarketMaker {
+    dbClient: DeepBookClient; // For building transactions
+    suiClient: SuiClient; // For executing transactions
+    keypair: Ed25519Keypair; // For signing transactions
+    env: 'testnet' | 'mainnet';
+
+    constructor(privateKey: string, env: 'testnet' | 'mainnet') {
+        this.env = env;
+        this.keypair = this.getSignerFromPK(privateKey);
+        this.suiClient = new SuiClient({
+            url: getFullnodeUrl(env)
+        })
+        this.dbClient = new DeepBookClient({
+            address: this.getActiveAddress(),
+            env: env,
+            client: this.suiClient,
+            balanceManagers: this.getBalanceManagers()
+        });
+    }
+
+    getSignerFromPK = (privateKey: string): Ed25519Keypair => {
+    const { schema, secretKey } = decodeSuiPrivateKey(privateKey);
+    if (schema === 'ED25519') return Ed25519Keypair.fromSecretKey(secretKey);
+
+    throw new Error(`Unsupported schema: ${schema}`);
+  };
+
+    getActiveAddress() {
+        return this.keypair.toSuiAddress();
+    }
+
+    getBalanceManagers(): { [key: string]: BalanceManager } {
+        // Used wherever balance manager key is required
+        const balanceManagerAddress = process.env.BALANCE_MANAGER_ADDRESS;
+        const balanceManagerTradeCap = process.env.BALANCE_MANAGER_TRADE_CAP;
+        if (!balanceManagerAddress) {
+            throw new Error('No balance manager address found');
+        }
+        return {
+            BALANCE_MANAGER_KEY: {
+                address: balanceManagerAddress,
+                tradeCap: balanceManagerTradeCap
+            }
+        }
+    }
+}
+```
+    
+Example creating a balance manager:
+    
+```tsx
+import { SuiClient, getFullnodeUrl } from "@mysten/sui/client";
+import { Ed25519Keypair } from "@mysten/sui/keypairs/ed25519";
+import { decodeSuiPrivateKey } from "@mysten/sui/cryptography";
+
+import { DeepBookClient } from "../src";
+import { Transaction } from "@mysten/sui/transactions";
+import { BalanceManager } from "./types";
+
+// Used wherever balance manager key is required
+const BALANCE_MANAGER_KEY = 'MANAGER_1';
+
+class DeepBookMarketMaker {
+    dbClient: DeepBookClient; // For building transactions
+    suiClient: SuiClient; // For executing transactions
+    keypair: Ed25519Keypair; // For signing transactions
+    env: 'testnet' | 'mainnet';
+
+    constructor(privateKey: string, env: 'testnet' | 'mainnet') {
+        this.env = env;
+        this.keypair = this.getSignerFromPK(privateKey);
+        this.suiClient = new SuiClient({
+            url: getFullnodeUrl(env)
+        })
+        this.dbClient = new DeepBookClient({
+            address: this.getActiveAddress(),
+            env: env,
+            client: this.suiClient,
+        });
+    }
+
+    getSignerFromPK = (privateKey: string): Ed25519Keypair => {
+      const { schema, secretKey } = decodeSuiPrivateKey(privateKey);
+      if (schema === 'ED25519') return Ed25519Keypair.fromSecretKey(secretKey);
+  
+      throw new Error(`Unsupported schema: ${schema}`);
+    };
+
+    getActiveAddress() {
+        return this.keypair.toSuiAddress();
+    }
+
+    async createBalanceManagerAndReinitialize() {
+        let tx = new Transaction();
+        tx.add(this.dbClient.balanceManager.createAndShareBalanceManager());
+        
+        const res = await this.suiClient.signAndExecuteTransaction({
+            transaction: tx,
+            signer: this.keypair,
+            options: {
+                showEffects: true,
+                showObjectChanges: true,
+            },
+        })
+
+        // @ts-ignore
+        const balanceManagerAddress = res.objectChanges?.find((change) => {
+            change.type === 'created' && change.objectType.includes('BalanceManager');
+        })?.['objectId'];
+
+        const balanceManagers: { [key: string]: BalanceManager } = {
+            BALANCE_MANAGER_KEY: {
+                address: balanceManagerAddress,
+                tradeCap: undefined,
+            }
+        }
+
+        this.dbClient = new DeepBookClient({
+            address: this.getActiveAddress(),
+            env: this.env,
+            client: this.suiClient,
+            balanceManagers: balanceManagers,
+        })
+    }
+}
+```
+
+### Coin
+
+The SDK comes with four default coins on Testnet and five default coins on Mainnet. 
+
+**Default Testnet coins**
+- DEEP
+- SUI
+- DBUSDC
+- DBUSDT
+
+**Default Mainnet coins**
+- DEEP
+- SUI
+- USDC
+- USDT
+- WETH
+
+You can also initialize the SDK with custom coins to interact with pools that are not supported by default. To do this, create a `CoinMap` object and pass it to the constructor of the client.
+
+### Pool
+
+Similar to coins, the SDK comes with default pools. You can provide a `PoolMap` during construction to override this behavior.
+    
+```tsx
+import { decodeSuiPrivateKey } from '@mysten/sui.js/cryptography';
+import { getFullnodeUrl, SuiClient } from '@mysten/sui/client';
+import type { Keypair } from '@mysten/sui/cryptography';
+import { Ed25519Keypair } from '@mysten/sui/keypairs/ed25519';
+import type { Transaction } from '@mysten/sui/transactions';
+
+import { DeepBookClient } from '../src/index.js'; // Adjust path according to new structure
+import type { BalanceManager } from '../src/types/index.js';
+
+export class DeepBookMarketMaker extends DeepBookClient {
+  keypair: Keypair;
+  suiClient: SuiClient;
+
+  constructor(
+    keypair: string | Keypair,
+    env: 'testnet' | 'mainnet',
+    balanceManagers?: { [key: string]: BalanceManager },
+    adminCap?: string,
+  ) {
+    let resolvedKeypair: Keypair;
+
+    if (typeof keypair === 'string') {
+      resolvedKeypair = DeepBookMarketMaker.#getSignerFromPK(keypair);
+    } else {
+      resolvedKeypair = keypair;
+    }
+
+    const address = resolvedKeypair.toSuiAddress();
+
+    super({
+      address: address,
+      env: env,
+      client: new SuiClient({
+        url: getFullnodeUrl(env),
+      }),
+      balanceManagers: balanceManagers,
+      adminCap: adminCap,
+    });
+
+    this.keypair = resolvedKeypair;
+    this.suiClient = new SuiClient({
+      url: getFullnodeUrl(env),
+    });
+  }
+
+  static #getSignerFromPK = (privateKey: string) => {
+    const { schema, secretKey } = decodeSuiPrivateKey(privateKey);
+    if (schema === 'ED25519') return Ed25519Keypair.fromSecretKey(secretKey);
+
+    throw new Error(`Unsupported schema: ${schema}`);
+  };
+
+  signAndExecute = async (tx: Transaction) => {
+    // remove arguments
+    return this.suiClient.signAndExecuteTransaction({
+      transaction: tx,
+      signer: this.keypair,
+      options: {
+        showEffects: true,
+        showObjectChanges: true,
+      },
+    });
+  };
+
+  getActiveAddress() {
+    return this.keypair.getPublicKey().toSuiAddress();
+  }
+}
+
+```
+
+### Example setup
+
+The following example uses the default pools and coins provided.
+    
+```tsx
+import { Transaction } from '@mysten/sui/transactions';
+import { DeepBookMarketMaker } from './deepbookMarketMaker.js';
+
+(async () => {
+  const privateKey = ''; // Can encapsalate this in a .env file
+
+  // Initialize with balance managers if created
+  const balanceManagers = {
+    MANAGER_1: {
+      address: '',
+      tradeCap: '',
+    },
+  };
+  const mmClient = new DeepBookMarketMaker(
+    privateKey,
+    'testnet',
+    balanceManagers,
+  );
+
+  const tx = new Transaction();
+
+  // Read only call
+  console.log(await mmClient.checkManagerBalance('MANAGER_1', 'SUI'));
+  console.log(await mmClient.getLevel2Range('SUI_DBUSDC', 0.1, 100, true));
+
+  // Balance manager contract call
+  mmClient.balanceManager.depositIntoManager('MANAGER_1', 'DBUSDT', 10000)(tx);
+  mmClient.balanceManager.withdrawAllFromManager(
+    'MANAGER_1',
+    'DBUSDT',
+    mmClient.getActiveAddress(),
+  )(tx);
+
+  // Example custom PTB call in DeepBookMarketMaker class
+  mmClient.placeLimitOrderExample(tx);
+  mmClient.flashLoanExample(tx);
+
+  let res = await mmClient.signAndExecute(tx);
+
+  console.dir(res, { depth: null });
+})();
+
+```
\ No newline at end of file
diff --git a/docs/content/standards/deepbookv3-sdk/flash-loans.mdx b/docs/content/standards/deepbookv3-sdk/flash-loans.mdx
new file mode 100644
index 0000000000000..151b8af17dcee
--- /dev/null
+++ b/docs/content/standards/deepbookv3-sdk/flash-loans.mdx
@@ -0,0 +1,127 @@
+---
+title: Flash Loans SDK
+sidebar_label: Flash Loans
+---
+
+A flash loan is one where the borrowing and returning of loans from pools is performed within a single programmable transaction block. The SDK exposes functions that allow you to implement this functionality. See [Flash Loans](https://docs.sui.io/standards/deepbookv3/flash-loans) for more details on the API.
+
+## Flash loan functions
+
+The DeepBookV3 SDK provides the following flash loan related functions. 
+
+### borrowBaseAsset
+
+Use `borrowBaseAsset` to borrow a base asset from the pool identified by the `poolKey` value you provide. The call returns a function that takes a `Transaction` object
+
+**Parameters**
+
+- `poolKey`: String that identifies the pool from which to borrow.
+- `borrowAmount`: Number that represents the amount to borrow from the pool.
+
+```tsx
+borrowBaseAsset(poolKey: string, borrowAmount: number);
+```
+
+### returnBaseAsset
+
+Use `returnBaseAsset` to return the base asset to the pool identified by the `poolKey` value you provide. The call returns a function that takes a `Transaction` object.
+
+**Parameters**
+
+- `poolKey`: String that identifies the pool from which to borrow.
+- `borrowAmount`: Number that represents the amount to borrow from the pool.
+- `baseCoinInput`: Coin object representing the base asset to be returned.
+- `flashLoan`: Flash loan object representing the loan to be settled.
+
+```tsx
+returnBaseAsset(
+  {
+    poolKey: string,
+    borrowAmount: number,
+    baseCoinInput: TransactionObjectArgument,
+    flashLoan: TransactionObjectArgument,
+  }
+)
+```
+
+### borrowQuoteAsset
+
+Use `borrowQuoteAsset` to borrow a quote asset from the pool identified by the `poolKey` value you provide. The call returns a function that takes a `Transaction` object.
+
+**Parameters**
+
+- `poolKey`: String that identifies the pool from which to borrow.
+- `borrowAmount`: Number that represents the amount to borrow from the pool.
+
+```tsx
+borrowQuoteAsset(poolKey: string, borrowAmount: number);
+```
+
+### returnQuoteAsset
+
+Use `returnQuoteAsset` to return a quote asset to the pool identified by the `poolKey` you provide. The call returns a function that takes a `Transaction` object.
+
+**Parameters**
+
+- `poolKey`: String that identifies the pool from which to borrow.
+- `borrowAmount`: Number that represents the amount to borrow from the pool.
+- `baseCoinInput`: Coin object representing the quote asset to be returned.
+- `flashLoan`: Flash loan object representing the loan to be settled.
+
+```tsx
+returnQuoteAsset(
+  poolKey: string,
+  borrowAmount: number,
+  quoteCoinInput: TransactionObjectArgument,
+  flashLoan: TransactionObjectArgument,
+);
+```
+
+## Flash loan example
+
+The following example demonstrates flash loan usage in `DeepBookMarketMaker` class.
+    
+```tsx
+// Example of a flash loan transaction
+// Borrow 1 DEEP from DEEP_SUI pool
+// Swap 0.5 DBUSDC for SUI in SUI_DBUSDC pool, pay with deep borrowed
+// Swap SUI back to DEEP
+// Return 1 DEEP to DEEP_SUI pool
+flashLoanExample = async (tx: Transaction) => {
+  const borrowAmount = 1;
+  const [deepCoin, flashLoan] = tx.add(this.flashLoans.borrowBaseAsset('DEEP_SUI', borrowAmount));
+
+  // Execute trade using borrowed DEEP
+  const [baseOut, quoteOut, deepOut] = tx.add(
+    this.deepBook.swapExactQuoteForBase({
+      poolKey: 'SUI_DBUSDC',
+      amount: 0.5,
+      deepAmount: 1,
+      minOut: 0,
+      deepCoin: deepCoin,
+    }),
+  );
+
+  tx.transferObjects([baseOut, quoteOut, deepOut], this.getActiveAddress());
+
+  // Execute second trade to get back DEEP for repayment
+  const [baseOut2, quoteOut2, deepOut2] = tx.add(
+    this.deepBook.swapExactQuoteForBase({
+      poolKey: 'DEEP_SUI',
+      amount: 10,
+      deepAmount: 0,
+      minOut: 0,
+    }),
+  );
+
+  tx.transferObjects([quoteOut2, deepOut2], this.getActiveAddress());
+
+  // Return borrowed DEEP
+  const loanRemain = tx.add(
+    this.flashLoans.returnBaseAsset('DEEP_SUI', borrowAmount, baseOut2, flashLoan),
+  );
+  
+  // Send the remaining coin to user's address
+  tx.transferObjects([loanRemain], this.getActiveAddress());
+};
+```
\ No newline at end of file
diff --git a/docs/content/standards/deepbookv3-sdk/orders.mdx b/docs/content/standards/deepbookv3-sdk/orders.mdx
new file mode 100644
index 0000000000000..a17f28e191251
--- /dev/null
+++ b/docs/content/standards/deepbookv3-sdk/orders.mdx
@@ -0,0 +1,202 @@
+---
+title: Orders SDK
+sidebar_label: Orders
+---
+
+Placing orders is a main function of any DeepBook integration. Before you can place orders, though, you must first set up a balance manager. See [DeepBookV3 SDK](../deepbookv3-sdk.mdx) for information on setting up a balance manager.
+
+## Order functions
+
+The DeepBookV3 SDK provides the following functions for leveraging orders against pools.
+
+### placeLimitOrder
+
+Use `placeLimitOrder` to place limit orders. The call returns a function that takes a `Transaction` object.
+
+**Parameters**
+
+- `params`: `SwapParams` object that represents the parameters for the swap.
+
+```tsx
+placeLimitOrder({ params: PlaceLimitOrderParams });
+```
+
+### placeMarketOrder
+
+Use `placeMarketOrder` to place market orders. The call returns a function that takes a `Transaction` object.
+
+**Parameters**
+
+- `params`: `SwapParams` object that represents the parameters for the swap.
+
+```tsx
+placeMarketOrder({ params: PlaceMarketOrderParams });
+```
+
+### cancelOrder
+
+Use `cancelOrder` to cancel an existing order that is identified by the `orderId` thqt you provide. The call returns a function that takes a `Transaction` object.
+
+::: warn
+
+The `orderId` is the protocol `orderId` generated during order placement, which is different from the client `orderId`.
+
+:::
+
+**Parameters**
+
+- `poolKey`: String that identifies the pool from which to borrow.
+- `balanceManagerKey`: String that identifies the `BalanceManager`.
+- `orderId`: String of the protocol order ID that identifies the order to cancel. 
+
+```tsx
+cancelOrder(poolKey: string, balanceManagerKey: string, orderId: string);
+```
+
+### cancelAllOrders
+
+Use `cancelAllOrders` to cancel every order for the balance manager whose key you provide. The call returns a function that takes a `Transaction` object.
+
+**Parameters**
+
+- `poolKey`: String that identifies the pool from which to borrow.
+- `balanceManagerKey`: String that identifies the `BalanceManager`.
+
+```tsx
+cancelAllOrders(poolKey: string, balanceManagerKey: string);
+```
+
+## Examples
+
+The following examples demonstrate some custom functions for DeepBookV3 orders.
+
+### Limit orders
+
+See the [Order API](../deepbookv3/orders) for the different order types and self matching options.
+    
+```tsx
+// Params for limit order
+interface PlaceLimitOrderParams {
+    poolKey: string;
+    balanceManagerKey: string;
+    clientOrderId: string;
+    price: number;
+    quantity: number;
+    isBid: boolean;
+    expiration?: number | bigint; // Default no expiration
+    orderType?: OrderType; // Default no restrictions
+    selfMatchingOption?: SelfMatchingOptions; // Default self matching allowed
+    payWithDeep?: boolean; // Default true
+}
+
+/**
+  * @description Place a limit order
+  * @param {PlaceLimitOrderParams} params Parameters for placing a limit order
+  * @returns A function that takes a Transaction object
+  */
+placeLimitOrder = (params: PlaceLimitOrderParams) => (tx: Transaction) => {}
+
+// Example usage in DeepBookMarketMaker class
+// Place a bid of 10 DEEP at $0.1
+customPlaceLimitOrder = (tx: Transaction) => {
+  const poolKey = 'DEEP_DBUSDC'; // Pool key, check constants.ts for more
+  const managerKey = 'MANAGER_1'; // Balance manager key, initialized during client creation by user
+  tx.add(
+    this.deepBook.placeLimitOrder({
+      poolKey: poolKey,
+      balanceManagerKey: managerKey,
+      clientOrderId: '1',
+      price: 0.1,
+      quantity: 10,
+      isBid: true,
+      payWithDeep: true,
+    }),
+  );
+};
+```
+
+### Place market order
+
+Example of placing a market order.
+
+```tsx
+// Params for market order
+interface PlaceMarketOrderParams {
+    poolKey: string;
+    balanceManagerKey: string;
+    clientOrderId: string;
+    quantity: number;
+    isBid: boolean;
+    selfMatchingOption?: SelfMatchingOptions;
+    payWithDeep?: boolean;
+}
+
+// Example usage in DeepBookMarketMaker class
+// Place a market sell of 10 SUI in the SUI_DBUSDC pool
+customPlaceMarketOrder = (tx: Transaction) => {
+  const poolKey = 'SUI_DBUSDC'; // Pool key, check constants.ts for more
+  const managerKey = 'MANAGER_1'; // Balance manager key, initialized during client creation by user
+  tx.add(
+    this.deepBook.placeMarketOrder({
+      poolKey: poolKey,
+      balanceManagerKey: managerKey,
+      clientOrderId: '2',
+      quantity: 10,
+      isBid: true,
+      payWithDeep: true,
+    }),
+  );
+};
+```
+    
+### Cancel an order
+
+Example of canceling a single order in a pool for a balance manager. 
+    
+```tsx
+/**
+  * @description Cancel an existing order
+  * @param {string} poolKey The key to identify the pool
+  * @param {string} balanceManagerKey The key to identify the BalanceManager
+  * @param {number} orderId Order ID to cancel
+  * @returns A function that takes a Transaction object
+  */
+cancelOrder = (
+  poolKey: string, 
+  balanceManagerKey: string, 
+  orderId: number
+) => (tx: Transaction) => {}
+
+// Example usage in DeepBookMarketMaker class
+// Cancel order 12345678 in SUI_DBUSDC pool
+cancelOrder = (tx: Transaction) => {
+  const poolKey = 'SUI_DBUSDC'; // Pool key, check constants.ts for more
+  const managerKey = 'MANAGER_1'; // Balance manager key, initialized during client creation by user
+  tx.add(this.deepBook.cancelOrder(poolKey, managerKey, 12345678));
+};
+```
+
+### Cancel all orders
+
+Example of canceling all orders in a pool for a balance manager.
+    
+```tsx
+/**
+  * @description Cancel all open orders for a balance manager
+  * @param {string} poolKey The key to identify the pool
+  * @param {string} balanceManagerKey The key to identify the BalanceManager
+  * @returns A function that takes a Transaction object
+  */
+cancelAllOrders = (
+  poolKey: string, 
+  balanceManagerKey: string
+) => (tx: Transaction) => {}
+
+// Example usage in DeepBookMarketMaker class
+// Cancel order 12345678 in SUI_DBUSDC pool
+cancelOrder = (tx: Transaction) => {
+  const poolKey = 'SUI_DBUSDC'; // Pool key, check constants.ts for more
+  const managerKey = 'MANAGER_1'; // Balance manager key, initialized during client creation by user
+  tx.add(this.deepBook.cancelAllOrders(poolKey, managerKey));
+};
+```
\ No newline at end of file
diff --git a/docs/content/standards/deepbookv3-sdk/pools.mdx b/docs/content/standards/deepbookv3-sdk/pools.mdx
new file mode 100644
index 0000000000000..2577a73c72bce
--- /dev/null
+++ b/docs/content/standards/deepbookv3-sdk/pools.mdx
@@ -0,0 +1,243 @@
+---
+title: Pools SDK
+sidebar_label: Pools
+---
+
+Pools are shared objects that represent a market. See [Query the Pool](../deepbookv3/query-the-pool.mdx) for more information on pools.
+
+## Pool functions
+
+The DeepBookV3 SDK exposes functions that you can call to read the state of a pool. These functions typically require a `managerKey`, `coinKey`, `poolKey`, or a combination of these. For details on these keys, see [DeepBookV3 SDK](../deepbookv3-sdk.mdx#keys). The SDK includes some default keys that you can view in the `constants.ts` file.
+
+::: tip
+Decimal adjust all input quantities. All outputs are decimal adjusted.
+:::
+
+### checkManagerBalance
+
+Use `checkManagerBalance` to check the balance manager for a specific coin. The call returns a `Promise` in the form:
+```
+{ 
+  coinType: string,
+  balance: number 
+}
+```
+
+**Parameters**
+
+- `managerKey`: String that identifies the balance manager to query.
+- `coinKey`: String that identifies the coin to query the balance of.
+
+```tsx
+async checkManagerBalance(managerKey: string, coinKey: string) {}
+```
+
+### getOrder
+
+Use `getOrder` to retrieve an order's information. The call returns a `Promise` in the `Order` struct, which has the following form:
+
+```tsx
+{
+  balance_manager_id: {
+    bytes: '0x6149bfe6808f0d6a9db1c766552b7ae1df477f5885493436214ed4228e842393'
+  },
+  order_id: '9223372036873222552073709551614',
+  client_order_id: '888',
+  quantity: '50000000',
+  filled_quantity: '0',
+  fee_is_deep: true,
+  order_deep_price: { asset_is_base: false, deep_per_asset: '0' },
+  epoch: '440',
+  status: 0,
+  expire_timestamp: '1844674407370955161'
+}
+```
+
+**Parameters**
+
+`poolKey`: String that identifies the pool to query.
+`orderId`: ID of the order to query.
+
+```tsx
+async getOrder(poolKey: string, orderId: string) {}
+```
+
+
+### getQuoteQuantityOut
+
+Use `getQuoteQuantityOut` to retrieve the quote quantity out for the base quantity you provide. The call returns a `Promise` in the form:
+```
+{ 
+  baseQuantity: number,
+  baseOut: number,
+  quoteOut: number,
+  deepRequired: number 
+}
+```
+where `deepRequired` is the amount of DEEP required for the dry run.
+
+**Parameters**
+
+- `poolKey`: String that identifies the pool to query.
+- `baseQuantity`: Number that defines the base quantity you want to convert.
+
+ ```tsx
+async getQuoteQuantityOut(poolKey: string, baseQuantity: number) {}
+```
+
+### getBaseQuantityOut
+
+Use `getBaseQuantityOut` to retrieve the base quantity out for the quote quantity that you provide. The call returns a `Promise` in the form:
+```
+{
+  quoteQuantity: number,
+  baseOut: number,
+  quoteOut: number,
+  deepRequired: number
+}
+```
+where `deepRequired` is the amount of DEEP required for the dry run.
+
+**Parameters**
+
+- `poolKey`: String that identifies the pool to query.
+- `quoteQuantity`: Number that defines the quote quantity you want to convert.
+
+```tsx
+async getBaseQuantityOut(poolKey: string, quoteQuantity: number) {}
+```
+
+### getQuantityOut
+
+Use `getQuantityOut` to retrieve the output quantities for the base or quote quantity you provide. You provide values for both quantities, but only one of them can be non-zero. The call returns a `Promise` with the form:
+```
+{
+  baseQuantity: number,
+  quoteQuantity: number,
+  baseOut: number,
+  quoteOut: number,
+  deepRequired: number
+}
+```
+where `deepRequired` is the amount of DEEP required for the dry run.
+
+**Parameters**
+
+- `poolKey`: String that identifies the pool to query.
+- `baseQuantity`: Number that defines the base quantity you want to convert. Set to `0` if using quote quantity.
+- `quoteQuantity`: Number that defines the quote quantity you want to convert. Set to `0` if using base quantity.
+
+```tsx
+async getQuantityOut(poolKey: string, baseQuantity: number, quoteQuantity: number) {}
+```
+
+### accountOpenOrders
+
+Use `accountOpenOrders` to retrieve open orders for the balance manager and pool with the IDs you provide. The call returns a `Promise` that contains an array of open order IDs.
+
+**Parameters**
+
+- `poolKey`: String that identifies the pool to query.
+- `managerKey`: String that identifies the balance manager to query.
+
+```tsx
+async accountOpenOrders(poolKey: string, managerKey: string) {}
+```
+
+### getLevel2Range
+
+Use `getLevel2Range` to retrieve level 2 order book within the boundary price range you provide. The call returns a `Promise` in the form:
+```
+{
+  prices: Array<number>,
+  quantities: Array<number>
+}
+```
+
+**Parameters**
+
+- `poolKey`: String that identifies the pool to query.
+- `priceLow`: Number for lower bound of price range.
+- `priceHigh`: Number for upper bound of price range.
+- `isBid`: Boolean when set to `true` gets bid orders, else retrieve ask orders.
+
+ ```tsx
+async getLevel2Range(poolKey: string, priceLow: number, priceHigh: number, isBid: boolean) {}
+```
+
+### getLevel2TicksFromMid
+
+Use `getLevel2TicksFromMid` to retrieve level 2 order book ticks from mid-price for a pool with the ID you provide. The call returns a `Promise` in the form:
+```
+{
+  bid_prices: Array<number>,
+  bid_quantities: Array<number>,
+  ask_prices: Array<number>,
+  ask_quantities: Array<number>
+}
+```
+
+**Parameters**
+
+- `poolKey`: String that identifies the pool to query.
+- `ticks`: Number of ticks from mid-price.
+
+ ```tsx
+async getLevel2TicksFromMid(poolKey: string, ticks: number) {}
+```
+
+### vaultBalances
+
+Use `vaultBalances` to get the vault balances for a pool with the ID you provide. The call returns a `Promise` in the form:
+```
+{
+  base: number, 
+  quote: number, 
+  deep: number
+} 
+```
+
+**Parameters**
+
+- `poolKey`: String that identifies the pool to query.
+
+```tsx
+async vaultBalances(poolKey: string) {}
+```
+
+### getPoolIdByAssets
+
+Use `getPoolIdByAssets` to retrieve the pool ID for the asset types you provide. The call returns a `Promise` with the address of the pool if it's found.
+
+**Parameters**
+
+- `baseType`: String of the type of base asset.
+- `quoteType`: String of the type of quote asset.
+
+```tsx
+async getPoolIdByAssets(baseType: string, quoteType: string) {}
+```
+
+### midPrice
+
+Use `midPrice` to retrieve the mid price for a pool with the ID that you provide. The call returns a `Promise` with the mid price.
+
+**Parameters**
+
+- `poolKey`: String that identifies the pool to query.
+
+```tsx
+async midPrice(poolKey: string) {}
+```
+
+### whitelisted
+
+Use `whitelisted` to check if the pool with the ID you provide is whitelisted. The call returns a `Promise` as a boolean indicating whether the pool is whitelisted.
+
+**Parameters**
+
+- `poolKey`: String that identifies the pool to query.
+
+```tsx
+async whitelisted(poolKey: string) {}
+```
diff --git a/docs/content/standards/deepbookv3-sdk/staking-governance.mdx b/docs/content/standards/deepbookv3-sdk/staking-governance.mdx
new file mode 100644
index 0000000000000..8314eda586578
--- /dev/null
+++ b/docs/content/standards/deepbookv3-sdk/staking-governance.mdx
@@ -0,0 +1,148 @@
+---
+title: Staking and Governance SDK
+sidebar_label: Staking and Governance
+---
+
+Examples of interacting with staking and governance. These functions typically require a `balanceManagerKey`, `poolKey`, or both. For details on these keys, see [DeepBookV3 SDK](../deepbookv3-sdk.mdx#keys). The SDK includes some default keys that you can view in the `constants.ts` file. 
+
+See [Staking and Governance](../deepbookv3/staking-governance.mdx) for more information on the staking and governance API.
+
+## Staking and governance functions
+
+### stake
+
+Use `stake` to stake an amount you specify into a specific pool. The call returns a `Transaction` object.
+
+**Parameters**
+
+- `poolKey`: String that identifies the pool.
+- `balanceManagerKey`: String that identifies the balance manager.
+- `stakeAmount`: Number representing the amount to stake.
+
+```tsx
+stake(poolKey: string, balanceManagerKey: string, stakeAmount: number);
+```
+
+### unstake
+
+Use `unstake` to unstake from a particular pool. The call returns a `Transaction` object.
+
+**Parameters**
+
+- `poolKey`: String that identifies the pool.
+- `balanceManagerKey`: String that identifies the balance manager.
+
+```tsx
+unstake(poolKey: string, balanceManagerKey: string);
+```
+
+### submitProposal
+
+Use `submitProposal` to submit a governance proposal. The call returns a `Transaction` object.
+
+**Parameters**
+
+- `params`: A `ProposalParams` object that defines the proposal.
+
+```tsx
+submitProposal({ params: ProposalParams });
+```
+
+### vote
+
+Use `vote` to vote on a proposal. The call returns a `Transaction` object.
+
+**Parameters**
+
+- `poolKey`: String that identifies the pool.
+- `balanceManagerKey`: String that identifies the balance manager.
+- `proposal_id`: String that identifies the proposal to vote on.
+
+```tsx
+vote(poolKey: string, balanceManagerKey: string, proposal_id: string)
+```
+
+## Examples
+
+The following examples demonstrate custom staking and governance functions that you can place into the `DeepBookMarketMaker` class. 
+
+### stake custom function
+
+```tsx
+stake = (
+  poolKey: string, 
+  balanceManagerKey: string, 
+  stakeAmount: number
+) => (tx: Transaction) => {}
+
+// Custom function to stake 100 DEEP in DeepBookMarketMaker class
+stake = (tx: Transaction) => {
+  const poolKey = 'DBUSDT_DBUSDC';
+  const balanceManagerKey = 'MANAGER_1';
+  tx.add(this.governance.stake(poolKey, balanceManagerKey, 100));
+};
+```
+
+### unstake custom function
+
+```tsx
+unstake = (
+  poolKey: string, 
+  balanceManagerKey: string
+) => (tx: Transaction) => {}
+
+// Custom function to unstake in DeepBookMarketMaker class
+unstake = (tx: Transaction) => {
+  const poolKey = 'DBUSDT_DBUSDC';
+  const balanceManagerKey = 'MANAGER_1';
+  tx.add(this.governance.unstake(poolKey, balanceManagerKey));
+};
+```
+
+### submitProposal custom function
+
+```tsx
+// Proposal params
+export interface ProposalParams {
+  poolKey: string;
+  balanceManagerKey: string;
+  takerFee: number;
+  makerFee: number;
+  stakeRequired: number;
+}
+
+submitProposal = (params: ProposalParams) => (tx: Transaction) => {}
+
+// Custom function to submit proposal in DeepBookMarketMaker class
+submitProposal = (tx: Transaction) => {
+  const poolKey = 'DBUSDT_DBUSDC';
+  const balanceManagerKey = 'MANAGER_1';
+  tx.add(
+    this.governance.submitProposal({
+      poolKey,
+      balanceManagerKey,
+      takerFee: 0.002,
+      makerFee: 0.001,
+      stakeRequired: 100,
+    }),
+  );
+};
+```
+
+### vote custom function
+
+```tsx
+vote = (
+  poolKey: string, 
+  balanceManagerKey: string, 
+  proposal_id: string
+) => (tx: Transaction) => {}
+
+// Custom function to vote in DeepBookMarketMaker class
+vote = (tx: Transaction) => {
+  const poolKey = 'DBUSDT_DBUSDC';
+  const balanceManagerKey = 'MANAGER_1';
+  const proposalID = '0x123456789';
+  tx.add(this.governance.vote(poolKey, balanceManagerKey, proposalID));
+};
+```
\ No newline at end of file
diff --git a/docs/content/standards/deepbookv3-sdk/swaps.mdx b/docs/content/standards/deepbookv3-sdk/swaps.mdx
new file mode 100644
index 0000000000000..df16ff2ea9b0a
--- /dev/null
+++ b/docs/content/standards/deepbookv3-sdk/swaps.mdx
@@ -0,0 +1,63 @@
+---
+title: Swaps
+---
+
+DeepBookV3 provides a swap-like interface commonly seen in automatic market makers (AMMs). The DeepBookV3 SDK provides functions to leverage the features of this interface. See [Swaps](../deepbookv3/swaps.mdx) in the API section for more details.
+
+## Swap functions
+
+The SDK provides the following functions to perform swaps between the base and quote asset.
+
+### swapExactBaseForQuote
+
+Use `swapExactBaseForQuote` to swap exact base amount for quote amount. The call returns a function that takes a `Transaction` object.
+
+**Parameters**
+
+- `params`: `SwapParams` object that represents the parameters for the swap.
+
+```tsx
+swapExactBaseForQuote({ params: SwapParams });
+```
+
+### swapExactQuoteForBase
+
+Use `swapExactQuoteForBase` to swap exact quote amount for base amount. The call returns a function that takes a `Transaction` object. 
+
+**Parameters**
+
+- `params`: `SwapParams` object that represents the parameters for the swap.
+
+```tsx
+swapExactQuoteForBase({ params: SwapParams });
+```
+
+### Examples
+
+The following examples demonstrate custom swap functions that you can place into the `DeepBookMarketMaker` class. Base coin, quote coin, and deep coin are automatically determined by the coin available in the user address unless you explicitly pass one in as an argument. You can transfer the coin outputs to their address or execute other operations using the outputs.
+
+```tsx
+swapExactBaseForQuote = (tx: Transaction) => {
+  const [baseOut, quoteOut, deepOut] = this.deepBook.swapExactBaseForQuote({
+    poolKey: 'SUI_DBUSDC',
+    amount: 1, // amount of SUI to swap
+    deepAmount: 1, // amount of DEEP to pay as fees, excess is returned
+    minOut: 0.1, // minimum amount of DBUSDC to receive or transactionf fails
+  })(tx);
+
+  // Transfer received coins to own address
+  tx.transferObjects([baseOut, quoteOut, deepOut], this.getActiveAddress());
+};
+
+swapExactQuoteForBase = (tx: Transaction) => {
+  const [baseOut, quoteOut, deepOut] = this.deepBook.swapExactQuoteForBase({
+    poolKey: 'SUI_DBUSDC',
+    amount: 1, // amount of DBUSDC to swap
+    deepAmount: 1, // amount of DEEP to pay as fees, excess is returned
+    minOut: 0.1, // minimum amount of SUI to receive or transactionf fails
+  })(tx);
+
+  // Transfer received coins to own address
+  tx.transferObjects([baseOut, quoteOut, deepOut], this.getActiveAddress());
+};
+```
\ No newline at end of file
diff --git a/docs/content/standards/kiosk.mdx b/docs/content/standards/kiosk.mdx
index b22b65fbdd735..658e1614e1e78 100644
--- a/docs/content/standards/kiosk.mdx
+++ b/docs/content/standards/kiosk.mdx
@@ -3,11 +3,11 @@ title: Sui Kiosk
 description: Kiosk is a decentralized system for commerce applications on Sui. Kiosk is a part of the Sui framework, native to the system, and available to everyone.
 ---
 
-Kiosk is a decentralized system for commerce applications on Sui. It consists of Kiosks - shared objects owned by individual parties that store assets and allow listing them for sale as well as utilize custom trading functionality - for example, an auction. While being highly decentralized, Kiosk provides a set of strong guarantees:
+Kiosk is a decentralized system for commerce applications on Sui. It consists of `Kiosk` objects - shared objects owned by individual parties that store assets and allow listing them for sale as well as utilize custom trading functionality - for example, an auction. While being highly decentralized, Sui Kiosk provides a set of strong guarantees:
 
 - Kiosk owners retain ownership of their assets to the moment of purchase.
 - Creators set custom policies - sets of rules applied to every trade (such as pay royalty fee or do some arbitrary action X).
-- Marketplaces can index events the Kiosk emits and subscribe to a single feed for on-chain asset trading.
+- Marketplaces can index events the `Kiosk` object emits and subscribe to a single feed for on-chain asset trading.
 
 Practically, Kiosk is a part of the Sui framework, and it is native to the system and available to everyone out of the box.
 
@@ -23,7 +23,7 @@ Anyone can create a Sui Kiosk. Ownership of a kiosk is determined by the owner o
 
 To sell an item, if there is an existing transfer policy for the type (T), you just add your assets to your kiosk and then list them. You specify an offer amount when you list an item. Anyone can then purchase the item for the amount of SUI specified in the listing. The associated transfer policy determines what the buyer can do with the purchased asset.
 
-A Kiosk owner can:
+A kiosk owner can:
 
 - Place and take items
 - List items for sale
@@ -34,13 +34,13 @@ A Kiosk owner can:
 
 ## Sui Kiosk for buyers
 
-A buyer is a party that purchases (or - more generally - receives) items from Kiosks, anyone on the network can be a Buyer (and, for example, a Kiosk Owner at the same time).
+A buyer is a party that purchases (or - more generally - receives) items from kiosks, anyone on the network can be a buyer (and, for example, a kiosk owner at the same time).
 
-** Benefits:**
+**Benefits:**
 
 - Buyers get access to global liquidity and can get the best offer
-- Buyers can place bids on collections through their Kiosks
-- Most of the actions performed in Kiosks are free (gas-less) for Buyers
+- Buyers can place bids on collections through their kiosks
+- Most buyer actions performed in kiosks clean up seller objects, which results in free (gas-less) actions
 
 **Responsibilities:**
 
@@ -49,7 +49,7 @@ A buyer is a party that purchases (or - more generally - receives) items from Ki
 
 **Guarantees:**
 
-- When using a custom trading logic such as an Auction, the items are guaranteed to be unchanged until the trade is complete
+- When using a custom trading logic such as an auction, the items are guaranteed to be unchanged until the trade is complete
 
 ## Sui Kiosk for marketplaces
 
@@ -59,22 +59,22 @@ As a marketplace operator, you can implement Sui Kiosk to watch for offers made
 
 As a creator, Sui Kiosk supports strong enforcement for transfer policies and associated rules to protect assets and enforce asset ownership. Sui Kiosk gives creators more control over their creations, and puts creators and owners in control of how their works can be used.
 
-Creator is a party that creates and controls the TransferPolicy for a single type. For example, the authors of SuiFrens are the Creators of the `SuiFren<Capy>` type and act as creators in the Kiosk ecosystem. Creators set the policy, but they might also be the first sellers of their assets through a Kiosk.
+Creator is a party that creates and controls the TransferPolicy for a single type. For example, the authors of SuiFrens are the Creators of the `SuiFren<Capy>` type and act as creators in the Kiosk ecosystem. Creators set the policy, but they might also be the first sellers of their assets through a kiosk.
 
 **Creators can:**
 
 - Set any rules for trades
 - Set multiple ways ("tracks") of rules
 - Enable or disable trades at any moment with a policy
-- Enforce policies (eg royalties) on all trades
-- Perform a primary sale of their assets through a Kiosk
+- Enforce policies (like royalties) on all trades
+- Perform a primary sale of their assets through a kiosk
 
 All of the above is effective immediately and globally.
 
 **Creators cannot:**
 
-- Take or modify items stored in someone else's Kiosk
-- Restrict taking items from Kiosks if the "locking" rule was not set in the policy
+- Take or modify items stored in someone else's kiosk
+- Restrict taking items from kiosks if the "locking" rule was not set in the policy
 
 ## Sui Kiosk guarantees
 
@@ -82,7 +82,7 @@ Sui Kiosk provides a set of guarantees that Sui enforces through smart contracts
 These guarantees include:
 
 - Every trade in Sui Kiosk requires a `TransferPolicy` resolution. This gives creators control over how their assets can be traded.
-- True Ownership, which means that only a kiosk owner can take, list, borrow, or modify the assets added to their kiosk. This is similar to how single-owner objects work on Sui.
+- True ownership, which means that only a kiosk owner can take, list, borrow, or modify the assets added to their kiosk. This is similar to how single-owner objects work on Sui.
 - Strong policy enforcement, for example Royalty policies, that lets creators enable or disable policies at any time that applies to all trades on the platform for objects with that policy attached.
 - Changes to a `TransferPolicy` apply instantly and globally.
 
@@ -98,10 +98,10 @@ In practice, these guarantees mean that:
 
 Sui Kiosk is a shared object that can store heterogeneous values, such as different sets of asset collectibles. When you add an asset to your kiosk, it has one of the following states:
 
-- PLACED - an item placed in the kiosk using the `kiosk::place` function. The Kiosk Owner can withdraw it and use it directly, borrow it (mutably or immutably), or list an item for sale.
-- LOCKED - an item placed in the kiosk using the `kiosk::lock` function. You can’t withdraw a Locked item from a kiosk, but you can borrow it mutably and list it for sale. Any item placed in a kiosk that has an associated Kiosk Lock policy have a LOCKED state.
+- PLACED - an item placed in the kiosk using the `kiosk::place` function. The kiosk owner can withdraw it and use it directly, borrow it (mutably or immutably), or list an item for sale.
+- LOCKED - an item placed in the kiosk using the `kiosk::lock` function. You can’t withdraw a Locked item from a kiosk, but you can borrow it mutably and list it for sale. Any item placed in a kiosk that has an associated kiosk lock policy have a LOCKED state.
 - LISTED - an item in the kiosk that is listed for sale using the `kiosk::list` or `kiosk::place_and_list` functions. You can’t modify an item while listed, but you can borrow it immutably or delist it, which returns it to its previous state.
-- LISTED EXCLUSIVELY - an item placed or locked in the kiosk by an extension that calls the `kiosk::list_with_purchase_cap` function. Only the kiosk owner can approve calling the function. The owner can only borrow it immutably. The extension must provide the functionality to delist / unlock the asset, or it might stay locked forever. Given that this action is explicitly performed by the Owner - it is the responsibility of the Owner to choose verified and audited extensions to use.
+- LISTED EXCLUSIVELY - an item placed or locked in the kiosk by an extension that calls the `kiosk::list_with_purchase_cap` function. Only the kiosk owner can approve calling the function. The owner can only borrow it immutably. The extension must provide the functionality to delist / unlock the asset, or it might stay locked forever. Given that this action is explicitly performed by the owner - it is the responsibility of the owner to choose verified and audited extensions to use.
 
 When someone purchases an asset from a kiosk, the asset leaves the kiosk and ownership transfers to the buyer’s address.
 
@@ -132,8 +132,8 @@ sui client call \
 
 ### Create a Sui Kiosk with advanced options
 
-For more advanced use cases, when you want to choose the storage model or perform an action right away, you can use the programmable transaction block (PTB) friendly function kiosk::new.
-Kiosk is designed to be shared. If you choose a different storage model, such as owned, your kiosk might not function as intended or not be accessible to other users. You can make sure your Kiosk works by testing it on Sui Testnet.
+For more advanced use cases, when you want to choose the storage model or perform an action right away, you can use the programmable transaction block (PTB) friendly function `kiosk::new`.
+Kiosk is designed to be shared. If you choose a different storage model, such as owned, your kiosk might not function as intended or not be accessible to other users. You can make sure your kiosk works by testing it on Sui Testnet.
 
 ### Create a Sui Kiosk with advanced options using programmable transaction blocks
 
@@ -159,11 +159,11 @@ Sui CLI does not support PTBs and transaction chaining yet. You can use the `kio
 
 As a kiosk owner, you can place any assets into your Sui Kiosk. You can take any item from your kiosk that is not currently listed for sale.
 
-There's no limitations on which assets you can place in your kiosk. However, you can’t necessarily list and trade all of the items you place in your kiosk. The `TransferPolicy` associated with the type for the item determines whether you can trade it. To learn more, see the [Purchase items from a Kiosk](#purchase) section.
+There's no limitations on which assets you can place in your kiosk. However, you can’t necessarily list and trade all of the items you place in your kiosk. The `TransferPolicy` associated with the type for the item determines whether you can trade it. To learn more, see the [Purchase items from a kiosk](#purchase) section.
 
 ### Place an item in your kiosk
 
-To place an item to the Kiosk, the owner needs to call the `sui::kiosk::place` function on the `Kiosk` object and pass the `KioskOwnerCap` and the `Item` as arguments.
+To place an item to the kiosk, the owner needs to call the `sui::kiosk::place` function on the `Kiosk` object and pass the `KioskOwnerCap` and the `Item` as arguments.
 
 `ITEM_TYPE` in the following examples represents the full type of the item.
 
@@ -281,7 +281,7 @@ Anyone on the network can purchase an item listed from a Sui Kiosk. To learn mor
 ### List an item from a kiosk
 
 As a kiosk owner, you can use the `kiosk::list` function to list any asset you added to your kiosk. Include the item to sell and the list price as arguments. All listings on Sui are in SUI tokens.
-When you list an item, Sui emits a `kiosk::ItemListed` event that contains the Kiosk ID, Item ID, type of the Item, and the list price.
+When you list an item, Sui emits a `kiosk::ItemListed` event that contains the kiosk ID, item ID, type of the item, and the list price.
 
 ### List an item using programmable transaction blocks
 
@@ -319,7 +319,7 @@ As a kiosk owner you can use the `kiosk::delist` to delist any currently listed
 
 When you delist an item, Sui returns to the kiosk owner the gas fees charged to list the item.
 
-When you delist an item, Sui emits a `kiosk::ItemDelisted` event that contains the Kiosk ID, Item ID, and the type of the item.
+When you delist an item, Sui emits a `kiosk::ItemDelisted` event that contains the kiosk ID, item ID, and the type of the item.
 
 ### Delist an item using the programmable transaction blocks
 
@@ -351,7 +351,7 @@ sui client call \
 
 ## Purchase an item from a kiosk {#purchase}
 
-Anyone that has an address on the Sui network can purchase an item listed from a Sui Kiosk. To purchase an item, you can use the `kiosk::purchase` function. Specify the item to purchase and pay the list price set by the Kiosk Owner.
+Anyone that has an address on the Sui network can purchase an item listed from a Sui Kiosk. To purchase an item, you can use the `kiosk::purchase` function. Specify the item to purchase and pay the list price set by the kiosk owner.
 
 You can discover the items listed on the network with the `kiosk::ItemListed` event.
 
@@ -434,7 +434,7 @@ tx.moveCall({
 
 ## Withdraw proceeds from a completed sale
 
-When someone purchases an item, Sui stores the proceeds from the sale in the Kiosk. As the kiosk owner, you can withdraw the proceeds at any time by calling the `kiosk::withdraw` function. The function is simple, but because it is PTB friendly it is not currently supported in the Sui CLI.
+When someone purchases an item, Sui stores the proceeds from the sale in the kiosk. As the kiosk owner, you can withdraw the proceeds at any time by calling the `kiosk::withdraw` function. The function is simple, but because it is PTB friendly it is not currently supported in the Sui CLI.
 
 ### Withdraw proceeds using programmable transaction blocks
 
@@ -466,4 +466,4 @@ let coin = tx.moveCall({
 
 ### Withdraw proceeds using the Sui CLI
 
-Due to the function being PTB friendly, it is not currently supported in the CLI environment.
+This action is not currently supported in the CLI environment.
diff --git a/docs/site/docusaurus.config.js b/docs/site/docusaurus.config.js
index e784d38744f15..5760ff48882b1 100644
--- a/docs/site/docusaurus.config.js
+++ b/docs/site/docusaurus.config.js
@@ -62,7 +62,7 @@ const config = {
       "@graphql-markdown/docusaurus",
       {
         schema:
-          "../../crates/sui-graphql-rpc/schema/current_progress_schema.graphql",
+          "../../crates/sui-graphql-rpc/schema.graphql",
         rootPath: "../content", // docs will be generated under rootPath/baseURL
         baseURL: "references/sui-api/sui-graphql/reference",
         loaders: {
diff --git a/docs/site/src/components/ProtocolConfig/index.tsx b/docs/site/src/components/ProtocolConfig/index.tsx
new file mode 100644
index 0000000000000..99f660669ddae
--- /dev/null
+++ b/docs/site/src/components/ProtocolConfig/index.tsx
@@ -0,0 +1,117 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+import React, { useState, useEffect } from "react";
+import Tabs from "@theme/Tabs";
+import TabItem from "@theme/TabItem";
+import axios from "axios";
+
+export default function ProtocolConfig() {
+  const data = {
+    jsonrpc: "2.0",
+    id: 1,
+    method: "sui_getProtocolConfig",
+    params: [],
+  };
+  const urls = [
+    "https://fullnode.mainnet.sui.io:443",
+    "https://fullnode.testnet.sui.io:443",
+    "https://fullnode.devnet.sui.io:443",
+  ];
+  const [results, setResults] = useState({
+    mainnet: null,
+    testnet: null,
+    devnet: null,
+  });
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState(null);
+
+  const parseResult = (data) => {
+    let items = Object.entries(data);
+
+    return items.map((item) => {
+      if (item[1] === null) {
+        return item;
+      }
+      if (typeof item[1] === "object") {
+        const [k, v] = Object.entries(item[1])[0];
+        return [item[0], k, v];
+      }
+      return item;
+    });
+  };
+
+  const DisplayResults = (props) => {
+    const { results } = props;
+    return (
+      <table>
+        <thead>
+          <tr>
+            <th>Parameter</th>
+            <th>Type</th>
+            <th>Value</th>
+          </tr>
+        </thead>
+        <tbody>
+          {results.map((item, index) => (
+            <tr key={index}>
+              <td>{item[0]}</td>
+              <td>{item[1]}</td>
+              <td>{item[2] ? item[2] : "null"}</td>
+            </tr>
+          ))}
+        </tbody>
+      </table>
+    );
+  };
+
+  useEffect(() => {
+    const fetchData = async () => {
+      try {
+        const responses = await Promise.all(
+          urls.map((url) =>
+            axios.post(url, data, {
+              headers: {
+                "Content-Type": "application/json",
+              },
+            }),
+          ),
+        );
+
+        setResults({
+          mainnet: parseResult(responses[0].data.result.attributes),
+          testnet: parseResult(responses[1].data.result.attributes),
+          devnet: parseResult(responses[2].data.result.attributes),
+        });
+      } catch (err) {
+        setError(err.message);
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    fetchData();
+  }, []);
+
+  if (loading) {
+    return <div>Loading...</div>;
+  }
+
+  if (error) {
+    return <div>Error: {error}</div>;
+  }
+
+  return (
+    <Tabs groupId="sui-network">
+      <TabItem value="mainnet" label="Mainnet">
+        <DisplayResults results={results.mainnet} />
+      </TabItem>
+      <TabItem value="testnet" label="Testnet">
+        <DisplayResults results={results.testnet} />
+      </TabItem>
+      <TabItem value="devnet" label="Devnet">
+        <DisplayResults results={results.devnet} />
+      </TabItem>
+    </Tabs>
+  );
+}
diff --git a/docs/site/src/pages/index.js b/docs/site/src/pages/index.js
index bfd85f5122d3a..7fa05c6824877 100644
--- a/docs/site/src/pages/index.js
+++ b/docs/site/src/pages/index.js
@@ -42,17 +42,6 @@ export default function Home() {
           </div>
         </div>
         <div className="flex flex-row flex-wrap justify-center gap-2 max-w-[1066px] mx-auto">
-          <HomeCard title="About Sui">
-            <Link className={styles.cardLink} to="./concepts/tokenomics">
-              Tokenomics
-            </Link>
-            <Link className={styles.cardLink} to="./concepts/cryptography">
-              Cryptography
-            </Link>
-            <Link className={styles.cardLink} to="standards">
-              Standards
-            </Link>
-          </HomeCard>
           <HomeCard title="Developers">
             <Link
               className={styles.cardLink}
@@ -82,6 +71,17 @@ export default function Home() {
               <span className="block bg-auto bg-[url(../static/img/index/right-arrow.svg)]"></span>
             </Link>
           </HomeCard>
+          <HomeCard title="About Sui">
+            <Link className={styles.cardLink} to="./concepts/tokenomics">
+              Tokenomics
+            </Link>
+            <Link className={styles.cardLink} to="./concepts/cryptography">
+              Cryptography
+            </Link>
+            <Link className={styles.cardLink} to="standards">
+              Standards
+            </Link>
+          </HomeCard>
           <HomeCard title="References" aux>
             <Link
               className={styles.cardLink}
diff --git a/docs/site/src/plugins/inject-code/injectLoader.js b/docs/site/src/plugins/inject-code/injectLoader.js
index 704a80e22133b..8aee6e91a2fc2 100644
--- a/docs/site/src/plugins/inject-code/injectLoader.js
+++ b/docs/site/src/plugins/inject-code/injectLoader.js
@@ -117,7 +117,7 @@ const addCodeInject = function (source) {
                 let structContent = [];
                 for (let struct of structs) {
                   struct = struct.trim();
-                  const structStr = `^(\\s*)*?(public )?struct \\b${struct}\\b.*?}`;
+                  const structStr = `^(\\s*)*?(pub(lic)? )?struct \\b${struct}\\b.*?}`;
                   const structRE = new RegExp(structStr, "msi");
                   const structMatch = structRE.exec(injectFileContent);
                   if (structMatch) {
diff --git a/examples/custom-indexer/rust/Cargo.toml b/examples/custom-indexer/rust/Cargo.toml
index 5605e2cc8eefd..b805cd1b024b9 100644
--- a/examples/custom-indexer/rust/Cargo.toml
+++ b/examples/custom-indexer/rust/Cargo.toml
@@ -8,10 +8,16 @@ async-trait = "0.1.81"
 tokio = { version = "1.38.0", features = ["full"]}
 sui_types = { git = "https://github.com/mystenlabs/sui", package = "sui-types"}
 sui_data_ingestion_core = { git = "https://github.com/mystenlabs/sui", package = "sui-data-ingestion-core"}
+prometheus = "0.13.3"
 anyhow = "1.0.86"
 
-[workspace]
+[[bin]]
+name = "local_reader"
+path = "local_reader.rs"
 
 [[bin]]
-name = "custom-indexer"
-path = "main.rs"
+name = "remote_reader"
+path = "remote_reader.rs"
+
+[workspace]
+
diff --git a/examples/custom-indexer/rust/README.md b/examples/custom-indexer/rust/README.md
index 0c4b45bac7a21..37541f56153d1 100644
--- a/examples/custom-indexer/rust/README.md
+++ b/examples/custom-indexer/rust/README.md
@@ -13,6 +13,31 @@ cargo build
 ```
 
 ## How to run
-```bash
-cargo run main.rs
+### Remote Reader example
+```sh
+cargo run --bin remote_reader
+```
+
+### Local Reader example
+The local reader example saves progress in a file called `/tmp/local_reader_progress` and monitors checkpoint files in the `chk` directory
+
+
+To test the local reader example, create the `/tmp/local_reader_progress` file first
+```sh
+echo "{\"local_reader\": 1}" > /tmp/local_reader_progress
+```
+
+then, create the `chk` directory in the same level as the `local_reader.rs` file
+```sh
+mkdir -p chk
+```
+
+then, run the local reader example
+```sh
+cargo run --bin local_reader
+```
+
+Finally, copy the checkpoint files to the `chk` directory and the program should process the checkpoint files as they come in
+```sh
+cp $YOUR_CHECKPOINT_FILE chk/
 ```
diff --git a/examples/custom-indexer/rust/local_reader.rs b/examples/custom-indexer/rust/local_reader.rs
new file mode 100644
index 0000000000000..6d372749f3600
--- /dev/null
+++ b/examples/custom-indexer/rust/local_reader.rs
@@ -0,0 +1,46 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use tokio::sync::oneshot;
+use anyhow::Result;
+use async_trait::async_trait;
+use sui_types::full_checkpoint_content::CheckpointData;
+use sui_data_ingestion_core as sdic;
+use sdic::{Worker, WorkerPool, ReaderOptions};
+use sdic::{DataIngestionMetrics, FileProgressStore, IndexerExecutor};
+use prometheus::Registry;
+use std::path::PathBuf;
+use std::env;
+
+struct CustomWorker;
+
+#[async_trait]
+impl Worker for CustomWorker {
+    async fn process_checkpoint(&self, checkpoint: CheckpointData) -> Result<()> {
+        // custom processing logic
+        println!("Processing Local checkpoint: {}", checkpoint.checkpoint_summary.to_string());
+        Ok(())
+    }
+}
+        
+#[tokio::main]
+async fn main() -> Result<()> {
+    let concurrency = 5;
+    let (exit_sender, exit_receiver) = oneshot::channel();
+    let metrics = DataIngestionMetrics::new(&Registry::new());
+    let backfill_progress_file_path =
+        env::var("BACKFILL_PROGRESS_FILE_PATH").unwrap_or("/tmp/local_reader_progress".to_string());
+    let progress_store = FileProgressStore::new(PathBuf::from(backfill_progress_file_path));
+    let mut executor = IndexerExecutor::new(progress_store, 1 /* number of workflow types */, metrics);
+    let worker_pool = WorkerPool::new(CustomWorker, "local_reader".to_string(), concurrency);
+
+    executor.register(worker_pool).await?;
+    executor.run(
+        PathBuf::from("./chk".to_string()), // path to a local directory
+        None,
+        vec![], // optional remote store access options
+        ReaderOptions::default(),       /* remote_read_batch_size */
+        exit_receiver,
+        ).await?;
+    Ok(())
+}
diff --git a/examples/custom-indexer/rust/main.rs b/examples/custom-indexer/rust/remote_reader.rs
similarity index 100%
rename from examples/custom-indexer/rust/main.rs
rename to examples/custom-indexer/rust/remote_reader.rs
diff --git a/examples/move/crypto/bls_signature/sources/example.move b/examples/move/crypto/bls_signature/sources/example.move
index 5df1bc4b65678..387ba93089b1d 100644
--- a/examples/move/crypto/bls_signature/sources/example.move
+++ b/examples/move/crypto/bls_signature/sources/example.move
@@ -1,7 +1,7 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-/// Examples of BLS siganture related operations.
+/// Examples of BLS signature related operations.
 module bls_signature::example {
     use sui::bls12381;
     use std::hash::sha2_256;
diff --git a/examples/tic-tac-toe/README.md b/examples/tic-tac-toe/README.md
index 4f70705d9b466..a197f0f1d0ebe 100644
--- a/examples/tic-tac-toe/README.md
+++ b/examples/tic-tac-toe/README.md
@@ -109,7 +109,7 @@ The multisig account does not own anything other than the game object
 (it does not have any gas coins of its own), so the player sponsors
 the transaction, using one of its own gas coins.
 
-Sharing a resource while avoiding consensus by transfering it to a
+Sharing a resource while avoiding consensus by transferring it to a
 multisig account can be generalized from two accounts to a max of ten
 (the limit being the number of keys that can be associated with one
 multisig).
diff --git a/examples/trading/api/sui-utils.ts b/examples/trading/api/sui-utils.ts
index 67ef63369398c..24b5bdcbc69e7 100644
--- a/examples/trading/api/sui-utils.ts
+++ b/examples/trading/api/sui-utils.ts
@@ -7,7 +7,7 @@ import { homedir } from 'os';
 import path from 'path';
 import { getFullnodeUrl, SuiClient } from '@mysten/sui/client';
 import { Ed25519Keypair } from '@mysten/sui/keypairs/ed25519';
-import { TransactionBlock } from '@mysten/sui/transactions';
+import { Transaction } from '@mysten/sui/transactions';
 import { fromB64 } from '@mysten/sui/utils';
 
 export type Network = 'mainnet' | 'testnet' | 'devnet' | 'localnet';
@@ -49,12 +49,12 @@ export const getClient = (network: Network) => {
 };
 
 /** A helper to sign & execute a transaction. */
-export const signAndExecute = async (txb: TransactionBlock, network: Network) => {
+export const signAndExecute = async (txb: Transaction, network: Network) => {
 	const client = getClient(network);
 	const signer = getSigner();
 
-	return client.signAndExecuteTransactionBlock({
-		transactionBlock: txb,
+	return client.signAndExecuteTransaction({
+		transaction: txb,
 		signer,
 		options: {
 			showEffects: true,
@@ -73,7 +73,7 @@ export const publishPackage = async ({
 	network: Network;
 	exportFileName: string;
 }) => {
-	const txb = new TransactionBlock();
+	const txb = new Transaction();
 
 	const { modules, dependencies } = JSON.parse(
 		execSync(`${SUI_BIN} move build --dump-bytecode-as-base64 --path ${packagePath}`, {
diff --git a/external-crates/move/Cargo.lock b/external-crates/move/Cargo.lock
index 38787089bbf45..8fc7ec9946862 100644
--- a/external-crates/move/Cargo.lock
+++ b/external-crates/move/Cargo.lock
@@ -1542,6 +1542,7 @@ dependencies = [
  "move-ir-types",
  "move-package",
  "move-symbol-pool",
+ "once_cell",
  "serde",
  "serde_json",
  "sha2",
diff --git a/external-crates/move/Cargo.toml b/external-crates/move/Cargo.toml
index 8bac472e296d6..4aeea3a73a592 100644
--- a/external-crates/move/Cargo.toml
+++ b/external-crates/move/Cargo.toml
@@ -83,7 +83,7 @@ parking_lot = "0.11.1"
 paste = "1.0.5"
 petgraph = "0.5.1"
 phf = { version = "0.11", features = ["macros"] }
-plotters = { version = "0.3.0", default_features = false, features = ["evcxr", "line_series", "histogram"]}
+plotters = { version = "0.3.0", default-features = false, features = ["evcxr", "line_series", "histogram"]}
 pretty = "0.10.0"
 prettydiff = "0.4.0"
 primitive-types = { version = "0.10.1", features = ["impl-serde"]}
diff --git a/external-crates/move/crates/bytecode-verifier-prop-tests/src/unit_tests/prop_tests.rs b/external-crates/move/crates/bytecode-verifier-prop-tests/src/unit_tests/prop_tests.rs
index 2d799592a7107..518ead16b9a99 100644
--- a/external-crates/move/crates/bytecode-verifier-prop-tests/src/unit_tests/prop_tests.rs
+++ b/external-crates/move/crates/bytecode-verifier-prop-tests/src/unit_tests/prop_tests.rs
@@ -13,9 +13,11 @@ use move_binary_format::{
     proptest_types::CompiledModuleStrategyGen,
 };
 use move_bytecode_verifier::{
-    ability_field_requirements, constants, instantiation_loops::InstantiationLoopChecker,
-    DuplicationChecker, InstructionConsistency, RecursiveDataDefChecker, SignatureChecker,
+    ability_cache::AbilityCache, ability_field_requirements, constants,
+    instantiation_loops::InstantiationLoopChecker, DuplicationChecker, InstructionConsistency,
+    RecursiveDataDefChecker, SignatureChecker,
 };
+use move_bytecode_verifier_meter::dummy::DummyMeter;
 use move_core_types::{
     account_address::AccountAddress, identifier::Identifier, vm_status::StatusCode,
 };
@@ -28,7 +30,9 @@ proptest! {
 
     #[test]
     fn valid_ability_transitivity(module in CompiledModule::valid_strategy(20)) {
-        prop_assert!(ability_field_requirements::verify_module(&module).is_ok());
+        let module = &module;
+        let ability_cache = &mut AbilityCache::new(module);
+        prop_assert!(ability_field_requirements::verify_module(module, ability_cache, &mut DummyMeter).is_ok());
     }
 
     #[test]
@@ -101,18 +105,22 @@ proptest! {
 
     #[test]
     fn check_verifier_passes(module in CompiledModule::valid_strategy(20)) {
-        DuplicationChecker::verify_module(&module).expect("DuplicationChecker failure");
-        SignatureChecker::verify_module(&module).expect("SignatureChecker failure");
-        InstructionConsistency::verify_module(&module).expect("InstructionConsistency failure");
-        constants::verify_module(&module).expect("constants failure");
-        ability_field_requirements::verify_module(&module).expect("ability_field_requirements failure");
-        RecursiveDataDefChecker::verify_module(&module).expect("RecursiveDataDefChecker failure");
-        InstantiationLoopChecker::verify_module(&module).expect("InstantiationLoopChecker failure");
+        let module = &module;
+        let ability_cache = &mut AbilityCache::new(module);
+        DuplicationChecker::verify_module(module).expect("DuplicationChecker failure");
+        SignatureChecker::verify_module(module, ability_cache, &mut DummyMeter).expect("SignatureChecker failure");
+        InstructionConsistency::verify_module(module).expect("InstructionConsistency failure");
+        constants::verify_module(module).expect("constants failure");
+        ability_field_requirements::verify_module(module, ability_cache, &mut DummyMeter).expect("ability_field_requirements failure");
+        RecursiveDataDefChecker::verify_module(module).expect("RecursiveDataDefChecker failure");
+        InstantiationLoopChecker::verify_module(module).expect("InstantiationLoopChecker failure");
     }
 
     #[test]
     fn valid_signatures(module in CompiledModule::valid_strategy(20)) {
-        prop_assert!(SignatureChecker::verify_module(&module).is_ok())
+        let module = &module;
+        let ability_cache = &mut AbilityCache::new(module);
+        prop_assert!(SignatureChecker::verify_module(module, ability_cache, &mut DummyMeter).is_ok())
     }
 
     #[test]
@@ -123,7 +131,9 @@ proptest! {
         let context = SignatureRefMutation::new(&mut module, mutations);
         let expected_violations = context.apply();
 
-        let result = SignatureChecker::verify_module(&module);
+        let module = &module;
+        let ability_cache = &mut AbilityCache::new(module);
+        let result = SignatureChecker::verify_module(module, ability_cache, &mut DummyMeter);
 
         prop_assert_eq!(expected_violations, result.is_err());
     }
@@ -136,7 +146,9 @@ proptest! {
         let context = FieldRefMutation::new(&mut module, mutations);
         let expected_violations = context.apply();
 
-        let result = SignatureChecker::verify_module(&module);
+        let module = &module;
+        let ability_cache = &mut AbilityCache::new(module);
+        let result = SignatureChecker::verify_module(module, ability_cache, &mut DummyMeter);
 
         prop_assert_eq!(expected_violations, result.is_err());
     }
diff --git a/external-crates/move/crates/bytecode-verifier-tests/src/unit_tests/code_unit_tests.rs b/external-crates/move/crates/bytecode-verifier-tests/src/unit_tests/code_unit_tests.rs
index befa382686d74..9993b6d0c4027 100644
--- a/external-crates/move/crates/bytecode-verifier-tests/src/unit_tests/code_unit_tests.rs
+++ b/external-crates/move/crates/bytecode-verifier-tests/src/unit_tests/code_unit_tests.rs
@@ -4,15 +4,22 @@
 
 use crate::support::dummy_procedure_module;
 use move_binary_format::file_format::Bytecode;
-use move_bytecode_verifier::CodeUnitVerifier;
+use move_bytecode_verifier::ability_cache::AbilityCache;
+use move_bytecode_verifier::code_unit_verifier;
 use move_bytecode_verifier_meter::dummy::DummyMeter;
 use move_core_types::vm_status::StatusCode;
 use move_vm_config::verifier::VerifierConfig;
 
 #[test]
 fn invalid_fallthrough_br_true() {
-    let module = dummy_procedure_module(vec![Bytecode::LdFalse, Bytecode::BrTrue(1)]);
-    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    let module = &dummy_procedure_module(vec![Bytecode::LdFalse, Bytecode::BrTrue(1)]);
+    let ability_cache = &mut AbilityCache::new(module);
+    let result = code_unit_verifier::verify_module(
+        &Default::default(),
+        module,
+        ability_cache,
+        &mut DummyMeter,
+    );
     assert_eq!(
         result.unwrap_err().major_status(),
         StatusCode::INVALID_FALL_THROUGH
@@ -21,8 +28,14 @@ fn invalid_fallthrough_br_true() {
 
 #[test]
 fn invalid_fallthrough_br_false() {
-    let module = dummy_procedure_module(vec![Bytecode::LdTrue, Bytecode::BrFalse(1)]);
-    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    let module = &dummy_procedure_module(vec![Bytecode::LdTrue, Bytecode::BrFalse(1)]);
+    let ability_cache = &mut AbilityCache::new(module);
+    let result = code_unit_verifier::verify_module(
+        &Default::default(),
+        module,
+        ability_cache,
+        &mut DummyMeter,
+    );
     assert_eq!(
         result.unwrap_err().major_status(),
         StatusCode::INVALID_FALL_THROUGH
@@ -32,8 +45,14 @@ fn invalid_fallthrough_br_false() {
 // all non-branch instructions should trigger invalid fallthrough; just check one of them
 #[test]
 fn invalid_fallthrough_non_branch() {
-    let module = dummy_procedure_module(vec![Bytecode::LdTrue, Bytecode::Pop]);
-    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    let module = &dummy_procedure_module(vec![Bytecode::LdTrue, Bytecode::Pop]);
+    let ability_cache = &mut AbilityCache::new(module);
+    let result = code_unit_verifier::verify_module(
+        &Default::default(),
+        module,
+        ability_cache,
+        &mut DummyMeter,
+    );
     assert_eq!(
         result.unwrap_err().major_status(),
         StatusCode::INVALID_FALL_THROUGH
@@ -42,22 +61,40 @@ fn invalid_fallthrough_non_branch() {
 
 #[test]
 fn valid_fallthrough_branch() {
-    let module = dummy_procedure_module(vec![Bytecode::Branch(0)]);
-    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    let module = &dummy_procedure_module(vec![Bytecode::Branch(0)]);
+    let ability_cache = &mut AbilityCache::new(module);
+    let result = code_unit_verifier::verify_module(
+        &Default::default(),
+        module,
+        ability_cache,
+        &mut DummyMeter,
+    );
     assert!(result.is_ok());
 }
 
 #[test]
 fn valid_fallthrough_ret() {
-    let module = dummy_procedure_module(vec![Bytecode::Ret]);
-    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    let module = &dummy_procedure_module(vec![Bytecode::Ret]);
+    let ability_cache = &mut AbilityCache::new(module);
+    let result = code_unit_verifier::verify_module(
+        &Default::default(),
+        module,
+        ability_cache,
+        &mut DummyMeter,
+    );
     assert!(result.is_ok());
 }
 
 #[test]
 fn valid_fallthrough_abort() {
-    let module = dummy_procedure_module(vec![Bytecode::LdU64(7), Bytecode::Abort]);
-    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    let module = &dummy_procedure_module(vec![Bytecode::LdU64(7), Bytecode::Abort]);
+    let ability_cache = &mut AbilityCache::new(module);
+    let result = code_unit_verifier::verify_module(
+        &Default::default(),
+        module,
+        ability_cache,
+        &mut DummyMeter,
+    );
     assert!(result.is_ok());
 }
 
@@ -68,10 +105,15 @@ fn test_max_number_of_bytecode() {
         nops.push(Bytecode::Nop);
     }
     nops.push(Bytecode::Ret);
-    let module = dummy_procedure_module(nops);
+    let module = &dummy_procedure_module(nops);
+    let ability_cache = &mut AbilityCache::new(module);
 
-    let result =
-        CodeUnitVerifier::verify_module(&VerifierConfig::default(), &module, &mut DummyMeter);
+    let result = code_unit_verifier::verify_module(
+        &VerifierConfig::default(),
+        module,
+        ability_cache,
+        &mut DummyMeter,
+    );
     assert!(result.is_ok());
 }
 
@@ -81,14 +123,16 @@ fn test_max_basic_blocks() {
         .map(|idx| Bytecode::Branch(idx + 1))
         .collect::<Vec<_>>();
     code.push(Bytecode::Ret);
-    let module = dummy_procedure_module(code);
+    let module = &dummy_procedure_module(code);
+    let ability_cache = &mut AbilityCache::new(module);
 
-    let result = CodeUnitVerifier::verify_module(
+    let result = code_unit_verifier::verify_module(
         &VerifierConfig {
             max_basic_blocks: Some(16),
             ..Default::default()
         },
-        &module,
+        module,
+        ability_cache,
         &mut DummyMeter,
     );
     assert_eq!(
diff --git a/external-crates/move/crates/bytecode-verifier-tests/src/unit_tests/mod.rs b/external-crates/move/crates/bytecode-verifier-tests/src/unit_tests/mod.rs
index 17676ad1fe557..c3a6a22b7e08b 100644
--- a/external-crates/move/crates/bytecode-verifier-tests/src/unit_tests/mod.rs
+++ b/external-crates/move/crates/bytecode-verifier-tests/src/unit_tests/mod.rs
@@ -53,6 +53,6 @@ pub(crate) fn production_config() -> (VerifierConfig, MeterConfig) {
             bytecode_version: VERSION_MAX,
             max_variants_in_enum: Some(DEFAULT_MAX_VARIANTS),
         },
-        MeterConfig::default(),
+        MeterConfig::old_default(),
     )
 }
diff --git a/external-crates/move/crates/bytecode-verifier-tests/src/unit_tests/negative_stack_size_tests.rs b/external-crates/move/crates/bytecode-verifier-tests/src/unit_tests/negative_stack_size_tests.rs
index 9f9eb9327e916..1b160ce6be167 100644
--- a/external-crates/move/crates/bytecode-verifier-tests/src/unit_tests/negative_stack_size_tests.rs
+++ b/external-crates/move/crates/bytecode-verifier-tests/src/unit_tests/negative_stack_size_tests.rs
@@ -4,14 +4,21 @@
 
 use crate::support::dummy_procedure_module;
 use move_binary_format::file_format::Bytecode;
-use move_bytecode_verifier::CodeUnitVerifier;
+use move_bytecode_verifier::ability_cache::AbilityCache;
+use move_bytecode_verifier::code_unit_verifier;
 use move_bytecode_verifier_meter::dummy::DummyMeter;
 use move_core_types::vm_status::StatusCode;
 
 #[test]
 fn one_pop_no_push() {
-    let module = dummy_procedure_module(vec![Bytecode::Pop, Bytecode::Ret]);
-    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    let module = &dummy_procedure_module(vec![Bytecode::Pop, Bytecode::Ret]);
+    let ability_cache = &mut AbilityCache::new(module);
+    let result = code_unit_verifier::verify_module(
+        &Default::default(),
+        module,
+        ability_cache,
+        &mut DummyMeter,
+    );
     assert_eq!(
         result.unwrap_err().major_status(),
         StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK
@@ -21,8 +28,14 @@ fn one_pop_no_push() {
 #[test]
 fn one_pop_one_push() {
     // Height: 0 + (-1 + 1) = 0 would have passed original usage verifier
-    let module = dummy_procedure_module(vec![Bytecode::ReadRef, Bytecode::Ret]);
-    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    let module = &dummy_procedure_module(vec![Bytecode::ReadRef, Bytecode::Ret]);
+    let ability_cache = &mut AbilityCache::new(module);
+    let result = code_unit_verifier::verify_module(
+        &Default::default(),
+        module,
+        ability_cache,
+        &mut DummyMeter,
+    );
     assert_eq!(
         result.unwrap_err().major_status(),
         StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK
@@ -32,8 +45,14 @@ fn one_pop_one_push() {
 #[test]
 fn two_pop_one_push() {
     // Height: 0 + 1 + (-2 + 1) = 0 would have passed original usage verifier
-    let module = dummy_procedure_module(vec![Bytecode::LdU64(0), Bytecode::Add, Bytecode::Ret]);
-    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    let module = &dummy_procedure_module(vec![Bytecode::LdU64(0), Bytecode::Add, Bytecode::Ret]);
+    let ability_cache = &mut AbilityCache::new(module);
+    let result = code_unit_verifier::verify_module(
+        &Default::default(),
+        module,
+        ability_cache,
+        &mut DummyMeter,
+    );
     assert_eq!(
         result.unwrap_err().major_status(),
         StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK
@@ -42,8 +61,14 @@ fn two_pop_one_push() {
 
 #[test]
 fn two_pop_no_push() {
-    let module = dummy_procedure_module(vec![Bytecode::WriteRef, Bytecode::Ret]);
-    let result = CodeUnitVerifier::verify_module(&Default::default(), &module, &mut DummyMeter);
+    let module = &dummy_procedure_module(vec![Bytecode::WriteRef, Bytecode::Ret]);
+    let ability_cache = &mut AbilityCache::new(module);
+    let result = code_unit_verifier::verify_module(
+        &Default::default(),
+        module,
+        ability_cache,
+        &mut DummyMeter,
+    );
     assert_eq!(
         result.unwrap_err().major_status(),
         StatusCode::NEGATIVE_STACK_SIZE_WITHIN_BLOCK
diff --git a/external-crates/move/crates/bytecode-verifier-tests/src/unit_tests/signature_tests.rs b/external-crates/move/crates/bytecode-verifier-tests/src/unit_tests/signature_tests.rs
index ad7b496b0a23f..b59ef9aa05152 100644
--- a/external-crates/move/crates/bytecode-verifier-tests/src/unit_tests/signature_tests.rs
+++ b/external-crates/move/crates/bytecode-verifier-tests/src/unit_tests/signature_tests.rs
@@ -7,7 +7,8 @@ use move_binary_format::file_format::{
     Bytecode::*, CompiledModule, SignatureToken::*, Visibility::Public, *,
 };
 use move_bytecode_verifier::{
-    verify_module_unmetered, verify_module_with_config_for_test, SignatureChecker,
+    ability_cache::AbilityCache, verify_module_unmetered, verify_module_with_config_for_test,
+    SignatureChecker,
 };
 use move_bytecode_verifier_meter::dummy::DummyMeter;
 use move_core_types::{
@@ -20,7 +21,8 @@ fn test_reference_of_reference() {
     m.signatures[0] = Signature(vec![Reference(Box::new(Reference(Box::new(
         SignatureToken::Bool,
     ))))]);
-    let errors = SignatureChecker::verify_module(&m);
+    let ability_cache = &mut AbilityCache::new(&m);
+    let errors = SignatureChecker::verify_module(&m, ability_cache, &mut DummyMeter);
     assert!(errors.is_err());
 }
 
diff --git a/external-crates/move/crates/move-abstract-interpreter/src/absint.rs b/external-crates/move/crates/move-abstract-interpreter/src/absint.rs
index 5742c01504cf0..d8dc34a0a5fd2 100644
--- a/external-crates/move/crates/move-abstract-interpreter/src/absint.rs
+++ b/external-crates/move/crates/move-abstract-interpreter/src/absint.rs
@@ -202,23 +202,23 @@ impl<'a> FunctionContext<'a> {
         self.index
     }
 
-    pub fn code(&self) -> &CodeUnit {
+    pub fn code(&self) -> &'a CodeUnit {
         self.code
     }
 
-    pub fn parameters(&self) -> &Signature {
+    pub fn parameters(&self) -> &'a Signature {
         self.parameters
     }
 
-    pub fn return_(&self) -> &Signature {
+    pub fn return_(&self) -> &'a Signature {
         self.return_
     }
 
-    pub fn locals(&self) -> &Signature {
+    pub fn locals(&self) -> &'a Signature {
         self.locals
     }
 
-    pub fn type_parameters(&self) -> &[AbilitySet] {
+    pub fn type_parameters(&self) -> &'a [AbilitySet] {
         self.type_parameters
     }
 
diff --git a/external-crates/move/crates/move-analyzer/Cargo.toml b/external-crates/move/crates/move-analyzer/Cargo.toml
index a70912daea5d7..b1be5edc5fae5 100644
--- a/external-crates/move/crates/move-analyzer/Cargo.toml
+++ b/external-crates/move/crates/move-analyzer/Cargo.toml
@@ -25,6 +25,7 @@ move-compiler.workspace = true
 move-ir-types.workspace = true
 move-package.workspace = true
 move-symbol-pool.workspace = true
+once_cell.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 sha2.workspace = true
diff --git a/external-crates/move/crates/move-analyzer/editors/code/README.md b/external-crates/move/crates/move-analyzer/editors/code/README.md
index 7810592db0adb..5dda3d5d18686 100644
--- a/external-crates/move/crates/move-analyzer/editors/code/README.md
+++ b/external-crates/move/crates/move-analyzer/editors/code/README.md
@@ -83,6 +83,7 @@ Move source file (a file with a `.move` file extension) and:
   `>`, `)`, or `}` -- will be highlighted.
 - As you type, the editor will offer completion suggestions, in particular:
   - struct field name and method name suggestions following `.` being typed
+  - suggestions following `::` being typed
   - code snippets to complete `init` function and object type definitions
 - If the opened Move source file is located within a buildable project (a `Move.toml` file can be
   found in one of its parent directories), the following advanced features will also be available:
diff --git a/external-crates/move/crates/move-analyzer/editors/code/language-configuration.json b/external-crates/move/crates/move-analyzer/editors/code/language-configuration.json
index bb8418a84785d..5b20cd79bc16d 100644
--- a/external-crates/move/crates/move-analyzer/editors/code/language-configuration.json
+++ b/external-crates/move/crates/move-analyzer/editors/code/language-configuration.json
@@ -12,11 +12,10 @@
         { "open": "\"", "close": "\"", "notIn": ["string", "comment"] },
         { "open": "/*", "close": "*/", "notIn": ["string"] }
     ],
-    "brackets": [
+    "brackets":
         ["{", "}"],
         ["[", "]"],
-        ["(", ")"],
-        ["<", ">"],
+        ["(", ")"]
     ],
     "comments": {
         "lineComment": "//",
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 1e990b17166cc..ebb58e03531da 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.8",
+  "version": "1.0.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "move",
-      "version": "1.0.8",
+      "version": "1.0.10",
       "license": "Apache-2.0",
       "dependencies": {
         "command-exists": "^1.2.9",
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 69839e35c5720..4a3be17e8b51c 100644
--- a/external-crates/move/crates/move-analyzer/editors/code/package.json
+++ b/external-crates/move/crates/move-analyzer/editors/code/package.json
@@ -5,7 +5,7 @@
   "publisher": "mysten",
   "icon": "images/move.png",
   "license": "Apache-2.0",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "preview": true,
   "repository": {
     "url": "https://github.com/MystenLabs/sui.git",
diff --git a/external-crates/move/crates/move-analyzer/src/analysis/mod.rs b/external-crates/move/crates/move-analyzer/src/analysis/mod.rs
index d1e3391e262e1..6f2a94305dea9 100644
--- a/external-crates/move/crates/move-analyzer/src/analysis/mod.rs
+++ b/external-crates/move/crates/move-analyzer/src/analysis/mod.rs
@@ -1,4 +1,5 @@
 // Copyright (c) The Move Contributors
 // SPDX-License-Identifier: Apache-2.0
 
+pub mod parsing_analysis;
 pub mod typing_analysis;
diff --git a/external-crates/move/crates/move-analyzer/src/analysis/parsing_analysis.rs b/external-crates/move/crates/move-analyzer/src/analysis/parsing_analysis.rs
new file mode 100644
index 0000000000000..710a007dd9d24
--- /dev/null
+++ b/external-crates/move/crates/move-analyzer/src/analysis/parsing_analysis.rs
@@ -0,0 +1,848 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use crate::{
+    symbols::{
+        add_member_use_def, ignored_function, CallInfo, CursorContext, CursorDefinition,
+        CursorPosition, DefMap, ModuleDefs, References, UseDef, UseDefMap,
+    },
+    utils::loc_start_to_lsp_position_opt,
+};
+
+use lsp_types::Position;
+
+use std::collections::BTreeMap;
+
+use move_compiler::{
+    expansion::ast as E,
+    parser::ast as P,
+    shared::{files::MappedFiles, Identifier, Name, NamedAddressMap, NamedAddressMaps},
+};
+use move_ir_types::location::*;
+
+pub struct ParsingAnalysisContext<'a> {
+    /// Outermost definitions in a module (structs, consts, functions), keyd on a ModuleIdent
+    /// string so that we can access it regardless of the ModuleIdent representation
+    /// (e.g., in the parsing AST or in the typing AST)
+    pub mod_outer_defs: &'a mut BTreeMap<String, ModuleDefs>,
+    /// Mapped file information for translating locations into positions
+    pub files: &'a MappedFiles,
+    /// Associates uses for a given definition to allow displaying all references
+    pub references: &'a mut References,
+    /// Additional information about definitions
+    pub def_info: &'a mut DefMap,
+    /// A UseDefMap for a given module (needs to be appropriately set before the module
+    /// processing starts)
+    pub use_defs: UseDefMap,
+    /// Current module identifier string (needs to be appropriately set before the module
+    /// processing starts)
+    pub current_mod_ident_str: Option<String>,
+    /// Module name lengths in access paths for a given module (needs to be appropriately
+    /// set before the module processing starts)
+    pub alias_lengths: BTreeMap<Position, usize>,
+    /// A per-package mapping from package names to their addresses (needs to be appropriately set
+    /// before the package processint starts)
+    pub pkg_addresses: &'a NamedAddressMap,
+    /// Cursor contextual information, computed as part of the traversal.
+    pub cursor: Option<&'a mut CursorContext>,
+}
+
+macro_rules! update_cursor {
+    ($cursor:expr, $subject:expr, $kind:ident) => {
+        if let Some(cursor) = &mut $cursor {
+            if $subject.loc.contains(&cursor.loc) {
+                cursor.position = CursorPosition::$kind($subject.clone());
+            }
+        };
+    };
+    (IDENT, $cursor:expr, $subject:expr, $kind:ident) => {
+        if let Some(cursor) = &mut $cursor {
+            if $subject.loc().contains(&cursor.loc) {
+                cursor.position = CursorPosition::$kind($subject.clone());
+            }
+        };
+    };
+}
+
+impl<'a> ParsingAnalysisContext<'a> {
+    /// Get symbols for the whole program
+    pub fn prog_symbols(
+        &mut self,
+        prog: &'a P::Program,
+        mod_use_defs: &mut BTreeMap<String, UseDefMap>,
+        mod_to_alias_lengths: &mut BTreeMap<String, BTreeMap<Position, usize>>,
+    ) {
+        prog.source_definitions.iter().for_each(|pkg_def| {
+            self.pkg_symbols(
+                &prog.named_address_maps,
+                pkg_def,
+                mod_use_defs,
+                mod_to_alias_lengths,
+            )
+        });
+        prog.lib_definitions.iter().for_each(|pkg_def| {
+            self.pkg_symbols(
+                &prog.named_address_maps,
+                pkg_def,
+                mod_use_defs,
+                mod_to_alias_lengths,
+            )
+        });
+    }
+
+    /// Get symbols for the whole package
+    fn pkg_symbols(
+        &mut self,
+        pkg_address_maps: &'a NamedAddressMaps,
+        pkg_def: &P::PackageDefinition,
+        mod_use_defs: &mut BTreeMap<String, UseDefMap>,
+        mod_to_alias_lengths: &mut BTreeMap<String, BTreeMap<Position, usize>>,
+    ) {
+        if let P::Definition::Module(mod_def) = &pkg_def.def {
+            let pkg_addresses = pkg_address_maps.get(pkg_def.named_address_map);
+            let old_addresses = std::mem::replace(&mut self.pkg_addresses, pkg_addresses);
+            self.mod_symbols(mod_def, mod_use_defs, mod_to_alias_lengths);
+            self.current_mod_ident_str = None;
+            let _ = std::mem::replace(&mut self.pkg_addresses, old_addresses);
+        }
+    }
+
+    fn attr_symbols(&mut self, sp!(_, attr): P::Attribute) {
+        use P::Attribute_ as A;
+        match attr {
+            A::Name(_) => (),
+            A::Assigned(_, v) => {
+                update_cursor!(self.cursor, *v, Attribute);
+            }
+            A::Parameterized(_, sp!(_, attributes)) => {
+                attributes.iter().for_each(|a| self.attr_symbols(a.clone()))
+            }
+        }
+    }
+
+    /// Get symbols for the whole module
+    fn mod_symbols(
+        &mut self,
+        mod_def: &P::ModuleDefinition,
+        mod_use_defs: &mut BTreeMap<String, UseDefMap>,
+        mod_to_alias_lengths: &mut BTreeMap<String, BTreeMap<Position, usize>>,
+    ) {
+        // parsing symbolicator is currently only responsible for processing use declarations
+        let Some(mod_ident_str) = parsing_mod_def_to_map_key(self.pkg_addresses, mod_def) else {
+            return;
+        };
+        assert!(self.current_mod_ident_str.is_none());
+        self.current_mod_ident_str = Some(mod_ident_str.clone());
+
+        let use_defs = mod_use_defs.remove(&mod_ident_str).unwrap();
+        let old_defs = std::mem::replace(&mut self.use_defs, use_defs);
+        let alias_lengths: BTreeMap<Position, usize> = BTreeMap::new();
+        let old_alias_lengths = std::mem::replace(&mut self.alias_lengths, alias_lengths);
+
+        mod_def
+            .attributes
+            .iter()
+            .for_each(|sp!(_, attrs)| attrs.iter().for_each(|a| self.attr_symbols(a.clone())));
+
+        for m in &mod_def.members {
+            use P::ModuleMember as MM;
+            match m {
+                MM::Function(fun) => {
+                    if ignored_function(fun.name.value()) {
+                        continue;
+                    }
+
+                    // Unit returns span the entire function signature, so we process them first
+                    // for cursor ordering.
+                    self.type_symbols(&fun.signature.return_type);
+
+                    // If the cursor is in this item, mark that down.
+                    // This may be overridden by the recursion below.
+                    if let Some(cursor) = &mut self.cursor {
+                        if fun.name.loc().contains(&cursor.loc) {
+                            cursor.position = CursorPosition::DefName;
+                            debug_assert!(cursor.defn_name.is_none());
+                            cursor.defn_name = Some(CursorDefinition::Function(fun.name));
+                        } else if fun.loc.contains(&cursor.loc) {
+                            cursor.defn_name = Some(CursorDefinition::Function(fun.name));
+                        }
+                    };
+
+                    fun.attributes.iter().for_each(|sp!(_, attrs)| {
+                        attrs.iter().for_each(|a| self.attr_symbols(a.clone()))
+                    });
+
+                    for (_, x, t) in fun.signature.parameters.iter() {
+                        update_cursor!(IDENT, self.cursor, x, Parameter);
+                        self.type_symbols(t)
+                    }
+
+                    if fun.macro_.is_some() {
+                        // we currently do not process macro function bodies
+                        // in the parsing symbolicator (and do very limited
+                        // processing in typing symbolicator)
+                        continue;
+                    }
+                    if let P::FunctionBody_::Defined(seq) = &fun.body.value {
+                        self.seq_symbols(seq);
+                    };
+                }
+                MM::Struct(sdef) => {
+                    // If the cursor is in this item, mark that down.
+                    // This may be overridden by the recursion below.
+                    if let Some(cursor) = &mut self.cursor {
+                        if sdef.name.loc().contains(&cursor.loc) {
+                            cursor.position = CursorPosition::DefName;
+                            debug_assert!(cursor.defn_name.is_none());
+                            cursor.defn_name = Some(CursorDefinition::Struct(sdef.name));
+                        } else if sdef.loc.contains(&cursor.loc) {
+                            cursor.defn_name = Some(CursorDefinition::Struct(sdef.name));
+                        }
+                    };
+
+                    sdef.attributes.iter().for_each(|sp!(_, attrs)| {
+                        attrs.iter().for_each(|a| self.attr_symbols(a.clone()))
+                    });
+
+                    match &sdef.fields {
+                        P::StructFields::Named(v) => v.iter().for_each(|(x, t)| {
+                            self.field_defn(x);
+                            self.type_symbols(t)
+                        }),
+                        P::StructFields::Positional(v) => {
+                            v.iter().for_each(|t| self.type_symbols(t))
+                        }
+                        P::StructFields::Native(_) => (),
+                    }
+                }
+                MM::Enum(edef) => {
+                    // If the cursor is in this item, mark that down.
+                    // This may be overridden by the recursion below.
+                    if let Some(cursor) = &mut self.cursor {
+                        if edef.name.loc().contains(&cursor.loc) {
+                            cursor.position = CursorPosition::DefName;
+                            debug_assert!(cursor.defn_name.is_none());
+                            cursor.defn_name = Some(CursorDefinition::Enum(edef.name));
+                        } else if edef.loc.contains(&cursor.loc) {
+                            cursor.defn_name = Some(CursorDefinition::Enum(edef.name));
+                        }
+                    };
+
+                    edef.attributes.iter().for_each(|sp!(_, attrs)| {
+                        attrs.iter().for_each(|a| self.attr_symbols(a.clone()))
+                    });
+
+                    let P::EnumDefinition { variants, .. } = edef;
+                    for variant in variants {
+                        let P::VariantDefinition { fields, .. } = variant;
+                        match fields {
+                            P::VariantFields::Named(v) => v.iter().for_each(|(x, t)| {
+                                self.field_defn(x);
+                                self.type_symbols(t)
+                            }),
+                            P::VariantFields::Positional(v) => {
+                                v.iter().for_each(|t| self.type_symbols(t))
+                            }
+                            P::VariantFields::Empty => (),
+                        }
+                    }
+                }
+                MM::Use(use_decl) => self.use_decl_symbols(use_decl),
+                MM::Friend(fdecl) => self.chain_symbols(&fdecl.friend),
+                MM::Constant(c) => {
+                    // If the cursor is in this item, mark that down.
+                    // This may be overridden by the recursion below.
+                    if let Some(cursor) = &mut self.cursor {
+                        if c.name.loc().contains(&cursor.loc) {
+                            cursor.position = CursorPosition::DefName;
+                            debug_assert!(cursor.defn_name.is_none());
+                            cursor.defn_name = Some(CursorDefinition::Constant(c.name));
+                        } else if c.loc.contains(&cursor.loc) {
+                            cursor.defn_name = Some(CursorDefinition::Constant(c.name));
+                        }
+                    };
+
+                    c.attributes.iter().for_each(|sp!(_, attrs)| {
+                        attrs.iter().for_each(|a| self.attr_symbols(a.clone()))
+                    });
+
+                    self.type_symbols(&c.signature);
+                    self.exp_symbols(&c.value);
+                }
+                MM::Spec(_) => (),
+            }
+        }
+        self.current_mod_ident_str = None;
+        let processed_defs = std::mem::replace(&mut self.use_defs, old_defs);
+        mod_use_defs.insert(mod_ident_str.clone(), processed_defs);
+        let processed_alias_lengths = std::mem::replace(&mut self.alias_lengths, old_alias_lengths);
+        mod_to_alias_lengths.insert(mod_ident_str, processed_alias_lengths);
+    }
+
+    /// Get symbols for a sequence item
+    fn seq_item_symbols(&mut self, seq_item: &P::SequenceItem) {
+        use P::SequenceItem_ as I;
+
+        // If the cursor is in this item, mark that down.
+        // This may be overridden by the recursion below.
+        update_cursor!(self.cursor, seq_item, SeqItem);
+
+        match &seq_item.value {
+            I::Seq(e) => self.exp_symbols(e),
+            I::Declare(v, to) => {
+                v.value
+                    .iter()
+                    .for_each(|bind| self.bind_symbols(bind, to.is_some()));
+                if let Some(t) = to {
+                    self.type_symbols(t);
+                }
+            }
+            I::Bind(v, to, e) => {
+                v.value
+                    .iter()
+                    .for_each(|bind| self.bind_symbols(bind, to.is_some()));
+                if let Some(t) = to {
+                    self.type_symbols(t);
+                }
+                self.exp_symbols(e);
+            }
+        }
+    }
+
+    fn path_entry_symbols(&mut self, path: &P::PathEntry) {
+        let P::PathEntry {
+            name: _,
+            tyargs,
+            is_macro: _,
+        } = path;
+        if let Some(sp!(_, tyargs)) = tyargs {
+            tyargs.iter().for_each(|t| self.type_symbols(t));
+        }
+    }
+
+    fn root_path_entry_symbols(&mut self, path: &P::RootPathEntry) {
+        let P::RootPathEntry {
+            name: _,
+            tyargs,
+            is_macro: _,
+        } = path;
+        if let Some(sp!(_, tyargs)) = tyargs {
+            tyargs.iter().for_each(|t| self.type_symbols(t));
+        }
+    }
+
+    /// Get symbols for an expression
+    fn exp_symbols(&mut self, exp: &P::Exp) {
+        use P::Exp_ as E;
+        fn last_chain_symbol_loc(sp!(_, chain): &P::NameAccessChain) -> Loc {
+            use P::NameAccessChain_ as NA;
+            match chain {
+                NA::Single(entry) => entry.name.loc,
+                NA::Path(path) => {
+                    if path.entries.is_empty() {
+                        path.root.name.loc
+                    } else {
+                        path.entries.last().unwrap().name.loc
+                    }
+                }
+            }
+        }
+
+        // If the cursor is in this item, mark that down.
+        // This may be overridden by the recursion below.
+        update_cursor!(self.cursor, exp, Exp);
+
+        match &exp.value {
+            E::Move(_, e) => self.exp_symbols(e),
+            E::Copy(_, e) => self.exp_symbols(e),
+            E::Name(chain) => self.chain_symbols(chain),
+            E::Call(chain, v) => {
+                self.chain_symbols(chain);
+                v.value.iter().for_each(|e| self.exp_symbols(e));
+                assert!(self.current_mod_ident_str.is_some());
+                if let Some(mod_defs) = self
+                    .mod_outer_defs
+                    .get_mut(&self.current_mod_ident_str.clone().unwrap())
+                {
+                    mod_defs.call_infos.insert(
+                        last_chain_symbol_loc(chain),
+                        CallInfo::new(/* do_call */ false, &v.value),
+                    );
+                };
+            }
+            E::Pack(chain, v) => {
+                self.chain_symbols(chain);
+                v.iter().for_each(|(_, e)| self.exp_symbols(e));
+            }
+            E::Vector(_, vo, v) => {
+                if let Some(v) = vo {
+                    v.iter().for_each(|t| self.type_symbols(t));
+                }
+                v.value.iter().for_each(|e| self.exp_symbols(e));
+            }
+            E::IfElse(e1, e2, oe) => {
+                self.exp_symbols(e1);
+                self.exp_symbols(e2);
+                if let Some(e) = oe.as_ref() {
+                    self.exp_symbols(e)
+                }
+            }
+            E::Match(e, sp!(_, v)) => {
+                self.exp_symbols(e);
+                v.iter().for_each(|sp!(_, arm)| {
+                    self.match_pattern_symbols(&arm.pattern);
+                    if let Some(g) = &arm.guard {
+                        self.exp_symbols(g);
+                    }
+                    self.exp_symbols(&arm.rhs);
+                })
+            }
+            E::While(e1, e2) => {
+                self.exp_symbols(e1);
+                self.exp_symbols(e2);
+            }
+            E::Loop(e) => self.exp_symbols(e),
+            E::Labeled(_, e) => self.exp_symbols(e),
+            E::Block(seq) => self.seq_symbols(seq),
+            E::Lambda(sp!(_, bindings), to, e) => {
+                for (sp!(_, v), bto) in bindings {
+                    if let Some(bt) = bto {
+                        self.type_symbols(bt);
+                    }
+                    v.iter()
+                        .for_each(|bind| self.bind_symbols(bind, to.is_some()));
+                }
+                if let Some(t) = to {
+                    self.type_symbols(t);
+                }
+                self.exp_symbols(e);
+            }
+            E::ExpList(l) => l.iter().for_each(|e| self.exp_symbols(e)),
+            E::Parens(e) => self.exp_symbols(e),
+            E::Assign(e1, e2) => {
+                self.exp_symbols(e1);
+                self.exp_symbols(e2);
+            }
+            E::Abort(e) => self.exp_symbols(e),
+            E::Return(_, oe) => {
+                if let Some(e) = oe.as_ref() {
+                    self.exp_symbols(e)
+                }
+            }
+            E::Break(_, oe) => {
+                if let Some(e) = oe.as_ref() {
+                    self.exp_symbols(e)
+                }
+            }
+            E::Dereference(e) => self.exp_symbols(e),
+            E::UnaryExp(_, e) => self.exp_symbols(e),
+            E::BinopExp(e1, _, e2) => {
+                self.exp_symbols(e1);
+                self.exp_symbols(e2);
+            }
+            E::Borrow(_, e) => self.exp_symbols(e),
+            E::Dot(e, _) => self.exp_symbols(e),
+            E::DotCall(e, name, _, vo, v) => {
+                self.exp_symbols(e);
+                if let Some(v) = vo {
+                    v.iter().for_each(|t| self.type_symbols(t));
+                }
+                v.value.iter().for_each(|e| self.exp_symbols(e));
+                assert!(self.current_mod_ident_str.is_some());
+                if let Some(mod_defs) = self
+                    .mod_outer_defs
+                    .get_mut(&self.current_mod_ident_str.clone().unwrap())
+                {
+                    mod_defs
+                        .call_infos
+                        .insert(name.loc, CallInfo::new(/* do_call */ true, &v.value));
+                };
+            }
+            E::Index(e, v) => {
+                self.exp_symbols(e);
+                v.value.iter().for_each(|e| self.exp_symbols(e));
+            }
+            E::Cast(e, t) => {
+                self.exp_symbols(e);
+                self.type_symbols(t);
+            }
+            E::Annotate(e, t) => {
+                self.exp_symbols(e);
+                self.type_symbols(t);
+            }
+            E::DotUnresolved(_, e) => self.exp_symbols(e),
+            E::Value(_)
+            | E::Quant(..)
+            | E::Unit
+            | E::Continue(_)
+            | E::Spec(_)
+            | E::UnresolvedError => (),
+        }
+    }
+
+    fn match_pattern_symbols(&mut self, sp!(_, pattern): &P::MatchPattern) {
+        use P::MatchPattern_ as MP;
+        match pattern {
+            MP::PositionalConstructor(chain, sp!(_, v)) => {
+                self.chain_symbols(chain);
+                v.iter().for_each(|e| {
+                    if let P::Ellipsis::Binder(m) = e {
+                        self.match_pattern_symbols(m);
+                    }
+                })
+            }
+            MP::FieldConstructor(chain, sp!(_, v)) => {
+                self.chain_symbols(chain);
+                v.iter().for_each(|e| {
+                    if let P::Ellipsis::Binder((_, m)) = e {
+                        self.match_pattern_symbols(m);
+                    }
+                })
+            }
+            MP::Name(_, chain) => {
+                self.chain_symbols(chain);
+                assert!(self.current_mod_ident_str.is_some());
+                if let Some(mod_defs) = self
+                    .mod_outer_defs
+                    .get_mut(&self.current_mod_ident_str.clone().unwrap())
+                {
+                    mod_defs.untyped_defs.insert(chain.loc);
+                };
+            }
+            MP::Or(m1, m2) => {
+                self.match_pattern_symbols(m2);
+                self.match_pattern_symbols(m1);
+            }
+            MP::At(_, m) => self.match_pattern_symbols(m),
+            MP::Literal(_) => (),
+        }
+    }
+
+    /// Get symbols for a sequence
+    fn seq_symbols(&mut self, (use_decls, seq_items, _, oe): &P::Sequence) {
+        use_decls
+            .iter()
+            .for_each(|use_decl| self.use_decl_symbols(use_decl));
+
+        seq_items
+            .iter()
+            .for_each(|seq_item| self.seq_item_symbols(seq_item));
+        if let Some(e) = oe.as_ref().as_ref() {
+            self.exp_symbols(e)
+        }
+    }
+
+    /// Get symbols for a use declaration
+    fn use_decl_symbols(&mut self, use_decl: &P::UseDecl) {
+        use_decl
+            .attributes
+            .iter()
+            .for_each(|sp!(_, attrs)| attrs.iter().for_each(|a| self.attr_symbols(a.clone())));
+
+        update_cursor!(self.cursor, sp(use_decl.loc, use_decl.use_.clone()), Use);
+
+        match &use_decl.use_ {
+            P::Use::ModuleUse(mod_ident, mod_use) => {
+                let mod_ident_str =
+                    parsing_mod_ident_to_map_key(self.pkg_addresses, &mod_ident.value);
+                self.mod_name_symbol(&mod_ident.value.module, &mod_ident_str);
+                self.mod_use_symbols(mod_use, &mod_ident_str);
+            }
+            P::Use::NestedModuleUses(leading_name, uses) => {
+                for (mod_name, mod_use) in uses {
+                    let mod_ident_str = parsing_leading_and_mod_names_to_map_key(
+                        self.pkg_addresses,
+                        *leading_name,
+                        *mod_name,
+                    );
+
+                    self.mod_name_symbol(mod_name, &mod_ident_str);
+                    self.mod_use_symbols(mod_use, &mod_ident_str);
+                }
+            }
+            P::Use::Fun {
+                visibility: _,
+                function,
+                ty,
+                method: _,
+            } => {
+                self.chain_symbols(function);
+                self.chain_symbols(ty);
+            }
+            P::Use::Partial { .. } => (),
+        }
+    }
+
+    /// Get module name symbol
+    fn mod_name_symbol(&mut self, mod_name: &P::ModuleName, mod_ident_str: &String) {
+        let Some(mod_defs) = self.mod_outer_defs.get_mut(mod_ident_str) else {
+            return;
+        };
+        let Some(mod_name_start) = loc_start_to_lsp_position_opt(self.files, &mod_name.loc())
+        else {
+            debug_assert!(false);
+            return;
+        };
+        self.use_defs.insert(
+            mod_name_start.line,
+            UseDef::new(
+                self.references,
+                &BTreeMap::new(),
+                mod_name.loc().file_hash(),
+                mod_name_start,
+                mod_defs.name_loc,
+                &mod_name.value(),
+                None,
+            ),
+        );
+    }
+
+    /// Get symbols for a module use
+    fn mod_use_symbols(&mut self, mod_use: &P::ModuleUse, mod_ident_str: &String) {
+        match mod_use {
+            P::ModuleUse::Module(Some(alias_name)) => {
+                self.mod_name_symbol(alias_name, mod_ident_str);
+            }
+            P::ModuleUse::Module(None) => (), // nothing more to do
+            P::ModuleUse::Members(v) => {
+                for (name, alias_opt) in v {
+                    self.use_decl_member_symbols(mod_ident_str.clone(), name, alias_opt);
+                }
+            }
+            P::ModuleUse::Partial { .. } => (),
+        }
+    }
+
+    /// Get symbols for a module member in the use declaration (can be a struct or a function)
+    fn use_decl_member_symbols(
+        &mut self,
+        mod_ident_str: String,
+        name: &Name,
+        alias_opt: &Option<Name>,
+    ) {
+        let Some(mod_defs) = self.mod_outer_defs.get(&mod_ident_str) else {
+            return;
+        };
+        if let Some(mut ud) = add_member_use_def(
+            &name.value,
+            self.files,
+            mod_defs,
+            &name.value,
+            &name.loc,
+            self.references,
+            self.def_info,
+            &mut self.use_defs,
+            &BTreeMap::new(),
+        ) {
+            // it's a struct - add it for the alias as well
+            if let Some(alias) = alias_opt {
+                let Some(alias_start) = loc_start_to_lsp_position_opt(self.files, &alias.loc)
+                else {
+                    debug_assert!(false);
+                    return;
+                };
+                ud.rename_use(
+                    self.references,
+                    alias.value,
+                    alias_start,
+                    alias.loc.file_hash(),
+                );
+                self.use_defs.insert(alias_start.line, ud);
+            }
+            return;
+        }
+        if let Some(mut ud) = add_member_use_def(
+            &name.value,
+            self.files,
+            mod_defs,
+            &name.value,
+            &name.loc,
+            self.references,
+            self.def_info,
+            &mut self.use_defs,
+            &BTreeMap::new(),
+        ) {
+            // it's a function - add it for the alias as well
+            if let Some(alias) = alias_opt {
+                let Some(alias_start) = loc_start_to_lsp_position_opt(self.files, &alias.loc)
+                else {
+                    debug_assert!(false);
+                    return;
+                };
+                ud.rename_use(
+                    self.references,
+                    alias.value,
+                    alias_start,
+                    alias.loc.file_hash(),
+                );
+                self.use_defs.insert(alias_start.line, ud);
+            }
+        }
+    }
+
+    /// Get symbols for a type
+    fn type_symbols(&mut self, type_: &P::Type) {
+        use P::Type_ as T;
+
+        // If the cursor is in this item, mark that down.
+        // This may be overridden by the recursion below.
+        update_cursor!(self.cursor, type_, Type);
+
+        match &type_.value {
+            T::Apply(chain) => {
+                self.chain_symbols(chain);
+            }
+            T::Ref(_, t) => self.type_symbols(t),
+            T::Fun(v, t) => {
+                v.iter().for_each(|t| self.type_symbols(t));
+                self.type_symbols(t);
+            }
+            T::Multiple(v) => v.iter().for_each(|t| self.type_symbols(t)),
+            T::Unit => (),
+            T::UnresolvedError => (),
+        }
+    }
+
+    /// Get symbols for a bind statement
+    fn bind_symbols(&mut self, bind: &P::Bind, explicitly_typed: bool) {
+        use P::Bind_ as B;
+
+        // If the cursor is in this item, mark that down.
+        // This may be overridden by the recursion below.
+        update_cursor!(self.cursor, bind, Binding);
+
+        match &bind.value {
+            B::Unpack(chain, bindings) => {
+                self.chain_symbols(chain);
+                match bindings {
+                    P::FieldBindings::Named(v) => {
+                        for symbol in v {
+                            match symbol {
+                                P::Ellipsis::Binder((_, x)) => self.bind_symbols(x, false),
+                                P::Ellipsis::Ellipsis(_) => (),
+                            }
+                        }
+                    }
+                    P::FieldBindings::Positional(v) => {
+                        for symbol in v.iter() {
+                            match symbol {
+                                P::Ellipsis::Binder(x) => self.bind_symbols(x, false),
+                                P::Ellipsis::Ellipsis(_) => (),
+                            }
+                        }
+                    }
+                }
+            }
+            B::Var(_, var) => {
+                if !explicitly_typed {
+                    assert!(self.current_mod_ident_str.is_some());
+                    if let Some(mod_defs) = self
+                        .mod_outer_defs
+                        .get_mut(&self.current_mod_ident_str.clone().unwrap())
+                    {
+                        mod_defs.untyped_defs.insert(var.loc());
+                    };
+                }
+            }
+        }
+    }
+
+    /// Get symbols for a name access chain
+    fn chain_symbols(&mut self, sp!(_, chain): &P::NameAccessChain) {
+        use P::NameAccessChain_ as NA;
+        // Record the length of all identifiers representing a potentially
+        // aliased module, struct, enum or function name in an access chain.
+        // We can conservatively record all identifiers as they are only
+        // accessed by-location so those irrelevant will never be queried.
+        match chain {
+            NA::Single(entry) => {
+                self.path_entry_symbols(entry);
+                if let Some(loc) = loc_start_to_lsp_position_opt(self.files, &entry.name.loc) {
+                    self.alias_lengths.insert(loc, entry.name.value.len());
+                };
+            }
+            NA::Path(path) => {
+                let P::NamePath {
+                    root,
+                    entries,
+                    is_incomplete: _,
+                } = path;
+                self.root_path_entry_symbols(root);
+                if let Some(root_loc) = loc_start_to_lsp_position_opt(self.files, &root.name.loc) {
+                    if let P::LeadingNameAccess_::Name(n) = root.name.value {
+                        self.alias_lengths.insert(root_loc, n.value.len());
+                    }
+                };
+                entries.iter().for_each(|entry| {
+                    self.path_entry_symbols(entry);
+                    if let Some(loc) = loc_start_to_lsp_position_opt(self.files, &entry.name.loc) {
+                        self.alias_lengths.insert(loc, entry.name.value.len());
+                    };
+                });
+            }
+        };
+    }
+
+    fn field_defn(&mut self, field: &P::Field) {
+        // If the cursor is in this item, mark that down.
+        update_cursor!(IDENT, self.cursor, field, FieldDefn);
+    }
+}
+
+/// Produces module ident string of the form pkg::module to be used as a map key.
+/// It's important that these are consistent between parsing AST and typed AST,
+fn parsing_mod_ident_to_map_key(
+    pkg_addresses: &NamedAddressMap,
+    mod_ident: &P::ModuleIdent_,
+) -> String {
+    format!(
+        "{}::{}",
+        parsed_address(mod_ident.address, pkg_addresses),
+        mod_ident.module
+    )
+    .to_string()
+}
+
+/// Produces module ident string of the form pkg::module to be used as a map key.
+/// It's important that these are consistent between parsing AST and typed AST.
+fn parsing_mod_def_to_map_key(
+    pkg_addresses: &NamedAddressMap,
+    mod_def: &P::ModuleDefinition,
+) -> Option<String> {
+    // we assume that modules are declared using the PkgName::ModName pattern (which seems to be the
+    // standard practice) and while Move allows other ways of defining modules (i.e., with address
+    // preceding a sequence of modules), this method is now deprecated.
+    //
+    // TODO: make this function simply return String when the other way of defining modules is
+    // removed
+    mod_def
+        .address
+        .map(|a| parsing_leading_and_mod_names_to_map_key(pkg_addresses, a, mod_def.name))
+}
+
+/// Produces module ident string of the form pkg::module to be used as a map key.
+/// It's important that these are consistent between parsing AST and typed AST.
+fn parsing_leading_and_mod_names_to_map_key(
+    pkg_addresses: &NamedAddressMap,
+    ln: P::LeadingNameAccess,
+    name: P::ModuleName,
+) -> String {
+    format!("{}::{}", parsed_address(ln, pkg_addresses), name).to_string()
+}
+
+/// Converts parsing AST's `LeadingNameAccess` to expansion AST's `Address` (similarly to
+/// expansion::translate::top_level_address but disregarding the name portion of `Address` as we
+/// only care about actual address here if it's available). We need this to be able to reliably
+/// compare parsing AST's module identifier with expansion/typing AST's module identifier, even in
+/// presence of module renaming (i.e., we cannot rely on module names if addresses are available).
+fn parsed_address(ln: P::LeadingNameAccess, pkg_addresses: &NamedAddressMap) -> E::Address {
+    let sp!(loc, ln_) = ln;
+    match ln_ {
+        P::LeadingNameAccess_::AnonymousAddress(bytes) => E::Address::anonymous(loc, bytes),
+        P::LeadingNameAccess_::GlobalAddress(name) => E::Address::NamedUnassigned(name),
+        P::LeadingNameAccess_::Name(name) => match pkg_addresses.get(&name.value).copied() {
+            Some(addr) => E::Address::anonymous(loc, addr),
+            None => E::Address::NamedUnassigned(name),
+        },
+    }
+}
diff --git a/external-crates/move/crates/move-analyzer/src/compiler_info.rs b/external-crates/move/crates/move-analyzer/src/compiler_info.rs
index 583ad6a464fb4..10ab08bcf91cf 100644
--- a/external-crates/move/crates/move-analyzer/src/compiler_info.rs
+++ b/external-crates/move/crates/move-analyzer/src/compiler_info.rs
@@ -12,6 +12,7 @@ pub struct CompilerInfo {
     pub macro_info: BTreeMap<Loc, CI::MacroCallInfo>,
     pub expanded_lambdas: BTreeSet<Loc>,
     pub dot_autocomplete_info: BTreeMap<FileHash, BTreeMap<Loc, CI::DotAutocompleteInfo>>,
+    pub path_autocomplete_info: BTreeMap<Loc, CI::AliasAutocompleteInfo>,
     /// Locations of binders in enum variants that are expanded from an ellipsis (and should
     /// not be displayed in any way by the IDE)
     pub ellipsis_binders: BTreeSet<Loc>,
@@ -61,8 +62,8 @@ impl CompilerInfo {
                 CI::IDEAnnotation::EllipsisMatchEntries(_) => {
                     self.ellipsis_binders.insert(loc);
                 }
-                CI::IDEAnnotation::PathAutocompleteInfo(_) => {
-                    // TODO: Integrate this into the provided compiler information.
+                CI::IDEAnnotation::PathAutocompleteInfo(info) => {
+                    self.path_autocomplete_info.insert(loc, *info);
                 }
             }
         }
diff --git a/external-crates/move/crates/move-analyzer/src/completion.rs b/external-crates/move/crates/move-analyzer/src/completion.rs
index de0173b4938e2..04ced00f57fc9 100644
--- a/external-crates/move/crates/move-analyzer/src/completion.rs
+++ b/external-crates/move/crates/move-analyzer/src/completion.rs
@@ -6,11 +6,13 @@ use crate::{
     context::Context,
     symbols::{
         self, mod_ident_to_ide_string, ret_type_to_ide_str, type_args_to_ide_string,
-        type_list_to_ide_string, type_to_ide_string, CursorContext, CursorDefinition, DefInfo,
-        FunType, PrecompiledPkgDeps, SymbolicatorRunner, Symbols,
+        type_list_to_ide_string, type_to_ide_string, ChainCompletionKind, ChainInfo, CursorContext,
+        CursorDefinition, DefInfo, FunType, PrecompiledPkgDeps, SymbolicatorRunner, Symbols,
+        VariantInfo,
     },
     utils,
 };
+use itertools::Itertools;
 use lsp_server::Request;
 use lsp_types::{
     CompletionItem, CompletionItemKind, CompletionItemLabelDetails, CompletionParams,
@@ -19,26 +21,50 @@ use lsp_types::{
 use move_command_line_common::files::FileHash;
 use move_compiler::{
     editions::Edition,
-    expansion::ast::{ModuleIdent_, Visibility},
+    expansion::ast::{Address, ModuleIdent, ModuleIdent_, Visibility},
     linters::LintLevel,
     naming::ast::{Type, Type_},
     parser::{
-        ast::{self as P, Ability_},
+        ast::{self as P, Ability_, LeadingNameAccess, LeadingNameAccess_},
         keywords::{BUILTINS, CONTEXTUAL_KEYWORDS, KEYWORDS, PRIMITIVE_TYPES},
         lexer::{Lexer, Tok},
     },
-    shared::{ide::AutocompleteMethod, Identifier, Name},
+    shared::{
+        ide::{AliasAutocompleteInfo, AutocompleteMethod},
+        Identifier, Name, NumericalAddress,
+    },
 };
-use move_ir_types::location::Loc;
+use move_ir_types::location::{sp, Loc};
 use move_symbol_pool::Symbol;
 
+use once_cell::sync::Lazy;
+
 use std::{
-    collections::{BTreeMap, HashSet},
+    collections::{BTreeMap, BTreeSet, HashSet},
     path::{Path, PathBuf},
     sync::{Arc, Mutex},
 };
 use vfs::VfsPath;
 
+/// Describes kind of the name access chain component.
+enum ChainComponentKind {
+    Package(LeadingNameAccess),
+    Module(ModuleIdent),
+    Member(ModuleIdent, Symbol),
+}
+
+/// Information about access chain component - its location and kind.
+struct ChainComponentInfo {
+    loc: Loc,
+    kind: ChainComponentKind,
+}
+
+impl ChainComponentInfo {
+    fn new(loc: Loc, kind: ChainComponentKind) -> Self {
+        Self { loc, kind }
+    }
+}
+
 /// Constructs an `lsp_types::CompletionItem` with the given `label` and `kind`.
 fn completion_item(label: &str, kind: CompletionItemKind) -> CompletionItem {
     CompletionItem {
@@ -48,14 +74,14 @@ fn completion_item(label: &str, kind: CompletionItemKind) -> CompletionItem {
     }
 }
 
-/// Return a list of completion items corresponding to each one of Move's keywords.
+/// List of completion items corresponding to each one of Move's keywords.
 ///
 /// Currently, this does not filter keywords out based on whether they are valid at the completion
 /// request's cursor position, but in the future it ought to. For example, this function returns
 /// all specification language keywords, but in the future it should be modified to only do so
 /// within a spec block.
-fn keywords() -> Vec<CompletionItem> {
-    KEYWORDS
+static KEYWORD_COMPLETIONS: Lazy<Vec<CompletionItem>> = Lazy::new(|| {
+    let mut keywords = KEYWORDS
         .iter()
         .chain(CONTEXTUAL_KEYWORDS.iter())
         .chain(PRIMITIVE_TYPES.iter())
@@ -67,24 +93,28 @@ fn keywords() -> Vec<CompletionItem> {
             };
             completion_item(label, kind)
         })
-        .collect()
-}
+        .collect::<Vec<_>>();
+    keywords.extend(PRIMITIVE_TYPE_COMPLETIONS.clone());
+    keywords
+});
 
-/// Return a list of completion items of Move's primitive types
-fn primitive_types() -> Vec<CompletionItem> {
-    PRIMITIVE_TYPES
+/// List of completion items of Move's primitive types.
+static PRIMITIVE_TYPE_COMPLETIONS: Lazy<Vec<CompletionItem>> = Lazy::new(|| {
+    let mut primitive_types = PRIMITIVE_TYPES
         .iter()
         .map(|label| completion_item(label, CompletionItemKind::KEYWORD))
-        .collect()
-}
+        .collect::<Vec<_>>();
+    primitive_types.push(completion_item("address", CompletionItemKind::KEYWORD));
+    primitive_types
+});
 
-/// Return a list of completion items corresponding to each one of Move's builtin functions.
-fn builtins() -> Vec<CompletionItem> {
+/// List of completion items corresponding to each one of Move's builtin functions.
+static BUILTIN_COMPLETIONS: Lazy<Vec<CompletionItem>> = Lazy::new(|| {
     BUILTINS
         .iter()
         .map(|label| completion_item(label, CompletionItemKind::FUNCTION))
         .collect()
-}
+});
 
 /// Lexes the Move source file at the given path and returns a list of completion items
 /// corresponding to the non-keyword identifiers therein.
@@ -168,36 +198,41 @@ fn get_cursor_token(buffer: &str, position: &Position) -> Option<Tok> {
 fn context_specific_lbrace(
     symbols: &Symbols,
     cursor: &CursorContext,
-) -> Option<Vec<CompletionItem>> {
-    match &cursor.defn_name {
-        // look for a struct definition on the line that contains `{`, check its abilities,
-        // and do auto-completion if `key` ability is present
-        Some(CursorDefinition::Struct(sname)) => {
-            let mident = cursor.module?;
-            let typed_ast = symbols.typed_ast.as_ref()?;
-            let struct_def = typed_ast.info.struct_definition_opt(&mident, sname)?;
-            if struct_def.abilities.has_ability_(Ability_::Key) {
-                let obj_snippet = "\n\tid: UID,\n\t$1\n".to_string();
-                let init_completion = CompletionItem {
-                    label: "id: UID".to_string(),
-                    kind: Some(CompletionItemKind::SNIPPET),
-                    documentation: Some(Documentation::String("Object snippet".to_string())),
-                    insert_text: Some(obj_snippet),
-                    insert_text_format: Some(InsertTextFormat::SNIPPET),
-                    ..Default::default()
-                };
-                vec![init_completion].into()
-            } else {
-                None
-            }
-        }
-        Some(_) => None,
-        None => None,
+) -> (Vec<CompletionItem>, bool) {
+    let mut completions = vec![];
+    let mut only_custom_items = false;
+    // look for a struct definition on the line that contains `{`, check its abilities,
+    // and do auto-completion if `key` ability is present
+    let Some(CursorDefinition::Struct(sname)) = &cursor.defn_name else {
+        return (completions, only_custom_items);
+    };
+    only_custom_items = true;
+    let Some(mident) = cursor.module else {
+        return (completions, only_custom_items);
+    };
+    let Some(typed_ast) = symbols.typed_ast.as_ref() else {
+        return (completions, only_custom_items);
+    };
+    let Some(struct_def) = typed_ast.info.struct_definition_opt(&mident, sname) else {
+        return (completions, only_custom_items);
+    };
+    if struct_def.abilities.has_ability_(Ability_::Key) {
+        let obj_snippet = "\n\tid: UID,\n\t$1\n".to_string();
+        let init_completion = CompletionItem {
+            label: "id: UID".to_string(),
+            kind: Some(CompletionItemKind::SNIPPET),
+            documentation: Some(Documentation::String("Object snippet".to_string())),
+            insert_text: Some(obj_snippet),
+            insert_text_format: Some(InsertTextFormat::SNIPPET),
+            ..Default::default()
+        };
+        completions.push(init_completion);
     }
+    (completions, only_custom_items)
 }
 
 fn fun_def_info(symbols: &Symbols, mod_ident: ModuleIdent_, name: Symbol) -> Option<&DefInfo> {
-    let Some(mdef) = symbols
+    let Some(mod_defs) = symbols
         .file_mods
         .values()
         .flatten()
@@ -206,7 +241,7 @@ fn fun_def_info(symbols: &Symbols, mod_ident: ModuleIdent_, name: Symbol) -> Opt
         return None;
     };
 
-    let Some(fdef) = mdef.functions.get(&name) else {
+    let Some(fdef) = mod_defs.functions.get(&name) else {
         return None;
     };
     symbols.def_info(&fdef.name_loc)
@@ -230,13 +265,14 @@ fn lamda_snippet(sp!(_, ty): &Type, snippet_idx: &mut i32) -> Option<String> {
 
 fn call_completion_item(
     mod_ident: &ModuleIdent_,
-    fun_type: &FunType,
-    method_name: &Symbol,
+    is_macro: bool,
+    method_name_opt: Option<&Symbol>,
     function_name: &Symbol,
     type_args: &[Type],
     arg_names: &[Name],
     arg_types: &[Type],
     ret_type: &Type,
+    inside_use: bool,
 ) -> CompletionItem {
     let sig_string = format!(
         "fun {}({}){}",
@@ -244,13 +280,14 @@ fn call_completion_item(
         type_list_to_ide_string(arg_types, /* verbose */ false),
         ret_type_to_ide_str(ret_type, /* verbose */ false)
     );
-    // we omit the first argument which is guaranteed to be there
-    // as this is a method and needs a receiver
+    // if it's a method call we omit the first argument which is guaranteed to be there as this is a
+    // method and needs a receiver
+    let omitted_arg_count = if method_name_opt.is_some() { 1 } else { 0 };
     let mut snippet_idx = 0;
     let arg_snippet = arg_names
         .iter()
         .zip(arg_types)
-        .skip(1)
+        .skip(omitted_arg_count)
         .map(|(name, ty)| {
             lamda_snippet(ty, &mut snippet_idx).unwrap_or_else(|| {
                 let mut arg_name = name.to_string();
@@ -263,11 +300,7 @@ fn call_completion_item(
         })
         .collect::<Vec<_>>()
         .join(", ");
-    let macro_suffix = if matches!(fun_type, FunType::Macro) {
-        "!"
-    } else {
-        ""
-    };
+    let macro_suffix = if is_macro { "!" } else { "" };
     let label_details = Some(CompletionItemLabelDetails {
         detail: Some(format!(
             " ({}::{})",
@@ -277,18 +310,35 @@ fn call_completion_item(
         description: Some(sig_string),
     });
 
+    let method_name = method_name_opt.unwrap_or(function_name);
+    let (insert_text, insert_text_format) = if inside_use {
+        (
+            Some(format!("{method_name}")),
+            Some(InsertTextFormat::PLAIN_TEXT),
+        )
+    } else {
+        (
+            Some(format!("{method_name}{macro_suffix}({arg_snippet})")),
+            Some(InsertTextFormat::SNIPPET),
+        )
+    };
+
     CompletionItem {
-        label: format!("{}{}()", method_name, macro_suffix),
+        label: format!("{method_name}{macro_suffix}()"),
         label_details,
         kind: Some(CompletionItemKind::METHOD),
-        insert_text: Some(format!("{}{}({})", method_name, macro_suffix, arg_snippet)),
-        insert_text_format: Some(InsertTextFormat::SNIPPET),
+        insert_text,
+        insert_text_format,
         ..Default::default()
     }
 }
 
 /// Handle dot auto-completion at a given position.
-fn dot(symbols: &Symbols, use_fpath: &Path, position: &Position) -> Vec<CompletionItem> {
+fn dot_completions(
+    symbols: &Symbols,
+    use_fpath: &Path,
+    position: &Position,
+) -> Vec<CompletionItem> {
     let mut completions = vec![];
     let Some(fhash) = symbols.file_hash(use_fpath) else {
         eprintln!("no dot completions due to missing file");
@@ -320,13 +370,14 @@ fn dot(symbols: &Symbols, use_fpath: &Path, position: &Position) -> Vec<Completi
         {
             call_completion_item(
                 &mod_ident.value,
-                fun_type,
-                method_name,
+                matches!(fun_type, FunType::Macro),
+                Some(method_name),
                 &function_name.value(),
                 type_args,
                 arg_names,
                 arg_types,
                 ret_type,
+                /* inside_use */ false,
             )
         } else {
             // this shouldn't really happen as we should be able to get
@@ -361,6 +412,885 @@ fn dot(symbols: &Symbols, use_fpath: &Path, position: &Position) -> Vec<Completi
     completions
 }
 
+/// Returns all possible completions for a module member (e.g., a datatype) component of a name
+/// access chain, where the prefix of this component (e.g, in `some_pkg::some_mod::`) represents a
+/// module specified in `prefix_mod_ident`. The `inside_use` parameter determines if completion is
+/// for "regular" access chain or for completion within a `use` statement.
+fn module_member_completions(
+    symbols: &Symbols,
+    cursor: &CursorContext,
+    prefix_mod_ident: &ModuleIdent,
+    chain_kind: ChainCompletionKind,
+    inside_use: bool,
+) -> Vec<CompletionItem> {
+    use ChainCompletionKind as CT;
+
+    let mut completions = vec![];
+
+    let Some(mod_defs) = symbols
+        .file_mods
+        .values()
+        .flatten()
+        .find(|mdef| mdef.ident == prefix_mod_ident.value)
+    else {
+        return completions;
+    };
+
+    // list all members or only publicly visible ones
+    let mut same_module = false;
+    let mut same_package = false;
+    if let Some(cursor_mod_ident) = cursor.module {
+        if &cursor_mod_ident == prefix_mod_ident {
+            same_module = true;
+        }
+        if cursor_mod_ident.value.address == prefix_mod_ident.value.address {
+            same_package = true;
+        }
+    }
+
+    if matches!(chain_kind, CT::Function) || matches!(chain_kind, CT::All) {
+        let fun_completions = mod_defs
+            .functions
+            .iter()
+            .filter_map(|(fname, fdef)| {
+                symbols
+                    .def_info(&fdef.name_loc)
+                    .map(|def_info| (fname, def_info))
+            })
+            .filter(|(_, def_info)| {
+                if let DefInfo::Function(_, visibility, ..) = def_info {
+                    match visibility {
+                        Visibility::Internal => same_module,
+                        Visibility::Package(_) => same_package,
+                        _ => true,
+                    }
+                } else {
+                    false
+                }
+            })
+            .filter_map(|(fname, def_info)| {
+                if let DefInfo::Function(
+                    _,
+                    _,
+                    fun_type,
+                    _,
+                    type_args,
+                    arg_names,
+                    arg_types,
+                    ret_type,
+                    _,
+                ) = def_info
+                {
+                    Some(call_completion_item(
+                        &prefix_mod_ident.value,
+                        matches!(fun_type, FunType::Macro),
+                        None,
+                        fname,
+                        type_args,
+                        arg_names,
+                        arg_types,
+                        ret_type,
+                        inside_use,
+                    ))
+                } else {
+                    None
+                }
+            });
+        completions.extend(fun_completions);
+    }
+
+    if matches!(chain_kind, CT::Type) || matches!(chain_kind, CT::All) {
+        completions.extend(
+            mod_defs
+                .structs
+                .keys()
+                .map(|sname| completion_item(sname, CompletionItemKind::STRUCT)),
+        );
+        completions.extend(
+            mod_defs
+                .enums
+                .keys()
+                .map(|ename| completion_item(ename, CompletionItemKind::ENUM)),
+        );
+    }
+
+    if matches!(chain_kind, CT::All) && same_module {
+        completions.extend(
+            mod_defs
+                .constants
+                .keys()
+                .map(|cname| completion_item(cname, CompletionItemKind::CONSTANT)),
+        );
+    }
+
+    completions
+}
+
+/// Returns completion item if a given name/alias identifies a valid member of a given module
+/// available in the completion scope as if it was a single-length name chain.
+fn single_name_member_completion(
+    symbols: &Symbols,
+    mod_ident: &ModuleIdent_,
+    member_alias: &Symbol,
+    member_name: &Symbol,
+    chain_kind: ChainCompletionKind,
+) -> Option<CompletionItem> {
+    use ChainCompletionKind as CT;
+
+    let Some(mod_defs) = symbols
+        .file_mods
+        .values()
+        .flatten()
+        .find(|mdef| mdef.ident == *mod_ident)
+    else {
+        return None;
+    };
+
+    // is it a function?
+    if let Some(fdef) = mod_defs.functions.get(member_name) {
+        if !(matches!(chain_kind, CT::Function) || matches!(chain_kind, CT::All)) {
+            return None;
+        }
+        let Some(DefInfo::Function(.., fun_type, _, type_args, arg_names, arg_types, ret_type, _)) =
+            symbols.def_info(&fdef.name_loc)
+        else {
+            return None;
+        };
+        return Some(call_completion_item(
+            mod_ident,
+            matches!(fun_type, FunType::Macro),
+            None,
+            member_alias,
+            type_args,
+            arg_names,
+            arg_types,
+            ret_type,
+            /* inside_use */ false,
+        ));
+    };
+
+    // is it a struct?
+    if mod_defs.structs.get(member_name).is_some() {
+        if !(matches!(chain_kind, CT::Type) || matches!(chain_kind, CT::All)) {
+            return None;
+        }
+        return Some(completion_item(
+            member_alias.as_str(),
+            CompletionItemKind::STRUCT,
+        ));
+    }
+
+    // is it an enum?
+    if mod_defs.enums.get(member_name).is_some() {
+        if !(matches!(chain_kind, CT::Type) || matches!(chain_kind, CT::All)) {
+            return None;
+        }
+        return Some(completion_item(
+            member_alias.as_str(),
+            CompletionItemKind::ENUM,
+        ));
+    }
+
+    // is it a const?
+    if mod_defs.constants.get(member_name).is_some() {
+        if !matches!(chain_kind, CT::All) {
+            return None;
+        }
+        return Some(completion_item(
+            member_alias.as_str(),
+            CompletionItemKind::CONSTANT,
+        ));
+    }
+
+    None
+}
+
+/// Returns completion items for all members of a given module as if they were single-length name
+/// chains.
+fn all_single_name_member_completions(
+    symbols: &Symbols,
+    members_info: &BTreeSet<(Symbol, ModuleIdent, Name)>,
+    chain_kind: ChainCompletionKind,
+) -> Vec<CompletionItem> {
+    let mut completions = vec![];
+    for (member_alias, sp!(_, mod_ident), member_name) in members_info {
+        let Some(member_completion) = single_name_member_completion(
+            symbols,
+            mod_ident,
+            member_alias,
+            &member_name.value,
+            chain_kind,
+        ) else {
+            continue;
+        };
+        completions.push(member_completion);
+    }
+    completions
+}
+
+/// Checks if a given module identifier represents a module in a package identifier by
+/// `leading_name`.
+fn is_pkg_mod_ident(mod_ident: &ModuleIdent_, leading_name: &LeadingNameAccess) -> bool {
+    match mod_ident.address {
+        Address::NamedUnassigned(name) => matches!(leading_name.value,
+            LeadingNameAccess_::Name(n) | LeadingNameAccess_::GlobalAddress(n) if name == n),
+        Address::Numerical {
+            name,
+            value,
+            name_conflict: _,
+        } => match leading_name.value {
+            LeadingNameAccess_::AnonymousAddress(addr) if addr == value.value => true,
+            LeadingNameAccess_::Name(addr_name) | LeadingNameAccess_::GlobalAddress(addr_name)
+                if Some(addr_name) == name =>
+            {
+                true
+            }
+            _ => false,
+        },
+    }
+}
+
+/// Gets module identifiers for a given package identified by `leading_name`.
+fn pkg_mod_identifiers(
+    symbols: &Symbols,
+    info: &AliasAutocompleteInfo,
+    leading_name: &LeadingNameAccess,
+) -> BTreeSet<ModuleIdent> {
+    info.modules
+        .values()
+        .filter(|mod_ident| is_pkg_mod_ident(&mod_ident.value, leading_name))
+        .copied()
+        .chain(
+            symbols
+                .file_mods
+                .values()
+                .flatten()
+                .map(|mdef| sp(mdef.name_loc, mdef.ident))
+                .filter(|mod_ident| is_pkg_mod_ident(&mod_ident.value, leading_name)),
+        )
+        .collect::<BTreeSet<_>>()
+}
+
+/// Computes completion for a single enum variant.
+fn variant_completion(symbols: &Symbols, vinfo: &VariantInfo) -> Option<CompletionItem> {
+    let Some(DefInfo::Variant(_, _, vname, is_positional, field_names, ..)) =
+        symbols.def_info.get(&vinfo.name.loc)
+    else {
+        return None;
+    };
+
+    let label = if field_names.is_empty() {
+        vname.to_string()
+    } else if *is_positional {
+        format!("{vname}()")
+    } else {
+        format!("{vname}{{}}")
+    };
+    let field_snippet = field_names
+        .iter()
+        .enumerate()
+        .map(|(snippet_idx, fname)| {
+            if *is_positional {
+                format!("${{{}}}", snippet_idx + 1)
+            } else {
+                format!("${{{}:{}}}", snippet_idx + 1, fname)
+            }
+        })
+        .collect::<Vec<_>>()
+        .join(", ");
+    let insert_text = if *is_positional {
+        format!("{vname}({field_snippet})")
+    } else {
+        format!("{vname}{{{field_snippet}}}")
+    };
+
+    Some(CompletionItem {
+        label,
+        kind: Some(CompletionItemKind::ENUM_MEMBER),
+        insert_text: Some(insert_text),
+        insert_text_format: Some(InsertTextFormat::SNIPPET),
+        ..Default::default()
+    })
+}
+
+/// Computes completions for variants of a given enum.
+fn all_variant_completions(
+    symbols: &Symbols,
+    mod_ident: &ModuleIdent,
+    datatype_name: Symbol,
+) -> Vec<CompletionItem> {
+    let Some(mod_defs) = symbols
+        .file_mods
+        .values()
+        .flatten()
+        .find(|mdef| mdef.ident == mod_ident.value)
+    else {
+        return vec![];
+    };
+
+    let Some(edef) = mod_defs.enums.get(&datatype_name) else {
+        return vec![];
+    };
+
+    let Some(DefInfo::Enum(.., variants, _)) = symbols.def_info.get(&edef.name_loc) else {
+        return vec![];
+    };
+
+    variants
+        .iter()
+        .filter_map(|vinfo| variant_completion(symbols, vinfo))
+        .collect_vec()
+}
+
+/// Computes completions for a given chain entry: `prev_kind` determines the kind of previous chain
+/// component, and `chain_kind` contains information about the entity that the whole chain may
+/// represent (e.g., a type of or a function).
+fn name_chain_entry_completions(
+    symbols: &Symbols,
+    cursor: &CursorContext,
+    info: &AliasAutocompleteInfo,
+    prev_kind: ChainComponentKind,
+    chain_kind: ChainCompletionKind,
+    inside_use: bool,
+    completions: &mut Vec<CompletionItem>,
+) {
+    match prev_kind {
+        ChainComponentKind::Package(leading_name) => {
+            for mod_ident in pkg_mod_identifiers(symbols, info, &leading_name) {
+                completions.push(completion_item(
+                    mod_ident.value.module.value().as_str(),
+                    CompletionItemKind::MODULE,
+                ));
+            }
+        }
+        ChainComponentKind::Module(mod_ident) => {
+            completions.extend(module_member_completions(
+                symbols, cursor, &mod_ident, chain_kind, inside_use,
+            ));
+        }
+        ChainComponentKind::Member(mod_ident, member_name) => {
+            completions.extend(all_variant_completions(symbols, &mod_ident, member_name));
+        }
+    }
+}
+
+/// Computes the kind of the next chain component (based on what the previous one, represented by
+/// `prev_kind` was).
+fn next_name_chain_component_kind(
+    symbols: &Symbols,
+    info: &AliasAutocompleteInfo,
+    prev_kind: ChainComponentKind,
+    component_name: Name,
+) -> Option<ChainComponentKind> {
+    match prev_kind {
+        ChainComponentKind::Package(leading_name) => {
+            pkg_mod_identifiers(symbols, info, &leading_name)
+                .into_iter()
+                .find(|mod_ident| mod_ident.value.module.value() == component_name.value)
+                .map(ChainComponentKind::Module)
+        }
+        ChainComponentKind::Module(mod_ident) => {
+            Some(ChainComponentKind::Member(mod_ident, component_name.value))
+        }
+        ChainComponentKind::Member(_, _) => None, // no more "after" completions to be processed
+    }
+}
+
+/// Walks down a name chain, looking for the relevant portion that contains the cursor. When it
+/// finds, it calls to `name_chain_entry_completions` to compute and return the completions.
+fn completions_for_name_chain_entry(
+    symbols: &Symbols,
+    cursor: &CursorContext,
+    info: &AliasAutocompleteInfo,
+    prev_info: ChainComponentInfo,
+    chain_kind: ChainCompletionKind,
+    path_entries: &[Name],
+    path_index: usize,
+    colon_colon_triggered: bool,
+    inside_use: bool,
+    completions: &mut Vec<CompletionItem>,
+) {
+    let ChainComponentInfo {
+        loc: prev_loc,
+        kind: prev_kind,
+    } = prev_info;
+
+    let mut at_colon_colon = false;
+    if path_index == path_entries.len() {
+        // the only reason we would not return here is if we were at `::` which is past the location
+        // of the last path component
+        if colon_colon_triggered && cursor.loc.start() > prev_loc.end() {
+            at_colon_colon = true;
+        } else {
+            return;
+        }
+    }
+
+    if !at_colon_colon {
+        // we are not at the last `::` but we may be at an intermediate one
+        if colon_colon_triggered
+            && path_index < path_entries.len()
+            && cursor.loc.start() > prev_loc.end()
+            && cursor.loc.end() <= path_entries[path_index].loc.start()
+        {
+            at_colon_colon = true;
+        }
+    }
+
+    // we are at `::`, or at some component's identifier
+    if at_colon_colon || path_entries[path_index].loc.contains(&cursor.loc) {
+        name_chain_entry_completions(
+            symbols,
+            cursor,
+            info,
+            prev_kind,
+            chain_kind,
+            inside_use,
+            completions,
+        );
+    } else {
+        let component_name = path_entries[path_index];
+        if let Some(next_kind) =
+            next_name_chain_component_kind(symbols, info, prev_kind, component_name)
+        {
+            completions_for_name_chain_entry(
+                symbols,
+                cursor,
+                info,
+                ChainComponentInfo::new(component_name.loc, next_kind),
+                chain_kind,
+                path_entries,
+                path_index + 1,
+                colon_colon_triggered,
+                inside_use,
+                completions,
+            );
+        }
+    }
+}
+
+/// Check if a given address represents a package within the current program.
+fn is_package_address(
+    symbols: &Symbols,
+    info: &AliasAutocompleteInfo,
+    pkg_addr: NumericalAddress,
+) -> bool {
+    if info.addresses.iter().any(|(_, a)| a == &pkg_addr) {
+        return true;
+    }
+
+    symbols.file_mods.values().flatten().any(|mdef| {
+        matches!(mdef.ident.address,
+            Address::Numerical { value, .. } if value.value == pkg_addr)
+    })
+}
+
+/// Check if a given name represents a package within the current program.
+fn is_package_name(symbols: &Symbols, info: &AliasAutocompleteInfo, pkg_name: Name) -> bool {
+    if info.addresses.contains_key(&pkg_name.value) {
+        return true;
+    }
+
+    symbols
+        .file_mods
+        .values()
+        .flatten()
+        .map(|mdef| &mdef.ident)
+        .any(|mod_ident| match &mod_ident.address {
+            Address::NamedUnassigned(name) if name == &pkg_name => true,
+            Address::Numerical {
+                name: Some(name), ..
+            } if name == &pkg_name => true,
+            _ => false,
+        })
+}
+
+/// Get all packages that could be a target of auto-completion, whether they are part of
+/// `AliasAutocompleteInfo` or not.
+fn all_packages(symbols: &Symbols, info: &AliasAutocompleteInfo) -> BTreeSet<String> {
+    let mut addresses = BTreeSet::new();
+    for (n, a) in &info.addresses {
+        addresses.insert(n.to_string());
+        addresses.insert(a.to_string());
+    }
+
+    symbols
+        .file_mods
+        .values()
+        .flatten()
+        .map(|mdef| &mdef.ident)
+        .for_each(|mod_ident| match &mod_ident.address {
+            Address::Numerical { name, value, .. } => {
+                if let Some(n) = name {
+                    addresses.insert(n.to_string());
+                }
+                addresses.insert(value.to_string());
+            }
+            Address::NamedUnassigned(n) => {
+                addresses.insert(n.to_string());
+            }
+        });
+
+    addresses
+}
+
+/// Computes the kind of the fist chain component.
+fn first_name_chain_component_kind(
+    symbols: &Symbols,
+    info: &AliasAutocompleteInfo,
+    leading_name: LeadingNameAccess,
+) -> Option<ChainComponentKind> {
+    match leading_name.value {
+        LeadingNameAccess_::Name(n) => {
+            if is_package_name(symbols, info, n) {
+                Some(ChainComponentKind::Package(leading_name))
+            } else if let Some(mod_ident) = info.modules.get(&n.value) {
+                Some(ChainComponentKind::Module(*mod_ident))
+            } else if let Some((mod_ident, member_name)) =
+                info.members
+                    .iter()
+                    .find_map(|(alias_name, mod_ident, member_name)| {
+                        if alias_name == &n.value {
+                            Some((*mod_ident, member_name))
+                        } else {
+                            None
+                        }
+                    })
+            {
+                Some(ChainComponentKind::Member(mod_ident, member_name.value))
+            } else {
+                None
+            }
+        }
+        LeadingNameAccess_::AnonymousAddress(addr) => {
+            if is_package_address(symbols, info, addr) {
+                Some(ChainComponentKind::Package(leading_name))
+            } else {
+                None
+            }
+        }
+        LeadingNameAccess_::GlobalAddress(n) => {
+            // if leading name is global address then the first component can only be a
+            // package
+            if is_package_name(symbols, info, n) {
+                Some(ChainComponentKind::Package(leading_name))
+            } else {
+                None
+            }
+        }
+    }
+}
+
+/// Handle name chain auto-completion at a given position. The gist of this approach is to first
+/// identify what the first component of the access chain represents (as it may be a package, module
+/// or a member) and if the chain has other components, recursively process them in turn to either
+/// - finish auto-completion if cursor is on a given component's identifier
+/// - identify what the subsequent component represents and keep going
+fn name_chain_completions(
+    symbols: &Symbols,
+    cursor: &CursorContext,
+    colon_colon_triggered: bool,
+) -> (Vec<CompletionItem>, bool) {
+    eprintln!("looking for name access chains");
+    let mut completions = vec![];
+    let mut only_custom_items = false;
+    let Some(ChainInfo {
+        chain,
+        kind: chain_kind,
+        inside_use,
+    }) = cursor.find_access_chain()
+    else {
+        eprintln!("no access chain");
+        return (completions, only_custom_items);
+    };
+
+    let (leading_name, path_entries) = match &chain.value {
+        P::NameAccessChain_::Single(entry) => (
+            sp(entry.name.loc, LeadingNameAccess_::Name(entry.name)),
+            vec![],
+        ),
+        P::NameAccessChain_::Path(name_path) => (
+            name_path.root.name,
+            name_path.entries.iter().map(|e| e.name).collect::<Vec<_>>(),
+        ),
+    };
+
+    // there may be access chains for which there is not auto-completion info generated by the
+    // compiler but which still have to be handled (e.g., chains starting with numeric address)
+    let info = symbols
+        .compiler_info
+        .path_autocomplete_info
+        .get(&leading_name.loc)
+        .cloned()
+        .unwrap_or_else(AliasAutocompleteInfo::new);
+
+    eprintln!("found access chain for auto-completion (adddreses: {}, modules: {}, members: {}, tparams: {}",
+              info.addresses.len(), info.modules.len(), info.members.len(), info.type_params.len());
+
+    // if we are auto-completing for an access chain, there is no need to include default completions
+    only_custom_items = true;
+
+    if leading_name.loc.contains(&cursor.loc) {
+        // at first position of the chain suggest all packages that are available regardless of what
+        // the leading name represents, as a package always fits at that position, for example:
+        // OxCAFE::...
+        // some_name::...
+        // ::some_name
+        //
+        completions.extend(
+            all_packages(symbols, &info)
+                .iter()
+                .map(|n| completion_item(n.as_str(), CompletionItemKind::UNIT)),
+        );
+
+        // only if leading name is actually a name, modules or module members are a correct
+        // auto-completion in the first position
+        if let LeadingNameAccess_::Name(_) = &leading_name.value {
+            completions.extend(
+                info.modules
+                    .keys()
+                    .map(|n| completion_item(n.as_str(), CompletionItemKind::MODULE)),
+            );
+            completions.extend(all_single_name_member_completions(
+                symbols,
+                &info.members,
+                chain_kind,
+            ));
+            if matches!(chain_kind, ChainCompletionKind::Type) {
+                completions.extend(PRIMITIVE_TYPE_COMPLETIONS.clone());
+                completions.extend(
+                    info.type_params
+                        .iter()
+                        .map(|t| completion_item(t.as_str(), CompletionItemKind::TYPE_PARAMETER)),
+                );
+            }
+        }
+    } else if let Some(next_kind) = first_name_chain_component_kind(symbols, &info, leading_name) {
+        completions_for_name_chain_entry(
+            symbols,
+            cursor,
+            &info,
+            ChainComponentInfo::new(leading_name.loc, next_kind),
+            chain_kind,
+            &path_entries,
+            /* path_index */ 0,
+            colon_colon_triggered,
+            inside_use,
+            &mut completions,
+        );
+    }
+
+    eprintln!("found {} access chain completions", completions.len());
+
+    (completions, only_custom_items)
+}
+
+/// Computes auto-completions for module uses.
+fn module_use_completions(
+    symbols: &Symbols,
+    cursor: &CursorContext,
+    info: &AliasAutocompleteInfo,
+    mod_use: &P::ModuleUse,
+    package: &LeadingNameAccess,
+    mod_name: &P::ModuleName,
+) -> Vec<CompletionItem> {
+    use P::ModuleUse as MU;
+    let mut completions = vec![];
+
+    let Some(mod_ident) = pkg_mod_identifiers(symbols, info, package)
+        .into_iter()
+        .find(|mod_ident| &mod_ident.value.module == mod_name)
+    else {
+        return completions;
+    };
+
+    match mod_use {
+        MU::Module(_) => (), // nothing to do with just module alias
+        MU::Members(members) => {
+            if let Some((first_name, _)) = members.first() {
+                if cursor.loc.start() > mod_name.loc().end()
+                    && cursor.loc.end() <= first_name.loc.start()
+                {
+                    // cursor is after `::` succeeding module but before the first module member
+                    completions.extend(module_member_completions(
+                        symbols,
+                        cursor,
+                        &mod_ident,
+                        ChainCompletionKind::All,
+                        /* inside_use */ true,
+                    ));
+                    // no point in falling through to the members loop below
+                    return completions;
+                }
+            }
+
+            for (sp!(mloc, _), _) in members {
+                if mloc.contains(&cursor.loc) {
+                    // cursor is at identifier representing module member
+                    completions.extend(module_member_completions(
+                        symbols,
+                        cursor,
+                        &mod_ident,
+                        ChainCompletionKind::All,
+                        /* inside_use */ true,
+                    ));
+                    // no point checking other locations
+                    break;
+                }
+            }
+        }
+        MU::Partial {
+            colon_colon,
+            opening_brace: _,
+        } => {
+            if let Some(colon_colon_loc) = colon_colon {
+                if cursor.loc.start() >= colon_colon_loc.start() {
+                    // cursor is on or past `::`
+                    completions.extend(module_member_completions(
+                        symbols,
+                        cursor,
+                        &mod_ident,
+                        ChainCompletionKind::All,
+                        /* inside_use */ true,
+                    ));
+                }
+            }
+        }
+    }
+
+    completions
+}
+
+/// Handles auto-completions for "regular" `use` declarations (name access chains in `use fun`
+/// declarations are handled as part of name chain completions).
+fn use_decl_completions(symbols: &Symbols, cursor: &CursorContext) -> (Vec<CompletionItem>, bool) {
+    eprintln!("looking for use declarations");
+    let mut completions = vec![];
+    let mut only_custom_items = false;
+    let Some(use_) = cursor.find_use_decl() else {
+        eprintln!("no use declaration");
+        return (completions, only_custom_items);
+    };
+    eprintln!("use declaration {:?}", use_);
+
+    // if we are auto-completing for a use decl, there is no need to include default completions
+    only_custom_items = true;
+
+    // there is no auto-completion info generated by the compiler for this but helper methods used
+    // here are shared with name chain completion where it may exist, so we create an "empty" one
+    // here
+    let info = AliasAutocompleteInfo::new();
+
+    match use_ {
+        P::Use::ModuleUse(sp!(_, mod_ident), mod_use) => {
+            if mod_ident.address.loc.contains(&cursor.loc) {
+                // cursor on package (e.g., on `some_pkg` in `some_pkg::some_mod`)
+                completions.extend(
+                    all_packages(symbols, &info)
+                        .iter()
+                        .map(|n| completion_item(n.as_str(), CompletionItemKind::UNIT)),
+                );
+            } else if cursor.loc.start() > mod_ident.address.loc.end()
+                && cursor.loc.end() <= mod_ident.module.loc().end()
+            {
+                // cursor is either at the `::` succeeding package/address or at the identifier
+                // following that particular `::`
+                for ident in pkg_mod_identifiers(symbols, &info, &mod_ident.address) {
+                    completions.push(completion_item(
+                        ident.value.module.value().as_str(),
+                        CompletionItemKind::MODULE,
+                    ));
+                }
+            } else {
+                completions.extend(module_use_completions(
+                    symbols,
+                    cursor,
+                    &info,
+                    &mod_use,
+                    &mod_ident.address,
+                    &mod_ident.module,
+                ));
+            }
+        }
+        P::Use::NestedModuleUses(leading_name, uses) => {
+            if leading_name.loc.contains(&cursor.loc) {
+                // cursor on package
+                completions.extend(
+                    all_packages(symbols, &info)
+                        .iter()
+                        .map(|n| completion_item(n.as_str(), CompletionItemKind::UNIT)),
+                );
+            } else {
+                if let Some((first_name, _)) = uses.first() {
+                    if cursor.loc.start() > leading_name.loc.end()
+                        && cursor.loc.end() <= first_name.loc().start()
+                    {
+                        // cursor is after `::` succeeding address/package but before the first
+                        // module
+                        for ident in pkg_mod_identifiers(symbols, &info, &leading_name) {
+                            completions.push(completion_item(
+                                ident.value.module.value().as_str(),
+                                CompletionItemKind::MODULE,
+                            ));
+                        }
+                        // no point in falling through to the uses loop below
+                        return (completions, only_custom_items);
+                    }
+                }
+
+                for (mod_name, mod_use) in &uses {
+                    if mod_name.loc().contains(&cursor.loc) {
+                        for ident in pkg_mod_identifiers(symbols, &info, &leading_name) {
+                            completions.push(completion_item(
+                                ident.value.module.value().as_str(),
+                                CompletionItemKind::MODULE,
+                            ));
+                        }
+                        // no point checking other locations
+                        break;
+                    }
+                    completions.extend(module_use_completions(
+                        symbols,
+                        cursor,
+                        &info,
+                        mod_use,
+                        &leading_name,
+                        mod_name,
+                    ));
+                }
+            }
+        }
+        P::Use::Fun { .. } => (), // already handled as part of name chain completion
+        P::Use::Partial {
+            package,
+            colon_colon,
+            opening_brace: _,
+        } => {
+            if package.loc.contains(&cursor.loc) {
+                // cursor on package name/address
+                completions.extend(
+                    all_packages(symbols, &info)
+                        .iter()
+                        .map(|n| completion_item(n.as_str(), CompletionItemKind::UNIT)),
+                );
+            }
+            if let Some(colon_colon_loc) = colon_colon {
+                if cursor.loc.start() >= colon_colon_loc.start() {
+                    // cursor is on or past `::`
+                    for ident in pkg_mod_identifiers(symbols, &info, &package) {
+                        completions.push(completion_item(
+                            ident.value.module.value().as_str(),
+                            CompletionItemKind::MODULE,
+                        ));
+                    }
+                }
+            }
+        }
+    }
+
+    (completions, only_custom_items)
+}
+
 /// Handle context-specific auto-completion requests with no trigger character.
 fn context_specific_no_trigger(
     symbols: &Symbols,
@@ -369,7 +1299,7 @@ fn context_specific_no_trigger(
     position: &Position,
 ) -> (Vec<CompletionItem>, bool) {
     eprintln!("looking for dot");
-    let mut completions = dot(symbols, use_fpath, position);
+    let mut completions = dot_completions(symbols, use_fpath, position);
     eprintln!("dot found: {}", !completions.is_empty());
     if !completions.is_empty() {
         // found dot completions - do not look for any other
@@ -549,9 +1479,10 @@ pub fn on_completion_request(
     }
     let items = completions_with_context(context, ide_files_root, pkg_dependencies, &path, pos)
         .unwrap_or_default();
+    let items_len = items.len();
 
     let result = serde_json::to_value(items).expect("could not serialize completion response");
-    eprintln!("about to send completion response");
+    eprintln!("about to send completion response with {items_len} items");
     let response = lsp_server::Response::new_ok(request.id.clone(), result);
     if let Err(err) = context
         .connection
@@ -653,13 +1584,14 @@ fn compute_completion_items(symbols: &Symbols, path: &Path, pos: Position) -> Ve
             }
         }
         if !only_custom_items {
+            eprintln!("including identifiers");
             let identifiers = identifiers(&file_source, symbols, path);
             items.extend(identifiers);
         }
     } else {
         // no file content
-        items.extend(keywords());
-        items.extend(builtins());
+        items.extend(KEYWORD_COMPLETIONS.clone());
+        items.extend(BUILTIN_COMPLETIONS.clone());
     }
     items
 }
@@ -675,14 +1607,10 @@ fn cursor_completion_items(
 ) -> (Vec<CompletionItem>, bool) {
     let cursor_leader = get_cursor_token(file_source, &pos);
     match cursor_leader {
-        Some(Tok::Colon) => {
-            // TODO: sweep current scope and find types there.
-            (primitive_types(), false)
-        }
         // TODO: consider using `cursor.position` for this instead
         Some(Tok::Period) => {
             eprintln!("found period");
-            let items = dot(symbols, path, &pos);
+            let items = dot_completions(symbols, path, &pos);
             let items_is_empty = items.is_empty();
             eprintln!("found items: {}", !items_is_empty);
             // whether completions have been found for the dot or not
@@ -692,60 +1620,62 @@ fn cursor_completion_items(
             // with u64 receiver being visible)
             (items, true)
         }
-        // TODO: consider using `cursor.position` for this instead
         Some(Tok::ColonColon) => {
-            // `.` or `::` must be followed by identifiers, which are added to the completion items
-            // below.
-            // TODO: consider the cursor and see if we can handle a path there
-            match &cursor.position {
-                symbols::CursorPosition::Exp(sp!(_, P::Exp_::Name(name))) => {
-                    match &name.value {
-                        P::NameAccessChain_::Single(_name) => {
-                            // This is technically unreachable because we wouldn't be at a `::`
-                            (vec![], false)
-                        }
-                        P::NameAccessChain_::Path(path) => {
-                            let P::NamePath {
-                                root,
-                                entries,
-                                is_incomplete: _,
-                            } = path;
-                            if root.name.loc.contains(&cursor.loc) {
-                                // This is technically unreachable because we wouldn't be at a `::`
-                                (vec![], false)
-                            } else {
-                                for entry in entries {
-                                    if entry.name.loc.contains(&cursor.loc) {
-                                        // TODO: figure out what the name parts refers to, look it
-                                        // up in typing, and go from there.
-                                        return (vec![], false);
-                                    }
-                                }
-                                (vec![], false)
-                            }
-                        }
-                    }
-                }
-                _ => (vec![], false),
+            let mut items = vec![];
+            let mut only_custom_items = false;
+            let (path_items, path_custom) =
+                name_chain_completions(symbols, cursor, /* colon_colon_triggered */ true);
+            items.extend(path_items);
+            only_custom_items |= path_custom;
+            if !only_custom_items {
+                let (path_items, path_custom) = use_decl_completions(symbols, cursor);
+                items.extend(path_items);
+                only_custom_items |= path_custom;
             }
+            (items, only_custom_items)
         }
         // Carve out to suggest UID for struct with key ability
-        Some(Tok::LBrace) => (
-            context_specific_lbrace(symbols, cursor).unwrap_or_default(),
-            true,
-        ),
+        Some(Tok::LBrace) => {
+            let mut items = vec![];
+            let mut only_custom_items = false;
+            let (path_items, path_custom) = context_specific_lbrace(symbols, cursor);
+            items.extend(path_items);
+            only_custom_items |= path_custom;
+            if !only_custom_items {
+                let (path_items, path_custom) = use_decl_completions(symbols, cursor);
+                items.extend(path_items);
+                only_custom_items |= path_custom;
+            }
+            (items, only_custom_items)
+        }
+        // TODO: should we handle auto-completion on `:`? If we model our support after
+        // rust-analyzer then it does not do this - it starts auto-completing types after the first
+        // character beyond `:` is typed
         _ => {
             eprintln!("no relevant cursor leader");
             let mut items = vec![];
             let mut only_custom_items = false;
-            if let symbols::CursorPosition::Exp(sp!(_, P::Exp_::Name(_name))) = &cursor.position {
-                // TODO: match on the name and use provided compiler info to resolve this
-                // (see PR 18108 for more details on that information)
+            let (path_items, path_custom) =
+                name_chain_completions(symbols, cursor, /* colon_colon_triggered */ false);
+            items.extend(path_items);
+            only_custom_items |= path_custom;
+            if !only_custom_items {
+                if matches!(cursor_leader, Some(Tok::Colon)) {
+                    // much like rust-analyzer we do not auto-complete in the middle of `::`
+                    only_custom_items = true;
+                } else {
+                    let (path_items, path_custom) = use_decl_completions(symbols, cursor);
+                    items.extend(path_items);
+                    only_custom_items |= path_custom;
+                }
+            }
+            if !only_custom_items {
+                eprintln!("checking default items");
+                let (default_items, default_custom) =
+                    default_items(symbols, path, file_source, pos);
+                items.extend(default_items);
+                only_custom_items |= default_custom;
             }
-            eprintln!("checking default items");
-            let (default_items, default_custom) = default_items(symbols, path, file_source, pos);
-            items.extend(default_items);
-            only_custom_items |= default_custom;
             (items, only_custom_items)
         }
     }
@@ -764,8 +1694,8 @@ fn default_items(
         context_specific_no_trigger(symbols, path, file_source, &pos);
     let mut items = custom_items;
     if !only_custom_items {
-        items.extend(keywords());
-        items.extend(builtins());
+        items.extend(KEYWORD_COMPLETIONS.clone());
+        items.extend(BUILTIN_COMPLETIONS.clone());
     }
     (items, only_custom_items)
 }
diff --git a/external-crates/move/crates/move-analyzer/src/symbols.rs b/external-crates/move/crates/move-analyzer/src/symbols.rs
index cff3cac4793d9..aae8c17cbf87b 100644
--- a/external-crates/move/crates/move-analyzer/src/symbols.rs
+++ b/external-crates/move/crates/move-analyzer/src/symbols.rs
@@ -5,10 +5,14 @@
 //! and typed ASTs, in particular identifier definitions to be used for implementing go-to-def,
 //! go-to-references, and on-hover language server commands.
 //!
-//! There are different structs that are used at different phases of the process, the
-//! ParsingSymbolicator and Typing Symbolicator structs are used when building symbolication
-//! information and the Symbols struct is summarizes the symbolication results and is used by the
-//! language server find definitions and references.
+//! The analysis starts with top-level module definitions being processed and then proceeds to
+//! process parsed AST (parsing analysis) and typed AST (typing analysis) to gather all the required
+//! information which is then summarized in the Symbols struct subsequently used by the language
+//! server to find definitions, references, auto-completions, etc.  Parsing analysis is largely
+//! responsible for processing import statements (no longer available at the level of typed AST) and
+//! typing analysis gathers remaining information. In particular, for local definitions, typing
+//! analysis builds a scope stack, entering encountered definitions and matching uses to a
+//! definition in the innermost scope.
 //!
 //! Here is a brief description of how the symbolication information is encoded. Each identifier in
 //! the source code of a given module is represented by its location (UseLoc struct): line number,
@@ -45,17 +49,10 @@
 //! We also associate all uses of an identifier with its definition to support
 //! go-to-references. This is done in a global map from an identifier location (DefLoc) to a set of
 //! use locations (UseLoc).
-//!
-//! Symbolication algorithm over typing AST first analyzes all top-level definitions from all
-//! modules. ParsingSymbolicator then processes import statements (no longer available at the level
-//! of typed AST) and TypingSymbolicator processes function bodies, as well as constant and struct
-//! definitions. For local definitions, TypingSymbolicator builds a scope stack, entering
-//! encountered definitions and matching uses to a definition in the innermost scope.
-
 #![allow(clippy::non_canonical_partial_ord_impl)]
 
 use crate::{
-    analysis::typing_analysis,
+    analysis::{parsing_analysis, typing_analysis},
     compiler_info::CompilerInfo,
     context::Context,
     diagnostics::{lsp_diagnostics, lsp_empty_diagnostics},
@@ -96,11 +93,11 @@ use move_compiler::{
     expansion::ast::{self as E, AbilitySet, ModuleIdent, ModuleIdent_, Value, Value_, Visibility},
     linters::LintLevel,
     naming::ast::{DatatypeTypeParameter, StructFields, Type, TypeName_, Type_, VariantFields},
-    parser::ast::{self as P, NameAccessChain, NameAccessChain_},
+    parser::ast as P,
     shared::{
         files::{FileId, MappedFiles},
         unique_map::UniqueMap,
-        Identifier, Name, NamedAddressMap, NamedAddressMaps,
+        Identifier, Name, NamedAddressMap,
     },
     typing::{
         ast::{
@@ -153,9 +150,9 @@ pub enum FunType {
 
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct VariantInfo {
-    name: Symbol,
-    empty: bool,
-    positional: bool,
+    pub name: Name,
+    pub empty: bool,
+    pub positional: bool,
 }
 /// Information about a definition of some identifier
 #[derive(Debug, Clone, Eq, PartialEq)]
@@ -394,6 +391,30 @@ pub struct CursorContext {
     pub loc: Loc,
 }
 
+#[derive(Clone, Debug, Copy)]
+pub enum ChainCompletionKind {
+    Type,
+    Function,
+    All,
+}
+
+#[derive(Clone, Debug)]
+pub struct ChainInfo {
+    pub chain: P::NameAccessChain,
+    pub kind: ChainCompletionKind,
+    pub inside_use: bool,
+}
+
+impl ChainInfo {
+    pub fn new(chain: P::NameAccessChain, kind: ChainCompletionKind, inside_use: bool) -> Self {
+        Self {
+            chain,
+            kind,
+            inside_use,
+        }
+    }
+}
+
 impl CursorContext {
     fn new(loc: Loc) -> Self {
         CursorContext {
@@ -403,6 +424,63 @@ impl CursorContext {
             loc,
         }
     }
+
+    /// Returns access chain at cursor position (if any) along with the information of what the chain's
+    /// auto-completed target kind should be, and weather it is part of the use statement.
+    pub fn find_access_chain(&self) -> Option<ChainInfo> {
+        use ChainCompletionKind as CT;
+        use CursorPosition as CP;
+        match &self.position {
+            CP::Exp(sp!(_, exp)) => match exp {
+                P::Exp_::Name(chain) if chain.loc.contains(&self.loc) => {
+                    return Some(ChainInfo::new(chain.clone(), CT::All, false))
+                }
+                P::Exp_::Call(chain, _) if chain.loc.contains(&self.loc) => {
+                    return Some(ChainInfo::new(chain.clone(), CT::Function, false))
+                }
+                P::Exp_::Pack(chain, _) if chain.loc.contains(&self.loc) => {
+                    return Some(ChainInfo::new(chain.clone(), CT::Type, false))
+                }
+                _ => (),
+            },
+            CP::Binding(sp!(_, bind)) => match bind {
+                P::Bind_::Unpack(chain, _) if chain.loc.contains(&self.loc) => {
+                    return Some(ChainInfo::new(*(chain.clone()), CT::Type, false))
+                }
+                _ => (),
+            },
+            CP::Type(sp!(_, ty)) => match ty {
+                P::Type_::Apply(chain) if chain.loc.contains(&self.loc) => {
+                    return Some(ChainInfo::new(*(chain.clone()), CT::Type, false))
+                }
+                _ => (),
+            },
+            CP::Attribute(attr_val) => match &attr_val.value {
+                P::AttributeValue_::ModuleAccess(chain) if chain.loc.contains(&self.loc) => {
+                    return Some(ChainInfo::new(chain.clone(), CT::All, false))
+                }
+                _ => (),
+            },
+            CP::Use(sp!(_, P::Use::Fun { function, ty, .. })) => {
+                if function.loc.contains(&self.loc) {
+                    return Some(ChainInfo::new(*(function.clone()), CT::Function, true));
+                }
+                if ty.loc.contains(&self.loc) {
+                    return Some(ChainInfo::new(*(ty.clone()), CT::Type, true));
+                }
+            }
+            _ => (),
+        };
+        None
+    }
+
+    /// Returns use declaration at cursor position (if any).
+    pub fn find_use_decl(&self) -> Option<P::Use> {
+        if let CursorPosition::Use(use_) = &self.position {
+            return Some(use_.value.clone());
+        }
+        None
+    }
 }
 
 #[derive(Clone, Debug)]
@@ -414,6 +492,8 @@ pub enum CursorPosition {
     FieldDefn(P::Field),
     Parameter(P::Var),
     DefName,
+    Attribute(P::AttributeValue),
+    Use(Spanned<P::Use>),
     Unknown,
     // FIXME: These two are currently unused because these forms don't have enough location
     // recorded on them during parsing.
@@ -428,33 +508,6 @@ pub enum CursorDefinition {
     Struct(P::DatatypeName),
     Enum(P::DatatypeName),
 }
-/// Data used during symbolication over parsed AST
-pub struct ParsingSymbolicator<'a> {
-    /// Outermost definitions in a module (structs, consts, functions), keyd on a ModuleIdent
-    /// string so that we can access it regardless of the ModuleIdent representation
-    /// (e.g., in the parsing AST or in the typing AST)
-    mod_outer_defs: &'a mut BTreeMap<String, ModuleDefs>,
-    /// Mapped file information for translating locations into positions
-    files: &'a MappedFiles,
-    /// Associates uses for a given definition to allow displaying all references
-    references: &'a mut References,
-    /// Additional information about definitions
-    def_info: &'a mut DefMap,
-    /// A UseDefMap for a given module (needs to be appropriately set before the module
-    /// processing starts)
-    use_defs: UseDefMap,
-    /// Current module identifier string (needs to be appropriately set before the module
-    /// processing starts)
-    current_mod_ident_str: Option<String>,
-    /// Module name lengths in access paths for a given module (needs to be appropriately
-    /// set before the module processing starts)
-    alias_lengths: BTreeMap<Position, usize>,
-    /// A per-package mapping from package names to their addresses (needs to be appropriately set
-    /// before the package processint starts)
-    pkg_addresses: &'a NamedAddressMap,
-    /// Cursor contextual information, computed as part of the traversal.
-    cursor: Option<&'a mut CursorContext>,
-}
 
 type LineOffset = u32;
 
@@ -746,6 +799,14 @@ impl fmt::Display for CursorContext {
         }?;
         write!(f, "- position: ")?;
         match position {
+            CursorPosition::Attribute(value) => {
+                writeln!(f, "attribute value")?;
+                writeln!(f, "- value: {:#?}", value)?;
+            }
+            CursorPosition::Use(value) => {
+                writeln!(f, "use value")?;
+                writeln!(f, "- value: {:#?}", value)?;
+            }
             CursorPosition::DefName => {
                 writeln!(f, "defn name")?;
             }
@@ -1274,7 +1335,7 @@ impl UseDef {
     }
 
     /// Given a UseDef, modify just the use name and location (to make it represent an alias).
-    fn rename_use(
+    pub fn rename_use(
         &mut self,
         references: &mut References,
         new_name: Symbol,
@@ -1726,7 +1787,7 @@ pub fn get_symbols(
     let mut file_use_defs = BTreeMap::new();
     let mut mod_to_alias_lengths = BTreeMap::new();
 
-    let mut parsing_symbolicator = ParsingSymbolicator {
+    let mut parsing_symbolicator = parsing_analysis::ParsingAnalysisContext {
         mod_outer_defs: &mut mod_outer_defs,
         files: &mapped_files,
         references: &mut references,
@@ -1922,64 +1983,6 @@ fn file_sources(
         .collect()
 }
 
-/// Produces module ident string of the form pkg::module to be used as a map key.
-/// It's important that these are consistent between parsing AST and typed AST,
-fn parsing_mod_ident_to_map_key(
-    pkg_addresses: &NamedAddressMap,
-    mod_ident: &P::ModuleIdent_,
-) -> String {
-    format!(
-        "{}::{}",
-        parsed_address(mod_ident.address, pkg_addresses),
-        mod_ident.module
-    )
-    .to_string()
-}
-
-/// Produces module ident string of the form pkg::module to be used as a map key.
-/// It's important that these are consistent between parsing AST and typed AST.
-fn parsing_mod_def_to_map_key(
-    pkg_addresses: &NamedAddressMap,
-    mod_def: &P::ModuleDefinition,
-) -> Option<String> {
-    // we assume that modules are declared using the PkgName::ModName pattern (which seems to be the
-    // standard practice) and while Move allows other ways of defining modules (i.e., with address
-    // preceding a sequence of modules), this method is now deprecated.
-    //
-    // TODO: make this function simply return String when the other way of defining modules is
-    // removed
-    mod_def
-        .address
-        .map(|a| parsing_leading_and_mod_names_to_map_key(pkg_addresses, a, mod_def.name))
-}
-
-/// Produces module ident string of the form pkg::module to be used as a map key.
-/// It's important that these are consistent between parsing AST and typed AST.
-fn parsing_leading_and_mod_names_to_map_key(
-    pkg_addresses: &NamedAddressMap,
-    ln: P::LeadingNameAccess,
-    name: P::ModuleName,
-) -> String {
-    format!("{}::{}", parsed_address(ln, pkg_addresses), name).to_string()
-}
-
-/// Converts parsing AST's `LeadingNameAccess` to expansion AST's `Address` (similarly to
-/// expansion::translate::top_level_address but disregarding the name portion of `Address` as we
-/// only care about actual address here if it's available). We need this to be able to reliably
-/// compare parsing AST's module identifier with expansion/typing AST's module identifier, even in
-/// presence of module renaming (i.e., we cannot rely on module names if addresses are available).
-fn parsed_address(ln: P::LeadingNameAccess, pkg_addresses: &NamedAddressMap) -> E::Address {
-    let sp!(loc, ln_) = ln;
-    match ln_ {
-        P::LeadingNameAccess_::AnonymousAddress(bytes) => E::Address::anonymous(loc, bytes),
-        P::LeadingNameAccess_::GlobalAddress(name) => E::Address::NamedUnassigned(name),
-        P::LeadingNameAccess_::Name(name) => match pkg_addresses.get(&name.value).copied() {
-            Some(addr) => E::Address::anonymous(loc, addr),
-            None => E::Address::NamedUnassigned(name),
-        },
-    }
-}
-
 /// Produces module ident string of the form pkg::module to be used as a map key
 /// It's important that these are consistent between parsing AST and typed AST.
 pub fn expansion_mod_ident_to_map_key(mod_ident: &E::ModuleIdent_) -> String {
@@ -2004,18 +2007,6 @@ pub fn empty_symbols() -> Symbols {
     }
 }
 
-/// Some functions defined in a module need to be ignored.
-fn ignored_function(name: Symbol) -> bool {
-    // In test mode (that's how IDE compiles Move source files),
-    // the compiler inserts an dummy function preventing preventing
-    // publishing of modules compiled in test mode. We need to
-    // ignore its definition to avoid spurious on-hover display
-    // of this function's info whe hovering close to `module` keyword.
-    name == UNIT_TEST_POISON_FUN_NAME
-}
-
-/// Main AST traversal functions
-
 fn field_defs_and_types(
     datatype_name: Symbol,
     datatype_loc: Loc,
@@ -2063,6 +2054,15 @@ fn datatype_type_params(data_tparams: &[DatatypeTypeParameter]) -> Vec<(Type, /*
         .collect()
 }
 
+/// Some functions defined in a module need to be ignored.
+pub fn ignored_function(name: Symbol) -> bool {
+    // In test mode (that's how IDE compiles Move source files), the compiler inserts an dummy
+    // function preventing publishing of modules compiled in test mode. We need to ignore its
+    // definition to avoid spurious on-hover display of this function's info whe hovering close to
+    // `module` keyword.
+    name == UNIT_TEST_POISON_FUN_NAME
+}
+
 /// Get symbols for outer definitions in the module (functions, structs, and consts)
 fn get_mod_outer_defs(
     loc: &Loc,
@@ -2157,7 +2157,7 @@ fn get_mod_outer_defs(
             };
             let field_names = field_defs.iter().map(|f| sp(f.loc, f.name)).collect();
             def_info_variants.push(VariantInfo {
-                name: *vname,
+                name: sp(vname_loc, *vname),
                 empty: field_defs.is_empty(),
                 positional,
             });
@@ -2314,703 +2314,6 @@ fn get_mod_outer_defs(
     (mod_defs, use_def_map)
 }
 
-macro_rules! update_cursor {
-    ($cursor:expr, $subject:expr, $kind:ident) => {
-        if let Some(cursor) = &mut $cursor {
-            if $subject.loc.contains(&cursor.loc) {
-                cursor.position = CursorPosition::$kind($subject.clone());
-            }
-        };
-    };
-    (IDENT, $cursor:expr, $subject:expr, $kind:ident) => {
-        if let Some(cursor) = &mut $cursor {
-            if $subject.loc().contains(&cursor.loc) {
-                cursor.position = CursorPosition::$kind($subject.clone());
-            }
-        };
-    };
-}
-
-impl<'a> ParsingSymbolicator<'a> {
-    /// Get symbols for the whole program
-    fn prog_symbols(
-        &mut self,
-        prog: &'a P::Program,
-        mod_use_defs: &mut BTreeMap<String, UseDefMap>,
-        mod_to_alias_lengths: &mut BTreeMap<String, BTreeMap<Position, usize>>,
-    ) {
-        prog.source_definitions.iter().for_each(|pkg_def| {
-            self.pkg_symbols(
-                &prog.named_address_maps,
-                pkg_def,
-                mod_use_defs,
-                mod_to_alias_lengths,
-            )
-        });
-        prog.lib_definitions.iter().for_each(|pkg_def| {
-            self.pkg_symbols(
-                &prog.named_address_maps,
-                pkg_def,
-                mod_use_defs,
-                mod_to_alias_lengths,
-            )
-        });
-    }
-
-    /// Get symbols for the whole package
-    fn pkg_symbols(
-        &mut self,
-        pkg_address_maps: &'a NamedAddressMaps,
-        pkg_def: &P::PackageDefinition,
-        mod_use_defs: &mut BTreeMap<String, UseDefMap>,
-        mod_to_alias_lengths: &mut BTreeMap<String, BTreeMap<Position, usize>>,
-    ) {
-        if let P::Definition::Module(mod_def) = &pkg_def.def {
-            let pkg_addresses = pkg_address_maps.get(pkg_def.named_address_map);
-            let old_addresses = std::mem::replace(&mut self.pkg_addresses, pkg_addresses);
-            self.mod_symbols(mod_def, mod_use_defs, mod_to_alias_lengths);
-            self.current_mod_ident_str = None;
-            let _ = std::mem::replace(&mut self.pkg_addresses, old_addresses);
-        }
-    }
-
-    /// Get symbols for the whole module
-    fn mod_symbols(
-        &mut self,
-        mod_def: &P::ModuleDefinition,
-        mod_use_defs: &mut BTreeMap<String, UseDefMap>,
-        mod_to_alias_lengths: &mut BTreeMap<String, BTreeMap<Position, usize>>,
-    ) {
-        // parsing symbolicator is currently only responsible for processing use declarations
-        let Some(mod_ident_str) = parsing_mod_def_to_map_key(self.pkg_addresses, mod_def) else {
-            return;
-        };
-        assert!(self.current_mod_ident_str.is_none());
-        self.current_mod_ident_str = Some(mod_ident_str.clone());
-
-        let use_defs = mod_use_defs.remove(&mod_ident_str).unwrap();
-        let old_defs = std::mem::replace(&mut self.use_defs, use_defs);
-        let alias_lengths: BTreeMap<Position, usize> = BTreeMap::new();
-        let old_alias_lengths = std::mem::replace(&mut self.alias_lengths, alias_lengths);
-
-        for m in &mod_def.members {
-            use P::ModuleMember as MM;
-            match m {
-                MM::Function(fun) => {
-                    if ignored_function(fun.name.value()) {
-                        continue;
-                    }
-
-                    // Unit returns span the entire function signature, so we process them first
-                    // for cursor ordering.
-                    self.type_symbols(&fun.signature.return_type);
-
-                    // If the cursor is in this item, mark that down.
-                    // This may be overridden by the recursion below.
-                    if let Some(cursor) = &mut self.cursor {
-                        if fun.name.loc().contains(&cursor.loc) {
-                            cursor.position = CursorPosition::DefName;
-                            debug_assert!(cursor.defn_name.is_none());
-                            cursor.defn_name = Some(CursorDefinition::Function(fun.name));
-                        } else if fun.loc.contains(&cursor.loc) {
-                            cursor.defn_name = Some(CursorDefinition::Function(fun.name));
-                        }
-                    };
-
-                    for (_, x, t) in fun.signature.parameters.iter() {
-                        update_cursor!(IDENT, self.cursor, x, Parameter);
-                        self.type_symbols(t)
-                    }
-
-                    if fun.macro_.is_some() {
-                        // we currently do not process macro function bodies
-                        // in the parsing symbolicator (and do very limited
-                        // processing in typing symbolicator)
-                        continue;
-                    }
-                    if let P::FunctionBody_::Defined(seq) = &fun.body.value {
-                        self.seq_symbols(seq);
-                    };
-                }
-                MM::Struct(sdef) => {
-                    // If the cursor is in this item, mark that down.
-                    // This may be overridden by the recursion below.
-                    if let Some(cursor) = &mut self.cursor {
-                        if sdef.name.loc().contains(&cursor.loc) {
-                            cursor.position = CursorPosition::DefName;
-                            debug_assert!(cursor.defn_name.is_none());
-                            cursor.defn_name = Some(CursorDefinition::Struct(sdef.name));
-                        } else if sdef.loc.contains(&cursor.loc) {
-                            cursor.defn_name = Some(CursorDefinition::Struct(sdef.name));
-                        }
-                    };
-                    match &sdef.fields {
-                        P::StructFields::Named(v) => v.iter().for_each(|(x, t)| {
-                            self.field_defn(x);
-                            self.type_symbols(t)
-                        }),
-                        P::StructFields::Positional(v) => {
-                            v.iter().for_each(|t| self.type_symbols(t))
-                        }
-                        P::StructFields::Native(_) => (),
-                    }
-                }
-                MM::Enum(edef) => {
-                    // If the cursor is in this item, mark that down.
-                    // This may be overridden by the recursion below.
-                    if let Some(cursor) = &mut self.cursor {
-                        if edef.name.loc().contains(&cursor.loc) {
-                            cursor.position = CursorPosition::DefName;
-                            debug_assert!(cursor.defn_name.is_none());
-                            cursor.defn_name = Some(CursorDefinition::Enum(edef.name));
-                        } else if edef.loc.contains(&cursor.loc) {
-                            cursor.defn_name = Some(CursorDefinition::Enum(edef.name));
-                        }
-                    };
-
-                    let P::EnumDefinition { variants, .. } = edef;
-                    for variant in variants {
-                        let P::VariantDefinition { fields, .. } = variant;
-                        match fields {
-                            P::VariantFields::Named(v) => v.iter().for_each(|(x, t)| {
-                                self.field_defn(x);
-                                self.type_symbols(t)
-                            }),
-                            P::VariantFields::Positional(v) => {
-                                v.iter().for_each(|t| self.type_symbols(t))
-                            }
-                            P::VariantFields::Empty => (),
-                        }
-                    }
-                }
-                MM::Use(use_decl) => self.use_decl_symbols(use_decl),
-                MM::Friend(fdecl) => self.chain_symbols(&fdecl.friend),
-                MM::Constant(c) => {
-                    // If the cursor is in this item, mark that down.
-                    // This may be overridden by the recursion below.
-                    if let Some(cursor) = &mut self.cursor {
-                        if c.name.loc().contains(&cursor.loc) {
-                            cursor.position = CursorPosition::DefName;
-                            debug_assert!(cursor.defn_name.is_none());
-                            cursor.defn_name = Some(CursorDefinition::Constant(c.name));
-                        } else if c.loc.contains(&cursor.loc) {
-                            cursor.defn_name = Some(CursorDefinition::Constant(c.name));
-                        }
-                    };
-                    self.type_symbols(&c.signature);
-                    self.exp_symbols(&c.value);
-                }
-                MM::Spec(_) => (),
-            }
-        }
-        self.current_mod_ident_str = None;
-        let processed_defs = std::mem::replace(&mut self.use_defs, old_defs);
-        mod_use_defs.insert(mod_ident_str.clone(), processed_defs);
-        let processed_alias_lengths = std::mem::replace(&mut self.alias_lengths, old_alias_lengths);
-        mod_to_alias_lengths.insert(mod_ident_str, processed_alias_lengths);
-    }
-
-    /// Get symbols for a sequence item
-    fn seq_item_symbols(&mut self, seq_item: &P::SequenceItem) {
-        use P::SequenceItem_ as I;
-
-        // If the cursor is in this item, mark that down.
-        // This may be overridden by the recursion below.
-        update_cursor!(self.cursor, seq_item, SeqItem);
-
-        match &seq_item.value {
-            I::Seq(e) => self.exp_symbols(e),
-            I::Declare(v, to) => {
-                v.value
-                    .iter()
-                    .for_each(|bind| self.bind_symbols(bind, to.is_some()));
-                if let Some(t) = to {
-                    self.type_symbols(t);
-                }
-            }
-            I::Bind(v, to, e) => {
-                v.value
-                    .iter()
-                    .for_each(|bind| self.bind_symbols(bind, to.is_some()));
-                if let Some(t) = to {
-                    self.type_symbols(t);
-                }
-                self.exp_symbols(e);
-            }
-        }
-    }
-
-    fn path_entry_symbols(&mut self, path: &P::PathEntry) {
-        let P::PathEntry {
-            name: _,
-            tyargs,
-            is_macro: _,
-        } = path;
-        if let Some(sp!(_, tyargs)) = tyargs {
-            tyargs.iter().for_each(|t| self.type_symbols(t));
-        }
-    }
-
-    fn root_path_entry_symbols(&mut self, path: &P::RootPathEntry) {
-        let P::RootPathEntry {
-            name: _,
-            tyargs,
-            is_macro: _,
-        } = path;
-        if let Some(sp!(_, tyargs)) = tyargs {
-            tyargs.iter().for_each(|t| self.type_symbols(t));
-        }
-    }
-
-    /// Get symbols for an expression
-    fn exp_symbols(&mut self, exp: &P::Exp) {
-        use P::Exp_ as E;
-        fn last_chain_symbol_loc(sp!(_, chain): &NameAccessChain) -> Loc {
-            use NameAccessChain_ as NA;
-            match chain {
-                NA::Single(entry) => entry.name.loc,
-                NA::Path(path) => {
-                    if path.entries.is_empty() {
-                        path.root.name.loc
-                    } else {
-                        path.entries.last().unwrap().name.loc
-                    }
-                }
-            }
-        }
-
-        // If the cursor is in this item, mark that down.
-        // This may be overridden by the recursion below.
-        update_cursor!(self.cursor, exp, Exp);
-
-        match &exp.value {
-            E::Move(_, e) => self.exp_symbols(e),
-            E::Copy(_, e) => self.exp_symbols(e),
-            E::Name(chain) => self.chain_symbols(chain),
-            E::Call(chain, v) => {
-                self.chain_symbols(chain);
-                v.value.iter().for_each(|e| self.exp_symbols(e));
-                assert!(self.current_mod_ident_str.is_some());
-                if let Some(mod_defs) = self
-                    .mod_outer_defs
-                    .get_mut(&self.current_mod_ident_str.clone().unwrap())
-                {
-                    mod_defs.call_infos.insert(
-                        last_chain_symbol_loc(chain),
-                        CallInfo::new(/* do_call */ false, &v.value),
-                    );
-                };
-            }
-            E::Pack(chain, v) => {
-                self.chain_symbols(chain);
-                v.iter().for_each(|(_, e)| self.exp_symbols(e));
-            }
-            E::Vector(_, vo, v) => {
-                if let Some(v) = vo {
-                    v.iter().for_each(|t| self.type_symbols(t));
-                }
-                v.value.iter().for_each(|e| self.exp_symbols(e));
-            }
-            E::IfElse(e1, e2, oe) => {
-                self.exp_symbols(e1);
-                self.exp_symbols(e2);
-                if let Some(e) = oe.as_ref() {
-                    self.exp_symbols(e)
-                }
-            }
-            E::Match(e, sp!(_, v)) => {
-                self.exp_symbols(e);
-                v.iter().for_each(|sp!(_, arm)| {
-                    self.match_pattern_symbols(&arm.pattern);
-                    if let Some(g) = &arm.guard {
-                        self.exp_symbols(g);
-                    }
-                    self.exp_symbols(&arm.rhs);
-                })
-            }
-            E::While(e1, e2) => {
-                self.exp_symbols(e1);
-                self.exp_symbols(e2);
-            }
-            E::Loop(e) => self.exp_symbols(e),
-            E::Labeled(_, e) => self.exp_symbols(e),
-            E::Block(seq) => self.seq_symbols(seq),
-            E::Lambda(sp!(_, bindings), to, e) => {
-                for (sp!(_, v), bto) in bindings {
-                    if let Some(bt) = bto {
-                        self.type_symbols(bt);
-                    }
-                    v.iter()
-                        .for_each(|bind| self.bind_symbols(bind, to.is_some()));
-                }
-                if let Some(t) = to {
-                    self.type_symbols(t);
-                }
-                self.exp_symbols(e);
-            }
-            E::ExpList(l) => l.iter().for_each(|e| self.exp_symbols(e)),
-            E::Parens(e) => self.exp_symbols(e),
-            E::Assign(e1, e2) => {
-                self.exp_symbols(e1);
-                self.exp_symbols(e2);
-            }
-            E::Abort(e) => self.exp_symbols(e),
-            E::Return(_, oe) => {
-                if let Some(e) = oe.as_ref() {
-                    self.exp_symbols(e)
-                }
-            }
-            E::Break(_, oe) => {
-                if let Some(e) = oe.as_ref() {
-                    self.exp_symbols(e)
-                }
-            }
-            E::Dereference(e) => self.exp_symbols(e),
-            E::UnaryExp(_, e) => self.exp_symbols(e),
-            E::BinopExp(e1, _, e2) => {
-                self.exp_symbols(e1);
-                self.exp_symbols(e2);
-            }
-            E::Borrow(_, e) => self.exp_symbols(e),
-            E::Dot(e, _) => self.exp_symbols(e),
-            E::DotCall(e, name, _, vo, v) => {
-                self.exp_symbols(e);
-                if let Some(v) = vo {
-                    v.iter().for_each(|t| self.type_symbols(t));
-                }
-                v.value.iter().for_each(|e| self.exp_symbols(e));
-                assert!(self.current_mod_ident_str.is_some());
-                if let Some(mod_defs) = self
-                    .mod_outer_defs
-                    .get_mut(&self.current_mod_ident_str.clone().unwrap())
-                {
-                    mod_defs
-                        .call_infos
-                        .insert(name.loc, CallInfo::new(/* do_call */ true, &v.value));
-                };
-            }
-            E::Index(e, v) => {
-                self.exp_symbols(e);
-                v.value.iter().for_each(|e| self.exp_symbols(e));
-            }
-            E::Cast(e, t) => {
-                self.exp_symbols(e);
-                self.type_symbols(t);
-            }
-            E::Annotate(e, t) => {
-                self.exp_symbols(e);
-                self.type_symbols(t);
-            }
-            E::DotUnresolved(_, e) => self.exp_symbols(e),
-            E::Value(_)
-            | E::Quant(..)
-            | E::Unit
-            | E::Continue(_)
-            | E::Spec(_)
-            | E::UnresolvedError => (),
-        }
-    }
-
-    fn match_pattern_symbols(&mut self, sp!(_, pattern): &P::MatchPattern) {
-        use P::MatchPattern_ as MP;
-        match pattern {
-            MP::PositionalConstructor(chain, sp!(_, v)) => {
-                self.chain_symbols(chain);
-                v.iter().for_each(|e| {
-                    if let P::Ellipsis::Binder(m) = e {
-                        self.match_pattern_symbols(m);
-                    }
-                })
-            }
-            MP::FieldConstructor(chain, sp!(_, v)) => {
-                self.chain_symbols(chain);
-                v.iter().for_each(|e| {
-                    if let P::Ellipsis::Binder((_, m)) = e {
-                        self.match_pattern_symbols(m);
-                    }
-                })
-            }
-            MP::Name(_, chain) => {
-                self.chain_symbols(chain);
-                assert!(self.current_mod_ident_str.is_some());
-                if let Some(mod_defs) = self
-                    .mod_outer_defs
-                    .get_mut(&self.current_mod_ident_str.clone().unwrap())
-                {
-                    mod_defs.untyped_defs.insert(chain.loc);
-                };
-            }
-            MP::Or(m1, m2) => {
-                self.match_pattern_symbols(m2);
-                self.match_pattern_symbols(m1);
-            }
-            MP::At(_, m) => self.match_pattern_symbols(m),
-            MP::Literal(_) => (),
-        }
-    }
-
-    /// Get symbols for a sequence
-    fn seq_symbols(&mut self, (use_decls, seq_items, _, oe): &P::Sequence) {
-        use_decls
-            .iter()
-            .for_each(|use_decl| self.use_decl_symbols(use_decl));
-
-        seq_items
-            .iter()
-            .for_each(|seq_item| self.seq_item_symbols(seq_item));
-        if let Some(e) = oe.as_ref().as_ref() {
-            self.exp_symbols(e)
-        }
-    }
-
-    /// Get symbols for a use declaration
-    fn use_decl_symbols(&mut self, use_decl: &P::UseDecl) {
-        match &use_decl.use_ {
-            P::Use::ModuleUse(mod_ident, mod_use) => {
-                let mod_ident_str =
-                    parsing_mod_ident_to_map_key(self.pkg_addresses, &mod_ident.value);
-                self.mod_name_symbol(&mod_ident.value.module, &mod_ident_str);
-                self.mod_use_symbols(mod_use, &mod_ident_str);
-            }
-            P::Use::NestedModuleUses(leading_name, uses) => {
-                for (mod_name, mod_use) in uses {
-                    let mod_ident_str = parsing_leading_and_mod_names_to_map_key(
-                        self.pkg_addresses,
-                        *leading_name,
-                        *mod_name,
-                    );
-
-                    self.mod_name_symbol(mod_name, &mod_ident_str);
-                    self.mod_use_symbols(mod_use, &mod_ident_str);
-                }
-            }
-            P::Use::Fun {
-                visibility: _,
-                function,
-                ty,
-                method: _,
-            } => {
-                self.chain_symbols(function);
-                self.chain_symbols(ty);
-            }
-        }
-    }
-
-    /// Get module name symbol
-    fn mod_name_symbol(&mut self, mod_name: &P::ModuleName, mod_ident_str: &String) {
-        let Some(mod_defs) = self.mod_outer_defs.get_mut(mod_ident_str) else {
-            return;
-        };
-        let Some(mod_name_start) = loc_start_to_lsp_position_opt(self.files, &mod_name.loc())
-        else {
-            debug_assert!(false);
-            return;
-        };
-        self.use_defs.insert(
-            mod_name_start.line,
-            UseDef::new(
-                self.references,
-                &BTreeMap::new(),
-                mod_name.loc().file_hash(),
-                mod_name_start,
-                mod_defs.name_loc,
-                &mod_name.value(),
-                None,
-            ),
-        );
-    }
-
-    /// Get symbols for a module use
-    fn mod_use_symbols(&mut self, mod_use: &P::ModuleUse, mod_ident_str: &String) {
-        match mod_use {
-            P::ModuleUse::Module(Some(alias_name)) => {
-                self.mod_name_symbol(alias_name, mod_ident_str);
-            }
-            P::ModuleUse::Module(None) => (), // nothing more to do
-            P::ModuleUse::Members(v) => {
-                for (name, alias_opt) in v {
-                    self.use_decl_member_symbols(mod_ident_str.clone(), name, alias_opt);
-                }
-            }
-        }
-    }
-
-    /// Get symbols for a module member in the use declaration (can be a struct or a function)
-    fn use_decl_member_symbols(
-        &mut self,
-        mod_ident_str: String,
-        name: &Name,
-        alias_opt: &Option<Name>,
-    ) {
-        let Some(mod_defs) = self.mod_outer_defs.get(&mod_ident_str) else {
-            return;
-        };
-        if let Some(mut ud) = add_member_use_def(
-            &name.value,
-            self.files,
-            mod_defs,
-            &name.value,
-            &name.loc,
-            self.references,
-            self.def_info,
-            &mut self.use_defs,
-            &BTreeMap::new(),
-        ) {
-            // it's a struct - add it for the alias as well
-            if let Some(alias) = alias_opt {
-                let Some(alias_start) = loc_start_to_lsp_position_opt(self.files, &alias.loc)
-                else {
-                    debug_assert!(false);
-                    return;
-                };
-                ud.rename_use(
-                    self.references,
-                    alias.value,
-                    alias_start,
-                    alias.loc.file_hash(),
-                );
-                self.use_defs.insert(alias_start.line, ud);
-            }
-            return;
-        }
-        if let Some(mut ud) = add_member_use_def(
-            &name.value,
-            self.files,
-            mod_defs,
-            &name.value,
-            &name.loc,
-            self.references,
-            self.def_info,
-            &mut self.use_defs,
-            &BTreeMap::new(),
-        ) {
-            // it's a function - add it for the alias as well
-            if let Some(alias) = alias_opt {
-                let Some(alias_start) = loc_start_to_lsp_position_opt(self.files, &alias.loc)
-                else {
-                    debug_assert!(false);
-                    return;
-                };
-                ud.rename_use(
-                    self.references,
-                    alias.value,
-                    alias_start,
-                    alias.loc.file_hash(),
-                );
-                self.use_defs.insert(alias_start.line, ud);
-            }
-        }
-    }
-
-    /// Get symbols for a type
-    fn type_symbols(&mut self, type_: &P::Type) {
-        use P::Type_ as T;
-
-        // If the cursor is in this item, mark that down.
-        // This may be overridden by the recursion below.
-        update_cursor!(self.cursor, type_, Type);
-
-        match &type_.value {
-            T::Apply(chain) => {
-                self.chain_symbols(chain);
-            }
-            T::Ref(_, t) => self.type_symbols(t),
-            T::Fun(v, t) => {
-                v.iter().for_each(|t| self.type_symbols(t));
-                self.type_symbols(t);
-            }
-            T::Multiple(v) => v.iter().for_each(|t| self.type_symbols(t)),
-            T::Unit => (),
-            T::UnresolvedError => (),
-        }
-    }
-
-    /// Get symbols for a bind statement
-    fn bind_symbols(&mut self, bind: &P::Bind, explicitly_typed: bool) {
-        use P::Bind_ as B;
-
-        // If the cursor is in this item, mark that down.
-        // This may be overridden by the recursion below.
-        update_cursor!(self.cursor, bind, Binding);
-
-        match &bind.value {
-            B::Unpack(chain, bindings) => {
-                self.chain_symbols(chain);
-                match bindings {
-                    P::FieldBindings::Named(v) => {
-                        for symbol in v {
-                            match symbol {
-                                P::Ellipsis::Binder((_, x)) => self.bind_symbols(x, false),
-                                P::Ellipsis::Ellipsis(_) => (),
-                            }
-                        }
-                    }
-                    P::FieldBindings::Positional(v) => {
-                        for symbol in v.iter() {
-                            match symbol {
-                                P::Ellipsis::Binder(x) => self.bind_symbols(x, false),
-                                P::Ellipsis::Ellipsis(_) => (),
-                            }
-                        }
-                    }
-                }
-            }
-            B::Var(_, var) => {
-                if !explicitly_typed {
-                    assert!(self.current_mod_ident_str.is_some());
-                    if let Some(mod_defs) = self
-                        .mod_outer_defs
-                        .get_mut(&self.current_mod_ident_str.clone().unwrap())
-                    {
-                        mod_defs.untyped_defs.insert(var.loc());
-                    };
-                }
-            }
-        }
-    }
-
-    /// Get symbols for a name access chain
-    fn chain_symbols(&mut self, sp!(_, chain): &P::NameAccessChain) {
-        use P::NameAccessChain_ as NA;
-        // Record the length of all identifiers representing a potentially
-        // aliased module, struct, enum or function name in an access chain.
-        // We can conservatively record all identifiers as they are only
-        // accessed by-location so those irrelevant will never be queried.
-        match chain {
-            NA::Single(entry) => {
-                self.path_entry_symbols(entry);
-                if let Some(loc) = loc_start_to_lsp_position_opt(self.files, &entry.name.loc) {
-                    self.alias_lengths.insert(loc, entry.name.value.len());
-                };
-            }
-            NA::Path(path) => {
-                let P::NamePath {
-                    root,
-                    entries,
-                    is_incomplete: _,
-                } = path;
-                self.root_path_entry_symbols(root);
-                if let Some(root_loc) = loc_start_to_lsp_position_opt(self.files, &root.name.loc) {
-                    if let P::LeadingNameAccess_::Name(n) = root.name.value {
-                        self.alias_lengths.insert(root_loc, n.value.len());
-                    }
-                };
-                entries.iter().for_each(|entry| {
-                    self.path_entry_symbols(entry);
-                    if let Some(loc) = loc_start_to_lsp_position_opt(self.files, &entry.name.loc) {
-                        self.alias_lengths.insert(loc, entry.name.value.len());
-                    };
-                });
-            }
-        };
-    }
-
-    fn field_defn(&mut self, field: &P::Field) {
-        // If the cursor is in this item, mark that down.
-        update_cursor!(IDENT, self.cursor, field, FieldDefn);
-    }
-}
-
 /// Add use of a function, method, struct or enum identifier
 pub fn add_member_use_def(
     member_def_name: &Symbol, // may be different from use_name for methods
diff --git a/external-crates/move/crates/move-analyzer/tests/colon_colon_completion.exp b/external-crates/move/crates/move-analyzer/tests/colon_colon_completion.exp
new file mode 100644
index 0000000000000..da343069e482c
--- /dev/null
+++ b/external-crates/move/crates/move-analyzer/tests/colon_colon_completion.exp
@@ -0,0 +1,1402 @@
+== colon_colon.move ========================================================
+-- test 0 -------------------
+use line: 15, use_col: 68
+Struct 'CompletionStruct'
+Struct 'SomeStruct'
+Enum 'SomeEnum'
+Enum 'TargEnum'
+
+-- test 1 -------------------
+use line: 21, use_col: 22
+Unit '0x1'
+Unit '0xA'
+Unit '0xCAFE'
+Unit 'Completion'
+Unit 'std'
+Module 'CC'
+Module 'Self'
+Module 'option'
+Module 'vector'
+Struct 'CompletionStruct'
+Struct 'Option'
+Enum 'SE'
+Constant 'SOME_CONST'
+Enum 'SomeEnum'
+Struct 'SomeStruct'
+Enum 'TargEnum'
+Method 'attr_chain()'
+    INSERT TEXT: 'attr_chain()'
+    TARGET     : '(Completion::colon_colon::attr_chain)'
+    TYPE       : 'fun ()'
+Method 'complete_chains()'
+    INSERT TEXT: 'complete_chains(${1:s})'
+    TARGET     : '(Completion::colon_colon::complete_chains)'
+    TYPE       : 'fun (SomeStruct)'
+Method 'multi_colon_colon()'
+    INSERT TEXT: 'multi_colon_colon()'
+    TARGET     : '(Completion::colon_colon::multi_colon_colon)'
+    TYPE       : 'fun ()'
+Method 'one_colon_colon()'
+    INSERT TEXT: 'one_colon_colon()'
+    TARGET     : '(Completion::colon_colon::one_colon_colon)'
+    TYPE       : 'fun ()'
+Method 'sbar()'
+    INSERT TEXT: 'sbar(${1:_param1}, ${2:_param2})'
+    TARGET     : '(Completion::colon_colon::sbar)'
+    TYPE       : 'fun (u64, SomeStruct)'
+Method 'sbaz()'
+    INSERT TEXT: 'sbaz()'
+    TARGET     : '(Completion::colon_colon::sbaz)'
+    TYPE       : 'fun ()'
+Method 'single_ident()'
+    INSERT TEXT: 'single_ident()'
+    TARGET     : '(Completion::colon_colon::single_ident)'
+    TYPE       : 'fun ()'
+Method 'targ_chain()'
+    INSERT TEXT: 'targ_chain()'
+    TARGET     : '(Completion::colon_colon::targ_chain)'
+    TYPE       : 'fun ()'
+Method 'targ_type()'
+    INSERT TEXT: 'targ_type(${1:p})'
+    TARGET     : '(Completion::colon_colon::targ_type)'
+    TYPE       : 'fun <SOME_TYPE>(SOME_TYPE)'
+
+-- test 2 -------------------
+use line: 21, use_col: 34
+Module 'colon_colon'
+Module 'dot'
+Module 'init'
+Module 'init_otw'
+Module 'macro_dot'
+Module 'object'
+Module 'other_mod_dot'
+Module 'uses'
+
+-- test 3 -------------------
+use line: 21, use_col: 47
+Method 'attr_chain()'
+    INSERT TEXT: 'attr_chain()'
+    TARGET     : '(Completion::colon_colon::attr_chain)'
+    TYPE       : 'fun ()'
+Method 'complete_chains()'
+    INSERT TEXT: 'complete_chains(${1:s})'
+    TARGET     : '(Completion::colon_colon::complete_chains)'
+    TYPE       : 'fun (SomeStruct)'
+Method 'multi_colon_colon()'
+    INSERT TEXT: 'multi_colon_colon()'
+    TARGET     : '(Completion::colon_colon::multi_colon_colon)'
+    TYPE       : 'fun ()'
+Method 'one_colon_colon()'
+    INSERT TEXT: 'one_colon_colon()'
+    TARGET     : '(Completion::colon_colon::one_colon_colon)'
+    TYPE       : 'fun ()'
+Method 'sbar()'
+    INSERT TEXT: 'sbar(${1:_param1}, ${2:_param2})'
+    TARGET     : '(Completion::colon_colon::sbar)'
+    TYPE       : 'fun (u64, SomeStruct)'
+Method 'sbaz()'
+    INSERT TEXT: 'sbaz()'
+    TARGET     : '(Completion::colon_colon::sbaz)'
+    TYPE       : 'fun ()'
+Method 'single_ident()'
+    INSERT TEXT: 'single_ident()'
+    TARGET     : '(Completion::colon_colon::single_ident)'
+    TYPE       : 'fun ()'
+Method 'targ_chain()'
+    INSERT TEXT: 'targ_chain()'
+    TARGET     : '(Completion::colon_colon::targ_chain)'
+    TYPE       : 'fun ()'
+Method 'targ_type()'
+    INSERT TEXT: 'targ_type(${1:p})'
+    TARGET     : '(Completion::colon_colon::targ_type)'
+    TYPE       : 'fun <SOME_TYPE>(SOME_TYPE)'
+Struct 'CompletionStruct'
+Struct 'SomeStruct'
+Enum 'SomeEnum'
+Enum 'TargEnum'
+Constant 'SOME_CONST'
+
+-- test 4 -------------------
+use line: 21, use_col: 57
+EnumMember 'SomeNamedVariant{}'
+    INSERT TEXT: 'SomeNamedVariant{${1:name1}, ${2:name2}}'
+EnumMember 'SomePositionalVariant()'
+    INSERT TEXT: 'SomePositionalVariant(${1}, ${2})'
+EnumMember 'SomeVariant'
+    INSERT TEXT: 'SomeVariant{}'
+
+-- test 5 -------------------
+use line: 22, use_col: 11
+Unit '0x1'
+Unit '0xA'
+Unit '0xCAFE'
+Unit 'Completion'
+Unit 'std'
+
+-- test 6 -------------------
+use line: 22, use_col: 46
+EnumMember 'SomeNamedVariant{}'
+    INSERT TEXT: 'SomeNamedVariant{${1:name1}, ${2:name2}}'
+EnumMember 'SomePositionalVariant()'
+    INSERT TEXT: 'SomePositionalVariant(${1}, ${2})'
+EnumMember 'SomeVariant'
+    INSERT TEXT: 'SomeVariant{}'
+
+-- test 7 -------------------
+use line: 23, use_col: 25
+Method 'aliased()'
+    INSERT TEXT: 'aliased()'
+    TARGET     : '(Completion::dot::aliased)'
+    TYPE       : 'fun ()'
+Method 'bar()'
+    INSERT TEXT: 'bar(${1:s}, ${2:_param1}, ${3:_param2})'
+    TARGET     : '(Completion::dot::bar)'
+    TYPE       : 'fun <T>(SomeStruct, u64, T): SomeStruct'
+Method 'foo()'
+    INSERT TEXT: 'foo(${1:_s})'
+    TARGET     : '(Completion::dot::foo)'
+    TYPE       : 'fun (SomeStruct)'
+Method 'shadowed()'
+    INSERT TEXT: 'shadowed()'
+    TARGET     : '(Completion::dot::shadowed)'
+    TYPE       : 'fun ()'
+
+-- test 8 -------------------
+use line: 24, use_col: 9
+Unit '0x1'
+Unit '0xA'
+Unit '0xCAFE'
+Unit 'Completion'
+Unit 'std'
+
+-- test 9 -------------------
+use line: 24, use_col: 40
+EnumMember 'SomeNamedVariant{}'
+    INSERT TEXT: 'SomeNamedVariant{${1:name1}, ${2:name2}}'
+EnumMember 'SomePositionalVariant()'
+    INSERT TEXT: 'SomePositionalVariant(${1}, ${2})'
+EnumMember 'SomeVariant'
+    INSERT TEXT: 'SomeVariant{}'
+
+-- test 10 -------------------
+use line: 25, use_col: 9
+Unit '0x1'
+Unit '0xA'
+Unit '0xCAFE'
+Unit 'Completion'
+Unit 'std'
+Module 'CC'
+Module 'Self'
+Module 'option'
+Module 'vector'
+Method 'attr_chain()'
+    INSERT TEXT: 'attr_chain()'
+    TARGET     : '(Completion::colon_colon::attr_chain)'
+    TYPE       : 'fun ()'
+Method 'complete_chains()'
+    INSERT TEXT: 'complete_chains(${1:s})'
+    TARGET     : '(Completion::colon_colon::complete_chains)'
+    TYPE       : 'fun (SomeStruct)'
+Method 'multi_colon_colon()'
+    INSERT TEXT: 'multi_colon_colon()'
+    TARGET     : '(Completion::colon_colon::multi_colon_colon)'
+    TYPE       : 'fun ()'
+Method 'one_colon_colon()'
+    INSERT TEXT: 'one_colon_colon()'
+    TARGET     : '(Completion::colon_colon::one_colon_colon)'
+    TYPE       : 'fun ()'
+Method 'sbar()'
+    INSERT TEXT: 'sbar(${1:_param1}, ${2:_param2})'
+    TARGET     : '(Completion::colon_colon::sbar)'
+    TYPE       : 'fun (u64, SomeStruct)'
+Method 'sbaz()'
+    INSERT TEXT: 'sbaz()'
+    TARGET     : '(Completion::colon_colon::sbaz)'
+    TYPE       : 'fun ()'
+Method 'single_ident()'
+    INSERT TEXT: 'single_ident()'
+    TARGET     : '(Completion::colon_colon::single_ident)'
+    TYPE       : 'fun ()'
+Method 'targ_chain()'
+    INSERT TEXT: 'targ_chain()'
+    TARGET     : '(Completion::colon_colon::targ_chain)'
+    TYPE       : 'fun ()'
+Method 'targ_type()'
+    INSERT TEXT: 'targ_type(${1:p})'
+    TARGET     : '(Completion::colon_colon::targ_type)'
+    TYPE       : 'fun <SOME_TYPE>(SOME_TYPE)'
+
+-- test 11 -------------------
+use line: 25, use_col: 17
+Method 'and!()'
+    INSERT TEXT: 'and!(${1:o}, |${2}| ${3})'
+    TARGET     : '(std::option::and)'
+    TYPE       : 'fun <$T, $U>(Option, |$T| -> Option): Option'
+Method 'and_ref!()'
+    INSERT TEXT: 'and_ref!(${1:o}, |${2}| ${3})'
+    TARGET     : '(std::option::and_ref)'
+    TYPE       : 'fun <$T, $U>(&Option, |&$T| -> Option): Option'
+Method 'borrow()'
+    INSERT TEXT: 'borrow(${1:t})'
+    TARGET     : '(std::option::borrow)'
+    TYPE       : 'fun <Element>(&Option): &Element'
+Method 'borrow_mut()'
+    INSERT TEXT: 'borrow_mut(${1:t})'
+    TARGET     : '(std::option::borrow_mut)'
+    TYPE       : 'fun <Element>(&mut Option): &mut Element'
+Method 'borrow_with_default()'
+    INSERT TEXT: 'borrow_with_default(${1:t}, ${2:default_ref})'
+    TARGET     : '(std::option::borrow_with_default)'
+    TYPE       : 'fun <Element>(&Option, &Element): &Element'
+Method 'contains()'
+    INSERT TEXT: 'contains(${1:t}, ${2:e_ref})'
+    TARGET     : '(std::option::contains)'
+    TYPE       : 'fun <Element>(&Option, &Element): bool'
+Method 'destroy!()'
+    INSERT TEXT: 'destroy!(${1:o}, |${2}| ${3})'
+    TARGET     : '(std::option::destroy)'
+    TYPE       : 'fun <$T>(Option, |$T| -> ())'
+Method 'destroy_none()'
+    INSERT TEXT: 'destroy_none(${1:t})'
+    TARGET     : '(std::option::destroy_none)'
+    TYPE       : 'fun <Element>(Option)'
+Method 'destroy_or!()'
+    INSERT TEXT: 'destroy_or!(${1:o}, ${2:default})'
+    TARGET     : '(std::option::destroy_or)'
+    TYPE       : 'fun <$T>(Option, $T): $T'
+Method 'destroy_some()'
+    INSERT TEXT: 'destroy_some(${1:t})'
+    TARGET     : '(std::option::destroy_some)'
+    TYPE       : 'fun <Element>(Option): Element'
+Method 'destroy_with_default()'
+    INSERT TEXT: 'destroy_with_default(${1:t}, ${2:default})'
+    TARGET     : '(std::option::destroy_with_default)'
+    TYPE       : 'fun <Element>(Option, Element): Element'
+Method 'do!()'
+    INSERT TEXT: 'do!(${1:o}, |${2}| ${3})'
+    TARGET     : '(std::option::do)'
+    TYPE       : 'fun <$T>(Option, |$T| -> ())'
+Method 'do_mut!()'
+    INSERT TEXT: 'do_mut!(${1:o}, |${2}| ${3})'
+    TARGET     : '(std::option::do_mut)'
+    TYPE       : 'fun <$T>(&mut Option, |&mut $T| -> ())'
+Method 'do_ref!()'
+    INSERT TEXT: 'do_ref!(${1:o}, |${2}| ${3})'
+    TARGET     : '(std::option::do_ref)'
+    TYPE       : 'fun <$T>(&Option, |&$T| -> ())'
+Method 'extract()'
+    INSERT TEXT: 'extract(${1:t})'
+    TARGET     : '(std::option::extract)'
+    TYPE       : 'fun <Element>(&mut Option): Element'
+Method 'fill()'
+    INSERT TEXT: 'fill(${1:t}, ${2:e})'
+    TARGET     : '(std::option::fill)'
+    TYPE       : 'fun <Element>(&mut Option, Element)'
+Method 'filter!()'
+    INSERT TEXT: 'filter!(${1:o}, |${2}| ${3})'
+    TARGET     : '(std::option::filter)'
+    TYPE       : 'fun <$T>(Option, |&$T| -> bool): Option'
+Method 'get_with_default()'
+    INSERT TEXT: 'get_with_default(${1:t}, ${2:default})'
+    TARGET     : '(std::option::get_with_default)'
+    TYPE       : 'fun <Element>(&Option, Element): Element'
+Method 'is_none()'
+    INSERT TEXT: 'is_none(${1:t})'
+    TARGET     : '(std::option::is_none)'
+    TYPE       : 'fun <Element>(&Option): bool'
+Method 'is_some()'
+    INSERT TEXT: 'is_some(${1:t})'
+    TARGET     : '(std::option::is_some)'
+    TYPE       : 'fun <Element>(&Option): bool'
+Method 'is_some_and!()'
+    INSERT TEXT: 'is_some_and!(${1:o}, |${2}| ${3})'
+    TARGET     : '(std::option::is_some_and)'
+    TYPE       : 'fun <$T>(&Option, |&$T| -> bool): bool'
+Method 'map!()'
+    INSERT TEXT: 'map!(${1:o}, |${2}| ${3})'
+    TARGET     : '(std::option::map)'
+    TYPE       : 'fun <$T, $U>(Option, |$T| -> $U): Option'
+Method 'map_ref!()'
+    INSERT TEXT: 'map_ref!(${1:o}, |${2}| ${3})'
+    TARGET     : '(std::option::map_ref)'
+    TYPE       : 'fun <$T, $U>(&Option, |&$T| -> $U): Option'
+Method 'none()'
+    INSERT TEXT: 'none()'
+    TARGET     : '(std::option::none)'
+    TYPE       : 'fun <Element>(): Option'
+Method 'or!()'
+    INSERT TEXT: 'or!(${1:o}, ${2:default})'
+    TARGET     : '(std::option::or)'
+    TYPE       : 'fun <$T>(Option, Option): Option'
+Method 'some()'
+    INSERT TEXT: 'some(${1:e})'
+    TARGET     : '(std::option::some)'
+    TYPE       : 'fun <Element>(Element): Option'
+Method 'swap()'
+    INSERT TEXT: 'swap(${1:t}, ${2:e})'
+    TARGET     : '(std::option::swap)'
+    TYPE       : 'fun <Element>(&mut Option, Element): Element'
+Method 'swap_or_fill()'
+    INSERT TEXT: 'swap_or_fill(${1:t}, ${2:e})'
+    TARGET     : '(std::option::swap_or_fill)'
+    TYPE       : 'fun <Element>(&mut Option, Element): Option'
+Method 'to_vec()'
+    INSERT TEXT: 'to_vec(${1:t})'
+    TARGET     : '(std::option::to_vec)'
+    TYPE       : 'fun <Element>(Option): vector<Element>'
+
+-- test 12 -------------------
+use line: 26, use_col: 20
+Method 'sha2_256()'
+    INSERT TEXT: 'sha2_256(${1:data})'
+    TARGET     : '(std::hash::sha2_256)'
+    TYPE       : 'fun (vector<u8>): vector<u8>'
+Method 'sha3_256()'
+    INSERT TEXT: 'sha3_256(${1:data})'
+    TARGET     : '(std::hash::sha3_256)'
+    TYPE       : 'fun (vector<u8>): vector<u8>'
+
+-- test 13 -------------------
+use line: 27, use_col: 9
+Unit '0x1'
+Unit '0xA'
+Unit '0xCAFE'
+Unit 'Completion'
+Unit 'std'
+Module 'CC'
+Module 'Self'
+Module 'option'
+Module 'vector'
+Struct 'CompletionStruct'
+Struct 'Option'
+Enum 'SE'
+Constant 'SOME_CONST'
+Enum 'SomeEnum'
+Struct 'SomeStruct'
+Enum 'TargEnum'
+Method 'attr_chain()'
+    INSERT TEXT: 'attr_chain()'
+    TARGET     : '(Completion::colon_colon::attr_chain)'
+    TYPE       : 'fun ()'
+Method 'complete_chains()'
+    INSERT TEXT: 'complete_chains(${1:s})'
+    TARGET     : '(Completion::colon_colon::complete_chains)'
+    TYPE       : 'fun (SomeStruct)'
+Method 'multi_colon_colon()'
+    INSERT TEXT: 'multi_colon_colon()'
+    TARGET     : '(Completion::colon_colon::multi_colon_colon)'
+    TYPE       : 'fun ()'
+Method 'one_colon_colon()'
+    INSERT TEXT: 'one_colon_colon()'
+    TARGET     : '(Completion::colon_colon::one_colon_colon)'
+    TYPE       : 'fun ()'
+Method 'sbar()'
+    INSERT TEXT: 'sbar(${1:_param1}, ${2:_param2})'
+    TARGET     : '(Completion::colon_colon::sbar)'
+    TYPE       : 'fun (u64, SomeStruct)'
+Method 'sbaz()'
+    INSERT TEXT: 'sbaz()'
+    TARGET     : '(Completion::colon_colon::sbaz)'
+    TYPE       : 'fun ()'
+Method 'single_ident()'
+    INSERT TEXT: 'single_ident()'
+    TARGET     : '(Completion::colon_colon::single_ident)'
+    TYPE       : 'fun ()'
+Method 'targ_chain()'
+    INSERT TEXT: 'targ_chain()'
+    TARGET     : '(Completion::colon_colon::targ_chain)'
+    TYPE       : 'fun ()'
+Method 'targ_type()'
+    INSERT TEXT: 'targ_type(${1:p})'
+    TARGET     : '(Completion::colon_colon::targ_type)'
+    TYPE       : 'fun <SOME_TYPE>(SOME_TYPE)'
+
+-- test 14 -------------------
+use line: 27, use_col: 23
+EnumMember 'SomeNamedVariant{}'
+    INSERT TEXT: 'SomeNamedVariant{${1:name1}, ${2:name2}}'
+EnumMember 'SomePositionalVariant()'
+    INSERT TEXT: 'SomePositionalVariant(${1}, ${2})'
+EnumMember 'SomeVariant'
+    INSERT TEXT: 'SomeVariant{}'
+
+-- test 15 -------------------
+use line: 28, use_col: 13
+Method 'attr_chain()'
+    INSERT TEXT: 'attr_chain()'
+    TARGET     : '(Completion::colon_colon::attr_chain)'
+    TYPE       : 'fun ()'
+Method 'complete_chains()'
+    INSERT TEXT: 'complete_chains(${1:s})'
+    TARGET     : '(Completion::colon_colon::complete_chains)'
+    TYPE       : 'fun (SomeStruct)'
+Method 'multi_colon_colon()'
+    INSERT TEXT: 'multi_colon_colon()'
+    TARGET     : '(Completion::colon_colon::multi_colon_colon)'
+    TYPE       : 'fun ()'
+Method 'one_colon_colon()'
+    INSERT TEXT: 'one_colon_colon()'
+    TARGET     : '(Completion::colon_colon::one_colon_colon)'
+    TYPE       : 'fun ()'
+Method 'sbar()'
+    INSERT TEXT: 'sbar(${1:_param1}, ${2:_param2})'
+    TARGET     : '(Completion::colon_colon::sbar)'
+    TYPE       : 'fun (u64, SomeStruct)'
+Method 'sbaz()'
+    INSERT TEXT: 'sbaz()'
+    TARGET     : '(Completion::colon_colon::sbaz)'
+    TYPE       : 'fun ()'
+Method 'single_ident()'
+    INSERT TEXT: 'single_ident()'
+    TARGET     : '(Completion::colon_colon::single_ident)'
+    TYPE       : 'fun ()'
+Method 'targ_chain()'
+    INSERT TEXT: 'targ_chain()'
+    TARGET     : '(Completion::colon_colon::targ_chain)'
+    TYPE       : 'fun ()'
+Method 'targ_type()'
+    INSERT TEXT: 'targ_type(${1:p})'
+    TARGET     : '(Completion::colon_colon::targ_type)'
+    TYPE       : 'fun <SOME_TYPE>(SOME_TYPE)'
+
+-- test 16 -------------------
+use line: 29, use_col: 9
+Unit '0x1'
+Unit '0xA'
+Unit '0xCAFE'
+Unit 'Completion'
+Unit 'std'
+Module 'CC'
+Module 'Self'
+Module 'option'
+Module 'vector'
+Struct 'CompletionStruct'
+Struct 'Option'
+Enum 'SE'
+Constant 'SOME_CONST'
+Enum 'SomeEnum'
+Struct 'SomeStruct'
+Enum 'TargEnum'
+Method 'attr_chain()'
+    INSERT TEXT: 'attr_chain()'
+    TARGET     : '(Completion::colon_colon::attr_chain)'
+    TYPE       : 'fun ()'
+Method 'complete_chains()'
+    INSERT TEXT: 'complete_chains(${1:s})'
+    TARGET     : '(Completion::colon_colon::complete_chains)'
+    TYPE       : 'fun (SomeStruct)'
+Method 'multi_colon_colon()'
+    INSERT TEXT: 'multi_colon_colon()'
+    TARGET     : '(Completion::colon_colon::multi_colon_colon)'
+    TYPE       : 'fun ()'
+Method 'one_colon_colon()'
+    INSERT TEXT: 'one_colon_colon()'
+    TARGET     : '(Completion::colon_colon::one_colon_colon)'
+    TYPE       : 'fun ()'
+Method 'sbar()'
+    INSERT TEXT: 'sbar(${1:_param1}, ${2:_param2})'
+    TARGET     : '(Completion::colon_colon::sbar)'
+    TYPE       : 'fun (u64, SomeStruct)'
+Method 'sbaz()'
+    INSERT TEXT: 'sbaz()'
+    TARGET     : '(Completion::colon_colon::sbaz)'
+    TYPE       : 'fun ()'
+Method 'single_ident()'
+    INSERT TEXT: 'single_ident()'
+    TARGET     : '(Completion::colon_colon::single_ident)'
+    TYPE       : 'fun ()'
+Method 'targ_chain()'
+    INSERT TEXT: 'targ_chain()'
+    TARGET     : '(Completion::colon_colon::targ_chain)'
+    TYPE       : 'fun ()'
+Method 'targ_type()'
+    INSERT TEXT: 'targ_type(${1:p})'
+    TARGET     : '(Completion::colon_colon::targ_type)'
+    TYPE       : 'fun <SOME_TYPE>(SOME_TYPE)'
+
+-- test 17 -------------------
+use line: 33, use_col: 33
+Unit '0x1'
+Unit '0xA'
+Unit '0xCAFE'
+Unit 'Completion'
+Unit 'std'
+Module 'CC'
+Module 'Self'
+Module 'option'
+Module 'vector'
+Struct 'CompletionStruct'
+Struct 'Option'
+Enum 'SE'
+Enum 'SomeEnum'
+Struct 'SomeStruct'
+Enum 'TargEnum'
+Keyword 'u8'
+Keyword 'u16'
+Keyword 'u32'
+Keyword 'u64'
+Keyword 'u128'
+Keyword 'u256'
+Keyword 'bool'
+Keyword 'vector'
+Keyword 'address'
+
+-- test 18 -------------------
+use line: 33, use_col: 37
+Struct 'CompletionStruct'
+Struct 'SomeStruct'
+Enum 'SomeEnum'
+Enum 'TargEnum'
+
+-- test 19 -------------------
+use line: 34, use_col: 31
+Unit '0x1'
+Unit '0xA'
+Unit '0xCAFE'
+Unit 'Completion'
+Unit 'std'
+Keyword 'u8'
+Keyword 'u16'
+Keyword 'u32'
+Keyword 'u64'
+Keyword 'u128'
+Keyword 'u256'
+Keyword 'bool'
+Keyword 'vector'
+Keyword 'address'
+
+-- test 20 -------------------
+use line: 38, use_col: 9
+Unit '0x1'
+Unit '0xA'
+Unit '0xCAFE'
+Unit 'Completion'
+Unit 'std'
+Module 'Self'
+Module 'option'
+Module 'vector'
+Struct 'CompletionStruct'
+Struct 'Option'
+Constant 'SOME_CONST'
+Enum 'SomeEnum'
+Struct 'SomeStruct'
+Enum 'TargEnum'
+Method 'attr_chain()'
+    INSERT TEXT: 'attr_chain()'
+    TARGET     : '(Completion::colon_colon::attr_chain)'
+    TYPE       : 'fun ()'
+Method 'complete_chains()'
+    INSERT TEXT: 'complete_chains(${1:s})'
+    TARGET     : '(Completion::colon_colon::complete_chains)'
+    TYPE       : 'fun (SomeStruct)'
+Method 'multi_colon_colon()'
+    INSERT TEXT: 'multi_colon_colon()'
+    TARGET     : '(Completion::colon_colon::multi_colon_colon)'
+    TYPE       : 'fun ()'
+Method 'one_colon_colon()'
+    INSERT TEXT: 'one_colon_colon()'
+    TARGET     : '(Completion::colon_colon::one_colon_colon)'
+    TYPE       : 'fun ()'
+Method 'sbar()'
+    INSERT TEXT: 'sbar(${1:_param1}, ${2:_param2})'
+    TARGET     : '(Completion::colon_colon::sbar)'
+    TYPE       : 'fun (u64, SomeStruct)'
+Method 'sbaz()'
+    INSERT TEXT: 'sbaz()'
+    TARGET     : '(Completion::colon_colon::sbaz)'
+    TYPE       : 'fun ()'
+Method 'single_ident()'
+    INSERT TEXT: 'single_ident()'
+    TARGET     : '(Completion::colon_colon::single_ident)'
+    TYPE       : 'fun ()'
+Method 'targ_chain()'
+    INSERT TEXT: 'targ_chain()'
+    TARGET     : '(Completion::colon_colon::targ_chain)'
+    TYPE       : 'fun ()'
+Method 'targ_type()'
+    INSERT TEXT: 'targ_type(${1:p})'
+    TARGET     : '(Completion::colon_colon::targ_type)'
+    TYPE       : 'fun <SOME_TYPE>(SOME_TYPE)'
+
+-- test 21 -------------------
+use line: 55, use_col: 26
+Struct 'CompletionStruct'
+Struct 'SomeStruct'
+Enum 'SomeEnum'
+Enum 'TargEnum'
+
+-- test 22 -------------------
+use line: 55, use_col: 39
+EnumMember 'Variant{}'
+    INSERT TEXT: 'Variant{${1:field}}'
+
+-- test 23 -------------------
+use line: 59, use_col: 21
+Unit '0x1'
+Unit '0xA'
+Unit '0xCAFE'
+Unit 'Completion'
+Unit 'std'
+Module 'Self'
+Module 'option'
+Module 'vector'
+Struct 'CompletionStruct'
+Struct 'Option'
+Enum 'SomeEnum'
+Struct 'SomeStruct'
+Enum 'TargEnum'
+Keyword 'u8'
+Keyword 'u16'
+Keyword 'u32'
+Keyword 'u64'
+Keyword 'u128'
+Keyword 'u256'
+Keyword 'bool'
+Keyword 'vector'
+Keyword 'address'
+TypeParameter 'SOME_TYPE'
+
+-- test 24 -------------------
+use line: 62, use_col: 43
+Unit '0x1'
+Unit '0xA'
+Unit '0xCAFE'
+Unit 'Completion'
+Unit 'std'
+Module 'Self'
+Module 'option'
+Module 'vector'
+Struct 'CompletionStruct'
+Struct 'Option'
+Constant 'SOME_CONST'
+Enum 'SomeEnum'
+Struct 'SomeStruct'
+Enum 'TargEnum'
+Method 'attr_chain()'
+    INSERT TEXT: 'attr_chain()'
+    TARGET     : '(Completion::colon_colon::attr_chain)'
+    TYPE       : 'fun ()'
+Method 'complete_chains()'
+    INSERT TEXT: 'complete_chains(${1:s})'
+    TARGET     : '(Completion::colon_colon::complete_chains)'
+    TYPE       : 'fun (SomeStruct)'
+Method 'multi_colon_colon()'
+    INSERT TEXT: 'multi_colon_colon()'
+    TARGET     : '(Completion::colon_colon::multi_colon_colon)'
+    TYPE       : 'fun ()'
+Method 'one_colon_colon()'
+    INSERT TEXT: 'one_colon_colon()'
+    TARGET     : '(Completion::colon_colon::one_colon_colon)'
+    TYPE       : 'fun ()'
+Method 'sbar()'
+    INSERT TEXT: 'sbar(${1:_param1}, ${2:_param2})'
+    TARGET     : '(Completion::colon_colon::sbar)'
+    TYPE       : 'fun (u64, SomeStruct)'
+Method 'sbaz()'
+    INSERT TEXT: 'sbaz()'
+    TARGET     : '(Completion::colon_colon::sbaz)'
+    TYPE       : 'fun ()'
+Method 'single_ident()'
+    INSERT TEXT: 'single_ident()'
+    TARGET     : '(Completion::colon_colon::single_ident)'
+    TYPE       : 'fun ()'
+Method 'targ_chain()'
+    INSERT TEXT: 'targ_chain()'
+    TARGET     : '(Completion::colon_colon::targ_chain)'
+    TYPE       : 'fun ()'
+Method 'targ_type()'
+    INSERT TEXT: 'targ_type(${1:p})'
+    TARGET     : '(Completion::colon_colon::targ_type)'
+    TYPE       : 'fun <SOME_TYPE>(SOME_TYPE)'
+
+-- test 25 -------------------
+use line: 62, use_col: 49
+Method 'attr_chain()'
+    INSERT TEXT: 'attr_chain()'
+    TARGET     : '(Completion::colon_colon::attr_chain)'
+    TYPE       : 'fun ()'
+Method 'complete_chains()'
+    INSERT TEXT: 'complete_chains(${1:s})'
+    TARGET     : '(Completion::colon_colon::complete_chains)'
+    TYPE       : 'fun (SomeStruct)'
+Method 'multi_colon_colon()'
+    INSERT TEXT: 'multi_colon_colon()'
+    TARGET     : '(Completion::colon_colon::multi_colon_colon)'
+    TYPE       : 'fun ()'
+Method 'one_colon_colon()'
+    INSERT TEXT: 'one_colon_colon()'
+    TARGET     : '(Completion::colon_colon::one_colon_colon)'
+    TYPE       : 'fun ()'
+Method 'sbar()'
+    INSERT TEXT: 'sbar(${1:_param1}, ${2:_param2})'
+    TARGET     : '(Completion::colon_colon::sbar)'
+    TYPE       : 'fun (u64, SomeStruct)'
+Method 'sbaz()'
+    INSERT TEXT: 'sbaz()'
+    TARGET     : '(Completion::colon_colon::sbaz)'
+    TYPE       : 'fun ()'
+Method 'single_ident()'
+    INSERT TEXT: 'single_ident()'
+    TARGET     : '(Completion::colon_colon::single_ident)'
+    TYPE       : 'fun ()'
+Method 'targ_chain()'
+    INSERT TEXT: 'targ_chain()'
+    TARGET     : '(Completion::colon_colon::targ_chain)'
+    TYPE       : 'fun ()'
+Method 'targ_type()'
+    INSERT TEXT: 'targ_type(${1:p})'
+    TARGET     : '(Completion::colon_colon::targ_type)'
+    TYPE       : 'fun <SOME_TYPE>(SOME_TYPE)'
+Struct 'CompletionStruct'
+Struct 'SomeStruct'
+Enum 'SomeEnum'
+Enum 'TargEnum'
+Constant 'SOME_CONST'
+
+-- test 26 -------------------
+use line: 21, use_col: 33
+Module 'colon_colon'
+Module 'dot'
+Module 'init'
+Module 'init_otw'
+Module 'macro_dot'
+Module 'object'
+Module 'other_mod_dot'
+Module 'uses'
+
+-- test 27 -------------------
+use line: 21, use_col: 46
+Method 'attr_chain()'
+    INSERT TEXT: 'attr_chain()'
+    TARGET     : '(Completion::colon_colon::attr_chain)'
+    TYPE       : 'fun ()'
+Method 'complete_chains()'
+    INSERT TEXT: 'complete_chains(${1:s})'
+    TARGET     : '(Completion::colon_colon::complete_chains)'
+    TYPE       : 'fun (SomeStruct)'
+Method 'multi_colon_colon()'
+    INSERT TEXT: 'multi_colon_colon()'
+    TARGET     : '(Completion::colon_colon::multi_colon_colon)'
+    TYPE       : 'fun ()'
+Method 'one_colon_colon()'
+    INSERT TEXT: 'one_colon_colon()'
+    TARGET     : '(Completion::colon_colon::one_colon_colon)'
+    TYPE       : 'fun ()'
+Method 'sbar()'
+    INSERT TEXT: 'sbar(${1:_param1}, ${2:_param2})'
+    TARGET     : '(Completion::colon_colon::sbar)'
+    TYPE       : 'fun (u64, SomeStruct)'
+Method 'sbaz()'
+    INSERT TEXT: 'sbaz()'
+    TARGET     : '(Completion::colon_colon::sbaz)'
+    TYPE       : 'fun ()'
+Method 'single_ident()'
+    INSERT TEXT: 'single_ident()'
+    TARGET     : '(Completion::colon_colon::single_ident)'
+    TYPE       : 'fun ()'
+Method 'targ_chain()'
+    INSERT TEXT: 'targ_chain()'
+    TARGET     : '(Completion::colon_colon::targ_chain)'
+    TYPE       : 'fun ()'
+Method 'targ_type()'
+    INSERT TEXT: 'targ_type(${1:p})'
+    TARGET     : '(Completion::colon_colon::targ_type)'
+    TYPE       : 'fun <SOME_TYPE>(SOME_TYPE)'
+Struct 'CompletionStruct'
+Struct 'SomeStruct'
+Enum 'SomeEnum'
+Enum 'TargEnum'
+Constant 'SOME_CONST'
+
+-- test 28 -------------------
+use line: 21, use_col: 56
+EnumMember 'SomeNamedVariant{}'
+    INSERT TEXT: 'SomeNamedVariant{${1:name1}, ${2:name2}}'
+EnumMember 'SomePositionalVariant()'
+    INSERT TEXT: 'SomePositionalVariant(${1}, ${2})'
+EnumMember 'SomeVariant'
+    INSERT TEXT: 'SomeVariant{}'
+
+-- test 29 -------------------
+use line: 25, use_col: 16
+Method 'and!()'
+    INSERT TEXT: 'and!(${1:o}, |${2}| ${3})'
+    TARGET     : '(std::option::and)'
+    TYPE       : 'fun <$T, $U>(Option, |$T| -> Option): Option'
+Method 'and_ref!()'
+    INSERT TEXT: 'and_ref!(${1:o}, |${2}| ${3})'
+    TARGET     : '(std::option::and_ref)'
+    TYPE       : 'fun <$T, $U>(&Option, |&$T| -> Option): Option'
+Method 'borrow()'
+    INSERT TEXT: 'borrow(${1:t})'
+    TARGET     : '(std::option::borrow)'
+    TYPE       : 'fun <Element>(&Option): &Element'
+Method 'borrow_mut()'
+    INSERT TEXT: 'borrow_mut(${1:t})'
+    TARGET     : '(std::option::borrow_mut)'
+    TYPE       : 'fun <Element>(&mut Option): &mut Element'
+Method 'borrow_with_default()'
+    INSERT TEXT: 'borrow_with_default(${1:t}, ${2:default_ref})'
+    TARGET     : '(std::option::borrow_with_default)'
+    TYPE       : 'fun <Element>(&Option, &Element): &Element'
+Method 'contains()'
+    INSERT TEXT: 'contains(${1:t}, ${2:e_ref})'
+    TARGET     : '(std::option::contains)'
+    TYPE       : 'fun <Element>(&Option, &Element): bool'
+Method 'destroy!()'
+    INSERT TEXT: 'destroy!(${1:o}, |${2}| ${3})'
+    TARGET     : '(std::option::destroy)'
+    TYPE       : 'fun <$T>(Option, |$T| -> ())'
+Method 'destroy_none()'
+    INSERT TEXT: 'destroy_none(${1:t})'
+    TARGET     : '(std::option::destroy_none)'
+    TYPE       : 'fun <Element>(Option)'
+Method 'destroy_or!()'
+    INSERT TEXT: 'destroy_or!(${1:o}, ${2:default})'
+    TARGET     : '(std::option::destroy_or)'
+    TYPE       : 'fun <$T>(Option, $T): $T'
+Method 'destroy_some()'
+    INSERT TEXT: 'destroy_some(${1:t})'
+    TARGET     : '(std::option::destroy_some)'
+    TYPE       : 'fun <Element>(Option): Element'
+Method 'destroy_with_default()'
+    INSERT TEXT: 'destroy_with_default(${1:t}, ${2:default})'
+    TARGET     : '(std::option::destroy_with_default)'
+    TYPE       : 'fun <Element>(Option, Element): Element'
+Method 'do!()'
+    INSERT TEXT: 'do!(${1:o}, |${2}| ${3})'
+    TARGET     : '(std::option::do)'
+    TYPE       : 'fun <$T>(Option, |$T| -> ())'
+Method 'do_mut!()'
+    INSERT TEXT: 'do_mut!(${1:o}, |${2}| ${3})'
+    TARGET     : '(std::option::do_mut)'
+    TYPE       : 'fun <$T>(&mut Option, |&mut $T| -> ())'
+Method 'do_ref!()'
+    INSERT TEXT: 'do_ref!(${1:o}, |${2}| ${3})'
+    TARGET     : '(std::option::do_ref)'
+    TYPE       : 'fun <$T>(&Option, |&$T| -> ())'
+Method 'extract()'
+    INSERT TEXT: 'extract(${1:t})'
+    TARGET     : '(std::option::extract)'
+    TYPE       : 'fun <Element>(&mut Option): Element'
+Method 'fill()'
+    INSERT TEXT: 'fill(${1:t}, ${2:e})'
+    TARGET     : '(std::option::fill)'
+    TYPE       : 'fun <Element>(&mut Option, Element)'
+Method 'filter!()'
+    INSERT TEXT: 'filter!(${1:o}, |${2}| ${3})'
+    TARGET     : '(std::option::filter)'
+    TYPE       : 'fun <$T>(Option, |&$T| -> bool): Option'
+Method 'get_with_default()'
+    INSERT TEXT: 'get_with_default(${1:t}, ${2:default})'
+    TARGET     : '(std::option::get_with_default)'
+    TYPE       : 'fun <Element>(&Option, Element): Element'
+Method 'is_none()'
+    INSERT TEXT: 'is_none(${1:t})'
+    TARGET     : '(std::option::is_none)'
+    TYPE       : 'fun <Element>(&Option): bool'
+Method 'is_some()'
+    INSERT TEXT: 'is_some(${1:t})'
+    TARGET     : '(std::option::is_some)'
+    TYPE       : 'fun <Element>(&Option): bool'
+Method 'is_some_and!()'
+    INSERT TEXT: 'is_some_and!(${1:o}, |${2}| ${3})'
+    TARGET     : '(std::option::is_some_and)'
+    TYPE       : 'fun <$T>(&Option, |&$T| -> bool): bool'
+Method 'map!()'
+    INSERT TEXT: 'map!(${1:o}, |${2}| ${3})'
+    TARGET     : '(std::option::map)'
+    TYPE       : 'fun <$T, $U>(Option, |$T| -> $U): Option'
+Method 'map_ref!()'
+    INSERT TEXT: 'map_ref!(${1:o}, |${2}| ${3})'
+    TARGET     : '(std::option::map_ref)'
+    TYPE       : 'fun <$T, $U>(&Option, |&$T| -> $U): Option'
+Method 'none()'
+    INSERT TEXT: 'none()'
+    TARGET     : '(std::option::none)'
+    TYPE       : 'fun <Element>(): Option'
+Method 'or!()'
+    INSERT TEXT: 'or!(${1:o}, ${2:default})'
+    TARGET     : '(std::option::or)'
+    TYPE       : 'fun <$T>(Option, Option): Option'
+Method 'some()'
+    INSERT TEXT: 'some(${1:e})'
+    TARGET     : '(std::option::some)'
+    TYPE       : 'fun <Element>(Element): Option'
+Method 'swap()'
+    INSERT TEXT: 'swap(${1:t}, ${2:e})'
+    TARGET     : '(std::option::swap)'
+    TYPE       : 'fun <Element>(&mut Option, Element): Element'
+Method 'swap_or_fill()'
+    INSERT TEXT: 'swap_or_fill(${1:t}, ${2:e})'
+    TARGET     : '(std::option::swap_or_fill)'
+    TYPE       : 'fun <Element>(&mut Option, Element): Option'
+Method 'to_vec()'
+    INSERT TEXT: 'to_vec(${1:t})'
+    TARGET     : '(std::option::to_vec)'
+    TYPE       : 'fun <Element>(Option): vector<Element>'
+
+-- test 30 -------------------
+use line: 26, use_col: 19
+Method 'sha2_256()'
+    INSERT TEXT: 'sha2_256(${1:data})'
+    TARGET     : '(std::hash::sha2_256)'
+    TYPE       : 'fun (vector<u8>): vector<u8>'
+Method 'sha3_256()'
+    INSERT TEXT: 'sha3_256(${1:data})'
+    TARGET     : '(std::hash::sha3_256)'
+    TYPE       : 'fun (vector<u8>): vector<u8>'
+
+-- test 31 -------------------
+use line: 27, use_col: 23
+EnumMember 'SomeNamedVariant{}'
+    INSERT TEXT: 'SomeNamedVariant{${1:name1}, ${2:name2}}'
+EnumMember 'SomePositionalVariant()'
+    INSERT TEXT: 'SomePositionalVariant(${1}, ${2})'
+EnumMember 'SomeVariant'
+    INSERT TEXT: 'SomeVariant{}'
+
+-- test 32 -------------------
+use line: 41, use_col: 20
+Module 'colon_colon'
+Module 'dot'
+Module 'init'
+Module 'init_otw'
+Module 'macro_dot'
+Module 'object'
+Module 'other_mod_dot'
+Module 'uses'
+
+-- test 33 -------------------
+use line: 44, use_col: 43
+EnumMember 'SomeNamedVariant{}'
+    INSERT TEXT: 'SomeNamedVariant{${1:name1}, ${2:name2}}'
+EnumMember 'SomePositionalVariant()'
+    INSERT TEXT: 'SomePositionalVariant(${1}, ${2})'
+EnumMember 'SomeVariant'
+    INSERT TEXT: 'SomeVariant{}'
+
+-- test 34 -------------------
+use line: 55, use_col: 38
+EnumMember 'Variant{}'
+    INSERT TEXT: 'Variant{${1:field}}'
+
+== uses.move ========================================================
+-- test 0 -------------------
+use line: 2, use_col: 9
+Unit '0x1'
+Unit '0xA'
+Unit '0xCAFE'
+Unit 'Completion'
+Unit 'std'
+
+-- test 1 -------------------
+use line: 2, use_col: 20
+Module 'colon_colon'
+Module 'dot'
+Module 'init'
+Module 'init_otw'
+Module 'macro_dot'
+Module 'object'
+Module 'other_mod_dot'
+Module 'uses'
+
+-- test 2 -------------------
+use line: 2, use_col: 21
+Module 'colon_colon'
+Module 'dot'
+Module 'init'
+Module 'init_otw'
+Module 'macro_dot'
+Module 'object'
+Module 'other_mod_dot'
+Module 'uses'
+
+-- test 3 -------------------
+use line: 2, use_col: 25
+Method 'aliased()'
+    INSERT TEXT: 'aliased'
+    TARGET     : '(Completion::dot::aliased)'
+    TYPE       : 'fun ()'
+Method 'bar()'
+    INSERT TEXT: 'bar'
+    TARGET     : '(Completion::dot::bar)'
+    TYPE       : 'fun <T>(SomeStruct, u64, T): SomeStruct'
+Method 'foo()'
+    INSERT TEXT: 'foo'
+    TARGET     : '(Completion::dot::foo)'
+    TYPE       : 'fun (SomeStruct)'
+Method 'shadowed()'
+    INSERT TEXT: 'shadowed'
+    TARGET     : '(Completion::dot::shadowed)'
+    TYPE       : 'fun ()'
+Struct 'SomeStruct'
+
+-- test 4 -------------------
+use line: 2, use_col: 26
+Method 'aliased()'
+    INSERT TEXT: 'aliased'
+    TARGET     : '(Completion::dot::aliased)'
+    TYPE       : 'fun ()'
+Method 'bar()'
+    INSERT TEXT: 'bar'
+    TARGET     : '(Completion::dot::bar)'
+    TYPE       : 'fun <T>(SomeStruct, u64, T): SomeStruct'
+Method 'foo()'
+    INSERT TEXT: 'foo'
+    TARGET     : '(Completion::dot::foo)'
+    TYPE       : 'fun (SomeStruct)'
+Method 'shadowed()'
+    INSERT TEXT: 'shadowed'
+    TARGET     : '(Completion::dot::shadowed)'
+    TYPE       : 'fun ()'
+Struct 'SomeStruct'
+
+-- test 5 -------------------
+use line: 3, use_col: 9
+Unit '0x1'
+Unit '0xA'
+Unit '0xCAFE'
+Unit 'Completion'
+Unit 'std'
+
+-- test 6 -------------------
+use line: 3, use_col: 22
+Module 'colon_colon'
+Module 'dot'
+Module 'init'
+Module 'init_otw'
+Module 'macro_dot'
+Module 'object'
+Module 'other_mod_dot'
+Module 'uses'
+
+-- test 7 -------------------
+use line: 3, use_col: 28
+Method 'aliased()'
+    INSERT TEXT: 'aliased'
+    TARGET     : '(Completion::dot::aliased)'
+    TYPE       : 'fun ()'
+Method 'bar()'
+    INSERT TEXT: 'bar'
+    TARGET     : '(Completion::dot::bar)'
+    TYPE       : 'fun <T>(SomeStruct, u64, T): SomeStruct'
+Method 'foo()'
+    INSERT TEXT: 'foo'
+    TARGET     : '(Completion::dot::foo)'
+    TYPE       : 'fun (SomeStruct)'
+Method 'shadowed()'
+    INSERT TEXT: 'shadowed'
+    TARGET     : '(Completion::dot::shadowed)'
+    TYPE       : 'fun ()'
+Struct 'SomeStruct'
+
+-- test 8 -------------------
+use line: 3, use_col: 33
+Method 'aliased()'
+    INSERT TEXT: 'aliased'
+    TARGET     : '(Completion::dot::aliased)'
+    TYPE       : 'fun ()'
+Method 'bar()'
+    INSERT TEXT: 'bar'
+    TARGET     : '(Completion::dot::bar)'
+    TYPE       : 'fun <T>(SomeStruct, u64, T): SomeStruct'
+Method 'foo()'
+    INSERT TEXT: 'foo'
+    TARGET     : '(Completion::dot::foo)'
+    TYPE       : 'fun (SomeStruct)'
+Method 'shadowed()'
+    INSERT TEXT: 'shadowed'
+    TARGET     : '(Completion::dot::shadowed)'
+    TYPE       : 'fun ()'
+Struct 'SomeStruct'
+
+-- test 9 -------------------
+use line: 3, use_col: 39
+Module 'colon_colon'
+Module 'dot'
+Module 'init'
+Module 'init_otw'
+Module 'macro_dot'
+Module 'object'
+Module 'other_mod_dot'
+Module 'uses'
+
+-- test 10 -------------------
+use line: 3, use_col: 51
+Method 'attr_chain()'
+    INSERT TEXT: 'attr_chain'
+    TARGET     : '(Completion::colon_colon::attr_chain)'
+    TYPE       : 'fun ()'
+Method 'complete_chains()'
+    INSERT TEXT: 'complete_chains'
+    TARGET     : '(Completion::colon_colon::complete_chains)'
+    TYPE       : 'fun (SomeStruct)'
+Method 'multi_colon_colon()'
+    INSERT TEXT: 'multi_colon_colon'
+    TARGET     : '(Completion::colon_colon::multi_colon_colon)'
+    TYPE       : 'fun ()'
+Method 'one_colon_colon()'
+    INSERT TEXT: 'one_colon_colon'
+    TARGET     : '(Completion::colon_colon::one_colon_colon)'
+    TYPE       : 'fun ()'
+Method 'sbar()'
+    INSERT TEXT: 'sbar'
+    TARGET     : '(Completion::colon_colon::sbar)'
+    TYPE       : 'fun (u64, SomeStruct)'
+Method 'sbaz()'
+    INSERT TEXT: 'sbaz'
+    TARGET     : '(Completion::colon_colon::sbaz)'
+    TYPE       : 'fun ()'
+Method 'single_ident()'
+    INSERT TEXT: 'single_ident'
+    TARGET     : '(Completion::colon_colon::single_ident)'
+    TYPE       : 'fun ()'
+Method 'targ_chain()'
+    INSERT TEXT: 'targ_chain'
+    TARGET     : '(Completion::colon_colon::targ_chain)'
+    TYPE       : 'fun ()'
+Method 'targ_type()'
+    INSERT TEXT: 'targ_type'
+    TARGET     : '(Completion::colon_colon::targ_type)'
+    TYPE       : 'fun <SOME_TYPE>(SOME_TYPE)'
+Struct 'CompletionStruct'
+Struct 'SomeStruct'
+Enum 'SomeEnum'
+Enum 'TargEnum'
+
+-- test 11 -------------------
+use line: 3, use_col: 52
+Method 'attr_chain()'
+    INSERT TEXT: 'attr_chain'
+    TARGET     : '(Completion::colon_colon::attr_chain)'
+    TYPE       : 'fun ()'
+Method 'complete_chains()'
+    INSERT TEXT: 'complete_chains'
+    TARGET     : '(Completion::colon_colon::complete_chains)'
+    TYPE       : 'fun (SomeStruct)'
+Method 'multi_colon_colon()'
+    INSERT TEXT: 'multi_colon_colon'
+    TARGET     : '(Completion::colon_colon::multi_colon_colon)'
+    TYPE       : 'fun ()'
+Method 'one_colon_colon()'
+    INSERT TEXT: 'one_colon_colon'
+    TARGET     : '(Completion::colon_colon::one_colon_colon)'
+    TYPE       : 'fun ()'
+Method 'sbar()'
+    INSERT TEXT: 'sbar'
+    TARGET     : '(Completion::colon_colon::sbar)'
+    TYPE       : 'fun (u64, SomeStruct)'
+Method 'sbaz()'
+    INSERT TEXT: 'sbaz'
+    TARGET     : '(Completion::colon_colon::sbaz)'
+    TYPE       : 'fun ()'
+Method 'single_ident()'
+    INSERT TEXT: 'single_ident'
+    TARGET     : '(Completion::colon_colon::single_ident)'
+    TYPE       : 'fun ()'
+Method 'targ_chain()'
+    INSERT TEXT: 'targ_chain'
+    TARGET     : '(Completion::colon_colon::targ_chain)'
+    TYPE       : 'fun ()'
+Method 'targ_type()'
+    INSERT TEXT: 'targ_type'
+    TARGET     : '(Completion::colon_colon::targ_type)'
+    TYPE       : 'fun <SOME_TYPE>(SOME_TYPE)'
+Struct 'CompletionStruct'
+Struct 'SomeStruct'
+Enum 'SomeEnum'
+Enum 'TargEnum'
+
+-- test 12 -------------------
+use line: 15, use_col: 13
+Unit '0x1'
+Unit '0xA'
+Unit '0xCAFE'
+Unit 'Completion'
+Unit 'std'
+
+-- test 13 -------------------
+use line: 19, use_col: 24
+Module 'colon_colon'
+Module 'dot'
+Module 'init'
+Module 'init_otw'
+Module 'macro_dot'
+Module 'object'
+Module 'other_mod_dot'
+Module 'uses'
+
+-- test 14 -------------------
+use line: 23, use_col: 29
+Method 'aliased()'
+    INSERT TEXT: 'aliased'
+    TARGET     : '(Completion::dot::aliased)'
+    TYPE       : 'fun ()'
+Method 'bar()'
+    INSERT TEXT: 'bar'
+    TARGET     : '(Completion::dot::bar)'
+    TYPE       : 'fun <T>(SomeStruct, u64, T): SomeStruct'
+Method 'foo()'
+    INSERT TEXT: 'foo'
+    TARGET     : '(Completion::dot::foo)'
+    TYPE       : 'fun (SomeStruct)'
+Method 'shadowed()'
+    INSERT TEXT: 'shadowed'
+    TARGET     : '(Completion::dot::shadowed)'
+    TYPE       : 'fun ()'
+Struct 'SomeStruct'
+
+-- test 15 -------------------
+use line: 27, use_col: 30
+Method 'aliased()'
+    INSERT TEXT: 'aliased'
+    TARGET     : '(Completion::dot::aliased)'
+    TYPE       : 'fun ()'
+Method 'bar()'
+    INSERT TEXT: 'bar'
+    TARGET     : '(Completion::dot::bar)'
+    TYPE       : 'fun <T>(SomeStruct, u64, T): SomeStruct'
+Method 'foo()'
+    INSERT TEXT: 'foo'
+    TARGET     : '(Completion::dot::foo)'
+    TYPE       : 'fun (SomeStruct)'
+Method 'shadowed()'
+    INSERT TEXT: 'shadowed'
+    TARGET     : '(Completion::dot::shadowed)'
+    TYPE       : 'fun ()'
+Struct 'SomeStruct'
+
+-- test 16 -------------------
+use line: 31, use_col: 30
+Method 'aliased()'
+    INSERT TEXT: 'aliased'
+    TARGET     : '(Completion::dot::aliased)'
+    TYPE       : 'fun ()'
+Method 'bar()'
+    INSERT TEXT: 'bar'
+    TARGET     : '(Completion::dot::bar)'
+    TYPE       : 'fun <T>(SomeStruct, u64, T): SomeStruct'
+Method 'foo()'
+    INSERT TEXT: 'foo'
+    TARGET     : '(Completion::dot::foo)'
+    TYPE       : 'fun (SomeStruct)'
+Method 'shadowed()'
+    INSERT TEXT: 'shadowed'
+    TARGET     : '(Completion::dot::shadowed)'
+    TYPE       : 'fun ()'
+Struct 'SomeStruct'
+
+-- test 17 -------------------
+use line: 37, use_col: 31
+Method 'aliased()'
+    INSERT TEXT: 'aliased'
+    TARGET     : '(Completion::dot::aliased)'
+    TYPE       : 'fun ()'
+Method 'bar()'
+    INSERT TEXT: 'bar'
+    TARGET     : '(Completion::dot::bar)'
+    TYPE       : 'fun <T>(SomeStruct, u64, T): SomeStruct'
+Method 'foo()'
+    INSERT TEXT: 'foo'
+    TARGET     : '(Completion::dot::foo)'
+    TYPE       : 'fun (SomeStruct)'
+Method 'shadowed()'
+    INSERT TEXT: 'shadowed'
+    TARGET     : '(Completion::dot::shadowed)'
+    TYPE       : 'fun ()'
+Struct 'SomeStruct'
+
+-- test 18 -------------------
+use line: 43, use_col: 25
+Module 'colon_colon'
+Module 'dot'
+Module 'init'
+Module 'init_otw'
+Module 'macro_dot'
+Module 'object'
+Module 'other_mod_dot'
+Module 'uses'
+
+-- test 19 -------------------
+use line: 49, use_col: 26
+Module 'colon_colon'
+Module 'dot'
+Module 'init'
+Module 'init_otw'
+Module 'macro_dot'
+Module 'object'
+Module 'other_mod_dot'
+Module 'uses'
+
+-- test 20 -------------------
+use line: 55, use_col: 30
+Method 'aliased()'
+    INSERT TEXT: 'aliased'
+    TARGET     : '(Completion::dot::aliased)'
+    TYPE       : 'fun ()'
+Method 'bar()'
+    INSERT TEXT: 'bar'
+    TARGET     : '(Completion::dot::bar)'
+    TYPE       : 'fun <T>(SomeStruct, u64, T): SomeStruct'
+Method 'foo()'
+    INSERT TEXT: 'foo'
+    TARGET     : '(Completion::dot::foo)'
+    TYPE       : 'fun (SomeStruct)'
+Method 'shadowed()'
+    INSERT TEXT: 'shadowed'
+    TARGET     : '(Completion::dot::shadowed)'
+    TYPE       : 'fun ()'
+Struct 'SomeStruct'
+
+-- test 21 -------------------
+use line: 61, use_col: 31
+Method 'aliased()'
+    INSERT TEXT: 'aliased'
+    TARGET     : '(Completion::dot::aliased)'
+    TYPE       : 'fun ()'
+Method 'bar()'
+    INSERT TEXT: 'bar'
+    TARGET     : '(Completion::dot::bar)'
+    TYPE       : 'fun <T>(SomeStruct, u64, T): SomeStruct'
+Method 'foo()'
+    INSERT TEXT: 'foo'
+    TARGET     : '(Completion::dot::foo)'
+    TYPE       : 'fun (SomeStruct)'
+Method 'shadowed()'
+    INSERT TEXT: 'shadowed'
+    TARGET     : '(Completion::dot::shadowed)'
+    TYPE       : 'fun ()'
+Struct 'SomeStruct'
+
+-- test 22 -------------------
+use line: 67, use_col: 37
+Method 'aliased()'
+    INSERT TEXT: 'aliased'
+    TARGET     : '(Completion::dot::aliased)'
+    TYPE       : 'fun ()'
+Method 'bar()'
+    INSERT TEXT: 'bar'
+    TARGET     : '(Completion::dot::bar)'
+    TYPE       : 'fun <T>(SomeStruct, u64, T): SomeStruct'
+Method 'foo()'
+    INSERT TEXT: 'foo'
+    TARGET     : '(Completion::dot::foo)'
+    TYPE       : 'fun (SomeStruct)'
+Method 'shadowed()'
+    INSERT TEXT: 'shadowed'
+    TARGET     : '(Completion::dot::shadowed)'
+    TYPE       : 'fun ()'
+Struct 'SomeStruct'
+
+-- test 23 -------------------
+use line: 73, use_col: 43
+Module 'colon_colon'
+Module 'dot'
+Module 'init'
+Module 'init_otw'
+Module 'macro_dot'
+Module 'object'
+Module 'other_mod_dot'
+Module 'uses'
+
diff --git a/external-crates/move/crates/move-analyzer/tests/colon_colon_completion.ide b/external-crates/move/crates/move-analyzer/tests/colon_colon_completion.ide
new file mode 100644
index 0000000000000..78c526092d177
--- /dev/null
+++ b/external-crates/move/crates/move-analyzer/tests/colon_colon_completion.ide
@@ -0,0 +1,252 @@
+// Tests `::` completions
+{
+  "Completion": {
+    "project": "tests/completion",
+    "file_tests": {
+      "colon_colon.move": [
+        // cursor on identifier
+        {
+          "use_line": 15,
+          "use_col": 68
+        },
+        {
+          "use_line": 21,
+          "use_col": 22
+        },
+        {
+          "use_line": 21,
+          "use_col": 34
+        },
+        {
+          "use_line": 21,
+          "use_col": 47
+        },
+        {
+          "use_line": 21,
+          "use_col": 57
+        },
+        {
+          "use_line": 22,
+          "use_col": 11
+        },
+        {
+          "use_line": 22,
+          "use_col": 46
+        },
+        {
+          "use_line": 23,
+          "use_col": 25
+        },
+        {
+          "use_line": 24,
+          "use_col": 9
+        },
+        {
+          "use_line": 24,
+          "use_col": 40
+        },
+        {
+          "use_line": 25,
+          "use_col": 9
+        },
+        {
+          "use_line": 25,
+          "use_col": 17
+        },
+        {
+          "use_line": 26,
+          "use_col": 20
+        },
+        {
+          "use_line": 27,
+          "use_col": 9
+        },
+        {
+          "use_line": 27,
+          "use_col": 23
+        },
+        {
+          "use_line": 28,
+          "use_col": 13
+        },
+        {
+          "use_line": 29,
+          "use_col": 9
+        },
+        {
+          "use_line": 33,
+          "use_col": 33
+        },
+        {
+          "use_line": 33,
+          "use_col": 37
+        },
+        {
+          "use_line": 34,
+          "use_col": 31
+        },
+        {
+          "use_line": 38,
+          "use_col": 9
+        },
+        {
+          "use_line": 55,
+          "use_col": 26
+        },
+        {
+          "use_line": 55,
+          "use_col": 39
+        },
+        {
+          "use_line": 59,
+          "use_col": 21
+        },
+        {
+          "use_line": 62,
+          "use_col": 43
+        },
+        {
+          "use_line": 62,
+          "use_col": 49
+        },
+        // cursor after `::`
+        {
+          "use_line": 21,
+          "use_col": 33
+        },
+        {
+          "use_line": 21,
+          "use_col": 46
+        },
+        {
+          "use_line": 21,
+          "use_col": 56
+        },
+        {
+          "use_line": 25,
+          "use_col": 16
+        },
+        {
+          "use_line": 26,
+          "use_col": 19
+        },
+        {
+          "use_line": 27,
+          "use_col": 23
+        },
+        {
+          "use_line": 41,
+          "use_col": 20
+        },
+        {
+          "use_line": 44,
+          "use_col": 43
+        },
+        {
+          "use_line": 55,
+          "use_col": 38
+        }
+      ],
+      "uses.move": [
+        // complete uses
+        {
+          "use_line": 2,
+          "use_col": 9
+        },
+        {
+          "use_line": 2,
+          "use_col": 20
+        },
+        {
+          "use_line": 2,
+          "use_col": 21
+        },
+        {
+          "use_line": 2,
+          "use_col": 25
+        },
+        {
+          "use_line": 2,
+          "use_col": 26
+        },
+        {
+          "use_line": 3,
+          "use_col": 9
+        },
+        {
+          "use_line": 3,
+          "use_col": 22
+        },
+        {
+          "use_line": 3,
+          "use_col": 28
+        },
+        {
+          "use_line": 3,
+          "use_col": 33
+        },
+        {
+          "use_line": 3,
+          "use_col": 39
+        },
+        {
+          "use_line": 3,
+          "use_col": 51
+        },
+        {
+          "use_line": 3,
+          "use_col": 52
+        },
+        // partial uses
+        {
+          "use_line": 15,
+          "use_col": 13
+        },
+        {
+          "use_line": 19,
+          "use_col": 24
+        },
+        {
+          "use_line": 23,
+          "use_col": 29
+        },
+        {
+          "use_line": 27,
+          "use_col": 30
+        },
+        {
+          "use_line": 31,
+          "use_col": 30
+        },
+        {
+          "use_line": 37,
+          "use_col": 31
+        },
+        {
+          "use_line": 43,
+          "use_col": 25
+        },
+        {
+          "use_line": 49,
+          "use_col": 26
+        },
+        {
+          "use_line": 55,
+          "use_col": 30
+        },
+        {
+          "use_line": 61,
+          "use_col": 31
+        },
+        {
+          "use_line": 67,
+          "use_col": 37
+        },
+        {
+          "use_line": 73,
+          "use_col": 43
+        }
+      ]
+    }
+  }
+}
diff --git a/external-crates/move/crates/move-analyzer/tests/completion/sources/colon_colon.move b/external-crates/move/crates/move-analyzer/tests/completion/sources/colon_colon.move
new file mode 100644
index 0000000000000..56a9a4dcb5ad4
--- /dev/null
+++ b/external-crates/move/crates/move-analyzer/tests/completion/sources/colon_colon.move
@@ -0,0 +1,66 @@
+module Completion::colon_colon {
+
+    const SOME_CONST: u64 = 42;
+
+    public struct SomeStruct has drop {}
+
+    public enum SomeEnum has drop {
+        SomeVariant,
+        SomeNamedVariant { name1: u64, name2: u64},
+        SomePositionalVariant(u64, u64),
+    }
+
+    public struct CompletionStruct has drop {}
+
+    public fun sbar(_param1: u64, _param2: Completion::colon_colon::SomeStruct) {}
+    public fun sbaz() {}
+
+    public fun complete_chains(s: SomeStruct) {
+        use Completion::colon_colon as CC;
+        use Completion::colon_colon::SomeEnum as SE;
+        let _local = Completion::colon_colon::SomeEnum::SomeVariant;
+        ::Completion::colon_colon::SomeEnum::SomeVariant;
+        Completion::dot::shadowed();
+        0xCAFE::colon_colon::SomeEnum::SomeVariant;
+        option::none<u64>();
+        std::hash::sha2_256(vector::empty());
+        CC::SomeEnum::SomeVariant;
+        CC::sbar(42, s);
+        SE::SomeVariant;
+        SE::SomePositionalVariant(7, 42);
+        SE::SomeNamedVariant{name1: 7, name2: 42};
+
+        let _struct_vec: vector<CC::SomeStruct> = vector::empty();
+        let _prim_vec: vector<u64> = vector::empty();
+    }
+
+    public fun single_ident() {
+        C
+    }
+    public fun one_colon_colon() {
+        Completion::
+    }
+    public fun multi_colon_colon() {
+        Completion::colon_colon::SomeEnum::
+    }
+
+    public enum TargEnum<T: drop> has drop {
+        Variant{field: T}
+    }
+
+    public fun targ_chain() {
+        use Completion::colon_colon as CC;
+        // to test that variant for enums with explict type arguments auto-complete correctly
+        // and that type argument auto-completes correctly
+        CC::TargEnum<CC::SomeStruct>::Variant{field: CC::SomeStruct{}};
+    }
+
+    public fun targ_type<SOME_TYPE>(p: SOME_TYPE) {
+        let _local: SOME_TYPE = p;
+    }
+
+    #[test, expected_failure(abort_code = Self::SOME_CONST)]
+    public fun attr_chain() {
+        abort(SOME_CONST);
+    }
+}
diff --git a/external-crates/move/crates/move-analyzer/tests/completion/sources/dot.move b/external-crates/move/crates/move-analyzer/tests/completion/sources/dot.move
index e312112788da4..d53b13553dc46 100644
--- a/external-crates/move/crates/move-analyzer/tests/completion/sources/dot.move
+++ b/external-crates/move/crates/move-analyzer/tests/completion/sources/dot.move
@@ -10,7 +10,7 @@ module Completion::dot {
         s
     }
 
-    public fun simple() {
+    fun simple() {
         let s = SomeStruct { some_field: 42 };
         s.;
     }
@@ -21,7 +21,7 @@ module Completion::dot {
         s.;
     }
 
-    public fun shadowed() {
+    public(package) fun shadowed() {
         use fun bar as SomeStruct.foo;
         let s = SomeStruct { some_field: 42 };
         s.;
diff --git a/external-crates/move/crates/move-analyzer/tests/completion/sources/uses.move b/external-crates/move/crates/move-analyzer/tests/completion/sources/uses.move
new file mode 100644
index 0000000000000..2bb1b2fffdae5
--- /dev/null
+++ b/external-crates/move/crates/move-analyzer/tests/completion/sources/uses.move
@@ -0,0 +1,77 @@
+module Completion::uses {
+    use Completion::dot::aliased;
+    use Completion::{dot::{foo, bar}, colon_colon::complete_chains};
+
+    public fun foo(p: SomeStruct) {}
+
+    public fun use_fun_chain(s: SomeStruct) {
+        use Completion::colon_colon as CC;
+        use fun CC::foo as Completion::colon_colon::SomeStruct.foo_alias;
+
+        s.foo_alias();
+    }
+
+    public fun partial1() {
+        use C
+    }
+
+    public fun partial2() {
+        use Completion::
+    }
+
+    public fun partial3() {
+        use Completion::dot::
+    }
+
+    public fun partial4() {
+        use Completion::dot::f
+    }
+
+    public fun partial5() {
+        use Completion::dot::{
+    }
+
+    public fun reset_parser1() {}
+
+    public fun partial6() {
+        use Completion::dot::{f
+    }
+
+    public fun reset_parser1() {}
+
+    public fun partial7() {
+        use Completion::{
+    }
+
+    public fun reset_parser2() {}
+
+    public fun partial8() {
+        use Completion::{d
+    }
+
+    public fun reset_parser3() {}
+
+    public fun partial9() {
+        use Completion::{dot::
+    }
+
+    public fun reset_parser4() {}
+
+    public fun partial10() {
+        use Completion::{dot::f
+    }
+
+    public fun reset_parser5() {}
+
+    public fun partial11() {
+        use Completion::{dot::{foo, b
+    }
+
+    public fun reset_parser6() {}
+
+    public fun partial12() {
+        use Completion::{dot::{foo, bar}, c
+    }
+
+    public fun reset_parser7() {}
+}
diff --git a/external-crates/move/crates/move-analyzer/tests/ide_testsuite.rs b/external-crates/move/crates/move-analyzer/tests/ide_testsuite.rs
index 8f642d137ce2f..97d0d6d39b7a6 100644
--- a/external-crates/move/crates/move-analyzer/tests/ide_testsuite.rs
+++ b/external-crates/move/crates/move-analyzer/tests/ide_testsuite.rs
@@ -204,7 +204,9 @@ impl CompletionTest {
         )?;
         for i in items {
             writeln!(output, "{:?} '{}'", i.kind.unwrap(), i.label)?;
-            writeln!(output, "    INSERT TEXT: '{}'", i.insert_text.unwrap())?;
+            if let Some(insert_text) = i.insert_text {
+                writeln!(output, "    INSERT TEXT: '{}'", insert_text)?;
+            }
             if let Some(label_details) = i.label_details {
                 if let Some(detail) = label_details.detail {
                     writeln!(output, "    TARGET     : '{}'", detail.trim())?;
diff --git a/external-crates/move/crates/move-binary-format/src/file_format.rs b/external-crates/move/crates/move-binary-format/src/file_format.rs
index ff60d27ee3849..c65207ff96e15 100644
--- a/external-crates/move/crates/move-binary-format/src/file_format.rs
+++ b/external-crates/move/crates/move-binary-format/src/file_format.rs
@@ -12,15 +12,15 @@
 //!
 //! Overall the binary format is structured in a number of sections:
 //! - **Header**: this must start at offset 0 in the binary. It contains a blob that starts every
-//! Diem binary, followed by the version of the VM used to compile the code, and last is the
-//! number of tables present in this binary.
+//!     Diem binary, followed by the version of the VM used to compile the code, and last is the
+//!     number of tables present in this binary.
 //! - **Table Specification**: it's a number of tuple of the form
-//! `(table type, starting_offset, byte_count)`. The number of entries is specified in the
-//! header (last entry in header). There can only be a single entry per table type. The
-//! `starting offset` is from the beginning of the binary. Tables must cover the entire size of
-//! the binary blob and cannot overlap.
+//!     `(table type, starting_offset, byte_count)`. The number of entries is specified in the
+//!     header (last entry in header). There can only be a single entry per table type. The
+//!     `starting offset` is from the beginning of the binary. Tables must cover the entire size of
+//!     the binary blob and cannot overlap.
 //! - **Table Content**: the serialized form of the specific entries in the table. Those roughly
-//! map to the structs defined in this module. Entries in each table must be unique.
+//!     map to the structs defined in this module. Entries in each table must be unique.
 //!
 //! We have two formats: one for modules here represented by `CompiledModule`, another
 //! for transaction scripts which is `CompiledScript`. Building those tables and passing them
diff --git a/external-crates/move/crates/move-binary-format/src/file_format_common.rs b/external-crates/move/crates/move-binary-format/src/file_format_common.rs
index 7c81c755a012a..7d006ef74f9f9 100644
--- a/external-crates/move/crates/move-binary-format/src/file_format_common.rs
+++ b/external-crates/move/crates/move-binary-format/src/file_format_common.rs
@@ -334,7 +334,7 @@ pub enum Opcodes {
 }
 
 /// Upper limit on the binary size
-pub const BINARY_SIZE_LIMIT: usize = usize::max_value();
+pub const BINARY_SIZE_LIMIT: usize = usize::MAX;
 
 /// A wrapper for the binary vector
 #[derive(Default, Debug)]
diff --git a/external-crates/move/crates/move-binary-format/src/lib.rs b/external-crates/move/crates/move-binary-format/src/lib.rs
index 2490f2d247205..78e3607f7dfc8 100644
--- a/external-crates/move/crates/move-binary-format/src/lib.rs
+++ b/external-crates/move/crates/move-binary-format/src/lib.rs
@@ -161,8 +161,10 @@ macro_rules! safe_unwrap {
         match $e {
             Some(x) => x,
             None => {
-                let err = PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
-                    .with_message(format!("{}:{} (none)", file!(), line!()));
+                let err = move_binary_format::errors::PartialVMError::new(
+                    move_core_types::vm_status::StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR,
+                )
+                .with_message(format!("{}:{} (none)", file!(), line!()));
                 if cfg!(debug_assertions) {
                     panic!("{:?}", err);
                 } else {
diff --git a/external-crates/move/crates/move-binary-format/src/proptest_types/functions.rs b/external-crates/move/crates/move-binary-format/src/proptest_types/functions.rs
index a549e18fb8b94..42bbfacfc1b75 100644
--- a/external-crates/move/crates/move-binary-format/src/proptest_types/functions.rs
+++ b/external-crates/move/crates/move-binary-format/src/proptest_types/functions.rs
@@ -55,7 +55,7 @@ impl SignatureState {
     }
 
     fn add_signature(&mut self, sig: Signature) -> SignatureIndex {
-        debug_assert!(self.signatures.len() < TableSize::max_value() as usize);
+        debug_assert!(self.signatures.len() < TableSize::MAX as usize);
         if let Some(idx) = self.signature_map.get(&sig) {
             return *idx;
         }
@@ -81,7 +81,7 @@ impl FieldHandleState {
 
     #[allow(unused)]
     fn add_field_handle(&mut self, fh: FieldHandle) -> FieldHandleIndex {
-        debug_assert!(self.field_handles.len() < TableSize::max_value() as usize);
+        debug_assert!(self.field_handles.len() < TableSize::MAX as usize);
         if let Some(idx) = self.field_map.get(&fh) {
             return *idx;
         }
@@ -105,7 +105,7 @@ impl VariantHandleState {
     }
 
     fn add_variant_handle(&mut self, vh: VariantHandle) -> Option<VariantHandleIndex> {
-        debug_assert!(self.variant_handles.len() < TableSize::max_value() as usize);
+        debug_assert!(self.variant_handles.len() < TableSize::MAX as usize);
         if let Some(idx) = self.variant_map.get(&vh) {
             return Some(*idx);
         }
@@ -135,7 +135,7 @@ impl VariantInstantiationHandleState {
         &mut self,
         vh: VariantInstantiationHandle,
     ) -> Option<VariantInstantiationHandleIndex> {
-        debug_assert!(self.variant_instantiation_handles.len() < TableSize::max_value() as usize);
+        debug_assert!(self.variant_instantiation_handles.len() < TableSize::MAX as usize);
         if let Some(idx) = self.variant_map.get(&vh) {
             return Some(*idx);
         }
@@ -179,7 +179,7 @@ where
 
     #[allow(unused)]
     fn add_instantiation(&mut self, inst: T) -> TableIndex {
-        debug_assert!(self.instantiations.len() < TableSize::max_value() as usize);
+        debug_assert!(self.instantiations.len() < TableSize::MAX as usize);
         if let Some(idx) = self.instantiation_map.get(&inst) {
             return *idx;
         }
@@ -381,7 +381,7 @@ impl<'a> FnDefnMaterializeState<'a> {
     }
 
     fn add_function_handle(&mut self, handle: FunctionHandle) -> FunctionHandleIndex {
-        debug_assert!(self.function_handles.len() < TableSize::max_value() as usize);
+        debug_assert!(self.function_handles.len() < TableSize::MAX as usize);
         self.function_handles.push(handle);
         FunctionHandleIndex((self.function_handles.len() - 1) as TableIndex)
     }
@@ -488,7 +488,7 @@ impl FunctionDefinitionGen {
 
     pub fn materialize(self, state: &mut FnDefnMaterializeState) -> Option<FunctionDefinition> {
         // This precondition should never fail because the table size cannot be greater
-        // than TableSize::max_value()
+        // than TableSize::MAX
         let iden_idx = IdentifierIndex(self.name.index(state.identifiers_len) as TableIndex);
         if state
             .def_function_handles
diff --git a/external-crates/move/crates/move-binary-format/src/proptest_types/types.rs b/external-crates/move/crates/move-binary-format/src/proptest_types/types.rs
index 6cd5e43e76afd..49071e100b080 100644
--- a/external-crates/move/crates/move-binary-format/src/proptest_types/types.rs
+++ b/external-crates/move/crates/move-binary-format/src/proptest_types/types.rs
@@ -23,9 +23,6 @@ use proptest::{
 };
 use std::collections::BTreeSet;
 
-#[derive(Debug)]
-struct TypeSignatureIndex(u16);
-
 #[derive(Debug)]
 pub struct StDefnMaterializeState {
     pub self_module_handle_idx: ModuleHandleIndex,
diff --git a/external-crates/move/crates/move-binary-format/src/serializer.rs b/external-crates/move/crates/move-binary-format/src/serializer.rs
index 2d5a362e23914..0c8c6038df4d9 100644
--- a/external-crates/move/crates/move-binary-format/src/serializer.rs
+++ b/external-crates/move/crates/move-binary-format/src/serializer.rs
@@ -228,11 +228,11 @@ impl CompiledModule {
         let mut ser = ModuleSerializer::new(version);
         let mut temp = BinaryData::new();
         ser.serialize_tables(&mut temp, self)?;
-        if temp.len() > u32::max_value() as usize {
+        if temp.len() > u32::MAX as usize {
             bail!(
                 "table content size ({}) cannot exceed ({})",
                 temp.len(),
-                u32::max_value()
+                u32::MAX
             );
         }
         ser.common.serialize_header(&mut binary_data)?;
@@ -296,11 +296,11 @@ struct ModuleSerializer {
 // Helpers
 //
 fn check_index_in_binary(index: usize) -> Result<u32> {
-    if index > u32::max_value() as usize {
+    if index > u32::MAX as usize {
         bail!(
             "Compilation unit too big ({}) cannot exceed {}",
             index,
-            u32::max_value()
+            u32::MAX
         )
     }
     Ok(index as u32)
diff --git a/external-crates/move/crates/move-binary-format/src/unit_tests/number_tests.rs b/external-crates/move/crates/move-binary-format/src/unit_tests/number_tests.rs
index b99e94bb66e33..1e5f97f551374 100644
--- a/external-crates/move/crates/move-binary-format/src/unit_tests/number_tests.rs
+++ b/external-crates/move/crates/move-binary-format/src/unit_tests/number_tests.rs
@@ -42,8 +42,8 @@ fn uleb128_test() {
         uleb128_test_u64(2u64.pow(exp), n + 1);
         n += 1;
     }
-    uleb128_test_u64(u64::max_value() - 1, 10);
-    uleb128_test_u64(u64::max_value(), 10);
+    uleb128_test_u64(u64::MAX - 1, 10);
+    uleb128_test_u64(u64::MAX, 10);
 }
 
 #[test]
diff --git a/external-crates/move/crates/move-borrow-graph/src/graph.rs b/external-crates/move/crates/move-borrow-graph/src/graph.rs
index bb3dfe4bf0b29..0f51ed4e5bc05 100644
--- a/external-crates/move/crates/move-borrow-graph/src/graph.rs
+++ b/external-crates/move/crates/move-borrow-graph/src/graph.rs
@@ -232,19 +232,21 @@ impl<Loc: Copy, Lbl: Clone + Ord> BorrowGraph<Loc, Lbl> {
     /// Remove reference `id` from the graph
     /// Fixes any transitive borrows, so if `parent` borrowed by `id` borrowed by `child`
     /// After the release, `parent` borrowed by `child`
-    pub fn release(&mut self, id: RefID) {
+    pub fn release(&mut self, id: RefID) -> usize {
         debug_assert!(self.check_invariant());
         let Ref {
             borrowed_by,
             borrows_from,
             ..
         } = self.0.remove(&id).unwrap();
+        let mut released_edges = 0;
         for parent_ref_id in borrows_from.into_iter() {
             let parent = self.0.get_mut(&parent_ref_id).unwrap();
             let parent_edges = parent.borrowed_by.0.remove(&id).unwrap();
             for parent_edge in parent_edges {
                 for (child_ref_id, child_edges) in &borrowed_by.0 {
                     for child_edge in child_edges {
+                        released_edges += 1;
                         self.splice_out_intermediate(
                             parent_ref_id,
                             &parent_edge,
@@ -260,6 +262,7 @@ impl<Loc: Copy, Lbl: Clone + Ord> BorrowGraph<Loc, Lbl> {
             child.borrows_from.remove(&id);
         }
         debug_assert!(self.check_invariant());
+        released_edges
     }
 
     fn splice_out_intermediate(
diff --git a/external-crates/move/crates/move-bytecode-verifier-meter/src/lib.rs b/external-crates/move/crates/move-bytecode-verifier-meter/src/lib.rs
index 64bc6bd6e123f..ce90b1e1db8f8 100644
--- a/external-crates/move/crates/move-bytecode-verifier-meter/src/lib.rs
+++ b/external-crates/move/crates/move-bytecode-verifier-meter/src/lib.rs
@@ -46,6 +46,7 @@ pub trait Meter {
     }
 
     /// Adds the number of items with growth factor
+    #[deprecated(note = "this function is extremely slow and should be avoided")]
     fn add_items_with_growth(
         &mut self,
         scope: Scope,
diff --git a/external-crates/move/crates/move-bytecode-verifier/src/ability_cache.rs b/external-crates/move/crates/move-bytecode-verifier/src/ability_cache.rs
new file mode 100644
index 0000000000000..39ba92b79c49c
--- /dev/null
+++ b/external-crates/move/crates/move-bytecode-verifier/src/ability_cache.rs
@@ -0,0 +1,100 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+use move_binary_format::{
+    errors::PartialVMResult,
+    file_format::{AbilitySet, DatatypeHandleIndex, SignatureToken},
+    safe_unwrap, CompiledModule,
+};
+use move_bytecode_verifier_meter::{Meter, Scope};
+use std::{
+    cmp::max,
+    collections::{btree_map::Entry, BTreeMap},
+};
+
+const TYPE_ARG_COST: u128 = 1;
+
+pub struct AbilityCache<'a> {
+    module: &'a CompiledModule,
+    vector_results: BTreeMap<AbilitySet, AbilitySet>,
+    datatype_results: BTreeMap<DatatypeHandleIndex, BTreeMap<Vec<AbilitySet>, AbilitySet>>,
+}
+
+impl<'a> AbilityCache<'a> {
+    pub fn new(module: &'a CompiledModule) -> Self {
+        Self {
+            module,
+            vector_results: BTreeMap::new(),
+            datatype_results: BTreeMap::new(),
+        }
+    }
+
+    pub fn abilities(
+        &mut self,
+        scope: Scope,
+        meter: &mut (impl Meter + ?Sized),
+        type_parameter_abilities: &[AbilitySet],
+        ty: &SignatureToken,
+    ) -> PartialVMResult<AbilitySet> {
+        use SignatureToken as S;
+
+        Ok(match ty {
+            S::Bool | S::U8 | S::U16 | S::U32 | S::U64 | S::U128 | S::U256 | S::Address => {
+                AbilitySet::PRIMITIVES
+            }
+
+            S::Reference(_) | S::MutableReference(_) => AbilitySet::REFERENCES,
+            S::Signer => AbilitySet::SIGNER,
+            S::TypeParameter(idx) => *safe_unwrap!(type_parameter_abilities.get(*idx as usize)),
+            S::Datatype(idx) => {
+                let sh = self.module.datatype_handle_at(*idx);
+                sh.abilities
+            }
+            S::Vector(inner) => {
+                let inner_abilities =
+                    self.abilities(scope, meter, type_parameter_abilities, inner)?;
+                let entry = self.vector_results.entry(inner_abilities);
+                match entry {
+                    Entry::Occupied(entry) => *entry.get(),
+                    Entry::Vacant(entry) => {
+                        meter.add(scope, TYPE_ARG_COST)?;
+                        let abilities = AbilitySet::polymorphic_abilities(
+                            AbilitySet::VECTOR,
+                            vec![false],
+                            vec![inner_abilities],
+                        )?;
+                        entry.insert(abilities);
+                        abilities
+                    }
+                }
+            }
+            S::DatatypeInstantiation(inst) => {
+                let (idx, type_args) = &**inst;
+                let type_arg_abilities = type_args
+                    .iter()
+                    .map(|arg| self.abilities(scope, meter, type_parameter_abilities, arg))
+                    .collect::<PartialVMResult<Vec<_>>>()?;
+                let entry = self
+                    .datatype_results
+                    .entry(*idx)
+                    .or_default()
+                    .entry(type_arg_abilities.clone());
+                match entry {
+                    Entry::Occupied(entry) => *entry.get(),
+                    Entry::Vacant(entry) => {
+                        meter.add_items(scope, TYPE_ARG_COST, max(type_args.len(), 1))?;
+                        let sh = self.module.datatype_handle_at(*idx);
+                        let declared_abilities = sh.abilities;
+                        let abilities = AbilitySet::polymorphic_abilities(
+                            declared_abilities,
+                            sh.type_parameters.iter().map(|param| param.is_phantom),
+                            type_arg_abilities,
+                        )?;
+                        entry.insert(abilities);
+                        abilities
+                    }
+                }
+            }
+        })
+    }
+}
diff --git a/external-crates/move/crates/move-bytecode-verifier/src/ability_field_requirements.rs b/external-crates/move/crates/move-bytecode-verifier/src/ability_field_requirements.rs
index 1c868ad3856ad..3d462dcd04197 100644
--- a/external-crates/move/crates/move-bytecode-verifier/src/ability_field_requirements.rs
+++ b/external-crates/move/crates/move-bytecode-verifier/src/ability_field_requirements.rs
@@ -4,18 +4,29 @@
 
 //! This module implements a checker for verifying that all of the struct's fields satisfy the
 //! abilities required by the struct's abilities
+use crate::ability_cache::AbilityCache;
 use move_binary_format::{
     errors::{verification_error, Location, PartialVMResult, VMResult},
     file_format::{AbilitySet, CompiledModule, StructFieldInformation, TableIndex},
     IndexKind,
 };
+use move_bytecode_verifier_meter::{Meter, Scope};
 use move_core_types::vm_status::StatusCode;
 
-pub fn verify_module(module: &CompiledModule) -> VMResult<()> {
-    verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+pub fn verify_module<'env>(
+    module: &'env CompiledModule,
+    ability_cache: &mut AbilityCache<'env>,
+    meter: &mut (impl Meter + ?Sized),
+) -> VMResult<()> {
+    verify_module_impl(module, ability_cache, meter)
+        .map_err(|e| e.finish(Location::Module(module.self_id())))
 }
 
-fn verify_module_impl(module: &CompiledModule) -> PartialVMResult<()> {
+fn verify_module_impl<'env>(
+    module: &'env CompiledModule,
+    ability_cache: &mut AbilityCache<'env>,
+    meter: &mut (impl Meter + ?Sized),
+) -> PartialVMResult<()> {
     for (idx, struct_def) in module.struct_defs().iter().enumerate() {
         let sh = module.datatype_handle_at(struct_def.struct_handle);
         let fields = match &struct_def.field_information {
@@ -35,8 +46,12 @@ fn verify_module_impl(module: &CompiledModule) -> PartialVMResult<()> {
             .map(|_| AbilitySet::ALL)
             .collect::<Vec<_>>();
         for field in fields {
-            let field_abilities =
-                module.abilities(&field.signature.0, &type_parameter_abilities)?;
+            let field_abilities = ability_cache.abilities(
+                Scope::Module,
+                meter,
+                &type_parameter_abilities,
+                &field.signature.0,
+            )?;
             if !required_abilities.is_subset(field_abilities) {
                 return Err(verification_error(
                     StatusCode::FIELD_MISSING_TYPE_ABILITY,
@@ -63,8 +78,12 @@ fn verify_module_impl(module: &CompiledModule) -> PartialVMResult<()> {
             .collect::<Vec<_>>();
         for (i, variant) in enum_def.variants.iter().enumerate() {
             for (fi, field) in variant.fields.iter().enumerate() {
-                let field_abilities =
-                    module.abilities(&field.signature.0, &type_parameter_abilities)?;
+                let field_abilities = ability_cache.abilities(
+                    Scope::Module,
+                    meter,
+                    &type_parameter_abilities,
+                    &field.signature.0,
+                )?;
                 if !required_abilities.is_subset(field_abilities) {
                     return Err(verification_error(
                         StatusCode::FIELD_MISSING_TYPE_ABILITY,
diff --git a/external-crates/move/crates/move-bytecode-verifier/src/code_unit_verifier.rs b/external-crates/move/crates/move-bytecode-verifier/src/code_unit_verifier.rs
index a3b9a0ab07fa9..f8971d78924e4 100644
--- a/external-crates/move/crates/move-bytecode-verifier/src/code_unit_verifier.rs
+++ b/external-crates/move/crates/move-bytecode-verifier/src/code_unit_verifier.rs
@@ -6,8 +6,8 @@
 //! The overall verification is split between stack_usage_verifier.rs and
 //! abstract_interpreter.rs. CodeUnitVerifier simply orchestrates calls into these two files.
 use crate::{
-    acquires_list_verifier::AcquiresVerifier, control_flow, locals_safety, reference_safety,
-    stack_usage_verifier::StackUsageVerifier, type_safety,
+    ability_cache::AbilityCache, acquires_list_verifier::AcquiresVerifier, control_flow,
+    locals_safety, reference_safety, stack_usage_verifier::StackUsageVerifier, type_safety,
 };
 use move_abstract_interpreter::{absint::FunctionContext, control_flow_graph::ControlFlowGraph};
 use move_binary_format::{
@@ -22,123 +22,128 @@ use move_core_types::vm_status::StatusCode;
 use move_vm_config::verifier::VerifierConfig;
 use std::collections::HashMap;
 
-pub struct CodeUnitVerifier<'a> {
-    module: &'a CompiledModule,
-    function_context: FunctionContext<'a>,
+pub struct CodeUnitVerifier<'env, 'a> {
+    module: &'env CompiledModule,
+    function_context: FunctionContext<'env>,
     name_def_map: &'a HashMap<IdentifierIndex, FunctionDefinitionIndex>,
 }
 
-impl<'a> CodeUnitVerifier<'a> {
-    pub fn verify_module(
-        verifier_config: &VerifierConfig,
-        module: &'a CompiledModule,
-        meter: &mut (impl Meter + ?Sized),
-    ) -> VMResult<()> {
-        Self::verify_module_impl(verifier_config, module, meter)
-            .map_err(|e| e.finish(Location::Module(module.self_id())))
-    }
+pub fn verify_module<'env>(
+    verifier_config: &VerifierConfig,
+    module: &'env CompiledModule,
+    ability_cache: &mut AbilityCache<'env>,
+    meter: &mut (impl Meter + ?Sized),
+) -> VMResult<()> {
+    verify_module_impl(verifier_config, module, ability_cache, meter)
+        .map_err(|e| e.finish(Location::Module(module.self_id())))
+}
 
-    fn verify_module_impl(
-        verifier_config: &VerifierConfig,
-        module: &CompiledModule,
-        meter: &mut (impl Meter + ?Sized),
-    ) -> PartialVMResult<()> {
-        let mut name_def_map = HashMap::new();
-        for (idx, func_def) in module.function_defs().iter().enumerate() {
-            let fh = module.function_handle_at(func_def.function);
-            name_def_map.insert(fh.name, FunctionDefinitionIndex(idx as u16));
-        }
-        let mut total_back_edges = 0;
-        for (idx, function_definition) in module.function_defs().iter().enumerate() {
-            let index = FunctionDefinitionIndex(idx as TableIndex);
-            let num_back_edges = Self::verify_function(
-                verifier_config,
-                index,
-                function_definition,
-                module,
-                &name_def_map,
-                meter,
-            )
-            .map_err(|err| err.at_index(IndexKind::FunctionDefinition, index.0))?;
-            total_back_edges += num_back_edges;
-        }
-        if let Some(limit) = verifier_config.max_back_edges_per_module {
-            if total_back_edges > limit {
-                return Err(PartialVMError::new(StatusCode::TOO_MANY_BACK_EDGES));
-            }
-        }
-        Ok(())
+fn verify_module_impl<'env>(
+    verifier_config: &VerifierConfig,
+    module: &'env CompiledModule,
+    ability_cache: &mut AbilityCache<'env>,
+    meter: &mut (impl Meter + ?Sized),
+) -> PartialVMResult<()> {
+    let mut name_def_map = HashMap::new();
+    for (idx, func_def) in module.function_defs().iter().enumerate() {
+        let fh = module.function_handle_at(func_def.function);
+        name_def_map.insert(fh.name, FunctionDefinitionIndex(idx as u16));
     }
-
-    fn verify_function(
-        verifier_config: &VerifierConfig,
-        index: FunctionDefinitionIndex,
-        function_definition: &FunctionDefinition,
-        module: &CompiledModule,
-        name_def_map: &HashMap<IdentifierIndex, FunctionDefinitionIndex>,
-        meter: &mut (impl Meter + ?Sized),
-    ) -> PartialVMResult<usize> {
-        meter.enter_scope(
-            module
-                .identifier_at(module.function_handle_at(function_definition.function).name)
-                .as_str(),
-            Scope::Function,
-        );
-        // nothing to verify for native function
-        let code = match &function_definition.code {
-            Some(code) => code,
-            None => return Ok(0),
-        };
-
-        // create `FunctionContext` and `BinaryIndexedView`
-        let function_context = control_flow::verify_function(
+    let mut total_back_edges = 0;
+    for (idx, function_definition) in module.function_defs().iter().enumerate() {
+        let index = FunctionDefinitionIndex(idx as TableIndex);
+        let num_back_edges = verify_function(
             verifier_config,
-            module,
             index,
             function_definition,
-            code,
+            module,
+            ability_cache,
+            &name_def_map,
             meter,
-        )?;
+        )
+        .map_err(|err| err.at_index(IndexKind::FunctionDefinition, index.0))?;
+        total_back_edges += num_back_edges;
+    }
+    if let Some(limit) = verifier_config.max_back_edges_per_module {
+        if total_back_edges > limit {
+            return Err(PartialVMError::new(StatusCode::TOO_MANY_BACK_EDGES));
+        }
+    }
+    Ok(())
+}
 
-        if let Some(limit) = verifier_config.max_basic_blocks {
-            if function_context.cfg().blocks().len() > limit {
-                return Err(
-                    PartialVMError::new(StatusCode::TOO_MANY_BASIC_BLOCKS).at_code_offset(index, 0)
-                );
-            }
+fn verify_function<'env>(
+    verifier_config: &VerifierConfig,
+    index: FunctionDefinitionIndex,
+    function_definition: &'env FunctionDefinition,
+    module: &'env CompiledModule,
+    ability_cache: &mut AbilityCache<'env>,
+    name_def_map: &HashMap<IdentifierIndex, FunctionDefinitionIndex>,
+    meter: &mut (impl Meter + ?Sized),
+) -> PartialVMResult<usize> {
+    meter.enter_scope(
+        module
+            .identifier_at(module.function_handle_at(function_definition.function).name)
+            .as_str(),
+        Scope::Function,
+    );
+    // nothing to verify for native function
+    let code = match &function_definition.code {
+        Some(code) => code,
+        None => return Ok(0),
+    };
+
+    // create `FunctionContext` and `BinaryIndexedView`
+    let function_context = control_flow::verify_function(
+        verifier_config,
+        module,
+        index,
+        function_definition,
+        code,
+        meter,
+    )?;
+
+    if let Some(limit) = verifier_config.max_basic_blocks {
+        if function_context.cfg().blocks().len() > limit {
+            return Err(
+                PartialVMError::new(StatusCode::TOO_MANY_BASIC_BLOCKS).at_code_offset(index, 0)
+            );
         }
+    }
 
-        let num_back_edges = function_context.cfg().num_back_edges();
-        if let Some(limit) = verifier_config.max_back_edges_per_function {
-            if num_back_edges > limit {
-                return Err(
-                    PartialVMError::new(StatusCode::TOO_MANY_BACK_EDGES).at_code_offset(index, 0)
-                );
-            }
+    let num_back_edges = function_context.cfg().num_back_edges();
+    if let Some(limit) = verifier_config.max_back_edges_per_function {
+        if num_back_edges > limit {
+            return Err(
+                PartialVMError::new(StatusCode::TOO_MANY_BACK_EDGES).at_code_offset(index, 0)
+            );
         }
+    }
 
-        // verify
-        let code_unit_verifier = CodeUnitVerifier {
-            module,
-            function_context,
-            name_def_map,
-        };
-        code_unit_verifier.verify_common(verifier_config, meter)?;
-        AcquiresVerifier::verify(module, index, function_definition, meter)?;
+    // verify
+    let code_unit_verifier = CodeUnitVerifier {
+        module,
+        function_context,
+        name_def_map,
+    };
+    code_unit_verifier.verify_common(verifier_config, ability_cache, meter)?;
+    AcquiresVerifier::verify(module, index, function_definition, meter)?;
 
-        meter.transfer(Scope::Function, Scope::Module, 1.0)?;
+    meter.transfer(Scope::Function, Scope::Module, 1.0)?;
 
-        Ok(num_back_edges)
-    }
+    Ok(num_back_edges)
+}
 
+impl<'env, 'a> CodeUnitVerifier<'env, 'a> {
     fn verify_common(
         &self,
         verifier_config: &VerifierConfig,
+        ability_cache: &mut AbilityCache<'env>,
         meter: &mut (impl Meter + ?Sized),
     ) -> PartialVMResult<()> {
         StackUsageVerifier::verify(verifier_config, self.module, &self.function_context, meter)?;
-        type_safety::verify(self.module, &self.function_context, meter)?;
-        locals_safety::verify(self.module, &self.function_context, meter)?;
+        type_safety::verify(self.module, &self.function_context, ability_cache, meter)?;
+        locals_safety::verify(self.module, &self.function_context, ability_cache, meter)?;
         reference_safety::verify(
             self.module,
             &self.function_context,
diff --git a/external-crates/move/crates/move-bytecode-verifier/src/control_flow.rs b/external-crates/move/crates/move-bytecode-verifier/src/control_flow.rs
index e32afcee37cff..07eb8b12991a0 100644
--- a/external-crates/move/crates/move-bytecode-verifier/src/control_flow.rs
+++ b/external-crates/move/crates/move-bytecode-verifier/src/control_flow.rs
@@ -29,14 +29,14 @@ use std::collections::BTreeSet;
 
 /// Perform control flow verification on the compiled function, returning its `FunctionContext` if
 /// verification was successful.
-pub fn verify_function<'a>(
-    verifier_config: &'a VerifierConfig,
-    module: &'a CompiledModule,
+pub fn verify_function<'env>(
+    verifier_config: &VerifierConfig,
+    module: &'env CompiledModule,
     index: FunctionDefinitionIndex,
-    function_definition: &'a FunctionDefinition,
-    code: &'a CodeUnit,
+    function_definition: &'env FunctionDefinition,
+    code: &'env CodeUnit,
     _meter: &mut (impl Meter + ?Sized), // TODO: metering
-) -> PartialVMResult<FunctionContext<'a>> {
+) -> PartialVMResult<FunctionContext<'env>> {
     let function_handle = module.function_handle_at(function_definition.function);
 
     if module.version() <= 5 {
diff --git a/external-crates/move/crates/move-bytecode-verifier/src/control_flow_v5.rs b/external-crates/move/crates/move-bytecode-verifier/src/control_flow_v5.rs
index b24d7aeca62b9..eb705b9498b8b 100644
--- a/external-crates/move/crates/move-bytecode-verifier/src/control_flow_v5.rs
+++ b/external-crates/move/crates/move-bytecode-verifier/src/control_flow_v5.rs
@@ -37,7 +37,7 @@ pub fn verify(
 
 fn verify_fallthrough(
     current_function: FunctionDefinitionIndex,
-    code: &Vec<Bytecode>,
+    code: &[Bytecode],
 ) -> PartialVMResult<()> {
     // Check to make sure that the bytecode vector ends with a branching instruction.
     match code.last() {
diff --git a/external-crates/move/crates/move-bytecode-verifier/src/lib.rs b/external-crates/move/crates/move-bytecode-verifier/src/lib.rs
index 64a88f59842dd..660da728a05d5 100644
--- a/external-crates/move/crates/move-bytecode-verifier/src/lib.rs
+++ b/external-crates/move/crates/move-bytecode-verifier/src/lib.rs
@@ -7,6 +7,7 @@
 //! Verifies bytecode sanity.
 
 // Bounds checks are implemented in the `vm` crate.
+pub mod ability_cache;
 pub mod ability_field_requirements;
 pub mod check_duplication;
 pub mod code_unit_verifier;
diff --git a/external-crates/move/crates/move-bytecode-verifier/src/locals_safety/abstract_state.rs b/external-crates/move/crates/move-bytecode-verifier/src/locals_safety/abstract_state.rs
index c42e538bf5b87..26eae31969670 100644
--- a/external-crates/move/crates/move-bytecode-verifier/src/locals_safety/abstract_state.rs
+++ b/external-crates/move/crates/move-bytecode-verifier/src/locals_safety/abstract_state.rs
@@ -4,6 +4,7 @@
 
 //! This module defines the abstract state for the local safety analysis.
 
+use crate::ability_cache::AbilityCache;
 use move_abstract_interpreter::absint::{AbstractDomain, FunctionContext, JoinResult};
 use move_binary_format::{
     errors::{PartialVMError, PartialVMResult},
@@ -26,10 +27,9 @@ pub(crate) enum LocalState {
 }
 use LocalState::*;
 
-pub(crate) const STEP_BASE_COST: u128 = 15;
-pub(crate) const RET_PER_LOCAL_COST: u128 = 30;
-pub(crate) const JOIN_BASE_COST: u128 = 10;
-pub(crate) const JOIN_PER_LOCAL_COST: u128 = 5;
+pub(crate) const STEP_BASE_COST: u128 = 1;
+pub(crate) const RET_COST: u128 = 10;
+pub(crate) const JOIN_COST: u128 = 10;
 
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub(crate) struct AbstractState {
@@ -41,8 +41,10 @@ pub(crate) struct AbstractState {
 impl AbstractState {
     /// create a new abstract state
     pub fn new(
-        module: &CompiledModule,
+        _module: &CompiledModule,
         function_context: &FunctionContext,
+        ability_cache: &mut AbilityCache,
+        meter: &mut (impl Meter + ?Sized),
     ) -> PartialVMResult<Self> {
         let num_args = function_context.parameters().len();
         let num_locals = num_args + function_context.locals().len();
@@ -55,7 +57,14 @@ impl AbstractState {
             .0
             .iter()
             .chain(function_context.locals().0.iter())
-            .map(|st| module.abilities(st, function_context.type_parameters()))
+            .map(|st| {
+                ability_cache.abilities(
+                    Scope::Function,
+                    meter,
+                    function_context.type_parameters(),
+                    st,
+                )
+            })
             .collect::<PartialVMResult<Vec<_>>>()?;
 
         Ok(Self {
@@ -141,12 +150,7 @@ impl AbstractDomain for AbstractState {
         state: &AbstractState,
         meter: &mut (impl Meter + ?Sized),
     ) -> PartialVMResult<JoinResult> {
-        meter.add(Scope::Function, JOIN_BASE_COST)?;
-        meter.add_items(
-            Scope::Function,
-            JOIN_PER_LOCAL_COST,
-            state.local_states.len(),
-        )?;
+        meter.add(Scope::Function, JOIN_COST)?;
         let joined = Self::join_(self, state);
         assert!(self.local_states.len() == joined.local_states.len());
         let locals_unchanged = self
diff --git a/external-crates/move/crates/move-bytecode-verifier/src/locals_safety/mod.rs b/external-crates/move/crates/move-bytecode-verifier/src/locals_safety/mod.rs
index f5eab08181ab5..1c9b0487b28d0 100644
--- a/external-crates/move/crates/move-bytecode-verifier/src/locals_safety/mod.rs
+++ b/external-crates/move/crates/move-bytecode-verifier/src/locals_safety/mod.rs
@@ -8,8 +8,8 @@
 
 mod abstract_state;
 
-use crate::locals_safety::abstract_state::{RET_PER_LOCAL_COST, STEP_BASE_COST};
-use abstract_state::{AbstractState, LocalState};
+use crate::ability_cache::AbilityCache;
+use abstract_state::{AbstractState, LocalState, RET_COST, STEP_BASE_COST};
 use move_abstract_interpreter::absint::{AbstractInterpreter, FunctionContext, TransferFunctions};
 use move_binary_format::{
     errors::{PartialVMError, PartialVMResult},
@@ -22,9 +22,10 @@ use move_core_types::vm_status::StatusCode;
 pub(crate) fn verify<'a>(
     module: &CompiledModule,
     function_context: &'a FunctionContext<'a>,
+    ability_cache: &mut AbilityCache,
     meter: &mut (impl Meter + ?Sized),
 ) -> PartialVMResult<()> {
-    let initial_state = AbstractState::new(module, function_context)?;
+    let initial_state = AbstractState::new(module, function_context, ability_cache, meter)?;
     LocalsSafetyAnalysis().analyze_function(initial_state, function_context, meter)
 }
 
@@ -70,7 +71,7 @@ fn execute_inner(
 
         Bytecode::Ret => {
             let local_states = state.local_states();
-            meter.add_items(Scope::Function, RET_PER_LOCAL_COST, local_states.len())?;
+            meter.add_items(Scope::Function, RET_COST, local_states.len())?;
             let all_local_abilities = state.all_local_abilities();
             assert!(local_states.len() == all_local_abilities.len());
             for (local_state, local_abilities) in local_states.iter().zip(all_local_abilities) {
diff --git a/external-crates/move/crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs b/external-crates/move/crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs
index 6aaa140cdebec..2557a0f75ee88 100644
--- a/external-crates/move/crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs
+++ b/external-crates/move/crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs
@@ -16,7 +16,10 @@ use move_binary_format::{
 use move_borrow_graph::references::RefID;
 use move_bytecode_verifier_meter::{Meter, Scope};
 use move_core_types::vm_status::StatusCode;
-use std::collections::{BTreeMap, BTreeSet};
+use std::{
+    cmp::max,
+    collections::{BTreeMap, BTreeSet},
+};
 
 type BorrowGraph = move_borrow_graph::graph::BorrowGraph<(), Label>;
 
@@ -74,19 +77,18 @@ impl std::fmt::Display for Label {
     }
 }
 
-pub(crate) const STEP_BASE_COST: u128 = 10;
-pub(crate) const STEP_PER_LOCAL_COST: u128 = 20;
-pub(crate) const STEP_PER_GRAPH_ITEM_COST: u128 = 50;
-pub(crate) const JOIN_BASE_COST: u128 = 100;
-pub(crate) const JOIN_PER_LOCAL_COST: u128 = 10;
-pub(crate) const JOIN_PER_GRAPH_ITEM_COST: u128 = 50;
+pub(crate) const STEP_BASE_COST: u128 = 1;
+pub(crate) const JOIN_BASE_COST: u128 = 10;
+
+pub(crate) const PER_GRAPH_ITEM_COST: u128 = 4;
 
-// The cost for an edge from an input reference parameter to output reference.
-pub(crate) const REF_PARAM_EDGE_COST: u128 = 100;
-pub(crate) const REF_PARAM_EDGE_COST_GROWTH: f32 = 1.5;
+pub(crate) const RELEASE_ITEM_COST: u128 = 3;
+pub(crate) const RELEASE_ITEM_QUADRATIC_THRESHOLD: usize = 5;
 
-// The cost of an acquires in a call.
-pub(crate) const CALL_PER_ACQUIRES_COST: u128 = 100;
+pub(crate) const JOIN_ITEM_COST: u128 = 4;
+pub(crate) const JOIN_ITEM_QUADRATIC_THRESHOLD: usize = 10;
+
+pub(crate) const ADD_BORROW_COST: u128 = 3;
 
 /// AbstractState is the analysis state over which abstract interpretation is performed.
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -126,10 +128,6 @@ impl AbstractState {
         state
     }
 
-    pub(crate) fn local_count(&self) -> usize {
-        self.locals.len()
-    }
-
     pub(crate) fn graph_size(&self) -> usize {
         self.borrow_graph.graph_size()
     }
@@ -166,27 +164,63 @@ impl AbstractState {
         id
     }
 
-    fn add_copy(&mut self, parent: RefID, child: RefID) {
-        self.borrow_graph.add_strong_borrow((), parent, child)
+    fn add_copy(
+        &mut self,
+        parent: RefID,
+        child: RefID,
+        meter: &mut (impl Meter + ?Sized),
+    ) -> PartialVMResult<()> {
+        meter.add(Scope::Function, ADD_BORROW_COST)?;
+        self.borrow_graph.add_strong_borrow((), parent, child);
+        Ok(())
     }
 
-    fn add_borrow(&mut self, parent: RefID, child: RefID) {
-        self.borrow_graph.add_weak_borrow((), parent, child)
+    fn add_borrow(
+        &mut self,
+        parent: RefID,
+        child: RefID,
+        meter: &mut (impl Meter + ?Sized),
+    ) -> PartialVMResult<()> {
+        meter.add(Scope::Function, ADD_BORROW_COST)?;
+        self.borrow_graph.add_weak_borrow((), parent, child);
+        Ok(())
     }
 
-    fn add_field_borrow(&mut self, parent: RefID, field: FieldHandleIndex, child: RefID) {
+    fn add_field_borrow(
+        &mut self,
+        parent: RefID,
+        field: FieldHandleIndex,
+        child: RefID,
+        meter: &mut (impl Meter + ?Sized),
+    ) -> PartialVMResult<()> {
+        meter.add(Scope::Function, ADD_BORROW_COST)?;
         self.borrow_graph
-            .add_strong_field_borrow((), parent, Label::StructField(field), child)
+            .add_strong_field_borrow((), parent, Label::StructField(field), child);
+        Ok(())
     }
 
-    fn add_local_borrow(&mut self, local: LocalIndex, id: RefID) {
+    fn add_local_borrow(
+        &mut self,
+        local: LocalIndex,
+        id: RefID,
+        meter: &mut (impl Meter + ?Sized),
+    ) -> PartialVMResult<()> {
+        meter.add(Scope::Function, ADD_BORROW_COST)?;
         self.borrow_graph
-            .add_strong_field_borrow((), self.frame_root(), Label::Local(local), id)
+            .add_strong_field_borrow((), self.frame_root(), Label::Local(local), id);
+        Ok(())
     }
 
-    fn add_resource_borrow(&mut self, resource: StructDefinitionIndex, id: RefID) {
+    fn add_resource_borrow(
+        &mut self,
+        resource: StructDefinitionIndex,
+        id: RefID,
+        meter: &mut (impl Meter + ?Sized),
+    ) -> PartialVMResult<()> {
+        meter.add(Scope::Function, ADD_BORROW_COST)?;
         self.borrow_graph
-            .add_weak_field_borrow((), self.frame_root(), Label::Global(resource), id)
+            .add_weak_field_borrow((), self.frame_root(), Label::Global(resource), id);
+        Ok(())
     }
 
     fn add_variant_field_borrow(
@@ -196,18 +230,22 @@ impl AbstractState {
         variant_tag: VariantTag,
         field_index: MemberCount,
         child_id: RefID,
-    ) {
+        meter: &mut (impl Meter + ?Sized),
+    ) -> PartialVMResult<()> {
+        meter.add(Scope::Function, ADD_BORROW_COST)?;
         self.borrow_graph.add_strong_field_borrow(
             (),
             parent,
             Label::VariantField(enum_def_idx, variant_tag, field_index),
             child_id,
-        )
+        );
+        Ok(())
     }
 
     /// removes `id` from borrow graph
-    fn release(&mut self, id: RefID) {
-        self.borrow_graph.release(id);
+    fn release(&mut self, id: RefID, meter: &mut (impl Meter + ?Sized)) -> PartialVMResult<()> {
+        let released_edges = self.borrow_graph.release(id);
+        charge_release(released_edges, meter)
     }
 
     //**********************************************************************************************
@@ -258,52 +296,85 @@ impl AbstractState {
     /// checks if `id` is writable
     /// - Mutable references are writable if there are no consistent borrows
     /// - Immutable references are not writable by the typing rules
-    fn is_writable(&self, id: RefID) -> bool {
+    fn is_writable(&self, id: RefID, meter: &mut (impl Meter + ?Sized)) -> PartialVMResult<bool> {
         assert!(self.borrow_graph.is_mutable(id));
-        !self.has_consistent_borrows(id, None)
+        charge_graph_size(self.graph_size(), meter)?;
+        Ok(!self.has_consistent_borrows(id, None))
     }
 
     /// checks if `id` is freezable
     /// - Mutable references are freezable if there are no consistent mutable borrows
     /// - Immutable references are not freezable by the typing rules
-    fn is_freezable(&self, id: RefID, at_field_opt: Option<FieldHandleIndex>) -> bool {
+    fn is_freezable(
+        &self,
+        id: RefID,
+        at_field_opt: Option<FieldHandleIndex>,
+        meter: &mut (impl Meter + ?Sized),
+    ) -> PartialVMResult<bool> {
         assert!(self.borrow_graph.is_mutable(id));
-        !self.has_consistent_mutable_borrows(id, at_field_opt.map(Label::StructField))
+        charge_graph_size(self.graph_size(), meter)?;
+        Ok(!self.has_consistent_mutable_borrows(id, at_field_opt.map(Label::StructField)))
     }
 
     /// checks if `id` is readable
     /// - Mutable references are readable if they are freezable
     /// - Immutable references are always readable
-    fn is_readable(&self, id: RefID, at_field_opt: Option<FieldHandleIndex>) -> bool {
+    fn is_readable(
+        &self,
+        id: RefID,
+        at_field_opt: Option<FieldHandleIndex>,
+        meter: &mut (impl Meter + ?Sized),
+    ) -> PartialVMResult<bool> {
         let is_mutable = self.borrow_graph.is_mutable(id);
-        !is_mutable || self.is_freezable(id, at_field_opt)
+        Ok(!is_mutable || self.is_freezable(id, at_field_opt, meter)?)
     }
 
     /// checks if local@idx is borrowed
-    fn is_local_borrowed(&self, idx: LocalIndex) -> bool {
-        self.has_consistent_borrows(self.frame_root(), Some(Label::Local(idx)))
+    fn is_local_borrowed(
+        &self,
+        idx: LocalIndex,
+        meter: &mut (impl Meter + ?Sized),
+    ) -> PartialVMResult<bool> {
+        charge_graph_size(self.graph_size(), meter)?;
+        Ok(self.has_consistent_borrows(self.frame_root(), Some(Label::Local(idx))))
     }
 
     /// checks if local@idx is mutably borrowed
-    fn is_local_mutably_borrowed(&self, idx: LocalIndex) -> bool {
-        self.has_consistent_mutable_borrows(self.frame_root(), Some(Label::Local(idx)))
+    fn is_local_mutably_borrowed(
+        &self,
+        idx: LocalIndex,
+        meter: &mut (impl Meter + ?Sized),
+    ) -> PartialVMResult<bool> {
+        charge_graph_size(self.graph_size(), meter)?;
+        Ok(self.has_consistent_mutable_borrows(self.frame_root(), Some(Label::Local(idx))))
     }
 
     /// checks if global@idx is borrowed
-    fn is_global_borrowed(&self, resource: StructDefinitionIndex) -> bool {
-        self.has_consistent_borrows(self.frame_root(), Some(Label::Global(resource)))
+    fn is_global_borrowed(
+        &self,
+        resource: StructDefinitionIndex,
+        meter: &mut (impl Meter + ?Sized),
+    ) -> PartialVMResult<bool> {
+        charge_graph_size(self.graph_size(), meter)?;
+        Ok(self.has_consistent_borrows(self.frame_root(), Some(Label::Global(resource))))
     }
 
     /// checks if global@idx is mutably borrowed
-    fn is_global_mutably_borrowed(&self, resource: StructDefinitionIndex) -> bool {
-        self.has_consistent_mutable_borrows(self.frame_root(), Some(Label::Global(resource)))
+    fn is_global_mutably_borrowed(
+        &self,
+        resource: StructDefinitionIndex,
+        meter: &mut (impl Meter + ?Sized),
+    ) -> PartialVMResult<bool> {
+        charge_graph_size(self.graph_size(), meter)?;
+        Ok(self.has_consistent_mutable_borrows(self.frame_root(), Some(Label::Global(resource))))
     }
 
     /// checks if the stack frame of the function being analyzed can be safely destroyed.
     /// safe destruction requires that all references in locals have already been destroyed
     /// and all values in locals are copyable and unborrowed.
-    fn is_frame_safe_to_destroy(&self) -> bool {
-        !self.has_consistent_borrows(self.frame_root(), None)
+    fn is_frame_safe_to_destroy(&self, meter: &mut (impl Meter + ?Sized)) -> PartialVMResult<bool> {
+        charge_graph_size(self.graph_size(), meter)?;
+        Ok(!self.has_consistent_borrows(self.frame_root(), None))
     }
 
     //**********************************************************************************************
@@ -311,10 +382,14 @@ impl AbstractState {
     //**********************************************************************************************
 
     /// destroys local@idx
-    pub fn release_value(&mut self, value: AbstractValue) {
+    pub fn release_value(
+        &mut self,
+        value: AbstractValue,
+        meter: &mut (impl Meter + ?Sized),
+    ) -> PartialVMResult<()> {
         match value {
-            AbstractValue::Reference(id) => self.release(id),
-            AbstractValue::NonReference => (),
+            AbstractValue::Reference(id) => self.release(id, meter),
+            AbstractValue::NonReference => Ok(()),
         }
     }
 
@@ -322,15 +397,16 @@ impl AbstractState {
         &mut self,
         offset: CodeOffset,
         local: LocalIndex,
+        meter: &mut (impl Meter + ?Sized),
     ) -> PartialVMResult<AbstractValue> {
         match safe_unwrap!(self.locals.get(local as usize)) {
             AbstractValue::Reference(id) => {
                 let id = *id;
                 let new_id = self.new_ref(self.borrow_graph.is_mutable(id));
-                self.add_copy(id, new_id);
+                self.add_copy(id, new_id, meter)?;
                 Ok(AbstractValue::Reference(new_id))
             }
-            AbstractValue::NonReference if self.is_local_mutably_borrowed(local) => {
+            AbstractValue::NonReference if self.is_local_mutably_borrowed(local, meter)? => {
                 Err(self.error(StatusCode::COPYLOC_EXISTS_BORROW_ERROR, offset))
             }
             AbstractValue::NonReference => Ok(AbstractValue::NonReference),
@@ -341,6 +417,7 @@ impl AbstractState {
         &mut self,
         offset: CodeOffset,
         local: LocalIndex,
+        meter: &mut (impl Meter + ?Sized),
     ) -> PartialVMResult<AbstractValue> {
         let old_value = std::mem::replace(
             safe_unwrap!(self.locals.get_mut(local as usize)),
@@ -348,7 +425,7 @@ impl AbstractState {
         );
         match old_value {
             AbstractValue::Reference(id) => Ok(AbstractValue::Reference(id)),
-            AbstractValue::NonReference if self.is_local_borrowed(local) => {
+            AbstractValue::NonReference if self.is_local_borrowed(local, meter)? => {
                 Err(self.error(StatusCode::MOVELOC_EXISTS_BORROW_ERROR, offset))
             }
             AbstractValue::NonReference => Ok(AbstractValue::NonReference),
@@ -360,29 +437,32 @@ impl AbstractState {
         offset: CodeOffset,
         local: LocalIndex,
         new_value: AbstractValue,
+        meter: &mut (impl Meter + ?Sized),
     ) -> PartialVMResult<()> {
         let old_value =
             std::mem::replace(safe_unwrap!(self.locals.get_mut(local as usize)), new_value);
         match old_value {
-            AbstractValue::Reference(id) => {
-                self.release(id);
-                Ok(())
-            }
-            AbstractValue::NonReference if self.is_local_borrowed(local) => {
+            AbstractValue::Reference(id) => self.release(id, meter),
+            AbstractValue::NonReference if self.is_local_borrowed(local, meter)? => {
                 Err(self.error(StatusCode::STLOC_UNSAFE_TO_DESTROY_ERROR, offset))
             }
             AbstractValue::NonReference => Ok(()),
         }
     }
 
-    pub fn freeze_ref(&mut self, offset: CodeOffset, id: RefID) -> PartialVMResult<AbstractValue> {
-        if !self.is_freezable(id, None) {
+    pub fn freeze_ref(
+        &mut self,
+        offset: CodeOffset,
+        id: RefID,
+        meter: &mut (impl Meter + ?Sized),
+    ) -> PartialVMResult<AbstractValue> {
+        if !self.is_freezable(id, None, meter)? {
             return Err(self.error(StatusCode::FREEZEREF_EXISTS_MUTABLE_BORROW_ERROR, offset));
         }
 
         let frozen_id = self.new_ref(false);
-        self.add_copy(id, frozen_id);
-        self.release(id);
+        self.add_copy(id, frozen_id, meter)?;
+        self.release(id, meter)?;
         Ok(AbstractValue::Reference(frozen_id))
     }
 
@@ -391,17 +471,19 @@ impl AbstractState {
         offset: CodeOffset,
         v1: AbstractValue,
         v2: AbstractValue,
+        meter: &mut (impl Meter + ?Sized),
     ) -> PartialVMResult<AbstractValue> {
         match (v1, v2) {
             (AbstractValue::Reference(id1), AbstractValue::Reference(id2))
-                if !self.is_readable(id1, None) || !self.is_readable(id2, None) =>
+                if !self.is_readable(id1, None, meter)?
+                    || !self.is_readable(id2, None, meter)? =>
             {
                 // TODO better error code
                 return Err(self.error(StatusCode::READREF_EXISTS_MUTABLE_BORROW_ERROR, offset));
             }
             (AbstractValue::Reference(id1), AbstractValue::Reference(id2)) => {
-                self.release(id1);
-                self.release(id2)
+                self.release(id1, meter)?;
+                self.release(id2, meter)?;
             }
             (v1, v2) => {
                 assert!(v1.is_value());
@@ -411,21 +493,31 @@ impl AbstractState {
         Ok(AbstractValue::NonReference)
     }
 
-    pub fn read_ref(&mut self, offset: CodeOffset, id: RefID) -> PartialVMResult<AbstractValue> {
-        if !self.is_readable(id, None) {
+    pub fn read_ref(
+        &mut self,
+        offset: CodeOffset,
+        id: RefID,
+        meter: &mut (impl Meter + ?Sized),
+    ) -> PartialVMResult<AbstractValue> {
+        if !self.is_readable(id, None, meter)? {
             return Err(self.error(StatusCode::READREF_EXISTS_MUTABLE_BORROW_ERROR, offset));
         }
 
-        self.release(id);
+        self.release(id, meter)?;
         Ok(AbstractValue::NonReference)
     }
 
-    pub fn write_ref(&mut self, offset: CodeOffset, id: RefID) -> PartialVMResult<()> {
-        if !self.is_writable(id) {
+    pub fn write_ref(
+        &mut self,
+        offset: CodeOffset,
+        id: RefID,
+        meter: &mut (impl Meter + ?Sized),
+    ) -> PartialVMResult<()> {
+        if !self.is_writable(id, meter)? {
             return Err(self.error(StatusCode::WRITEREF_EXISTS_BORROW_ERROR, offset));
         }
 
-        self.release(id);
+        self.release(id, meter)?;
         Ok(())
     }
 
@@ -434,15 +526,16 @@ impl AbstractState {
         offset: CodeOffset,
         mut_: bool,
         local: LocalIndex,
+        meter: &mut (impl Meter + ?Sized),
     ) -> PartialVMResult<AbstractValue> {
         // nothing to check in case borrow is mutable since the frame cannot have an full borrow/
         // epsilon outgoing edge
-        if !mut_ && self.is_local_mutably_borrowed(local) {
+        if !mut_ && self.is_local_mutably_borrowed(local, meter)? {
             return Err(self.error(StatusCode::BORROWLOC_EXISTS_BORROW_ERROR, offset));
         }
 
         let new_id = self.new_ref(mut_);
-        self.add_local_borrow(local, new_id);
+        self.add_local_borrow(local, new_id, meter)?;
         Ok(AbstractValue::Reference(new_id))
     }
 
@@ -452,21 +545,29 @@ impl AbstractState {
         mut_: bool,
         id: RefID,
         field: FieldHandleIndex,
+        meter: &mut (impl Meter + ?Sized),
     ) -> PartialVMResult<AbstractValue> {
         // Any field borrows will be factored out, so don't check in the mutable case
-        let is_mut_borrow_with_full_borrows = || mut_ && self.has_full_borrows(id);
+        macro_rules! is_mut_borrow_with_full_borrows {
+            () => {
+                mut_ && self.has_full_borrows(id)
+            };
+        }
         // For new immutable borrow, the reference must be readable at that field
         // This means that there could exist a mutable borrow on some other field
-        let is_imm_borrow_with_mut_borrows = || !mut_ && !self.is_readable(id, Some(field));
-
-        if is_mut_borrow_with_full_borrows() || is_imm_borrow_with_mut_borrows() {
+        macro_rules! is_imm_borrow_with_mut_borrows {
+            () => {
+                !mut_ && !self.is_readable(id, Some(field), meter)?
+            };
+        }
+        if is_mut_borrow_with_full_borrows!() || is_imm_borrow_with_mut_borrows!() {
             // TODO improve error for mutable case
             return Err(self.error(StatusCode::FIELD_EXISTS_MUTABLE_BORROW_ERROR, offset));
         }
 
         let field_borrow_id = self.new_ref(mut_);
-        self.add_field_borrow(id, field, field_borrow_id);
-        self.release(id);
+        self.add_field_borrow(id, field, field_borrow_id, meter)?;
+        self.release(id, meter)?;
         Ok(AbstractValue::Reference(field_borrow_id))
     }
 
@@ -478,14 +579,22 @@ impl AbstractState {
         variant_def: &VariantDefinition,
         mut_: bool,
         id: RefID,
+        meter: &mut (impl Meter + ?Sized),
     ) -> PartialVMResult<Vec<AbstractValue>> {
         // Any field borrows will be factored out, so don't check in the mutable case
-        let is_mut_borrow_with_full_borrows = || mut_ && self.has_full_borrows(id);
+        macro_rules! is_mut_borrow_with_full_borrows {
+            () => {
+                mut_ && self.has_full_borrows(id)
+            };
+        }
         // For new immutable borrow, the reference to the variant must be readable.
         // This means that there _does not_ exist a mutable borrow on some other field
-        let is_imm_borrow_with_mut_borrows = || !mut_ && !self.is_readable(id, None);
-
-        if is_mut_borrow_with_full_borrows() || is_imm_borrow_with_mut_borrows() {
+        macro_rules! is_imm_borrow_with_mut_borrows {
+            () => {
+                !mut_ && !self.is_readable(id, None, meter)?
+            };
+        }
+        if is_mut_borrow_with_full_borrows!() || is_imm_borrow_with_mut_borrows!() {
             return Err(self.error(StatusCode::FIELD_EXISTS_MUTABLE_BORROW_ERROR, offset));
         }
 
@@ -501,12 +610,13 @@ impl AbstractState {
                     variant_tag,
                     i as MemberCount,
                     field_borrow_id,
-                );
-                AbstractValue::Reference(field_borrow_id)
+                    meter,
+                )?;
+                Ok(AbstractValue::Reference(field_borrow_id))
             })
-            .collect();
+            .collect::<PartialVMResult<_>>()?;
 
-        self.release(id);
+        self.release(id, meter)?;
         Ok(field_borrows)
     }
 
@@ -515,14 +625,16 @@ impl AbstractState {
         offset: CodeOffset,
         mut_: bool,
         resource: StructDefinitionIndex,
+        meter: &mut (impl Meter + ?Sized),
     ) -> PartialVMResult<AbstractValue> {
-        if (mut_ && self.is_global_borrowed(resource)) || self.is_global_mutably_borrowed(resource)
+        if (mut_ && self.is_global_borrowed(resource, meter)?)
+            || self.is_global_mutably_borrowed(resource, meter)?
         {
             return Err(self.error(StatusCode::GLOBAL_REFERENCE_ERROR, offset));
         }
 
         let new_id = self.new_ref(mut_);
-        self.add_resource_borrow(resource, new_id);
+        self.add_resource_borrow(resource, new_id, meter)?;
         Ok(AbstractValue::Reference(new_id))
     }
 
@@ -530,8 +642,9 @@ impl AbstractState {
         &mut self,
         offset: CodeOffset,
         resource: StructDefinitionIndex,
+        meter: &mut (impl Meter + ?Sized),
     ) -> PartialVMResult<AbstractValue> {
-        if self.is_global_borrowed(resource) {
+        if self.is_global_borrowed(resource, meter)? {
             Err(self.error(StatusCode::GLOBAL_REFERENCE_ERROR, offset))
         } else {
             Ok(AbstractValue::NonReference)
@@ -543,12 +656,13 @@ impl AbstractState {
         offset: CodeOffset,
         vector: AbstractValue,
         mut_: bool,
+        meter: &mut (impl Meter + ?Sized),
     ) -> PartialVMResult<()> {
         let id = safe_unwrap!(vector.ref_id());
-        if mut_ && !self.is_writable(id) {
+        if mut_ && !self.is_writable(id, meter)? {
             return Err(self.error(StatusCode::VEC_UPDATE_EXISTS_MUTABLE_BORROW_ERROR, offset));
         }
-        self.release(id);
+        self.release(id, meter)?;
         Ok(())
     }
 
@@ -557,9 +671,10 @@ impl AbstractState {
         offset: CodeOffset,
         vector: AbstractValue,
         mut_: bool,
+        meter: &mut (impl Meter + ?Sized),
     ) -> PartialVMResult<AbstractValue> {
         let vec_id = safe_unwrap!(vector.ref_id());
-        if mut_ && !self.is_writable(vec_id) {
+        if mut_ && !self.is_writable(vec_id, meter)? {
             return Err(self.error(
                 StatusCode::VEC_BORROW_ELEMENT_EXISTS_MUTABLE_BORROW_ERROR,
                 offset,
@@ -567,9 +682,9 @@ impl AbstractState {
         }
 
         let elem_id = self.new_ref(mut_);
-        self.add_borrow(vec_id, elem_id);
+        self.add_borrow(vec_id, elem_id, meter)?;
 
-        self.release(vec_id);
+        self.release(vec_id, meter)?;
         Ok(AbstractValue::Reference(elem_id))
     }
 
@@ -581,14 +696,9 @@ impl AbstractState {
         return_: &Signature,
         meter: &mut (impl Meter + ?Sized),
     ) -> PartialVMResult<Vec<AbstractValue>> {
-        meter.add_items(
-            Scope::Function,
-            CALL_PER_ACQUIRES_COST,
-            acquired_resources.len(),
-        )?;
         // Check acquires
         for acquired_resource in acquired_resources {
-            if self.is_global_borrowed(*acquired_resource) {
+            if self.is_global_borrowed(*acquired_resource, meter)? {
                 return Err(self.error(StatusCode::GLOBAL_REFERENCE_ERROR, offset));
             }
         }
@@ -598,7 +708,7 @@ impl AbstractState {
         let mut mutable_references_to_borrow_from = BTreeSet::new();
         for id in arguments.iter().filter_map(|v| v.ref_id()) {
             if self.borrow_graph.is_mutable(id) {
-                if !self.is_writable(id) {
+                if !self.is_writable(id, meter)? {
                     return Err(
                         self.error(StatusCode::CALL_BORROWED_MUTABLE_REFERENCE_ERROR, offset)
                     );
@@ -613,45 +723,42 @@ impl AbstractState {
         let return_values = return_
             .0
             .iter()
-            .map(|return_type| match return_type {
-                SignatureToken::MutableReference(_) => {
-                    let id = self.new_ref(true);
-                    for parent in &mutable_references_to_borrow_from {
-                        self.add_borrow(*parent, id);
+            .map(|return_type| {
+                Ok(match return_type {
+                    SignatureToken::MutableReference(_) => {
+                        let id = self.new_ref(true);
+                        for parent in &mutable_references_to_borrow_from {
+                            self.add_borrow(*parent, id, meter)?;
+                        }
+                        returned_refs += 1;
+                        AbstractValue::Reference(id)
                     }
-                    returned_refs += 1;
-                    AbstractValue::Reference(id)
-                }
-                SignatureToken::Reference(_) => {
-                    let id = self.new_ref(false);
-                    for parent in &all_references_to_borrow_from {
-                        self.add_borrow(*parent, id);
+                    SignatureToken::Reference(_) => {
+                        let id = self.new_ref(false);
+                        for parent in &all_references_to_borrow_from {
+                            self.add_borrow(*parent, id, meter)?;
+                        }
+                        returned_refs += 1;
+                        AbstractValue::Reference(id)
                     }
-                    returned_refs += 1;
-                    AbstractValue::Reference(id)
-                }
-                _ => AbstractValue::NonReference,
+                    _ => AbstractValue::NonReference,
+                })
             })
-            .collect();
-
-        // Meter usage of reference edges
-        meter.add_items_with_growth(
-            Scope::Function,
-            REF_PARAM_EDGE_COST,
-            all_references_to_borrow_from
-                .len()
-                .saturating_mul(returned_refs),
-            REF_PARAM_EDGE_COST_GROWTH,
-        )?;
+            .collect::<PartialVMResult<_>>()?;
 
         // Release input references
         for id in all_references_to_borrow_from {
-            self.release(id)
+            self.release(id, meter)?
         }
         Ok(return_values)
     }
 
-    pub fn ret(&mut self, offset: CodeOffset, values: Vec<AbstractValue>) -> PartialVMResult<()> {
+    pub fn ret(
+        &mut self,
+        offset: CodeOffset,
+        values: Vec<AbstractValue>,
+        meter: &mut (impl Meter + ?Sized),
+    ) -> PartialVMResult<()> {
         // release all local variables
         let mut released = BTreeSet::new();
         for stored_value in self.locals.iter() {
@@ -659,10 +766,12 @@ impl AbstractState {
                 released.insert(*id);
             }
         }
-        released.into_iter().for_each(|id| self.release(id));
+        for id in released {
+            self.release(id, meter)?
+        }
 
         // Check that no local or global is borrowed
-        if !self.is_frame_safe_to_destroy() {
+        if !self.is_frame_safe_to_destroy(meter)? {
             return Err(self.error(
                 StatusCode::UNSAFE_RET_LOCAL_OR_RESOURCE_STILL_BORROWED,
                 offset,
@@ -671,7 +780,7 @@ impl AbstractState {
 
         // Check mutable references can be transferred
         for id in values.into_iter().filter_map(|v| v.ref_id()) {
-            if self.borrow_graph.is_mutable(id) && !self.is_writable(id) {
+            if self.borrow_graph.is_mutable(id) && !self.is_writable(id, meter)? {
                 return Err(self.error(StatusCode::RET_BORROWED_MUTABLE_REFERENCE_ERROR, offset));
             }
         }
@@ -726,13 +835,14 @@ impl AbstractState {
             })
     }
 
-    pub fn join_(&self, other: &Self) -> Self {
+    pub fn join_(&self, other: &Self) -> (Self, usize) {
         assert!(self.current_function == other.current_function);
         assert!(self.is_canonical() && other.is_canonical());
         assert!(self.next_id == other.next_id);
         assert!(self.locals.len() == other.locals.len());
         let mut self_graph = self.borrow_graph.clone();
         let mut other_graph = other.borrow_graph.clone();
+        let mut released = 0;
         let locals = self
             .locals
             .iter()
@@ -740,11 +850,11 @@ impl AbstractState {
             .map(|(self_value, other_value)| {
                 match (self_value, other_value) {
                     (AbstractValue::Reference(id), AbstractValue::NonReference) => {
-                        self_graph.release(*id);
+                        released += self_graph.release(*id);
                         AbstractValue::NonReference
                     }
                     (AbstractValue::NonReference, AbstractValue::Reference(id)) => {
-                        other_graph.release(*id);
+                        released += other_graph.release(*id);
                         AbstractValue::NonReference
                     }
                     // The local has a value on each side, add it to the state
@@ -759,13 +869,13 @@ impl AbstractState {
         let borrow_graph = self_graph.join(&other_graph);
         let current_function = self.current_function;
         let next_id = self.next_id;
-
-        Self {
+        let joined = Self {
             current_function,
             locals,
             borrow_graph,
             next_id,
-        }
+        };
+        (joined, released)
     }
 }
 
@@ -776,16 +886,16 @@ impl AbstractDomain for AbstractState {
         state: &AbstractState,
         meter: &mut (impl Meter + ?Sized),
     ) -> PartialVMResult<JoinResult> {
-        let joined = Self::join_(self, state);
+        meter.add(Scope::Function, JOIN_BASE_COST)?;
+        let self_size = self.graph_size();
+        let state_size = state.graph_size();
+        let (joined, released) = Self::join_(self, state);
         assert!(joined.is_canonical());
         assert!(self.locals.len() == joined.locals.len());
-        meter.add(Scope::Function, JOIN_BASE_COST)?;
-        meter.add_items(Scope::Function, JOIN_PER_LOCAL_COST, self.locals.len())?;
-        meter.add_items(
-            Scope::Function,
-            JOIN_PER_GRAPH_ITEM_COST,
-            self.borrow_graph.graph_size(),
-        )?;
+        let max_size = max(max(self_size, state_size), joined.graph_size());
+        charge_join(self_size, state_size, meter)?;
+        charge_graph_size(max_size, meter)?;
+        charge_release(released, meter)?;
         let locals_unchanged = self
             .locals
             .iter()
@@ -801,3 +911,40 @@ impl AbstractDomain for AbstractState {
         }
     }
 }
+
+fn charge_graph_size(size: usize, meter: &mut (impl Meter + ?Sized)) -> PartialVMResult<()> {
+    let size = max(size, 1);
+    meter.add_items(Scope::Function, PER_GRAPH_ITEM_COST, size)
+}
+
+fn charge_release(released: usize, meter: &mut (impl Meter + ?Sized)) -> PartialVMResult<()> {
+    let size = max(released, 1);
+    meter.add_items(
+        Scope::Function,
+        RELEASE_ITEM_COST,
+        // max(x, x^2/5)
+        max(
+            size,
+            size.saturating_mul(size) / RELEASE_ITEM_QUADRATIC_THRESHOLD,
+        ),
+    )
+}
+
+fn charge_join(
+    size1: usize,
+    size2: usize,
+    meter: &mut (impl Meter + ?Sized),
+) -> PartialVMResult<()> {
+    let size1 = max(size1, 1);
+    let size2 = max(size2, 1);
+    let size = size1.saturating_add(size2);
+    meter.add_items(
+        Scope::Function,
+        JOIN_ITEM_COST,
+        // max(x, x^2/10)
+        max(
+            size,
+            size.saturating_mul(size) / JOIN_ITEM_QUADRATIC_THRESHOLD,
+        ),
+    )
+}
diff --git a/external-crates/move/crates/move-bytecode-verifier/src/reference_safety/mod.rs b/external-crates/move/crates/move-bytecode-verifier/src/reference_safety/mod.rs
index f3bfaf804cb16..9ac61018e27f3 100644
--- a/external-crates/move/crates/move-bytecode-verifier/src/reference_safety/mod.rs
+++ b/external-crates/move/crates/move-bytecode-verifier/src/reference_safety/mod.rs
@@ -10,9 +10,7 @@
 
 mod abstract_state;
 
-use crate::reference_safety::abstract_state::{
-    STEP_BASE_COST, STEP_PER_GRAPH_ITEM_COST, STEP_PER_LOCAL_COST,
-};
+use crate::reference_safety::abstract_state::STEP_BASE_COST;
 use abstract_state::{AbstractState, AbstractValue};
 use move_abstract_interpreter::absint::{AbstractInterpreter, FunctionContext, TransferFunctions};
 use move_abstract_stack::AbstractStack;
@@ -182,113 +180,110 @@ fn execute_inner(
     meter: &mut (impl Meter + ?Sized),
 ) -> PartialVMResult<()> {
     meter.add(Scope::Function, STEP_BASE_COST)?;
-    meter.add_items(Scope::Function, STEP_PER_LOCAL_COST, state.local_count())?;
-    meter.add_items(
-        Scope::Function,
-        STEP_PER_GRAPH_ITEM_COST,
-        state.graph_size(),
-    )?;
 
     match bytecode {
-        Bytecode::Pop => state.release_value(safe_unwrap_err!(verifier.stack.pop())),
+        Bytecode::Pop => state.release_value(safe_unwrap_err!(verifier.stack.pop()), meter)?,
 
         Bytecode::CopyLoc(local) => {
-            let value = state.copy_loc(offset, *local)?;
+            let value = state.copy_loc(offset, *local, meter)?;
             verifier.push(value)?
         }
         Bytecode::MoveLoc(local) => {
-            let value = state.move_loc(offset, *local)?;
+            let value = state.move_loc(offset, *local, meter)?;
             verifier.push(value)?
         }
-        Bytecode::StLoc(local) => {
-            state.st_loc(offset, *local, safe_unwrap_err!(verifier.stack.pop()))?
-        }
+        Bytecode::StLoc(local) => state.st_loc(
+            offset,
+            *local,
+            safe_unwrap_err!(verifier.stack.pop()),
+            meter,
+        )?,
 
         Bytecode::FreezeRef => {
             let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
-            let frozen = state.freeze_ref(offset, id)?;
+            let frozen = state.freeze_ref(offset, id, meter)?;
             verifier.push(frozen)?
         }
         Bytecode::Eq | Bytecode::Neq => {
             let v1 = safe_unwrap_err!(verifier.stack.pop());
             let v2 = safe_unwrap_err!(verifier.stack.pop());
-            let value = state.comparison(offset, v1, v2)?;
+            let value = state.comparison(offset, v1, v2, meter)?;
             verifier.push(value)?
         }
         Bytecode::ReadRef => {
             let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
-            let value = state.read_ref(offset, id)?;
+            let value = state.read_ref(offset, id, meter)?;
             verifier.push(value)?
         }
         Bytecode::WriteRef => {
             let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
             let val_operand = safe_unwrap_err!(verifier.stack.pop());
             safe_assert!(val_operand.is_value());
-            state.write_ref(offset, id)?
+            state.write_ref(offset, id, meter)?
         }
 
         Bytecode::MutBorrowLoc(local) => {
-            let value = state.borrow_loc(offset, true, *local)?;
+            let value = state.borrow_loc(offset, true, *local, meter)?;
             verifier.push(value)?
         }
         Bytecode::ImmBorrowLoc(local) => {
-            let value = state.borrow_loc(offset, false, *local)?;
+            let value = state.borrow_loc(offset, false, *local, meter)?;
             verifier.push(value)?
         }
         Bytecode::MutBorrowField(field_handle_index) => {
             let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
-            let value = state.borrow_field(offset, true, id, *field_handle_index)?;
+            let value = state.borrow_field(offset, true, id, *field_handle_index, meter)?;
             verifier.push(value)?
         }
         Bytecode::MutBorrowFieldGeneric(field_inst_index) => {
             let field_inst = verifier.module.field_instantiation_at(*field_inst_index);
             let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
-            let value = state.borrow_field(offset, true, id, field_inst.handle)?;
+            let value = state.borrow_field(offset, true, id, field_inst.handle, meter)?;
             verifier.push(value)?
         }
         Bytecode::ImmBorrowField(field_handle_index) => {
             let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
-            let value = state.borrow_field(offset, false, id, *field_handle_index)?;
+            let value = state.borrow_field(offset, false, id, *field_handle_index, meter)?;
             verifier.push(value)?
         }
         Bytecode::ImmBorrowFieldGeneric(field_inst_index) => {
             let field_inst = verifier.module.field_instantiation_at(*field_inst_index);
             let id = safe_unwrap!(safe_unwrap_err!(verifier.stack.pop()).ref_id());
-            let value = state.borrow_field(offset, false, id, field_inst.handle)?;
+            let value = state.borrow_field(offset, false, id, field_inst.handle, meter)?;
             verifier.push(value)?
         }
 
         Bytecode::MutBorrowGlobalDeprecated(idx) => {
             safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
-            let value = state.borrow_global(offset, true, *idx)?;
+            let value = state.borrow_global(offset, true, *idx, meter)?;
             verifier.push(value)?
         }
         Bytecode::MutBorrowGlobalGenericDeprecated(idx) => {
             safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
             let struct_inst = verifier.module.struct_instantiation_at(*idx);
-            let value = state.borrow_global(offset, true, struct_inst.def)?;
+            let value = state.borrow_global(offset, true, struct_inst.def, meter)?;
             verifier.push(value)?
         }
         Bytecode::ImmBorrowGlobalDeprecated(idx) => {
             safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
-            let value = state.borrow_global(offset, false, *idx)?;
+            let value = state.borrow_global(offset, false, *idx, meter)?;
             verifier.push(value)?
         }
         Bytecode::ImmBorrowGlobalGenericDeprecated(idx) => {
             safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
             let struct_inst = verifier.module.struct_instantiation_at(*idx);
-            let value = state.borrow_global(offset, false, struct_inst.def)?;
+            let value = state.borrow_global(offset, false, struct_inst.def, meter)?;
             verifier.push(value)?
         }
         Bytecode::MoveFromDeprecated(idx) => {
             safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
-            let value = state.move_from(offset, *idx)?;
+            let value = state.move_from(offset, *idx, meter)?;
             verifier.push(value)?
         }
         Bytecode::MoveFromGenericDeprecated(idx) => {
             safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
             let struct_inst = verifier.module.struct_instantiation_at(*idx);
-            let value = state.move_from(offset, struct_inst.def)?;
+            let value = state.move_from(offset, struct_inst.def, meter)?;
             verifier.push(value)?
         }
 
@@ -309,7 +304,7 @@ fn execute_inner(
             }
             return_values.reverse();
 
-            state.ret(offset, return_values)?
+            state.ret(offset, return_values, meter)?
         }
 
         Bytecode::Branch(_)
@@ -331,7 +326,7 @@ fn execute_inner(
             // resource value
             safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
             // signer reference
-            state.release_value(safe_unwrap_err!(verifier.stack.pop()));
+            state.release_value(safe_unwrap_err!(verifier.stack.pop()), meter)?;
         }
 
         Bytecode::LdTrue | Bytecode::LdFalse => {
@@ -402,32 +397,32 @@ fn execute_inner(
 
         Bytecode::VecLen(_) => {
             let vec_ref = safe_unwrap_err!(verifier.stack.pop());
-            state.vector_op(offset, vec_ref, false)?;
+            state.vector_op(offset, vec_ref, false, meter)?;
             verifier.push(state.value_for(&SignatureToken::U64))?
         }
 
         Bytecode::VecImmBorrow(_) => {
             safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
             let vec_ref = safe_unwrap_err!(verifier.stack.pop());
-            let elem_ref = state.vector_element_borrow(offset, vec_ref, false)?;
+            let elem_ref = state.vector_element_borrow(offset, vec_ref, false, meter)?;
             verifier.push(elem_ref)?
         }
         Bytecode::VecMutBorrow(_) => {
             safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
             let vec_ref = safe_unwrap_err!(verifier.stack.pop());
-            let elem_ref = state.vector_element_borrow(offset, vec_ref, true)?;
+            let elem_ref = state.vector_element_borrow(offset, vec_ref, true, meter)?;
             verifier.push(elem_ref)?
         }
 
         Bytecode::VecPushBack(_) => {
             safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
             let vec_ref = safe_unwrap_err!(verifier.stack.pop());
-            state.vector_op(offset, vec_ref, true)?;
+            state.vector_op(offset, vec_ref, true, meter)?;
         }
 
         Bytecode::VecPopBack(idx) => {
             let vec_ref = safe_unwrap_err!(verifier.stack.pop());
-            state.vector_op(offset, vec_ref, true)?;
+            state.vector_op(offset, vec_ref, true, meter)?;
 
             let element_type = vec_element_type(verifier, *idx)?;
             verifier.push(state.value_for(&element_type))?
@@ -444,7 +439,7 @@ fn execute_inner(
             safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
             safe_assert!(safe_unwrap_err!(verifier.stack.pop()).is_value());
             let vec_ref = safe_unwrap_err!(verifier.stack.pop());
-            state.vector_op(offset, vec_ref, true)?;
+            state.vector_op(offset, vec_ref, true, meter)?;
         }
         Bytecode::PackVariant(vidx) => {
             let handle = verifier.module.variant_handle_at(*vidx);
@@ -486,6 +481,7 @@ fn execute_inner(
                     variant_def,
                     false,
                     id,
+                    meter,
                 )?
                 .into_iter()
             {
@@ -506,6 +502,7 @@ fn execute_inner(
                     variant_def,
                     true,
                     id,
+                    meter,
                 )?
                 .into_iter()
             {
@@ -525,6 +522,7 @@ fn execute_inner(
                     variant_def,
                     false,
                     id,
+                    meter,
                 )?
                 .into_iter()
             {
@@ -544,13 +542,16 @@ fn execute_inner(
                     variant_def,
                     true,
                     id,
+                    meter,
                 )?
                 .into_iter()
             {
                 verifier.push(val)?
             }
         }
-        Bytecode::VariantSwitch(_) => state.release_value(safe_unwrap_err!(verifier.stack.pop())),
+        Bytecode::VariantSwitch(_) => {
+            state.release_value(safe_unwrap_err!(verifier.stack.pop()), meter)?
+        }
     };
     Ok(())
 }
diff --git a/external-crates/move/crates/move-bytecode-verifier/src/script_signature.rs b/external-crates/move/crates/move-bytecode-verifier/src/script_signature.rs
index a26628c138ed0..8f11893a3f44a 100644
--- a/external-crates/move/crates/move-bytecode-verifier/src/script_signature.rs
+++ b/external-crates/move/crates/move-bytecode-verifier/src/script_signature.rs
@@ -9,6 +9,7 @@
 //! - (DEPRECATED) Has an empty return type
 //! - All return types are not references
 //! - Satisfies the additional checks provided as an argument via `check_signature`
+//!
 //! `check_signature` should be used by adapters to quickly and easily verify custom signature
 //! rules for entrypoints
 
diff --git a/external-crates/move/crates/move-bytecode-verifier/src/signature.rs b/external-crates/move/crates/move-bytecode-verifier/src/signature.rs
index 29b96a2a2af52..c1052c190ba6a 100644
--- a/external-crates/move/crates/move-bytecode-verifier/src/signature.rs
+++ b/external-crates/move/crates/move-bytecode-verifier/src/signature.rs
@@ -15,22 +15,38 @@ use move_binary_format::{
     file_format_common::VERSION_6,
     IndexKind,
 };
+use move_bytecode_verifier_meter::{Meter, Scope};
 use move_core_types::vm_status::StatusCode;
 use std::collections::{HashMap, HashSet};
 
-pub struct SignatureChecker<'a> {
-    module: &'a CompiledModule,
+use crate::ability_cache::AbilityCache;
+
+pub struct SignatureChecker<'env, 'a, 'b, M: Meter + ?Sized> {
+    module: &'env CompiledModule,
+    module_ability_cache: &'a mut AbilityCache<'env>,
+    meter: &'b mut M,
     abilities_cache: HashMap<SignatureIndex, HashSet<Vec<AbilitySet>>>,
 }
 
-impl<'a> SignatureChecker<'a> {
-    pub fn verify_module(module: &'a CompiledModule) -> VMResult<()> {
-        Self::verify_module_impl(module).map_err(|e| e.finish(Location::Module(module.self_id())))
+impl<'env, 'a, 'b, M: Meter + ?Sized> SignatureChecker<'env, 'a, 'b, M> {
+    pub fn verify_module(
+        module: &'env CompiledModule,
+        module_ability_cache: &'a mut AbilityCache<'env>,
+        meter: &'b mut M,
+    ) -> VMResult<()> {
+        Self::verify_module_impl(module, module_ability_cache, meter)
+            .map_err(|e| e.finish(Location::Module(module.self_id())))
     }
 
-    fn verify_module_impl(module: &'a CompiledModule) -> PartialVMResult<()> {
+    fn verify_module_impl(
+        module: &'env CompiledModule,
+        module_ability_cache: &'a mut AbilityCache<'env>,
+        meter: &'b mut M,
+    ) -> PartialVMResult<()> {
         let mut sig_check = Self {
             module,
+            module_ability_cache,
+            meter,
             abilities_cache: HashMap::new(),
         };
         sig_check.verify_signature_pool(module.signatures())?;
@@ -66,7 +82,7 @@ impl<'a> SignatureChecker<'a> {
         Ok(())
     }
 
-    fn verify_struct_fields(&self, struct_defs: &[StructDefinition]) -> PartialVMResult<()> {
+    fn verify_struct_fields(&mut self, struct_defs: &[StructDefinition]) -> PartialVMResult<()> {
         for (struct_def_idx, struct_def) in struct_defs.iter().enumerate() {
             let fields = match &struct_def.field_information {
                 StructFieldInformation::Native => continue,
@@ -95,7 +111,7 @@ impl<'a> SignatureChecker<'a> {
         Ok(())
     }
 
-    fn verify_enum_fields(&self, enum_defs: &[EnumDefinition]) -> PartialVMResult<()> {
+    fn verify_enum_fields(&mut self, enum_defs: &[EnumDefinition]) -> PartialVMResult<()> {
         for (enum_def_idx, enum_def) in enum_defs.iter().enumerate() {
             let enum_handle = self.module.datatype_handle_at(enum_def.enum_handle);
             let type_param_constraints: Vec<_> = enum_handle.type_param_constraints().collect();
@@ -419,7 +435,7 @@ impl<'a> SignatureChecker<'a> {
     }
 
     fn check_type_instantiation(
-        &self,
+        &mut self,
         s: &SignatureToken,
         type_parameters: &[AbilitySet],
     ) -> PartialVMResult<()> {
@@ -435,7 +451,7 @@ impl<'a> SignatureChecker<'a> {
     }
 
     fn check_type_instantiation_(
-        &self,
+        &mut self,
         s: &SignatureToken,
         type_parameters: &[AbilitySet],
     ) -> PartialVMResult<()> {
@@ -472,7 +488,7 @@ impl<'a> SignatureChecker<'a> {
 
     // Checks if the given types are well defined and satisfy the constraints in the given context.
     fn check_generic_instance(
-        &self,
+        &mut self,
         type_arguments: &[SignatureToken],
         constraints: impl ExactSizeIterator<Item = AbilitySet>,
         global_abilities: &[AbilitySet],
@@ -489,8 +505,11 @@ impl<'a> SignatureChecker<'a> {
             );
         }
 
+        let meter: &mut M = self.meter;
+        let module_ability_cache: &mut AbilityCache = self.module_ability_cache;
         for (constraint, ty) in constraints.into_iter().zip(type_arguments) {
-            let given = self.module.abilities(ty, global_abilities)?;
+            let given =
+                module_ability_cache.abilities(Scope::Module, meter, global_abilities, ty)?;
             if !constraint.is_subset(given) {
                 return Err(PartialVMError::new(StatusCode::CONSTRAINT_NOT_SATISFIED)
                     .with_message(format!(
diff --git a/external-crates/move/crates/move-bytecode-verifier/src/type_safety.rs b/external-crates/move/crates/move-bytecode-verifier/src/type_safety.rs
index 6d2b33ee02425..ddace3cf61530 100644
--- a/external-crates/move/crates/move-bytecode-verifier/src/type_safety.rs
+++ b/external-crates/move/crates/move-bytecode-verifier/src/type_safety.rs
@@ -5,7 +5,7 @@
 //! This module defines the transfer functions for verifying type safety of a procedure body.
 //! It does not utilize control flow, but does check each block independently
 
-use std::num::NonZeroU64;
+use std::{cmp::max, num::NonZeroU64};
 
 use move_abstract_interpreter::{absint::FunctionContext, control_flow_graph::ControlFlowGraph};
 use move_abstract_stack::AbstractStack;
@@ -22,13 +22,17 @@ use move_binary_format::{
 use move_bytecode_verifier_meter::{Meter, Scope};
 use move_core_types::vm_status::StatusCode;
 
+use crate::ability_cache::AbilityCache;
+
 struct Locals<'a> {
     param_count: usize,
     parameters: &'a Signature,
     locals: &'a Signature,
 }
 
-const TYPE_NODE_COST: u128 = 30;
+const TYPE_NODE_COST: u128 = 6;
+const TYPE_NODE_QUADRATIC_THRESHOLD: usize = 10;
+const TYPE_PUSH_COST: u128 = 3;
 
 impl<'a> Locals<'a> {
     fn new(parameters: &'a Signature, locals: &'a Signature) -> Self {
@@ -49,19 +53,25 @@ impl<'a> Locals<'a> {
     }
 }
 
-struct TypeSafetyChecker<'a> {
-    module: &'a CompiledModule,
-    function_context: &'a FunctionContext<'a>,
-    locals: Locals<'a>,
+struct TypeSafetyChecker<'env, 'a> {
+    module: &'env CompiledModule,
+    function_context: &'a FunctionContext<'env>,
+    ability_cache: &'a mut AbilityCache<'env>,
+    locals: Locals<'env>,
     stack: AbstractStack<SignatureToken>,
 }
 
-impl<'a> TypeSafetyChecker<'a> {
-    fn new(module: &'a CompiledModule, function_context: &'a FunctionContext<'a>) -> Self {
+impl<'env, 'a> TypeSafetyChecker<'env, 'a> {
+    fn new(
+        module: &'env CompiledModule,
+        function_context: &'a FunctionContext<'env>,
+        ability_cache: &'a mut AbilityCache<'env>,
+    ) -> Self {
         let locals = Locals::new(function_context.parameters(), function_context.locals());
         Self {
             module,
             function_context,
+            ability_cache,
             locals,
             stack: AbstractStack::new(),
         }
@@ -71,9 +81,17 @@ impl<'a> TypeSafetyChecker<'a> {
         self.locals.local_at(i)
     }
 
-    fn abilities(&self, t: &SignatureToken) -> PartialVMResult<AbilitySet> {
-        self.module
-            .abilities(t, self.function_context.type_parameters())
+    fn abilities(
+        &mut self,
+        meter: &mut (impl Meter + ?Sized),
+        t: &SignatureToken,
+    ) -> PartialVMResult<AbilitySet> {
+        self.ability_cache.abilities(
+            Scope::Function,
+            meter,
+            self.function_context.type_parameters(),
+            t,
+        )
     }
 
     fn error(&self, status: StatusCode, offset: CodeOffset) -> PartialVMError {
@@ -90,7 +108,7 @@ impl<'a> TypeSafetyChecker<'a> {
         meter: &mut (impl Meter + ?Sized),
         ty: SignatureToken,
     ) -> PartialVMResult<()> {
-        self.charge_ty(meter, &ty)?;
+        meter.add(Scope::Function, TYPE_PUSH_COST)?;
         safe_unwrap_err!(self.stack.push(ty));
         Ok(())
     }
@@ -101,50 +119,41 @@ impl<'a> TypeSafetyChecker<'a> {
         ty: SignatureToken,
         n: u64,
     ) -> PartialVMResult<()> {
-        self.charge_ty(meter, &ty)?;
+        meter.add_items(Scope::Function, TYPE_PUSH_COST, n as usize)?;
         safe_unwrap_err!(self.stack.push_n(ty, n));
         Ok(())
     }
+}
 
-    fn charge_ty(
-        &mut self,
-        meter: &mut (impl Meter + ?Sized),
-        ty: &SignatureToken,
-    ) -> PartialVMResult<()> {
-        self.charge_ty_(meter, ty, 1)
-    }
-
-    fn charge_ty_(
-        &mut self,
-        meter: &mut (impl Meter + ?Sized),
-        ty: &SignatureToken,
-        n: u64,
-    ) -> PartialVMResult<()> {
-        meter.add_items(
-            Scope::Function,
-            TYPE_NODE_COST,
-            ty.preorder_traversal().count() * (n as usize),
-        )
-    }
+macro_rules! charge_clone {
+    ($meter:ident, $ty:expr) => {{
+        let ty: &SignatureToken = $ty;
+        charge_ty(&mut *$meter, ty)?;
+        ty.clone()
+    }};
+}
 
-    fn charge_tys(
-        &mut self,
-        meter: &mut (impl Meter + ?Sized),
-        tys: &[SignatureToken],
-    ) -> PartialVMResult<()> {
-        for ty in tys {
-            self.charge_ty(meter, ty)?
-        }
-        Ok(())
-    }
+fn charge_ty(meter: &mut (impl Meter + ?Sized), ty: &SignatureToken) -> PartialVMResult<()> {
+    let size = ty.preorder_traversal().count();
+    meter.add_items(
+        Scope::Function,
+        TYPE_NODE_COST,
+        // max(x, x^2/10)
+        max(
+            size,
+            size.saturating_mul(size) / TYPE_NODE_QUADRATIC_THRESHOLD,
+        ),
+    )
 }
 
-pub(crate) fn verify<'a>(
-    module: &'a CompiledModule,
-    function_context: &'a FunctionContext<'a>,
+pub(crate) fn verify<'env>(
+    module: &'env CompiledModule,
+    function_context: &FunctionContext<'env>,
+    ability_cache: &mut AbilityCache<'env>,
     meter: &mut (impl Meter + ?Sized),
 ) -> PartialVMResult<()> {
-    let verifier = &mut TypeSafetyChecker::new(module, function_context);
+    let mut checker = TypeSafetyChecker::new(module, function_context, ability_cache);
+    let verifier = &mut checker;
 
     for block_id in function_context.cfg().blocks() {
         for offset in function_context.cfg().instr_indexes(block_id) {
@@ -220,7 +229,7 @@ fn borrow_field(
     // For generic fields access, this step materializes that type
     let field_handle = verifier.module.field_handle_at(field_handle_index);
     let struct_def = verifier.module.struct_def_at(field_handle.owner);
-    let expected_type = materialize_type(struct_def.struct_handle, type_args);
+    let expected_type = materialize_type(meter, struct_def.struct_handle, type_args)?;
     match operand {
         ST::Reference(inner) | ST::MutableReference(inner) if expected_type == *inner => (),
         _ => return Err(verifier.error(StatusCode::BORROWFIELD_TYPE_MISMATCH_ERROR, offset)),
@@ -237,7 +246,7 @@ fn borrow_field(
             &fields[field_handle.field as usize]
         }
     };
-    let field_type = Box::new(instantiate(&field_def.signature.0, type_args));
+    let field_type = Box::new(instantiate(meter, &field_def.signature.0, type_args)?);
     verifier.push(
         meter,
         if mut_ {
@@ -257,7 +266,7 @@ fn borrow_loc(
     mut_: bool,
     idx: LocalIndex,
 ) -> PartialVMResult<()> {
-    let loc_signature = verifier.local_at(idx).clone();
+    let loc_signature = charge_clone!(meter, verifier.local_at(idx));
 
     if loc_signature.is_reference() {
         return Err(verifier.error(StatusCode::BORROWLOC_REFERENCE_ERROR, offset));
@@ -289,12 +298,11 @@ fn borrow_global(
     }
 
     let struct_def = verifier.module.struct_def_at(idx);
-    let struct_type = materialize_type(struct_def.struct_handle, type_args);
-    if !verifier.abilities(&struct_type)?.has_key() {
+    let struct_type = materialize_type(meter, struct_def.struct_handle, type_args)?;
+    if !verifier.abilities(meter, &struct_type)?.has_key() {
         return Err(verifier.error(StatusCode::BORROWGLOBAL_WITHOUT_KEY_ABILITY, offset));
     }
 
-    let struct_type = materialize_type(struct_def.struct_handle, type_args);
     verifier.push(
         meter,
         if mut_ {
@@ -317,20 +325,21 @@ fn call(
     for parameter in parameters.0.iter().rev() {
         let arg = safe_unwrap_err!(verifier.stack.pop());
         if (type_actuals.is_empty() && &arg != parameter)
-            || (!type_actuals.is_empty() && arg != instantiate(parameter, type_actuals))
+            || (!type_actuals.is_empty() && arg != instantiate(meter, parameter, type_actuals)?)
         {
             return Err(verifier.error(StatusCode::CALL_TYPE_MISMATCH_ERROR, offset));
         }
     }
     for return_type in &verifier.module.signature_at(function_handle.return_).0 {
-        verifier.push(meter, instantiate(return_type, type_actuals))?
+        let sig = instantiate(meter, return_type, type_actuals)?;
+        verifier.push(meter, sig)?
     }
     Ok(())
 }
 
 fn type_fields_signature(
     verifier: &mut TypeSafetyChecker,
-    _meter: &mut (impl Meter + ?Sized), // TODO: metering
+    meter: &mut (impl Meter + ?Sized),
     offset: CodeOffset,
     struct_def: &StructDefinition,
     type_args: &Signature,
@@ -341,10 +350,10 @@ fn type_fields_signature(
             Err(verifier.error(StatusCode::PACK_TYPE_MISMATCH_ERROR, offset))
         }
         StructFieldInformation::Declared(fields) => {
-            let mut field_sig = vec![];
-            for field_def in fields.iter() {
-                field_sig.push(instantiate(&field_def.signature.0, type_args));
-            }
+            let field_sig = fields
+                .iter()
+                .map(|field_def| instantiate(meter, &field_def.signature.0, type_args))
+                .collect::<PartialVMResult<_>>()?;
             Ok(Signature(field_sig))
         }
     }
@@ -357,7 +366,6 @@ fn pack_struct(
     struct_def: &StructDefinition,
     type_args: &Signature,
 ) -> PartialVMResult<()> {
-    let struct_type = materialize_type(struct_def.struct_handle, type_args);
     let field_sig = type_fields_signature(verifier, meter, offset, struct_def, type_args)?;
     for sig in field_sig.0.iter().rev() {
         let arg = safe_unwrap_err!(verifier.stack.pop());
@@ -365,7 +373,7 @@ fn pack_struct(
             return Err(verifier.error(StatusCode::PACK_TYPE_MISMATCH_ERROR, offset));
         }
     }
-
+    let struct_type = materialize_type(meter, struct_def.struct_handle, type_args)?;
     verifier.push(meter, struct_type)?;
     Ok(())
 }
@@ -377,7 +385,7 @@ fn unpack_struct(
     struct_def: &StructDefinition,
     type_args: &Signature,
 ) -> PartialVMResult<()> {
-    let struct_type = materialize_type(struct_def.struct_handle, type_args);
+    let struct_type = materialize_type(meter, struct_def.struct_handle, type_args)?;
 
     // Pop an abstract value from the stack and check if its type is equal to the one
     // declared.
@@ -401,18 +409,15 @@ fn pack_enum_variant(
     variant_def: &VariantDefinition,
     type_args: &Signature,
 ) -> PartialVMResult<()> {
-    let enum_type = materialize_type(enum_def.enum_handle, type_args);
-    let field_sig = variant_def
-        .fields
-        .iter()
-        .map(|field_def| instantiate(&field_def.signature.0, type_args));
-    for sig in field_sig.rev() {
+    for field_def in variant_def.fields.iter().rev() {
+        let sig = instantiate(meter, &field_def.signature.0, type_args)?;
         let arg = safe_unwrap_err!(verifier.stack.pop());
         if arg != sig {
             return Err(verifier.error(StatusCode::PACK_TYPE_MISMATCH_ERROR, offset));
         }
     }
 
+    let enum_type = materialize_type(meter, enum_def.enum_handle, type_args)?;
     verifier.push(meter, enum_type)?;
     Ok(())
 }
@@ -425,7 +430,7 @@ fn unpack_enum_variant_by_value(
     variant_def: &VariantDefinition,
     type_args: &Signature,
 ) -> PartialVMResult<()> {
-    let enum_type = materialize_type(enum_def.enum_handle, type_args);
+    let enum_type = materialize_type(meter, enum_def.enum_handle, type_args)?;
 
     // Pop an abstract value from the stack and check if its type is equal to the one
     // declared.
@@ -434,11 +439,8 @@ fn unpack_enum_variant_by_value(
         return Err(verifier.error(StatusCode::UNPACK_TYPE_MISMATCH_ERROR, offset));
     }
 
-    let field_sig = variant_def
-        .fields
-        .iter()
-        .map(|field_def| instantiate(&field_def.signature.0, type_args));
-    for sig in field_sig {
+    for field_def in &variant_def.fields {
+        let sig = instantiate(meter, &field_def.signature.0, type_args)?;
         verifier.push(meter, sig)?
     }
     Ok(())
@@ -453,8 +455,6 @@ fn unpack_enum_variant_by_ref(
     variant_def: &VariantDefinition,
     type_args: &Signature,
 ) -> PartialVMResult<()> {
-    let enum_type = materialize_type(enum_def.enum_handle, type_args);
-
     // Pop an abstract value from the stack and check if its type is equal to the one
     // declared.
     let arg = safe_unwrap_err!(verifier.stack.pop());
@@ -467,20 +467,18 @@ fn unpack_enum_variant_by_ref(
         _ => return Err(verifier.error(StatusCode::UNPACK_TYPE_MISMATCH_ERROR, offset)),
     };
 
+    let enum_type = materialize_type(meter, enum_def.enum_handle, type_args)?;
     if *inner != enum_type {
         return Err(verifier.error(StatusCode::UNPACK_TYPE_MISMATCH_ERROR, offset));
     }
 
-    let field_sig = variant_def
-        .fields
-        .iter()
-        .map(|field_def| instantiate(&field_def.signature.0, type_args));
-    for sig in field_sig {
-        let mk_sig = if mut_ {
-            ST::MutableReference
-        } else {
-            ST::Reference
-        };
+    let mk_sig = if mut_ {
+        ST::MutableReference
+    } else {
+        ST::Reference
+    };
+    for field_def in &variant_def.fields {
+        let sig = instantiate(meter, &field_def.signature.0, type_args)?;
         verifier.push(meter, mk_sig(Box::new(sig)))?
     }
     Ok(())
@@ -493,8 +491,8 @@ fn exists(
     struct_def: &StructDefinition,
     type_args: &Signature,
 ) -> PartialVMResult<()> {
-    let struct_type = materialize_type(struct_def.struct_handle, type_args);
-    if !verifier.abilities(&struct_type)?.has_key() {
+    let struct_type = materialize_type(meter, struct_def.struct_handle, type_args)?;
+    if !verifier.abilities(meter, &struct_type)?.has_key() {
         return Err(verifier.error(
             StatusCode::EXISTS_WITHOUT_KEY_ABILITY_OR_BAD_ARGUMENT,
             offset,
@@ -521,12 +519,11 @@ fn move_from(
     struct_def: &StructDefinition,
     type_args: &Signature,
 ) -> PartialVMResult<()> {
-    let struct_type = materialize_type(struct_def.struct_handle, type_args);
-    if !verifier.abilities(&struct_type)?.has_key() {
+    let struct_type = materialize_type(meter, struct_def.struct_handle, type_args)?;
+    if !verifier.abilities(meter, &struct_type)?.has_key() {
         return Err(verifier.error(StatusCode::MOVEFROM_WITHOUT_KEY_ABILITY, offset));
     }
 
-    let struct_type = materialize_type(struct_def.struct_handle, type_args);
     let operand = safe_unwrap_err!(verifier.stack.pop());
     if operand != ST::Address {
         return Err(verifier.error(StatusCode::MOVEFROM_TYPE_MISMATCH_ERROR, offset));
@@ -538,16 +535,16 @@ fn move_from(
 
 fn move_to(
     verifier: &mut TypeSafetyChecker,
+    meter: &mut (impl Meter + ?Sized),
     offset: CodeOffset,
     struct_def: &StructDefinition,
     type_args: &Signature,
 ) -> PartialVMResult<()> {
-    let struct_type = materialize_type(struct_def.struct_handle, type_args);
-    if !verifier.abilities(&struct_type)?.has_key() {
+    let struct_type = materialize_type(meter, struct_def.struct_handle, type_args)?;
+    if !verifier.abilities(meter, &struct_type)?.has_key() {
         return Err(verifier.error(StatusCode::MOVETO_WITHOUT_KEY_ABILITY, offset));
     }
 
-    let struct_type = materialize_type(struct_def.struct_handle, type_args);
     let key_struct_operand = safe_unwrap_err!(verifier.stack.pop());
     let signer_reference_operand = safe_unwrap_err!(verifier.stack.pop());
     if key_struct_operand != struct_type {
@@ -602,10 +599,8 @@ fn verify_instr(
     match bytecode {
         Bytecode::Pop => {
             let operand = safe_unwrap_err!(verifier.stack.pop());
-            let abilities = verifier
-                .module
-                .abilities(&operand, verifier.function_context.type_parameters());
-            if !abilities?.has_drop() {
+            let abilities = verifier.abilities(meter, &operand)?;
+            if !abilities.has_drop() {
                 return Err(verifier.error(StatusCode::POP_WITHOUT_DROP_ABILITY, offset));
             }
         }
@@ -663,7 +658,6 @@ fn verify_instr(
         Bytecode::MutBorrowFieldGeneric(field_inst_index) => {
             let field_inst = verifier.module.field_instantiation_at(*field_inst_index);
             let type_inst = verifier.module.signature_at(field_inst.type_parameters);
-            verifier.charge_tys(meter, &type_inst.0)?;
             borrow_field(verifier, meter, offset, true, field_inst.handle, type_inst)?
         }
 
@@ -679,7 +673,6 @@ fn verify_instr(
         Bytecode::ImmBorrowFieldGeneric(field_inst_index) => {
             let field_inst = verifier.module.field_instantiation_at(*field_inst_index);
             let type_inst = verifier.module.signature_at(field_inst.type_parameters);
-            verifier.charge_tys(meter, &type_inst.0)?;
             borrow_field(verifier, meter, offset, false, field_inst.handle, type_inst)?
         }
 
@@ -708,7 +701,7 @@ fn verify_instr(
         }
 
         Bytecode::LdConst(idx) => {
-            let signature = verifier.module.constant_at(*idx).type_.clone();
+            let signature = charge_clone!(meter, &verifier.module.constant_at(*idx).type_);
             verifier.push(meter, signature)?;
         }
 
@@ -717,22 +710,15 @@ fn verify_instr(
         }
 
         Bytecode::CopyLoc(idx) => {
-            let local_signature = verifier.local_at(*idx).clone();
-            if !verifier
-                .module
-                .abilities(
-                    &local_signature,
-                    verifier.function_context.type_parameters(),
-                )?
-                .has_copy()
-            {
+            let local_signature = charge_clone!(meter, verifier.local_at(*idx));
+            if !verifier.abilities(meter, &local_signature)?.has_copy() {
                 return Err(verifier.error(StatusCode::COPYLOC_WITHOUT_COPY_ABILITY, offset));
             }
             verifier.push(meter, local_signature)?
         }
 
         Bytecode::MoveLoc(idx) => {
-            let local_signature = verifier.local_at(*idx).clone();
+            let local_signature = charge_clone!(meter, verifier.local_at(*idx));
             verifier.push(meter, local_signature)?
         }
 
@@ -749,7 +735,6 @@ fn verify_instr(
             let func_inst = verifier.module.function_instantiation_at(*idx);
             let func_handle = verifier.module.function_handle_at(func_inst.handle);
             let type_args = &verifier.module.signature_at(func_inst.type_parameters);
-            verifier.charge_tys(meter, &type_args.0)?;
             call(verifier, meter, offset, func_handle, type_args)?
         }
 
@@ -768,7 +753,6 @@ fn verify_instr(
             let struct_inst = verifier.module.struct_instantiation_at(*idx);
             let struct_def = verifier.module.struct_def_at(struct_inst.def);
             let type_args = verifier.module.signature_at(struct_inst.type_parameters);
-            verifier.charge_tys(meter, &type_args.0)?;
             pack_struct(verifier, meter, offset, struct_def, type_args)?
         }
 
@@ -787,7 +771,6 @@ fn verify_instr(
             let struct_inst = verifier.module.struct_instantiation_at(*idx);
             let struct_def = verifier.module.struct_def_at(struct_inst.def);
             let type_args = verifier.module.signature_at(struct_inst.type_parameters);
-            verifier.charge_tys(meter, &type_args.0)?;
             unpack_struct(verifier, meter, offset, struct_def, type_args)?
         }
 
@@ -795,7 +778,7 @@ fn verify_instr(
             let operand = safe_unwrap_err!(verifier.stack.pop());
             match operand {
                 ST::Reference(inner) | ST::MutableReference(inner) => {
-                    if !verifier.abilities(&inner)?.has_copy() {
+                    if !verifier.abilities(meter, &inner)?.has_copy() {
                         return Err(
                             verifier.error(StatusCode::READREF_WITHOUT_COPY_ABILITY, offset)
                         );
@@ -817,7 +800,7 @@ fn verify_instr(
                     )
                 }
             };
-            if !verifier.abilities(&ref_inner_signature)?.has_drop() {
+            if !verifier.abilities(meter, &ref_inner_signature)?.has_drop() {
                 return Err(verifier.error(StatusCode::WRITEREF_WITHOUT_DROP_ABILITY, offset));
             }
 
@@ -897,7 +880,7 @@ fn verify_instr(
         Bytecode::Eq | Bytecode::Neq => {
             let operand1 = safe_unwrap_err!(verifier.stack.pop());
             let operand2 = safe_unwrap_err!(verifier.stack.pop());
-            if verifier.abilities(&operand1)?.has_drop() && operand1 == operand2 {
+            if verifier.abilities(meter, &operand1)?.has_drop() && operand1 == operand2 {
                 verifier.push(meter, ST::Bool)?;
             } else {
                 return Err(verifier.error(StatusCode::EQUALITY_OP_TYPE_MISMATCH_ERROR, offset));
@@ -921,7 +904,6 @@ fn verify_instr(
         Bytecode::MutBorrowGlobalGenericDeprecated(idx) => {
             let struct_inst = verifier.module.struct_instantiation_at(*idx);
             let type_inst = verifier.module.signature_at(struct_inst.type_parameters);
-            verifier.charge_tys(meter, &type_inst.0)?;
             borrow_global(verifier, meter, offset, true, struct_inst.def, type_inst)?
         }
 
@@ -932,7 +914,6 @@ fn verify_instr(
         Bytecode::ImmBorrowGlobalGenericDeprecated(idx) => {
             let struct_inst = verifier.module.struct_instantiation_at(*idx);
             let type_inst = verifier.module.signature_at(struct_inst.type_parameters);
-            verifier.charge_tys(meter, &type_inst.0)?;
             borrow_global(verifier, meter, offset, false, struct_inst.def, type_inst)?
         }
 
@@ -945,7 +926,6 @@ fn verify_instr(
             let struct_inst = verifier.module.struct_instantiation_at(*idx);
             let struct_def = verifier.module.struct_def_at(struct_inst.def);
             let type_args = verifier.module.signature_at(struct_inst.type_parameters);
-            verifier.charge_tys(meter, &type_args.0)?;
             exists(verifier, meter, offset, struct_def, type_args)?
         }
 
@@ -958,21 +938,19 @@ fn verify_instr(
             let struct_inst = verifier.module.struct_instantiation_at(*idx);
             let struct_def = verifier.module.struct_def_at(struct_inst.def);
             let type_args = verifier.module.signature_at(struct_inst.type_parameters);
-            verifier.charge_tys(meter, &type_args.0)?;
             move_from(verifier, meter, offset, struct_def, type_args)?
         }
 
         Bytecode::MoveToDeprecated(idx) => {
             let struct_def = verifier.module.struct_def_at(*idx);
-            move_to(verifier, offset, struct_def, &Signature(vec![]))?
+            move_to(verifier, meter, offset, struct_def, &Signature(vec![]))?
         }
 
         Bytecode::MoveToGenericDeprecated(idx) => {
             let struct_inst = verifier.module.struct_instantiation_at(*idx);
             let struct_def = verifier.module.struct_def_at(struct_inst.def);
             let type_args = verifier.module.signature_at(struct_inst.type_parameters);
-            verifier.charge_tys(meter, &type_args.0)?;
-            move_to(verifier, offset, struct_def, type_args)?
+            move_to(verifier, meter, offset, struct_def, type_args)?
         }
 
         Bytecode::VecPack(idx, num) => {
@@ -987,7 +965,8 @@ fn verify_instr(
                     return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset));
                 }
             }
-            verifier.push(meter, ST::Vector(Box::new(element_type.clone())))?;
+            let element_type = charge_clone!(meter, element_type);
+            verifier.push(meter, ST::Vector(Box::new(element_type)))?;
         }
 
         Bytecode::VecLen(idx) => {
@@ -1037,10 +1016,13 @@ fn verify_instr(
         Bytecode::VecUnpack(idx, num) => {
             let operand_vec = safe_unwrap_err!(verifier.stack.pop());
             let declared_element_type = &verifier.module.signature_at(*idx).0[0];
-            if operand_vec != ST::Vector(Box::new(declared_element_type.clone())) {
+            let correct_vec_ty =
+                matches!(operand_vec, ST::Vector(inner) if &*inner == declared_element_type);
+            if !correct_vec_ty {
                 return Err(verifier.error(StatusCode::TYPE_MISMATCH, offset));
             }
-            verifier.push_n(meter, declared_element_type.clone(), *num)?;
+            let declared_element_type = charge_clone!(meter, declared_element_type);
+            verifier.push_n(meter, declared_element_type, *num)?;
         }
 
         Bytecode::VecSwap(idx) => {
@@ -1096,7 +1078,6 @@ fn verify_instr(
             let type_args = verifier.module.signature_at(enum_inst.type_parameters);
             let enum_def = verifier.module.enum_def_at(enum_inst.def);
             let variant_def = &enum_def.variants[handle.variant as usize];
-            verifier.charge_tys(meter, &type_args.0)?;
             pack_enum_variant(verifier, meter, offset, enum_def, variant_def, type_args)?
         }
         Bytecode::UnpackVariant(vidx) => {
@@ -1118,7 +1099,6 @@ fn verify_instr(
             let type_args = verifier.module.signature_at(enum_inst.type_parameters);
             let enum_def = verifier.module.enum_def_at(enum_inst.def);
             let variant_def = &enum_def.variants[handle.variant as usize];
-            verifier.charge_tys(meter, &type_args.0)?;
             unpack_enum_variant_by_value(verifier, meter, offset, enum_def, variant_def, type_args)?
         }
         Bytecode::UnpackVariantImmRef(vidx) => {
@@ -1155,7 +1135,6 @@ fn verify_instr(
             let type_args = verifier.module.signature_at(enum_inst.type_parameters);
             let enum_def = verifier.module.enum_def_at(enum_inst.def);
             let variant_def = &enum_def.variants[handle.variant as usize];
-            verifier.charge_tys(meter, &type_args.0)?;
             unpack_enum_variant_by_ref(
                 verifier,
                 meter,
@@ -1172,7 +1151,6 @@ fn verify_instr(
             let type_args = verifier.module.signature_at(enum_inst.type_parameters);
             let enum_def = verifier.module.enum_def_at(enum_inst.def);
             let variant_def = &enum_def.variants[handle.variant as usize];
-            verifier.charge_tys(meter, &type_args.0)?;
             unpack_enum_variant_by_ref(
                 verifier,
                 meter,
@@ -1195,49 +1173,64 @@ fn verify_instr(
 // Helpers functions for types
 //
 
-fn materialize_type(struct_handle: DatatypeHandleIndex, type_args: &Signature) -> SignatureToken {
-    if type_args.is_empty() {
+fn materialize_type(
+    meter: &mut (impl Meter + ?Sized),
+    struct_handle: DatatypeHandleIndex,
+    type_args: &Signature,
+) -> PartialVMResult<SignatureToken> {
+    let ty = if type_args.is_empty() {
         ST::Datatype(struct_handle)
     } else {
         ST::DatatypeInstantiation(Box::new((struct_handle, type_args.0.clone())))
-    }
+    };
+    charge_ty(meter, &ty)?;
+    Ok(ty)
 }
 
-fn instantiate(token: &SignatureToken, subst: &Signature) -> SignatureToken {
-    use SignatureToken::*;
-
-    if subst.0.is_empty() {
-        return token.clone();
-    }
-
-    match token {
-        Bool => Bool,
-        U8 => U8,
-        U16 => U16,
-        U32 => U32,
-        U64 => U64,
-        U128 => U128,
-        U256 => U256,
-        Address => Address,
-        Signer => Signer,
-        Vector(ty) => Vector(Box::new(instantiate(ty, subst))),
-        Datatype(idx) => Datatype(*idx),
-        DatatypeInstantiation(inst) => {
-            let (idx, type_args) = &**inst;
-            DatatypeInstantiation(Box::new((
-                *idx,
-                type_args.iter().map(|ty| instantiate(ty, subst)).collect(),
-            )))
-        }
-        Reference(ty) => Reference(Box::new(instantiate(ty, subst))),
-        MutableReference(ty) => MutableReference(Box::new(instantiate(ty, subst))),
-        TypeParameter(idx) => {
-            // Assume that the caller has previously parsed and verified the structure of the
-            // file and that this guarantees that type parameter indices are always in bounds.
-            debug_assert!((*idx as usize) < subst.len());
-            subst.0[*idx as usize].clone()
+fn instantiate(
+    meter: &mut (impl Meter + ?Sized),
+    token: &SignatureToken,
+    subst: &Signature,
+) -> PartialVMResult<SignatureToken> {
+    fn rec(token: &SignatureToken, subst: &Signature) -> SignatureToken {
+        use SignatureToken::*;
+
+        if subst.0.is_empty() {
+            return token.clone();
+        }
+
+        match token {
+            Bool => Bool,
+            U8 => U8,
+            U16 => U16,
+            U32 => U32,
+            U64 => U64,
+            U128 => U128,
+            U256 => U256,
+            Address => Address,
+            Signer => Signer,
+            Vector(ty) => Vector(Box::new(rec(ty, subst))),
+            Datatype(idx) => Datatype(*idx),
+            DatatypeInstantiation(inst) => {
+                let (idx, type_args) = &**inst;
+                DatatypeInstantiation(Box::new((
+                    *idx,
+                    type_args.iter().map(|ty| rec(ty, subst)).collect(),
+                )))
+            }
+            Reference(ty) => Reference(Box::new(rec(ty, subst))),
+            MutableReference(ty) => MutableReference(Box::new(rec(ty, subst))),
+            TypeParameter(idx) => {
+                // Assume that the caller has previously parsed and verified the structure of the
+                // file and that this guarantees that type parameter indices are always in bounds.
+                debug_assert!((*idx as usize) < subst.len());
+                subst.0[*idx as usize].clone()
+            }
         }
     }
+    let ty = rec(token, subst);
+    charge_ty(meter, &ty)?;
+    Ok(ty)
 }
 
 fn get_vector_element_type(
diff --git a/external-crates/move/crates/move-bytecode-verifier/src/verifier.rs b/external-crates/move/crates/move-bytecode-verifier/src/verifier.rs
index 16fc546c260c8..2c441ce0cd2bb 100644
--- a/external-crates/move/crates/move-bytecode-verifier/src/verifier.rs
+++ b/external-crates/move/crates/move-bytecode-verifier/src/verifier.rs
@@ -4,11 +4,18 @@
 
 //! This module contains the public APIs supported by the bytecode verifier.
 use crate::{
-    ability_field_requirements, check_duplication::DuplicationChecker,
-    code_unit_verifier::CodeUnitVerifier, constants, data_defs::RecursiveDataDefChecker, friends,
-    instantiation_loops::InstantiationLoopChecker, instruction_consistency::InstructionConsistency,
-    limits::LimitsVerifier, script_signature,
-    script_signature::no_additional_script_signature_checks, signature::SignatureChecker,
+    ability_cache::AbilityCache,
+    ability_field_requirements,
+    check_duplication::DuplicationChecker,
+    code_unit_verifier::{self},
+    constants,
+    data_defs::RecursiveDataDefChecker,
+    friends,
+    instantiation_loops::InstantiationLoopChecker,
+    instruction_consistency::InstructionConsistency,
+    limits::LimitsVerifier,
+    script_signature::{self, no_additional_script_signature_checks},
+    signature::SignatureChecker,
 };
 use move_binary_format::{
     check_bounds::BoundsChecker,
@@ -76,6 +83,7 @@ pub fn verify_module_with_config_metered(
     module: &CompiledModule,
     meter: &mut (impl Meter + ?Sized),
 ) -> VMResult<()> {
+    let ability_cache = &mut AbilityCache::new(module);
     BoundsChecker::verify_module(module).map_err(|e| {
         // We can't point the error at the module, because if bounds-checking
         // failed, we cannot safely index into module's handle to itself.
@@ -83,14 +91,14 @@ pub fn verify_module_with_config_metered(
     })?;
     LimitsVerifier::verify_module(config, module)?;
     DuplicationChecker::verify_module(module)?;
-    SignatureChecker::verify_module(module)?;
+    SignatureChecker::verify_module(module, ability_cache, meter)?;
     InstructionConsistency::verify_module(module)?;
     constants::verify_module(module)?;
     friends::verify_module(module)?;
-    ability_field_requirements::verify_module(module)?;
+    ability_field_requirements::verify_module(module, ability_cache, meter)?;
     RecursiveDataDefChecker::verify_module(module)?;
     InstantiationLoopChecker::verify_module(module)?;
-    CodeUnitVerifier::verify_module(config, module, meter)?;
+    code_unit_verifier::verify_module(config, module, ability_cache, meter)?;
 
     script_signature::verify_module(module, no_additional_script_signature_checks)
 }
diff --git a/external-crates/move/crates/move-command-line-common/src/files.rs b/external-crates/move/crates/move-command-line-common/src/files.rs
index 9300f49f895fc..b7b1039c7c12a 100644
--- a/external-crates/move/crates/move-command-line-common/src/files.rs
+++ b/external-crates/move/crates/move-command-line-common/src/files.rs
@@ -212,6 +212,7 @@ pub fn try_exists_vfs(vfs_path: &VfsPath) -> VfsResult<bool> {
 /// - For each directory in `paths`, it will return all files that satisfy the predicate
 /// - Any file explicitly passed in `paths`, it will include that file in the result, regardless
 ///   of the file extension
+///
 /// It implements the same functionality as find_filenames above but for the virtual file system
 pub fn find_filenames_vfs<Predicate: FnMut(&VfsPath) -> bool>(
     paths: &[VfsPath],
@@ -244,7 +245,8 @@ pub fn find_filenames_vfs<Predicate: FnMut(&VfsPath) -> bool>(
 /// - For each directory in `paths`, it will return all files with the `MOVE_EXTENSION` found
 ///   recursively in that directory
 /// - If `keep_specified_files` any file explicitly passed in `paths`, will be added to the result
-///   Otherwise, they will be discarded
+///
+/// Otherwise, they will be discarded
 /// It implements the same functionality as find_move_filenames above but for the virtual file
 /// system
 pub fn find_move_filenames_vfs(
diff --git a/external-crates/move/crates/move-compiler-transactional-tests/tests/functions/large_enum.exp b/external-crates/move/crates/move-compiler-transactional-tests/tests/functions/large_enum.exp
new file mode 100644
index 0000000000000..f32b667741b9f
--- /dev/null
+++ b/external-crates/move/crates/move-compiler-transactional-tests/tests/functions/large_enum.exp
@@ -0,0 +1,15 @@
+processed 4 tasks
+
+task 2, line 34:
+//# run 0x42::m::x1
+return values: |0|{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+
+task 3, line 36:
+//# run 0x42::m::x3
+Error: Function execution failed with VMError: {
+    major_status: VERIFICATION_ERROR,
+    sub_status: None,
+    location: undefined,
+    indices: [],
+    offsets: [],
+}
diff --git a/external-crates/move/crates/move-compiler-transactional-tests/tests/functions/large_enum.move b/external-crates/move/crates/move-compiler-transactional-tests/tests/functions/large_enum.move
new file mode 100644
index 0000000000000..97813d424a567
--- /dev/null
+++ b/external-crates/move/crates/move-compiler-transactional-tests/tests/functions/large_enum.move
@@ -0,0 +1,36 @@
+// tests error after serializing a large enum return value
+
+//# init --edition 2024.alpha
+
+//# publish
+
+module 0x42::m {
+
+public enum X1 {
+    Big(u8, u8, u8, u8, u8, u8, u8, u8, u8, u8, u8, u8, u8, u8, u8, u8),
+}
+
+public enum X2 {
+    V1(X1, X1, X1),
+    V2(X1, X1, X1),
+    V3(X1, X1, X1),
+}
+
+public enum X3 {
+    X2(X2, X2, X2),
+    U64(u64),
+}
+
+entry fun x1(): X1 {
+    X1::Big(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
+}
+
+entry fun x3(): X3 {
+    X3::U64(0)
+}
+
+}
+
+//# run 0x42::m::x1
+
+//# run 0x42::m::x3
diff --git a/external-crates/move/crates/move-compiler-transactional-tests/tests/matching/field_ordering.exp b/external-crates/move/crates/move-compiler-transactional-tests/tests/matching/field_ordering.exp
new file mode 100644
index 0000000000000..fc5a4436b29d4
--- /dev/null
+++ b/external-crates/move/crates/move-compiler-transactional-tests/tests/matching/field_ordering.exp
@@ -0,0 +1 @@
+processed 3 tasks
diff --git a/external-crates/move/crates/move-compiler-transactional-tests/tests/matching/field_ordering.move b/external-crates/move/crates/move-compiler-transactional-tests/tests/matching/field_ordering.move
new file mode 100644
index 0000000000000..0b062b9decac5
--- /dev/null
+++ b/external-crates/move/crates/move-compiler-transactional-tests/tests/matching/field_ordering.move
@@ -0,0 +1,19 @@
+//# init --edition 2024.beta
+
+//# publish
+module 0x42::m;
+
+public enum E {
+    V { zero: u64, one: u64 }
+}
+
+fun add1(n: u64): u64 { n + 1 }
+
+public fun main() {
+    let one = match (E::V { zero: 0, one: 1}) {
+        E::V { one: _, zero: one } => add1(one)
+    };
+    assert!(one == 1)
+}
+
+//# run 0x42::m::main
diff --git a/external-crates/move/crates/move-compiler/src/cfgir/borrows/state.rs b/external-crates/move/crates/move-compiler/src/cfgir/borrows/state.rs
index 93d345fd3965b..a9a97be7e1efe 100644
--- a/external-crates/move/crates/move-compiler/src/cfgir/borrows/state.rs
+++ b/external-crates/move/crates/move-compiler/src/cfgir/borrows/state.rs
@@ -369,7 +369,7 @@ impl BorrowState {
 
     fn release(&mut self, ref_id: RefID) {
         self.id_to_exp.remove(&ref_id);
-        self.borrows.release(ref_id)
+        self.borrows.release(ref_id);
     }
 
     fn divergent_control_flow(&mut self) {
diff --git a/external-crates/move/crates/move-compiler/src/cfgir/cfg.rs b/external-crates/move/crates/move-compiler/src/cfgir/cfg.rs
index d640a3f20589a..8cad547a7ce11 100644
--- a/external-crates/move/crates/move-compiler/src/cfgir/cfg.rs
+++ b/external-crates/move/crates/move-compiler/src/cfgir/cfg.rs
@@ -205,6 +205,7 @@ impl<'a> ImmForwardCFG<'a> {
     /// Returns
     /// - A CFG
     /// - A set of infinite loop heads
+    ///
     /// This _must_ be called after `BlockMutCFG::new`, as the mutable version optimizes the code
     /// This will be done for external usage,
     /// since the Mut CFG is used during the building of the cfgir::ast::Program
diff --git a/external-crates/move/crates/move-compiler/src/expansion/path_expander.rs b/external-crates/move/crates/move-compiler/src/expansion/path_expander.rs
index d97869a4580c2..20ae8acd5aa7e 100644
--- a/external-crates/move/crates/move-compiler/src/expansion/path_expander.rs
+++ b/external-crates/move/crates/move-compiler/src/expansion/path_expander.rs
@@ -1215,10 +1215,10 @@ impl PathExpander for LegacyPathExpander {
         if context.env.ide_mode() && context.is_source_definition {
             let mut info = AliasAutocompleteInfo::new();
             for (name, addr) in context.named_address_mapping.unwrap().iter() {
-                info.addresses.insert((*name, *addr));
+                info.addresses.insert(*name, *addr);
             }
             for (_, name, (_, mident)) in self.aliases.modules.iter() {
-                info.modules.insert((*name, *mident));
+                info.modules.insert(*name, *mident);
             }
             for (_, name, (_, (mident, member))) in self.aliases.members.iter() {
                 info.members.insert((*name, *mident, *member));
diff --git a/external-crates/move/crates/move-compiler/src/expansion/translate.rs b/external-crates/move/crates/move-compiler/src/expansion/translate.rs
index 7d4230b6cf5cc..093a28e8f9af0 100644
--- a/external-crates/move/crates/move-compiler/src/expansion/translate.rs
+++ b/external-crates/move/crates/move-compiler/src/expansion/translate.rs
@@ -1574,6 +1574,7 @@ fn use_(
             };
             use_funs.explicit.push(explicit);
         }
+        P::Use::Partial { .. } => (), // no actual module to process
     }
 }
 
@@ -1703,6 +1704,14 @@ fn module_use(
                 }
             }
         }
+        P::ModuleUse::Partial { .. } => {
+            let mident = module_ident(&mut context.defn_context, in_mident);
+            if !context.defn_context.module_members.contains_key(&mident) {
+                context.env().add_diag(unbound_module(&mident));
+                return;
+            };
+            add_module_alias!(mident, mident.value.module.0)
+        }
     }
 }
 
diff --git a/external-crates/move/crates/move-compiler/src/hlir/match_compilation.rs b/external-crates/move/crates/move-compiler/src/hlir/match_compilation.rs
index cea38a40416d1..df12006c03ad6 100644
--- a/external-crates/move/crates/move-compiler/src/hlir/match_compilation.rs
+++ b/external-crates/move/crates/move-compiler/src/hlir/match_compilation.rs
@@ -271,7 +271,7 @@ fn compile_match_head(
 ) -> MatchStep {
     debug_print!(
         context.debug.match_specialization,
-        ("-----\ncompiling with fringe queue entry" => fringe; dbg)
+        ("-----\ncompiling with fringe queue entry" => fringe; sdbg)
     );
     if matrix.is_empty() {
         MatchStep::Failure
@@ -333,8 +333,10 @@ fn compile_match_head(
             // If we have an actual destructuring anywhere, we do that and take the specialized
             // matrix (which holds the default matrix and bindings, for our purpose). If we don't,
             // we just take the default matrix.
+            let decl_fields = context.info.struct_fields(&mident, &datatype_name).unwrap();
             let unpack = if let Some((ploc, arg_types)) = matrix.first_struct_ctors() {
-                let fringe_binders = context.make_imm_ref_match_binders(ploc, arg_types);
+                let fringe_binders =
+                    context.make_imm_ref_match_binders(decl_fields, ploc, arg_types);
                 let fringe_exps = make_fringe_entries(&fringe_binders);
                 let mut inner_fringe = fringe.clone();
                 for fringe_exp in fringe_exps.into_iter().rev() {
@@ -376,7 +378,12 @@ fn compile_match_head(
             let mut arms = BTreeMap::new();
             for (ctor, (ploc, arg_types)) in ctors {
                 unmatched_variants.remove(&ctor);
-                let fringe_binders = context.make_imm_ref_match_binders(ploc, arg_types);
+                let decl_fields = context
+                    .info
+                    .enum_variant_fields(&mident, &datatype_name, &ctor)
+                    .unwrap();
+                let fringe_binders =
+                    context.make_imm_ref_match_binders(decl_fields, ploc, arg_types);
                 let fringe_exps = make_fringe_entries(&fringe_binders);
                 let mut inner_fringe = fringe.clone();
                 for fringe_exp in fringe_exps.into_iter().rev() {
@@ -898,6 +905,12 @@ fn make_arm_variant_unpack_fields(
 ) -> (Vec<(FringeEntry, MatchPattern)>, Vec<(Field, Var, Type)>) {
     let field_pats = fields.clone().map(|_key, (ndx, (_, pat))| (ndx, pat));
 
+    let decl_fields = context
+        .hlir_context
+        .info
+        .enum_variant_fields(&mident, &enum_, &variant)
+        .unwrap();
+
     let field_tys = {
         let field_tys = fields.map(|_key, (ndx, (ty, _))| (ndx, ty));
         if let Some(mut_) = mut_ref {
@@ -911,13 +924,12 @@ fn make_arm_variant_unpack_fields(
             field_tys
         }
     };
-    let fringe_binders = context.hlir_context.make_unpack_binders(pat_loc, field_tys);
+    let fringe_binders =
+        context
+            .hlir_context
+            .make_unpack_binders(decl_fields.clone(), pat_loc, field_tys);
     let fringe_exps = make_fringe_entries(&fringe_binders);
 
-    let decl_fields = context
-        .hlir_context
-        .info
-        .enum_variant_fields(&mident, &enum_, &variant);
     let ordered_pats = order_fields_by_decl(decl_fields, field_pats);
 
     let mut unpack_fields: Vec<(Field, Var, Type)> = vec![];
@@ -946,6 +958,11 @@ fn make_arm_struct_unpack_fields(
     fields: Fields<(Type, MatchPattern)>,
 ) -> (Vec<(FringeEntry, MatchPattern)>, Vec<(Field, Var, Type)>) {
     let field_pats = fields.clone().map(|_key, (ndx, (_, pat))| (ndx, pat));
+    let decl_fields = context
+        .hlir_context
+        .info
+        .struct_fields(&mident, &struct_)
+        .unwrap();
 
     let field_tys = {
         let field_tys = fields.map(|_key, (ndx, (ty, _))| (ndx, ty));
@@ -960,10 +977,12 @@ fn make_arm_struct_unpack_fields(
             field_tys
         }
     };
-    let fringe_binders = context.hlir_context.make_unpack_binders(pat_loc, field_tys);
+    let fringe_binders =
+        context
+            .hlir_context
+            .make_unpack_binders(decl_fields.clone(), pat_loc, field_tys);
     let fringe_exps = make_fringe_entries(&fringe_binders);
 
-    let decl_fields = context.hlir_context.info.struct_fields(&mident, &struct_);
     let ordered_pats = order_fields_by_decl(decl_fields, field_pats);
 
     let mut unpack_fields: Vec<(Field, Var, Type)> = vec![];
diff --git a/external-crates/move/crates/move-compiler/src/linters/mod.rs b/external-crates/move/crates/move-compiler/src/linters/mod.rs
index 01ab4d3c2902f..0457c5d511f51 100644
--- a/external-crates/move/crates/move-compiler/src/linters/mod.rs
+++ b/external-crates/move/crates/move-compiler/src/linters/mod.rs
@@ -8,6 +8,7 @@ use crate::{
     linters::constant_naming::ConstantNamingVisitor, typing::visitor::TypingVisitor,
 };
 pub mod constant_naming;
+mod unnecessary_while_loop;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum LintLevel {
@@ -34,16 +35,26 @@ pub const ALLOW_ATTR_CATEGORY: &str = "lint";
 pub const LINT_WARNING_PREFIX: &str = "Lint ";
 pub const CONSTANT_NAMING_FILTER_NAME: &str = "constant_naming";
 pub const CONSTANT_NAMING_DIAG_CODE: u8 = 1;
+pub const WHILE_TRUE_TO_LOOP_FILTER_NAME: &str = "while_true";
+pub const WHILE_TRUE_TO_LOOP_DIAG_CODE: u8 = 4;
 
 pub fn known_filters() -> (Option<Symbol>, Vec<WarningFilter>) {
     (
         Some(ALLOW_ATTR_CATEGORY.into()),
-        vec![WarningFilter::code(
-            Some(LINT_WARNING_PREFIX),
-            LinterDiagnosticCategory::Style as u8,
-            CONSTANT_NAMING_DIAG_CODE,
-            Some(CONSTANT_NAMING_FILTER_NAME),
-        )],
+        vec![
+            WarningFilter::code(
+                Some(LINT_WARNING_PREFIX),
+                LinterDiagnosticCategory::Style as u8,
+                CONSTANT_NAMING_DIAG_CODE,
+                Some(CONSTANT_NAMING_FILTER_NAME),
+            ),
+            WarningFilter::code(
+                Some(LINT_WARNING_PREFIX),
+                LinterDiagnosticCategory::Complexity as u8,
+                WHILE_TRUE_TO_LOOP_DIAG_CODE,
+                Some(WHILE_TRUE_TO_LOOP_FILTER_NAME),
+            ),
+        ],
     )
 }
 
@@ -51,9 +62,12 @@ pub fn linter_visitors(level: LintLevel) -> Vec<Visitor> {
     match level {
         LintLevel::None | LintLevel::Default => vec![],
         LintLevel::All => {
-            vec![constant_naming::ConstantNamingVisitor::visitor(
-                ConstantNamingVisitor,
-            )]
+            vec![
+                constant_naming::ConstantNamingVisitor::visitor(ConstantNamingVisitor),
+                unnecessary_while_loop::WhileTrueToLoop::visitor(
+                    unnecessary_while_loop::WhileTrueToLoop,
+                ),
+            ]
         }
     }
 }
diff --git a/external-crates/move/crates/move-compiler/src/linters/unnecessary_while_loop.rs b/external-crates/move/crates/move-compiler/src/linters/unnecessary_while_loop.rs
new file mode 100644
index 0000000000000..0985a02e7b01c
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/src/linters/unnecessary_while_loop.rs
@@ -0,0 +1,68 @@
+//! Encourages replacing `while(true)` with `loop` for infinite loops in Move for clarity and conciseness.
+//! Identifies `while(true)` patterns, suggesting a more idiomatic approach using `loop`.
+//! Aims to enhance code readability and adherence to Rust idioms.
+use crate::{
+    diag,
+    diagnostics::{
+        codes::{custom, DiagnosticInfo, Severity},
+        WarningFilters,
+    },
+    expansion::ast::Value_,
+    shared::CompilationEnv,
+    typing::{
+        ast::{self as T, UnannotatedExp_},
+        visitor::{TypingVisitorConstructor, TypingVisitorContext},
+    },
+};
+
+use super::{LinterDiagnosticCategory, LINT_WARNING_PREFIX, WHILE_TRUE_TO_LOOP_DIAG_CODE};
+
+const WHILE_TRUE_TO_LOOP_DIAG: DiagnosticInfo = custom(
+    LINT_WARNING_PREFIX,
+    Severity::Warning,
+    LinterDiagnosticCategory::Complexity as u8,
+    WHILE_TRUE_TO_LOOP_DIAG_CODE,
+    "unnecessary 'while (true)', replace with 'loop'",
+);
+
+pub struct WhileTrueToLoop;
+
+pub struct Context<'a> {
+    env: &'a mut CompilationEnv,
+}
+
+impl TypingVisitorConstructor for WhileTrueToLoop {
+    type Context<'a> = Context<'a>;
+
+    fn context<'a>(env: &'a mut CompilationEnv, _program: &T::Program) -> Self::Context<'a> {
+        Context { env }
+    }
+}
+
+impl TypingVisitorContext for Context<'_> {
+    fn add_warning_filter_scope(&mut self, filter: WarningFilters) {
+        self.env.add_warning_filter_scope(filter)
+    }
+    fn pop_warning_filter_scope(&mut self) {
+        self.env.pop_warning_filter_scope()
+    }
+
+    fn visit_exp_custom(&mut self, exp: &mut T::Exp) -> bool {
+        let UnannotatedExp_::While(_, cond, _) = &exp.exp.value else {
+            return false;
+        };
+        let UnannotatedExp_::Value(sp!(_, Value_::Bool(true))) = &cond.exp.value else {
+            return false;
+        };
+
+        let msg = "'while (true)' can be always replaced with 'loop'";
+        let mut diag = diag!(WHILE_TRUE_TO_LOOP_DIAG, (exp.exp.loc, msg));
+        diag.add_note(
+            "A 'loop' is more useful in these cases. Unlike 'while', 'loop' can have a \
+            'break' with a value, e.g. 'let x = loop { break 42 };'",
+        );
+        self.env.add_diag(diag);
+
+        false
+    }
+}
diff --git a/external-crates/move/crates/move-compiler/src/naming/translate.rs b/external-crates/move/crates/move-compiler/src/naming/translate.rs
index ed6593ec344e9..f238eb60f6ff1 100644
--- a/external-crates/move/crates/move-compiler/src/naming/translate.rs
+++ b/external-crates/move/crates/move-compiler/src/naming/translate.rs
@@ -51,6 +51,7 @@ pub struct ResolvedModuleFunction {
     pub mident: ModuleIdent,
     pub name: FunctionName,
     pub tyarg_arity: usize,
+    #[allow(unused)]
     pub arity: usize,
 }
 
@@ -93,6 +94,7 @@ pub enum FieldInfo {
 pub struct ResolvedConstant {
     pub mident: ModuleIdent,
     pub name: ConstantName,
+    #[allow(unused)]
     pub decl_loc: Loc,
 }
 
@@ -138,6 +140,7 @@ pub(super) enum ResolvedConstructor {
 #[derive(Debug, Clone)]
 pub(super) enum ResolvedCallSubject {
     Builtin(Box<ResolvedBuiltinFunction>),
+    #[allow(unused)]
     Constructor(Box<ResolvedConstructor>),
     Function(Box<ResolvedModuleFunction>),
     Var(Box<N::Var>),
@@ -146,6 +149,7 @@ pub(super) enum ResolvedCallSubject {
 
 #[derive(Debug, Clone)]
 pub(super) enum ResolvedUseFunFunction {
+    #[allow(unused)]
     Builtin(Box<ResolvedBuiltinFunction>),
     Module(Box<ResolvedModuleFunction>),
     Unbound,
@@ -3193,7 +3197,7 @@ fn unique_pattern_binders(
 ) -> Vec<(Mutability, P::Var)> {
     use E::MatchPattern_ as EP;
 
-    fn report_duplicate(context: &mut Context, var: P::Var, locs: &Vec<(Mutability, Loc)>) {
+    fn report_duplicate(context: &mut Context, var: P::Var, locs: &[(Mutability, Loc)]) {
         assert!(locs.len() > 1, "ICE pattern duplicate detection error");
         let (_, first_loc) = locs.first().unwrap();
         let mut diag = diag!(
diff --git a/external-crates/move/crates/move-compiler/src/parser/ast.rs b/external-crates/move/crates/move-compiler/src/parser/ast.rs
index a4378ed18a950..edfddcb304f2b 100644
--- a/external-crates/move/crates/move-compiler/src/parser/ast.rs
+++ b/external-crates/move/crates/move-compiler/src/parser/ast.rs
@@ -104,12 +104,31 @@ pub enum Use {
         ty: Box<NameAccessChain>,
         method: Name,
     },
+    // used for one of the three cases when `LeadingNameAccess` represents `some_pkg`
+    // - `some_pkg`
+    // - `some_pkg::`
+    // - `some_pkg::{`
+    // where first location represents `::` and the second one represents `{`
+    Partial {
+        package: LeadingNameAccess,
+        colon_colon: Option<Loc>,
+        opening_brace: Option<Loc>,
+    },
 }
 
 #[derive(Debug, PartialEq, Clone, Eq)]
 pub enum ModuleUse {
     Module(Option<ModuleName>),
     Members(Vec<(Name, Option<Name>)>),
+    // used for one of the three cases when defining `ModuleUse` for `some_mod`:
+    // - `... some_mod`
+    // - `... some_mod::`
+    // - `... some_mod::{`
+    // where first location represents `::` and the second one represents `{`
+    Partial {
+        colon_colon: Option<Loc>,
+        opening_brace: Option<Loc>,
+    },
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -1489,6 +1508,13 @@ impl AstDebug for ModuleUse {
                     alias.map(|alias| w.write(&format!("as {}", alias.value)));
                 })
             }),
+            ModuleUse::Partial {
+                colon_colon,
+                opening_brace,
+            } => {
+                colon_colon.map(|_| w.write("::"));
+                opening_brace.map(|_| w.write("{"));
+            }
         }
     }
 }
@@ -1523,6 +1549,15 @@ impl AstDebug for Use {
                 ty.ast_debug(w);
                 w.write(format!(".{method}"));
             }
+            Use::Partial {
+                package,
+                colon_colon,
+                opening_brace,
+            } => {
+                w.write(package.to_string());
+                colon_colon.map(|_| w.write("::"));
+                opening_brace.map(|_| w.write("{"));
+            }
         }
         w.write(";")
     }
diff --git a/external-crates/move/crates/move-compiler/src/parser/syntax.rs b/external-crates/move/crates/move-compiler/src/parser/syntax.rs
index 2e1f9d21e48ab..e31d1bb8c6637 100644
--- a/external-crates/move/crates/move-compiler/src/parser/syntax.rs
+++ b/external-crates/move/crates/move-compiler/src/parser/syntax.rs
@@ -1499,12 +1499,8 @@ fn parse_sequence(context: &mut Context) -> Result<Sequence, Box<Diagnostic>> {
     let mut uses = vec![];
     while context.tokens.peek() == Tok::Use {
         let start_loc = context.tokens.start_loc();
-        uses.push(parse_use_decl(
-            vec![],
-            start_loc,
-            Modifiers::empty(),
-            context,
-        )?);
+        let tmp = parse_use_decl(vec![], start_loc, Modifiers::empty(), context)?;
+        uses.push(tmp);
     }
 
     let mut seq: Vec<SequenceItem> = vec![];
@@ -2303,6 +2299,7 @@ fn at_start_of_exp(context: &mut Context) -> bool {
             | Tok::Break
             | Tok::Continue
             | Tok::If
+            | Tok::Match
             | Tok::Loop
             | Tok::Return
             | Tok::While
@@ -3427,6 +3424,7 @@ fn parse_enum_variant_decls(
 // Parse an enum variant definition:
 //      VariantDecl = <Identifier> ("{" Comma<FieldAnnot> "}" | "(" Comma<PosField> ")")
 fn parse_enum_variant_decl(context: &mut Context) -> Result<VariantDefinition, Box<Diagnostic>> {
+    context.tokens.match_doc_comments();
     let start_loc = context.tokens.start_loc();
     let name = parse_identifier(context)?;
     let fields = parse_enum_variant_fields(context)?;
@@ -4130,45 +4128,88 @@ fn parse_use_decl(
             }
             let address_start_loc = context.tokens.start_loc();
             let address = parse_leading_name_access(context)?;
-            consume_token_(
+            let colon_colon_loc = context.tokens.current_token_loc();
+            if let Err(diag) = consume_token_(
                 context.tokens,
                 Tok::ColonColon,
                 start_loc,
                 " after an address in a use declaration",
-            )?;
-            match context.tokens.peek() {
-                Tok::LBrace => {
-                    let parse_inner = |ctxt: &mut Context<'_, '_, '_>| {
-                        let (name, _, use_) = parse_use_module(ctxt)?;
-                        Ok((name, use_))
-                    };
-                    let use_decls = parse_comma_list(
-                        context,
-                        Tok::LBrace,
-                        Tok::RBrace,
-                        &TokenSet::from([Tok::Identifier]),
-                        parse_inner,
-                        "a module use clause",
-                    );
-
-                    Use::NestedModuleUses(address, use_decls)
+            ) {
+                context.add_diag(*diag);
+                Use::Partial {
+                    package: address,
+                    colon_colon: None,
+                    opening_brace: None,
                 }
-                _ => {
-                    let (name, end_loc, use_) = parse_use_module(context)?;
-                    let loc = make_loc(context.tokens.file_hash(), address_start_loc, end_loc);
-                    let module_ident = sp(
-                        loc,
-                        ModuleIdent_ {
-                            address,
-                            module: name,
-                        },
-                    );
-                    Use::ModuleUse(module_ident, use_)
+            } else {
+                // add `;` to stop set to limit number of eaten tokens if the list is parsed
+                // incorrectly
+                context.stop_set.add(Tok::Semicolon);
+                match context.tokens.peek() {
+                    Tok::LBrace => {
+                        let lbrace_loc = context.tokens.current_token_loc();
+                        let parse_inner = |ctxt: &mut Context<'_, '_, '_>| {
+                            parse_use_module(ctxt).map(|(name, _, use_)| (name, use_))
+                        };
+                        let use_decls = parse_comma_list(
+                            context,
+                            Tok::LBrace,
+                            Tok::RBrace,
+                            &TokenSet::from([Tok::Identifier]),
+                            parse_inner,
+                            "a module use clause",
+                        );
+                        let use_ = if use_decls.is_empty() {
+                            // empty list does not make much sense as it contains no alias
+                            // information and it actually helps IDE to treat this case as a partial
+                            // use
+                            Use::Partial {
+                                package: address,
+                                colon_colon: Some(colon_colon_loc),
+                                opening_brace: Some(lbrace_loc),
+                            }
+                        } else {
+                            Use::NestedModuleUses(address, use_decls)
+                        };
+                        context.stop_set.remove(Tok::Semicolon);
+                        use_
+                    }
+                    _ => {
+                        let use_ = match parse_use_module(context) {
+                            Ok((name, end_loc, use_)) => {
+                                let loc = make_loc(
+                                    context.tokens.file_hash(),
+                                    address_start_loc,
+                                    end_loc,
+                                );
+                                let module_ident = sp(
+                                    loc,
+                                    ModuleIdent_ {
+                                        address,
+                                        module: name,
+                                    },
+                                );
+                                Use::ModuleUse(module_ident, use_)
+                            }
+                            Err(diag) => {
+                                context.add_diag(*diag);
+                                Use::Partial {
+                                    package: address,
+                                    colon_colon: Some(colon_colon_loc),
+                                    opening_brace: None,
+                                }
+                            }
+                        };
+                        context.stop_set.remove(Tok::Semicolon);
+                        use_
+                    }
                 }
             }
         }
     };
-    consume_token(context.tokens, Tok::Semicolon)?;
+    if let Err(diag) = consume_token(context.tokens, Tok::Semicolon) {
+        context.add_diag(*diag);
+    }
     let end_loc = context.tokens.previous_end_loc();
     let loc = make_loc(context.tokens.file_hash(), start_loc, end_loc);
     Ok(UseDecl {
@@ -4191,19 +4232,49 @@ fn parse_use_module(
     let alias_opt = parse_use_alias(context)?;
     let module_use = match (&alias_opt, context.tokens.peek()) {
         (None, Tok::ColonColon) => {
-            consume_token(context.tokens, Tok::ColonColon)?;
-            let sub_uses = match context.tokens.peek() {
-                Tok::LBrace => parse_comma_list(
-                    context,
-                    Tok::LBrace,
-                    Tok::RBrace,
-                    &TokenSet::from([Tok::Identifier]),
-                    parse_use_member,
-                    "a module member alias",
-                ),
-                _ => vec![parse_use_member(context)?],
-            };
-            ModuleUse::Members(sub_uses)
+            let colon_colon_loc = context.tokens.current_token_loc();
+            if let Err(diag) = consume_token(context.tokens, Tok::ColonColon) {
+                context.add_diag(*diag);
+                ModuleUse::Partial {
+                    colon_colon: None,
+                    opening_brace: None,
+                }
+            } else {
+                match context.tokens.peek() {
+                    Tok::LBrace => {
+                        let lbrace_loc = context.tokens.current_token_loc();
+                        let sub_uses = parse_comma_list(
+                            context,
+                            Tok::LBrace,
+                            Tok::RBrace,
+                            &TokenSet::from([Tok::Identifier]),
+                            parse_use_member,
+                            "a module member alias",
+                        );
+                        if sub_uses.is_empty() {
+                            // empty list does not make much sense as it contains no alias
+                            // information and it actually helps IDE to treat this case as a partial
+                            // module use
+                            ModuleUse::Partial {
+                                colon_colon: Some(colon_colon_loc),
+                                opening_brace: Some(lbrace_loc),
+                            }
+                        } else {
+                            ModuleUse::Members(sub_uses)
+                        }
+                    }
+                    _ => match parse_use_member(context) {
+                        Ok(m) => ModuleUse::Members(vec![m]),
+                        Err(diag) => {
+                            context.add_diag(*diag);
+                            ModuleUse::Partial {
+                                colon_colon: Some(colon_colon_loc),
+                                opening_brace: None,
+                            }
+                        }
+                    },
+                }
+            }
         }
         _ => ModuleUse::Module(alias_opt.map(ModuleName)),
     };
diff --git a/external-crates/move/crates/move-compiler/src/shared/ide.rs b/external-crates/move/crates/move-compiler/src/shared/ide.rs
index 51f9738aacc6d..6816278d34ed8 100644
--- a/external-crates/move/crates/move-compiler/src/shared/ide.rs
+++ b/external-crates/move/crates/move-compiler/src/shared/ide.rs
@@ -82,9 +82,9 @@ pub struct DotAutocompleteInfo {
 #[derive(Default, Debug, Clone)]
 pub struct AliasAutocompleteInfo {
     /// Numerical addresses that are valid autocompletes
-    pub addresses: BTreeSet<(Symbol, NumericalAddress)>,
+    pub addresses: BTreeMap<Symbol, NumericalAddress>,
     /// Modules that are valid autocompletes
-    pub modules: BTreeSet<(Symbol, E::ModuleIdent)>,
+    pub modules: BTreeMap<Symbol, E::ModuleIdent>,
     /// Members that are valid autocompletes
     pub members: BTreeSet<(Symbol, E::ModuleIdent, Name)>,
     /// Type parameters that are valid autocompletes
@@ -213,8 +213,8 @@ impl
             BTreeMap<Symbol, MemberEntry>,
         ),
     ) -> Self {
-        let mut addresses: BTreeSet<(Symbol, NumericalAddress)> = BTreeSet::new();
-        let mut modules: BTreeSet<(Symbol, E::ModuleIdent)> = BTreeSet::new();
+        let mut addresses: BTreeMap<Symbol, NumericalAddress> = BTreeMap::new();
+        let mut modules: BTreeMap<Symbol, E::ModuleIdent> = BTreeMap::new();
         let mut members: BTreeSet<(Symbol, E::ModuleIdent, Name)> = BTreeSet::new();
         let mut type_params: BTreeSet<Symbol> = BTreeSet::new();
 
@@ -224,10 +224,10 @@ impl
         {
             match entry {
                 LeadingAccessEntry::Address(addr) => {
-                    addresses.insert((*symbol, *addr));
+                    addresses.insert(*symbol, *addr);
                 }
                 LeadingAccessEntry::Module(mident) => {
-                    modules.insert((*symbol, *mident));
+                    modules.insert(*symbol, *mident);
                 }
                 LeadingAccessEntry::Member(mident, name) => {
                     members.insert((*symbol, *mident, *name));
diff --git a/external-crates/move/crates/move-compiler/src/shared/matching.rs b/external-crates/move/crates/move-compiler/src/shared/matching.rs
index 7ef8e6da583d8..26ca069a61b9b 100644
--- a/external-crates/move/crates/move-compiler/src/shared/matching.rs
+++ b/external-crates/move/crates/move-compiler/src/shared/matching.rs
@@ -78,6 +78,7 @@ pub trait MatchContext<const AFTER_TYPING: bool> {
 
     fn make_imm_ref_match_binders(
         &mut self,
+        decl_fields: UniqueMap<Field, usize>,
         pattern_loc: Loc,
         arg_types: Fields<N::Type>,
     ) -> Vec<(Field, N::Var, N::Type)> {
@@ -92,7 +93,7 @@ pub trait MatchContext<const AFTER_TYPING: bool> {
             }
         }
 
-        let fields = order_fields_by_decl(None, arg_types.clone());
+        let fields = order_fields_by_decl(decl_fields, arg_types.clone());
         fields
             .into_iter()
             .map(|(_, field_name, field_type)| {
@@ -107,10 +108,11 @@ pub trait MatchContext<const AFTER_TYPING: bool> {
 
     fn make_unpack_binders(
         &mut self,
+        decl_fields: UniqueMap<Field, usize>,
         pattern_loc: Loc,
         arg_types: Fields<N::Type>,
     ) -> Vec<(Field, N::Var, N::Type)> {
-        let fields = order_fields_by_decl(None, arg_types.clone());
+        let fields = order_fields_by_decl(decl_fields, arg_types.clone());
         fields
             .into_iter()
             .map(|(_, field_name, field_type)| {
@@ -283,7 +285,8 @@ impl PatternArm {
                 let field_pats = fields.clone().map(|_key, (ndx, (_, pat))| (ndx, pat));
                 let decl_fields = context
                     .program_info()
-                    .enum_variant_fields(&mident, &enum_, &name);
+                    .enum_variant_fields(&mident, &enum_, &name)
+                    .unwrap();
                 let ordered_pats = order_fields_by_decl(decl_fields, field_pats);
                 for (_, _, pat) in ordered_pats.into_iter().rev() {
                     output.pats.push_front(pat);
@@ -341,7 +344,10 @@ impl PatternArm {
             TP::Struct(mident, struct_, _, fields)
             | TP::BorrowStruct(_, mident, struct_, _, fields) => {
                 let field_pats = fields.clone().map(|_key, (ndx, (_, pat))| (ndx, pat));
-                let decl_fields = context.program_info().struct_fields(&mident, &struct_);
+                let decl_fields = context
+                    .program_info()
+                    .struct_fields(&mident, &struct_)
+                    .unwrap();
                 let ordered_pats = order_fields_by_decl(decl_fields, field_pats);
                 for (_, _, pat) in ordered_pats.into_iter().rev() {
                     output.pats.push_front(pat);
@@ -921,22 +927,13 @@ fn combine_pattern_fields(
 
 /// Helper function for creating an ordered list of fields Field information and Fields.
 pub fn order_fields_by_decl<T: std::fmt::Debug>(
-    decl_fields: Option<UniqueMap<Field, usize>>,
+    decl_fields: UniqueMap<Field, usize>,
     fields: Fields<T>,
 ) -> Vec<(usize, Field, T)> {
-    let mut texp_fields: Vec<(usize, Field, T)> = if let Some(field_map) = decl_fields {
-        fields
-            .into_iter()
-            .map(|(f, (_exp_idx, t))| (*field_map.get(&f).unwrap(), f, t))
-            .collect()
-    } else {
-        // If no field map, compiler error in typing.
-        fields
-            .into_iter()
-            .enumerate()
-            .map(|(ndx, (f, (_exp_idx, t)))| (ndx, f, t))
-            .collect()
-    };
+    let mut texp_fields: Vec<(usize, Field, T)> = fields
+        .into_iter()
+        .map(|(f, (_exp_idx, t))| (*decl_fields.get(&f).unwrap(), f, t))
+        .collect();
     texp_fields.sort_by(|(decl_idx1, _, _), (decl_idx2, _, _)| decl_idx1.cmp(decl_idx2));
     texp_fields
 }
diff --git a/external-crates/move/crates/move-compiler/src/shared/program_info.rs b/external-crates/move/crates/move-compiler/src/shared/program_info.rs
index 250bdeeb01213..2ceadbb461cce 100644
--- a/external-crates/move/crates/move-compiler/src/shared/program_info.rs
+++ b/external-crates/move/crates/move-compiler/src/shared/program_info.rs
@@ -219,6 +219,21 @@ impl<const AFTER_TYPING: bool> ProgramInfo<AFTER_TYPING> {
             _ => panic!("ICE should have failed in naming"),
         }
     }
+
+    pub fn datatype_declared_loc(&self, m: &ModuleIdent, n: &DatatypeName) -> Loc {
+        match self.datatype_kind(m, n) {
+            DatatypeKind::Struct => self.struct_declared_loc_(m, &n.0.value),
+            DatatypeKind::Enum => self.enum_declared_loc_(m, &n.0.value),
+        }
+    }
+
+    pub fn datatype_declared_abilities(&self, m: &ModuleIdent, n: &DatatypeName) -> &AbilitySet {
+        match self.datatype_kind(m, n) {
+            DatatypeKind::Struct => self.struct_declared_abilities(m, n),
+            DatatypeKind::Enum => self.enum_declared_abilities(m, n),
+        }
+    }
+
     pub fn struct_definition(&self, m: &ModuleIdent, n: &DatatypeName) -> &StructDefinition {
         self.struct_definition_opt(m, n)
             .expect("ICE should have failed in naming")
diff --git a/external-crates/move/crates/move-compiler/src/sui_mode/linters/freezing_capability.rs b/external-crates/move/crates/move-compiler/src/sui_mode/linters/freezing_capability.rs
new file mode 100644
index 0000000000000..d5f657d6cb2ee
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/src/sui_mode/linters/freezing_capability.rs
@@ -0,0 +1,116 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+//! Implements lint to warn against freezing capability-like types in Sui, identifying function calls that may incorrectly freeze such types.
+//! The lint checks for specific freezing functions defined in constants and inspects their type arguments for capability-like type names.
+
+use super::{LinterDiagnosticCategory, LinterDiagnosticCode, LINT_WARNING_PREFIX};
+use crate::{
+    diag,
+    diagnostics::{
+        codes::{custom, DiagnosticInfo, Severity},
+        WarningFilters,
+    },
+    naming::ast::TypeName_,
+    shared::{CompilationEnv, Identifier},
+    sui_mode::linters::{FREEZE_FUN, PUBLIC_FREEZE_FUN, SUI_PKG_NAME, TRANSFER_MOD_NAME},
+    typing::{
+        ast as T, core,
+        visitor::{TypingVisitorConstructor, TypingVisitorContext},
+    },
+};
+use move_ir_types::location::*;
+use once_cell::sync::Lazy;
+use regex::Regex;
+
+const FREEZE_CAPABILITY_DIAG: DiagnosticInfo = custom(
+    LINT_WARNING_PREFIX,
+    Severity::Warning,
+    LinterDiagnosticCategory::Sui as u8,
+    LinterDiagnosticCode::FreezingCapability as u8,
+    "freezing potential capability",
+);
+
+const FREEZE_FUNCTIONS: &[(&str, &str, &str)] = &[
+    (SUI_PKG_NAME, TRANSFER_MOD_NAME, PUBLIC_FREEZE_FUN),
+    (SUI_PKG_NAME, TRANSFER_MOD_NAME, FREEZE_FUN),
+];
+
+pub struct WarnFreezeCapability;
+
+pub struct Context<'a> {
+    env: &'a mut CompilationEnv,
+}
+
+static REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r".*Cap(?:[A-Z0-9_]+|ability|$).*").unwrap());
+
+impl TypingVisitorConstructor for WarnFreezeCapability {
+    type Context<'a> = Context<'a>;
+    fn context<'a>(env: &'a mut CompilationEnv, _program: &T::Program) -> Self::Context<'a> {
+        Context { env }
+    }
+}
+
+impl<'a> TypingVisitorContext for Context<'a> {
+    fn visit_module_custom(
+        &mut self,
+        _ident: crate::expansion::ast::ModuleIdent,
+        mdef: &mut T::ModuleDefinition,
+    ) -> bool {
+        // skips if true
+        mdef.attributes.is_test_or_test_only()
+    }
+
+    fn visit_function_custom(
+        &mut self,
+        _module: crate::expansion::ast::ModuleIdent,
+        _function_name: crate::parser::ast::FunctionName,
+        fdef: &mut T::Function,
+    ) -> bool {
+        // skips if true
+        fdef.attributes.is_test_or_test_only()
+    }
+
+    fn visit_exp_custom(&mut self, exp: &mut T::Exp) -> bool {
+        if let T::UnannotatedExp_::ModuleCall(fun) = &exp.exp.value {
+            if is_freeze_function(fun) {
+                check_type_arguments(self, fun, exp.exp.loc);
+            }
+        }
+        false
+    }
+
+    fn add_warning_filter_scope(&mut self, filter: WarningFilters) {
+        self.env.add_warning_filter_scope(filter)
+    }
+
+    fn pop_warning_filter_scope(&mut self) {
+        self.env.pop_warning_filter_scope()
+    }
+}
+
+fn is_freeze_function(fun: &T::ModuleCall) -> bool {
+    FREEZE_FUNCTIONS.iter().any(|(addr, module, fname)| {
+        fun.module.value.is(*addr, *module) && &fun.name.value().as_str() == fname
+    })
+}
+
+fn check_type_arguments(context: &mut Context, fun: &T::ModuleCall, loc: Loc) {
+    for sp!(_, type_arg) in &fun.type_arguments {
+        let Some(sp!(_, TypeName_::ModuleType(_, struct_name))) = type_arg.type_name() else {
+            continue;
+        };
+        if REGEX.is_match(struct_name.value().as_str()) {
+            let msg = format!(
+                "The type {} is potentially a capability based on its name",
+                core::error_format_(type_arg, &core::Subst::empty()),
+            );
+            let mut diag = diag!(FREEZE_CAPABILITY_DIAG, (loc, msg));
+            diag.add_note(
+                "Freezing a capability might lock out critical operations \
+                or otherwise open access to operations that otherwise should be restricted",
+            );
+            context.env.add_diag(diag);
+        };
+    }
+}
diff --git a/external-crates/move/crates/move-compiler/src/sui_mode/linters/missing_key.rs b/external-crates/move/crates/move-compiler/src/sui_mode/linters/missing_key.rs
new file mode 100644
index 0000000000000..d058f11d255d8
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/src/sui_mode/linters/missing_key.rs
@@ -0,0 +1,81 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! This linter rule checks for structs with an `id` field of type `UID` without the `key` ability.
+
+use super::{LinterDiagnosticCategory, LinterDiagnosticCode, LINT_WARNING_PREFIX};
+use crate::expansion::ast::ModuleIdent;
+use crate::parser::ast::DatatypeName;
+use crate::{
+    diag,
+    diagnostics::{
+        codes::{custom, DiagnosticInfo, Severity},
+        WarningFilters,
+    },
+    naming::ast::{StructDefinition, StructFields},
+    parser::ast::Ability_,
+    shared::CompilationEnv,
+    typing::{
+        ast as T,
+        visitor::{TypingVisitorConstructor, TypingVisitorContext},
+    },
+};
+
+const MISSING_KEY_ABILITY_DIAG: DiagnosticInfo = custom(
+    LINT_WARNING_PREFIX,
+    Severity::Warning,
+    LinterDiagnosticCategory::Sui as u8,
+    LinterDiagnosticCode::MissingKey as u8,
+    "struct with id but missing key ability",
+);
+
+pub struct MissingKeyVisitor;
+
+pub struct Context<'a> {
+    env: &'a mut CompilationEnv,
+}
+impl TypingVisitorConstructor for MissingKeyVisitor {
+    type Context<'a> = Context<'a>;
+
+    fn context<'a>(env: &'a mut CompilationEnv, _program: &T::Program) -> Self::Context<'a> {
+        Context { env }
+    }
+}
+
+impl TypingVisitorContext for Context<'_> {
+    fn add_warning_filter_scope(&mut self, filter: WarningFilters) {
+        self.env.add_warning_filter_scope(filter)
+    }
+
+    fn pop_warning_filter_scope(&mut self) {
+        self.env.pop_warning_filter_scope()
+    }
+
+    fn visit_struct_custom(
+        &mut self,
+        _module: ModuleIdent,
+        _struct_name: DatatypeName,
+        sdef: &mut StructDefinition,
+    ) -> bool {
+        if first_field_has_id_field_of_type_uid(sdef) && lacks_key_ability(sdef) {
+            let uid_msg =
+                "Struct's first field has an 'id' field of type 'sui::object::UID' but is missing the 'key' ability.";
+            let diagnostic = diag!(MISSING_KEY_ABILITY_DIAG, (sdef.loc, uid_msg));
+            self.env.add_diag(diagnostic);
+        }
+        false
+    }
+}
+
+fn first_field_has_id_field_of_type_uid(sdef: &StructDefinition) -> bool {
+    match &sdef.fields {
+        StructFields::Defined(_, fields) => fields.iter().any(|(_, symbol, (idx, ty))| {
+            *idx == 0 && symbol == &symbol!("id") && ty.value.is("sui", "object", "UID")
+        }),
+        StructFields::Native(_) => false,
+    }
+}
+
+fn lacks_key_ability(sdef: &StructDefinition) -> bool {
+    !sdef.abilities.has_ability_(Ability_::Key)
+}
diff --git a/external-crates/move/crates/move-compiler/src/sui_mode/linters/mod.rs b/external-crates/move/crates/move-compiler/src/sui_mode/linters/mod.rs
index 012d78fc852fb..d8e21d6bb3167 100644
--- a/external-crates/move/crates/move-compiler/src/sui_mode/linters/mod.rs
+++ b/external-crates/move/crates/move-compiler/src/sui_mode/linters/mod.rs
@@ -18,6 +18,9 @@ pub mod coin_field;
 pub mod collection_equality;
 pub mod custom_state_change;
 pub mod freeze_wrapped;
+pub mod freezing_capability;
+pub mod missing_key;
+pub mod public_mut_tx_context;
 pub mod public_random;
 pub mod self_transfer;
 pub mod share_owned;
@@ -68,6 +71,9 @@ pub const COIN_FIELD_FILTER_NAME: &str = "coin_field";
 pub const FREEZE_WRAPPED_FILTER_NAME: &str = "freeze_wrapped";
 pub const COLLECTION_EQUALITY_FILTER_NAME: &str = "collection_equality";
 pub const PUBLIC_RANDOM_FILTER_NAME: &str = "public_random";
+pub const MISSING_KEY_FILTER_NAME: &str = "missing_key";
+pub const FREEZING_CAPABILITY_FILTER_NAME: &str = "freezing_capability";
+pub const PREFER_MUTABLE_TX_CONTEXT_FILTER_NAME: &str = "prefer_mut_tx_context";
 
 pub const RANDOM_MOD_NAME: &str = "random";
 pub const RANDOM_STRUCT_NAME: &str = "Random";
@@ -84,6 +90,9 @@ pub enum LinterDiagnosticCode {
     FreezeWrapped,
     CollectionEquality,
     PublicRandom,
+    MissingKey,
+    FreezingCapability,
+    PreferMutableTxContext,
 }
 
 pub fn known_filters() -> (Option<Symbol>, Vec<WarningFilter>) {
@@ -131,23 +140,49 @@ pub fn known_filters() -> (Option<Symbol>, Vec<WarningFilter>) {
             LinterDiagnosticCode::PublicRandom as u8,
             Some(PUBLIC_RANDOM_FILTER_NAME),
         ),
+        WarningFilter::code(
+            Some(LINT_WARNING_PREFIX),
+            LinterDiagnosticCategory::Sui as u8,
+            LinterDiagnosticCode::MissingKey as u8,
+            Some(MISSING_KEY_FILTER_NAME),
+        ),
+        WarningFilter::code(
+            Some(LINT_WARNING_PREFIX),
+            LinterDiagnosticCategory::Sui as u8,
+            LinterDiagnosticCode::FreezingCapability as u8,
+            Some(FREEZING_CAPABILITY_FILTER_NAME),
+        ),
+        WarningFilter::code(
+            Some(LINT_WARNING_PREFIX),
+            LinterDiagnosticCategory::Sui as u8,
+            LinterDiagnosticCode::PreferMutableTxContext as u8,
+            Some(PREFER_MUTABLE_TX_CONTEXT_FILTER_NAME),
+        ),
     ];
+
     (Some(ALLOW_ATTR_CATEGORY.into()), filters)
 }
 
 pub fn linter_visitors(level: LintLevel) -> Vec<Visitor> {
     match level {
         LintLevel::None => vec![],
-        LintLevel::Default | LintLevel::All => {
-            vec![
-                share_owned::ShareOwnedVerifier.visitor(),
-                self_transfer::SelfTransferVerifier.visitor(),
-                custom_state_change::CustomStateChangeVerifier.visitor(),
-                coin_field::CoinFieldVisitor.visitor(),
-                freeze_wrapped::FreezeWrappedVisitor.visitor(),
-                collection_equality::CollectionEqualityVisitor.visitor(),
-                public_random::PublicRandomVisitor.visitor(),
-            ]
+        LintLevel::Default => vec![
+            share_owned::ShareOwnedVerifier.visitor(),
+            self_transfer::SelfTransferVerifier.visitor(),
+            custom_state_change::CustomStateChangeVerifier.visitor(),
+            coin_field::CoinFieldVisitor.visitor(),
+            freeze_wrapped::FreezeWrappedVisitor.visitor(),
+            collection_equality::CollectionEqualityVisitor.visitor(),
+            public_random::PublicRandomVisitor.visitor(),
+            missing_key::MissingKeyVisitor.visitor(),
+        ],
+        LintLevel::All => {
+            let mut visitors = linter_visitors(LintLevel::Default);
+            visitors.extend([
+                freezing_capability::WarnFreezeCapability.visitor(),
+                public_mut_tx_context::PreferMutableTxContext.visitor(),
+            ]);
+            visitors
         }
     }
 }
diff --git a/external-crates/move/crates/move-compiler/src/sui_mode/linters/public_mut_tx_context.rs b/external-crates/move/crates/move-compiler/src/sui_mode/linters/public_mut_tx_context.rs
new file mode 100644
index 0000000000000..c664fa1aa3fb0
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/src/sui_mode/linters/public_mut_tx_context.rs
@@ -0,0 +1,97 @@
+// Copyright (c) The Move Contributors
+// SPDX-License-Identifier: Apache-2.0
+
+//! Enforces that public functions use `&mut TxContext` instead of `&TxContext` to ensure upgradability.
+//! Detects and reports instances where a non-mutable reference to `TxContext` is used in public function signatures.
+//! Promotes best practices for future-proofing smart contract code by allowing mutation of the transaction context.
+use super::{LinterDiagnosticCategory, LinterDiagnosticCode, LINT_WARNING_PREFIX};
+
+use crate::{
+    diag,
+    diagnostics::{
+        codes::{custom, DiagnosticInfo, Severity},
+        WarningFilters,
+    },
+    expansion::ast::{ModuleIdent, Visibility},
+    naming::ast::Type_,
+    parser::ast::FunctionName,
+    shared::CompilationEnv,
+    sui_mode::{SUI_ADDR_NAME, TX_CONTEXT_MODULE_NAME, TX_CONTEXT_TYPE_NAME},
+    typing::{
+        ast as T,
+        visitor::{TypingVisitorConstructor, TypingVisitorContext},
+    },
+};
+use move_ir_types::location::Loc;
+
+const REQUIRE_MUTABLE_TX_CONTEXT_DIAG: DiagnosticInfo = custom(
+    LINT_WARNING_PREFIX,
+    Severity::Warning,
+    LinterDiagnosticCategory::Sui as u8,
+    LinterDiagnosticCode::PreferMutableTxContext as u8,
+    "prefer '&mut TxContext' over '&TxContext'",
+);
+
+pub struct PreferMutableTxContext;
+
+pub struct Context<'a> {
+    env: &'a mut CompilationEnv,
+}
+
+impl TypingVisitorConstructor for PreferMutableTxContext {
+    type Context<'a> = Context<'a>;
+
+    fn context<'a>(env: &'a mut CompilationEnv, _program: &T::Program) -> Self::Context<'a> {
+        Context { env }
+    }
+}
+
+impl TypingVisitorContext for Context<'_> {
+    fn add_warning_filter_scope(&mut self, filter: WarningFilters) {
+        self.env.add_warning_filter_scope(filter)
+    }
+    fn pop_warning_filter_scope(&mut self) {
+        self.env.pop_warning_filter_scope()
+    }
+
+    fn visit_module_custom(&mut self, ident: ModuleIdent, _mdef: &mut T::ModuleDefinition) -> bool {
+        // skip if in 'sui::tx_context'
+        ident.value.is(SUI_ADDR_NAME, TX_CONTEXT_MODULE_NAME)
+    }
+
+    fn visit_function_custom(
+        &mut self,
+        _module: ModuleIdent,
+        _function_name: FunctionName,
+        fdef: &mut T::Function,
+    ) -> bool {
+        if !matches!(&fdef.visibility, Visibility::Public(_)) {
+            return false;
+        }
+
+        for (_, _, sp!(loc, param_ty_)) in &fdef.signature.parameters {
+            if matches!(
+                param_ty_,
+                Type_::Ref(false, t) if t.value.is(SUI_ADDR_NAME, TX_CONTEXT_MODULE_NAME, TX_CONTEXT_TYPE_NAME),
+            ) {
+                report_non_mutable_tx_context(self.env, *loc);
+            }
+        }
+
+        false
+    }
+}
+
+fn report_non_mutable_tx_context(env: &mut CompilationEnv, loc: Loc) {
+    let msg = format!(
+        "'public' functions should prefer '&mut {0}' over '&{0}' for better upgradability.",
+        TX_CONTEXT_TYPE_NAME
+    );
+    let mut diag = diag!(REQUIRE_MUTABLE_TX_CONTEXT_DIAG, (loc, msg));
+    diag.add_note(
+        "When upgrading, the public function cannot be modified to take '&mut TxContext' instead \
+         of '&TxContext'. As such, it is recommended to consider using '&mut TxContext' to \
+         future-proof the function.",
+    );
+    env.add_diag(diag);
+}
diff --git a/external-crates/move/crates/move-compiler/src/sui_mode/typing.rs b/external-crates/move/crates/move-compiler/src/sui_mode/typing.rs
index 31238adb5258d..aba3fc400fe56 100644
--- a/external-crates/move/crates/move-compiler/src/sui_mode/typing.rs
+++ b/external-crates/move/crates/move-compiler/src/sui_mode/typing.rs
@@ -868,8 +868,8 @@ fn entry_return(
                 let (declared_loc_opt, declared_abilities) = match tn_ {
                     TypeName_::Multiple(_) => (None, AbilitySet::collection(*tloc)),
                     TypeName_::ModuleType(m, n) => (
-                        Some(context.info.struct_declared_loc(m, n)),
-                        context.info.struct_declared_abilities(m, n).clone(),
+                        Some(context.info.datatype_declared_loc(m, n)),
+                        context.info.datatype_declared_abilities(m, n).clone(),
                     ),
                     TypeName_::Builtin(b) => (None, b.value.declared_abilities(b.loc)),
                 };
@@ -1064,7 +1064,7 @@ fn check_private_transfer(context: &mut Context, loc: Loc, mcall: &ModuleCall) {
             let store_loc = if let Some((first_ty_module, first_ty_name)) = &first_ty_tn {
                 let abilities = context
                     .info
-                    .struct_declared_abilities(first_ty_module, first_ty_name);
+                    .datatype_declared_abilities(first_ty_module, first_ty_name);
                 abilities.ability_loc_(Ability_::Store).unwrap()
             } else {
                 first_ty
diff --git a/external-crates/move/crates/move-compiler/src/to_bytecode/canonicalize_handles.rs b/external-crates/move/crates/move-compiler/src/to_bytecode/canonicalize_handles.rs
index 36d4a2544ef4b..5f816dd627ab4 100644
--- a/external-crates/move/crates/move-compiler/src/to_bytecode/canonicalize_handles.rs
+++ b/external-crates/move/crates/move-compiler/src/to_bytecode/canonicalize_handles.rs
@@ -31,7 +31,7 @@ use move_symbol_pool::Symbol;
 ///
 /// - Friend Declarations are sorted in lexical order (by address name and module name), followed by
 ///   unnamed addresses in their original order.
-
+///
 /// Key for ordering module handles, distinguishing the module's self handle, handles with names,
 /// and handles without names.
 #[derive(Eq, PartialEq, Ord, PartialOrd)]
@@ -336,7 +336,7 @@ fn remap_code(code: &mut CodeUnit, functions: &[TableIndex]) {
 ///
 /// is sorted according to `key`.
 fn permutation<'p, T, K: Ord>(
-    pool: &'p Vec<T>,
+    pool: &'p [T],
     key: impl Fn(TableIndex, &'p T) -> K + 'p,
 ) -> Vec<TableIndex> {
     let mut inverse: Vec<_> = (0..pool.len() as TableIndex).collect();
@@ -352,7 +352,7 @@ fn permutation<'p, T, K: Ord>(
 
 /// Re-order `pool` according to the `permutation` array.  `permutation[i]` is the new location of
 /// `pool[i]`.
-fn apply_permutation<T>(pool: &mut Vec<T>, mut permutation: Vec<TableIndex>) {
+fn apply_permutation<T>(pool: &mut [T], mut permutation: Vec<TableIndex>) {
     assert_eq!(pool.len(), permutation.len());
 
     // At every iteration we confirm that one more value is in its final position in the pool,
diff --git a/external-crates/move/crates/move-compiler/src/typing/deprecation_warnings.rs b/external-crates/move/crates/move-compiler/src/typing/deprecation_warnings.rs
index dc6c387a99cd9..9ba6765d66dc3 100644
--- a/external-crates/move/crates/move-compiler/src/typing/deprecation_warnings.rs
+++ b/external-crates/move/crates/move-compiler/src/typing/deprecation_warnings.rs
@@ -19,6 +19,7 @@ const NOTE_STR: &str = "note";
 #[derive(Debug, Clone)]
 pub struct Deprecation {
     // The source location of the deprecation attribute
+    #[allow(unused)]
     pub source_location: Loc,
     // The type of the member that is deprecated (function, constant, etc.)
     pub location: AttributePosition,
diff --git a/external-crates/move/crates/move-compiler/src/typing/expand.rs b/external-crates/move/crates/move-compiler/src/typing/expand.rs
index 2fd127861672a..9f36764277e55 100644
--- a/external-crates/move/crates/move-compiler/src/typing/expand.rs
+++ b/external-crates/move/crates/move-compiler/src/typing/expand.rs
@@ -318,11 +318,11 @@ fn inferred_numerical_value(
         Some(sp!(_, bt)) if bt.is_numeric() => bt,
         _ => panic!("ICE inferred num failed {:?}", &ty.value),
     };
-    let u8_max = U256::from(std::u8::MAX);
-    let u16_max = U256::from(std::u16::MAX);
-    let u32_max = U256::from(std::u32::MAX);
-    let u64_max = U256::from(std::u64::MAX);
-    let u128_max = U256::from(std::u128::MAX);
+    let u8_max = U256::from(u8::MAX);
+    let u16_max = U256::from(u16::MAX);
+    let u32_max = U256::from(u32::MAX);
+    let u64_max = U256::from(u64::MAX);
+    let u128_max = U256::from(u128::MAX);
     let u256_max = U256::max_value();
     let max = match bt {
         BT::U8 => u8_max,
diff --git a/external-crates/move/crates/move-compiler/src/typing/match_analysis.rs b/external-crates/move/crates/move-compiler/src/typing/match_analysis.rs
index 55dbda9a44d3e..2e6b0dde0696c 100644
--- a/external-crates/move/crates/move-compiler/src/typing/match_analysis.rs
+++ b/external-crates/move/crates/move-compiler/src/typing/match_analysis.rs
@@ -373,7 +373,12 @@ fn find_counterexample_impl(
             // recur. If we don't, we check it as a default specialization.
             if let Some((ploc, arg_types)) = matrix.first_struct_ctors() {
                 let ctor_arity = arg_types.len() as u32;
-                let fringe_binders = context.make_imm_ref_match_binders(ploc, arg_types);
+                let decl_fields = context
+                    .modules
+                    .struct_fields(&mident, &datatype_name)
+                    .unwrap();
+                let fringe_binders =
+                    context.make_imm_ref_match_binders(decl_fields, ploc, arg_types);
                 let is_positional = context
                     .modules
                     .struct_is_positional(&mident, &datatype_name);
@@ -433,7 +438,12 @@ fn find_counterexample_impl(
             if unmatched_variants.is_empty() {
                 for (ctor, (ploc, arg_types)) in ctors {
                     let ctor_arity = arg_types.len() as u32;
-                    let fringe_binders = context.make_imm_ref_match_binders(ploc, arg_types);
+                    let decl_fields = context
+                        .modules
+                        .enum_variant_fields(&mident, &datatype_name, &ctor)
+                        .unwrap();
+                    let fringe_binders =
+                        context.make_imm_ref_match_binders(decl_fields, ploc, arg_types);
                     let is_positional =
                         context
                             .modules
diff --git a/external-crates/move/crates/move-compiler/src/typing/visitor.rs b/external-crates/move/crates/move-compiler/src/typing/visitor.rs
index 1e9a51a0f5e02..8af7b81038e59 100644
--- a/external-crates/move/crates/move-compiler/src/typing/visitor.rs
+++ b/external-crates/move/crates/move-compiler/src/typing/visitor.rs
@@ -84,13 +84,11 @@ pub trait TypingVisitorContext {
             self.pop_warning_filter_scope();
             return;
         }
-        if Self::VISIT_TYPES {
-            for (struct_name, sdef) in mdef.structs.key_cloned_iter_mut() {
-                self.visit_struct(ident, struct_name, sdef)
-            }
-            for (enum_name, edef) in mdef.enums.key_cloned_iter_mut() {
-                self.visit_enum(ident, enum_name, edef)
-            }
+        for (struct_name, sdef) in mdef.structs.key_cloned_iter_mut() {
+            self.visit_struct(ident, struct_name, sdef)
+        }
+        for (enum_name, edef) in mdef.enums.key_cloned_iter_mut() {
+            self.visit_enum(ident, enum_name, edef)
         }
         for (constant_name, cdef) in mdef.constants.key_cloned_iter_mut() {
             self.visit_constant(ident, constant_name, cdef)
diff --git a/external-crates/move/crates/move-compiler/src/unit_test/plan_builder.rs b/external-crates/move/crates/move-compiler/src/unit_test/plan_builder.rs
index 066cd6f982799..7aab1a163d71d 100644
--- a/external-crates/move/crates/move-compiler/src/unit_test/plan_builder.rs
+++ b/external-crates/move/crates/move-compiler/src/unit_test/plan_builder.rs
@@ -713,7 +713,7 @@ fn convert_attribute_value_u64(
 ) -> Option<(Loc, u64)> {
     use E::{AttributeValue_ as EAV, Value_ as EV};
     match value {
-        sp!(vloc, EAV::Value(sp!(_, EV::InferredNum(u)))) if *u <= U256::from(std::u64::MAX) => {
+        sp!(vloc, EAV::Value(sp!(_, EV::InferredNum(u)))) if *u <= U256::from(u64::MAX) => {
             Some((*vloc, u.down_cast_lossy()))
         }
         sp!(vloc, EAV::Value(sp!(_, EV::U64(u)))) => Some((*vloc, *u)),
diff --git a/external-crates/move/crates/move-compiler/tests/linter/false_negative_unnecessary_while_loop.move b/external-crates/move/crates/move-compiler/tests/linter/false_negative_unnecessary_while_loop.move
new file mode 100644
index 0000000000000..0f06f05bc8e51
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/linter/false_negative_unnecessary_while_loop.move
@@ -0,0 +1,11 @@
+module 0x42::loop_test {
+
+    // These should trigger but currently dont
+    public fun false_negative_obfuscated_true() {
+        let always_true = true;
+        while (always_true) {};
+        while (true && true) {};
+        while (true || false) {};
+        while (1 > 0) {};
+    }
+}
diff --git a/external-crates/move/crates/move-compiler/tests/linter/suppress_unnecessary_while_loop.move b/external-crates/move/crates/move-compiler/tests/linter/suppress_unnecessary_while_loop.move
new file mode 100644
index 0000000000000..1477d966a74c3
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/linter/suppress_unnecessary_while_loop.move
@@ -0,0 +1,7 @@
+module 0x42::loop_test {
+
+    #[allow(lint(while_true))]
+    public fun suppressed_while_true() {
+        while (true) {};
+    }
+}
diff --git a/external-crates/move/crates/move-compiler/tests/linter/true_negative_unnecessary_while_loop.move b/external-crates/move/crates/move-compiler/tests/linter/true_negative_unnecessary_while_loop.move
new file mode 100644
index 0000000000000..d5ad1e0cfb6f6
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/linter/true_negative_unnecessary_while_loop.move
@@ -0,0 +1,11 @@
+module 0x42::loop_test {
+
+    public fun true_negative_while_with_condition() {
+        let b = false;
+        while (false) {};
+        while (b) {};
+        while (false && true) {};
+        while (false || false) {};
+        while (0 > 1) {};
+    }
+}
diff --git a/external-crates/move/crates/move-compiler/tests/linter/true_positive_unnecessary_while_loop.exp b/external-crates/move/crates/move-compiler/tests/linter/true_positive_unnecessary_while_loop.exp
new file mode 100644
index 0000000000000..2ba9789c925b3
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/linter/true_positive_unnecessary_while_loop.exp
@@ -0,0 +1,18 @@
+warning[Lint W01004]: unnecessary 'while (true)', replace with 'loop'
+  ┌─ tests/linter/true_positive_unnecessary_while_loop.move:3:9
+  │
+3 │         while (true) {};
+  │         ^^^^^^^^^^^^^^^ 'while (true)' can be always replaced with 'loop'
+  │
+  = A 'loop' is more useful in these cases. Unlike 'while', 'loop' can have a 'break' with a value, e.g. 'let x = loop { break 42 };'
+  = This warning can be suppressed with '#[allow(lint(while_true))]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[Lint W01004]: unnecessary 'while (true)', replace with 'loop'
+  ┌─ tests/linter/true_positive_unnecessary_while_loop.move:4:9
+  │
+4 │         while (true) { break }
+  │         ^^^^^^^^^^^^^^^^^^^^^^ 'while (true)' can be always replaced with 'loop'
+  │
+  = A 'loop' is more useful in these cases. Unlike 'while', 'loop' can have a 'break' with a value, e.g. 'let x = loop { break 42 };'
+  = This warning can be suppressed with '#[allow(lint(while_true))]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/external-crates/move/crates/move-compiler/tests/linter/true_positive_unnecessary_while_loop.move b/external-crates/move/crates/move-compiler/tests/linter/true_positive_unnecessary_while_loop.move
new file mode 100644
index 0000000000000..eaf03b83ba5e8
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/linter/true_positive_unnecessary_while_loop.move
@@ -0,0 +1,6 @@
+module 0x42::loop_test {
+    public fun true_positive_infinite_loop() {
+        while (true) {};
+        while (true) { break }
+    }
+}
diff --git a/external-crates/move/crates/move-compiler/tests/move_2024/ide_mode/use_incomplete.exp b/external-crates/move/crates/move-compiler/tests/move_2024/ide_mode/use_incomplete.exp
new file mode 100644
index 0000000000000..0e34cb2cfccff
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/move_2024/ide_mode/use_incomplete.exp
@@ -0,0 +1,77 @@
+error[E01002]: unexpected token
+  ┌─ tests/move_2024/ide_mode/use_incomplete.move:5:9
+  │
+5 │         let _tmp = 42; // reset parser to see if the next line compiles
+  │         ^^^
+  │         │
+  │         Unexpected 'let'
+  │         Expected an identifier
+
+error[E01002]: unexpected token
+   ┌─ tests/move_2024/ide_mode/use_incomplete.move:11:9
+   │
+11 │         let _tmp = 42; // reset parser to see if the next line compiles
+   │         ^^^
+   │         │
+   │         Unexpected 'let'
+   │         Expected ',' or '}'
+
+error[E01002]: unexpected token
+   ┌─ tests/move_2024/ide_mode/use_incomplete.move:11:22
+   │
+10 │         use a::m2::{foo
+   │                    - To match this '{'
+11 │         let _tmp = 42; // reset parser to see if the next line compiles
+   │                      ^ Expected '}'
+
+error[E01002]: unexpected token
+   ┌─ tests/move_2024/ide_mode/use_incomplete.move:17:9
+   │
+17 │         let _tmp = 42; // reset parser to see if the next lines compile
+   │         ^^^
+   │         │
+   │         Unexpected 'let'
+   │         Expected ',' or '}'
+
+error[E01002]: unexpected token
+   ┌─ tests/move_2024/ide_mode/use_incomplete.move:17:22
+   │
+16 │         use a::m2::{foo, bar
+   │                    - To match this '{'
+17 │         let _tmp = 42; // reset parser to see if the next lines compile
+   │                      ^ Expected '}'
+
+error[E01002]: unexpected token
+   ┌─ tests/move_2024/ide_mode/use_incomplete.move:24:9
+   │
+24 │         let _tmp = 42; // reset parser to see if the next lines compile
+   │         ^^^
+   │         │
+   │         Unexpected 'let'
+   │         Expected ',' or '}'
+
+error[E01002]: unexpected token
+   ┌─ tests/move_2024/ide_mode/use_incomplete.move:24:22
+   │
+23 │         use a::{m2::{foo, bar
+   │                     - To match this '{'
+24 │         let _tmp = 42; // reset parser to see if the next lines compile
+   │                      ^ Expected '}'
+
+error[E01002]: unexpected token
+   ┌─ tests/move_2024/ide_mode/use_incomplete.move:32:9
+   │
+32 │         let _tmp = 42; // reset parser to see if the next lines compile
+   │         ^^^
+   │         │
+   │         Unexpected 'let'
+   │         Expected ',' or '}'
+
+error[E01002]: unexpected token
+   ┌─ tests/move_2024/ide_mode/use_incomplete.move:32:22
+   │
+31 │         use a::{m2::{foo, bar}, m3
+   │                - To match this '{'
+32 │         let _tmp = 42; // reset parser to see if the next lines compile
+   │                      ^ Expected '}'
+
diff --git a/external-crates/move/crates/move-compiler/tests/move_2024/ide_mode/use_incomplete.move b/external-crates/move/crates/move-compiler/tests/move_2024/ide_mode/use_incomplete.move
new file mode 100644
index 0000000000000..e0c8e30aafe0d
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/move_2024/ide_mode/use_incomplete.move
@@ -0,0 +1,49 @@
+module a::m {
+
+    public fun test1() {
+        use a::m2::
+        let _tmp = 42; // reset parser to see if the next line compiles
+        m2::foo();
+    }
+
+    public fun test2() {
+        use a::m2::{foo
+        let _tmp = 42; // reset parser to see if the next line compiles
+        foo();
+    }
+
+    public fun test3() {
+        use a::m2::{foo, bar
+        let _tmp = 42; // reset parser to see if the next lines compile
+        foo();
+        bar();
+    }
+
+    public fun test4() {
+        use a::{m2::{foo, bar
+        let _tmp = 42; // reset parser to see if the next lines compile
+        foo();
+        bar();
+
+    }
+
+    public fun test5() {
+        use a::{m2::{foo, bar}, m3
+        let _tmp = 42; // reset parser to see if the next lines compile
+        m3::baz();
+        foo();
+        bar();
+    }
+}
+
+module a::m2 {
+
+    public fun foo() {}
+
+    public fun bar() {}
+}
+
+module a::m3 {
+
+    public fun baz() {}
+}
diff --git a/external-crates/move/crates/move-compiler/tests/move_2024/matching/field_order_counterexample.exp b/external-crates/move/crates/move-compiler/tests/move_2024/matching/field_order_counterexample.exp
new file mode 100644
index 0000000000000..a8fb54edd0fc8
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/move_2024/matching/field_order_counterexample.exp
@@ -0,0 +1,8 @@
+error[E04036]: non-exhaustive pattern
+  ┌─ tests/move_2024/matching/field_order_counterexample.move:8:12
+  │
+8 │     match (e) {
+  │            ^ Pattern 'E::V { zero: _0, one: _ }' not covered
+  │
+  = When '_0' is not 0
+
diff --git a/external-crates/move/crates/move-compiler/tests/move_2024/matching/field_order_counterexample.move b/external-crates/move/crates/move-compiler/tests/move_2024/matching/field_order_counterexample.move
new file mode 100644
index 0000000000000..eccb5f946e26f
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/move_2024/matching/field_order_counterexample.move
@@ -0,0 +1,11 @@
+module a::m;
+
+public enum E {
+    V { zero: u64, one: u64 }
+}
+
+public fun bad(e: &E) {
+    match (e) {
+        E::V { one: _, zero: 0 } => (),
+    }
+}
diff --git a/external-crates/move/crates/move-compiler/tests/move_2024/matching/match_break_parse.move b/external-crates/move/crates/move-compiler/tests/move_2024/matching/match_break_parse.move
new file mode 100644
index 0000000000000..40a4da6fa3a35
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/move_2024/matching/match_break_parse.move
@@ -0,0 +1,7 @@
+module a::m;
+
+public fun t(): u64 {
+    loop {
+        break match (0u64) { 0 => 0, _ => 0 }
+    }
+}
diff --git a/external-crates/move/crates/move-compiler/tests/move_2024/matching/match_return_parse.move b/external-crates/move/crates/move-compiler/tests/move_2024/matching/match_return_parse.move
new file mode 100644
index 0000000000000..8552c1dbd2243
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/move_2024/matching/match_return_parse.move
@@ -0,0 +1,5 @@
+module a::m;
+
+public fun t(): u64 {
+    return match (0u64) { 0 => 0, _ => 0 }
+}
diff --git a/external-crates/move/crates/move-compiler/tests/move_2024/matching/stloc_error.move b/external-crates/move/crates/move-compiler/tests/move_2024/matching/stloc_error.move
new file mode 100644
index 0000000000000..3119c3442764c
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/move_2024/matching/stloc_error.move
@@ -0,0 +1,30 @@
+module a::m;
+
+public enum Proposal has store, copy, drop {
+        ConfigProposalQuorum {approved: vector<u16>, rejected: vector<u16>},
+        MpcTxProposalQuorum {approved: vector<u16>, rejected: vector<u16>},
+        MpcTxProposalSpecific { require_approval_users: vector<u16>, threshold: u16, approved: vector<u16>, rejected: vector<u16> },
+}
+
+public struct Users {}
+
+public fun quorum_approves(_users: &Users, _approved: &vector<u16>): bool { false }
+
+public(package) fun is_proposal_approved(proposal: &Proposal, users: &Users): bool {
+    match (proposal) {
+        Proposal::ConfigProposalQuorum { approved: approved, rejected: _ } => {
+            users.quorum_approves(approved)
+        },
+        Proposal::MpcTxProposalQuorum { approved:approved, rejected: _ } => {
+            users.quorum_approves(approved)
+        },
+        Proposal::MpcTxProposalSpecific {
+            require_approval_users : _,
+            threshold: threshold,
+            approved: approved,
+            rejected: _
+        } => {
+            ((approved.length() as u16) >= *threshold)
+        }
+    }
+}
diff --git a/external-crates/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_close_brace.exp b/external-crates/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_close_brace.exp
index 2c8419ace14a8..a3c5d6ba63037 100644
--- a/external-crates/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_close_brace.exp
+++ b/external-crates/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_close_brace.exp
@@ -1,16 +1,16 @@
 error[E01002]: unexpected token
   ┌─ tests/move_check/parser/use_module_member_invalid_missing_close_brace.move:6:5
   │
-4 │     use 0x1::X::{S as XS
-  │                 - To match this '{'
+4 │     use 0x42::M::{S as XS
+  │                  - To match this '{'
 5 │ 
-6 │     fun foo() {
+6 │     fun foo() {}
   │     ^ Expected '}'
 
 error[E01002]: unexpected token
   ┌─ tests/move_check/parser/use_module_member_invalid_missing_close_brace.move:6:5
   │
-6 │     fun foo() {
+6 │     fun foo() {}
   │     ^^^
   │     │
   │     Unexpected 'fun'
diff --git a/external-crates/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_close_brace.move b/external-crates/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_close_brace.move
index ed776d516fbd6..022ba96b63c1f 100644
--- a/external-crates/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_close_brace.move
+++ b/external-crates/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_close_brace.move
@@ -1,9 +1,11 @@
 
 module 0x42::M {
 
-    use 0x1::X::{S as XS
+    use 0x42::M::{S as XS
 
-    fun foo() {
+    fun foo() {}
 
-    }
+    struct S has drop {}
+
+    fun bar(_p: XS) {}
 }
diff --git a/external-crates/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_semicolon.exp b/external-crates/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_semicolon.exp
index b7adf60971e58..7cfa235226b66 100644
--- a/external-crates/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_semicolon.exp
+++ b/external-crates/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_semicolon.exp
@@ -1,9 +1,9 @@
 error[E01002]: unexpected token
-  ┌─ tests/move_check/parser/use_module_member_invalid_missing_semicolon.move:5:1
+  ┌─ tests/move_check/parser/use_module_member_invalid_missing_semicolon.move:6:5
   │
-5 │ }
-  │ ^
-  │ │
-  │ Unexpected '}'
-  │ Expected ';'
+6 │     fun foo() {}
+  │     ^^^
+  │     │
+  │     Unexpected 'fun'
+  │     Expected ';'
 
diff --git a/external-crates/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_semicolon.move b/external-crates/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_semicolon.move
index 645abec93ca36..c1280790461fe 100644
--- a/external-crates/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_semicolon.move
+++ b/external-crates/move/crates/move-compiler/tests/move_check/parser/use_module_member_invalid_missing_semicolon.move
@@ -1,5 +1,11 @@
 
 module 0x42::M {
 
-    use 0x1::X::{S as XS,}
+    use 0x42::M::{S as XS,}
+
+    fun foo() {}
+
+    struct S has drop {}
+
+    fun bar(_p: XS) {}
 }
diff --git a/external-crates/move/crates/move-compiler/tests/sui_mode/linter/custom_state_change.move b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/custom_state_change.move
index 37edbb43fc4a7..ff6151946908a 100644
--- a/external-crates/move/crates/move-compiler/tests/sui_mode/linter/custom_state_change.move
+++ b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/custom_state_change.move
@@ -11,7 +11,7 @@ module a::test {
         id: UID
     }
 
-    #[allow(lint(self_transfer))]
+    #[allow(lint(self_transfer, prefer_mut_tx_context))]
     public fun custom_transfer_bad(o: S1, ctx: &TxContext) {
         transfer::transfer(o, tx_context::sender(ctx))
     }
diff --git a/external-crates/move/crates/move-compiler/tests/sui_mode/linter/edge_case_lint_missing_key.move b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/edge_case_lint_missing_key.move
new file mode 100644
index 0000000000000..270976888885f
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/edge_case_lint_missing_key.move
@@ -0,0 +1,24 @@
+module a::edge_cases {
+    struct UID {}
+    // Test case with a different UID type
+    struct DifferentUID {
+        id: sui::another::UID,
+    }
+
+    struct NotAnObject {
+        id: UID,
+    }
+
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
+
+module sui::another {
+    struct UID has store {
+        id: address,
+    }
+}
diff --git a/external-crates/move/crates/move-compiler/tests/sui_mode/linter/false_negative_lint_missing_key.exp b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/false_negative_lint_missing_key.exp
new file mode 100644
index 0000000000000..6162ba8ff27d4
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/false_negative_lint_missing_key.exp
@@ -0,0 +1,10 @@
+warning[Lint W99007]: struct with id but missing key ability
+   ┌─ tests/sui_mode/linter/false_negative_lint_missing_key.move:22:5
+   │  
+22 │ ╭     struct Wrapper {
+23 │ │         id: UID,
+24 │ │     }
+   │ ╰─────^ Struct's first field has an 'id' field of type 'sui::object::UID' but is missing the 'key' ability.
+   │  
+   = This warning can be suppressed with '#[allow(lint(missing_key))]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/external-crates/move/crates/move-compiler/tests/sui_mode/linter/false_negative_lint_missing_key.move b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/false_negative_lint_missing_key.move
new file mode 100644
index 0000000000000..667c9f88872ca
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/false_negative_lint_missing_key.move
@@ -0,0 +1,31 @@
+module a::trigger_lint_cases {
+    use sui::object::UID;
+
+    // False negative cases (should trigger warning but might not):
+
+    // 1. Different field name
+    struct FN1_MissingKeyWithDifferentFieldName {
+        uid: UID,
+    }
+
+    // 2. UID field not first
+    struct FN2_MissingKeyUIDNotFirst {
+        point: u64,
+        id: UID,
+    }
+
+    // 3. Nested UID
+    struct FN3_MissingKeyNestedUID {
+        wrapper: Wrapper,
+    }
+
+    struct Wrapper {
+        id: UID,
+    }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
diff --git a/external-crates/move/crates/move-compiler/tests/sui_mode/linter/freezing_capability_false_negatives.move b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/freezing_capability_false_negatives.move
new file mode 100644
index 0000000000000..2f7f69ec9fe5c
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/freezing_capability_false_negatives.move
@@ -0,0 +1,51 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+module a::test_false_negatives {
+    use sui::object::UID;
+    use sui::transfer;
+
+    struct AdminRights has key {
+       id: UID
+    }
+
+    struct PrivilegeToken has key {
+       id: UID
+    }
+
+    struct AccessControl has key {
+       id: UID
+    }
+
+    struct Capv0 has key {
+        id: UID
+    }
+
+    public fun freeze_admin_rights(w: AdminRights) {
+        transfer::public_freeze_object(w);
+    }
+
+    public fun freeze_privilege_token(w: PrivilegeToken) {
+        transfer::public_freeze_object(w);
+    }
+
+    public fun freeze_access_control(w: AccessControl) {
+        transfer::public_freeze_object(w);
+    }
+
+    public fun freeze_cap_v(w: Capv0) {
+        transfer::public_freeze_object(w);
+    }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
+
+module sui::transfer {
+    public fun public_freeze_object<T: key>(_: T) {
+        abort 0
+    }
+}
diff --git a/external-crates/move/crates/move-compiler/tests/sui_mode/linter/freezing_capability_false_positives.exp b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/freezing_capability_false_positives.exp
new file mode 100644
index 0000000000000..fad2409846d1c
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/freezing_capability_false_positives.exp
@@ -0,0 +1,18 @@
+warning[Lint W99008]: freezing potential capability
+   ┌─ tests/sui_mode/linter/freezing_capability_false_positives.move:25:9
+   │
+25 │         transfer::public_freeze_object(w);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The type 'a::test_false_positives::NoCap' is potentially a capability based on its name
+   │
+   = Freezing a capability might lock out critical operations or otherwise open access to operations that otherwise should be restricted
+   = This warning can be suppressed with '#[allow(lint(freezing_capability))]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[Lint W99008]: freezing potential capability
+   ┌─ tests/sui_mode/linter/freezing_capability_false_positives.move:29:9
+   │
+29 │         transfer::public_freeze_object(w);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The type 'a::test_false_positives::CapAndHat' is potentially a capability based on its name
+   │
+   = Freezing a capability might lock out critical operations or otherwise open access to operations that otherwise should be restricted
+   = This warning can be suppressed with '#[allow(lint(freezing_capability))]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/external-crates/move/crates/move-compiler/tests/sui_mode/linter/freezing_capability_false_positives.move b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/freezing_capability_false_positives.move
new file mode 100644
index 0000000000000..c96c031482168
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/freezing_capability_false_positives.move
@@ -0,0 +1,51 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+module a::test_false_positives {
+    use sui::object::UID;
+    use sui::transfer;
+
+    struct NoCap has key {
+       id: UID
+    }
+
+    struct CapAndHat has key {
+       id: UID
+    }
+
+    struct Recap has key {
+       id: UID
+    }
+
+    struct MyCapybara has key {
+       id: UID
+    }
+
+    public fun freeze_capture(w: NoCap) {
+        transfer::public_freeze_object(w);
+    }
+
+    public fun freeze_handicap(w: CapAndHat) {
+        transfer::public_freeze_object(w);
+    }
+
+    public fun freeze_recap(w: Recap) {
+        transfer::public_freeze_object(w);
+    }
+
+    public fun freeze_capybara(w: MyCapybara) {
+        transfer::public_freeze_object(w);
+    }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
+
+module sui::transfer {
+    public fun public_freeze_object<T: key>(_: T) {
+        abort 0
+    }
+}
diff --git a/external-crates/move/crates/move-compiler/tests/sui_mode/linter/freezing_capability_suppression.move b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/freezing_capability_suppression.move
new file mode 100644
index 0000000000000..f0e4f249c0e38
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/freezing_capability_suppression.move
@@ -0,0 +1,46 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+module a::test_suppression {
+    use sui::object::UID;
+    use sui::transfer;
+
+    struct SuperAdminCap has key {
+       id: UID
+    }
+
+    struct MasterCapability has key {
+       id: UID
+    }
+
+    struct RootCapV3 has key {
+       id: UID
+    }
+
+    #[allow(lint(freezing_capability))]
+    public fun freeze_super_admin(w: SuperAdminCap) {
+        transfer::public_freeze_object(w);
+    }
+
+    #[allow(lint(freezing_capability))]
+    public fun freeze_master_cap(w: MasterCapability) {
+        transfer::public_freeze_object(w);
+    }
+
+    #[allow(lint(freezing_capability))]
+    public fun freeze_root_cap(w: RootCapV3) {
+        transfer::public_freeze_object(w);
+    }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
+
+module sui::transfer {
+    public fun public_freeze_object<T: key>(_: T) {
+        abort 0
+    }
+}
diff --git a/external-crates/move/crates/move-compiler/tests/sui_mode/linter/freezing_capability_true_negatives.move b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/freezing_capability_true_negatives.move
new file mode 100644
index 0000000000000..e1fa1deb126f8
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/freezing_capability_true_negatives.move
@@ -0,0 +1,75 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+module a::test_true_negatives {
+    use sui::object::UID;
+    use sui::transfer;
+
+    struct NormalStruct has key {
+       id: UID
+    }
+
+    struct Data has key {
+       id: UID
+    }
+
+    struct Token has key {
+       id: UID
+    }
+
+    struct Capture has key {
+       id: UID
+    }
+
+    struct Handicap has key {
+       id: UID
+    }
+
+    struct Recap has key {
+       id: UID
+    }
+
+    struct MyCapybara has key {
+       id: UID
+    }
+
+    public fun freeze_normal(w: NormalStruct) {
+        transfer::public_freeze_object(w);
+    }
+
+    public fun freeze_data(w: Data) {
+        transfer::public_freeze_object(w);
+    }
+
+    public fun freeze_token(w: Token) {
+        transfer::public_freeze_object(w);
+    }
+
+    public fun freeze_capture(w: Capture) {
+        transfer::public_freeze_object(w);
+    }
+
+    public fun freeze_handicap(w: Handicap) {
+        transfer::public_freeze_object(w);
+    }
+
+    public fun freeze_recap(w: Recap) {
+        transfer::public_freeze_object(w);
+    }
+
+    public fun freeze_capybara(w: MyCapybara) {
+        transfer::public_freeze_object(w);
+    }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
+
+module sui::transfer {
+    public fun public_freeze_object<T: key>(_: T) {
+        abort 0
+    }
+}
diff --git a/external-crates/move/crates/move-compiler/tests/sui_mode/linter/freezing_capability_true_positives.exp b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/freezing_capability_true_positives.exp
new file mode 100644
index 0000000000000..78c5b8538a69c
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/freezing_capability_true_positives.exp
@@ -0,0 +1,27 @@
+warning[Lint W99008]: freezing potential capability
+   ┌─ tests/sui_mode/linter/freezing_capability_true_positives.move:21:9
+   │
+21 │         transfer::public_freeze_object(w);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The type 'a::test_true_positives::AdminCap' is potentially a capability based on its name
+   │
+   = Freezing a capability might lock out critical operations or otherwise open access to operations that otherwise should be restricted
+   = This warning can be suppressed with '#[allow(lint(freezing_capability))]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[Lint W99008]: freezing potential capability
+   ┌─ tests/sui_mode/linter/freezing_capability_true_positives.move:25:9
+   │
+25 │         transfer::public_freeze_object(w);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The type 'a::test_true_positives::UserCapability' is potentially a capability based on its name
+   │
+   = Freezing a capability might lock out critical operations or otherwise open access to operations that otherwise should be restricted
+   = This warning can be suppressed with '#[allow(lint(freezing_capability))]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[Lint W99008]: freezing potential capability
+   ┌─ tests/sui_mode/linter/freezing_capability_true_positives.move:29:9
+   │
+29 │         transfer::public_freeze_object(w);
+   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The type 'a::test_true_positives::OwnerCapV2' is potentially a capability based on its name
+   │
+   = Freezing a capability might lock out critical operations or otherwise open access to operations that otherwise should be restricted
+   = This warning can be suppressed with '#[allow(lint(freezing_capability))]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/external-crates/move/crates/move-compiler/tests/sui_mode/linter/freezing_capability_true_positives.move b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/freezing_capability_true_positives.move
new file mode 100644
index 0000000000000..03651926773a9
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/freezing_capability_true_positives.move
@@ -0,0 +1,43 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+module a::test_true_positives {
+    use sui::object::UID;
+    use sui::transfer;
+
+    struct AdminCap has key {
+       id: UID
+    }
+
+    struct UserCapability has key {
+       id: UID
+    }
+
+    struct OwnerCapV2 has key {
+       id: UID
+    }
+
+    public fun freeze_cap1(w: AdminCap) {
+        transfer::public_freeze_object(w);
+    }
+
+    public fun freeze_cap2(w: UserCapability) {
+        transfer::public_freeze_object(w);
+    }
+
+    public fun freeze_cap3(w: OwnerCapV2) {
+        transfer::public_freeze_object(w);
+    }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
+
+module sui::transfer {
+    public fun public_freeze_object<T: key>(_: T) {
+        abort 0
+    }
+}
diff --git a/external-crates/move/crates/move-compiler/tests/sui_mode/linter/no_trigger_lint_missing_key.move b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/no_trigger_lint_missing_key.move
new file mode 100644
index 0000000000000..6918849f48883
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/no_trigger_lint_missing_key.move
@@ -0,0 +1,14 @@
+module a::no_trigger_lint_cases {
+    use sui::object::UID;
+
+    // This should not trigger the linter warning (true negative)
+    struct HasKeyAbility has key {
+        id: UID,
+    }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
diff --git a/external-crates/move/crates/move-compiler/tests/sui_mode/linter/suppress_lint_missing_key.move b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/suppress_lint_missing_key.move
new file mode 100644
index 0000000000000..3e86667a95af7
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/suppress_lint_missing_key.move
@@ -0,0 +1,15 @@
+module a::trigger_lint_cases {
+    use sui::object::UID;
+
+    // 4. Suppress warning
+    #[allow(lint(missing_key))]
+    struct SuppressWarning {
+       id: UID,
+    }
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
diff --git a/external-crates/move/crates/move-compiler/tests/sui_mode/linter/suppress_public_mut_tx_context.move b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/suppress_public_mut_tx_context.move
new file mode 100644
index 0000000000000..2d8f98657902c
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/suppress_public_mut_tx_context.move
@@ -0,0 +1,20 @@
+module 0x42::suppress_cases {
+    use sui::tx_context::TxContext;
+
+    #[allow(lint(prefer_mut_tx_context))]
+    public fun suppressed_function(_ctx: &TxContext) {
+    }
+
+    #[allow(lint(prefer_mut_tx_context))]
+    public fun multi_suppressed_function(_ctx: &TxContext) {
+    }
+
+    #[allow(lint(prefer_mut_tx_context))]
+    public fun suppressed_multi_param(_a: u64, _ctx: &TxContext, _b: &mut TxContext) {
+    }
+}
+
+// Mocking the sui::tx_context module
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/external-crates/move/crates/move-compiler/tests/sui_mode/linter/trigger_lint_missing_key.exp b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/trigger_lint_missing_key.exp
new file mode 100644
index 0000000000000..243ce11581d70
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/trigger_lint_missing_key.exp
@@ -0,0 +1,10 @@
+warning[Lint W99007]: struct with id but missing key ability
+  ┌─ tests/sui_mode/linter/trigger_lint_missing_key.move:5:5
+  │  
+5 │ ╭     struct MissingKeyAbility {
+6 │ │         id: UID,
+7 │ │     }
+  │ ╰─────^ Struct's first field has an 'id' field of type 'sui::object::UID' but is missing the 'key' ability.
+  │  
+  = This warning can be suppressed with '#[allow(lint(missing_key))]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/external-crates/move/crates/move-compiler/tests/sui_mode/linter/trigger_lint_missing_key.move b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/trigger_lint_missing_key.move
new file mode 100644
index 0000000000000..5b6bb908d4ff3
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/trigger_lint_missing_key.move
@@ -0,0 +1,15 @@
+module a::trigger_lint_cases {
+    use sui::object::UID;
+
+    // This should trigger the linter warning (true positive)
+    struct MissingKeyAbility {
+        id: UID,
+    }
+
+}
+
+module sui::object {
+    struct UID has store {
+        id: address,
+    }
+}
diff --git a/external-crates/move/crates/move-compiler/tests/sui_mode/linter/true_negative_public_mut_tx_context.move b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/true_negative_public_mut_tx_context.move
new file mode 100644
index 0000000000000..1796cb046a7b7
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/true_negative_public_mut_tx_context.move
@@ -0,0 +1,26 @@
+// tests the lint for preferring &mut TxContext over &TxContext in public functions
+// these cases correctly should not trigger the lint
+module 0x42::true_negative {
+    use sui::tx_context::TxContext;
+
+    public fun correct_mint(_ctx: &mut TxContext) {
+    }
+
+    public fun another_correct(_a: u64, _b: &mut TxContext, _c: u64) {
+    }
+
+    fun private_function(_ctx: &TxContext) {
+    }
+
+    public fun custom_module(_b: &mut sui::mock_tx_context::TxContext) {}
+
+
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
+
+module sui::mock_tx_context {
+    struct TxContext has drop {}
+}
diff --git a/external-crates/move/crates/move-compiler/tests/sui_mode/linter/true_positive_public_mut_tx_context.exp b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/true_positive_public_mut_tx_context.exp
new file mode 100644
index 0000000000000..981d0e737b750
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/true_positive_public_mut_tx_context.exp
@@ -0,0 +1,36 @@
+warning[Lint W99009]: prefer '&mut TxContext' over '&TxContext'
+  ┌─ tests/sui_mode/linter/true_positive_public_mut_tx_context.move:8:37
+  │
+8 │     public fun incorrect_mint(_ctx: &TxContext) {
+  │                                     ^^^^^^^^^^ 'public' functions should prefer '&mut TxContext' over '&TxContext' for better upgradability.
+  │
+  = When upgrading, the public function cannot be modified to take '&mut TxContext' instead of '&TxContext'. As such, it is recommended to consider using '&mut TxContext' to future-proof the function.
+  = This warning can be suppressed with '#[allow(lint(prefer_mut_tx_context))]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[Lint W99009]: prefer '&mut TxContext' over '&TxContext'
+   ┌─ tests/sui_mode/linter/true_positive_public_mut_tx_context.move:11:47
+   │
+11 │     public fun another_incorrect(_a: u64, _b: &TxContext, _c: u64) {
+   │                                               ^^^^^^^^^^ 'public' functions should prefer '&mut TxContext' over '&TxContext' for better upgradability.
+   │
+   = When upgrading, the public function cannot be modified to take '&mut TxContext' instead of '&TxContext'. As such, it is recommended to consider using '&mut TxContext' to future-proof the function.
+   = This warning can be suppressed with '#[allow(lint(prefer_mut_tx_context))]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[Lint W99009]: prefer '&mut TxContext' over '&TxContext'
+   ┌─ tests/sui_mode/linter/true_positive_public_mut_tx_context.move:14:54
+   │
+14 │     public fun mixed_function(_a: &CustomStruct, _b: &TxContext, _c: &mut TxContext) {}
+   │                                                      ^^^^^^^^^^ 'public' functions should prefer '&mut TxContext' over '&TxContext' for better upgradability.
+   │
+   = When upgrading, the public function cannot be modified to take '&mut TxContext' instead of '&TxContext'. As such, it is recommended to consider using '&mut TxContext' to future-proof the function.
+   = This warning can be suppressed with '#[allow(lint(prefer_mut_tx_context))]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
+warning[Lint W99009]: prefer '&mut TxContext' over '&TxContext'
+   ┌─ tests/sui_mode/linter/true_positive_public_mut_tx_context.move:20:13
+   │
+20 │         _b: &TxContext, // Should warn
+   │             ^^^^^^^^^^ 'public' functions should prefer '&mut TxContext' over '&TxContext' for better upgradability.
+   │
+   = When upgrading, the public function cannot be modified to take '&mut TxContext' instead of '&TxContext'. As such, it is recommended to consider using '&mut TxContext' to future-proof the function.
+   = This warning can be suppressed with '#[allow(lint(prefer_mut_tx_context))]' applied to the 'module' or module member ('const', 'fun', or 'struct')
+
diff --git a/external-crates/move/crates/move-compiler/tests/sui_mode/linter/true_positive_public_mut_tx_context.move b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/true_positive_public_mut_tx_context.move
new file mode 100644
index 0000000000000..cee7d73f1b2e7
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/sui_mode/linter/true_positive_public_mut_tx_context.move
@@ -0,0 +1,29 @@
+// tests the lint for preferring &mut TxContext over &TxContext in public functions
+// these cases correctly should trigger the lint
+module 0x42::true_positive {
+    use sui::tx_context::TxContext;
+
+    struct CustomStruct has drop {}
+
+    public fun incorrect_mint(_ctx: &TxContext) {
+    }
+
+    public fun another_incorrect(_a: u64, _b: &TxContext, _c: u64) {
+    }
+
+    public fun mixed_function(_a: &CustomStruct, _b: &TxContext, _c: &mut TxContext) {}
+
+    fun private_function(_ctx: &TxContext) {}
+
+    public fun complex_function<T: drop>(
+        _a: u64,
+        _b: &TxContext, // Should warn
+        _c: &mut TxContext,
+        _d: &T,
+        _e: &CustomStruct
+    ) {}
+}
+
+module sui::tx_context {
+    struct TxContext has drop {}
+}
diff --git a/external-crates/move/crates/move-compiler/tests/sui_mode/move_2024/typing/enum_in_struct_position.exp b/external-crates/move/crates/move-compiler/tests/sui_mode/move_2024/typing/enum_in_struct_position.exp
new file mode 100644
index 0000000000000..5f388c9fe77c9
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/sui_mode/move_2024/typing/enum_in_struct_position.exp
@@ -0,0 +1,39 @@
+error[Sui E02007]: invalid object declaration
+   ┌─ tests/sui_mode/move_2024/typing/enum_in_struct_position.move:11:13
+   │
+11 │ public enum Obj has key, store {
+   │             ^^^     --- Enums cannot have the 'key' ability.
+   │             │        
+   │             Invalid object 'Obj'
+
+error[Sui E02002]: invalid 'entry' function signature
+   ┌─ tests/sui_mode/move_2024/typing/enum_in_struct_position.move:18:1
+   │
+ 3 │ public enum E {
+   │             - To satisfy the constraint, the 'drop' ability would need to be added here
+   ·
+18 │ entry fun ret(): E {
+   │ ^^^^^            - The type 'a::m::E' does not have the ability 'drop'
+   │ │                 
+   │ Invalid return type for entry function 'ret'
+
+error[Sui E02002]: invalid 'entry' function signature
+   ┌─ tests/sui_mode/move_2024/typing/enum_in_struct_position.move:22:14
+   │
+22 │ entry fun x3(_: E) {
+   │ -----        ^  - 'entry' parameters must be primitives (by-value), vectors of primitives, objects (by-reference or by-value), vectors of objects, or 'Receiving' arguments (by-reference or by-value)
+   │ │            │   
+   │ │            Invalid 'entry' parameter type for parameter '_'
+   │ 'x3' was declared 'entry' here
+
+error[Sui E02009]: invalid private transfer call
+   ┌─ tests/sui_mode/move_2024/typing/enum_in_struct_position.move:30:5
+   │
+11 │ public enum Obj has key, store {
+   │                          ----- The object has 'store' so 'sui::transfer::public_transfer' can be called instead
+   ·
+29 │ public fun transfer(o: a::m::Obj) {
+   │                        --------- The type 'a::m::Obj' is not declared in the current module
+30 │     transfer::transfer(o, @0)
+   │     ^^^^^^^^^^^^^^^^^^^^^^^^^ Invalid private transfer. The function 'sui::transfer::transfer' is restricted to being called in the object's module, 'a::m'
+
diff --git a/external-crates/move/crates/move-compiler/tests/sui_mode/move_2024/typing/enum_in_struct_position.move b/external-crates/move/crates/move-compiler/tests/sui_mode/move_2024/typing/enum_in_struct_position.move
new file mode 100644
index 0000000000000..3a38fc40f633e
--- /dev/null
+++ b/external-crates/move/crates/move-compiler/tests/sui_mode/move_2024/typing/enum_in_struct_position.move
@@ -0,0 +1,42 @@
+module a::m {
+
+public enum E {
+    V()
+}
+
+public enum M has drop {
+    V()
+}
+
+public enum Obj has key, store {
+    V()
+}
+
+fun init(_: M, _: &mut TxContext) {
+}
+
+entry fun ret(): E {
+    E::V()
+}
+
+entry fun x3(_: E) {
+    abort 0
+}
+
+}
+
+module a::n {
+public fun transfer(o: a::m::Obj) {
+    transfer::transfer(o, @0)
+}
+}
+
+module sui::transfer {
+public fun transfer<T: key>(_: T, _: address) {
+    abort 0
+}
+}
+
+module sui::tx_context{
+public struct TxContext has drop {}
+}
diff --git a/external-crates/move/crates/move-core-types/src/identifier.rs b/external-crates/move/crates/move-core-types/src/identifier.rs
index 019adcc274eaa..b45a25dbbf459 100644
--- a/external-crates/move/crates/move-core-types/src/identifier.rs
+++ b/external-crates/move/crates/move-core-types/src/identifier.rs
@@ -234,6 +234,12 @@ impl Borrow<IdentStr> for Identifier {
     }
 }
 
+impl Borrow<str> for Identifier {
+    fn borrow(&self) -> &str {
+        &self.0
+    }
+}
+
 impl ToOwned for IdentStr {
     type Owned = Identifier;
 
diff --git a/external-crates/move/crates/move-core-types/src/state.rs b/external-crates/move/crates/move-core-types/src/state.rs
index 6d94c574a9dd6..f57e1abdcad79 100644
--- a/external-crates/move/crates/move-core-types/src/state.rs
+++ b/external-crates/move/crates/move-core-types/src/state.rs
@@ -13,7 +13,7 @@ pub enum VMState {
 }
 
 thread_local! {
-    static STATE: RefCell<VMState> = RefCell::new(VMState::OTHER);
+    static STATE: RefCell<VMState> = const { RefCell::new(VMState::OTHER) };
 }
 
 pub fn set_state(state: VMState) -> VMState {
diff --git a/external-crates/move/crates/move-core-types/src/u256.rs b/external-crates/move/crates/move-core-types/src/u256.rs
index fb240326cebad..d47245857df5c 100644
--- a/external-crates/move/crates/move-core-types/src/u256.rs
+++ b/external-crates/move/crates/move-core-types/src/u256.rs
@@ -567,7 +567,6 @@ impl Distribution<U256> for Standard {
 // Rand impl below are inspired by u128 impl found in https://rust-random.github.io/rand/src/rand/distributions/uniform.rs.html
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
-#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
 pub struct UniformU256 {
     low: U256,
     range: U256,
diff --git a/external-crates/move/crates/move-docgen/src/docgen.rs b/external-crates/move/crates/move-docgen/src/docgen.rs
index acb803f56b248..8aec76705e526 100644
--- a/external-crates/move/crates/move-docgen/src/docgen.rs
+++ b/external-crates/move/crates/move-docgen/src/docgen.rs
@@ -13,8 +13,8 @@ use move_model::{
     code_writer::{CodeWriter, CodeWriterLabel},
     emit, emitln,
     model::{
-        AbilitySet, FunId, FunctionEnv, GlobalEnv, Loc, ModuleEnv, ModuleId, NamedConstantEnv,
-        Parameter, QualifiedId, StructEnv, TypeParameter,
+        AbilitySet, EnumEnv, FunId, FunctionEnv, GlobalEnv, Loc, ModuleEnv, ModuleId,
+        NamedConstantEnv, Parameter, QualifiedId, StructEnv, TypeParameter,
     },
     symbol::Symbol,
     ty::TypeDisplayContext,
@@ -584,6 +584,15 @@ impl<'env> Docgen<'env> {
             }
         }
 
+        if !module_env.get_enums().count() > 0 {
+            for s in module_env
+                .get_enums()
+                .sorted_by(|a, b| Ord::cmp(&a.get_loc(), &b.get_loc()))
+            {
+                self.gen_enum(&s);
+            }
+        }
+
         if module_env.get_named_constant_count() > 0 {
             // Introduce a Constant section
             self.gen_named_constants();
@@ -896,6 +905,28 @@ impl<'env> Docgen<'env> {
         self.decrement_section_nest();
     }
 
+    /// Generates documentation for an enum.
+    fn gen_enum(&self, enum_env: &EnumEnv<'_>) {
+        let name = enum_env.get_name();
+        self.section_header(
+            &format!("Enum `{}`", self.name_string(enum_env.get_name())),
+            &self.label_for_module_item(&enum_env.module_env, name),
+        );
+        self.increment_section_nest();
+        self.doc_text(enum_env.get_doc());
+        self.code_block(&self.enum_header_display(enum_env));
+
+        if self.options.include_impl || (self.options.include_specs && self.options.specs_inlined) {
+            // Include field documentation if either impls or specs are present and inlined,
+            // because they are used by both.
+            self.begin_collapsed("Variants");
+            self.gen_enum_variants(enum_env);
+            self.end_collapsed();
+        }
+
+        self.decrement_section_nest();
+    }
+
     /// Returns "Struct `N`" or "Resource `N`".
     fn struct_title(&self, struct_env: &StructEnv<'_>) -> String {
         // NOTE(mengxu): although we no longer declare structs with the `resource` keyword, it
@@ -960,6 +991,59 @@ impl<'env> Docgen<'env> {
         self.end_definitions();
     }
 
+    /// Generates code signature for an enum.
+    fn enum_header_display(&self, enum_env: &EnumEnv<'_>) -> String {
+        let name = self.name_string(enum_env.get_name());
+        let type_params = self.type_parameter_list_display(&enum_env.get_named_type_parameters());
+        let ability_tokens = self.ability_tokens(enum_env.get_abilities());
+        if ability_tokens.is_empty() {
+            format!("public enum {}{}", name, type_params)
+        } else {
+            format!(
+                "public enum {}{} has {}",
+                name,
+                type_params,
+                ability_tokens.join(", ")
+            )
+        }
+    }
+
+    fn gen_enum_variants(&self, enum_env: &EnumEnv<'_>) {
+        let tctx = {
+            let type_param_names = Some(
+                enum_env
+                    .get_named_type_parameters()
+                    .iter()
+                    .map(|TypeParameter(name, _)| *name)
+                    .collect_vec(),
+            );
+            TypeDisplayContext::WithEnv {
+                env: self.env,
+                type_param_names,
+            }
+        };
+        self.begin_definitions();
+        for variant_env in enum_env.get_variants() {
+            self.definition_text(
+                &format!("Variant `{}`", self.name_string(variant_env.get_name()),),
+                variant_env.get_doc(),
+            );
+            for field in variant_env.get_fields() {
+                self.begin_definitions();
+                self.definition_text(
+                    &format!(
+                        "`{}: {}`",
+                        self.name_string(field.get_name()),
+                        field.get_type().display(&tctx)
+                    ),
+                    field.get_doc(),
+                );
+                self.end_definitions();
+            }
+        }
+        self.end_definitions();
+    }
+
     /// Generates documentation for a function.
     fn gen_function(&self, func_env: &FunctionEnv<'_>) {
         let is_script = func_env.module_env.is_script_module();
diff --git a/external-crates/move/crates/move-docgen/tests/sources/enums_test.move b/external-crates/move/crates/move-docgen/tests/sources/enums_test.move
new file mode 100644
index 0000000000000..b85b53d003cbf
--- /dev/null
+++ b/external-crates/move/crates/move-docgen/tests/sources/enums_test.move
@@ -0,0 +1,47 @@
+/// This is a doc comment above an annotation.
+#[allow(unused)]
+module 0x42::m {
+    /// This is a doc comment above an enum
+    public enum Enum has drop {
+        /// This is a doc comment above a variant
+        A,
+        B(),
+        C(u64),
+        /// Another doc comment
+        D { 
+            /// Doc text on variant field
+            x: u64 
+        },
+        E { x: u64, y: u64 },
+    }
+
+    public enum GenericEnum<T> {
+        A(T),
+        B,
+    }
+
+    public struct X has drop { x: Enum }
+    public struct Y(Enum)
+
+    public struct XG { x: GenericEnum<Enum> }
+    public struct YG(GenericEnum<Enum>)
+
+    public struct XGG<T> { x: GenericEnum<T> }
+    public struct YGG<T>(GenericEnum<T>)
+
+    public struct VecMap<K: copy, V> has copy, drop, store {
+        contents: vector<Entry<K, V>>,
+    }
+
+    /// An entry in the map
+    public struct Entry<K: copy, V> has copy, drop, store {
+        key: K,
+        value: V,
+    }
+
+    /// Doc comments `type_: VecMap<u64, X>`
+    fun f(x: VecMap<u64, X>): u64 {
+        0
+    }
+}
+
diff --git a/external-crates/move/crates/move-docgen/tests/sources/enums_test.spec_inline.md b/external-crates/move/crates/move-docgen/tests/sources/enums_test.spec_inline.md
new file mode 100644
index 0000000000000..38cd3f13aaa3d
--- /dev/null
+++ b/external-crates/move/crates/move-docgen/tests/sources/enums_test.spec_inline.md
@@ -0,0 +1,407 @@
+
+<a name="0x42_m"></a>
+
+# Module `0x42::m`
+
+This is a doc comment above an annotation.
+
+
+-  [Struct `X`](#0x42_m_X)
+-  [Struct `Y`](#0x42_m_Y)
+-  [Struct `XG`](#0x42_m_XG)
+-  [Struct `YG`](#0x42_m_YG)
+-  [Struct `XGG`](#0x42_m_XGG)
+-  [Struct `YGG`](#0x42_m_YGG)
+-  [Struct `VecMap`](#0x42_m_VecMap)
+-  [Struct `Entry`](#0x42_m_Entry)
+-  [Enum `Enum`](#0x42_m_Enum)
+-  [Enum `GenericEnum`](#0x42_m_GenericEnum)
+-  [Function `f`](#0x42_m_f)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x42_m_X"></a>
+
+## Struct `X`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_X">X</a> <b>has</b> drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>x: m::Enum</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x42_m_Y"></a>
+
+## Struct `Y`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_Y">Y</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pos0: m::Enum</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x42_m_XG"></a>
+
+## Struct `XG`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_XG">XG</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>x: m::GenericEnum&lt;m::Enum&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x42_m_YG"></a>
+
+## Struct `YG`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_YG">YG</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pos0: m::GenericEnum&lt;m::Enum&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x42_m_XGG"></a>
+
+## Struct `XGG`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_XGG">XGG</a>&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>x: m::GenericEnum&lt;T&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x42_m_YGG"></a>
+
+## Struct `YGG`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_YGG">YGG</a>&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pos0: m::GenericEnum&lt;T&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x42_m_VecMap"></a>
+
+## Struct `VecMap`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_VecMap">VecMap</a>&lt;K: <b>copy</b>, V&gt; <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>contents: vector&lt;<a href="enums_test.md#0x42_m_Entry">m::Entry</a>&lt;K, V&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x42_m_Entry"></a>
+
+## Struct `Entry`
+
+An entry in the map
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_Entry">Entry</a>&lt;K: <b>copy</b>, V&gt; <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>key: K</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>value: V</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x42_m_Enum"></a>
+
+## Enum `Enum`
+
+This is a doc comment above an enum
+
+
+<pre><code><b>public</b> enum Enum <b>has</b> drop
+</code></pre>
+
+
+
+<details>
+<summary>Variants</summary>
+
+
+<dl>
+<dt>
+Variant <code>A</code>
+</dt>
+<dd>
+ This is a doc comment above a variant
+</dd>
+<dt>
+Variant <code>B</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+Variant <code>C</code>
+</dt>
+<dd>
+
+</dd>
+
+<dl>
+<dt>
+<code>pos0: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+<dt>
+Variant <code>D</code>
+</dt>
+<dd>
+ Another doc comment
+</dd>
+
+<dl>
+<dt>
+<code>x: u64</code>
+</dt>
+<dd>
+ Doc text on variant field
+</dd>
+</dl>
+
+<dt>
+Variant <code>E</code>
+</dt>
+<dd>
+
+</dd>
+
+<dl>
+<dt>
+<code>x: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+<dl>
+<dt>
+<code>y: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+</dl>
+
+
+</details>
+
+<a name="0x42_m_GenericEnum"></a>
+
+## Enum `GenericEnum`
+
+
+
+<pre><code><b>public</b> enum GenericEnum&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Variants</summary>
+
+
+<dl>
+<dt>
+Variant <code>A</code>
+</dt>
+<dd>
+
+</dd>
+
+<dl>
+<dt>
+<code>pos0: T</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+<dt>
+Variant <code>B</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x42_m_f"></a>
+
+## Function `f`
+
+Doc comments <code>type_: <a href="enums_test.md#0x42_m_VecMap">VecMap</a>&lt;u64, <a href="enums_test.md#0x42_m_X">X</a>&gt;</code>
+
+
+<pre><code><b>fun</b> <a href="enums_test.md#0x42_m_f">f</a>(x: <a href="enums_test.md#0x42_m_VecMap">m::VecMap</a>&lt;u64, <a href="enums_test.md#0x42_m_X">m::X</a>&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="enums_test.md#0x42_m_f">f</a>(x: <a href="enums_test.md#0x42_m_VecMap">VecMap</a>&lt;u64, <a href="enums_test.md#0x42_m_X">X</a>&gt;): u64 {
+    0
+}
+</code></pre>
+
+
+
+</details>
diff --git a/external-crates/move/crates/move-docgen/tests/sources/enums_test.spec_inline_no_fold.md b/external-crates/move/crates/move-docgen/tests/sources/enums_test.spec_inline_no_fold.md
new file mode 100644
index 0000000000000..f761ecf936c3b
--- /dev/null
+++ b/external-crates/move/crates/move-docgen/tests/sources/enums_test.spec_inline_no_fold.md
@@ -0,0 +1,372 @@
+
+<a name="0x42_m"></a>
+
+# Module `0x42::m`
+
+This is a doc comment above an annotation.
+
+
+-  [Struct `X`](#0x42_m_X)
+-  [Struct `Y`](#0x42_m_Y)
+-  [Struct `XG`](#0x42_m_XG)
+-  [Struct `YG`](#0x42_m_YG)
+-  [Struct `XGG`](#0x42_m_XGG)
+-  [Struct `YGG`](#0x42_m_YGG)
+-  [Struct `VecMap`](#0x42_m_VecMap)
+-  [Struct `Entry`](#0x42_m_Entry)
+-  [Enum `Enum`](#0x42_m_Enum)
+-  [Enum `GenericEnum`](#0x42_m_GenericEnum)
+-  [Function `f`](#0x42_m_f)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x42_m_X"></a>
+
+## Struct `X`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_X">X</a> <b>has</b> drop
+</code></pre>
+
+
+
+##### Fields
+
+
+<dl>
+<dt>
+<code>x: m::Enum</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+<a name="0x42_m_Y"></a>
+
+## Struct `Y`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_Y">Y</a>
+</code></pre>
+
+
+
+##### Fields
+
+
+<dl>
+<dt>
+<code>pos0: m::Enum</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+<a name="0x42_m_XG"></a>
+
+## Struct `XG`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_XG">XG</a>
+</code></pre>
+
+
+
+##### Fields
+
+
+<dl>
+<dt>
+<code>x: m::GenericEnum&lt;m::Enum&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+<a name="0x42_m_YG"></a>
+
+## Struct `YG`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_YG">YG</a>
+</code></pre>
+
+
+
+##### Fields
+
+
+<dl>
+<dt>
+<code>pos0: m::GenericEnum&lt;m::Enum&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+<a name="0x42_m_XGG"></a>
+
+## Struct `XGG`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_XGG">XGG</a>&lt;T&gt;
+</code></pre>
+
+
+
+##### Fields
+
+
+<dl>
+<dt>
+<code>x: m::GenericEnum&lt;T&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+<a name="0x42_m_YGG"></a>
+
+## Struct `YGG`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_YGG">YGG</a>&lt;T&gt;
+</code></pre>
+
+
+
+##### Fields
+
+
+<dl>
+<dt>
+<code>pos0: m::GenericEnum&lt;T&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+<a name="0x42_m_VecMap"></a>
+
+## Struct `VecMap`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_VecMap">VecMap</a>&lt;K: <b>copy</b>, V&gt; <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+##### Fields
+
+
+<dl>
+<dt>
+<code>contents: vector&lt;<a href="enums_test.md#0x42_m_Entry">m::Entry</a>&lt;K, V&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+<a name="0x42_m_Entry"></a>
+
+## Struct `Entry`
+
+An entry in the map
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_Entry">Entry</a>&lt;K: <b>copy</b>, V&gt; <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+##### Fields
+
+
+<dl>
+<dt>
+<code>key: K</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>value: V</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+<a name="0x42_m_Enum"></a>
+
+## Enum `Enum`
+
+This is a doc comment above an enum
+
+
+<pre><code><b>public</b> enum Enum <b>has</b> drop
+</code></pre>
+
+
+
+##### Variants
+
+
+<dl>
+<dt>
+Variant <code>A</code>
+</dt>
+<dd>
+ This is a doc comment above a variant
+</dd>
+<dt>
+Variant <code>B</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+Variant <code>C</code>
+</dt>
+<dd>
+
+</dd>
+
+<dl>
+<dt>
+<code>pos0: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+<dt>
+Variant <code>D</code>
+</dt>
+<dd>
+ Another doc comment
+</dd>
+
+<dl>
+<dt>
+<code>x: u64</code>
+</dt>
+<dd>
+ Doc text on variant field
+</dd>
+</dl>
+
+<dt>
+Variant <code>E</code>
+</dt>
+<dd>
+
+</dd>
+
+<dl>
+<dt>
+<code>x: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+<dl>
+<dt>
+<code>y: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+</dl>
+
+
+<a name="0x42_m_GenericEnum"></a>
+
+## Enum `GenericEnum`
+
+
+
+<pre><code><b>public</b> enum GenericEnum&lt;T&gt;
+</code></pre>
+
+
+
+##### Variants
+
+
+<dl>
+<dt>
+Variant <code>A</code>
+</dt>
+<dd>
+
+</dd>
+
+<dl>
+<dt>
+<code>pos0: T</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+<dt>
+Variant <code>B</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+<a name="0x42_m_f"></a>
+
+## Function `f`
+
+Doc comments <code>type_: <a href="enums_test.md#0x42_m_VecMap">VecMap</a>&lt;u64, <a href="enums_test.md#0x42_m_X">X</a>&gt;</code>
+
+
+<pre><code><b>fun</b> <a href="enums_test.md#0x42_m_f">f</a>(x: <a href="enums_test.md#0x42_m_VecMap">m::VecMap</a>&lt;u64, <a href="enums_test.md#0x42_m_X">m::X</a>&gt;): u64
+</code></pre>
+
+
+
+##### Implementation
+
+
+<pre><code><b>fun</b> <a href="enums_test.md#0x42_m_f">f</a>(x: <a href="enums_test.md#0x42_m_VecMap">VecMap</a>&lt;u64, <a href="enums_test.md#0x42_m_X">X</a>&gt;): u64 {
+    0
+}
+</code></pre>
diff --git a/external-crates/move/crates/move-docgen/tests/sources/enums_test.spec_separate.md b/external-crates/move/crates/move-docgen/tests/sources/enums_test.spec_separate.md
new file mode 100644
index 0000000000000..38cd3f13aaa3d
--- /dev/null
+++ b/external-crates/move/crates/move-docgen/tests/sources/enums_test.spec_separate.md
@@ -0,0 +1,407 @@
+
+<a name="0x42_m"></a>
+
+# Module `0x42::m`
+
+This is a doc comment above an annotation.
+
+
+-  [Struct `X`](#0x42_m_X)
+-  [Struct `Y`](#0x42_m_Y)
+-  [Struct `XG`](#0x42_m_XG)
+-  [Struct `YG`](#0x42_m_YG)
+-  [Struct `XGG`](#0x42_m_XGG)
+-  [Struct `YGG`](#0x42_m_YGG)
+-  [Struct `VecMap`](#0x42_m_VecMap)
+-  [Struct `Entry`](#0x42_m_Entry)
+-  [Enum `Enum`](#0x42_m_Enum)
+-  [Enum `GenericEnum`](#0x42_m_GenericEnum)
+-  [Function `f`](#0x42_m_f)
+
+
+<pre><code></code></pre>
+
+
+
+<a name="0x42_m_X"></a>
+
+## Struct `X`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_X">X</a> <b>has</b> drop
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>x: m::Enum</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x42_m_Y"></a>
+
+## Struct `Y`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_Y">Y</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pos0: m::Enum</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x42_m_XG"></a>
+
+## Struct `XG`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_XG">XG</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>x: m::GenericEnum&lt;m::Enum&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x42_m_YG"></a>
+
+## Struct `YG`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_YG">YG</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pos0: m::GenericEnum&lt;m::Enum&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x42_m_XGG"></a>
+
+## Struct `XGG`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_XGG">XGG</a>&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>x: m::GenericEnum&lt;T&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x42_m_YGG"></a>
+
+## Struct `YGG`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_YGG">YGG</a>&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pos0: m::GenericEnum&lt;T&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x42_m_VecMap"></a>
+
+## Struct `VecMap`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_VecMap">VecMap</a>&lt;K: <b>copy</b>, V&gt; <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>contents: vector&lt;<a href="enums_test.md#0x42_m_Entry">m::Entry</a>&lt;K, V&gt;&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x42_m_Entry"></a>
+
+## Struct `Entry`
+
+An entry in the map
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_Entry">Entry</a>&lt;K: <b>copy</b>, V&gt; <b>has</b> <b>copy</b>, drop, store
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>key: K</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+<code>value: V</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x42_m_Enum"></a>
+
+## Enum `Enum`
+
+This is a doc comment above an enum
+
+
+<pre><code><b>public</b> enum Enum <b>has</b> drop
+</code></pre>
+
+
+
+<details>
+<summary>Variants</summary>
+
+
+<dl>
+<dt>
+Variant <code>A</code>
+</dt>
+<dd>
+ This is a doc comment above a variant
+</dd>
+<dt>
+Variant <code>B</code>
+</dt>
+<dd>
+
+</dd>
+<dt>
+Variant <code>C</code>
+</dt>
+<dd>
+
+</dd>
+
+<dl>
+<dt>
+<code>pos0: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+<dt>
+Variant <code>D</code>
+</dt>
+<dd>
+ Another doc comment
+</dd>
+
+<dl>
+<dt>
+<code>x: u64</code>
+</dt>
+<dd>
+ Doc text on variant field
+</dd>
+</dl>
+
+<dt>
+Variant <code>E</code>
+</dt>
+<dd>
+
+</dd>
+
+<dl>
+<dt>
+<code>x: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+<dl>
+<dt>
+<code>y: u64</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+</dl>
+
+
+</details>
+
+<a name="0x42_m_GenericEnum"></a>
+
+## Enum `GenericEnum`
+
+
+
+<pre><code><b>public</b> enum GenericEnum&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Variants</summary>
+
+
+<dl>
+<dt>
+Variant <code>A</code>
+</dt>
+<dd>
+
+</dd>
+
+<dl>
+<dt>
+<code>pos0: T</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+<dt>
+Variant <code>B</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x42_m_f"></a>
+
+## Function `f`
+
+Doc comments <code>type_: <a href="enums_test.md#0x42_m_VecMap">VecMap</a>&lt;u64, <a href="enums_test.md#0x42_m_X">X</a>&gt;</code>
+
+
+<pre><code><b>fun</b> <a href="enums_test.md#0x42_m_f">f</a>(x: <a href="enums_test.md#0x42_m_VecMap">m::VecMap</a>&lt;u64, <a href="enums_test.md#0x42_m_X">m::X</a>&gt;): u64
+</code></pre>
+
+
+
+<details>
+<summary>Implementation</summary>
+
+
+<pre><code><b>fun</b> <a href="enums_test.md#0x42_m_f">f</a>(x: <a href="enums_test.md#0x42_m_VecMap">VecMap</a>&lt;u64, <a href="enums_test.md#0x42_m_X">X</a>&gt;): u64 {
+    0
+}
+</code></pre>
+
+
+
+</details>
diff --git a/external-crates/move/crates/move-ir-to-bytecode/src/context.rs b/external-crates/move/crates/move-ir-to-bytecode/src/context.rs
index b62cda8506c6d..1d320b4653cf9 100644
--- a/external-crates/move/crates/move-ir-to-bytecode/src/context.rs
+++ b/external-crates/move/crates/move-ir-to-bytecode/src/context.rs
@@ -48,7 +48,7 @@ macro_rules! get_or_add_item_macro {
     }};
 }
 
-pub const TABLE_MAX_SIZE: usize = u16::max_value() as usize;
+pub const TABLE_MAX_SIZE: usize = u16::MAX as usize;
 fn get_or_add_item_ref<K: Clone + Eq + Hash>(
     m: &mut HashMap<K, TableIndex>,
     k: &K,
diff --git a/external-crates/move/crates/move-model/src/builder/exp_translator.rs b/external-crates/move/crates/move-model/src/builder/exp_translator.rs
index 96b33e6f979a1..cba675c90343c 100644
--- a/external-crates/move/crates/move-model/src/builder/exp_translator.rs
+++ b/external-crates/move/crates/move-model/src/builder/exp_translator.rs
@@ -132,7 +132,7 @@ impl<'env, 'translator, 'module_translator> ExpTranslator<'env, 'translator, 'mo
     fn type_display_context(&self) -> TypeDisplayContext<'_> {
         TypeDisplayContext::WithoutEnv {
             symbol_pool: self.symbol_pool(),
-            reverse_struct_table: &self.parent.parent.reverse_struct_table,
+            reverse_datatype_table: &self.parent.parent.reverse_datatype_table,
         }
     }
 
diff --git a/external-crates/move/crates/move-model/src/builder/model_builder.rs b/external-crates/move/crates/move-model/src/builder/model_builder.rs
index 4a823ed5a50c2..73ffd986c2f37 100644
--- a/external-crates/move/crates/move-model/src/builder/model_builder.rs
+++ b/external-crates/move/crates/move-model/src/builder/model_builder.rs
@@ -27,26 +27,37 @@ use crate::{
 pub(crate) struct ModelBuilder<'env> {
     /// The global environment we are building.
     pub env: &'env mut GlobalEnv,
-    /// A symbol table for structs.
-    pub struct_table: BTreeMap<QualifiedSymbol, StructEntry>,
-    /// A reverse mapping from ModuleId/StructId pairs to QualifiedSymbol. This
+    /// A symbol table for datatypes.
+    pub datatype_table: BTreeMap<QualifiedSymbol, DatatypeEntry>,
+    /// A reverse mapping from ModuleId/DatatypeId pairs to QualifiedSymbol. This
     /// is used for visualization of types in error messages.
-    pub reverse_struct_table: BTreeMap<(ModuleId, DatatypeId), QualifiedSymbol>,
+    pub reverse_datatype_table: BTreeMap<(ModuleId, DatatypeId), QualifiedSymbol>,
     /// A symbol table for functions.
     pub fun_table: BTreeMap<QualifiedSymbol, FunEntry>,
     /// A symbol table for constants.
     pub const_table: BTreeMap<QualifiedSymbol, ConstEntry>,
 }
 
-/// A declaration of a struct.
+/// A declaration of a datatype.
 #[derive(Debug, Clone)]
-pub(crate) struct StructEntry {
+pub(crate) struct DatatypeEntry {
     pub loc: Loc,
     pub module_id: ModuleId,
     pub struct_id: DatatypeId,
     pub type_params: Vec<(Symbol, Type)>,
-    pub fields: Option<BTreeMap<Symbol, (usize, Type)>>,
     pub attributes: Vec<Attribute>,
+    pub data: DatatypeData,
+}
+
+#[allow(dead_code)]
+#[derive(Debug, Clone)]
+pub(crate) enum DatatypeData {
+    Struct {
+        fields: Option<BTreeMap<Symbol, (usize, Type)>>,
+    },
+    Enum {
+        variants: BTreeMap<Symbol, Option<BTreeMap<Symbol, (usize, Type)>>>,
+    },
 }
 
 /// A declaration of a function.
@@ -70,8 +81,8 @@ impl<'env> ModelBuilder<'env> {
     pub fn new(env: &'env mut GlobalEnv) -> Self {
         ModelBuilder {
             env,
-            struct_table: BTreeMap::new(),
-            reverse_struct_table: BTreeMap::new(),
+            datatype_table: BTreeMap::new(),
+            reverse_datatype_table: BTreeMap::new(),
             fun_table: BTreeMap::new(),
             const_table: BTreeMap::new(),
         }
@@ -98,17 +109,41 @@ impl<'env> ModelBuilder<'env> {
         type_params: Vec<(Symbol, Type)>,
         fields: Option<BTreeMap<Symbol, (usize, Type)>>,
     ) {
-        let entry = StructEntry {
+        let entry = DatatypeEntry {
+            loc,
+            attributes,
+            module_id,
+            struct_id,
+            type_params,
+            data: DatatypeData::Struct { fields },
+        };
+        // Duplicate declarations have been checked by the Move compiler.
+        assert!(self.datatype_table.insert(name.clone(), entry).is_none());
+        self.reverse_datatype_table
+            .insert((module_id, struct_id), name);
+    }
+
+    pub fn define_enum(
+        &mut self,
+        loc: Loc,
+        attributes: Vec<Attribute>,
+        name: QualifiedSymbol,
+        module_id: ModuleId,
+        struct_id: DatatypeId,
+        type_params: Vec<(Symbol, Type)>,
+        variants: BTreeMap<Symbol, Option<BTreeMap<Symbol, (usize, Type)>>>,
+    ) {
+        let entry = DatatypeEntry {
             loc,
             attributes,
             module_id,
             struct_id,
             type_params,
-            fields,
+            data: DatatypeData::Enum { variants },
         };
         // Duplicate declarations have been checked by the Move compiler.
-        assert!(self.struct_table.insert(name.clone(), entry).is_none());
-        self.reverse_struct_table
+        assert!(self.datatype_table.insert(name.clone(), entry).is_none());
+        self.reverse_datatype_table
             .insert((module_id, struct_id), name);
     }
 
@@ -149,7 +184,7 @@ impl<'env> ModelBuilder<'env> {
 
     /// Looks up a type (struct), reporting an error if it is not found.
     pub fn lookup_type(&self, loc: &Loc, name: &QualifiedSymbol) -> Type {
-        self.struct_table
+        self.datatype_table
             .get(name)
             .cloned()
             .map(|e| Type::Datatype(e.module_id, e.struct_id, project_2nd(&e.type_params)))
diff --git a/external-crates/move/crates/move-model/src/builder/module_builder.rs b/external-crates/move/crates/move-model/src/builder/module_builder.rs
index 72d7e31e94762..69c8112b85db0 100644
--- a/external-crates/move/crates/move-model/src/builder/module_builder.rs
+++ b/external-crates/move/crates/move-model/src/builder/module_builder.rs
@@ -22,7 +22,7 @@ use crate::{
     ast::{Attribute, AttributeValue, ModuleName, QualifiedSymbol, Value},
     builder::{
         exp_translator::ExpTranslator,
-        model_builder::{ConstEntry, ModelBuilder},
+        model_builder::{ConstEntry, DatatypeData, ModelBuilder},
     },
     model::{
         DatatypeId, EnumData, FunId, FunctionData, Loc, ModuleId, NamedConstantData,
@@ -257,6 +257,9 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
         for (name, struct_def) in module_def.structs.key_cloned_iter() {
             self.decl_ana_struct(&name, struct_def);
         }
+        for (name, enum_def) in module_def.enums.key_cloned_iter() {
+            self.decl_ana_enum(&name, enum_def);
+        }
         for (name, fun_def) in module_def.functions.key_cloned_iter() {
             if fun_def.macro_.is_none() {
                 self.decl_ana_fun(&name, fun_def);
@@ -311,6 +314,24 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
         );
     }
 
+    fn decl_ana_enum(&mut self, name: &PA::DatatypeName, def: &EA::EnumDefinition) {
+        let qsym = self.qualified_by_module_from_name(&name.0);
+        let struct_id = DatatypeId::new(qsym.symbol);
+        let attrs = self.translate_attributes(&def.attributes);
+        let mut et = ExpTranslator::new(self);
+        let type_params =
+            et.analyze_and_add_type_params(def.type_parameters.iter().map(|param| &param.name));
+        et.parent.parent.define_enum(
+            et.to_loc(&def.loc),
+            attrs,
+            qsym,
+            et.parent.module_id,
+            struct_id,
+            type_params,
+            BTreeMap::new(), // will be filled in during definition analysis
+        );
+    }
+
     fn decl_ana_fun(&mut self, name: &PA::FunctionName, def: &EA::Function) {
         let qsym = self.qualified_by_module_from_name(&name.0);
         let attrs = self.translate_attributes(&def.attributes);
@@ -342,6 +363,11 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
             self.def_ana_struct(&name, def);
         }
 
+        // Analyze all enums.
+        for (name, def) in module_def.enums.key_cloned_iter() {
+            self.def_ana_enum(&name, def);
+        }
+
         // Analyze all functions.
         for (name, fun_def) in module_def.functions.key_cloned_iter() {
             if fun_def.macro_.is_none() {
@@ -359,14 +385,14 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
     }
 }
 
-/// ## Struct Definition Analysis
+/// ## Struct and Enum Definition Analysis
 
 impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
     fn def_ana_struct(&mut self, name: &PA::DatatypeName, def: &EA::StructDefinition) {
         let qsym = self.qualified_by_module_from_name(&name.0);
         let type_params = self
             .parent
-            .struct_table
+            .datatype_table
             .get(&qsym)
             .expect("struct invalid")
             .type_params
@@ -399,10 +425,61 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
             EA::StructFields::Native(_) => None,
         };
         self.parent
-            .struct_table
+            .datatype_table
             .get_mut(&qsym)
             .expect("struct invalid")
-            .fields = fields;
+            .data = DatatypeData::Struct { fields };
+    }
+
+    fn def_ana_enum(&mut self, name: &PA::DatatypeName, def: &EA::EnumDefinition) {
+        let qsym = self.qualified_by_module_from_name(&name.0);
+        let type_params = self
+            .parent
+            .datatype_table
+            .get(&qsym)
+            .expect("enum invalid")
+            .type_params
+            .clone();
+        let mut et = ExpTranslator::new(self);
+        let loc = et.to_loc(&name.0.loc);
+        for (name, ty) in type_params {
+            et.define_type_param(&loc, name, ty);
+        }
+        let variants: BTreeMap<_, _> = def
+            .variants
+            .key_cloned_iter()
+            .map(|(key, variant)| {
+                let variant_name = et.symbol_pool().make(&key.0.value);
+                let variant_fields = match &variant.fields {
+                    EA::VariantFields::Named(fields) => {
+                        let mut field_map = BTreeMap::new();
+                        for (_name_loc, field_name_, (idx, ty)) in fields {
+                            let field_sym = et.symbol_pool().make(field_name_);
+                            let field_ty = et.translate_type(ty);
+                            field_map.insert(field_sym, (*idx, field_ty));
+                        }
+                        Some(field_map)
+                    }
+                    EA::VariantFields::Positional(tys) => {
+                        let mut field_map = BTreeMap::new();
+                        for (idx, ty) in tys.iter().enumerate() {
+                            let field_name_ = format!("{idx}");
+                            let field_sym = et.symbol_pool().make(&field_name_);
+                            let field_ty = et.translate_type(ty);
+                            field_map.insert(field_sym, (idx, field_ty));
+                        }
+                        Some(field_map)
+                    }
+                    EA::VariantFields::Empty => None,
+                };
+                (variant_name, variant_fields)
+            })
+            .collect();
+        self.parent
+            .datatype_table
+            .get_mut(&qsym)
+            .expect("enum invalid")
+            .data = DatatypeData::Enum { variants };
     }
 }
 
@@ -453,7 +530,7 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
                 let name = self.symbol_pool().make(module.identifier_at(handle.name).as_str());
                 if let Some(entry) = self
                     .parent
-                    .struct_table
+                    .datatype_table
                     .get(&self.qualified_by_module(name))
                 {
                     Some((
@@ -482,7 +559,7 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
                 let name = self.symbol_pool().make(module.identifier_at(handle.name).as_str());
                 if let Some(entry) = self
                     .parent
-                    .struct_table
+                    .datatype_table
                     .get(&self.qualified_by_module(name))
                 {
                     Some((
@@ -492,6 +569,7 @@ impl<'env, 'translator> ModuleBuilder<'env, 'translator> {
                             def_idx,
                             name,
                             entry.loc.clone(),
+                            Some(&source_map),
                             entry.attributes.clone(),
                         ),
                     ))
diff --git a/external-crates/move/crates/move-model/src/exp_generator.rs b/external-crates/move/crates/move-model/src/exp_generator.rs
index d1334af6f8d51..007a657960a9b 100644
--- a/external-crates/move/crates/move-model/src/exp_generator.rs
+++ b/external-crates/move/crates/move-model/src/exp_generator.rs
@@ -74,7 +74,7 @@ pub trait ExpGenerator<'env> {
     fn get_memory_of_node(&self, node_id: NodeId) -> QualifiedInstId<DatatypeId> {
         // We do have a call `f<R<..>>` so extract the type from the function instantiation.
         let rty = &self.global_env().get_node_instantiation(node_id)[0];
-        let (mid, sid, inst) = rty.require_struct();
+        let (mid, sid, inst) = rty.require_datatype();
         mid.qualified_inst(sid, inst.to_owned())
     }
 }
diff --git a/external-crates/move/crates/move-model/src/lib.rs b/external-crates/move/crates/move-model/src/lib.rs
index b864b996d38db..a81e9e5557e42 100644
--- a/external-crates/move/crates/move-model/src/lib.rs
+++ b/external-crates/move/crates/move-model/src/lib.rs
@@ -18,7 +18,7 @@ use num::{BigUint, Num};
 
 use builder::module_builder::ModuleBuilder;
 use move_binary_format::file_format::{
-    CompiledModule, FunctionDefinitionIndex, StructDefinitionIndex,
+    CompiledModule, EnumDefinitionIndex, FunctionDefinitionIndex, StructDefinitionIndex,
 };
 use move_compiler::{
     self,
@@ -335,6 +335,18 @@ pub fn run_bytecode_model_builder<'a>(
             module_data.struct_idx_to_id.insert(def_idx, struct_id);
         }
 
+        // add enums
+        for (i, def) in m.enum_defs().iter().enumerate() {
+            let def_idx = EnumDefinitionIndex(i as u16);
+            let name = m.identifier_at(m.datatype_handle_at(def.enum_handle).name);
+            let symbol = env.symbol_pool().make(name.as_str());
+            let enum_id = DatatypeId::new(symbol);
+            let data =
+                env.create_move_enum_data(m, def_idx, symbol, Loc::default(), None, Vec::default());
+            module_data.enum_data.insert(enum_id, data);
+            module_data.enum_idx_to_id.insert(def_idx, enum_id);
+        }
+
         env.module_data.push(module_data);
     }
     Ok(env)
diff --git a/external-crates/move/crates/move-model/src/model.rs b/external-crates/move/crates/move-model/src/model.rs
index 006348d0cffb0..859be6bf46cc8 100644
--- a/external-crates/move/crates/move-model/src/model.rs
+++ b/external-crates/move/crates/move-model/src/model.rs
@@ -1027,16 +1027,11 @@ impl GlobalEnv {
         def_idx: EnumDefinitionIndex,
         name: Symbol,
         loc: Loc,
+        source_map: Option<&SourceMap>,
         attributes: Vec<Attribute>,
     ) -> EnumData {
         let enum_def = module.enum_def_at(def_idx);
-        let enum_smap = self
-            .find_module_by_language_storage_id(&module.self_id())
-            .unwrap()
-            .data
-            .source_map
-            .get_enum_source_map(def_idx)
-            .unwrap();
+        let enum_smap = source_map.map(|smap| smap.get_enum_source_map(def_idx).unwrap());
         let handle_idx = enum_def.enum_handle;
         let mut variant_data = BTreeMap::new();
         for (tag, variant) in enum_def.variants.iter().enumerate() {
@@ -1051,7 +1046,10 @@ impl GlobalEnv {
             let variant_name = self
                 .symbol_pool
                 .make(module.identifier_at(variant.variant_name).as_str());
-            let loc = self.to_loc(&enum_smap.variants[tag].0 .1);
+            let loc = match enum_smap {
+                None => Loc::default(),
+                Some(smap) => self.to_loc(&smap.variants[tag].0 .1),
+            };
             variant_data.insert(
                 VariantId(variant_name),
                 VariantData {
@@ -1123,7 +1121,7 @@ impl GlobalEnv {
     }
 
     /// Gets a StructEnv in this module by its `StructTag`
-    pub fn find_struct_by_tag(
+    pub fn find_datatype_by_tag(
         &self,
         tag: &language_storage::StructTag,
     ) -> Option<QualifiedId<DatatypeId>> {
@@ -1131,6 +1129,10 @@ impl GlobalEnv {
             .and_then(|menv| {
                 menv.find_struct_by_identifier(tag.name.clone())
                     .map(|sid| menv.get_id().qualified(sid))
+                    .or_else(|| {
+                        menv.find_enum_by_identifier(tag.name.clone())
+                            .map(|sid| menv.get_id().qualified(sid))
+                    })
             })
     }
 
@@ -1244,16 +1246,23 @@ impl GlobalEnv {
         sid: DatatypeId,
         ts: &[Type],
     ) -> Option<language_storage::StructTag> {
-        self.get_struct_type(mid, sid, ts)?.into_struct_tag()
+        self.get_datatype(mid, sid, ts)?.into_struct_tag()
     }
 
     /// Attempt to compute a struct type for (`mid`, `sid`, `ts`).
-    pub fn get_struct_type(&self, mid: ModuleId, sid: DatatypeId, ts: &[Type]) -> Option<MType> {
+    pub fn get_datatype(&self, mid: ModuleId, sid: DatatypeId, ts: &[Type]) -> Option<MType> {
         let menv = self.get_module(mid);
+        let name = menv
+            .find_struct(sid.symbol())
+            .map(|senv| senv.get_identifier())
+            .or_else(|| {
+                menv.find_enum(sid.symbol())
+                    .map(|eenv| eenv.get_identifier())
+            })??;
         Some(MType::Struct {
             address: *menv.self_address(),
             module: menv.get_identifier(),
-            name: menv.get_struct(sid).get_identifier()?,
+            name,
             type_arguments: ts
                 .iter()
                 .map(|t| t.clone().into_normalized_type(self).unwrap())
@@ -2032,10 +2041,13 @@ impl<'env> ModuleEnv<'env> {
                     .env
                     .find_module(&self.env.to_module_name(&declaring_module))
                     .expect("undefined module");
-                let struct_env = declaring_module_env
-                    .find_struct(self.env.symbol_pool.make(sname))
-                    .expect("undefined struct");
-                Type::Datatype(declaring_module_env.data.id, struct_env.get_id(), vec![])
+                let name = self.env.symbol_pool.make(sname);
+                let datatype_id = declaring_module_env
+                    .find_struct(name)
+                    .map(|env| env.get_id())
+                    .or_else(|| declaring_module_env.find_enum(name).map(|env| env.get_id()))
+                    .expect("undefined datatype");
+                Type::Datatype(declaring_module_env.data.id, datatype_id, vec![])
             }
             SignatureToken::DatatypeInstantiation(inst) => {
                 let (handle_idx, args) = &**inst;
@@ -2048,12 +2060,15 @@ impl<'env> ModuleEnv<'env> {
                     .env
                     .find_module(&self.env.to_module_name(&declaring_module))
                     .expect("undefined module");
-                let struct_env = declaring_module_env
-                    .find_struct(self.env.symbol_pool.make(sname))
-                    .expect("undefined struct");
+                let name = self.env.symbol_pool.make(sname);
+                let datatype_id = declaring_module_env
+                    .find_struct(name)
+                    .map(|env| env.get_id())
+                    .or_else(|| declaring_module_env.find_enum(name).map(|env| env.get_id()))
+                    .expect("undefined datatype");
                 Type::Datatype(
                     declaring_module_env.data.id,
-                    struct_env.get_id(),
+                    datatype_id,
                     self.globalize_signatures(args),
                 )
             }
diff --git a/external-crates/move/crates/move-model/src/ty.rs b/external-crates/move/crates/move-model/src/ty.rs
index 4d74a64c5412b..31ef1d646d1b7 100644
--- a/external-crates/move/crates/move-model/src/ty.rs
+++ b/external-crates/move/crates/move-model/src/ty.rs
@@ -15,7 +15,7 @@ use move_core_types::language_storage::{StructTag, TypeTag};
 
 use crate::{
     ast::QualifiedSymbol,
-    model::{DatatypeId, GlobalEnv, ModuleId, QualifiedInstId, StructEnv},
+    model::{DatatypeId, GlobalEnv, ModuleId},
     symbol::{Symbol, SymbolPool},
 };
 
@@ -173,19 +173,18 @@ impl Type {
 
     /// Returns true if this is any number type.
     pub fn is_number(&self) -> bool {
-        if let Type::Primitive(p) = self {
-            if let PrimitiveType::U8
-            | PrimitiveType::U16
-            | PrimitiveType::U32
-            | PrimitiveType::U64
-            | PrimitiveType::U128
-            | PrimitiveType::U256
-            | PrimitiveType::Num = p
-            {
-                return true;
-            }
-        }
-        false
+        matches!(
+            self,
+            Type::Primitive(
+                PrimitiveType::U8
+                    | PrimitiveType::U16
+                    | PrimitiveType::U32
+                    | PrimitiveType::U64
+                    | PrimitiveType::U128
+                    | PrimitiveType::U256
+                    | PrimitiveType::Num,
+            )
+        )
     }
     /// Returns true if this is an address or signer type.
     pub fn is_signer_or_address(&self) -> bool {
@@ -233,38 +232,16 @@ impl Type {
         }
     }
 
-    /// If this is a struct type, replace the type instantiation.
-    pub fn replace_struct_instantiation(&self, inst: &[Type]) -> Type {
+    /// If this is a datatype, replace the type instantiation.
+    pub fn replace_datatype_instantiation(&self, inst: &[Type]) -> Type {
         match self {
             Type::Datatype(mid, sid, _) => Type::Datatype(*mid, *sid, inst.to_vec()),
             _ => self.clone(),
         }
     }
 
-    /// If this is a struct type, return the associated struct env and type parameters.
-    pub fn get_struct<'env>(
-        &'env self,
-        env: &'env GlobalEnv,
-    ) -> Option<(StructEnv<'env>, &'env [Type])> {
-        if let Type::Datatype(module_idx, struct_idx, params) = self {
-            Some((env.get_module(*module_idx).into_struct(*struct_idx), params))
-        } else {
-            None
-        }
-    }
-
-    /// If this is a struct type, return the associated QualifiedInstId.
-    pub fn get_struct_id(&self, env: &GlobalEnv) -> Option<QualifiedInstId<DatatypeId>> {
-        self.get_struct(env).map(|(se, inst)| {
-            se.module_env
-                .get_id()
-                .qualified(se.get_id())
-                .instantiate(inst.to_vec())
-        })
-    }
-
-    /// Require this to be a struct, if so extracts its content.
-    pub fn require_struct(&self) -> (ModuleId, DatatypeId, &[Type]) {
+    /// Require this to be a datatype, if so extracts its content.
+    pub fn require_datatype(&self) -> (ModuleId, DatatypeId, &[Type]) {
         if let Type::Datatype(mid, sid, targs) = self {
             (*mid, *sid, targs.as_slice())
         } else {
@@ -414,10 +391,10 @@ impl Type {
     }
 
     /// Attempt to convert this type into a normalized::Type
-    pub fn into_struct_type(self, env: &GlobalEnv) -> Option<MType> {
+    pub fn into_datatype_ty(self, env: &GlobalEnv) -> Option<MType> {
         use Type::*;
         match self {
-            Datatype(mid, sid, ts) => env.get_struct_type(mid, sid, &ts),
+            Datatype(mid, sid, ts) => env.get_datatype(mid, sid, &ts),
             _ => None,
         }
     }
@@ -428,7 +405,7 @@ impl Type {
         match self {
             Primitive(p) => Some(p.into_normalized_type().expect("Invariant violation: unexpected spec primitive")),
             Datatype(mid, sid, ts) =>
-                env.get_struct_type(mid, sid, &ts),
+                env.get_datatype(mid, sid, &ts),
             Vector(et) => Some(MType::Vector(
                 Box::new(et.into_normalized_type(env)
                     .expect("Invariant violation: vector type argument contains incomplete, tuple, or spec type"))
@@ -447,7 +424,7 @@ impl Type {
 
     /// Attempt to convert this type into a language_storage::StructTag
     pub fn into_struct_tag(self, env: &GlobalEnv) -> Option<StructTag> {
-        self.into_struct_type(env)?.into_struct_tag()
+        self.into_datatype_ty(env)?.into_struct_tag()
     }
 
     /// Attempt to convert this type into a language_storage::TypeTag
@@ -469,8 +446,8 @@ impl Type {
             TypeTag::Address => Primitive(PrimitiveType::Address),
             TypeTag::Signer => Primitive(PrimitiveType::Signer),
             TypeTag::Struct(s) => {
-                let qid = env.find_struct_by_tag(s).unwrap_or_else(|| {
-                    panic!("Invariant violation: couldn't resolve struct {:?}", s)
+                let qid = env.find_datatype_by_tag(s).unwrap_or_else(|| {
+                    panic!("Invariant violation: couldn't resolve datatype {:?}", s)
                 });
                 let type_args = s
                     .type_params
@@ -802,6 +779,7 @@ impl TypeUnificationAdapter {
     /// - any type parameter on the LHS with index < P will be treated as concrete types and
     /// - only type parameters on the LHS with index >= P are treated as variables and thus,
     ///   participate in the type unification process.
+    ///
     /// The same rule applies to the RHS parameters via `treat_rhs_type_param_as_var_after_index`.
     fn new<'a, I>(
         lhs_types: I,
@@ -1004,6 +982,7 @@ impl TypeInstantiationDerivation {
     /// - be assigned with a concrete type already and hence, ceases to be a type parameter, or
     /// - does not have any matching instantiation and hence, either remains a type parameter or is
     ///   represented as a type error.
+    ///
     /// But in anyway, these type parameters no longer participate in type unification anymore.
     ///
     /// If `target_lhs` is True, derive instantiations for the type parameter with
@@ -1065,6 +1044,7 @@ impl TypeInstantiationDerivation {
     ///     - finds all possible instantiations for parameter at index 2 (`inst_param_2`)
     ///     - for each instantiation in `inst_param_2`,
     ///       - ......
+    ///
     /// The process continues until all type parameters are analyzed (i.e., reaching the type
     /// parameter at index `N`).
     ///
@@ -1159,7 +1139,7 @@ impl TypeInstantiationDerivation {
 pub enum TypeDisplayContext<'a> {
     WithoutEnv {
         symbol_pool: &'a SymbolPool,
-        reverse_struct_table: &'a BTreeMap<(ModuleId, DatatypeId), QualifiedSymbol>,
+        reverse_datatype_table: &'a BTreeMap<(ModuleId, DatatypeId), QualifiedSymbol>,
     },
     WithEnv {
         env: &'a GlobalEnv,
@@ -1216,7 +1196,7 @@ impl<'a> fmt::Display for TypeDisplay<'a> {
             Vector(t) => write!(f, "vector<{}>", t.display(self.context)),
             TypeDomain(t) => write!(f, "domain<{}>", t.display(self.context)),
             ResourceDomain(mid, sid, inst_opt) => {
-                write!(f, "resources<{}", self.struct_str(*mid, *sid))?;
+                write!(f, "resources<{}", self.datatype_str(*mid, *sid))?;
                 if let Some(inst) = inst_opt {
                     f.write_str("<")?;
                     comma_list(f, inst)?;
@@ -1231,7 +1211,7 @@ impl<'a> fmt::Display for TypeDisplay<'a> {
                 write!(f, "{}", t.display(self.context))
             }
             Datatype(mid, sid, ts) => {
-                write!(f, "{}", self.struct_str(*mid, *sid))?;
+                write!(f, "{}", self.datatype_str(*mid, *sid))?;
                 if !ts.is_empty() {
                     f.write_str("<")?;
                     comma_list(f, ts)?;
@@ -1269,11 +1249,11 @@ impl<'a> fmt::Display for TypeDisplay<'a> {
 }
 
 impl<'a> TypeDisplay<'a> {
-    fn struct_str(&self, mid: ModuleId, sid: DatatypeId) -> String {
+    fn datatype_str(&self, mid: ModuleId, sid: DatatypeId) -> String {
         match self.context {
             TypeDisplayContext::WithoutEnv {
                 symbol_pool,
-                reverse_struct_table,
+                reverse_datatype_table: reverse_struct_table,
             } => {
                 if let Some(sym) = reverse_struct_table.get(&(mid, sid)) {
                     sym.display(symbol_pool).to_string()
@@ -1282,12 +1262,25 @@ impl<'a> TypeDisplay<'a> {
                 }
             }
             TypeDisplayContext::WithEnv { env, .. } => {
-                let struct_env = env.get_module(mid).into_struct(sid);
-                format!(
-                    "{}::{}",
-                    struct_env.module_env.get_name().display(env.symbol_pool()),
-                    struct_env.get_name().display(env.symbol_pool())
-                )
+                let menv = env.get_module(mid);
+                menv.find_struct(sid.symbol())
+                    .map(|senv| {
+                        format!(
+                            "{}::{}",
+                            senv.module_env.get_name().display(env.symbol_pool()),
+                            senv.get_name().display(env.symbol_pool()),
+                        )
+                    })
+                    .or_else(|| {
+                        menv.find_enum(sid.symbol()).map(|eenv| {
+                            format!(
+                                "{}::{}",
+                                eenv.module_env.get_name().display(env.symbol_pool()),
+                                eenv.get_name().display(env.symbol_pool()),
+                            )
+                        })
+                    })
+                    .expect("Unknown struct or enum")
             }
         }
     }
diff --git a/external-crates/move/crates/move-package/src/resolution/dependency_cache.rs b/external-crates/move/crates/move-package/src/resolution/dependency_cache.rs
index 7d2886052d3c8..6752f3f2fe39d 100644
--- a/external-crates/move/crates/move-package/src/resolution/dependency_cache.rs
+++ b/external-crates/move/crates/move-package/src/resolution/dependency_cache.rs
@@ -165,6 +165,7 @@ impl DependencyCache {
                             OsStr::new("fetch"),
                             OsStr::new("origin"),
                         ])
+                        .stdin(Stdio::null())
                         .stdout(Stdio::null())
                         .stderr(Stdio::null())
                         .status()
@@ -193,6 +194,7 @@ impl DependencyCache {
                             OsStr::new("--hard"),
                             OsStr::new(&format!("origin/{}", git_rev)),
                         ])
+                        .stdin(Stdio::null())
                         .stdout(Stdio::null())
                         .stderr(Stdio::null())
                         .status()
diff --git a/external-crates/move/crates/move-stackless-bytecode/src/access_path.rs b/external-crates/move/crates/move-stackless-bytecode/src/access_path.rs
index 52927f081a542..84d41e97e530d 100644
--- a/external-crates/move/crates/move-stackless-bytecode/src/access_path.rs
+++ b/external-crates/move/crates/move-stackless-bytecode/src/access_path.rs
@@ -6,6 +6,7 @@
 //! memory. Some examples of concrete paths are:
 //! * `0x7/M::T/f` (i.e., the field `f` of the `M::T` resource stored at address `0x7`
 //! * `Formal(0)/[2]` (i.e., the value stored at index 2 of the array bound the 0th formal of the current procedure)
+//!
 //! An abstract path is similar; it consists of the following components:
 //! * A *root*, which is either an abstract address or a local
 //! * Zero or more *offsets*, where an offset is a field, an unknown vector index, or an abstract struct type
diff --git a/external-crates/move/crates/move-stackless-bytecode/src/inconsistency_check.rs b/external-crates/move/crates/move-stackless-bytecode/src/inconsistency_check.rs
index 7ca6aad925ba2..8a5f2dec7e20a 100644
--- a/external-crates/move/crates/move-stackless-bytecode/src/inconsistency_check.rs
+++ b/external-crates/move/crates/move-stackless-bytecode/src/inconsistency_check.rs
@@ -11,6 +11,7 @@
 //! an `assert false` before
 //! - every `return` and
 //! - every `abort` (if the `unconditional-abort-as-inconsistency` option is set).
+//!
 //! In this way, if the instrumented `assert false` can be proved, it means we have an inconsistency
 //! in the specifications.
 //!
diff --git a/external-crates/move/crates/move-stackless-bytecode/src/packed_types_analysis.rs b/external-crates/move/crates/move-stackless-bytecode/src/packed_types_analysis.rs
index 1e0783cd8b308..10fc6fbe99891 100644
--- a/external-crates/move/crates/move-stackless-bytecode/src/packed_types_analysis.rs
+++ b/external-crates/move/crates/move-stackless-bytecode/src/packed_types_analysis.rs
@@ -26,6 +26,7 @@ use crate::{
 /// - Transaction scripts have at most 1 type argument
 /// - The only values that can be bound to a transaction script type argument are XUS and
 ///   XDX. Passing any other values will lead to an aborted transaction.
+///
 /// The first assumption is checked and will trigger an assert failure if violated. The second
 /// is unchecked, but would be a nice property for the prover.
 pub fn get_packed_types(
diff --git a/external-crates/move/crates/move-stdlib-natives/src/debug.rs b/external-crates/move/crates/move-stdlib-natives/src/debug.rs
index 1aee70ebed864..d4e55a46ea170 100644
--- a/external-crates/move/crates/move-stdlib-natives/src/debug.rs
+++ b/external-crates/move/crates/move-stdlib-natives/src/debug.rs
@@ -286,7 +286,7 @@ mod testing {
         Ok(())
     }
 
-    fn is_non_empty_vector_u8(vec: &Vec<A::MoveValue>) -> bool {
+    fn is_non_empty_vector_u8(vec: &[A::MoveValue]) -> bool {
         if vec.is_empty() {
             false
         } else {
diff --git a/external-crates/move/crates/move-vm-config/src/runtime.rs b/external-crates/move/crates/move-vm-config/src/runtime.rs
index 515efeec3f6ef..d51578a3d208d 100644
--- a/external-crates/move/crates/move-vm-config/src/runtime.rs
+++ b/external-crates/move/crates/move-vm-config/src/runtime.rs
@@ -33,6 +33,9 @@ pub struct VMConfig {
     pub error_execution_state: bool,
     // configuration for binary deserialization (modules)
     pub binary_config: BinaryConfig,
+    // Whether value serialization errors when generating type layouts should be rethrown or
+    // converted to a different error.
+    pub rethrow_serialization_type_layout_errors: bool,
 }
 
 impl Default for VMConfig {
@@ -46,6 +49,7 @@ impl Default for VMConfig {
             profiler_config: None,
             error_execution_state: true,
             binary_config: BinaryConfig::with_extraneous_bytes_check(false),
+            rethrow_serialization_type_layout_errors: false,
         }
     }
 }
diff --git a/external-crates/move/crates/move-vm-config/src/verifier.rs b/external-crates/move/crates/move-vm-config/src/verifier.rs
index d33febd865d83..d029b308cf260 100644
--- a/external-crates/move/crates/move-vm-config/src/verifier.rs
+++ b/external-crates/move/crates/move-vm-config/src/verifier.rs
@@ -77,12 +77,22 @@ impl Default for VerifierConfig {
     }
 }
 
+impl MeterConfig {
+    pub fn old_default() -> Self {
+        Self {
+            max_per_fun_meter_units: Some(8_000_000),
+            max_per_mod_meter_units: Some(8_000_000),
+            max_per_pkg_meter_units: Some(8_000_000),
+        }
+    }
+}
+
 impl Default for MeterConfig {
     fn default() -> Self {
         Self {
-            max_per_fun_meter_units: Some(1000 * 8000),
-            max_per_mod_meter_units: Some(1000 * 8000),
-            max_per_pkg_meter_units: Some(1000 * 8000),
+            max_per_fun_meter_units: Some(2_200_000),
+            max_per_mod_meter_units: Some(2_200_000),
+            max_per_pkg_meter_units: Some(2_200_000),
         }
     }
 }
diff --git a/external-crates/move/crates/move-vm-runtime/src/loader.rs b/external-crates/move/crates/move-vm-runtime/src/loader.rs
index 572aa9e787ed1..dd23015d2ab64 100644
--- a/external-crates/move/crates/move-vm-runtime/src/loader.rs
+++ b/external-crates/move/crates/move-vm-runtime/src/loader.rs
@@ -2355,7 +2355,7 @@ pub const VALUE_DEPTH_MAX: u64 = 128;
 
 /// Maximal nodes which are allowed when converting to layout. This includes the types of
 /// fields for struct types.
-/// Maximal nodes which are allowed when converting to layout. This includes the the types of
+/// Maximal nodes which are allowed when converting to layout. This includes the types of
 /// fields for datatypes.
 const MAX_TYPE_TO_LAYOUT_NODES: u64 = 256;
 
diff --git a/external-crates/move/crates/move-vm-runtime/src/runtime.rs b/external-crates/move/crates/move-vm-runtime/src/runtime.rs
index 924a8f9df983d..8a1a344f55b9f 100644
--- a/external-crates/move/crates/move-vm-runtime/src/runtime.rs
+++ b/external-crates/move/crates/move-vm-runtime/src/runtime.rs
@@ -265,11 +265,20 @@ impl VMRuntime {
             _ => (ty, value),
         };
 
-        let layout = self.loader.type_to_type_layout(ty).map_err(|_err| {
-            PartialVMError::new(StatusCode::VERIFICATION_ERROR).with_message(
-                "entry point functions cannot have non-serializable return types".to_string(),
-            )
-        })?;
+        let layout = if self
+            .loader()
+            .vm_config()
+            .rethrow_serialization_type_layout_errors
+        {
+            self.loader.type_to_type_layout(ty)?
+        } else {
+            self.loader.type_to_type_layout(ty).map_err(|_err| {
+                PartialVMError::new(StatusCode::VERIFICATION_ERROR).with_message(
+                    "entry point functions cannot have non-serializable return types".to_string(),
+                )
+            })?
+        };
+
         let bytes = value.simple_serialize(&layout).ok_or_else(|| {
             PartialVMError::new(StatusCode::UNKNOWN_INVARIANT_VIOLATION_ERROR)
                 .with_message("failed to serialize return values".to_string())
diff --git a/external-crates/move/crates/move-vm-runtime/src/tracing.rs b/external-crates/move/crates/move-vm-runtime/src/tracing.rs
index b016879c9bb45..a4c984c62a537 100644
--- a/external-crates/move/crates/move-vm-runtime/src/tracing.rs
+++ b/external-crates/move/crates/move-vm-runtime/src/tracing.rs
@@ -48,7 +48,6 @@ static DEBUGGING_ENABLED: Lazy<bool> =
 static LOGGING_FILE: Lazy<Mutex<File>> = Lazy::new(|| {
     Mutex::new(
         OpenOptions::new()
-            .write(true)
             .create(true)
             .append(true)
             .open(&*FILE_PATH)
diff --git a/external-crates/move/crates/move-vm-test-utils/src/gas_schedule.rs b/external-crates/move/crates/move-vm-test-utils/src/gas_schedule.rs
index 2d4cfed4537ed..128d7e4447841 100644
--- a/external-crates/move/crates/move-vm-test-utils/src/gas_schedule.rs
+++ b/external-crates/move/crates/move-vm-test-utils/src/gas_schedule.rs
@@ -33,10 +33,7 @@ use move_vm_types::{
 };
 use once_cell::sync::Lazy;
 use serde::{Deserialize, Serialize};
-use std::{
-    ops::{Add, Mul},
-    u64,
-};
+use std::ops::{Add, Mul};
 pub enum GasUnit {}
 
 pub type Gas = GasQuantity<GasUnit>;
diff --git a/external-crates/move/crates/move-vm-types/src/values/values_impl.rs b/external-crates/move/crates/move-vm-types/src/values/values_impl.rs
index e09471bf6e027..aab6897fdc244 100644
--- a/external-crates/move/crates/move-vm-types/src/values/values_impl.rs
+++ b/external-crates/move/crates/move-vm-types/src/values/values_impl.rs
@@ -2018,7 +2018,7 @@ impl IntegerValue {
         match self {
             U8(x) => Ok(x),
             U16(x) => {
-                if x > (std::u8::MAX as u16) {
+                if x > (u8::MAX as u16) {
                     Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
                         .with_message(format!("Cannot cast u16({}) to u8", x)))
                 } else {
@@ -2026,7 +2026,7 @@ impl IntegerValue {
                 }
             }
             U32(x) => {
-                if x > (std::u8::MAX as u32) {
+                if x > (u8::MAX as u32) {
                     Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
                         .with_message(format!("Cannot cast u32({}) to u8", x)))
                 } else {
@@ -2034,7 +2034,7 @@ impl IntegerValue {
                 }
             }
             U64(x) => {
-                if x > (std::u8::MAX as u64) {
+                if x > (u8::MAX as u64) {
                     Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
                         .with_message(format!("Cannot cast u64({}) to u8", x)))
                 } else {
@@ -2042,7 +2042,7 @@ impl IntegerValue {
                 }
             }
             U128(x) => {
-                if x > (std::u8::MAX as u128) {
+                if x > (u8::MAX as u128) {
                     Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
                         .with_message(format!("Cannot cast u128({}) to u8", x)))
                 } else {
@@ -2050,7 +2050,7 @@ impl IntegerValue {
                 }
             }
             U256(x) => {
-                if x > (u256::U256::from(std::u8::MAX)) {
+                if x > (u256::U256::from(u8::MAX)) {
                     Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
                         .with_message(format!("Cannot cast u256({}) to u8", x)))
                 } else {
@@ -2067,7 +2067,7 @@ impl IntegerValue {
             U8(x) => Ok(x as u16),
             U16(x) => Ok(x),
             U32(x) => {
-                if x > (std::u16::MAX as u32) {
+                if x > (u16::MAX as u32) {
                     Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
                         .with_message(format!("Cannot cast u32({}) to u16", x)))
                 } else {
@@ -2075,7 +2075,7 @@ impl IntegerValue {
                 }
             }
             U64(x) => {
-                if x > (std::u16::MAX as u64) {
+                if x > (u16::MAX as u64) {
                     Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
                         .with_message(format!("Cannot cast u64({}) to u16", x)))
                 } else {
@@ -2083,7 +2083,7 @@ impl IntegerValue {
                 }
             }
             U128(x) => {
-                if x > (std::u16::MAX as u128) {
+                if x > (u16::MAX as u128) {
                     Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
                         .with_message(format!("Cannot cast u128({}) to u16", x)))
                 } else {
@@ -2091,7 +2091,7 @@ impl IntegerValue {
                 }
             }
             U256(x) => {
-                if x > (u256::U256::from(std::u16::MAX)) {
+                if x > (u256::U256::from(u16::MAX)) {
                     Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
                         .with_message(format!("Cannot cast u256({}) to u16", x)))
                 } else {
@@ -2109,7 +2109,7 @@ impl IntegerValue {
             U16(x) => Ok(x as u32),
             U32(x) => Ok(x),
             U64(x) => {
-                if x > (std::u32::MAX as u64) {
+                if x > (u32::MAX as u64) {
                     Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
                         .with_message(format!("Cannot cast u64({}) to u32", x)))
                 } else {
@@ -2117,7 +2117,7 @@ impl IntegerValue {
                 }
             }
             U128(x) => {
-                if x > (std::u32::MAX as u128) {
+                if x > (u32::MAX as u128) {
                     Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
                         .with_message(format!("Cannot cast u128({}) to u32", x)))
                 } else {
@@ -2125,7 +2125,7 @@ impl IntegerValue {
                 }
             }
             U256(x) => {
-                if x > (u256::U256::from(std::u32::MAX)) {
+                if x > (u256::U256::from(u32::MAX)) {
                     Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
                         .with_message(format!("Cannot cast u128({}) to u32", x)))
                 } else {
@@ -2144,7 +2144,7 @@ impl IntegerValue {
             U32(x) => Ok(x as u64),
             U64(x) => Ok(x),
             U128(x) => {
-                if x > (std::u64::MAX as u128) {
+                if x > (u64::MAX as u128) {
                     Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
                         .with_message(format!("Cannot cast u128({}) to u64", x)))
                 } else {
@@ -2152,7 +2152,7 @@ impl IntegerValue {
                 }
             }
             U256(x) => {
-                if x > (u256::U256::from(std::u64::MAX)) {
+                if x > (u256::U256::from(u64::MAX)) {
                     Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
                         .with_message(format!("Cannot cast u256({}) to u64", x)))
                 } else {
@@ -2172,7 +2172,7 @@ impl IntegerValue {
             U64(x) => Ok(x as u128),
             U128(x) => Ok(x),
             U256(x) => {
-                if x > (u256::U256::from(std::u128::MAX)) {
+                if x > (u256::U256::from(u128::MAX)) {
                     Err(PartialVMError::new(StatusCode::ARITHMETIC_ERROR)
                         .with_message(format!("Cannot cast u256({}) to u128", x)))
                 } else {
diff --git a/external-crates/move/crates/test-generation/src/abstract_state.rs b/external-crates/move/crates/test-generation/src/abstract_state.rs
index 00325826f9402..b83e2759c98b9 100644
--- a/external-crates/move/crates/test-generation/src/abstract_state.rs
+++ b/external-crates/move/crates/test-generation/src/abstract_state.rs
@@ -511,7 +511,7 @@ impl AbstractState {
     pub fn stack_push(&mut self, item: AbstractValue) {
         // Programs that are large enough to exceed this bound
         // will not be generated
-        debug_assert!(self.stack.len() < usize::max_value());
+        debug_assert!(self.stack.len() < usize::MAX);
         self.stack.push(item);
     }
 
@@ -521,7 +521,7 @@ impl AbstractState {
         if let Some(abstract_value) = self.register_move() {
             // Programs that are large enough to exceed this bound
             // will not be generated
-            debug_assert!(self.stack.len() < usize::max_value());
+            debug_assert!(self.stack.len() < usize::MAX);
             self.stack.push(abstract_value);
             Ok(())
         } else {
diff --git a/external-crates/move/crates/test-generation/src/borrow_graph.rs b/external-crates/move/crates/test-generation/src/borrow_graph.rs
index df1ea3fde6c18..8d5a489a78136 100644
--- a/external-crates/move/crates/test-generation/src/borrow_graph.rs
+++ b/external-crates/move/crates/test-generation/src/borrow_graph.rs
@@ -67,7 +67,7 @@ impl BorrowGraph {
             }
             self.partition_map.insert(self.partition_counter, vec![n]);
             // Implication of `checked_add`
-            debug_assert!(self.partitions.len() < usize::max_value());
+            debug_assert!(self.partitions.len() < usize::MAX);
             self.partitions.push(self.partition_counter);
             Ok(())
         } else {
diff --git a/external-crates/move/crates/test-generation/src/bytecode_generator.rs b/external-crates/move/crates/test-generation/src/bytecode_generator.rs
index 3177706654b32..efbb3aae9141e 100644
--- a/external-crates/move/crates/test-generation/src/bytecode_generator.rs
+++ b/external-crates/move/crates/test-generation/src/bytecode_generator.rs
@@ -157,7 +157,7 @@ impl FunctionGenerationContext {
 
     pub fn incr_instruction_count(&mut self) -> Option<()> {
         self.bytecode_len += 1;
-        if self.bytecode_len >= (u16::max_value() - 1) as u64 {
+        if self.bytecode_len >= (u16::MAX - 1) as u64 {
             return None;
         }
         Some(())
@@ -357,25 +357,23 @@ impl<'a> BytecodeGenerator<'a> {
                 }
                 BytecodeType::U8(instruction) => {
                     // Generate a random u8 constant to load
-                    Some(instruction(self.rng.gen_range(0..u8::max_value())))
+                    Some(instruction(self.rng.gen_range(0..u8::MAX)))
                 }
                 BytecodeType::U16(instruction) => {
                     // Generate a random u16 constant to load
-                    Some(instruction(self.rng.gen_range(0..u16::max_value())))
+                    Some(instruction(self.rng.gen_range(0..u16::MAX)))
                 }
                 BytecodeType::U32(instruction) => {
                     // Generate a random u32 constant to load
-                    Some(instruction(self.rng.gen_range(0..u32::max_value())))
+                    Some(instruction(self.rng.gen_range(0..u32::MAX)))
                 }
                 BytecodeType::U64(instruction) => {
                     // Generate a random u64 constant to load
-                    Some(instruction(self.rng.gen_range(0..u64::max_value())))
+                    Some(instruction(self.rng.gen_range(0..u64::MAX)))
                 }
                 BytecodeType::U128(instruction) => {
                     // Generate a random u128 constant to load
-                    Some(instruction(Box::new(
-                        self.rng.gen_range(0..u128::max_value()),
-                    )))
+                    Some(instruction(Box::new(self.rng.gen_range(0..u128::MAX))))
                 }
                 BytecodeType::U256(instruction) => {
                     // Generate a random u256 constant to load
@@ -442,7 +440,7 @@ impl<'a> BytecodeGenerator<'a> {
                     || unsatisfied_preconditions == 0
                 {
                     // The size of matches cannot be greater than the number of bytecode instructions
-                    debug_assert!(matches.len() < usize::max_value());
+                    debug_assert!(matches.len() < usize::MAX);
                     matches.push((*stack_effect, instruction));
                 }
             }
@@ -572,7 +570,7 @@ impl<'a> BytecodeGenerator<'a> {
         exact: bool,
     ) -> Option<AbstractState> {
         // Bytecode will never be generated this large
-        debug_assert!(bytecode.len() < usize::max_value());
+        debug_assert!(bytecode.len() < usize::MAX);
         debug!("**********************");
         debug!("State1: {}", state);
         debug!("Next instr: {:?}", instruction);
diff --git a/external-crates/move/crates/test-generation/src/control_flow_graph.rs b/external-crates/move/crates/test-generation/src/control_flow_graph.rs
index 78100aa710d89..341d68ed5f6d7 100644
--- a/external-crates/move/crates/test-generation/src/control_flow_graph.rs
+++ b/external-crates/move/crates/test-generation/src/control_flow_graph.rs
@@ -95,22 +95,22 @@ impl CFG {
             // The number of edges will be at most `2*target_blocks``
             // Since target blocks is at most a `u16`, this will not overflow even if
             // `usize` is a `u32`
-            debug_assert!(edges.len() < usize::max_value());
+            debug_assert!(edges.len() < usize::MAX);
             edges.push((parent_block_id, current_block_id));
             block_queue.push_back(current_block_id);
             // `current_block_id` is bound by the max og `target_block_size`
-            debug_assert!(current_block_id < u16::max_value());
+            debug_assert!(current_block_id < u16::MAX);
             current_block_id += 1;
             // Generate a second child edge with prob = 1/2
             if rng.gen_bool(0.5) && current_block_id < target_blocks {
                 // The number of edges will be at most `2*target_blocks``
                 // Since target blocks is at most a `u16`, this will not overflow even if
                 // `usize` is a `u32`
-                debug_assert!(edges.len() < usize::max_value());
+                debug_assert!(edges.len() < usize::MAX);
                 edges.push((parent_block_id, current_block_id));
                 block_queue.push_back(current_block_id);
                 // `current_block_id` is bound by the max og `target_block_size`
-                debug_assert!(current_block_id < u16::max_value());
+                debug_assert!(current_block_id < u16::MAX);
                 current_block_id += 1;
             }
         }
@@ -156,7 +156,7 @@ impl CFG {
         for (parent, child) in self.edges.iter() {
             if *parent == block_id {
                 // Length is bound by iteration on `self.edges`
-                debug_assert!(children_ids.len() < usize::max_value());
+                debug_assert!(children_ids.len() < usize::MAX);
                 children_ids.push(*child);
             }
         }
@@ -175,7 +175,7 @@ impl CFG {
         for (parent, child) in self.edges.iter() {
             if *child == block_id {
                 // Iteration is bound by the self.edges vector length
-                debug_assert!(parent_ids.len() < usize::max_value());
+                debug_assert!(parent_ids.len() < usize::MAX);
                 parent_ids.push(*parent);
             }
         }
diff --git a/external-crates/move/crates/test-generation/src/lib.rs b/external-crates/move/crates/test-generation/src/lib.rs
index 4a4ce8449659a..676044d88b632 100644
--- a/external-crates/move/crates/test-generation/src/lib.rs
+++ b/external-crates/move/crates/test-generation/src/lib.rs
@@ -236,9 +236,7 @@ pub fn module_frame_generation(
     let mut module = generate_module(&mut rng, generation_options.clone());
     // Either get the number of iterations provided by the user, or iterate "infinitely"--up to
     // u128::MAX number of times.
-    let iters = num_iters
-        .map(|x| x as u128)
-        .unwrap_or_else(|| std::u128::MAX);
+    let iters = num_iters.map(|x| x as u128).unwrap_or_else(|| u128::MAX);
 
     while generated < iters && sender.send(module).is_ok() {
         module = generate_module(&mut rng, generation_options.clone());
diff --git a/external-crates/move/crates/test-generation/tests/generic_instructions.rs b/external-crates/move/crates/test-generation/tests/generic_instructions.rs
index 66eb17078de50..0f6305f419638 100644
--- a/external-crates/move/crates/test-generation/tests/generic_instructions.rs
+++ b/external-crates/move/crates/test-generation/tests/generic_instructions.rs
@@ -13,7 +13,7 @@ use test_generation::transitions::Subst;
 #[test]
 fn unify_no_subst() {
     use SignatureToken::*;
-    let tys = vec![Bool, U64, Vector(Box::new(U8)), Address];
+    let tys = [Bool, U64, Vector(Box::new(U8)), Address];
     for tok1 in tys.iter() {
         for tok2 in tys.iter() {
             let should_unify = tok1.clone() == tok2.clone();
diff --git a/external-crates/move/move-execution/v0/crates/bytecode-verifier-tests/src/unit_tests/mod.rs b/external-crates/move/move-execution/v0/crates/bytecode-verifier-tests/src/unit_tests/mod.rs
index b18560955e1e9..20ef87ddf6fa1 100644
--- a/external-crates/move/move-execution/v0/crates/bytecode-verifier-tests/src/unit_tests/mod.rs
+++ b/external-crates/move/move-execution/v0/crates/bytecode-verifier-tests/src/unit_tests/mod.rs
@@ -53,6 +53,6 @@ pub(crate) fn production_config() -> (VerifierConfig, MeterConfig) {
             bytecode_version: VERSION_6,
             max_variants_in_enum: Some(VARIANT_COUNT_MAX),
         },
-        MeterConfig::default(),
+        MeterConfig::old_default(),
     )
 }
diff --git a/external-crates/move/move-execution/v0/crates/move-bytecode-verifier/src/control_flow_v5.rs b/external-crates/move/move-execution/v0/crates/move-bytecode-verifier/src/control_flow_v5.rs
index b24d7aeca62b9..eb705b9498b8b 100644
--- a/external-crates/move/move-execution/v0/crates/move-bytecode-verifier/src/control_flow_v5.rs
+++ b/external-crates/move/move-execution/v0/crates/move-bytecode-verifier/src/control_flow_v5.rs
@@ -37,7 +37,7 @@ pub fn verify(
 
 fn verify_fallthrough(
     current_function: FunctionDefinitionIndex,
-    code: &Vec<Bytecode>,
+    code: &[Bytecode],
 ) -> PartialVMResult<()> {
     // Check to make sure that the bytecode vector ends with a branching instruction.
     match code.last() {
diff --git a/external-crates/move/move-execution/v0/crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs b/external-crates/move/move-execution/v0/crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs
index d8d7b9f00a9a9..673660db4466b 100644
--- a/external-crates/move/move-execution/v0/crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs
+++ b/external-crates/move/move-execution/v0/crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs
@@ -512,6 +512,7 @@ impl AbstractState {
         Ok(AbstractValue::Reference(elem_id))
     }
 
+    #[allow(deprecated)]
     pub fn call(
         &mut self,
         offset: CodeOffset,
diff --git a/external-crates/move/move-execution/v0/crates/move-bytecode-verifier/src/script_signature.rs b/external-crates/move/move-execution/v0/crates/move-bytecode-verifier/src/script_signature.rs
index b55ea638e1e3d..35b065b204dbe 100644
--- a/external-crates/move/move-execution/v0/crates/move-bytecode-verifier/src/script_signature.rs
+++ b/external-crates/move/move-execution/v0/crates/move-bytecode-verifier/src/script_signature.rs
@@ -9,6 +9,7 @@
 //! - (DEPRECATED) Has an empty return type
 //! - All return types are not references
 //! - Satisfies the additional checks provided as an argument via `check_signature`
+//!
 //! `check_signature` should be used by adapters to quickly and easily verify custom signature
 //! rules for entrypoints
 
diff --git a/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/tracing.rs b/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/tracing.rs
index b016879c9bb45..a4c984c62a537 100644
--- a/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/tracing.rs
+++ b/external-crates/move/move-execution/v0/crates/move-vm-runtime/src/tracing.rs
@@ -48,7 +48,6 @@ static DEBUGGING_ENABLED: Lazy<bool> =
 static LOGGING_FILE: Lazy<Mutex<File>> = Lazy::new(|| {
     Mutex::new(
         OpenOptions::new()
-            .write(true)
             .create(true)
             .append(true)
             .open(&*FILE_PATH)
diff --git a/external-crates/move/move-execution/v1/crates/bytecode-verifier-tests/src/unit_tests/mod.rs b/external-crates/move/move-execution/v1/crates/bytecode-verifier-tests/src/unit_tests/mod.rs
index b18560955e1e9..20ef87ddf6fa1 100644
--- a/external-crates/move/move-execution/v1/crates/bytecode-verifier-tests/src/unit_tests/mod.rs
+++ b/external-crates/move/move-execution/v1/crates/bytecode-verifier-tests/src/unit_tests/mod.rs
@@ -53,6 +53,6 @@ pub(crate) fn production_config() -> (VerifierConfig, MeterConfig) {
             bytecode_version: VERSION_6,
             max_variants_in_enum: Some(VARIANT_COUNT_MAX),
         },
-        MeterConfig::default(),
+        MeterConfig::old_default(),
     )
 }
diff --git a/external-crates/move/move-execution/v1/crates/move-bytecode-verifier/src/control_flow_v5.rs b/external-crates/move/move-execution/v1/crates/move-bytecode-verifier/src/control_flow_v5.rs
index b24d7aeca62b9..eb705b9498b8b 100644
--- a/external-crates/move/move-execution/v1/crates/move-bytecode-verifier/src/control_flow_v5.rs
+++ b/external-crates/move/move-execution/v1/crates/move-bytecode-verifier/src/control_flow_v5.rs
@@ -37,7 +37,7 @@ pub fn verify(
 
 fn verify_fallthrough(
     current_function: FunctionDefinitionIndex,
-    code: &Vec<Bytecode>,
+    code: &[Bytecode],
 ) -> PartialVMResult<()> {
     // Check to make sure that the bytecode vector ends with a branching instruction.
     match code.last() {
diff --git a/external-crates/move/move-execution/v1/crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs b/external-crates/move/move-execution/v1/crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs
index d8d7b9f00a9a9..673660db4466b 100644
--- a/external-crates/move/move-execution/v1/crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs
+++ b/external-crates/move/move-execution/v1/crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs
@@ -512,6 +512,7 @@ impl AbstractState {
         Ok(AbstractValue::Reference(elem_id))
     }
 
+    #[allow(deprecated)]
     pub fn call(
         &mut self,
         offset: CodeOffset,
diff --git a/external-crates/move/move-execution/v1/crates/move-bytecode-verifier/src/script_signature.rs b/external-crates/move/move-execution/v1/crates/move-bytecode-verifier/src/script_signature.rs
index b55ea638e1e3d..35b065b204dbe 100644
--- a/external-crates/move/move-execution/v1/crates/move-bytecode-verifier/src/script_signature.rs
+++ b/external-crates/move/move-execution/v1/crates/move-bytecode-verifier/src/script_signature.rs
@@ -9,6 +9,7 @@
 //! - (DEPRECATED) Has an empty return type
 //! - All return types are not references
 //! - Satisfies the additional checks provided as an argument via `check_signature`
+//!
 //! `check_signature` should be used by adapters to quickly and easily verify custom signature
 //! rules for entrypoints
 
diff --git a/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/tracing.rs b/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/tracing.rs
index b016879c9bb45..a4c984c62a537 100644
--- a/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/tracing.rs
+++ b/external-crates/move/move-execution/v1/crates/move-vm-runtime/src/tracing.rs
@@ -48,7 +48,6 @@ static DEBUGGING_ENABLED: Lazy<bool> =
 static LOGGING_FILE: Lazy<Mutex<File>> = Lazy::new(|| {
     Mutex::new(
         OpenOptions::new()
-            .write(true)
             .create(true)
             .append(true)
             .open(&*FILE_PATH)
diff --git a/external-crates/move/move-execution/v2/crates/bytecode-verifier-tests/src/unit_tests/mod.rs b/external-crates/move/move-execution/v2/crates/bytecode-verifier-tests/src/unit_tests/mod.rs
index b18560955e1e9..20ef87ddf6fa1 100644
--- a/external-crates/move/move-execution/v2/crates/bytecode-verifier-tests/src/unit_tests/mod.rs
+++ b/external-crates/move/move-execution/v2/crates/bytecode-verifier-tests/src/unit_tests/mod.rs
@@ -53,6 +53,6 @@ pub(crate) fn production_config() -> (VerifierConfig, MeterConfig) {
             bytecode_version: VERSION_6,
             max_variants_in_enum: Some(VARIANT_COUNT_MAX),
         },
-        MeterConfig::default(),
+        MeterConfig::old_default(),
     )
 }
diff --git a/external-crates/move/move-execution/v2/crates/move-bytecode-verifier/src/control_flow_v5.rs b/external-crates/move/move-execution/v2/crates/move-bytecode-verifier/src/control_flow_v5.rs
index b24d7aeca62b9..eb705b9498b8b 100644
--- a/external-crates/move/move-execution/v2/crates/move-bytecode-verifier/src/control_flow_v5.rs
+++ b/external-crates/move/move-execution/v2/crates/move-bytecode-verifier/src/control_flow_v5.rs
@@ -37,7 +37,7 @@ pub fn verify(
 
 fn verify_fallthrough(
     current_function: FunctionDefinitionIndex,
-    code: &Vec<Bytecode>,
+    code: &[Bytecode],
 ) -> PartialVMResult<()> {
     // Check to make sure that the bytecode vector ends with a branching instruction.
     match code.last() {
diff --git a/external-crates/move/move-execution/v2/crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs b/external-crates/move/move-execution/v2/crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs
index d8d7b9f00a9a9..673660db4466b 100644
--- a/external-crates/move/move-execution/v2/crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs
+++ b/external-crates/move/move-execution/v2/crates/move-bytecode-verifier/src/reference_safety/abstract_state.rs
@@ -512,6 +512,7 @@ impl AbstractState {
         Ok(AbstractValue::Reference(elem_id))
     }
 
+    #[allow(deprecated)]
     pub fn call(
         &mut self,
         offset: CodeOffset,
diff --git a/external-crates/move/move-execution/v2/crates/move-bytecode-verifier/src/script_signature.rs b/external-crates/move/move-execution/v2/crates/move-bytecode-verifier/src/script_signature.rs
index b55ea638e1e3d..35b065b204dbe 100644
--- a/external-crates/move/move-execution/v2/crates/move-bytecode-verifier/src/script_signature.rs
+++ b/external-crates/move/move-execution/v2/crates/move-bytecode-verifier/src/script_signature.rs
@@ -9,6 +9,7 @@
 //! - (DEPRECATED) Has an empty return type
 //! - All return types are not references
 //! - Satisfies the additional checks provided as an argument via `check_signature`
+//!
 //! `check_signature` should be used by adapters to quickly and easily verify custom signature
 //! rules for entrypoints
 
diff --git a/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/tracing.rs b/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/tracing.rs
index b016879c9bb45..a4c984c62a537 100644
--- a/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/tracing.rs
+++ b/external-crates/move/move-execution/v2/crates/move-vm-runtime/src/tracing.rs
@@ -48,7 +48,6 @@ static DEBUGGING_ENABLED: Lazy<bool> =
 static LOGGING_FILE: Lazy<Mutex<File>> = Lazy::new(|| {
     Mutex::new(
         OpenOptions::new()
-            .write(true)
             .create(true)
             .append(true)
             .open(&*FILE_PATH)
diff --git a/fullnode.yaml b/fullnode.yaml
new file mode 100644
index 0000000000000..18f0be5f16fea
--- /dev/null
+++ b/fullnode.yaml
@@ -0,0 +1,65 @@
+# fetch snapshot
+# sui-tool download-db-snapshot --latest \
+#     --network mainnet \
+#     --path /db-files \
+#     --num-parallel-downloads 1000 \
+#     --skip-indexes \
+#     --no-sign-request
+
+# sui-tool download-formal-snapshot --latest \
+#     --network mainnet \
+#     --genesis /root/sui/genesis.blob \
+#     --path /db-files \
+#     --num-parallel-downloads 1000 \
+#     --no-sign-request
+
+# Update this value to the location you want Sui to store its database
+db-path: "/db-files"
+
+# For ipv4, update this to "/ipv4/X.X.X.X/tcp/8080/http"
+network-address: "/dns/localhost/tcp/8080/http"
+metrics-address: "0.0.0.0:9185"
+# this address is also used for web socket connections
+json-rpc-address: "0.0.0.0:9000"
+enable-event-processing: true
+
+genesis:
+  # Update this to the location of where the genesis file is stored
+  genesis-file-location: "/root/sui/genesis.blob"
+
+authority-store-pruning-config:
+  num-latest-epoch-dbs-to-retain: 0
+  epoch-db-pruning-period-secs: 3600
+  num-epochs-to-retain: 0
+  max-checkpoints-in-batch: 10
+  max-transactions-in-batch: 1000
+  pruning-run-delay-seconds: 60
+  periodic-compaction-threshold-days: 1
+  num-epochs-to-retain-for-checkpoints: 2
+# checkpoint-executor-config:
+#   checkpoint-execution-max-concurrency: 200
+#   local-execution-timeout-sec: 30
+#   data-ingestion-dir: /root/sui-blocks
+  
+p2p-config:
+  seed-peers:
+    - address: /dns/mel-00.mainnet.sui.io/udp/8084
+      peer-id: d32b55bdf1737ec415df8c88b3bf91e194b59ee3127e3f38ea46fd88ba2e7849
+    - address: /dns/ewr-00.mainnet.sui.io/udp/8084
+      peer-id: c7bf6cb93ca8fdda655c47ebb85ace28e6931464564332bf63e27e90199c50ee
+    - address: /dns/ewr-01.mainnet.sui.io/udp/8084
+      peer-id: 3227f8a05f0faa1a197c075d31135a366a1c6f3d4872cb8af66c14dea3e0eb66
+    - address: /dns/lhr-00.mainnet.sui.io/udp/8084
+      peer-id: c619a5e0f8f36eac45118c1f8bda28f0f508e2839042781f1d4a9818043f732c
+    - address: /dns/sui-mainnet-ssfn-1.nodeinfra.com/udp/8084
+      peer-id: 0c52ca8d2b9f51be4a50eb44ace863c05aadc940a7bd15d4d3f498deb81d7fc6
+    - address: /dns/sui-mainnet-ssfn-2.nodeinfra.com/udp/8084
+      peer-id: 1dbc28c105aa7eb9d1d3ac07ae663ea638d91f2b99c076a52bbded296bd3ed5c
+    - address: /dns/sui-mainnet-ssfn-ashburn-na.overclock.run/udp/8084
+      peer-id: 5ff8461ab527a8f241767b268c7aaf24d0312c7b923913dd3c11ee67ef181e45
+    - address: /dns/sui-mainnet-ssfn-dallas-na.overclock.run/udp/8084
+      peer-id: e1a4f40d66f1c89559a195352ba9ff84aec28abab1d3aa1c491901a252acefa6
+    - address: /dns/ssn01.mainnet.sui.rpcpool.com/udp/8084
+      peer-id: fadb7ccb0b7fc99223419176e707f5122fef4ea686eb8e80d1778588bf5a0bcd
+    - address: /dns/ssn02.mainnet.sui.rpcpool.com/udp/8084
+      peer-id: 13783584a90025b87d4604f1991252221e5fd88cab40001642f4b00111ae9b7e
\ No newline at end of file
diff --git a/genesis.blob b/genesis.blob
new file mode 100644
index 0000000000000..293e7e2be9c64
Binary files /dev/null and b/genesis.blob differ
diff --git a/narwhal/config/src/lib.rs b/narwhal/config/src/lib.rs
index 37f92aec91fb9..6ee97a903091f 100644
--- a/narwhal/config/src/lib.rs
+++ b/narwhal/config/src/lib.rs
@@ -99,7 +99,11 @@ 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).write(true).open(path)?;
+            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())?;
diff --git a/narwhal/network/Cargo.toml b/narwhal/network/Cargo.toml
index 4a97a99051dbc..f13a037099151 100644
--- a/narwhal/network/Cargo.toml
+++ b/narwhal/network/Cargo.toml
@@ -28,7 +28,6 @@ anemo.workspace = true
 anemo-tower.workspace = true
 anyhow.workspace = true
 axum.workspace = true
-axum-server.workspace = true
 tower.workspace = true
 
 [dev-dependencies]
diff --git a/narwhal/network/src/admin.rs b/narwhal/network/src/admin.rs
index ddf660d4dbe05..02ba0b8f7a811 100644
--- a/narwhal/network/src/admin.rs
+++ b/narwhal/network/src/admin.rs
@@ -2,9 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use axum::{extract::Extension, http::StatusCode, routing::get, Json, Router};
-use mysten_metrics::{spawn_logged_monitored_task, spawn_monitored_task};
-use std::net::{IpAddr, Ipv4Addr, SocketAddr, TcpListener};
+use mysten_metrics::spawn_logged_monitored_task;
+use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use std::time::Duration;
+use tokio::net::TcpListener;
 use tokio::task::JoinHandle;
 use tokio::time::sleep;
 use tracing::{error, info};
@@ -27,15 +28,7 @@ pub fn start_admin_server(
         "starting admin server"
     );
 
-    let handle = axum_server::Handle::new();
-    let shutdown_handle = handle.clone();
-
     let mut handles = Vec::new();
-    // Spawn a task to shutdown server.
-    handles.push(spawn_monitored_task!(async move {
-        _ = tr_shutdown.receiver.recv().await;
-        handle.clone().shutdown();
-    }));
 
     handles.push(spawn_logged_monitored_task!(
         async move {
@@ -45,11 +38,12 @@ pub fn start_admin_server(
             loop {
                 total_retries -= 1;
 
-                match TcpListener::bind(socket_address) {
+                match TcpListener::bind(socket_address).await {
                     Ok(listener) => {
-                        axum_server::from_tcp(listener)
-                            .handle(shutdown_handle)
-                            .serve(router.into_make_service())
+                        axum::serve(listener, router)
+                            .with_graceful_shutdown(async move {
+                                _ = tr_shutdown.receiver.recv().await;
+                            })
                             .await
                             .unwrap_or_else(|err| {
                                 panic!("Failed to boot admin {}: {err}", socket_address)
diff --git a/narwhal/node/src/benchmark_client.rs b/narwhal/node/src/benchmark_client.rs
index 1f6e10843dfec..a8d721f882d8c 100644
--- a/narwhal/node/src/benchmark_client.rs
+++ b/narwhal/node/src/benchmark_client.rs
@@ -31,6 +31,7 @@ use worker::LazyNarwhalClient;
 /// * the size of the transactions via the --size property
 /// * the worker address <ADDR> to send the transactions to. A url format is expected ex http://127.0.0.1:7000
 /// * the rate of sending transactions via the --rate parameter
+///
 /// Optionally the --nodes parameter can be passed where a list of worker addresses
 /// should be passed. The benchmarking client will first try to connect to all of those nodes before start sending
 /// any transactions. That confirms the system is up and running and ready to start processing the transactions.
diff --git a/narwhal/node/src/main.rs b/narwhal/node/src/main.rs
index 8de09ecd12106..3aa919b9b5012 100644
--- a/narwhal/node/src/main.rs
+++ b/narwhal/node/src/main.rs
@@ -303,7 +303,7 @@ async fn main() -> Result<(), eyre::Report> {
 
 /// Generate all the genesis files required for benchmarks.
 fn benchmark_genesis(
-    ips: &Vec<String>,
+    ips: &[String],
     working_directory: &PathBuf,
     num_workers: usize,
     base_port: usize,
diff --git a/narwhal/node/src/metrics.rs b/narwhal/node/src/metrics.rs
index 772c07a48aab1..8e3e06794bdc8 100644
--- a/narwhal/node/src/metrics.rs
+++ b/narwhal/node/src/metrics.rs
@@ -105,10 +105,8 @@ pub fn start_prometheus_server(addr: Multiaddr, registry: &Registry) -> JoinHand
 
     spawn_logged_monitored_task!(
         async move {
-            axum::Server::bind(&socket_addr)
-                .serve(app.into_make_service())
-                .await
-                .unwrap();
+            let listener = tokio::net::TcpListener::bind(&socket_addr).await.unwrap();
+            axum::serve(listener, app).await.unwrap();
         },
         "MetricsServerTask"
     )
diff --git a/narwhal/primary/src/consensus/metrics.rs b/narwhal/primary/src/consensus/metrics.rs
index d855a249327bf..11a16da29d8f9 100644
--- a/narwhal/primary/src/consensus/metrics.rs
+++ b/narwhal/primary/src/consensus/metrics.rs
@@ -37,7 +37,7 @@ pub struct ConsensusMetrics {
     /// all the nodes are expected to report the same results. For every leader of each round the
     /// output can be one of the following:
     /// * committed: the leader has been found and its subdag will get committed - no matter if the leader
-    /// is committed on its time or not (part of recursion)
+    ///     is committed on its time or not (part of recursion)
     /// * not_found: the leader has not been found on the commit path and doesn't get committed
     /// * no_path: the leader exists but there is no path that leads to it
     pub leader_election: IntCounterVec,
@@ -135,9 +135,9 @@ pub struct ChannelMetrics {
     /// occupancy of the channel from the `Consensus` to `SubscriberHandler`.
     /// See also:
     /// * tx_committed_certificates in primary, where the committed certificates
-    /// from `Consensus` are sent to `primary::StateHandler`
+    ///     from `Consensus` are sent to `primary::StateHandler`
     /// * tx_new_certificates where the newly accepted certificates are sent
-    /// from `primary::Synchronizer` to `Consensus`
+    ///     from `primary::Synchronizer` to `Consensus`
     pub tx_sequence: IntGauge,
 }
 
diff --git a/narwhal/primary/src/synchronizer.rs b/narwhal/primary/src/synchronizer.rs
index 6ce964d43501a..f7953c8bfab87 100644
--- a/narwhal/primary/src/synchronizer.rs
+++ b/narwhal/primary/src/synchronizer.rs
@@ -336,6 +336,7 @@ impl Inner {
 /// - Validating and accepting certificates received from peers.
 /// - Triggering fetching for certificates and batches.
 /// - Broadcasting created certificates.
+///
 /// `Synchronizer` contains most of the certificate processing logic in Narwhal.
 #[derive(Clone)]
 pub struct Synchronizer {
@@ -1516,9 +1517,7 @@ impl State {
     ) -> Option<((u64, CertificateDigest), Option<SuspendedCertificate>)> {
         // Accept suspended certificates at and below gc round because their parents will not
         // be accepted into the DAG store anymore, in sanitize_certificate().
-        let Some(((round, digest), _children)) = self.missing.first_key_value() else {
-            return None;
-        };
+        let ((round, digest), _children) = self.missing.first_key_value()?;
         // Note that gc_round is the highest round where certificates are gc'ed, and which will
         // never be in a consensus commit. It's safe to gc up to gc_round, so anything suspended on gc_round + 1
         // can safely be accepted as their parents (of gc_round) have already been removed from the DAG.
diff --git a/narwhal/primary/tests/nodes_bootstrapping_tests.rs b/narwhal/primary/tests/nodes_bootstrapping_tests.rs
index 60c0c2293c5d5..373676bfe7cb1 100644
--- a/narwhal/primary/tests/nodes_bootstrapping_tests.rs
+++ b/narwhal/primary/tests/nodes_bootstrapping_tests.rs
@@ -40,12 +40,7 @@ async fn test_response_error_after_shutdown_internal_consensus() {
     let Err(e) = client.submit_transaction(txn).await else {
         panic!("Submitting transactions after Narwhal shutdown should fail!");
     };
-    assert!(
-        e.message()
-            .contains("error trying to connect: tcp connect error:"),
-        "Actual: {}",
-        e
-    );
+    assert!(e.message().contains("tcp connect error:"), "Actual: {}", e);
 }
 
 /// Nodes will be started in a staggered fashion. This is simulating
diff --git a/narwhal/primary/tests/randomized_tests.rs b/narwhal/primary/tests/randomized_tests.rs
index 79274b9dbdd18..db357ab53ae5a 100644
--- a/narwhal/primary/tests/randomized_tests.rs
+++ b/narwhal/primary/tests/randomized_tests.rs
@@ -299,7 +299,7 @@ fn generate_randomised_dag(
 /// * nodes that don't create certificates at all for some rounds (failures)
 /// * leaders that don't get enough support (f+1) for their immediate round
 /// * slow nodes - nodes that create certificates but those might not referenced by nodes of
-/// subsequent rounds.
+///     subsequent rounds.
 pub fn make_certificates_with_parameters(
     seed: u64,
     committee: &Committee,
diff --git a/narwhal/storage/src/certificate_store.rs b/narwhal/storage/src/certificate_store.rs
index 17517c5edd686..8f1264f94745d 100644
--- a/narwhal/storage/src/certificate_store.rs
+++ b/narwhal/storage/src/certificate_store.rs
@@ -187,50 +187,6 @@ impl Cache for CertificateStoreCache {
     }
 }
 
-/// An implementation that basically disables the caching functionality when used for CertificateStore.
-#[derive(Clone)]
-struct NoCache {}
-
-impl Cache for NoCache {
-    fn write(&self, _certificate: Certificate) {
-        // no-op
-    }
-
-    fn write_all(&self, _certificate: Vec<Certificate>) {
-        // no-op
-    }
-
-    fn read(&self, _digest: &CertificateDigest) -> Option<Certificate> {
-        None
-    }
-
-    fn read_all(
-        &self,
-        digests: Vec<CertificateDigest>,
-    ) -> Vec<(CertificateDigest, Option<Certificate>)> {
-        digests.into_iter().map(|digest| (digest, None)).collect()
-    }
-
-    fn contains(&self, _digest: &CertificateDigest) -> bool {
-        false
-    }
-
-    fn multi_contains<'a>(
-        &self,
-        digests: impl Iterator<Item = &'a CertificateDigest>,
-    ) -> Vec<bool> {
-        digests.map(|_| false).collect()
-    }
-
-    fn remove(&self, _digest: &CertificateDigest) {
-        // no-op
-    }
-
-    fn remove_all(&self, _digests: Vec<CertificateDigest>) {
-        // no-op
-    }
-}
-
 /// The main storage when we have to deal with certificates. It maintains
 /// two storages, one main which saves the certificates by their ids, and a
 /// secondary one which acts as an index to allow us fast retrieval based
@@ -731,7 +687,7 @@ impl<T: Cache> CertificateStore<T> {
 
 #[cfg(test)]
 mod test {
-    use crate::certificate_store::{CertificateStore, NoCache};
+    use crate::certificate_store::CertificateStore;
     use crate::{Cache, CertificateStoreCache};
     use config::AuthorityIdentifier;
     use fastcrypto::hash::Hash;
@@ -749,6 +705,50 @@ mod test {
     use test_utils::{latest_protocol_version, temp_dir, CommitteeFixture};
     use types::{Certificate, CertificateAPI, CertificateDigest, HeaderAPI, Round};
 
+    /// An implementation that basically disables the caching functionality when used for CertificateStore.
+    #[derive(Clone)]
+    struct NoCache {}
+
+    impl Cache for NoCache {
+        fn write(&self, _certificate: Certificate) {
+            // no-op
+        }
+
+        fn write_all(&self, _certificate: Vec<Certificate>) {
+            // no-op
+        }
+
+        fn read(&self, _digest: &CertificateDigest) -> Option<Certificate> {
+            None
+        }
+
+        fn read_all(
+            &self,
+            digests: Vec<CertificateDigest>,
+        ) -> Vec<(CertificateDigest, Option<Certificate>)> {
+            digests.into_iter().map(|digest| (digest, None)).collect()
+        }
+
+        fn contains(&self, _digest: &CertificateDigest) -> bool {
+            false
+        }
+
+        fn multi_contains<'a>(
+            &self,
+            digests: impl Iterator<Item = &'a CertificateDigest>,
+        ) -> Vec<bool> {
+            digests.map(|_| false).collect()
+        }
+
+        fn remove(&self, _digest: &CertificateDigest) {
+            // no-op
+        }
+
+        fn remove_all(&self, _digests: Vec<CertificateDigest>) {
+            // no-op
+        }
+    }
+
     fn new_store(path: std::path::PathBuf) -> CertificateStore {
         let (certificate_map, certificate_id_by_round_map, certificate_id_by_origin_map) =
             create_db_maps(path);
diff --git a/narwhal/test-utils/src/cluster.rs b/narwhal/test-utils/src/cluster.rs
index 84fbf658a12b2..cd0e426f2a90d 100644
--- a/narwhal/test-utils/src/cluster.rs
+++ b/narwhal/test-utils/src/cluster.rs
@@ -178,6 +178,7 @@ impl Cluster {
     /// Returns all the running authorities. Any authority that:
     /// * has been started ever
     /// * or has been stopped
+    ///
     /// will not be returned by this method.
     pub async fn authorities(&self) -> Vec<AuthorityDetails> {
         let mut result = Vec::new();
diff --git a/narwhal/types/Cargo.toml b/narwhal/types/Cargo.toml
index a3621362c2bc2..355027c14c97c 100644
--- a/narwhal/types/Cargo.toml
+++ b/narwhal/types/Cargo.toml
@@ -47,12 +47,7 @@ criterion.workspace = true
 serde_test.workspace = true
 test-utils = { path = "../test-utils", package = "narwhal-test-utils" }
 
-[target.'cfg(not(target_env = "msvc"))'.build-dependencies]
-protobuf-src.workspace = true
-
 [build-dependencies]
-prost-build.workspace = true
-rustversion.workspace = true
 tonic-build.workspace = true
 anemo-build.workspace = true
 
diff --git a/narwhal/types/build.rs b/narwhal/types/build.rs
index 2b6bd50df5c99..09d6612db73cf 100644
--- a/narwhal/types/build.rs
+++ b/narwhal/types/build.rs
@@ -9,36 +9,47 @@ use std::{
 type Result<T> = std::result::Result<T, Box<dyn std::error::Error + Send + Sync>>;
 
 fn main() -> Result<()> {
-    #[cfg(not(target_env = "msvc"))]
-    std::env::set_var("PROTOC", protobuf_src::protoc());
-
     let out_dir = if env::var("DUMP_GENERATED_GRPC").is_ok() {
         PathBuf::from("")
     } else {
         PathBuf::from(env::var("OUT_DIR")?)
     };
 
-    let proto_files = &["proto/narwhal.proto"];
-    let dirs = &["proto"];
+    let codec_path = "tonic::codec::ProstCodec";
 
-    // Use `Bytes` instead of `Vec<u8>` for bytes fields
-    let mut config = prost_build::Config::new();
-    config.bytes(["."]);
+    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::configure()
+    tonic_build::manual::Builder::new()
         .out_dir(&out_dir)
-        .compile_with_config(config, proto_files, dirs)?;
+        .compile(&[service]);
 
     build_anemo_services(&out_dir);
 
     println!("cargo:rerun-if-changed=build.rs");
-    println!("cargo:rerun-if-changed=proto");
     println!("cargo:rerun-if-env-changed=DUMP_GENERATED_GRPC");
 
-    nightly();
-    beta();
-    stable();
-
     Ok(())
 }
 
@@ -162,27 +173,3 @@ fn build_anemo_services(out_dir: &Path) {
             worker_to_worker,
         ]);
 }
-
-#[rustversion::nightly]
-fn nightly() {
-    println!("cargo:rustc-cfg=nightly");
-}
-
-#[rustversion::not(nightly)]
-fn nightly() {}
-
-#[rustversion::beta]
-fn beta() {
-    println!("cargo:rustc-cfg=beta");
-}
-
-#[rustversion::not(beta)]
-fn beta() {}
-
-#[rustversion::stable]
-fn stable() {
-    println!("cargo:rustc-cfg=stable");
-}
-
-#[rustversion::not(stable)]
-fn stable() {}
diff --git a/narwhal/types/proto/narwhal.proto b/narwhal/types/proto/narwhal.proto
deleted file mode 100644
index e560576b83f02..0000000000000
--- a/narwhal/types/proto/narwhal.proto
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) Mysten Labs, Inc.
-// SPDX-License-Identifier: Apache-2.0
-
-syntax = "proto3";
-
-package narwhal;
-
-message Transaction {
-    repeated bytes transactions = 1;
-}
-
-// Empty message for when we don't have anything to return
-message Empty {}
-
-service Transactions {
-    // Submit a Transactions
-    rpc SubmitTransaction(Transaction) returns (Empty) {}
-
-    // Submit a Transactions
-    rpc SubmitTransactionStream(stream Transaction) returns (Empty) {}
-}
diff --git a/narwhal/types/src/primary.rs b/narwhal/types/src/primary.rs
index a2ab6d0afcd68..a478479ab0e54 100644
--- a/narwhal/types/src/primary.rs
+++ b/narwhal/types/src/primary.rs
@@ -1729,6 +1729,7 @@ pub struct FetchCertificatesRequest {
     /// 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.
diff --git a/narwhal/types/src/proto.rs b/narwhal/types/src/proto.rs
index f7299c51cacd0..8955fcbb502cb 100644
--- a/narwhal/types/src/proto.rs
+++ b/narwhal/types/src/proto.rs
@@ -1,8 +1,16 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 mod narwhal {
-    #![allow(clippy::derive_partial_eq_without_eq)]
-    tonic::include_proto!("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"));
 
     include!(concat!(env!("OUT_DIR"), "/narwhal.PrimaryToPrimary.rs"));
     include!(concat!(env!("OUT_DIR"), "/narwhal.PrimaryToWorker.rs"));
diff --git a/narwhal/worker/Cargo.toml b/narwhal/worker/Cargo.toml
index bfb56b3886dfe..6b70a2be94f81 100644
--- a/narwhal/worker/Cargo.toml
+++ b/narwhal/worker/Cargo.toml
@@ -6,6 +6,9 @@ authors = ["Mysten Labs <build@mystenlabs.com>"]
 edition = "2021"
 publish = false
 
+[lints]
+workspace = true
+
 [dependencies]
 arc-swap.workspace = true
 async-trait.workspace = true
diff --git a/narwhal/worker/src/handlers.rs b/narwhal/worker/src/handlers.rs
index e908739dbd7ba..8aab5309d1820 100644
--- a/narwhal/worker/src/handlers.rs
+++ b/narwhal/worker/src/handlers.rs
@@ -114,6 +114,7 @@ impl<V: TransactionValidator> WorkerToWorker for WorkerReceiverHandler<V> {
 /// Defines how the network receiver handles incoming primary messages.
 pub struct PrimaryReceiverHandler<V> {
     // The id of this authority.
+    #[allow(unused)]
     pub authority_id: AuthorityIdentifier,
     // The id of this worker.
     pub id: WorkerId,
@@ -127,6 +128,7 @@ pub struct PrimaryReceiverHandler<V> {
     // Timeout on RequestBatches RPC.
     pub request_batches_timeout: Duration,
     // Number of random nodes to query when retrying batch requests.
+    #[allow(unused)]
     pub request_batches_retry_nodes: usize,
     // Synchronize header payloads from other workers.
     pub network: Option<Network>,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 82044fbddcdd9..6fe93ff432deb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1320,6 +1320,43 @@ importers:
         specifier: ^7.2.0
         version: 7.2.0
 
+  sdk/deepbook-v3:
+    dependencies:
+      '@mysten/sui':
+        specifier: workspace:*
+        version: link:../typescript
+    devDependencies:
+      '@iarna/toml':
+        specifier: ^2.2.5
+        version: 2.2.5
+      '@mysten/build-scripts':
+        specifier: workspace:*
+        version: link:../build-scripts
+      '@types/node':
+        specifier: ^20.14.10
+        version: 20.14.10
+      tmp:
+        specifier: ^0.2.3
+        version: 0.2.3
+      ts-node:
+        specifier: ^10.9.2
+        version: 10.9.2(@swc/core@1.6.13)(@types/node@20.14.10)(typescript@5.5.3)
+      ts-retry-promise:
+        specifier: ^0.8.1
+        version: 0.8.1
+      typescript:
+        specifier: ^5.5.3
+        version: 5.5.3
+      vite:
+        specifier: ^5.3.3
+        version: 5.3.3(@types/node@20.14.10)(sass@1.77.6)(terser@5.31.1)
+      vitest:
+        specifier: ^2.0.1
+        version: 2.0.1(@types/node@20.14.10)(happy-dom@14.12.3)(jsdom@24.1.0)(sass@1.77.6)(terser@5.31.1)
+      wait-on:
+        specifier: ^7.2.0
+        version: 7.2.0
+
   sdk/docs:
     dependencies:
       '@mysten/bcs':
@@ -2071,6 +2108,7 @@ packages:
   '@babel/plugin-proposal-class-properties@7.18.6':
     resolution: {integrity: sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==}
     engines: {node: '>=6.9.0'}
+    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
@@ -2083,12 +2121,14 @@ packages:
   '@babel/plugin-proposal-nullish-coalescing-operator@7.18.6':
     resolution: {integrity: sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==}
     engines: {node: '>=6.9.0'}
+    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead.
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
   '@babel/plugin-proposal-numeric-separator@7.18.6':
     resolution: {integrity: sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==}
     engines: {node: '>=6.9.0'}
+    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-numeric-separator instead.
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
@@ -2102,12 +2142,14 @@ packages:
   '@babel/plugin-proposal-optional-chaining@7.21.0':
     resolution: {integrity: sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==}
     engines: {node: '>=6.9.0'}
+    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead.
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
   '@babel/plugin-proposal-private-methods@7.18.6':
     resolution: {integrity: sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==}
     engines: {node: '>=6.9.0'}
+    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-methods instead.
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
@@ -5615,6 +5657,7 @@ packages:
   '@sentry/cli@1.74.6':
     resolution: {integrity: sha512-pJ7JJgozyjKZSTjOGi86chIngZMLUlYt2HOog+OJn+WGvqEkVymu8m462j1DiXAnex9NspB4zLLNuZ/R6rTQHg==}
     engines: {node: '>= 8'}
+    hasBin: true
 
   '@sentry/core@6.19.7':
     resolution: {integrity: sha512-tOfZ/umqB2AcHPGbIrsFLcvApdTm9ggpi/kQZFkej7kMphjT+SGBiQfYtjyg9jcRW+ilAR4JXC9BGKsdEQ+8Vw==}
@@ -7226,6 +7269,7 @@ packages:
 
   are-we-there-yet@1.1.7:
     resolution: {integrity: sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g==}
+    deprecated: This package is no longer supported.
 
   arg@1.0.0:
     resolution: {integrity: sha512-Wk7TEzl1KqvTGs/uyhmHO/3XLd3t1UeU4IstvPXVzGPM522cTjqjNZ99esCkcL52sjqjo8e8CTBcWhkxvGzoAw==}
@@ -9499,6 +9543,7 @@ packages:
 
   gauge@2.7.4:
     resolution: {integrity: sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg==}
+    deprecated: This package is no longer supported.
 
   gensync@1.0.0-beta.2:
     resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
@@ -10057,6 +10102,7 @@ packages:
 
   inflight@1.0.6:
     resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
+    deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
 
   inherits@2.0.4:
     resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
@@ -11466,6 +11512,7 @@ packages:
 
   npmlog@4.1.2:
     resolution: {integrity: sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==}
+    deprecated: This package is no longer supported.
 
   nth-check@2.0.1:
     resolution: {integrity: sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==}
@@ -11564,6 +11611,7 @@ packages:
 
   onchange@7.1.0:
     resolution: {integrity: sha512-ZJcqsPiWUAUpvmnJri5TPBooqJOPmC0ttN65juhN15Q8xA+Nbg3BaxBHXQ45EistKKlKElb0edmbPWnKSBkvMg==}
+    hasBin: true
 
   onetime@5.1.2:
     resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
@@ -13080,6 +13128,7 @@ packages:
 
   sign-addon@5.3.0:
     resolution: {integrity: sha512-7nHlCzhQgVMLBNiXVEgbG/raq48awOW0lYMN5uo1BaB3mp0+k8M8pvDwbfTlr3apcxZJsk9HQsAW1POwoJugpQ==}
+    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
 
   signal-exit@3.0.7:
     resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
@@ -13422,6 +13471,7 @@ packages:
   svgo@3.0.2:
     resolution: {integrity: sha512-Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ==}
     engines: {node: '>=14.0.0'}
+    hasBin: true
 
   swap-case@2.0.2:
     resolution: {integrity: sha512-kc6S2YS/2yXbtkSMunBtKdah4VFETZ8Oh6ONSmSd9bRxhqTrtARUCBUiWXH3xVPpvR7tz2CSnkuXVE42EcGnMw==}
@@ -17476,7 +17526,7 @@ snapshots:
     dependencies:
       '@jridgewell/set-array': 1.1.2
       '@jridgewell/sourcemap-codec': 1.4.15
-      '@jridgewell/trace-mapping': 0.3.22
+      '@jridgewell/trace-mapping': 0.3.25
 
   '@jridgewell/gen-mapping@0.3.5':
     dependencies:
diff --git a/release_notes.txt b/release_notes.txt
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index c6e4d7d5031fa..a56a283d2abc1 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.79"
+channel = "1.80.1"
diff --git a/scripts/release_notes.py b/scripts/release_notes.py
index 4629a304db631..fe5c4e68f83a0 100755
--- a/scripts/release_notes.py
+++ b/scripts/release_notes.py
@@ -304,7 +304,7 @@ def do_generate(from_, to):
         print(f"## {impacted}")
 
         if impacted == "Protocol":
-            print(f"Sui Protocol Version in this release: {protocol_version}")
+            print(f"#### Sui Protocol Version in this release: `{protocol_version}`")
         print()
 
         for pr, note in reversed(notes):
diff --git a/scripts/simtest/cargo-simtest b/scripts/simtest/cargo-simtest
index 2c591c251d653..bd07db8332388 100755
--- a/scripts/simtest/cargo-simtest
+++ b/scripts/simtest/cargo-simtest
@@ -54,9 +54,9 @@ if [ -n "$LOCAL_MSIM_PATH" ]; then
 else
   cargo_patch_args=(
     --config 'patch.crates-io.tokio.git = "https://github.com/MystenLabs/mysten-sim.git"'
-    --config 'patch.crates-io.tokio.rev = "220f52a15804a768610ac0ae3b8da7de4a5c4d2b"'
+    --config 'patch.crates-io.tokio.rev = "b320996d8dfb99b273fe31c0222c659332283c99"'
     --config 'patch.crates-io.futures-timer.git = "https://github.com/MystenLabs/mysten-sim.git"'
-    --config 'patch.crates-io.futures-timer.rev = "220f52a15804a768610ac0ae3b8da7de4a5c4d2b"'
+    --config 'patch.crates-io.futures-timer.rev = "b320996d8dfb99b273fe31c0222c659332283c99"'
   )
 fi
 
diff --git a/scripts/simtest/codecov.sh b/scripts/simtest/codecov.sh
index afdd148855633..6df7c9ccaef05 100755
--- a/scripts/simtest/codecov.sh
+++ b/scripts/simtest/codecov.sh
@@ -11,6 +11,9 @@ fi
 # apply git patch
 git apply ./scripts/simtest/config-patch
 
+root_dir=$(git rev-parse --show-toplevel)
+export SIMTEST_STATIC_INIT_MOVE=$root_dir"/examples/move/basics"
+
 MSIM_WATCHDOG_TIMEOUT_MS=60000 MSIM_TEST_SEED=1 cargo llvm-cov --ignore-run-fail --lcov --output-path lcov-simtest.info nextest --cargo-profile simulator
 
 # remove the patch
diff --git a/scripts/simtest/config-patch b/scripts/simtest/config-patch
index e4dfa3c59b31a..655ca6ce64adc 100644
--- a/scripts/simtest/config-patch
+++ b/scripts/simtest/config-patch
@@ -12,11 +12,11 @@ diff --git a/Cargo.toml b/Cargo.toml
 index c0829bc1b6..4007f97d66 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -682,3 +682,7 @@ field_names = "0.2.0"
+@@ -682,5 +682,7 @@ field_names = "0.2.0"
  semver = "1.0.16"
  spinners = "4.1.0"
  include_dir = "0.7.3"
-+
-+[patch.crates-io]
-+tokio = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "220f52a15804a768610ac0ae3b8da7de4a5c4d2b" }
-+futures-timer = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "220f52a15804a768610ac0ae3b8da7de4a5c4d2b" }
+
+ [patch.crates-io]
++tokio = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "b320996d8dfb99b273fe31c0222c659332283c99" }
++futures-timer = { git = "https://github.com/MystenLabs/mysten-sim.git", rev = "b320996d8dfb99b273fe31c0222c659332283c99" }
diff --git a/scripts/simtest/simtest-run.sh b/scripts/simtest/simtest-run.sh
index 36f22837df2bd..cf5b24c9c8bbd 100755
--- a/scripts/simtest/simtest-run.sh
+++ b/scripts/simtest/simtest-run.sh
@@ -20,7 +20,7 @@ if [ -z "$NUM_CPUS" ]; then
 fi
 
 # filter out some tests that give spurious failures.
-TEST_FILTER="(not (test(~batch_verification_tests) | test(~validator_tx_finalizer_e2e_tests)))"
+TEST_FILTER="(not (test(~batch_verification_tests)))"
 
 DATE=$(date +%s)
 SEED="$DATE"
diff --git a/sdk/bcs/CHANGELOG.md b/sdk/bcs/CHANGELOG.md
index 0bf7a819eed89..873b938740c6c 100644
--- a/sdk/bcs/CHANGELOG.md
+++ b/sdk/bcs/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 1.0.4
+
+### Patch Changes
+
+- f37b3c2: Improve error message when bcs enum contains unknown value
+
 ## 1.0.3
 
 ### Patch Changes
diff --git a/sdk/bcs/package.json b/sdk/bcs/package.json
index 8b33a50bf0b97..93a502e14a589 100644
--- a/sdk/bcs/package.json
+++ b/sdk/bcs/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@mysten/bcs",
-	"version": "1.0.3",
+	"version": "1.0.4",
 	"description": "BCS - Canonical Binary Serialization implementation for JavaScript",
 	"license": "Apache-2.0",
 	"author": "Mysten Labs <build@mystenlabs.com>",
diff --git a/sdk/bcs/src/bcs.ts b/sdk/bcs/src/bcs.ts
index 25b52a8ae6e59..ae2da5c72f501 100644
--- a/sdk/bcs/src/bcs.ts
+++ b/sdk/bcs/src/bcs.ts
@@ -481,10 +481,17 @@ export const bcs = {
 			name,
 			read: (reader) => {
 				const index = reader.readULEB();
-				const [name, type] = canonicalOrder[index];
+
+				const enumEntry = canonicalOrder[index];
+				if (!enumEntry) {
+					throw new TypeError(`Unknown value ${index} for enum ${name}`);
+				}
+
+				const [kind, type] = enumEntry;
+
 				return {
-					[name]: type?.read(reader) ?? true,
-					$kind: name,
+					[kind]: type?.read(reader) ?? true,
+					$kind: kind,
 				} as never;
 			},
 			write: (value, writer) => {
diff --git a/sdk/create-dapp/CHANGELOG.md b/sdk/create-dapp/CHANGELOG.md
index cb300f30d4b5d..8b32d4af32408 100644
--- a/sdk/create-dapp/CHANGELOG.md
+++ b/sdk/create-dapp/CHANGELOG.md
@@ -1,5 +1,50 @@
 # @mysten/create-dapp
 
+## 0.3.17
+
+### Patch Changes
+
+- Updated dependencies [143cd9d]
+- Updated dependencies [4357ac6]
+- Updated dependencies [4019dd7]
+- Updated dependencies [4019dd7]
+- Updated dependencies [00a974d]
+  - @mysten/sui@1.7.0
+  - @mysten/dapp-kit@0.14.17
+
+## 0.3.16
+
+### Patch Changes
+
+- Updated dependencies [a3e32fe]
+  - @mysten/sui@1.6.0
+  - @mysten/dapp-kit@0.14.16
+
+## 0.3.15
+
+### Patch Changes
+
+- Updated dependencies [0851b31]
+- Updated dependencies [f37b3c2]
+  - @mysten/sui@1.5.0
+  - @mysten/dapp-kit@0.14.15
+
+## 0.3.14
+
+### Patch Changes
+
+- Updated dependencies [4419234]
+  - @mysten/sui@1.4.0
+  - @mysten/dapp-kit@0.14.14
+
+## 0.3.13
+
+### Patch Changes
+
+- Updated dependencies [a45f461]
+  - @mysten/sui@1.3.1
+  - @mysten/dapp-kit@0.14.13
+
 ## 0.3.12
 
 ### Patch Changes
diff --git a/sdk/create-dapp/package.json b/sdk/create-dapp/package.json
index 1416a064bb092..ef18887ca7d3e 100644
--- a/sdk/create-dapp/package.json
+++ b/sdk/create-dapp/package.json
@@ -3,7 +3,7 @@
 	"author": "Mysten Labs <build@mystenlabs.com>",
 	"description": "A CLI for creating new Sui dApps",
 	"homepage": "https://sdk.mystenlabs.com",
-	"version": "0.3.12",
+	"version": "0.3.17",
 	"license": "Apache-2.0",
 	"files": [
 		"CHANGELOG.md",
diff --git a/sdk/dapp-kit/CHANGELOG.md b/sdk/dapp-kit/CHANGELOG.md
index 36fef53cf62cc..05a307a8bfc72 100644
--- a/sdk/dapp-kit/CHANGELOG.md
+++ b/sdk/dapp-kit/CHANGELOG.md
@@ -1,5 +1,55 @@
 # @mysten/dapp-kit
 
+## 0.14.17
+
+### Patch Changes
+
+- Updated dependencies [143cd9d]
+- Updated dependencies [4357ac6]
+- Updated dependencies [4019dd7]
+- Updated dependencies [4019dd7]
+- Updated dependencies [00a974d]
+  - @mysten/sui@1.7.0
+  - @mysten/wallet-standard@0.13.2
+  - @mysten/zksend@0.10.6
+
+## 0.14.16
+
+### Patch Changes
+
+- Updated dependencies [a3e32fe]
+  - @mysten/sui@1.6.0
+  - @mysten/wallet-standard@0.13.1
+  - @mysten/zksend@0.10.5
+
+## 0.14.15
+
+### Patch Changes
+
+- Updated dependencies [0851b31]
+- Updated dependencies [f37b3c2]
+  - @mysten/wallet-standard@0.13.0
+  - @mysten/sui@1.5.0
+  - @mysten/zksend@0.10.4
+
+## 0.14.14
+
+### Patch Changes
+
+- Updated dependencies [4419234]
+  - @mysten/sui@1.4.0
+  - @mysten/wallet-standard@0.12.14
+  - @mysten/zksend@0.10.3
+
+## 0.14.13
+
+### Patch Changes
+
+- Updated dependencies [a45f461]
+  - @mysten/sui@1.3.1
+  - @mysten/wallet-standard@0.12.13
+  - @mysten/zksend@0.10.2
+
 ## 0.14.12
 
 ### Patch Changes
diff --git a/sdk/dapp-kit/package.json b/sdk/dapp-kit/package.json
index 595fc54315cca..4547755a41712 100644
--- a/sdk/dapp-kit/package.json
+++ b/sdk/dapp-kit/package.json
@@ -3,7 +3,7 @@
 	"author": "Mysten Labs <build@mystenlabs.com>",
 	"description": "A collection of React hooks and components for interacting with the Sui blockchain and wallets.",
 	"homepage": "https://sdk.mystenlabs.com/typescript",
-	"version": "0.14.12",
+	"version": "0.14.17",
 	"license": "Apache-2.0",
 	"files": [
 		"CHANGELOG.md",
diff --git a/sdk/deepbook-v3/.gitignore b/sdk/deepbook-v3/.gitignore
new file mode 100644
index 0000000000000..41ed5da947df8
--- /dev/null
+++ b/sdk/deepbook-v3/.gitignore
@@ -0,0 +1,132 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+.DS_Store
+.idea/
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional stylelint cache
+.stylelintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variable files
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# vuepress v2.x temp and cache directory
+.temp
+.cache
+
+# Docusaurus cache and generated files
+.docusaurus
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
diff --git a/sdk/deepbook-v3/.npmignore b/sdk/deepbook-v3/.npmignore
new file mode 100644
index 0000000000000..d838da9865693
--- /dev/null
+++ b/sdk/deepbook-v3/.npmignore
@@ -0,0 +1 @@
+examples/
diff --git a/sdk/deepbook-v3/.prettierignore b/sdk/deepbook-v3/.prettierignore
new file mode 100644
index 0000000000000..b0894a4b75616
--- /dev/null
+++ b/sdk/deepbook-v3/.prettierignore
@@ -0,0 +1,9 @@
+dist/
+package-lock.json
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.next/
+.swc/
+out/
+CHANGELOG.md
diff --git a/sdk/deepbook-v3/CHANGELOG.md b/sdk/deepbook-v3/CHANGELOG.md
new file mode 100644
index 0000000000000..2501d9bb5de9e
--- /dev/null
+++ b/sdk/deepbook-v3/CHANGELOG.md
@@ -0,0 +1,63 @@
+# @mysten/deepbook-v3
+
+## 0.3.3
+
+### Patch Changes
+
+- ed221a6: Update package address
+
+## 0.3.2
+
+### Patch Changes
+
+- Updated dependencies [143cd9d]
+- Updated dependencies [4357ac6]
+- Updated dependencies [4019dd7]
+- Updated dependencies [4019dd7]
+- Updated dependencies [00a974d]
+  - @mysten/sui@1.7.0
+
+## 0.3.1
+
+### Patch Changes
+
+- d70e8ff: Upgrade Package
+
+## 0.3.0
+
+### Minor Changes
+
+- 36f1c6f: Rounding for numbers, exports update
+- c51f186: New contract constants
+
+## 0.2.1
+
+### Patch Changes
+
+- Updated dependencies [a3e32fe]
+  - @mysten/sui@1.6.0
+
+## 0.2.0
+
+### Minor Changes
+
+- 41361b6: Constants update, manager sdk update
+
+## 0.1.0
+
+### Minor Changes
+
+- 05fb3ac: Update deepbook addresses
+
+### Patch Changes
+
+- Updated dependencies [0851b31]
+- Updated dependencies [f37b3c2]
+  - @mysten/sui@1.5.0
+
+## 0.0.1
+
+### Patch Changes
+
+- Updated dependencies [4419234]
+  - @mysten/sui@1.4.0
diff --git a/sdk/deepbook-v3/README.md b/sdk/deepbook-v3/README.md
new file mode 100644
index 0000000000000..c96f50141b529
--- /dev/null
+++ b/sdk/deepbook-v3/README.md
@@ -0,0 +1 @@
+# Deepbook TypeScript SDK
diff --git a/sdk/deepbook-v3/examples/deepbookMarketMaker.ts b/sdk/deepbook-v3/examples/deepbookMarketMaker.ts
new file mode 100644
index 0000000000000..5c463f792798e
--- /dev/null
+++ b/sdk/deepbook-v3/examples/deepbookMarketMaker.ts
@@ -0,0 +1,126 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+import { getFullnodeUrl, SuiClient } from '@mysten/sui/client';
+import { decodeSuiPrivateKey } from '@mysten/sui/cryptography';
+import type { Keypair } from '@mysten/sui/cryptography';
+import { Ed25519Keypair } from '@mysten/sui/keypairs/ed25519';
+import type { Transaction } from '@mysten/sui/transactions';
+
+import { DeepBookClient } from '../src/index.js'; // Adjust path according to new structure
+import type { BalanceManager } from '../src/types/index.js';
+
+export class DeepBookMarketMaker extends DeepBookClient {
+	keypair: Keypair;
+	suiClient: SuiClient;
+
+	constructor(
+		keypair: string | Keypair,
+		env: 'testnet' | 'mainnet',
+		balanceManagers?: { [key: string]: BalanceManager },
+		adminCap?: string,
+	) {
+		let resolvedKeypair: Keypair;
+
+		if (typeof keypair === 'string') {
+			resolvedKeypair = DeepBookMarketMaker.#getSignerFromPK(keypair);
+		} else {
+			resolvedKeypair = keypair;
+		}
+
+		const address = resolvedKeypair.toSuiAddress();
+
+		super({
+			address: address,
+			env: env,
+			client: new SuiClient({
+				url: getFullnodeUrl(env),
+			}),
+			balanceManagers: balanceManagers,
+			adminCap: adminCap,
+		});
+
+		this.keypair = resolvedKeypair;
+		this.suiClient = new SuiClient({
+			url: getFullnodeUrl(env),
+		});
+	}
+
+	static #getSignerFromPK = (privateKey: string) => {
+		const { schema, secretKey } = decodeSuiPrivateKey(privateKey);
+		if (schema === 'ED25519') return Ed25519Keypair.fromSecretKey(secretKey);
+
+		throw new Error(`Unsupported schema: ${schema}`);
+	};
+
+	signAndExecute = async (tx: Transaction) => {
+		return this.suiClient.signAndExecuteTransaction({
+			transaction: tx,
+			signer: this.keypair,
+			options: {
+				showEffects: true,
+				showObjectChanges: true,
+			},
+		});
+	};
+
+	getActiveAddress() {
+		return this.keypair.getPublicKey().toSuiAddress();
+	}
+
+	// Example of a flash loan transaction
+	// Borrow 1 DEEP from DEEP_SUI pool
+	// Swap 0.5 DBUSDC for SUI in SUI_DBUSDC pool, pay with deep borrowed
+	// Swap SUI back to DEEP
+	// Return 1 DEEP to DEEP_SUI pool
+	flashLoanExample = async (tx: Transaction) => {
+		const borrowAmount = 1;
+		const [deepCoin, flashLoan] = tx.add(this.flashLoans.borrowBaseAsset('DEEP_SUI', borrowAmount));
+
+		// Execute trade using borrowed DEEP
+		const [baseOut, quoteOut, deepOut] = tx.add(
+			this.deepBook.swapExactQuoteForBase({
+				poolKey: 'SUI_DBUSDC',
+				amount: 0.5,
+				deepAmount: 1,
+				minOut: 0,
+				deepCoin: deepCoin,
+			}),
+		);
+
+		tx.transferObjects([baseOut, quoteOut, deepOut], this.getActiveAddress());
+
+		// Execute second trade to get back DEEP for repayment
+		const [baseOut2, quoteOut2, deepOut2] = tx.add(
+			this.deepBook.swapExactQuoteForBase({
+				poolKey: 'DEEP_SUI',
+				amount: 10,
+				deepAmount: 0,
+				minOut: 0,
+			}),
+		);
+
+		tx.transferObjects([quoteOut2, deepOut2], this.getActiveAddress());
+
+		// Return borrowed DEEP
+		const loanRemain = tx.add(
+			this.flashLoans.returnBaseAsset('DEEP_SUI', borrowAmount, baseOut2, flashLoan),
+		);
+		tx.transferObjects([loanRemain], this.getActiveAddress());
+	};
+
+	placeLimitOrderExample = (tx: Transaction) => {
+		tx.add(
+			this.deepBook.placeLimitOrder({
+				poolKey: 'SUI_DBUSDC',
+				balanceManagerKey: 'MANAGER_1',
+				clientOrderId: '123456789',
+				price: 1,
+				quantity: 10,
+				isBid: true,
+				// orderType default: no restriction
+				// selfMatchingOption default: allow self matching
+				// payWithDeep default: true
+			}),
+		);
+	};
+}
diff --git a/sdk/deepbook-v3/examples/tsconfig.json b/sdk/deepbook-v3/examples/tsconfig.json
new file mode 100644
index 0000000000000..6a6cfe178ea1a
--- /dev/null
+++ b/sdk/deepbook-v3/examples/tsconfig.json
@@ -0,0 +1,12 @@
+{
+	"extends": "../tsconfig.esm.json",
+	"include": ["./**/*", "../src"],
+	"compilerOptions": {
+		"rootDir": "../..",
+		"noEmit": true,
+		"moduleResolution": "Node",
+		"emitDeclarationOnly": false,
+		"resolveJsonModule": true,
+		"module": "esnext"
+	}
+}
diff --git a/sdk/deepbook-v3/examples/useDeepbookClient.ts b/sdk/deepbook-v3/examples/useDeepbookClient.ts
new file mode 100644
index 0000000000000..80198d1d52d36
--- /dev/null
+++ b/sdk/deepbook-v3/examples/useDeepbookClient.ts
@@ -0,0 +1,47 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+import { Transaction } from '@mysten/sui/transactions';
+import { config } from 'dotenv';
+
+import { DeepBookMarketMaker } from './deepbookMarketMaker.js';
+
+// Load private key from .env file
+config();
+
+(async () => {
+	const privateKey = process.env.PRIVATE_KEY;
+	if (!privateKey) {
+		throw new Error('Private key not found');
+	}
+
+	// Initialize with balance managers if created
+	const balanceManagers = {
+		MANAGER_1: {
+			address: '0x6149bfe6808f0d6a9db1c766552b7ae1df477f5885493436214ed4228e842393',
+			tradeCap: '',
+		},
+	};
+	const mmClient = new DeepBookMarketMaker(
+		privateKey,
+		'testnet',
+		balanceManagers,
+		process.env.ADMIN_CAP,
+	);
+
+	const tx = new Transaction();
+
+	// Read only call
+	console.log(await mmClient.checkManagerBalance('MANAGER_1', 'SUI'));
+	console.log(await mmClient.getLevel2Range('SUI_DBUSDC', 0.1, 100, true));
+
+	// // Balance manager contract call
+	// mmClient.balanceManager.depositIntoManager('MANAGER_1', 'SUI', 10)(tx);
+
+	// // Example PTB call
+	// mmClient.placeLimitOrderExample(tx);
+	// mmClient.flashLoanExample(tx);
+
+	let res = await mmClient.signAndExecute(tx);
+
+	console.dir(res, { depth: null });
+})();
diff --git a/sdk/deepbook-v3/package.json b/sdk/deepbook-v3/package.json
new file mode 100644
index 0000000000000..418706faa1890
--- /dev/null
+++ b/sdk/deepbook-v3/package.json
@@ -0,0 +1,53 @@
+{
+	"name": "@mysten/deepbook-v3",
+	"author": "Mysten Labs <build@mystenlabs.com>",
+	"description": "Sui Deepbook SDK",
+	"version": "0.3.3",
+	"license": "Apache-2.0",
+	"type": "commonjs",
+	"main": "./dist/cjs/index.js",
+	"module": "./dist/esm/index.js",
+	"types": "./dist/cjs/index.d.ts",
+	"exports": {
+		".": {
+			"import": "./dist/esm/index.js",
+			"require": "./dist/cjs/index.js"
+		}
+	},
+	"files": [
+		"CHANGELOG.md",
+		"dist",
+		"src"
+	],
+	"engines": {
+		"node": ">=18"
+	},
+	"scripts": {
+		"clean": "rm -rf tsconfig.tsbuildinfo ./dist",
+		"build": "build-package",
+		"prepublishOnly": "pnpm build",
+		"prettier:check": "prettier -c --ignore-unknown .",
+		"prettier:fix": "prettier -w --ignore-unknown .",
+		"eslint:check": "eslint --max-warnings=0 .",
+		"eslint:fix": "pnpm run eslint:check --fix",
+		"lint": "pnpm run eslint:check && pnpm run prettier:check",
+		"lint:fix": "pnpm run eslint:fix && pnpm run prettier:fix",
+		"test:e2e": "wait-on http://127.0.0.1:9123 -l --timeout 120000 && vitest run e2e",
+		"prepare:e2e": "cargo build --bin sui --profile dev && cross-env RUST_LOG=warn,sui=error,anemo_tower=warn,consensus=off cargo run --bin sui -- start --with-faucet --force-regenesis"
+	},
+	"dependencies": {
+		"@mysten/sui": "workspace:*"
+	},
+	"devDependencies": {
+		"@iarna/toml": "^2.2.5",
+		"@mysten/build-scripts": "workspace:*",
+		"@types/node": "^20.14.10",
+		"tmp": "^0.2.3",
+		"ts-node": "^10.9.2",
+		"ts-retry-promise": "^0.8.1",
+		"typescript": "^5.5.3",
+		"vite": "^5.3.3",
+		"vitest": "^2.0.1",
+		"wait-on": "^7.2.0"
+	}
+}
diff --git a/sdk/deepbook-v3/src/client.ts b/sdk/deepbook-v3/src/client.ts
new file mode 100644
index 0000000000000..b27c1aa68d7fd
--- /dev/null
+++ b/sdk/deepbook-v3/src/client.ts
@@ -0,0 +1,435 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+import { bcs } from '@mysten/sui/bcs';
+import type { SuiClient } from '@mysten/sui/client';
+import { Transaction } from '@mysten/sui/transactions';
+import { normalizeSuiAddress } from '@mysten/sui/utils';
+
+import { BalanceManagerContract } from './transactions/balanceManager.js';
+import { DeepBookContract } from './transactions/deepbook.js';
+import { DeepBookAdminContract } from './transactions/deepbookAdmin.js';
+import { FlashLoanContract } from './transactions/flashLoans.js';
+import { GovernanceContract } from './transactions/governance.js';
+import type { BalanceManager, Environment } from './types/index.js';
+import { DEEP_SCALAR, DeepBookConfig, FLOAT_SCALAR } from './utils/config.js';
+import type { CoinMap, PoolMap } from './utils/constants.js';
+
+/**
+ * DeepBookClient class for managing DeepBook operations.
+ */
+export class DeepBookClient {
+	client: SuiClient;
+	#config: DeepBookConfig;
+	#address: string;
+	balanceManager: BalanceManagerContract;
+	deepBook: DeepBookContract;
+	deepBookAdmin: DeepBookAdminContract;
+	flashLoans: FlashLoanContract;
+	governance: GovernanceContract;
+
+	/**
+	 * @param {SuiClient} client SuiClient instance
+	 * @param {string} address Address of the client
+	 * @param {Environment} env Environment configuration
+	 * @param {Object.<string, BalanceManager>} [balanceManagers] Optional initial BalanceManager map
+	 * @param {CoinMap} [coins] Optional initial CoinMap
+	 * @param {PoolMap} [pools] Optional initial PoolMap
+	 * @param {string} [adminCap] Optional admin capability
+	 */
+	constructor({
+		client,
+		address,
+		env,
+		balanceManagers,
+		coins,
+		pools,
+		adminCap,
+	}: {
+		client: SuiClient;
+		address: string;
+		env: Environment;
+		balanceManagers?: { [key: string]: BalanceManager };
+		coins?: CoinMap;
+		pools?: PoolMap;
+		adminCap?: string;
+	}) {
+		this.client = client;
+		this.#address = normalizeSuiAddress(address);
+		this.#config = new DeepBookConfig({
+			address: this.#address,
+			env,
+			balanceManagers,
+			coins,
+			pools,
+			adminCap,
+		});
+		this.balanceManager = new BalanceManagerContract(this.#config);
+		this.deepBook = new DeepBookContract(this.#config);
+		this.deepBookAdmin = new DeepBookAdminContract(this.#config);
+		this.flashLoans = new FlashLoanContract(this.#config);
+		this.governance = new GovernanceContract(this.#config);
+	}
+
+	/**
+	 * @description Check the balance of a balance manager for a specific coin
+	 * @param {string} managerKey Key of the balance manager
+	 * @param {string} coinKey Key of the coin
+	 * @returns {Promise<{ coinType: string, balance: number }>} An object with coin type and balance
+	 */
+	async checkManagerBalance(managerKey: string, coinKey: string) {
+		const tx = new Transaction();
+		const coin = this.#config.getCoin(coinKey);
+
+		tx.add(this.balanceManager.checkManagerBalance(managerKey, coinKey));
+		const res = await this.client.devInspectTransactionBlock({
+			sender: this.#address,
+			transactionBlock: tx,
+		});
+
+		const bytes = res.results![0].returnValues![0][0];
+		const parsed_balance = bcs.U64.parse(new Uint8Array(bytes));
+		const balanceNumber = Number(parsed_balance);
+		const adjusted_balance = balanceNumber / coin.scalar;
+
+		return {
+			coinType: coin.type,
+			balance: Number(adjusted_balance.toFixed(9)),
+		};
+	}
+
+	/**
+	 * @description Check if a pool is whitelisted
+	 * @param {string} poolKey Key of the pool
+	 * @returns {Promise<boolean>} Boolean indicating if the pool is whitelisted
+	 */
+	async whitelisted(poolKey: string) {
+		const tx = new Transaction();
+
+		tx.add(this.deepBook.whitelisted(poolKey));
+		const res = await this.client.devInspectTransactionBlock({
+			sender: normalizeSuiAddress(this.#address),
+			transactionBlock: tx,
+		});
+
+		const bytes = res.results![0].returnValues![0][0];
+		const whitelisted = bcs.Bool.parse(new Uint8Array(bytes));
+
+		return whitelisted;
+	}
+
+	/**
+	 * @description Get the quote quantity out for a given base quantity
+	 * @param {string} poolKey Key of the pool
+	 * @param {number} baseQuantity Base quantity to convert
+	 * @returns {Promise<{ baseQuantity: number, baseOut: number, quoteOut: number, deepRequired: number }>}
+	 * An object with base quantity, base out, quote out, and deep required for the dry run
+	 */
+	async getQuoteQuantityOut(poolKey: string, baseQuantity: number) {
+		const tx = new Transaction();
+		const pool = this.#config.getPool(poolKey);
+		const baseScalar = this.#config.getCoin(pool.baseCoin).scalar;
+		const quoteScalar = this.#config.getCoin(pool.quoteCoin).scalar;
+
+		tx.add(this.deepBook.getQuoteQuantityOut(poolKey, baseQuantity));
+		const res = await this.client.devInspectTransactionBlock({
+			sender: normalizeSuiAddress(this.#address),
+			transactionBlock: tx,
+		});
+
+		const baseOut = Number(bcs.U64.parse(new Uint8Array(res.results![0].returnValues![0][0])));
+		const quoteOut = Number(bcs.U64.parse(new Uint8Array(res.results![0].returnValues![1][0])));
+		const deepRequired = Number(bcs.U64.parse(new Uint8Array(res.results![0].returnValues![2][0])));
+
+		return {
+			baseQuantity,
+			baseOut: Number((baseOut / baseScalar).toFixed(9)),
+			quoteOut: Number((quoteOut / quoteScalar).toFixed(9)),
+			deepRequired: Number((deepRequired / DEEP_SCALAR).toFixed(9)),
+		};
+	}
+
+	/**
+	 * @description Get the base quantity out for a given quote quantity
+	 * @param {string} poolKey Key of the pool
+	 * @param {number} quoteQuantity Quote quantity to convert
+	 * @returns {Promise<{ quoteQuantity: number, baseOut: number, quoteOut: number, deepRequired: number }>}
+	 * An object with quote quantity, base out, quote out, and deep required for the dry run
+	 */
+	async getBaseQuantityOut(poolKey: string, quoteQuantity: number) {
+		const tx = new Transaction();
+		const pool = this.#config.getPool(poolKey);
+		const baseScalar = this.#config.getCoin(pool.baseCoin).scalar;
+		const quoteScalar = this.#config.getCoin(pool.quoteCoin).scalar;
+
+		tx.add(this.deepBook.getBaseQuantityOut(poolKey, quoteQuantity));
+		const res = await this.client.devInspectTransactionBlock({
+			sender: normalizeSuiAddress(this.#address),
+			transactionBlock: tx,
+		});
+
+		const baseOut = Number(bcs.U64.parse(new Uint8Array(res.results![0].returnValues![0][0])));
+		const quoteOut = Number(bcs.U64.parse(new Uint8Array(res.results![0].returnValues![1][0])));
+		const deepRequired = Number(bcs.U64.parse(new Uint8Array(res.results![0].returnValues![2][0])));
+
+		return {
+			quoteQuantity: quoteQuantity,
+			baseOut: Number((baseOut / baseScalar).toFixed(9)),
+			quoteOut: Number((quoteOut / quoteScalar).toFixed(9)),
+			deepRequired: Number((deepRequired / DEEP_SCALAR).toFixed(9)),
+		};
+	}
+
+	/**
+	 * @description Get the output quantities for given base and quote quantities. Only one quantity can be non-zero
+	 * @param {string} poolKey Key of the pool
+	 * @param {number} baseQuantity Base quantity to convert
+	 * @param {number} quoteQuantity Quote quantity to convert
+	 * @returns {Promise<{ baseQuantity: number, quoteQuantity: number, baseOut: number, quoteOut: number, deepRequired: number }>}
+	 * An object with base quantity, quote quantity, base out, quote out, and deep required for the dry run
+	 */
+	async getQuantityOut(poolKey: string, baseQuantity: number, quoteQuantity: number) {
+		const tx = new Transaction();
+		const pool = this.#config.getPool(poolKey);
+		const baseScalar = this.#config.getCoin(pool.baseCoin).scalar;
+		const quoteScalar = this.#config.getCoin(pool.quoteCoin).scalar;
+
+		tx.add(this.deepBook.getQuantityOut(poolKey, baseQuantity, quoteQuantity));
+		const res = await this.client.devInspectTransactionBlock({
+			sender: normalizeSuiAddress(this.#address),
+			transactionBlock: tx,
+		});
+
+		const baseOut = Number(bcs.U64.parse(new Uint8Array(res.results![0].returnValues![0][0])));
+		const quoteOut = Number(bcs.U64.parse(new Uint8Array(res.results![0].returnValues![1][0])));
+		const deepRequired = Number(bcs.U64.parse(new Uint8Array(res.results![0].returnValues![2][0])));
+
+		return {
+			baseQuantity,
+			quoteQuantity,
+			baseOut: Number((baseOut / baseScalar).toFixed(9)),
+			quoteOut: Number((quoteOut / quoteScalar).toFixed(9)),
+			deepRequired: Number((deepRequired / DEEP_SCALAR).toFixed(9)),
+		};
+	}
+
+	/**
+	 * @description Get open orders for a balance manager in a pool
+	 * @param {string} poolKey Key of the pool
+	 * @param {string} managerKey Key of the balance manager
+	 * @returns {Promise<Array>} An array of open order IDs
+	 */
+	async accountOpenOrders(poolKey: string, managerKey: string) {
+		const tx = new Transaction();
+
+		tx.add(this.deepBook.accountOpenOrders(poolKey, managerKey));
+		const res = await this.client.devInspectTransactionBlock({
+			sender: normalizeSuiAddress(this.#address),
+			transactionBlock: tx,
+		});
+
+		const order_ids = res.results![0].returnValues![0][0];
+		const VecSet = bcs.struct('VecSet', {
+			constants: bcs.vector(bcs.U128),
+		});
+
+		return VecSet.parse(new Uint8Array(order_ids)).constants;
+	}
+
+	/**
+	 * @description Get the order information for a specific order in a pool
+	 * @param {string} poolKey Key of the pool
+	 * @param {string} orderId Order ID
+	 * @returns {Promise<Object>} A promise that resolves to an object containing the order information
+	 */
+	async getOrder(poolKey: string, orderId: string) {
+		const tx = new Transaction();
+
+		tx.add(this.deepBook.getOrder(poolKey, orderId));
+		const res = await this.client.devInspectTransactionBlock({
+			sender: normalizeSuiAddress(this.#address),
+			transactionBlock: tx,
+		});
+
+		const ID = bcs.struct('ID', {
+			bytes: bcs.Address,
+		});
+		const OrderDeepPrice = bcs.struct('OrderDeepPrice', {
+			asset_is_base: bcs.bool(),
+			deep_per_asset: bcs.u64(),
+		});
+		const Order = bcs.struct('Order', {
+			balance_manager_id: ID,
+			order_id: bcs.u128(),
+			client_order_id: bcs.u64(),
+			quantity: bcs.u64(),
+			filled_quantity: bcs.u64(),
+			fee_is_deep: bcs.bool(),
+			order_deep_price: OrderDeepPrice,
+			epoch: bcs.u64(),
+			status: bcs.u8(),
+			expire_timestamp: bcs.u64(),
+		});
+
+		const orderInformation = res.results![0].returnValues![0][0];
+		return Order.parse(new Uint8Array(orderInformation));
+	}
+
+	/**
+	 * @description Get level 2 order book specifying range of price
+	 * @param {string} poolKey Key of the pool
+	 * @param {number} priceLow Lower bound of the price range
+	 * @param {number} priceHigh Upper bound of the price range
+	 * @param {boolean} isBid Whether to get bid or ask orders
+	 * @returns {Promise<{ prices: Array<number>, quantities: Array<number> }>}
+	 * An object with arrays of prices and quantities
+	 */
+	async getLevel2Range(poolKey: string, priceLow: number, priceHigh: number, isBid: boolean) {
+		const tx = new Transaction();
+		const pool = this.#config.getPool(poolKey);
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+
+		tx.add(this.deepBook.getLevel2Range(poolKey, priceLow, priceHigh, isBid));
+		const res = await this.client.devInspectTransactionBlock({
+			sender: normalizeSuiAddress(this.#address),
+			transactionBlock: tx,
+		});
+
+		const prices = res.results![0].returnValues![0][0];
+		const parsed_prices = bcs.vector(bcs.u64()).parse(new Uint8Array(prices));
+		const quantities = res.results![0].returnValues![1][0];
+		const parsed_quantities = bcs.vector(bcs.u64()).parse(new Uint8Array(quantities));
+
+		return {
+			prices: parsed_prices.map((price) =>
+				Number(((Number(price) / FLOAT_SCALAR / quoteCoin.scalar) * baseCoin.scalar).toFixed(9)),
+			),
+			quantities: parsed_quantities.map((price) =>
+				Number((Number(price) / baseCoin.scalar).toFixed(9)),
+			),
+		};
+	}
+
+	/**
+	 * @description Get level 2 order book ticks from mid-price for a pool
+	 * @param {string} poolKey Key of the pool
+	 * @param {number} ticks Number of ticks from mid-price
+	 * @returns {Promise<{ bid_prices: Array<number>, bid_quantities: Array<number>, ask_prices: Array<number>, ask_quantities: Array<number> }>}
+	 * An object with arrays of prices and quantities
+	 */
+	async getLevel2TicksFromMid(poolKey: string, ticks: number) {
+		const tx = new Transaction();
+		const pool = this.#config.getPool(poolKey);
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+
+		tx.add(this.deepBook.getLevel2TicksFromMid(poolKey, ticks));
+		const res = await this.client.devInspectTransactionBlock({
+			sender: normalizeSuiAddress(this.#address),
+			transactionBlock: tx,
+		});
+
+		const bid_prices = res.results![0].returnValues![0][0];
+		const bid_parsed_prices = bcs.vector(bcs.u64()).parse(new Uint8Array(bid_prices));
+		const bid_quantities = res.results![0].returnValues![1][0];
+		const bid_parsed_quantities = bcs.vector(bcs.u64()).parse(new Uint8Array(bid_quantities));
+
+		const ask_prices = res.results![0].returnValues![2][0];
+		const ask_parsed_prices = bcs.vector(bcs.u64()).parse(new Uint8Array(ask_prices));
+		const ask_quantities = res.results![0].returnValues![3][0];
+		const ask_parsed_quantities = bcs.vector(bcs.u64()).parse(new Uint8Array(ask_quantities));
+
+		return {
+			bid_prices: bid_parsed_prices.map((price) =>
+				Number(((Number(price) / FLOAT_SCALAR / quoteCoin.scalar) * baseCoin.scalar).toFixed(9)),
+			),
+			bid_quantities: bid_parsed_quantities.map((quantity) =>
+				Number((Number(quantity) / baseCoin.scalar).toFixed(9)),
+			),
+			ask_prices: ask_parsed_prices.map((price) =>
+				Number(((Number(price) / FLOAT_SCALAR / quoteCoin.scalar) * baseCoin.scalar).toFixed(9)),
+			),
+			ask_quantities: ask_parsed_quantities.map((quantity) =>
+				Number((Number(quantity) / baseCoin.scalar).toFixed(9)),
+			),
+		};
+	}
+
+	/**
+	 * @description Get the vault balances for a pool
+	 * @param {string} poolKey Key of the pool
+	 * @returns {Promise<{ base: number, quote: number, deep: number }>}
+	 * An object with base, quote, and deep balances in the vault
+	 */
+	async vaultBalances(poolKey: string) {
+		const tx = new Transaction();
+		const pool = this.#config.getPool(poolKey);
+		const baseScalar = this.#config.getCoin(pool.baseCoin).scalar;
+		const quoteScalar = this.#config.getCoin(pool.quoteCoin).scalar;
+
+		tx.add(this.deepBook.vaultBalances(poolKey));
+		const res = await this.client.devInspectTransactionBlock({
+			sender: normalizeSuiAddress(this.#address),
+			transactionBlock: tx,
+		});
+
+		const baseInVault = Number(bcs.U64.parse(new Uint8Array(res.results![0].returnValues![0][0])));
+		const quoteInVault = Number(bcs.U64.parse(new Uint8Array(res.results![0].returnValues![1][0])));
+		const deepInVault = Number(bcs.U64.parse(new Uint8Array(res.results![0].returnValues![2][0])));
+
+		return {
+			base: Number((baseInVault / baseScalar).toFixed(9)),
+			quote: Number((quoteInVault / quoteScalar).toFixed(9)),
+			deep: Number((deepInVault / DEEP_SCALAR).toFixed(9)),
+		};
+	}
+
+	/**
+	 * @description Get the pool ID by asset types
+	 * @param {string} baseType Type of the base asset
+	 * @param {string} quoteType Type of the quote asset
+	 * @returns {Promise<string>} The address of the pool
+	 */
+	async getPoolIdByAssets(baseType: string, quoteType: string) {
+		const tx = new Transaction();
+		tx.add(this.deepBook.getPoolIdByAssets(baseType, quoteType));
+
+		const res = await this.client.devInspectTransactionBlock({
+			sender: normalizeSuiAddress(this.#address),
+			transactionBlock: tx,
+		});
+
+		const ID = bcs.struct('ID', {
+			bytes: bcs.Address,
+		});
+		const address = ID.parse(new Uint8Array(res.results![0].returnValues![0][0]))['bytes'];
+
+		return address;
+	}
+
+	/**
+	 * @description Get the mid price for a pool
+	 * @param {string} poolKey Key of the pool
+	 * @returns {Promise<number>} The mid price
+	 */
+	async midPrice(poolKey: string) {
+		const tx = new Transaction();
+		const pool = this.#config.getPool(poolKey);
+		tx.add(this.deepBook.midPrice(poolKey));
+
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+
+		const res = await this.client.devInspectTransactionBlock({
+			sender: normalizeSuiAddress(this.#address),
+			transactionBlock: tx,
+		});
+
+		const bytes = res.results![0].returnValues![0][0];
+		const parsed_mid_price = Number(bcs.U64.parse(new Uint8Array(bytes)));
+		const adjusted_mid_price =
+			(parsed_mid_price * baseCoin.scalar) / quoteCoin.scalar / FLOAT_SCALAR;
+
+		return Number(adjusted_mid_price.toFixed(9));
+	}
+}
diff --git a/sdk/deepbook-v3/src/index.ts b/sdk/deepbook-v3/src/index.ts
new file mode 100644
index 0000000000000..fad2c28551413
--- /dev/null
+++ b/sdk/deepbook-v3/src/index.ts
@@ -0,0 +1,12 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+export { DeepBookClient } from './client.js';
+export { BalanceManagerContract } from './transactions/balanceManager.js';
+export { DeepBookContract } from './transactions/deepbook.js';
+export { DeepBookAdminContract } from './transactions/deepbookAdmin.js';
+export { FlashLoanContract } from './transactions/flashLoans.js';
+export { GovernanceContract } from './transactions/governance.js';
+export { DeepBookConfig } from './utils/config.js';
+export type { BalanceManager, Coin, Pool } from './types/index.js';
+export type { CoinMap, PoolMap } from './utils/constants.js';
diff --git a/sdk/deepbook-v3/src/transactions/balanceManager.ts b/sdk/deepbook-v3/src/transactions/balanceManager.ts
new file mode 100644
index 0000000000000..55fdfaa527586
--- /dev/null
+++ b/sdk/deepbook-v3/src/transactions/balanceManager.ts
@@ -0,0 +1,185 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+import { coinWithBalance } from '@mysten/sui/transactions';
+import type { Transaction } from '@mysten/sui/transactions';
+
+import type { DeepBookConfig } from '../utils/config.js';
+
+/**
+ * BalanceManagerContract class for managing BalanceManager operations.
+ */
+export class BalanceManagerContract {
+	#config: DeepBookConfig;
+
+	/**
+	 * @param {DeepBookConfig} config Configuration for BalanceManagerContract
+	 */
+	constructor(config: DeepBookConfig) {
+		this.#config = config;
+	}
+
+	/**
+	 * @description Create and share a new BalanceManager
+	 * @returns A function that takes a Transaction object
+	 */
+	createAndShareBalanceManager = () => (tx: Transaction) => {
+		const manager = tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::balance_manager::new`,
+		});
+
+		tx.moveCall({
+			target: '0x2::transfer::public_share_object',
+			arguments: [manager],
+			typeArguments: [`${this.#config.DEEPBOOK_PACKAGE_ID}::balance_manager::BalanceManager`],
+		});
+	};
+
+	/**
+	 * @description Deposit funds into the BalanceManager
+	 * @param {string} managerKey The key of the BalanceManager
+	 * @param {string} coinKey The key of the coin to deposit
+	 * @param {number} amountToDeposit The amount to deposit
+	 * @returns A function that takes a Transaction object
+	 */
+	depositIntoManager =
+		(managerKey: string, coinKey: string, amountToDeposit: number) => (tx: Transaction) => {
+			tx.setSenderIfNotSet(this.#config.address);
+			const managerId = this.#config.getBalanceManager(managerKey).address;
+			const coin = this.#config.getCoin(coinKey);
+			const depositInput = Math.round(amountToDeposit * coin.scalar);
+			const deposit = coinWithBalance({
+				type: coin.type,
+				balance: depositInput,
+			});
+
+			tx.moveCall({
+				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::balance_manager::deposit`,
+				arguments: [tx.object(managerId), deposit],
+				typeArguments: [coin.type],
+			});
+		};
+
+	/**
+	 * @description Withdraw funds from the BalanceManager
+	 * @param {string} managerKey The key of the BalanceManager
+	 * @param {string} coinKey The key of the coin to withdraw
+	 * @param {number} amountToWithdraw The amount to withdraw
+	 * @param {string} recipient The recipient of the withdrawn funds
+	 * @returns A function that takes a Transaction object
+	 */
+	withdrawFromManager =
+		(managerKey: string, coinKey: string, amountToWithdraw: number, recipient: string) =>
+		(tx: Transaction) => {
+			const managerId = this.#config.getBalanceManager(managerKey).address;
+			const coin = this.#config.getCoin(coinKey);
+			const withdrawInput = Math.round(amountToWithdraw * coin.scalar);
+			const coinObject = tx.moveCall({
+				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::balance_manager::withdraw`,
+				arguments: [tx.object(managerId), tx.pure.u64(withdrawInput)],
+				typeArguments: [coin.type],
+			});
+
+			tx.transferObjects([coinObject], recipient);
+		};
+
+	/**
+	 * @description Withdraw all funds from the BalanceManager
+	 * @param {string} managerKey The key of the BalanceManager
+	 * @param {string} coinKey The key of the coin to withdraw
+	 * @param {string} recipient The recipient of the withdrawn funds
+	 * @returns A function that takes a Transaction object
+	 */
+	withdrawAllFromManager =
+		(managerKey: string, coinKey: string, recipient: string) => (tx: Transaction) => {
+			const managerId = this.#config.getBalanceManager(managerKey).address;
+			const coin = this.#config.getCoin(coinKey);
+			const withdrawalCoin = tx.moveCall({
+				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::balance_manager::withdraw_all`,
+				arguments: [tx.object(managerId)],
+				typeArguments: [coin.type],
+			});
+
+			tx.transferObjects([withdrawalCoin], recipient);
+		};
+
+	/**
+	 * @description Check the balance of the BalanceManager
+	 * @param {string} managerKey The key of the BalanceManager
+	 * @param {string} coinKey The key of the coin to check the balance of
+	 * @returns A function that takes a Transaction object
+	 */
+	checkManagerBalance = (managerKey: string, coinKey: string) => (tx: Transaction) => {
+		const managerId = this.#config.getBalanceManager(managerKey).address;
+		const coin = this.#config.getCoin(coinKey);
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::balance_manager::balance`,
+			arguments: [tx.object(managerId)],
+			typeArguments: [coin.type],
+		});
+	};
+
+	/**
+	 * @description Generate a trade proof for the BalanceManager. Calls the appropriate function based on whether tradeCap is set.
+	 * @param {string} managerKey The key of the BalanceManager
+	 * @returns A function that takes a Transaction object
+	 */
+	generateProof = (managerKey: string) => (tx: Transaction) => {
+		const balanceManager = this.#config.getBalanceManager(managerKey);
+		return tx.add(
+			balanceManager.tradeCap
+				? this.generateProofAsTrader(balanceManager.address, balanceManager.tradeCap)
+				: this.generateProofAsOwner(balanceManager.address),
+		);
+	};
+
+	/**
+	 * @description Generate a trade proof as the owner
+	 * @param {string} managerId The ID of the BalanceManager
+	 * @returns A function that takes a Transaction object
+	 */
+	generateProofAsOwner = (managerId: string) => (tx: Transaction) => {
+		return tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::balance_manager::generate_proof_as_owner`,
+			arguments: [tx.object(managerId)],
+		});
+	};
+
+	/**
+	 * @description Generate a trade proof as a trader
+	 * @param {string} managerId The ID of the BalanceManager
+	 * @param {string} tradeCapId The ID of the tradeCap
+	 * @returns A function that takes a Transaction object
+	 */
+	generateProofAsTrader = (managerId: string, tradeCapId: string) => (tx: Transaction) => {
+		return tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::balance_manager::generate_proof_as_trader`,
+			arguments: [tx.object(managerId), tx.object(tradeCapId)],
+		});
+	};
+
+	/**
+	 * @description Get the owner of the BalanceManager
+	 * @param {string} managerKey The key of the BalanceManager
+	 * @returns A function that takes a Transaction object
+	 */
+	owner = (managerKey: string) => (tx: Transaction) => {
+		const managerId = this.#config.getBalanceManager(managerKey).address;
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::balance_manager::owner`,
+			arguments: [tx.object(managerId)],
+		});
+	};
+
+	/**
+	 * @description Get the ID of the BalanceManager
+	 * @param {string} managerKey The key of the BalanceManager
+	 * @returns A function that takes a Transaction object
+	 */
+	id = (managerKey: string) => (tx: Transaction) => {
+		const managerId = this.#config.getBalanceManager(managerKey).address;
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::balance_manager::id`,
+			arguments: [tx.object(managerId)],
+		});
+	};
+}
diff --git a/sdk/deepbook-v3/src/transactions/deepbook.ts b/sdk/deepbook-v3/src/transactions/deepbook.ts
new file mode 100644
index 0000000000000..8dfa2b792e9a1
--- /dev/null
+++ b/sdk/deepbook-v3/src/transactions/deepbook.ts
@@ -0,0 +1,598 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+import { coinWithBalance } from '@mysten/sui/transactions';
+import type { Transaction } from '@mysten/sui/transactions';
+import { SUI_CLOCK_OBJECT_ID } from '@mysten/sui/utils';
+
+import { OrderType, SelfMatchingOptions } from '../types/index.js';
+import type { PlaceLimitOrderParams, PlaceMarketOrderParams, SwapParams } from '../types/index.js';
+import type { DeepBookConfig } from '../utils/config.js';
+import { DEEP_SCALAR, FLOAT_SCALAR, GAS_BUDGET, MAX_TIMESTAMP } from '../utils/config.js';
+
+/**
+ * DeepBookContract class for managing DeepBook operations.
+ */
+export class DeepBookContract {
+	#config: DeepBookConfig;
+
+	/**
+	 * @param {DeepBookConfig} config Configuration for DeepBookContract
+	 */
+	constructor(config: DeepBookConfig) {
+		this.#config = config;
+	}
+
+	/**
+	 * @description Place a limit order
+	 * @param {PlaceLimitOrderParams} params Parameters for placing a limit order
+	 * @returns A function that takes a Transaction object
+	 */
+	placeLimitOrder = (params: PlaceLimitOrderParams) => (tx: Transaction) => {
+		const {
+			poolKey,
+			balanceManagerKey,
+			clientOrderId,
+			price,
+			quantity,
+			isBid,
+			expiration = MAX_TIMESTAMP,
+			orderType = OrderType.NO_RESTRICTION,
+			selfMatchingOption = SelfMatchingOptions.SELF_MATCHING_ALLOWED,
+			payWithDeep = true,
+		} = params;
+
+		tx.setGasBudgetIfNotSet(GAS_BUDGET);
+		const pool = this.#config.getPool(poolKey);
+		const balanceManager = this.#config.getBalanceManager(balanceManagerKey);
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+		const inputPrice = Math.round((price * FLOAT_SCALAR * quoteCoin.scalar) / baseCoin.scalar);
+		const inputQuantity = Math.round(quantity * baseCoin.scalar);
+
+		const tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));
+
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::place_limit_order`,
+			arguments: [
+				tx.object(pool.address),
+				tx.object(balanceManager.address),
+				tradeProof,
+				tx.pure.u64(clientOrderId),
+				tx.pure.u8(orderType),
+				tx.pure.u8(selfMatchingOption),
+				tx.pure.u64(inputPrice),
+				tx.pure.u64(inputQuantity),
+				tx.pure.bool(isBid),
+				tx.pure.bool(payWithDeep),
+				tx.pure.u64(expiration),
+				tx.object(SUI_CLOCK_OBJECT_ID),
+			],
+			typeArguments: [baseCoin.type, quoteCoin.type],
+		});
+	};
+
+	/**
+	 * @description Place a market order
+	 * @param {PlaceMarketOrderParams} params Parameters for placing a market order
+	 * @returns A function that takes a Transaction object
+	 */
+	placeMarketOrder = (params: PlaceMarketOrderParams) => (tx: Transaction) => {
+		const {
+			poolKey,
+			balanceManagerKey,
+			clientOrderId,
+			quantity,
+			isBid,
+			selfMatchingOption = SelfMatchingOptions.SELF_MATCHING_ALLOWED,
+			payWithDeep = true,
+		} = params;
+
+		tx.setGasBudgetIfNotSet(GAS_BUDGET);
+		const pool = this.#config.getPool(poolKey);
+		const balanceManager = this.#config.getBalanceManager(balanceManagerKey);
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+		const tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));
+		const inputQuantity = Math.round(quantity * baseCoin.scalar);
+
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::place_market_order`,
+			arguments: [
+				tx.object(pool.address),
+				tx.object(balanceManager.address),
+				tradeProof,
+				tx.pure.u64(clientOrderId),
+				tx.pure.u8(selfMatchingOption),
+				tx.pure.u64(inputQuantity),
+				tx.pure.bool(isBid),
+				tx.pure.bool(payWithDeep),
+				tx.object(SUI_CLOCK_OBJECT_ID),
+			],
+			typeArguments: [baseCoin.type, quoteCoin.type],
+		});
+	};
+
+	/**
+	 * @description Modify an existing order
+	 * @param {string} poolKey The key to identify the pool
+	 * @param {string} balanceManagerKey The key to identify the BalanceManager
+	 * @param {string} orderId Order ID to modify
+	 * @param {number} newQuantity New quantity for the order
+	 * @returns A function that takes a Transaction object
+	 */
+	modifyOrder =
+		(poolKey: string, balanceManagerKey: string, orderId: string, newQuantity: number) =>
+		(tx: Transaction) => {
+			const pool = this.#config.getPool(poolKey);
+			const balanceManager = this.#config.getBalanceManager(balanceManagerKey);
+			const baseCoin = this.#config.getCoin(pool.baseCoin);
+			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+			const tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));
+			const inputQuantity = Math.round(newQuantity * baseCoin.scalar);
+
+			tx.moveCall({
+				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::modify_order`,
+				arguments: [
+					tx.object(pool.address),
+					tx.object(balanceManager.address),
+					tradeProof,
+					tx.pure.u128(orderId),
+					tx.pure.u64(inputQuantity),
+					tx.object(SUI_CLOCK_OBJECT_ID),
+				],
+				typeArguments: [baseCoin.type, quoteCoin.type],
+			});
+		};
+
+	/**
+	 * @description Cancel an existing order
+	 * @param {string} poolKey The key to identify the pool
+	 * @param {string} balanceManagerKey The key to identify the BalanceManager
+	 * @param {string} orderId Order ID to cancel
+	 * @returns A function that takes a Transaction object
+	 */
+	cancelOrder =
+		(poolKey: string, balanceManagerKey: string, orderId: string) => (tx: Transaction) => {
+			tx.setGasBudgetIfNotSet(GAS_BUDGET);
+			const pool = this.#config.getPool(poolKey);
+			const balanceManager = this.#config.getBalanceManager(balanceManagerKey);
+			const baseCoin = this.#config.getCoin(pool.baseCoin);
+			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+			const tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));
+
+			tx.moveCall({
+				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::cancel_order`,
+				arguments: [
+					tx.object(pool.address),
+					tx.object(balanceManager.address),
+					tradeProof,
+					tx.pure.u128(orderId),
+					tx.object(SUI_CLOCK_OBJECT_ID),
+				],
+				typeArguments: [baseCoin.type, quoteCoin.type],
+			});
+		};
+
+	/**
+	 * @description Cancel all open orders for a balance manager
+	 * @param {string} poolKey The key to identify the pool
+	 * @param {string} balanceManagerKey The key to identify the BalanceManager
+	 * @returns A function that takes a Transaction object
+	 */
+	cancelAllOrders = (poolKey: string, balanceManagerKey: string) => (tx: Transaction) => {
+		tx.setGasBudgetIfNotSet(GAS_BUDGET);
+		const pool = this.#config.getPool(poolKey);
+		const balanceManager = this.#config.getBalanceManager(balanceManagerKey);
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+		const tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));
+
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::cancel_all_orders`,
+			arguments: [
+				tx.object(pool.address),
+				tx.object(balanceManager.address),
+				tradeProof,
+				tx.object(SUI_CLOCK_OBJECT_ID),
+			],
+			typeArguments: [baseCoin.type, quoteCoin.type],
+		});
+	};
+
+	/**
+	 * @description Withdraw settled amounts for a balance manager
+	 * @param {string} poolKey The key to identify the pool
+	 * @param {string} balanceManagerKey The key to identify the BalanceManager
+	 * @returns A function that takes a Transaction object
+	 */
+	withdrawSettledAmounts = (poolKey: string, balanceManagerKey: string) => (tx: Transaction) => {
+		const pool = this.#config.getPool(poolKey);
+		const balanceManager = this.#config.getBalanceManager(balanceManagerKey);
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+		const tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));
+
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::withdraw_settled_amounts`,
+			arguments: [tx.object(pool.address), tx.object(balanceManager.address), tradeProof],
+			typeArguments: [baseCoin.type, quoteCoin.type],
+		});
+	};
+
+	/**
+	 * @description Add a deep price point for a target pool using a reference pool
+	 * @param {string} targetPoolKey The key to identify the target pool
+	 * @param {string} referencePoolKey The key to identify the reference pool
+	 * @returns A function that takes a Transaction object
+	 */
+	addDeepPricePoint = (targetPoolKey: string, referencePoolKey: string) => (tx: Transaction) => {
+		const targetPool = this.#config.getPool(targetPoolKey);
+		const referencePool = this.#config.getPool(referencePoolKey);
+		const targetBaseCoin = this.#config.getCoin(targetPool.baseCoin);
+		const targetQuoteCoin = this.#config.getCoin(targetPool.quoteCoin);
+		const referenceBaseCoin = this.#config.getCoin(referencePool.baseCoin);
+		const referenceQuoteCoin = this.#config.getCoin(referencePool.quoteCoin);
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::add_deep_price_point`,
+			arguments: [
+				tx.object(targetPool.address),
+				tx.object(referencePool.address),
+				tx.object(SUI_CLOCK_OBJECT_ID),
+			],
+			typeArguments: [
+				targetBaseCoin.type,
+				targetQuoteCoin.type,
+				referenceBaseCoin.type,
+				referenceQuoteCoin.type,
+			],
+		});
+	};
+
+	/**
+	 * @description Claim rebates for a balance manager
+	 * @param {string} poolKey The key to identify the pool
+	 * @param {string} balanceManagerKey The key to identify the BalanceManager
+	 * @returns A function that takes a Transaction object
+	 */
+	claimRebates = (poolKey: string, balanceManagerKey: string) => (tx: Transaction) => {
+		const pool = this.#config.getPool(poolKey);
+		const balanceManager = this.#config.getBalanceManager(balanceManagerKey);
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+		const tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));
+
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::claim_rebates`,
+			arguments: [tx.object(pool.address), tx.object(balanceManager.address), tradeProof],
+			typeArguments: [baseCoin.type, quoteCoin.type],
+		});
+	};
+
+	/**
+	 * @description Gets an order
+	 * @param {string} poolKey The key to identify the pool
+	 * @param {string} orderId Order ID to get
+	 * @returns A function that takes a Transaction object
+	 */
+	getOrder = (poolKey: string, orderId: string) => (tx: Transaction) => {
+		const pool = this.#config.getPool(poolKey);
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::get_order`,
+			arguments: [tx.object(pool.address), tx.pure.u128(orderId)],
+			typeArguments: [baseCoin.type, quoteCoin.type],
+		});
+	};
+
+	/**
+	 * @description Burn DEEP tokens from the pool
+	 * @param {string} poolKey The key to identify the pool
+	 * @returns A function that takes a Transaction object
+	 */
+	burnDeep = (poolKey: string) => (tx: Transaction) => {
+		const pool = this.#config.getPool(poolKey);
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::burn_deep`,
+			arguments: [tx.object(pool.address), tx.object(this.#config.DEEP_TREASURY_ID)],
+			typeArguments: [baseCoin.type, quoteCoin.type],
+		});
+	};
+
+	/**
+	 * @description Get the mid price for a pool
+	 * @param {string} poolKey The key to identify the pool
+	 * @returns A function that takes a Transaction object
+	 */
+	midPrice = (poolKey: string) => (tx: Transaction) => {
+		const pool = this.#config.getPool(poolKey);
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::mid_price`,
+			arguments: [tx.object(pool.address), tx.object(SUI_CLOCK_OBJECT_ID)],
+			typeArguments: [baseCoin.type, quoteCoin.type],
+		});
+	};
+
+	/**
+	 * @description Check if a pool is whitelisted
+	 * @param {string} poolKey The key to identify the pool
+	 * @returns A function that takes a Transaction object
+	 */
+	whitelisted = (poolKey: string) => (tx: Transaction) => {
+		const pool = this.#config.getPool(poolKey);
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::whitelisted`,
+			arguments: [tx.object(pool.address)],
+			typeArguments: [baseCoin.type, quoteCoin.type],
+		});
+	};
+
+	/**
+	 * @description Get the quote quantity out for a given base quantity in
+	 * @param {string} poolKey The key to identify the pool
+	 * @param {number} baseQuantity Base quantity to convert
+	 * @returns A function that takes a Transaction object
+	 */
+	getQuoteQuantityOut = (poolKey: string, baseQuantity: number) => (tx: Transaction) => {
+		const pool = this.#config.getPool(poolKey);
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::get_quote_quantity_out`,
+			arguments: [
+				tx.object(pool.address),
+				tx.pure.u64(baseQuantity * baseCoin.scalar),
+				tx.object(SUI_CLOCK_OBJECT_ID),
+			],
+			typeArguments: [baseCoin.type, quoteCoin.type],
+		});
+	};
+
+	/**
+	 * @description Get the base quantity out for a given quote quantity in
+	 * @param {string} poolKey The key to identify the pool
+	 * @param {number} quoteQuantity Quote quantity to convert
+	 * @returns A function that takes a Transaction object
+	 */
+	getBaseQuantityOut = (poolKey: string, quoteQuantity: number) => (tx: Transaction) => {
+		const pool = this.#config.getPool(poolKey);
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+		const quoteScalar = quoteCoin.scalar;
+
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::get_base_quantity_out`,
+			arguments: [
+				tx.object(pool.address),
+				tx.pure.u64(quoteQuantity * quoteScalar),
+				tx.object(SUI_CLOCK_OBJECT_ID),
+			],
+			typeArguments: [baseCoin.type, quoteCoin.type],
+		});
+	};
+
+	/**
+	 * @description Get the quantity out for a given base or quote quantity
+	 * @param {string} poolKey The key to identify the pool
+	 * @param {number} baseQuantity Base quantity to convert
+	 * @param {number} quoteQuantity Quote quantity to convert
+	 * @returns A function that takes a Transaction object
+	 */
+	getQuantityOut =
+		(poolKey: string, baseQuantity: number, quoteQuantity: number) => (tx: Transaction) => {
+			const pool = this.#config.getPool(poolKey);
+			const baseCoin = this.#config.getCoin(pool.baseCoin);
+			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+			const quoteScalar = quoteCoin.scalar;
+
+			tx.moveCall({
+				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::get_quantity_out`,
+				arguments: [
+					tx.object(pool.address),
+					tx.pure.u64(baseQuantity * baseCoin.scalar),
+					tx.pure.u64(quoteQuantity * quoteScalar),
+					tx.object(SUI_CLOCK_OBJECT_ID),
+				],
+				typeArguments: [baseCoin.type, quoteCoin.type],
+			});
+		};
+
+	/**
+	 * @description Get open orders for a balance manager in a pool
+	 * @param {string} poolKey The key to identify the pool
+	 * @param {string} managerKey Key of the balance manager
+	 * @returns A function that takes a Transaction object
+	 */
+	accountOpenOrders = (poolKey: string, managerKey: string) => (tx: Transaction) => {
+		const pool = this.#config.getPool(poolKey);
+		const manager = this.#config.getBalanceManager(managerKey);
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::account_open_orders`,
+			arguments: [tx.object(pool.address), tx.object(manager.address)],
+			typeArguments: [baseCoin.type, quoteCoin.type],
+		});
+	};
+
+	/**
+	 * @description Get level 2 order book specifying range of price
+	 * @param {string} poolKey The key to identify the pool
+	 * @param {number} priceLow Lower bound of the price range
+	 * @param {number} priceHigh Upper bound of the price range
+	 * @param {boolean} isBid Whether to get bid or ask orders
+	 * @returns A function that takes a Transaction object
+	 */
+	getLevel2Range =
+		(poolKey: string, priceLow: number, priceHigh: number, isBid: boolean) => (tx: Transaction) => {
+			const pool = this.#config.getPool(poolKey);
+			const baseCoin = this.#config.getCoin(pool.baseCoin);
+			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+
+			tx.moveCall({
+				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::get_level2_range`,
+				arguments: [
+					tx.object(pool.address),
+					tx.pure.u64((priceLow * FLOAT_SCALAR * quoteCoin.scalar) / baseCoin.scalar),
+					tx.pure.u64((priceHigh * FLOAT_SCALAR * quoteCoin.scalar) / baseCoin.scalar),
+					tx.pure.bool(isBid),
+					tx.object(SUI_CLOCK_OBJECT_ID),
+				],
+				typeArguments: [baseCoin.type, quoteCoin.type],
+			});
+		};
+
+	/**
+	 * @description Get level 2 order book ticks from mid-price for a pool
+	 * @param {string} poolKey The key to identify the pool
+	 * @param {number} tickFromMid Number of ticks from mid-price
+	 * @returns A function that takes a Transaction object
+	 */
+	getLevel2TicksFromMid = (poolKey: string, tickFromMid: number) => (tx: Transaction) => {
+		const pool = this.#config.getPool(poolKey);
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::get_level2_ticks_from_mid`,
+			arguments: [
+				tx.object(pool.address),
+				tx.pure.u64(tickFromMid),
+				tx.object(SUI_CLOCK_OBJECT_ID),
+			],
+			typeArguments: [baseCoin.type, quoteCoin.type],
+		});
+	};
+
+	/**
+	 * @description Get the vault balances for a pool
+	 * @param {string} poolKey The key to identify the pool
+	 * @returns A function that takes a Transaction object
+	 */
+	vaultBalances = (poolKey: string) => (tx: Transaction) => {
+		const pool = this.#config.getPool(poolKey);
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::vault_balances`,
+			arguments: [tx.object(pool.address)],
+			typeArguments: [baseCoin.type, quoteCoin.type],
+		});
+	};
+
+	/**
+	 * @description Get the pool ID by asset types
+	 * @param {string} baseType Type of the base asset
+	 * @param {string} quoteType Type of the quote asset
+	 * @returns A function that takes a Transaction object
+	 */
+	getPoolIdByAssets = (baseType: string, quoteType: string) => (tx: Transaction) => {
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::get_pool_id_by_asset`,
+			arguments: [tx.object(this.#config.REGISTRY_ID)],
+			typeArguments: [baseType, quoteType],
+		});
+	};
+
+	/**
+	 * @description Swap exact base amount for quote amount
+	 * @param {SwapParams} params Parameters for the swap
+	 * @returns A function that takes a Transaction object
+	 */
+	swapExactBaseForQuote = (params: SwapParams) => (tx: Transaction) => {
+		tx.setGasBudgetIfNotSet(GAS_BUDGET);
+		tx.setSenderIfNotSet(this.#config.address);
+
+		if (params.quoteCoin) {
+			throw new Error('quoteCoin is not accepted for swapping base asset');
+		}
+		const { poolKey, amount: baseAmount, deepAmount, minOut: minQuote } = params;
+
+		let pool = this.#config.getPool(poolKey);
+		let deepCoinType = this.#config.getCoin('DEEP').type;
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+
+		const baseCoinInput =
+			params.baseCoin ??
+			coinWithBalance({ type: baseCoin.type, balance: Math.round(baseAmount * baseCoin.scalar) });
+
+		const deepCoin =
+			params.deepCoin ??
+			coinWithBalance({ type: deepCoinType, balance: Math.round(deepAmount * DEEP_SCALAR) });
+
+		const minQuoteInput = Math.round(minQuote * quoteCoin.scalar);
+
+		const [baseCoinResult, quoteCoinResult, deepCoinResult] = tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::swap_exact_base_for_quote`,
+			arguments: [
+				tx.object(pool.address),
+				baseCoinInput,
+				deepCoin,
+				tx.pure.u64(minQuoteInput),
+				tx.object(SUI_CLOCK_OBJECT_ID),
+			],
+			typeArguments: [baseCoin.type, quoteCoin.type],
+		});
+
+		return [baseCoinResult, quoteCoinResult, deepCoinResult] as const;
+	};
+
+	/**
+	 * @description Swap exact quote amount for base amount
+	 * @param {SwapParams} params Parameters for the swap
+	 * @returns A function that takes a Transaction object
+	 */
+	swapExactQuoteForBase = (params: SwapParams) => (tx: Transaction) => {
+		tx.setGasBudgetIfNotSet(GAS_BUDGET);
+		tx.setSenderIfNotSet(this.#config.address);
+
+		if (params.baseCoin) {
+			throw new Error('baseCoin is not accepted for swapping quote asset');
+		}
+		const { poolKey, amount: quoteAmount, deepAmount, minOut: minBase } = params;
+
+		let pool = this.#config.getPool(poolKey);
+		let deepCoinType = this.#config.getCoin('DEEP').type;
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+
+		const quoteCoinInput =
+			params.quoteCoin ??
+			coinWithBalance({
+				type: quoteCoin.type,
+				balance: Math.round(quoteAmount * quoteCoin.scalar),
+			});
+
+		const deepCoin =
+			params.deepCoin ??
+			coinWithBalance({ type: deepCoinType, balance: Math.round(deepAmount * DEEP_SCALAR) });
+
+		const minBaseInput = Math.round(minBase * baseCoin.scalar);
+
+		const [baseCoinResult, quoteCoinResult, deepCoinResult] = tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::swap_exact_quote_for_base`,
+			arguments: [
+				tx.object(pool.address),
+				quoteCoinInput,
+				deepCoin,
+				tx.pure.u64(minBaseInput),
+				tx.object(SUI_CLOCK_OBJECT_ID),
+			],
+			typeArguments: [baseCoin.type, quoteCoin.type],
+		});
+
+		return [baseCoinResult, quoteCoinResult, deepCoinResult] as const;
+	};
+}
diff --git a/sdk/deepbook-v3/src/transactions/deepbookAdmin.ts b/sdk/deepbook-v3/src/transactions/deepbookAdmin.ts
new file mode 100644
index 0000000000000..801f8f7bb9ce0
--- /dev/null
+++ b/sdk/deepbook-v3/src/transactions/deepbookAdmin.ts
@@ -0,0 +1,140 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+import { coinWithBalance } from '@mysten/sui/transactions';
+import type { Transaction } from '@mysten/sui/transactions';
+
+import type { CreatePoolAdminParams } from '../types/index.js';
+import type { DeepBookConfig } from '../utils/config.js';
+import { FLOAT_SCALAR, POOL_CREATION_FEE } from '../utils/config.js';
+
+/**
+ * DeepBookAdminContract class for managing admin actions.
+ */
+export class DeepBookAdminContract {
+	#config: DeepBookConfig;
+
+	/**
+	 * @param {DeepBookConfig} config Configuration for DeepBookAdminContract
+	 */
+	constructor(config: DeepBookConfig) {
+		this.#config = config;
+	}
+
+	/**
+	 * @returns The admin capability required for admin operations
+	 * @throws Error if the admin capability is not set
+	 */
+	#adminCap() {
+		const adminCap = this.#config.adminCap;
+		if (!adminCap) {
+			throw new Error('ADMIN_CAP environment variable not set');
+		}
+		return adminCap;
+	}
+
+	/**
+	 * @description Create a new pool as admin
+	 * @param {CreatePoolAdminParams} params Parameters for creating pool as admin
+	 * @returns A function that takes a Transaction object
+	 */
+	createPoolAdmin = (params: CreatePoolAdminParams) => (tx: Transaction) => {
+		tx.setSenderIfNotSet(this.#config.address);
+		const { baseCoinKey, quoteCoinKey, tickSize, lotSize, minSize, whitelisted, stablePool } =
+			params;
+		const baseCoin = this.#config.getCoin(baseCoinKey);
+		const quoteCoin = this.#config.getCoin(quoteCoinKey);
+		const deepCoinType = this.#config.getCoin('DEEP').type;
+
+		const creationFee = coinWithBalance({ type: deepCoinType, balance: POOL_CREATION_FEE });
+		const baseScalar = baseCoin.scalar;
+		const quoteScalar = quoteCoin.scalar;
+
+		const adjustedTickSize = (tickSize * FLOAT_SCALAR * quoteScalar) / baseScalar;
+		const adjustedLotSize = lotSize * baseScalar;
+		const adjustedMinSize = minSize * baseScalar;
+
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::create_pool_admin`,
+			arguments: [
+				tx.object(this.#config.REGISTRY_ID), // registry_id
+				tx.pure.u64(adjustedTickSize), // adjusted tick_size
+				tx.pure.u64(adjustedLotSize), // adjusted lot_size
+				tx.pure.u64(adjustedMinSize), // adjusted min_size
+				creationFee, // 0x2::balance::Balance<0x2::sui::SUI>
+				tx.pure.bool(whitelisted),
+				tx.pure.bool(stablePool),
+				tx.object(this.#adminCap()),
+			],
+			typeArguments: [baseCoin.type, quoteCoin.type],
+		});
+	};
+
+	/**
+	 * @description Unregister a pool as admin
+	 * @param {string} poolKey The key of the pool to be unregistered by admin
+	 * @returns A function that takes a Transaction object
+	 */
+	unregisterPoolAdmin = (poolKey: string) => (tx: Transaction) => {
+		const pool = this.#config.getPool(poolKey);
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::unregister_pool_admin`,
+			arguments: [tx.object(this.#config.REGISTRY_ID), tx.object(this.#adminCap())],
+			typeArguments: [baseCoin.type, quoteCoin.type],
+		});
+	};
+
+	/**
+	 * @description Update the allowed versions for a pool
+	 * @param {string} poolKey The key of the pool to be updated
+	 * @returns A function that takes a Transaction object
+	 */
+	updateAllowedVersions = (poolKey: string) => (tx: Transaction) => {
+		const pool = this.#config.getPool(poolKey);
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::update_allowed_versions`,
+			arguments: [
+				tx.object(pool.address),
+				tx.object(this.#config.REGISTRY_ID),
+				tx.object(this.#adminCap()),
+			],
+			typeArguments: [baseCoin.type, quoteCoin.type],
+		});
+	};
+
+	/**
+	 * @description Enable a specific version
+	 * @param {number} version The version to be enabled
+	 * @returns A function that takes a Transaction object
+	 */
+	enableVersion = (version: number) => (tx: Transaction) => {
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::registry::enable_version`,
+			arguments: [
+				tx.object(this.#config.REGISTRY_ID),
+				tx.pure.u64(version),
+				tx.object(this.#adminCap()),
+			],
+		});
+	};
+
+	/**
+	 * @description Disable a specific version
+	 * @param {number} version The version to be disabled
+	 * @returns A function that takes a Transaction object
+	 */
+	disableVersion = (version: number) => (tx: Transaction) => {
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::registry::disable_version`,
+			arguments: [
+				tx.object(this.#config.REGISTRY_ID),
+				tx.pure.u64(version),
+				tx.object(this.#adminCap()),
+			],
+		});
+	};
+}
diff --git a/sdk/deepbook-v3/src/transactions/flashLoans.ts b/sdk/deepbook-v3/src/transactions/flashLoans.ts
new file mode 100644
index 0000000000000..f61c5eb66f523
--- /dev/null
+++ b/sdk/deepbook-v3/src/transactions/flashLoans.ts
@@ -0,0 +1,123 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+import type { Transaction, TransactionObjectArgument } from '@mysten/sui/transactions';
+
+import type { DeepBookConfig } from '../utils/config.js';
+
+/**
+ * FlashLoanContract class for managing flash loans.
+ */
+export class FlashLoanContract {
+	#config: DeepBookConfig;
+
+	/**
+	 * @param {DeepBookConfig} config Configuration object for DeepBook
+	 */
+	constructor(config: DeepBookConfig) {
+		this.#config = config;
+	}
+
+	/**
+	 * @description Borrow base asset from the pool
+	 * @param {string} poolKey The key to identify the pool
+	 * @param {number} borrowAmount The amount to borrow
+	 * @returns A function that takes a Transaction object
+	 */
+	borrowBaseAsset = (poolKey: string, borrowAmount: number) => (tx: Transaction) => {
+		const pool = this.#config.getPool(poolKey);
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+		const inputQuantity = Math.round(borrowAmount * baseCoin.scalar);
+		const [baseCoinResult, flashLoan] = tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::borrow_flashloan_base`,
+			arguments: [tx.object(pool.address), tx.pure.u64(inputQuantity)],
+			typeArguments: [baseCoin.type, quoteCoin.type],
+		});
+		return [baseCoinResult, flashLoan] as const;
+	};
+
+	/**
+	 * @description Return base asset to the pool after a flash loan.
+	 * @param {string} poolKey The key to identify the pool
+	 * @param {number} borrowAmount The amount of the base asset to return
+	 * @param {TransactionObjectArgument} baseCoinInput Coin object representing the base asset to be returned
+	 * @param {TransactionObjectArgument} flashLoan FlashLoan object representing the loan to be settled
+	 * @returns A function that takes a Transaction object
+	 */
+	returnBaseAsset =
+		(
+			poolKey: string,
+			borrowAmount: number,
+			baseCoinInput: TransactionObjectArgument,
+			flashLoan: TransactionObjectArgument,
+		) =>
+		(tx: Transaction) => {
+			const pool = this.#config.getPool(poolKey);
+			const baseCoin = this.#config.getCoin(pool.baseCoin);
+			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+			const borrowScalar = baseCoin.scalar;
+
+			const [baseCoinReturn] = tx.splitCoins(baseCoinInput, [
+				tx.pure.u64(Math.round(borrowAmount * borrowScalar)),
+			]);
+			tx.moveCall({
+				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::return_flashloan_base`,
+				arguments: [tx.object(pool.address), baseCoinReturn, flashLoan],
+				typeArguments: [baseCoin.type, quoteCoin.type],
+			});
+
+			return baseCoinInput;
+		};
+
+	/**
+	 * @description Borrow quote asset from the pool
+	 * @param {string} poolKey The key to identify the pool
+	 * @param {number} borrowAmount The amount to borrow
+	 * @returns A function that takes a Transaction object
+	 */
+	borrowQuoteAsset = (poolKey: string, borrowAmount: number) => (tx: Transaction) => {
+		const pool = this.#config.getPool(poolKey);
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+		const inputQuantity = Math.round(borrowAmount * quoteCoin.scalar);
+		const [quoteCoinResult, flashLoan] = tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::borrow_flashloan_quote`,
+			arguments: [tx.object(pool.address), tx.pure.u64(inputQuantity)],
+			typeArguments: [baseCoin.type, quoteCoin.type],
+		});
+		return [quoteCoinResult, flashLoan] as const;
+	};
+
+	/**
+	 * @description Return quote asset to the pool after a flash loan.
+	 * @param {string} poolKey The key to identify the pool
+	 * @param {number} borrowAmount The amount of the quote asset to return
+	 * @param {TransactionObjectArgument} quoteCoinInput Coin object representing the quote asset to be returned
+	 * @param {TransactionObjectArgument} flashLoan FlashLoan object representing the loan to be settled
+	 * @returns A function that takes a Transaction object
+	 */
+	returnQuoteAsset =
+		(
+			poolKey: string,
+			borrowAmount: number,
+			quoteCoinInput: TransactionObjectArgument,
+			flashLoan: TransactionObjectArgument,
+		) =>
+		(tx: Transaction) => {
+			const pool = this.#config.getPool(poolKey);
+			const baseCoin = this.#config.getCoin(pool.baseCoin);
+			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+			const borrowScalar = quoteCoin.scalar;
+
+			const [quoteCoinReturn] = tx.splitCoins(quoteCoinInput, [
+				tx.pure.u64(Math.round(borrowAmount * borrowScalar)),
+			]);
+			tx.moveCall({
+				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::return_flashloan_quote`,
+				arguments: [tx.object(pool.address), quoteCoinReturn, flashLoan],
+				typeArguments: [baseCoin.type, quoteCoin.type],
+			});
+
+			return quoteCoinInput;
+		};
+}
diff --git a/sdk/deepbook-v3/src/transactions/governance.ts b/sdk/deepbook-v3/src/transactions/governance.ts
new file mode 100644
index 0000000000000..907be66d6ad13
--- /dev/null
+++ b/sdk/deepbook-v3/src/transactions/governance.ts
@@ -0,0 +1,120 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+import type { Transaction } from '@mysten/sui/transactions';
+
+import type { ProposalParams } from '../types/index.js';
+import type { DeepBookConfig } from '../utils/config.js';
+import { DEEP_SCALAR, FLOAT_SCALAR } from '../utils/config.js';
+
+/**
+ * GovernanceContract class for managing governance operations in DeepBook.
+ */
+export class GovernanceContract {
+	#config: DeepBookConfig;
+
+	/**
+	 * @param {DeepBookConfig} config Configuration for GovernanceContract
+	 */
+	constructor(config: DeepBookConfig) {
+		this.#config = config;
+	}
+
+	/**
+	 * @description Stake a specified amount in the pool
+	 * @param {string} poolKey The key to identify the pool
+	 * @param {string} balanceManagerKey The key to identify the BalanceManager
+	 * @param {number} stakeAmount The amount to stake
+	 * @returns A function that takes a Transaction object
+	 */
+	stake =
+		(poolKey: string, balanceManagerKey: string, stakeAmount: number) => (tx: Transaction) => {
+			const pool = this.#config.getPool(poolKey);
+			const balanceManager = this.#config.getBalanceManager(balanceManagerKey);
+			const tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));
+			const baseCoin = this.#config.getCoin(pool.baseCoin);
+			const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+			const stakeInput = Math.round(stakeAmount * DEEP_SCALAR);
+
+			tx.moveCall({
+				target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::stake`,
+				arguments: [
+					tx.object(pool.address),
+					tx.object(balanceManager.address),
+					tradeProof,
+					tx.pure.u64(stakeInput),
+				],
+				typeArguments: [baseCoin.type, quoteCoin.type],
+			});
+		};
+
+	/**
+	 * @description Unstake from the pool
+	 * @param {string} poolKey The key to identify the pool
+	 * @param {string} balanceManagerKey The key to identify the BalanceManager
+	 * @returns A function that takes a Transaction object
+	 */
+	unstake = (poolKey: string, balanceManagerKey: string) => (tx: Transaction) => {
+		const pool = this.#config.getPool(poolKey);
+		const balanceManager = this.#config.getBalanceManager(balanceManagerKey);
+		const tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::unstake`,
+			arguments: [tx.object(pool.address), tx.object(balanceManager.address), tradeProof],
+			typeArguments: [baseCoin.type, quoteCoin.type],
+		});
+	};
+
+	/**
+	 * @description Submit a governance proposal
+	 * @param {ProposalParams} params Parameters for the proposal
+	 * @returns A function that takes a Transaction object
+	 */
+	submitProposal = (params: ProposalParams) => (tx: Transaction) => {
+		const { poolKey, balanceManagerKey, takerFee, makerFee, stakeRequired } = params;
+
+		const pool = this.#config.getPool(poolKey);
+		const balanceManager = this.#config.getBalanceManager(balanceManagerKey);
+		const tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));
+		const baseCoin = this.#config.getCoin(pool.baseCoin);
+		const quoteCoin = this.#config.getCoin(pool.quoteCoin);
+
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::submit_proposal`,
+			arguments: [
+				tx.object(pool.address),
+				tx.object(balanceManager.address),
+				tradeProof,
+				tx.pure.u64(Math.round(takerFee * FLOAT_SCALAR)),
+				tx.pure.u64(Math.round(makerFee * FLOAT_SCALAR)),
+				tx.pure.u64(Math.round(stakeRequired * DEEP_SCALAR)),
+			],
+			typeArguments: [baseCoin.type, quoteCoin.type],
+		});
+	};
+
+	/**
+	 * @description Vote on a proposal
+	 * @param {string} poolKey The key to identify the pool
+	 * @param {string} balanceManagerKey The key to identify the BalanceManager
+	 * @param {string} proposal_id The ID of the proposal to vote on
+	 * @returns A function that takes a Transaction object
+	 */
+	vote = (poolKey: string, balanceManagerKey: string, proposal_id: string) => (tx: Transaction) => {
+		const pool = this.#config.getPool(poolKey);
+		const balanceManager = this.#config.getBalanceManager(balanceManagerKey);
+		const tradeProof = tx.add(this.#config.balanceManager.generateProof(balanceManagerKey));
+
+		tx.moveCall({
+			target: `${this.#config.DEEPBOOK_PACKAGE_ID}::pool::vote`,
+			arguments: [
+				tx.object(pool.address),
+				tx.object(balanceManager.address),
+				tradeProof,
+				tx.pure.id(proposal_id),
+			],
+		});
+	};
+}
diff --git a/sdk/deepbook-v3/src/types/index.ts b/sdk/deepbook-v3/src/types/index.ts
new file mode 100644
index 0000000000000..4d51820cbd7e9
--- /dev/null
+++ b/sdk/deepbook-v3/src/types/index.ts
@@ -0,0 +1,98 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+import type { TransactionObjectArgument } from '@mysten/sui/transactions';
+
+// SPDX-License-Identifier: Apache-2.0
+export interface BalanceManager {
+	address: string;
+	tradeCap: string | undefined;
+}
+
+export interface Coin {
+	address: string;
+	type: string;
+	scalar: number;
+}
+
+export interface Pool {
+	address: string;
+	baseCoin: string;
+	quoteCoin: string;
+}
+
+// Trading constants
+export enum OrderType {
+	NO_RESTRICTION,
+	IMMEDIATE_OR_CANCEL,
+	FILL_OR_KILL,
+	POST_ONLY,
+}
+
+// Self matching options
+export enum SelfMatchingOptions {
+	SELF_MATCHING_ALLOWED,
+	CANCEL_TAKER,
+	CANCEL_MAKER,
+}
+
+export interface PlaceLimitOrderParams {
+	poolKey: string;
+	balanceManagerKey: string;
+	clientOrderId: string;
+	price: number;
+	quantity: number;
+	isBid: boolean;
+	expiration?: number | bigint;
+	orderType?: OrderType;
+	selfMatchingOption?: SelfMatchingOptions;
+	payWithDeep?: boolean;
+}
+
+export interface PlaceMarketOrderParams {
+	poolKey: string;
+	balanceManagerKey: string;
+	clientOrderId: string;
+	quantity: number;
+	isBid: boolean;
+	selfMatchingOption?: SelfMatchingOptions;
+	payWithDeep?: boolean;
+}
+
+export interface ProposalParams {
+	poolKey: string;
+	balanceManagerKey: string;
+	takerFee: number;
+	makerFee: number;
+	stakeRequired: number;
+}
+
+export interface SwapParams {
+	poolKey: string;
+	amount: number;
+	deepAmount: number;
+	minOut: number;
+	deepCoin?: TransactionObjectArgument;
+	baseCoin?: TransactionObjectArgument;
+	quoteCoin?: TransactionObjectArgument;
+}
+
+export interface CreatePoolAdminParams {
+	baseCoinKey: string;
+	quoteCoinKey: string;
+	tickSize: number;
+	lotSize: number;
+	minSize: number;
+	whitelisted: boolean;
+	stablePool: boolean;
+	deepCoin?: TransactionObjectArgument;
+	baseCoin?: TransactionObjectArgument;
+}
+
+export interface Config {
+	DEEPBOOK_PACKAGE_ID: string;
+	REGISTRY_ID: string;
+	DEEP_TREASURY_ID: string;
+}
+
+export type Environment = 'mainnet' | 'testnet';
diff --git a/sdk/deepbook-v3/src/utils/config.ts b/sdk/deepbook-v3/src/utils/config.ts
new file mode 100644
index 0000000000000..750ef6d7e68e4
--- /dev/null
+++ b/sdk/deepbook-v3/src/utils/config.ts
@@ -0,0 +1,103 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+import { normalizeSuiAddress } from '@mysten/sui/utils';
+
+import { BalanceManagerContract } from '../transactions/balanceManager.js';
+import type { BalanceManager, Environment } from '../types/index.js';
+import type { CoinMap, PoolMap } from './constants.js';
+import {
+	mainnetCoins,
+	mainnetPackageIds,
+	mainnetPools,
+	testnetCoins,
+	testnetPackageIds,
+	testnetPools,
+} from './constants.js';
+
+export const FLOAT_SCALAR = 1000000000;
+export const POOL_CREATION_FEE = 10000 * 1000000;
+export const MAX_TIMESTAMP = 1844674407370955161n;
+export const GAS_BUDGET = 0.5 * 500000000; // Adjust based on benchmarking
+export const DEEP_SCALAR = 1000000;
+
+export class DeepBookConfig {
+	#coins: CoinMap;
+	#pools: PoolMap;
+	balanceManagers: { [key: string]: BalanceManager };
+	address: string;
+
+	DEEPBOOK_PACKAGE_ID: string;
+	REGISTRY_ID: string;
+	DEEP_TREASURY_ID: string;
+	adminCap?: string;
+
+	balanceManager: BalanceManagerContract;
+
+	constructor({
+		env,
+		address,
+		adminCap,
+		balanceManagers,
+		coins,
+		pools,
+	}: {
+		env: Environment;
+		address: string;
+		adminCap?: string;
+		balanceManagers?: { [key: string]: BalanceManager };
+		coins?: CoinMap;
+		pools?: PoolMap;
+	}) {
+		this.address = normalizeSuiAddress(address);
+		this.adminCap = adminCap;
+		this.balanceManagers = balanceManagers || {};
+
+		if (env === 'mainnet') {
+			this.#coins = coins || mainnetCoins;
+			this.#pools = pools || mainnetPools;
+			this.DEEPBOOK_PACKAGE_ID = mainnetPackageIds.DEEPBOOK_PACKAGE_ID;
+			this.REGISTRY_ID = mainnetPackageIds.REGISTRY_ID;
+			this.DEEP_TREASURY_ID = mainnetPackageIds.DEEP_TREASURY_ID;
+		} else {
+			this.#coins = coins || testnetCoins;
+			this.#pools = pools || testnetPools;
+			this.DEEPBOOK_PACKAGE_ID = testnetPackageIds.DEEPBOOK_PACKAGE_ID;
+			this.REGISTRY_ID = testnetPackageIds.REGISTRY_ID;
+			this.DEEP_TREASURY_ID = testnetPackageIds.DEEP_TREASURY_ID;
+		}
+
+		this.balanceManager = new BalanceManagerContract(this);
+	}
+
+	// Getters
+	getCoin(key: string) {
+		const coin = this.#coins[key];
+		if (!coin) {
+			throw new Error(`Coin not found for key: ${key}`);
+		}
+
+		return coin;
+	}
+
+	getPool(key: string) {
+		const pool = this.#pools[key];
+		if (!pool) {
+			throw new Error(`Pool not found for key: ${key}`);
+		}
+
+		return pool;
+	}
+
+	/**
+	 * @description Get the balance manager by key
+	 * @param managerKey Key of the balance manager
+	 * @returns The BalanceManager object
+	 */
+	getBalanceManager(managerKey: string): BalanceManager {
+		if (!Object.hasOwn(this.balanceManagers, managerKey)) {
+			throw new Error(`Balance manager with key ${managerKey} not found.`);
+		}
+
+		return this.balanceManagers[managerKey];
+	}
+}
diff --git a/sdk/deepbook-v3/src/utils/constants.ts b/sdk/deepbook-v3/src/utils/constants.ts
new file mode 100644
index 0000000000000..97119bab2f4b7
--- /dev/null
+++ b/sdk/deepbook-v3/src/utils/constants.ts
@@ -0,0 +1,106 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Coin, Pool } from '../types/index.js';
+
+export type CoinMap = Record<string, Coin>;
+export type PoolMap = Record<string, Pool>;
+export interface DeepbookPackageIds {
+	DEEPBOOK_PACKAGE_ID: string;
+	REGISTRY_ID: string;
+	DEEP_TREASURY_ID: string;
+}
+
+export const testnetPackageIds = {
+	DEEPBOOK_PACKAGE_ID: '0xc671049379e6d512e3ecd0e79da50cb28840f09764d80a342b904863d87e5389',
+	REGISTRY_ID: '0x9162317a81a9eb66ecd42705529b2a39c7805f98f42312275c2e7a599d518437',
+	DEEP_TREASURY_ID: '0x69fffdae0075f8f71f4fa793549c11079266910e8905169845af1f5d00e09dcb',
+} satisfies DeepbookPackageIds;
+
+export const mainnetPackageIds = {
+	DEEPBOOK_PACKAGE_ID: '',
+	REGISTRY_ID: '',
+	DEEP_TREASURY_ID: '',
+};
+
+export const testnetCoins: CoinMap = {
+	DEEP: {
+		address: `0x36dbef866a1d62bf7328989a10fb2f07d769f4ee587c0de4a0a256e57e0a58a8`,
+		type: `0x36dbef866a1d62bf7328989a10fb2f07d769f4ee587c0de4a0a256e57e0a58a8::deep::DEEP`,
+		scalar: 1000000,
+	},
+	SUI: {
+		address: `0x0000000000000000000000000000000000000000000000000000000000000002`,
+		type: `0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI`,
+		scalar: 1000000000,
+	},
+	DBUSDC: {
+		address: `0xf7152c05930480cd740d7311b5b8b45c6f488e3a53a11c3f74a6fac36a52e0d7`,
+		type: `0xf7152c05930480cd740d7311b5b8b45c6f488e3a53a11c3f74a6fac36a52e0d7::DBUSDC::DBUSDC`,
+		scalar: 1000000,
+	},
+	DBUSDT: {
+		address: `0xf7152c05930480cd740d7311b5b8b45c6f488e3a53a11c3f74a6fac36a52e0d7`,
+		type: `0xf7152c05930480cd740d7311b5b8b45c6f488e3a53a11c3f74a6fac36a52e0d7::DBUSDT::DBUSDT`,
+		scalar: 1000000,
+	},
+};
+
+export const mainnetCoins: CoinMap = {
+	DEEP: {
+		address: `0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270`,
+		type: `0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270::deep::DEEP`,
+		scalar: 1000000,
+	},
+	SUI: {
+		address: `0x0000000000000000000000000000000000000000000000000000000000000002`,
+		type: `0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI`,
+		scalar: 1000000000,
+	},
+	USDC: {
+		address: `0x5d4b302506645c37ff133b98c4b50a5ae14841659738d6d733d59d0d217a93bf`,
+		type: `0x5d4b302506645c37ff133b98c4b50a5ae14841659738d6d733d59d0d217a93bf::coin::COIN`,
+		scalar: 1000000,
+	},
+	WETH: {
+		address: `0xaf8cd5edc19c4512f4259f0bee101a40d41ebed738ade5874359610ef8eeced5`,
+		type: `0xaf8cd5edc19c4512f4259f0bee101a40d41ebed738ade5874359610ef8eeced5::coin::COIN`,
+		scalar: 100000000,
+	},
+	USDT: {
+		address: `0xc060006111016b8a020ad5b33834984a437aaa7d3c74c18e09a95d48aceab08c`,
+		type: `0xc060006111016b8a020ad5b33834984a437aaa7d3c74c18e09a95d48aceab08c::coin::COIN`,
+		scalar: 1000000,
+	},
+};
+
+export const testnetPools: PoolMap = {
+	DEEP_SUI: {
+		address: `0x2decc59a6f05c5800e5c8a1135f9d133d1746f562bf56673e6e81ef4f7ccd3b7`,
+		baseCoin: 'DEEP',
+		quoteCoin: 'SUI',
+	},
+	SUI_DBUSDC: {
+		address: `0xace543e8239f0c19783e57bacb02c581fd38d52899bdce117e49c91b494c8b10`,
+		baseCoin: 'SUI',
+		quoteCoin: 'DBUSDC',
+	},
+	DEEP_DBUSDC: {
+		address: `0x1faaa544a84c16215ef005edb046ddf8e1cfec0792aec3032e86e554b33bd33a`,
+		baseCoin: 'DEEP',
+		quoteCoin: 'DBUSDC',
+	},
+	DBUSDT_DBUSDC: {
+		address: `0x83aca040eaeaf061e3d482a44d1a87a5b8b6206ad52edae9d0479b830a38106f`,
+		baseCoin: 'DBUSDT',
+		quoteCoin: 'DBUSDC',
+	},
+};
+
+export const mainnetPools: PoolMap = {
+	DEEP_SUI: {
+		address: ``,
+		baseCoin: 'DEEP',
+		quoteCoin: 'SUI',
+	},
+};
diff --git a/sdk/deepbook-v3/tsconfig.esm.json b/sdk/deepbook-v3/tsconfig.esm.json
new file mode 100644
index 0000000000000..5048bdf8ffc62
--- /dev/null
+++ b/sdk/deepbook-v3/tsconfig.esm.json
@@ -0,0 +1,7 @@
+{
+	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		"module": "ESNext",
+		"outDir": "dist/esm"
+	}
+}
diff --git a/sdk/deepbook-v3/tsconfig.json b/sdk/deepbook-v3/tsconfig.json
new file mode 100644
index 0000000000000..b4ed52cfe8a5e
--- /dev/null
+++ b/sdk/deepbook-v3/tsconfig.json
@@ -0,0 +1,11 @@
+{
+	"extends": "../build-scripts/tsconfig.shared.json",
+	"include": ["src"],
+	"compilerOptions": {
+		"module": "CommonJS",
+		"outDir": "dist/cjs",
+		"isolatedModules": true,
+		"rootDir": "src"
+	},
+	"references": [{ "path": "../typescript" }]
+}
diff --git a/sdk/deepbook-v3/typedoc.json b/sdk/deepbook-v3/typedoc.json
new file mode 100644
index 0000000000000..ccb323f01e813
--- /dev/null
+++ b/sdk/deepbook-v3/typedoc.json
@@ -0,0 +1,6 @@
+{
+	"entryPoints": ["src"],
+	"excludeInternal": true,
+	"excludePrivate": true,
+	"intentionallyNotExported": []
+}
diff --git a/sdk/deepbook-v3/vitest.config.ts b/sdk/deepbook-v3/vitest.config.ts
new file mode 100644
index 0000000000000..3f63e2781ad8e
--- /dev/null
+++ b/sdk/deepbook-v3/vitest.config.ts
@@ -0,0 +1,18 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+import { defineConfig } from 'vitest/config';
+
+export default defineConfig({
+	test: {
+		maxConcurrency: 8,
+		hookTimeout: 1000000,
+		testTimeout: 1000000,
+		env: {
+			NODE_ENV: 'test',
+		},
+	},
+	resolve: {
+		alias: {},
+	},
+});
diff --git a/sdk/deepbook/CHANGELOG.md b/sdk/deepbook/CHANGELOG.md
index 5868cf6fddd58..f9fdfffcfd923 100644
--- a/sdk/deepbook/CHANGELOG.md
+++ b/sdk/deepbook/CHANGELOG.md
@@ -1,5 +1,45 @@
 # @mysten/deepbook
 
+## 0.8.16
+
+### Patch Changes
+
+- Updated dependencies [143cd9d]
+- Updated dependencies [4357ac6]
+- Updated dependencies [4019dd7]
+- Updated dependencies [4019dd7]
+- Updated dependencies [00a974d]
+  - @mysten/sui@1.7.0
+
+## 0.8.15
+
+### Patch Changes
+
+- Updated dependencies [a3e32fe]
+  - @mysten/sui@1.6.0
+
+## 0.8.14
+
+### Patch Changes
+
+- Updated dependencies [0851b31]
+- Updated dependencies [f37b3c2]
+  - @mysten/sui@1.5.0
+
+## 0.8.13
+
+### Patch Changes
+
+- Updated dependencies [4419234]
+  - @mysten/sui@1.4.0
+
+## 0.8.12
+
+### Patch Changes
+
+- Updated dependencies [a45f461]
+  - @mysten/sui@1.3.1
+
 ## 0.8.11
 
 ### Patch Changes
diff --git a/sdk/deepbook/package.json b/sdk/deepbook/package.json
index 95e1079380dc0..dd90fff911719 100644
--- a/sdk/deepbook/package.json
+++ b/sdk/deepbook/package.json
@@ -2,7 +2,7 @@
 	"name": "@mysten/deepbook",
 	"author": "Mysten Labs <build@mystenlabs.com>",
 	"description": "Sui Deepbook SDK",
-	"version": "0.8.11",
+	"version": "0.8.16",
 	"license": "Apache-2.0",
 	"type": "commonjs",
 	"main": "./dist/cjs/index.js",
diff --git a/sdk/deepbook/test/e2e/setup.ts b/sdk/deepbook/test/e2e/setup.ts
index e6503cf356aad..65839279c1187 100644
--- a/sdk/deepbook/test/e2e/setup.ts
+++ b/sdk/deepbook/test/e2e/setup.ts
@@ -2,6 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { execSync } from 'child_process';
+import { mkdtemp } from 'fs/promises';
+import { tmpdir } from 'os';
+import path from 'path';
 import type {
 	DevInspectResults,
 	SuiObjectChangeCreated,
@@ -30,10 +33,12 @@ export const DEFAULT_LOT_SIZE = 1n;
 export class TestToolbox {
 	keypair: Ed25519Keypair;
 	client: SuiClient;
+	configPath: string;
 
-	constructor(keypair: Ed25519Keypair, client: SuiClient) {
+	constructor(keypair: Ed25519Keypair, client: SuiClient, configPath: string) {
 		this.keypair = keypair;
 		this.client = client;
+		this.configPath = configPath;
 	}
 
 	address() {
@@ -64,7 +69,12 @@ export async function setupSuiClient() {
 		retryIf: (error: any) => !(error instanceof FaucetRateLimitError),
 		logger: (msg) => console.warn('Retrying requesting from faucet: ' + msg),
 	});
-	return new TestToolbox(keypair, client);
+
+	const tmpDirPath = path.join(tmpdir(), 'config-');
+	const tmpDir = await mkdtemp(tmpDirPath);
+	const configPath = path.join(tmpDir, 'client.yaml');
+	execSync(`${SUI_BIN} client --yes --client.config ${configPath}`, { encoding: 'utf-8' });
+	return new TestToolbox(keypair, client, configPath);
 }
 
 // TODO: expose these testing utils from @mysten/sui
@@ -81,7 +91,7 @@ export async function publishPackage(packagePath: string, toolbox?: TestToolbox)
 
 	const { modules, dependencies } = JSON.parse(
 		execSync(
-			`${SUI_BIN} move build --dump-bytecode-as-base64 --path ${packagePath} --install-dir ${tmpobj.name}`,
+			`${SUI_BIN} move move --client.config ${toolbox.configPath} build --dump-bytecode-as-base64 --path ${packagePath} --install-dir ${tmpobj.name}`,
 			{ encoding: 'utf-8' },
 		),
 	);
diff --git a/sdk/deepbook/vitest.config.ts b/sdk/deepbook/vitest.config.ts
index 71d126eaef86c..07452fe1219c2 100644
--- a/sdk/deepbook/vitest.config.ts
+++ b/sdk/deepbook/vitest.config.ts
@@ -5,8 +5,8 @@ import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
 	test: {
-		minThreads: 1,
-		maxThreads: 8,
+		minWorkers: 1,
+		maxWorkers: 4,
 		hookTimeout: 1000000,
 		testTimeout: 1000000,
 		env: {
diff --git a/sdk/docs/pages/dapp-kit/wallet-hooks/useSignAndExecuteTransaction.mdx b/sdk/docs/pages/dapp-kit/wallet-hooks/useSignAndExecuteTransaction.mdx
index 45f9aebb4d826..c6ca63d1b815e 100644
--- a/sdk/docs/pages/dapp-kit/wallet-hooks/useSignAndExecuteTransaction.mdx
+++ b/sdk/docs/pages/dapp-kit/wallet-hooks/useSignAndExecuteTransaction.mdx
@@ -59,14 +59,14 @@ you can pass a custom `execute` function.
 ```ts
 import {
 	ConnectButton,
-	useClient,
+	useSuiClient,
 	useCurrentAccount,
 	useSignAndExecuteTransaction,
 } from '@mysten/dapp-kit';
 import { useState } from 'react';
 
 function MyComponent() {
-	const client = useClient();
+	const client = useSuiClient();
 	const { mutate: signAndExecuteTransaction } = useSignAndExecuteTransaction({
 		execute: async ({ bytes, signature }) =>
 			await client.executeTransactionBlock({
diff --git a/sdk/docs/pages/typescript/cryptography/keypairs.mdx b/sdk/docs/pages/typescript/cryptography/keypairs.mdx
index bdabb9a8cec9f..b779184e20059 100644
--- a/sdk/docs/pages/typescript/cryptography/keypairs.mdx
+++ b/sdk/docs/pages/typescript/cryptography/keypairs.mdx
@@ -118,6 +118,25 @@ if (publicKey.toSuiAddress() !== keypair.getPublicKey().toSuiAddress()) {
 }
 ```
 
+## Verifying zkLogin signatures
+
+ZkLogin signatures can't be verified purely on the client. When verifying a zkLogin signature, the
+SDK uses the GraphQL API to verify the signature. This will work for mainnet signatures without any
+additional configuration.
+
+For testnet signatures, you will need to provide a testnet GraphQL Client:
+
+```typescript
+import { SuiGraphQLClient } from '@mysten/sui/graphql';
+import { verifyPersonalMessageSignature } from '@mysten/sui/verify';
+
+const publicKey = await verifyPersonalMessageSignature(message, zkSignature, {
+	client: new SuiGraphQLClient({
+		url: 'https://sui-testnet.mystenlabs.com/graphql',
+	}),
+});
+```
+
 ## Deriving a key pair from a mnemonic
 
 The Sui TypeScript SDK supports deriving a key pair from a mnemonic phrase. This can be useful when
diff --git a/sdk/docs/pages/typescript/executors.mdx b/sdk/docs/pages/typescript/executors.mdx
index 381130b5b91fb..05eeed173ea9c 100644
--- a/sdk/docs/pages/typescript/executors.mdx
+++ b/sdk/docs/pages/typescript/executors.mdx
@@ -25,6 +25,13 @@ when multiple transactions use the same objects.
 `SerialTransactionExecutor` maintains an internal queue, so you don't need to wait for previous
 transactions to finish before sending the next one.
 
+`SerialTransactionExecutor` can be configured with a number of options:
+
+- `client`: An instance of `SuiClient` used to execute transactions.
+- `signer`: The signer/keypair used for signed transactions.
+- `defaultBudget`: The default budget for transactions, which will be used if the transaction does
+  not specify a budget (default `50_000_000n`),
+
 ```ts
 import { getFullnodeUrl, SuiClient } from '@mysten/sui/client';
 import { SerialTransactionExecutor } from '@mysten/sui/transactions';
@@ -83,7 +90,7 @@ way that avoids conflicts between transactions using the same object ids.
   (default 20)
 - `initialCoinBalance`: The balance of new coins created for the gas pool in MIST (default
   `200_000_000n`),
-- `minimumCoinBalance`: After executing a transaction, the the gasCoin will be reused unless it's
+- `minimumCoinBalance`: After executing a transaction, the gasCoin will be reused unless it's
   balance is below this value (default `50_000_000n`),
 - `defaultBudget`: The default budget for transactions, which will be used if the transaction does
   not specify a budget (default `minimumCoinBalance`),
diff --git a/sdk/docs/pages/typescript/index.mdx b/sdk/docs/pages/typescript/index.mdx
index d3c9e91a09570..c006083efa3f8 100644
--- a/sdk/docs/pages/typescript/index.mdx
+++ b/sdk/docs/pages/typescript/index.mdx
@@ -95,7 +95,7 @@ what you need to keep your code light and compact.
 
 - [`@mysten/sui/client`](/typescript/sui-client) - A client for interacting with Sui RPC nodes.
 - [`@mysten/sui/bcs`](/typescript/bcs) - A BCS builder with pre-defined types for Sui.
-- [`@mysten/sui/transaction`](/typescript/transaction-building/basics) - Utilities for building and
+- [`@mysten/sui/transactions`](/typescript/transaction-building/basics) - Utilities for building and
   interacting with transactions.
 - [`@mysten/sui/keypairs/*`](/typescript/cryptography/keypairs) - Modular exports for specific
   KeyPair implementations.
diff --git a/sdk/docs/pages/typescript/migrations/sui-1.0.mdx b/sdk/docs/pages/typescript/migrations/sui-1.0.mdx
index 5c19479925551..5bc1abde61337 100644
--- a/sdk/docs/pages/typescript/migrations/sui-1.0.mdx
+++ b/sdk/docs/pages/typescript/migrations/sui-1.0.mdx
@@ -352,7 +352,7 @@ of transactionBlockBytes
 ## `useSignAndExecuteTransactionBlock`
 
 The `useSignAndExecuteTransactionBlock` has been named to `useSignAndExecuteTransaction` and
-redesigned to work the the updated wallet-standard methods.
+redesigned to work the updated wallet-standard methods.
 
 `useSignAndExecuteTransaction` no-longer accepts the options passed to
 `suiClient.executeTransactionBlock` for returning additional data.
diff --git a/sdk/docs/pages/typescript/transaction-building/basics.mdx b/sdk/docs/pages/typescript/transaction-building/basics.mdx
index 4c53a4a5ea2fd..4a3d5bc82ae7d 100644
--- a/sdk/docs/pages/typescript/transaction-building/basics.mdx
+++ b/sdk/docs/pages/typescript/transaction-building/basics.mdx
@@ -53,6 +53,33 @@ After you have the transaction defined, you can directly execute it with a signe
 client.signAndExecuteTransaction({ signer: keypair, transaction: tx });
 ```
 
+## Observing the results of a transaction
+
+When you use `client.signAndExecuteTransaction` or `client.executeTransactionBlock`, the transaction
+will be finalized on the blockchain before the function resolves, but the effects of the transaction
+may not be immediately observable.
+
+There are 2 ways to observe the results of a transaction. Methods like
+`client.signAndExecuteTransaction` accept an `options` object with options like `showObjectChanges`
+and `showBalanceChanges` (see
+[the SuiClient docs for more details](/typescript/sui-client#arguments)). These options will cause
+the request to contain additional details about the effects of the transaction that can be
+immediately displayed to the user, or used for further processing in your application.
+
+The other way effects of transactions can be observed is by querying other RPC methods like
+`client.getBalances` that return objects or balances owned by a specific address. These RPC calls
+depend on the RPC node having indexed the effects of the transaction, which may not have happened
+immediately after a transaction has been executed. To ensure that effects of a transaction are
+represented in future RPC calls, you can use the `waitForTransaction` method on the client:
+
+```typescript
+const result = await client.signAndExecuteTransaction({ signer: keypair, transaction: tx });
+await client.waitForTransaction({ digest: result.digest });
+```
+
+Once `waitForTransaction` resolves, any future RPC calls will be guaranteed to reflect the effects
+of the transaction.
+
 ## Transactions
 
 Programmable Transactions have two key concepts: inputs and transactions.
diff --git a/sdk/enoki/CHANGELOG.md b/sdk/enoki/CHANGELOG.md
index 0b95b8580721e..99127ce42ddea 100644
--- a/sdk/enoki/CHANGELOG.md
+++ b/sdk/enoki/CHANGELOG.md
@@ -1,5 +1,63 @@
 # @mysten/enoki
 
+## 0.4.0
+
+### Minor Changes
+
+- f589885: Add sdk methods for managing enoki subnames
+
+## 0.3.17
+
+### Patch Changes
+
+- Updated dependencies [143cd9d]
+- Updated dependencies [4357ac6]
+- Updated dependencies [4019dd7]
+- Updated dependencies [4019dd7]
+- Updated dependencies [00a974d]
+  - @mysten/sui@1.7.0
+  - @mysten/zklogin@0.7.17
+
+## 0.3.16
+
+### Patch Changes
+
+- Updated dependencies [a3e32fe]
+  - @mysten/sui@1.6.0
+  - @mysten/zklogin@0.7.16
+
+## 0.3.15
+
+### Patch Changes
+
+- Updated dependencies [6f79ed9]
+  - @mysten/zklogin@0.7.15
+
+## 0.3.14
+
+### Patch Changes
+
+- Updated dependencies [0851b31]
+- Updated dependencies [f37b3c2]
+  - @mysten/sui@1.5.0
+  - @mysten/zklogin@0.7.14
+
+## 0.3.13
+
+### Patch Changes
+
+- Updated dependencies [4419234]
+  - @mysten/sui@1.4.0
+  - @mysten/zklogin@0.7.13
+
+## 0.3.12
+
+### Patch Changes
+
+- Updated dependencies [a45f461]
+  - @mysten/sui@1.3.1
+  - @mysten/zklogin@0.7.12
+
 ## 0.3.11
 
 ### Patch Changes
diff --git a/sdk/enoki/package.json b/sdk/enoki/package.json
index 74e053d1c6ccc..73e5a1d800774 100644
--- a/sdk/enoki/package.json
+++ b/sdk/enoki/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@mysten/enoki",
-	"version": "0.3.11",
+	"version": "0.4.0",
 	"description": "TODO: Description",
 	"license": "Apache-2.0",
 	"author": "Mysten Labs <build@mystenlabs.com>",
diff --git a/sdk/enoki/src/EnokiClient/index.ts b/sdk/enoki/src/EnokiClient/index.ts
index cc7f08421b84b..f9f5be737edeb 100644
--- a/sdk/enoki/src/EnokiClient/index.ts
+++ b/sdk/enoki/src/EnokiClient/index.ts
@@ -4,14 +4,20 @@
 import type {
 	CreateSponsoredTransactionApiInput,
 	CreateSponsoredTransactionApiResponse,
+	CreateSubnameApiInput,
+	CreateSubnameApiResponse,
 	CreateZkLoginNonceApiInput,
 	CreateZkLoginNonceApiResponse,
 	CreateZkLoginZkpApiInput,
 	CreateZkLoginZkpApiResponse,
+	DeleteSubnameApiInput,
+	DeleteSubnameApiResponse,
 	ExecuteSponsoredTransactionApiInput,
 	ExecuteSponsoredTransactionApiResponse,
 	GetAppApiInput,
 	GetAppApiResponse,
+	GetSubnamesApiInput,
+	GetSubnamesApiResponse,
 	GetZkLoginApiInput,
 	GetZkLoginApiResponse,
 } from './type.js';
@@ -29,6 +35,8 @@ export interface EnokiClientConfig {
 
 export class EnokiClientError extends Error {
 	errors: { code: string; message: string; data: unknown }[] = [];
+	status: number;
+	code: string;
 
 	constructor(status: number, response: string) {
 		let errors;
@@ -46,6 +54,8 @@ export class EnokiClientError extends Error {
 		});
 		this.errors = errors ?? [];
 		this.name = 'EnokiClientError';
+		this.status = status;
+		this.code = errors?.[0]?.code ?? 'unknown_error';
 	}
 }
 
@@ -134,6 +144,53 @@ export class EnokiClient {
 		);
 	}
 
+	getSubnames(input: GetSubnamesApiInput) {
+		const query = new URLSearchParams();
+		if (input.address) {
+			query.set('address', input.address);
+		}
+		if (input.network) {
+			query.set('network', input.network);
+		}
+		if (input.domain) {
+			query.set('domain', input.domain);
+		}
+		return this.#fetch<GetSubnamesApiResponse>(
+			'subnames' + (query.size > 0 ? `?${query.toString()}` : ''),
+			{
+				method: 'GET',
+			},
+		);
+	}
+
+	createSubname(input: CreateSubnameApiInput) {
+		return this.#fetch<CreateSubnameApiResponse>('subnames', {
+			method: 'POST',
+			headers: input.jwt
+				? {
+						[ZKLOGIN_HEADER]: input.jwt,
+					}
+				: {},
+			body: JSON.stringify({
+				network: input.network,
+				domain: input.domain,
+				subname: input.subname,
+				targetAddress: input.targetAddress,
+			}),
+		});
+	}
+
+	deleteSubname(input: DeleteSubnameApiInput) {
+		this.#fetch<DeleteSubnameApiResponse>('subnames', {
+			method: 'DELETE',
+			body: JSON.stringify({
+				network: input.network,
+				domain: input.domain,
+				subname: input.subname,
+			}),
+		});
+	}
+
 	async #fetch<T = unknown>(path: string, init: RequestInit): Promise<T> {
 		const res = await fetch(`${this.#apiUrl}/${this.#version}/${path}`, {
 			...init,
diff --git a/sdk/enoki/src/EnokiClient/type.ts b/sdk/enoki/src/EnokiClient/type.ts
index b5fb56ed7f133..77599cdc1ff49 100644
--- a/sdk/enoki/src/EnokiClient/type.ts
+++ b/sdk/enoki/src/EnokiClient/type.ts
@@ -7,13 +7,21 @@ import type { ZkLoginSignatureInputs } from '@mysten/sui/zklogin';
 import type { AuthProvider } from '../EnokiFlow.js';
 
 export type EnokiNetwork = 'mainnet' | 'testnet' | 'devnet';
+export type EnokiDomainNetwork = 'mainnet' | 'testnet';
+export type EnokiSubanameStatus = 'PENDING' | 'ACTIVE';
 
 export interface GetAppApiInput {}
 export interface GetAppApiResponse {
+	allowedOrigins: string[];
 	authenticationProviders: {
 		providerType: AuthProvider;
 		clientId: string;
 	}[];
+	domains: {
+		nftId: string;
+		name: string;
+		network: EnokiDomainNetwork;
+	}[];
 }
 
 export interface GetZkLoginApiInput {
@@ -77,3 +85,42 @@ export interface ExecuteSponsoredTransactionApiInput {
 export interface ExecuteSponsoredTransactionApiResponse {
 	digest: string;
 }
+
+export interface GetSubnamesApiInput {
+	address?: string;
+	network?: EnokiDomainNetwork;
+	domain?: string;
+}
+export interface GetSubnamesApiResponse {
+	subnames: {
+		name: string;
+		status: EnokiSubanameStatus;
+	}[];
+}
+
+export type CreateSubnameApiInput = {
+	domain: string;
+	network?: EnokiDomainNetwork;
+	subname: string;
+} & (
+	| {
+			jwt: string;
+			targetAddress?: never;
+	  }
+	| {
+			targetAddress: string;
+			jwt?: never;
+	  }
+);
+export interface CreateSubnameApiResponse {
+	name: string;
+}
+
+export interface DeleteSubnameApiInput {
+	domain: string;
+	network?: EnokiDomainNetwork;
+	subname: string;
+}
+export interface DeleteSubnameApiResponse {
+	name: string;
+}
diff --git a/sdk/enoki/src/index.ts b/sdk/enoki/src/index.ts
index 3b713d74a6604..591fbfd8fb30f 100644
--- a/sdk/enoki/src/index.ts
+++ b/sdk/enoki/src/index.ts
@@ -1,7 +1,7 @@
 // Copyright (c) Mysten Labs, Inc.
 // SPDX-License-Identifier: Apache-2.0
 
-export { EnokiClient, type EnokiClientConfig } from './EnokiClient/index.js';
+export { EnokiClient, type EnokiClientConfig, EnokiClientError } from './EnokiClient/index.js';
 export { EnokiFlow, type AuthProvider, type EnokiFlowConfig } from './EnokiFlow.js';
 export {
 	createLocalStorage,
diff --git a/sdk/graphql-transport/CHANGELOG.md b/sdk/graphql-transport/CHANGELOG.md
index 020caa3d4755d..fcfa14f6c2b08 100644
--- a/sdk/graphql-transport/CHANGELOG.md
+++ b/sdk/graphql-transport/CHANGELOG.md
@@ -1,5 +1,47 @@
 # @mysten/graphql-transport
 
+## 0.2.16
+
+### Patch Changes
+
+- Updated dependencies [143cd9d]
+- Updated dependencies [4357ac6]
+- Updated dependencies [4019dd7]
+- Updated dependencies [4019dd7]
+- Updated dependencies [00a974d]
+  - @mysten/sui@1.7.0
+
+## 0.2.15
+
+### Patch Changes
+
+- Updated dependencies [a3e32fe]
+  - @mysten/sui@1.6.0
+
+## 0.2.14
+
+### Patch Changes
+
+- Updated dependencies [0851b31]
+- Updated dependencies [f37b3c2]
+- Updated dependencies [f37b3c2]
+  - @mysten/sui@1.5.0
+  - @mysten/bcs@1.0.4
+
+## 0.2.13
+
+### Patch Changes
+
+- Updated dependencies [4419234]
+  - @mysten/sui@1.4.0
+
+## 0.2.12
+
+### Patch Changes
+
+- Updated dependencies [a45f461]
+  - @mysten/sui@1.3.1
+
 ## 0.2.11
 
 ### Patch Changes
diff --git a/sdk/graphql-transport/package.json b/sdk/graphql-transport/package.json
index c22203491491f..08ee1bb6507d3 100644
--- a/sdk/graphql-transport/package.json
+++ b/sdk/graphql-transport/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@mysten/graphql-transport",
-	"version": "0.2.11",
+	"version": "0.2.16",
 	"description": "A GraphQL transport to allow SuiClient to work with RPC 2.0",
 	"license": "Apache-2.0",
 	"author": "Mysten Labs <build@mystenlabs.com>",
diff --git a/sdk/graphql-transport/test/compatability.test.ts b/sdk/graphql-transport/test/compatability.test.ts
index 20cf47a227fdb..d8a0fbee58d81 100644
--- a/sdk/graphql-transport/test/compatability.test.ts
+++ b/sdk/graphql-transport/test/compatability.test.ts
@@ -608,9 +608,6 @@ describe('GraphQL SuiClient compatibility', () => {
 				},
 			})) as SuiTransactionBlockResponse & { rawEffects: unknown };
 
-		// Deleted gas coin isn't included in changes when executing transaction block
-		rpc.objectChanges?.pop();
-
 		expect(graphql).toEqual(rpc);
 	});
 
diff --git a/sdk/graphql-transport/vitest.config.ts b/sdk/graphql-transport/vitest.config.ts
index 2619e62f59c25..c728327ae6aaa 100644
--- a/sdk/graphql-transport/vitest.config.ts
+++ b/sdk/graphql-transport/vitest.config.ts
@@ -5,8 +5,8 @@ import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
 	test: {
-		minThreads: 1,
-		maxThreads: 8,
+		minWorkers: 1,
+		maxWorkers: 4,
 		hookTimeout: 1000000,
 		testTimeout: 1000000,
 		env: {
diff --git a/sdk/kiosk/CHANGELOG.md b/sdk/kiosk/CHANGELOG.md
index d21c10dc613d6..b41d2684a66a7 100644
--- a/sdk/kiosk/CHANGELOG.md
+++ b/sdk/kiosk/CHANGELOG.md
@@ -1,5 +1,45 @@
 # @mysten/kiosk
 
+## 0.9.16
+
+### Patch Changes
+
+- Updated dependencies [143cd9d]
+- Updated dependencies [4357ac6]
+- Updated dependencies [4019dd7]
+- Updated dependencies [4019dd7]
+- Updated dependencies [00a974d]
+  - @mysten/sui@1.7.0
+
+## 0.9.15
+
+### Patch Changes
+
+- Updated dependencies [a3e32fe]
+  - @mysten/sui@1.6.0
+
+## 0.9.14
+
+### Patch Changes
+
+- Updated dependencies [0851b31]
+- Updated dependencies [f37b3c2]
+  - @mysten/sui@1.5.0
+
+## 0.9.13
+
+### Patch Changes
+
+- Updated dependencies [4419234]
+  - @mysten/sui@1.4.0
+
+## 0.9.12
+
+### Patch Changes
+
+- Updated dependencies [a45f461]
+  - @mysten/sui@1.3.1
+
 ## 0.9.11
 
 ### Patch Changes
diff --git a/sdk/kiosk/package.json b/sdk/kiosk/package.json
index d11095d07d8b2..3f4dcea4135d5 100644
--- a/sdk/kiosk/package.json
+++ b/sdk/kiosk/package.json
@@ -2,7 +2,7 @@
 	"name": "@mysten/kiosk",
 	"author": "Mysten Labs <build@mystenlabs.com>",
 	"description": "Sui Kiosk library",
-	"version": "0.9.11",
+	"version": "0.9.16",
 	"license": "Apache-2.0",
 	"type": "commonjs",
 	"main": "./dist/cjs/index.js",
diff --git a/sdk/kiosk/test/e2e/setup.ts b/sdk/kiosk/test/e2e/setup.ts
index d15c9180a38ef..42da2e190e5cd 100644
--- a/sdk/kiosk/test/e2e/setup.ts
+++ b/sdk/kiosk/test/e2e/setup.ts
@@ -2,6 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { execSync } from 'child_process';
+import { mkdtemp } from 'fs/promises';
+import { tmpdir } from 'os';
+import path from 'path';
 import type {
 	DevInspectResults,
 	SuiObjectChangePublished,
@@ -28,10 +31,12 @@ const SUI_BIN = import.meta.env.VITE_SUI_BIN ?? 'cargo run --bin sui';
 export class TestToolbox {
 	keypair: Ed25519Keypair;
 	client: SuiClient;
+	configPath: string;
 
-	constructor(keypair: Ed25519Keypair, client: SuiClient) {
+	constructor(keypair: Ed25519Keypair, client: SuiClient, configPath: string) {
 		this.keypair = keypair;
 		this.client = client;
+		this.configPath = configPath;
 	}
 
 	address() {
@@ -62,7 +67,12 @@ export async function setupSuiClient() {
 		retryIf: (error: any) => !(error instanceof FaucetRateLimitError),
 		logger: (msg) => console.warn('Retrying requesting from faucet: ' + msg),
 	});
-	return new TestToolbox(keypair, client);
+
+	const tmpDirPath = path.join(tmpdir(), 'config-');
+	const tmpDir = await mkdtemp(tmpDirPath);
+	const configPath = path.join(tmpDir, 'client.yaml');
+	execSync(`${SUI_BIN} client --yes --client.config ${configPath}`, { encoding: 'utf-8' });
+	return new TestToolbox(keypair, client, configPath);
 }
 
 // TODO: expose these testing utils from @mysten/sui
@@ -79,7 +89,7 @@ export async function publishPackage(packagePath: string, toolbox?: TestToolbox)
 
 	const { modules, dependencies } = JSON.parse(
 		execSync(
-			`${SUI_BIN} move build --dump-bytecode-as-base64 --path ${packagePath} --install-dir ${tmpobj.name}`,
+			`${SUI_BIN} move --client.config ${toolbox.configPath} build --dump-bytecode-as-base64 --path ${packagePath} --install-dir ${tmpobj.name}`,
 			{ encoding: 'utf-8' },
 		),
 	);
diff --git a/sdk/kiosk/vitest.config.ts b/sdk/kiosk/vitest.config.ts
index 71d126eaef86c..07452fe1219c2 100644
--- a/sdk/kiosk/vitest.config.ts
+++ b/sdk/kiosk/vitest.config.ts
@@ -5,8 +5,8 @@ import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
 	test: {
-		minThreads: 1,
-		maxThreads: 8,
+		minWorkers: 1,
+		maxWorkers: 4,
 		hookTimeout: 1000000,
 		testTimeout: 1000000,
 		env: {
diff --git a/sdk/suins-toolkit/CHANGELOG.md b/sdk/suins-toolkit/CHANGELOG.md
index 807a6c1735e60..ba5294afb0e87 100644
--- a/sdk/suins-toolkit/CHANGELOG.md
+++ b/sdk/suins-toolkit/CHANGELOG.md
@@ -1,5 +1,45 @@
 # @mysten/suins-toolkit
 
+## 0.5.16
+
+### Patch Changes
+
+- Updated dependencies [143cd9d]
+- Updated dependencies [4357ac6]
+- Updated dependencies [4019dd7]
+- Updated dependencies [4019dd7]
+- Updated dependencies [00a974d]
+  - @mysten/sui@1.7.0
+
+## 0.5.15
+
+### Patch Changes
+
+- Updated dependencies [a3e32fe]
+  - @mysten/sui@1.6.0
+
+## 0.5.14
+
+### Patch Changes
+
+- Updated dependencies [0851b31]
+- Updated dependencies [f37b3c2]
+  - @mysten/sui@1.5.0
+
+## 0.5.13
+
+### Patch Changes
+
+- Updated dependencies [4419234]
+  - @mysten/sui@1.4.0
+
+## 0.5.12
+
+### Patch Changes
+
+- Updated dependencies [a45f461]
+  - @mysten/sui@1.3.1
+
 ## 0.5.11
 
 ### Patch Changes
diff --git a/sdk/suins-toolkit/package.json b/sdk/suins-toolkit/package.json
index f0b2527f0a660..434d8dedf04d7 100644
--- a/sdk/suins-toolkit/package.json
+++ b/sdk/suins-toolkit/package.json
@@ -2,7 +2,7 @@
 	"name": "@mysten/suins-toolkit",
 	"author": "Mysten Labs <build@mystenlabs.com>",
 	"description": "SuiNS TypeScript SDK",
-	"version": "0.5.11",
+	"version": "0.5.16",
 	"license": "Apache-2.0",
 	"type": "commonjs",
 	"main": "./dist/cjs/index.js",
diff --git a/sdk/suins-toolkit/vitest.config.ts b/sdk/suins-toolkit/vitest.config.ts
index ea622e90c555f..874241689c250 100644
--- a/sdk/suins-toolkit/vitest.config.ts
+++ b/sdk/suins-toolkit/vitest.config.ts
@@ -5,8 +5,8 @@ import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
 	test: {
-		minThreads: 1,
-		maxThreads: 8,
+		minWorkers: 1,
+		maxWorkers: 4,
 		hookTimeout: 1000000,
 		testTimeout: 1000000,
 	},
diff --git a/sdk/typescript/CHANGELOG.md b/sdk/typescript/CHANGELOG.md
index 8185e0a3ba7e1..1d3e424afca54 100644
--- a/sdk/typescript/CHANGELOG.md
+++ b/sdk/typescript/CHANGELOG.md
@@ -1,5 +1,56 @@
 # @mysten/sui.js
 
+## 1.7.0
+
+### Minor Changes
+
+- 143cd9d: Add new tx.object methods for defining inputs for well known object ids:
+
+  - `tx.object.system()`: `0x5`
+  - `tx.object.clock()`: `0x6`
+  - `tx.object.random()`: `0x8`
+  - `tx.object.denyList()`: `0x403`
+
+- 4019dd7: Add default budget to transactions executed through the SerialTransactionExecutor class
+- 4019dd7: Add options argument to executeTransaction methods on transaction executor classes
+- 00a974d: Add global registry for transaction plugins
+
+### Patch Changes
+
+- 4357ac6: Add options argument to verifyTransactionSignature
+
+## 1.6.0
+
+### Minor Changes
+
+- a3e32fe: `WaitForLocalExecution` now waits using client.waitForTransaction rather than sending
+  requestType to the RPC node. This change will preserve readAfterWrite consistency when local
+  execution is removed from fullnodes, at the cost of more network requests and higher latency.
+
+## 1.5.0
+
+### Minor Changes
+
+- 0851b31: Deprecate requestType option when executing transactions
+
+### Patch Changes
+
+- f37b3c2: Add PerEpochConfig and Cancelled to UnchangedSharedKind
+- Updated dependencies [f37b3c2]
+  - @mysten/bcs@1.0.4
+
+## 1.4.0
+
+### Minor Changes
+
+- 4419234: Add setGasBudgetIfNotSet helper to Transaction class
+
+## 1.3.1
+
+### Patch Changes
+
+- a45f461: Shared objects passed to MakeMoveVec, MergeCoins, and SplitCoin are now marked as mutable
+
 ## 1.3.0
 
 ### Minor Changes
diff --git a/sdk/typescript/package.json b/sdk/typescript/package.json
index 8720d52d8b12b..c544d7a672d78 100644
--- a/sdk/typescript/package.json
+++ b/sdk/typescript/package.json
@@ -3,7 +3,7 @@
 	"author": "Mysten Labs <build@mystenlabs.com>",
 	"description": "Sui TypeScript API(Work in Progress)",
 	"homepage": "https://sdk.mystenlabs.com",
-	"version": "1.3.0",
+	"version": "1.7.0",
 	"license": "Apache-2.0",
 	"sideEffects": false,
 	"files": [
diff --git a/sdk/typescript/scripts/generate.ts b/sdk/typescript/scripts/generate.ts
index 906bfd075b1a0..e8b70d7ef725c 100644
--- a/sdk/typescript/scripts/generate.ts
+++ b/sdk/typescript/scripts/generate.ts
@@ -55,6 +55,7 @@ const options: {
 				{
 					alias?: string;
 					typeAlias?: string;
+					deprecated?: string;
 				}
 			>;
 		}
@@ -173,6 +174,9 @@ const options: {
 					alias: 'signature',
 					typeAlias: 'string | string[]',
 				},
+				requestType: {
+					deprecated: 'requestType will be ignored by JSON RPC in the future',
+				},
 			},
 		},
 		suix_queryEvents: {
@@ -190,7 +194,7 @@ const options: {
 				},
 				tx_bytes: {
 					alias: 'transactionBlock',
-					typeAlias: 'TransactionBlock | Uint8Array | string',
+					typeAlias: 'Transaction | Uint8Array | string',
 				},
 				gas_price: {
 					typeAlias: 'bigint | number',
@@ -339,7 +343,7 @@ methodGenerator.imports.push(
 				ts.factory.createImportSpecifier(
 					false,
 					undefined,
-					ts.factory.createIdentifier('TransactionBlock'),
+					ts.factory.createIdentifier('Transaction'),
 				),
 			]),
 		),
@@ -364,8 +368,12 @@ async function createMethodParams(method: OpenRpcMethod) {
 				return !methodOptions.flattenParams?.includes(param.name);
 			})
 			.map(async (param) => {
+				const paramOptions =
+					methodOptions.params?.[normalizeParamName(method.name, param.name)] ?? {};
 				return withDescription(
-					param,
+					paramOptions.deprecated
+						? { description: `@deprecated ${paramOptions.deprecated}` }
+						: param,
 					ts.factory.createPropertySignature(
 						undefined,
 						normalizeParamName(method.name, param.name),
diff --git a/sdk/typescript/scripts/update-graphql-schemas.ts b/sdk/typescript/scripts/update-graphql-schemas.ts
index a129e7dfe1024..4a3843ede5cbc 100644
--- a/sdk/typescript/scripts/update-graphql-schemas.ts
+++ b/sdk/typescript/scripts/update-graphql-schemas.ts
@@ -29,7 +29,7 @@ const result = execSync(`git branch --remote --list "origin/releases/sui-graphql
 					minor,
 					patch,
 					branch,
-					schema: `https://raw.githubusercontent.com/MystenLabs/sui/${branch}/crates/sui-graphql-rpc/schema/current_progress_schema.graphql`,
+					schema: `https://raw.githubusercontent.com/MystenLabs/sui/${branch}/crates/sui-graphql-rpc/schema.graphql`,
 				}
 			: null;
 	})
diff --git a/sdk/typescript/src/bcs/effects.ts b/sdk/typescript/src/bcs/effects.ts
index 57388f11bf6e9..37827116ff3cd 100644
--- a/sdk/typescript/src/bcs/effects.ts
+++ b/sdk/typescript/src/bcs/effects.ts
@@ -178,6 +178,8 @@ const UnchangedSharedKind = bcs.enum('UnchangedSharedKind', {
 	ReadOnlyRoot: VersionDigest,
 	MutateDeleted: bcs.u64(),
 	ReadDeleted: bcs.u64(),
+	Cancelled: bcs.u64(),
+	PerEpochConfig: null,
 });
 
 const TransactionEffectsV2 = bcs.struct('TransactionEffectsV2', {
diff --git a/sdk/typescript/src/client/client.ts b/sdk/typescript/src/client/client.ts
index 530e846b1fea9..c425f9f3d2148 100644
--- a/sdk/typescript/src/client/client.ts
+++ b/sdk/typescript/src/client/client.ts
@@ -406,20 +406,32 @@ export class SuiClient {
 		});
 	}
 
-	async executeTransactionBlock(
-		input: ExecuteTransactionBlockParams,
-	): Promise<SuiTransactionBlockResponse> {
-		return await this.transport.request({
+	async executeTransactionBlock({
+		transactionBlock,
+		signature,
+		options,
+		requestType,
+	}: ExecuteTransactionBlockParams): Promise<SuiTransactionBlockResponse> {
+		const result: SuiTransactionBlockResponse = await this.transport.request({
 			method: 'sui_executeTransactionBlock',
 			params: [
-				typeof input.transactionBlock === 'string'
-					? input.transactionBlock
-					: toB64(input.transactionBlock),
-				Array.isArray(input.signature) ? input.signature : [input.signature],
-				input.options,
-				input.requestType,
+				typeof transactionBlock === 'string' ? transactionBlock : toB64(transactionBlock),
+				Array.isArray(signature) ? signature : [signature],
+				options,
 			],
 		});
+
+		if (requestType === 'WaitForLocalExecution') {
+			try {
+				await this.waitForTransaction({
+					digest: result.digest,
+				});
+			} catch (_) {
+				// Ignore error while waiting for transaction
+			}
+		}
+
+		return result;
 	}
 
 	async signAndExecuteTransaction({
diff --git a/sdk/typescript/src/client/types/generated.ts b/sdk/typescript/src/client/types/generated.ts
index 4b81412996da6..461fe8e3ae6ad 100644
--- a/sdk/typescript/src/client/types/generated.ts
+++ b/sdk/typescript/src/client/types/generated.ts
@@ -95,6 +95,10 @@ export type CompressedSignature =
 	| {
 			ZkLogin: string;
 	  };
+/** Uses an enum to allow for future expansion of the ConsensusDeterminedVersionAssignments. */
+export type ConsensusDeterminedVersionAssignments = {
+	CancelledTransactions: [string, [string, string][]][];
+};
 export type SuiParsedData =
 	| {
 			dataType: 'moveObject';
@@ -356,13 +360,6 @@ export type InputObjectKind =
 				mutable?: boolean;
 			};
 	  };
-export interface LoadedChildObject {
-	objectId: string;
-	sequenceNumber: string;
-}
-export interface LoadedChildObjectsResponse {
-	loadedChildObjects: LoadedChildObject[];
-}
 export interface MoveCallParams {
 	arguments: unknown[];
 	function: string;
@@ -396,7 +393,15 @@ export type MoveValue =
 			id: string;
 	  }
 	| MoveStruct
-	| null;
+	| null
+	| MoveVariant;
+export interface MoveVariant {
+	fields: {
+		[key: string]: MoveValue;
+	};
+	type: string;
+	variant: string;
+}
 /** The struct that contains signatures and public keys necessary for authenticating a MultiSig. */
 export interface MultiSig {
 	/** A bitmap that indicates the position of which public key the signature should be authenticated with. */
@@ -410,8 +415,8 @@ export interface MultiSig {
 	sigs: CompressedSignature[];
 }
 /**
- * Deprecated, use [struct MultiSig] instead. The struct that contains signatures and public keys
- * necessary for authenticating a MultiSigLegacy.
+ * Deprecated, use [struct MultiSig] instead. The struct that contains signatures and public keys necessary
+ * for authenticating a MultiSigLegacy.
  */
 export interface MultiSigLegacy {
 	/** A bitmap that indicates the position of which public key the signature should be authenticated with. */
@@ -715,6 +720,24 @@ export interface PaginatedTransactionResponse {
 	hasNextPage: boolean;
 	nextCursor?: string | null;
 }
+/**
+ * An passkey authenticator with parsed fields. See field defition below. Can be initialized from
+ * [struct RawPasskeyAuthenticator].
+ */
+export interface PasskeyAuthenticator {
+	/**
+	 * `authenticatorData` is a bytearray that encodes
+	 * [Authenticator Data](https://www.w3.org/TR/webauthn-2/#sctn-authenticator-data) structure returned
+	 * by the authenticator attestation response as is.
+	 */
+	authenticator_data: number[];
+	/**
+	 * `clientDataJSON` contains a JSON-compatible UTF-8 encoded string of the client data which is passed
+	 * to the authenticator by the client during the authentication request (see
+	 * [CollectedClientData](https://www.w3.org/TR/webauthn-2/#dictdef-collectedclientdata))
+	 */
+	client_data_json: string;
+}
 export interface ProtocolConfig {
 	attributes: {
 		[key: string]: ProtocolConfigValue | null;
@@ -738,6 +761,9 @@ export type ProtocolConfigValue =
 	  }
 	| {
 			f64: string;
+	  }
+	| {
+			bool: string;
 	  };
 export type PublicKey =
 	| {
@@ -751,6 +777,9 @@ export type PublicKey =
 	  }
 	| {
 			ZkLogin: string;
+	  }
+	| {
+			Passkey: string;
 	  };
 export type RPCTransactionRequestParams =
 	| {
@@ -895,6 +924,12 @@ export type SuiEndOfEpochTransactionKind =
 	  }
 	| {
 			AuthenticatorStateExpire: SuiAuthenticatorStateExpire;
+	  }
+	| {
+			BridgeStateCreate: string;
+	  }
+	| {
+			BridgeCommitteeUpdate: string;
 	  };
 export interface SuiExecutionResult {
 	/** The value of any arguments that were mutably borrowed. Non-mut borrowed values are not included */
@@ -1375,6 +1410,15 @@ export type SuiTransactionBlockKind =
 			epoch: string;
 			kind: 'ConsensusCommitPrologueV2';
 			round: string;
+	  }
+	| {
+			commit_timestamp_ms: string;
+			consensus_commit_digest: string;
+			consensus_determined_version_assignments: ConsensusDeterminedVersionAssignments;
+			epoch: string;
+			kind: 'ConsensusCommitPrologueV3';
+			round: string;
+			sub_dag_index?: string | null;
 	  };
 export interface SuiTransactionBlockResponse {
 	balanceChanges?: BalanceChange[] | null;
@@ -1468,9 +1512,9 @@ export interface TransferObjectParams {
 }
 /** Identifies a struct and the module it was defined in */
 export interface TypeOrigin {
+	datatype_name: string;
 	module_name: string;
 	package: string;
-	struct_name: string;
 }
 /** Upgraded package info for the linkage table */
 export interface UpgradeInfo {
diff --git a/sdk/typescript/src/client/types/params.ts b/sdk/typescript/src/client/types/params.ts
index 97c5e0c322ae5..3c1d030771b19 100644
--- a/sdk/typescript/src/client/types/params.ts
+++ b/sdk/typescript/src/client/types/params.ts
@@ -56,7 +56,7 @@ export interface ExecuteTransactionBlockParams {
 	signature: string | string[];
 	/** options for specifying the content to be returned */
 	options?: RpcTypes.SuiTransactionBlockResponseOptions | null | undefined;
-	/** The request type, derived from `SuiTransactionBlockResponseOptions` if None */
+	/** @deprecated requestType will be ignored by JSON RPC in the future */
 	requestType?: RpcTypes.ExecuteTransactionRequestType | null | undefined;
 }
 /** Return the first four bytes of the chain's genesis checkpoint digest. */
@@ -85,9 +85,6 @@ export interface GetEventsParams {
 }
 /** Return the sequence number of the latest checkpoint that has been executed */
 export interface GetLatestCheckpointSequenceNumberParams {}
-export interface GetLoadedChildObjectsParams {
-	digest: string;
-}
 /** Return the argument types of a Move function, based on normalized Type. */
 export interface GetMoveFunctionArgTypesParams {
 	package: string;
diff --git a/sdk/typescript/src/transactions/Arguments.ts b/sdk/typescript/src/transactions/Arguments.ts
index 920b3ff203423..ff384a69c31d1 100644
--- a/sdk/typescript/src/transactions/Arguments.ts
+++ b/sdk/typescript/src/transactions/Arguments.ts
@@ -2,12 +2,15 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Inputs } from './Inputs.js';
+import { createObjectMethods } from './object.js';
 import { createPure } from './pure.js';
 import type { Transaction, TransactionObjectInput } from './Transaction.js';
 
 export const Arguments = {
 	pure: createPure((value) => (tx: Transaction) => tx.pure(value)),
-	object: (value: TransactionObjectInput) => (tx: Transaction) => tx.object(value),
+	object: createObjectMethods(
+		(value: TransactionObjectInput) => (tx: Transaction) => tx.object(value),
+	),
 	sharedObjectRef:
 		(...args: Parameters<(typeof Inputs)['SharedObjectRef']>) =>
 		(tx: Transaction) =>
diff --git a/sdk/typescript/src/transactions/Transaction.ts b/sdk/typescript/src/transactions/Transaction.ts
index 2dc90a4dd10a4..30a7723beeb01 100644
--- a/sdk/typescript/src/transactions/Transaction.ts
+++ b/sdk/typescript/src/transactions/Transaction.ts
@@ -22,6 +22,7 @@ import type {
 	TransactionPlugin,
 } from './json-rpc-resolver.js';
 import { resolveTransactionData } from './json-rpc-resolver.js';
+import { createObjectMethods } from './object.js';
 import { createPure } from './pure.js';
 import { TransactionDataBuilder } from './TransactionData.js';
 import { getIdFromCallArg } from './utils.js';
@@ -98,12 +99,37 @@ export function isTransaction(obj: unknown): obj is Transaction {
 
 export type TransactionObjectInput = string | CallArg | TransactionObjectArgument;
 
+const modulePluginRegistry = {
+	buildPlugins: [] as TransactionPlugin[],
+	serializationPlugins: [] as TransactionPlugin[],
+};
+
+const TRANSACTION_REGISTRY_KEY = Symbol.for('@mysten/transaction/registry');
+function getGlobalPluginRegistry() {
+	try {
+		const target = globalThis as {
+			[TRANSACTION_REGISTRY_KEY]?: {
+				buildPlugins: TransactionPlugin[];
+				serializationPlugins: TransactionPlugin[];
+			};
+		};
+
+		if (!target[TRANSACTION_REGISTRY_KEY]) {
+			target[TRANSACTION_REGISTRY_KEY] = modulePluginRegistry;
+		}
+
+		return target[TRANSACTION_REGISTRY_KEY];
+	} catch (e) {
+		return modulePluginRegistry;
+	}
+}
+
 /**
  * Transaction Builder
  */
 export class Transaction {
-	#serializationPlugins: TransactionPlugin[] = [];
-	#buildPlugins: TransactionPlugin[] = [];
+	#serializationPlugins: TransactionPlugin[];
+	#buildPlugins: TransactionPlugin[];
 	#intentResolvers = new Map<string, TransactionPlugin>();
 
 	/**
@@ -142,6 +168,14 @@ export class Transaction {
 		return newTransaction;
 	}
 
+	static registerGlobalSerializationPlugin(step: TransactionPlugin) {
+		getGlobalPluginRegistry().serializationPlugins.push(step);
+	}
+
+	static registerGlobalBuildPlugin(step: TransactionPlugin) {
+		getGlobalPluginRegistry().buildPlugins.push(step);
+	}
+
 	addSerializationPlugin(step: TransactionPlugin) {
 		this.#serializationPlugins.push(step);
 	}
@@ -179,6 +213,13 @@ export class Transaction {
 	setGasBudget(budget: number | bigint) {
 		this.#data.gasConfig.budget = String(budget);
 	}
+
+	setGasBudgetIfNotSet(budget: number | bigint) {
+		if (this.#data.gasData.budget == null) {
+			this.#data.gasConfig.budget = String(budget);
+		}
+	}
+
 	setGasOwner(owner: string) {
 		this.#data.gasConfig.owner = owner;
 	}
@@ -234,7 +275,10 @@ export class Transaction {
 	}
 
 	constructor() {
+		const globalPlugins = getGlobalPluginRegistry();
 		this.#data = new TransactionDataBuilder();
+		this.#buildPlugins = [...globalPlugins.buildPlugins];
+		this.#serializationPlugins = [...globalPlugins.serializationPlugins];
 	}
 
 	/** Returns an argument for the gas coin, to be used in a transaction. */
@@ -245,37 +289,43 @@ export class Transaction {
 	/**
 	 * Add a new object input to the transaction.
 	 */
-	object(value: TransactionObjectInput): { $kind: 'Input'; Input: number; type?: 'object' } {
-		if (typeof value === 'function') {
-			return this.object(value(this));
-		}
+	object = createObjectMethods(
+		(value: TransactionObjectInput): { $kind: 'Input'; Input: number; type?: 'object' } => {
+			if (typeof value === 'function') {
+				return this.object(value(this));
+			}
 
-		if (typeof value === 'object' && is(Argument, value)) {
-			return value as { $kind: 'Input'; Input: number; type?: 'object' };
-		}
+			if (typeof value === 'object' && is(Argument, value)) {
+				return value as { $kind: 'Input'; Input: number; type?: 'object' };
+			}
 
-		const id = getIdFromCallArg(value);
+			const id = getIdFromCallArg(value);
 
-		const inserted = this.#data.inputs.find((i) => id === getIdFromCallArg(i));
+			const inserted = this.#data.inputs.find((i) => id === getIdFromCallArg(i));
 
-		// Upgrade shared object inputs to mutable if needed:
-		if (inserted?.Object?.SharedObject && typeof value === 'object' && value.Object?.SharedObject) {
-			inserted.Object.SharedObject.mutable =
-				inserted.Object.SharedObject.mutable || value.Object.SharedObject.mutable;
-		}
+			// Upgrade shared object inputs to mutable if needed:
+			if (
+				inserted?.Object?.SharedObject &&
+				typeof value === 'object' &&
+				value.Object?.SharedObject
+			) {
+				inserted.Object.SharedObject.mutable =
+					inserted.Object.SharedObject.mutable || value.Object.SharedObject.mutable;
+			}
 
-		return inserted
-			? { $kind: 'Input', Input: this.#data.inputs.indexOf(inserted), type: 'object' }
-			: this.#data.addInput(
-					'object',
-					typeof value === 'string'
-						? {
-								$kind: 'UnresolvedObject',
-								UnresolvedObject: { objectId: normalizeSuiAddress(value) },
-							}
-						: value,
-				);
-	}
+			return inserted
+				? { $kind: 'Input', Input: this.#data.inputs.indexOf(inserted), type: 'object' }
+				: this.#data.addInput(
+						'object',
+						typeof value === 'string'
+							? {
+									$kind: 'UnresolvedObject',
+									UnresolvedObject: { objectId: normalizeSuiAddress(value) },
+								}
+							: value,
+					);
+		},
+	);
 
 	/**
 	 * Add a new object input to the transaction using the fully-resolved object reference.
diff --git a/sdk/typescript/src/transactions/executor/parallel.ts b/sdk/typescript/src/transactions/executor/parallel.ts
index a74eefc714920..da47dbe1325b2 100644
--- a/sdk/typescript/src/transactions/executor/parallel.ts
+++ b/sdk/typescript/src/transactions/executor/parallel.ts
@@ -5,7 +5,7 @@ import { toB64 } from '@mysten/bcs';
 
 import { bcs } from '../../bcs/index.js';
 import type { SuiObjectRef } from '../../bcs/types.js';
-import type { SuiClient } from '../../client/index.js';
+import type { SuiClient, SuiTransactionBlockResponseOptions } from '../../client/index.js';
 import type { Signer } from '../../cryptography/index.js';
 import type { ObjectCacheOptions } from '../ObjectCache.js';
 import { Transaction } from '../Transaction.js';
@@ -104,7 +104,7 @@ export class ParallelTransactionExecutor {
 		await this.#updateCache(() => this.#waitForLastDigest());
 	}
 
-	async executeTransaction(transaction: Transaction) {
+	async executeTransaction(transaction: Transaction, options?: SuiTransactionBlockResponseOptions) {
 		const { promise, resolve, reject } = promiseWithResolvers<{
 			digest: string;
 			effects: string;
@@ -113,7 +113,7 @@ export class ParallelTransactionExecutor {
 
 		const execute = () => {
 			this.#executeQueue.runTask(() => {
-				const promise = this.#execute(transaction, usedObjects);
+				const promise = this.#execute(transaction, usedObjects, options);
 
 				return promise.then(resolve, reject);
 			});
@@ -174,7 +174,11 @@ export class ParallelTransactionExecutor {
 		return usedObjects;
 	}
 
-	async #execute(transaction: Transaction, usedObjects: Set<string>) {
+	async #execute(
+		transaction: Transaction,
+		usedObjects: Set<string>,
+		options?: SuiTransactionBlockResponseOptions,
+	) {
 		let gasCoin!: CoinWithBalance;
 		try {
 			transaction.setSenderIfNotSet(this.#signer.toSuiAddress());
@@ -186,9 +190,7 @@ export class ParallelTransactionExecutor {
 					transaction.setGasPrice(await this.#getGasPrice());
 				}
 
-				if (!data.gasData.budget) {
-					transaction.setGasBudget(this.#defaultGasBudget);
-				}
+				transaction.setGasBudgetIfNotSet(this.#defaultGasBudget);
 
 				await this.#updateCache();
 				gasCoin = await this.#getGasCoin();
@@ -213,6 +215,7 @@ export class ParallelTransactionExecutor {
 				transaction: bytes,
 				signature,
 				options: {
+					...options,
 					showEffects: true,
 				},
 			});
diff --git a/sdk/typescript/src/transactions/executor/serial.ts b/sdk/typescript/src/transactions/executor/serial.ts
index f301825ff887e..603dfeae7bd6e 100644
--- a/sdk/typescript/src/transactions/executor/serial.ts
+++ b/sdk/typescript/src/transactions/executor/serial.ts
@@ -4,7 +4,7 @@
 import { toB64 } from '@mysten/bcs';
 
 import { bcs } from '../../bcs/index.js';
-import type { SuiClient } from '../../client/index.js';
+import type { SuiClient, SuiTransactionBlockResponseOptions } from '../../client/index.js';
 import type { Signer } from '../../cryptography/keypair.js';
 import type { ObjectCacheOptions } from '../ObjectCache.js';
 import { isTransaction, Transaction } from '../Transaction.js';
@@ -15,15 +15,20 @@ export class SerialTransactionExecutor {
 	#queue = new SerialQueue();
 	#signer: Signer;
 	#cache: CachingTransactionExecutor;
+	#defaultGasBudget: bigint;
 
 	constructor({
 		signer,
+		defaultGasBudget = 50_000_000n,
 		...options
 	}: Omit<ObjectCacheOptions, 'address'> & {
 		client: SuiClient;
 		signer: Signer;
+		/** The gasBudget to use if the transaction has not defined it's own gasBudget, defaults to `50_000_000n` */
+		defaultGasBudget?: bigint;
 	}) {
 		this.#signer = signer;
+		this.#defaultGasBudget = defaultGasBudget;
 		this.#cache = new CachingTransactionExecutor({
 			client: options.client,
 			cache: options.cache,
@@ -63,6 +68,7 @@ export class SerialTransactionExecutor {
 			copy.setGasPayment([gasCoin]);
 		}
 
+		copy.setGasBudgetIfNotSet(this.#defaultGasBudget);
 		copy.setSenderIfNotSet(this.#signer.toSuiAddress());
 
 		return this.#cache.buildTransaction({ transaction: copy });
@@ -76,7 +82,10 @@ export class SerialTransactionExecutor {
 		return this.#cache.waitForLastTransaction();
 	}
 
-	executeTransaction(transaction: Transaction | Uint8Array) {
+	executeTransaction(
+		transaction: Transaction | Uint8Array,
+		options?: SuiTransactionBlockResponseOptions,
+	) {
 		return this.#queue.runTask(async () => {
 			const bytes = isTransaction(transaction)
 				? await this.#buildTransaction(transaction)
@@ -87,6 +96,7 @@ export class SerialTransactionExecutor {
 				.executeTransaction({
 					signature,
 					transaction: bytes,
+					options,
 				})
 				.catch(async (error) => {
 					await this.resetCache();
diff --git a/sdk/typescript/src/transactions/json-rpc-resolver.ts b/sdk/typescript/src/transactions/json-rpc-resolver.ts
index 7ca134f1d54b8..ee364f012d3a8 100644
--- a/sdk/typescript/src/transactions/json-rpc-resolver.ts
+++ b/sdk/typescript/src/transactions/json-rpc-resolver.ts
@@ -436,6 +436,10 @@ function isUsedAsMutable(transactionData: TransactionDataBuilder, index: number)
 			const argIndex = tx.MoveCall.arguments.indexOf(arg);
 			usedAsMutable = tx.MoveCall._argumentTypes[argIndex].ref !== '&' || usedAsMutable;
 		}
+
+		if (tx.$kind === 'MakeMoveVec' || tx.$kind === 'MergeCoins' || tx.$kind === 'SplitCoins') {
+			usedAsMutable = true;
+		}
 	});
 
 	return usedAsMutable;
diff --git a/sdk/typescript/src/transactions/object.ts b/sdk/typescript/src/transactions/object.ts
new file mode 100644
index 0000000000000..ff83fac9dc750
--- /dev/null
+++ b/sdk/typescript/src/transactions/object.ts
@@ -0,0 +1,17 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+import type { TransactionObjectInput } from './Transaction.js';
+
+export function createObjectMethods<T>(makeObject: (value: TransactionObjectInput) => T) {
+	function object(value: TransactionObjectInput) {
+		return makeObject(value);
+	}
+
+	object.system = () => object('0x5');
+	object.clock = () => object('0x6');
+	object.random = () => object('0x8');
+	object.denyList = () => object('0x403');
+
+	return object;
+}
diff --git a/sdk/typescript/src/verify/verify.ts b/sdk/typescript/src/verify/verify.ts
index 49cbcba897b64..7ba6fcf63a6ab 100644
--- a/sdk/typescript/src/verify/verify.ts
+++ b/sdk/typescript/src/verify/verify.ts
@@ -45,8 +45,9 @@ export async function verifyPersonalMessageSignature(
 export async function verifyTransactionSignature(
 	transaction: Uint8Array,
 	signature: string,
+	options: { client?: SuiGraphQLClient } = {},
 ): Promise<PublicKey> {
-	const parsedSignature = parseSignature(signature);
+	const parsedSignature = parseSignature(signature, options);
 
 	if (
 		!(await parsedSignature.publicKey.verifyTransaction(
@@ -102,10 +103,13 @@ export function publicKeyFromRawBytes(
 	}
 }
 
-export function publicKeyFromSuiBytes(publicKey: string | Uint8Array) {
+export function publicKeyFromSuiBytes(
+	publicKey: string | Uint8Array,
+	options: { client?: SuiGraphQLClient } = {},
+) {
 	const bytes = typeof publicKey === 'string' ? fromB64(publicKey) : publicKey;
 
 	const signatureScheme = SIGNATURE_FLAG_TO_SCHEME[bytes[0] as SignatureFlag];
 
-	return publicKeyFromRawBytes(signatureScheme, bytes.slice(1));
+	return publicKeyFromRawBytes(signatureScheme, bytes.slice(1), options);
 }
diff --git a/sdk/typescript/src/version.ts b/sdk/typescript/src/version.ts
index 86359db32790b..3615ca82466f4 100644
--- a/sdk/typescript/src/version.ts
+++ b/sdk/typescript/src/version.ts
@@ -3,5 +3,5 @@
 
 // This file is generated by genversion.mjs. Do not edit it directly.
 
-export const PACKAGE_VERSION = '1.3.0';
-export const TARGETED_RPC_VERSION = '1.30.0';
+export const PACKAGE_VERSION = '1.7.0';
+export const TARGETED_RPC_VERSION = '1.32.0';
diff --git a/sdk/typescript/src/zklogin/publickey.ts b/sdk/typescript/src/zklogin/publickey.ts
index 2e6bf8b3e6a34..d42afefb0559d 100644
--- a/sdk/typescript/src/zklogin/publickey.ts
+++ b/sdk/typescript/src/zklogin/publickey.ts
@@ -71,6 +71,7 @@ export class ZkLoginPublicIdentifier extends PublicKey {
 	verifyPersonalMessage(message: Uint8Array, signature: Uint8Array | string): Promise<boolean> {
 		const parsedSignature = parseSerializedZkLoginSignature(signature);
 		const address = new ZkLoginPublicIdentifier(parsedSignature.publicKey).toSuiAddress();
+
 		return graphqlVerifyZkLoginSignature({
 			address: address,
 			bytes: toB64(message),
diff --git a/sdk/typescript/test/e2e/id-entry-args.test.ts b/sdk/typescript/test/e2e/id-entry-args.test.ts
index afa9d960cd905..25974ac4a1e24 100644
--- a/sdk/typescript/test/e2e/id-entry-args.test.ts
+++ b/sdk/typescript/test/e2e/id-entry-args.test.ts
@@ -29,6 +29,7 @@ describe('Test ID as args to entry functions', () => {
 				showEffects: true,
 			},
 		});
+		await toolbox.client.waitForTransaction({ digest: result.digest });
 		expect(result.effects?.status.status).toEqual('success');
 	});
 
@@ -45,6 +46,7 @@ describe('Test ID as args to entry functions', () => {
 				showEffects: true,
 			},
 		});
+		await toolbox.client.waitForTransaction({ digest: result.digest });
 		expect(result.effects?.status.status).toEqual('success');
 	});
 });
diff --git a/sdk/typescript/test/e2e/multisig.test.ts b/sdk/typescript/test/e2e/multisig.test.ts
index 205a9ee8cdf3c..53a50966638f0 100644
--- a/sdk/typescript/test/e2e/multisig.test.ts
+++ b/sdk/typescript/test/e2e/multisig.test.ts
@@ -105,6 +105,7 @@ describe('MultiSig with zklogin signature', () => {
 			signature,
 			options: { showEffects: true },
 		});
+		await client.waitForTransaction({ digest: result.digest });
 
 		// check the execution result and digest.
 		const localDigest = await tx.getDigest({ client });
diff --git a/sdk/typescript/test/e2e/object-cache.test.ts b/sdk/typescript/test/e2e/object-cache.test.ts
index ebce84241aa02..3577b87389406 100644
--- a/sdk/typescript/test/e2e/object-cache.test.ts
+++ b/sdk/typescript/test/e2e/object-cache.test.ts
@@ -10,7 +10,7 @@ import { CachingTransactionExecutor } from '../../src/transactions/executor/cach
 import { normalizeSuiAddress } from '../../src/utils';
 import { setup, TestToolbox } from './utils/setup';
 
-describe('CachingTransactionExecutor', async () => {
+describe('CachingTransactionExecutor', { retry: 3 }, async () => {
 	let toolbox: TestToolbox;
 	let packageId: string;
 	let rawPackageId: string;
@@ -181,6 +181,8 @@ describe('CachingTransactionExecutor', async () => {
 
 		expect(toolbox.client.multiGetObjects).toHaveBeenCalledTimes(0);
 
+		await toolbox.client.waitForTransaction({ digest: result.digest });
+
 		const result2 = await executor.signAndExecuteTransaction({
 			transaction: txb2,
 			signer: toolbox.keypair,
@@ -192,6 +194,8 @@ describe('CachingTransactionExecutor', async () => {
 		expect(toolbox.client.multiGetObjects).toHaveBeenCalledTimes(0);
 		expect(result2.effects?.status.status).toBe('success');
 
+		await toolbox.client.waitForTransaction({ digest: result2.digest });
+
 		await executor.reset();
 
 		const txb3 = new Transaction();
@@ -209,6 +213,7 @@ describe('CachingTransactionExecutor', async () => {
 		});
 		expect(toolbox.client.multiGetObjects).toHaveBeenCalledTimes(1);
 		expect(result3.effects?.status.status).toBe('success');
+		await toolbox.client.waitForTransaction({ digest: result3.digest });
 	});
 });
 
diff --git a/sdk/typescript/test/e2e/objects.test.ts b/sdk/typescript/test/e2e/objects.test.ts
index 2a74636be5fcb..7f696b0404c7c 100644
--- a/sdk/typescript/test/e2e/objects.test.ts
+++ b/sdk/typescript/test/e2e/objects.test.ts
@@ -119,10 +119,11 @@ describe('Object Reading API', () => {
 		// Transfer the entire gas object:
 		tx.transferObjects([tx.gas], normalizeSuiAddress('0x2'));
 
-		await toolbox.client.signAndExecuteTransaction({
+		const { digest } = await toolbox.client.signAndExecuteTransaction({
 			signer: toolbox.keypair,
 			transaction: tx,
 		});
+		await toolbox.client.waitForTransaction({ digest });
 
 		const res = await toolbox.client.tryGetPastObject({
 			id: data[0].coinObjectId,
diff --git a/sdk/typescript/test/e2e/parallel-executor.test.ts b/sdk/typescript/test/e2e/parallel-executor.test.ts
index 88d7c58b73ea9..7d0d036fd4043 100644
--- a/sdk/typescript/test/e2e/parallel-executor.test.ts
+++ b/sdk/typescript/test/e2e/parallel-executor.test.ts
@@ -39,7 +39,7 @@ afterAll(() => {
 	vi.restoreAllMocks();
 });
 
-describe('ParallelTransactionExecutor', () => {
+describe('ParallelTransactionExecutor', { retry: 3 }, () => {
 	beforeEach(async () => {
 		await executor.resetCache();
 		vi.clearAllMocks();
diff --git a/sdk/typescript/test/e2e/serial-executor.test.ts b/sdk/typescript/test/e2e/serial-executor.test.ts
index 830d32fa8bd5c..d14ba26780dbb 100644
--- a/sdk/typescript/test/e2e/serial-executor.test.ts
+++ b/sdk/typescript/test/e2e/serial-executor.test.ts
@@ -29,7 +29,7 @@ afterAll(() => {
 	vi.restoreAllMocks();
 });
 
-describe('SerialExecutor', () => {
+describe('SerialExecutor', { retry: 3 }, () => {
 	beforeEach(async () => {
 		vi.clearAllMocks();
 		await executor.resetCache();
diff --git a/sdk/typescript/test/e2e/txn-builder.test.ts b/sdk/typescript/test/e2e/txn-builder.test.ts
index e92beced30a69..75486345488be 100644
--- a/sdk/typescript/test/e2e/txn-builder.test.ts
+++ b/sdk/typescript/test/e2e/txn-builder.test.ts
@@ -220,6 +220,7 @@ async function validateTransaction(client: SuiClient, signer: Keypair, tx: Trans
 			showEffects: true,
 		},
 	});
+	await client.waitForTransaction({ digest: result.digest });
 	expect(localDigest).toEqual(result.digest);
 	expect(result.effects?.status.status).toEqual('success');
 }
diff --git a/sdk/typescript/test/e2e/utils/setup.ts b/sdk/typescript/test/e2e/utils/setup.ts
index 037e490f013d5..63362790eee31 100644
--- a/sdk/typescript/test/e2e/utils/setup.ts
+++ b/sdk/typescript/test/e2e/utils/setup.ts
@@ -174,7 +174,7 @@ export async function publishPackage(packagePath: string, toolbox?: TestToolbox)
 
 	const { modules, dependencies } = JSON.parse(
 		execSync(
-			`${SUI_BIN} move build --dump-bytecode-as-base64 --path ${packagePath} --install-dir ${tmpobj.name}`,
+			`${SUI_BIN} move --client.config ${toolbox.configPath} build --dump-bytecode-as-base64 --path ${packagePath} --install-dir ${tmpobj.name}`,
 			{ encoding: 'utf-8' },
 		),
 	);
@@ -228,7 +228,7 @@ export async function upgradePackage(
 
 	const { modules, dependencies, digest } = JSON.parse(
 		execSync(
-			`${SUI_BIN} move build --dump-bytecode-as-base64 --path ${packagePath} --install-dir ${tmpobj.name}`,
+			`${SUI_BIN} move --client.config ${toolbox.configPath} build --dump-bytecode-as-base64 --path ${packagePath} --install-dir ${tmpobj.name}`,
 			{ encoding: 'utf-8' },
 		),
 	);
diff --git a/sdk/typescript/test/unit/arguments.test.ts b/sdk/typescript/test/unit/arguments.test.ts
index d737e5cc51e02..736b0be0eab50 100644
--- a/sdk/typescript/test/unit/arguments.test.ts
+++ b/sdk/typescript/test/unit/arguments.test.ts
@@ -26,6 +26,10 @@ describe('Arguments helpers', () => {
 				digest: toB58(new Uint8Array(32).fill(0x1)),
 			}),
 			Arguments.pure.address('0x2'),
+			Arguments.object.system(),
+			Arguments.object.clock(),
+			Arguments.object.random(),
+			Arguments.object.denyList(),
 		];
 
 		const tx = new Transaction();
@@ -67,6 +71,26 @@ describe('Arguments helpers', () => {
 			            "Input": 4,
 			            "type": "pure",
 			          },
+			          {
+			            "$kind": "Input",
+			            "Input": 5,
+			            "type": "object",
+			          },
+			          {
+			            "$kind": "Input",
+			            "Input": 6,
+			            "type": "object",
+			          },
+			          {
+			            "$kind": "Input",
+			            "Input": 7,
+			            "type": "object",
+			          },
+			          {
+			            "$kind": "Input",
+			            "Input": 8,
+			            "type": "object",
+			          },
 			        ],
 			        "function": "bar",
 			        "module": "foo",
@@ -128,6 +152,30 @@ describe('Arguments helpers', () => {
 			        "bytes": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAI=",
 			      },
 			    },
+			    {
+			      "$kind": "UnresolvedObject",
+			      "UnresolvedObject": {
+			        "objectId": "0x0000000000000000000000000000000000000000000000000000000000000005",
+			      },
+			    },
+			    {
+			      "$kind": "UnresolvedObject",
+			      "UnresolvedObject": {
+			        "objectId": "0x0000000000000000000000000000000000000000000000000000000000000006",
+			      },
+			    },
+			    {
+			      "$kind": "UnresolvedObject",
+			      "UnresolvedObject": {
+			        "objectId": "0x0000000000000000000000000000000000000000000000000000000000000008",
+			      },
+			    },
+			    {
+			      "$kind": "UnresolvedObject",
+			      "UnresolvedObject": {
+			        "objectId": "0x0000000000000000000000000000000000000000000000000000000000000403",
+			      },
+			    },
 			  ],
 			  "sender": null,
 			  "version": 2,
diff --git a/sdk/typescript/test/unit/object-inputs.test.ts b/sdk/typescript/test/unit/object-inputs.test.ts
new file mode 100644
index 0000000000000..ddde51d40331f
--- /dev/null
+++ b/sdk/typescript/test/unit/object-inputs.test.ts
@@ -0,0 +1,183 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+import { toB58 } from '@mysten/bcs';
+import { describe, expect, it } from 'vitest';
+
+import { Transaction } from '../../src/transactions';
+
+describe('Transaction inputs', () => {
+	it('can use tx methods for creating inputs', async () => {
+		const tx = new Transaction();
+
+		tx.moveCall({
+			target: '0x2::foo::bar',
+			arguments: [
+				tx.object('0x123'),
+				tx.receivingRef({
+					objectId: '1',
+					version: '123',
+					digest: toB58(new Uint8Array(32).fill(0x1)),
+				}),
+				tx.sharedObjectRef({
+					objectId: '2',
+					mutable: true,
+					initialSharedVersion: '123',
+				}),
+				tx.objectRef({
+					objectId: '3',
+					version: '123',
+					digest: toB58(new Uint8Array(32).fill(0x1)),
+				}),
+				tx.pure.address('0x2'),
+				tx.object.system(),
+				tx.object.clock(),
+				tx.object.random(),
+				tx.object.denyList(),
+			],
+		});
+
+		expect(tx.getData()).toMatchInlineSnapshot(`
+			{
+			  "commands": [
+			    {
+			      "$kind": "MoveCall",
+			      "MoveCall": {
+			        "arguments": [
+			          {
+			            "$kind": "Input",
+			            "Input": 0,
+			            "type": "object",
+			          },
+			          {
+			            "$kind": "Input",
+			            "Input": 1,
+			            "type": "object",
+			          },
+			          {
+			            "$kind": "Input",
+			            "Input": 2,
+			            "type": "object",
+			          },
+			          {
+			            "$kind": "Input",
+			            "Input": 3,
+			            "type": "object",
+			          },
+			          {
+			            "$kind": "Input",
+			            "Input": 4,
+			            "type": "pure",
+			          },
+			          {
+			            "$kind": "Input",
+			            "Input": 5,
+			            "type": "object",
+			          },
+			          {
+			            "$kind": "Input",
+			            "Input": 6,
+			            "type": "object",
+			          },
+			          {
+			            "$kind": "Input",
+			            "Input": 7,
+			            "type": "object",
+			          },
+			          {
+			            "$kind": "Input",
+			            "Input": 8,
+			            "type": "object",
+			          },
+			        ],
+			        "function": "bar",
+			        "module": "foo",
+			        "package": "0x0000000000000000000000000000000000000000000000000000000000000002",
+			        "typeArguments": [],
+			      },
+			    },
+			  ],
+			  "expiration": null,
+			  "gasData": {
+			    "budget": null,
+			    "owner": null,
+			    "payment": null,
+			    "price": null,
+			  },
+			  "inputs": [
+			    {
+			      "$kind": "UnresolvedObject",
+			      "UnresolvedObject": {
+			        "objectId": "0x0000000000000000000000000000000000000000000000000000000000000123",
+			      },
+			    },
+			    {
+			      "$kind": "Object",
+			      "Object": {
+			        "$kind": "Receiving",
+			        "Receiving": {
+			          "digest": "4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi",
+			          "objectId": "0x0000000000000000000000000000000000000000000000000000000000000001",
+			          "version": "123",
+			        },
+			      },
+			    },
+			    {
+			      "$kind": "Object",
+			      "Object": {
+			        "$kind": "SharedObject",
+			        "SharedObject": {
+			          "initialSharedVersion": "123",
+			          "mutable": true,
+			          "objectId": "0x0000000000000000000000000000000000000000000000000000000000000002",
+			        },
+			      },
+			    },
+			    {
+			      "$kind": "Object",
+			      "Object": {
+			        "$kind": "ImmOrOwnedObject",
+			        "ImmOrOwnedObject": {
+			          "digest": "4vJ9JU1bJJE96FWSJKvHsmmFADCg4gpZQff4P3bkLKi",
+			          "objectId": "0x0000000000000000000000000000000000000000000000000000000000000003",
+			          "version": "123",
+			        },
+			      },
+			    },
+			    {
+			      "$kind": "Pure",
+			      "Pure": {
+			        "bytes": "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAI=",
+			      },
+			    },
+			    {
+			      "$kind": "UnresolvedObject",
+			      "UnresolvedObject": {
+			        "objectId": "0x0000000000000000000000000000000000000000000000000000000000000005",
+			      },
+			    },
+			    {
+			      "$kind": "UnresolvedObject",
+			      "UnresolvedObject": {
+			        "objectId": "0x0000000000000000000000000000000000000000000000000000000000000006",
+			      },
+			    },
+			    {
+			      "$kind": "UnresolvedObject",
+			      "UnresolvedObject": {
+			        "objectId": "0x0000000000000000000000000000000000000000000000000000000000000008",
+			      },
+			    },
+			    {
+			      "$kind": "UnresolvedObject",
+			      "UnresolvedObject": {
+			        "objectId": "0x0000000000000000000000000000000000000000000000000000000000000403",
+			      },
+			    },
+			  ],
+			  "sender": null,
+			  "version": 2,
+			}
+		`);
+	});
+});
diff --git a/sdk/typescript/vitest.config.ts b/sdk/typescript/vitest.config.ts
index e58acd7035af6..231c84d702bbe 100644
--- a/sdk/typescript/vitest.config.ts
+++ b/sdk/typescript/vitest.config.ts
@@ -5,8 +5,8 @@ import { defineConfig } from 'vitest/config';
 
 export default defineConfig({
 	test: {
-		minThreads: 1,
-		maxThreads: 8,
+		minWorkers: 1,
+		maxWorkers: 4,
 		hookTimeout: 1000000,
 		testTimeout: 1000000,
 		env: {
diff --git a/sdk/wallet-standard/CHANGELOG.md b/sdk/wallet-standard/CHANGELOG.md
index c984dbf0f97d6..3c88ee60b92f2 100644
--- a/sdk/wallet-standard/CHANGELOG.md
+++ b/sdk/wallet-standard/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @mysten/wallet-standard
 
+## 0.13.2
+
+### Patch Changes
+
+- Updated dependencies [143cd9d]
+- Updated dependencies [4357ac6]
+- Updated dependencies [4019dd7]
+- Updated dependencies [4019dd7]
+- Updated dependencies [00a974d]
+  - @mysten/sui@1.7.0
+
+## 0.13.1
+
+### Patch Changes
+
+- Updated dependencies [a3e32fe]
+  - @mysten/sui@1.6.0
+
+## 0.13.0
+
+### Minor Changes
+
+- 0851b31: Deprecate requestType option when executing transactions
+
+### Patch Changes
+
+- Updated dependencies [0851b31]
+- Updated dependencies [f37b3c2]
+  - @mysten/sui@1.5.0
+
+## 0.12.14
+
+### Patch Changes
+
+- Updated dependencies [4419234]
+  - @mysten/sui@1.4.0
+
+## 0.12.13
+
+### Patch Changes
+
+- Updated dependencies [a45f461]
+  - @mysten/sui@1.3.1
+
 ## 0.12.12
 
 ### Patch Changes
diff --git a/sdk/wallet-standard/package.json b/sdk/wallet-standard/package.json
index fa19fdad28ca9..378c6b92b6e92 100644
--- a/sdk/wallet-standard/package.json
+++ b/sdk/wallet-standard/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@mysten/wallet-standard",
-	"version": "0.12.12",
+	"version": "0.13.2",
 	"description": "A suite of standard utilities for implementing wallets based on the Wallet Standard.",
 	"license": "Apache-2.0",
 	"author": "Mysten Labs <build@mystenlabs.com>",
diff --git a/sdk/wallet-standard/src/features/suiSignAndExecuteTransactionBlock.ts b/sdk/wallet-standard/src/features/suiSignAndExecuteTransactionBlock.ts
index 941aabdc9a77a..4601d53cde112 100644
--- a/sdk/wallet-standard/src/features/suiSignAndExecuteTransactionBlock.ts
+++ b/sdk/wallet-standard/src/features/suiSignAndExecuteTransactionBlock.ts
@@ -37,8 +37,7 @@ export type SuiSignAndExecuteTransactionBlockMethod = (
 /** Input for signing and sending transactions. */
 export interface SuiSignAndExecuteTransactionBlockInput extends SuiSignTransactionBlockInput {
 	/**
-	 * `WaitForEffectsCert` or `WaitForLocalExecution`, see details in `ExecuteTransactionRequestType`.
-	 * Defaults to `WaitForLocalExecution` if options.showEffects or options.showEvents is true
+	 * @deprecated requestType will be ignored by JSON RPC in the future
 	 */
 	requestType?: ExecuteTransactionRequestType;
 	/** specify which fields to return (e.g., transaction, effects, events, etc). By default, only the transaction digest will be returned. */
diff --git a/sdk/zklogin/CHANGELOG.md b/sdk/zklogin/CHANGELOG.md
index 378a140cbe213..011e1a18c2bc2 100644
--- a/sdk/zklogin/CHANGELOG.md
+++ b/sdk/zklogin/CHANGELOG.md
@@ -1,5 +1,53 @@
 # @mysten/zklogin
 
+## 0.7.17
+
+### Patch Changes
+
+- Updated dependencies [143cd9d]
+- Updated dependencies [4357ac6]
+- Updated dependencies [4019dd7]
+- Updated dependencies [4019dd7]
+- Updated dependencies [00a974d]
+  - @mysten/sui@1.7.0
+
+## 0.7.16
+
+### Patch Changes
+
+- Updated dependencies [a3e32fe]
+  - @mysten/sui@1.6.0
+
+## 0.7.15
+
+### Patch Changes
+
+- 6f79ed9: Additional check for bigints
+
+## 0.7.14
+
+### Patch Changes
+
+- Updated dependencies [0851b31]
+- Updated dependencies [f37b3c2]
+- Updated dependencies [f37b3c2]
+  - @mysten/sui@1.5.0
+  - @mysten/bcs@1.0.4
+
+## 0.7.13
+
+### Patch Changes
+
+- Updated dependencies [4419234]
+  - @mysten/sui@1.4.0
+
+## 0.7.12
+
+### Patch Changes
+
+- Updated dependencies [a45f461]
+  - @mysten/sui@1.3.1
+
 ## 0.7.11
 
 ### Patch Changes
diff --git a/sdk/zklogin/package.json b/sdk/zklogin/package.json
index 1f0ed57361b28..e42717b9670c0 100644
--- a/sdk/zklogin/package.json
+++ b/sdk/zklogin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@mysten/zklogin",
-	"version": "0.7.11",
+	"version": "0.7.17",
 	"description": "Utilities for interacting with zkLogin in Sui",
 	"license": "Apache-2.0",
 	"author": "Mysten Labs <build@mystenlabs.com>",
diff --git a/sdk/zklogin/src/poseidon.ts b/sdk/zklogin/src/poseidon.ts
index f51ce896137cd..c002176e7df3a 100644
--- a/sdk/zklogin/src/poseidon.ts
+++ b/sdk/zklogin/src/poseidon.ts
@@ -39,7 +39,17 @@ const poseidonNumToHashFN = [
 	poseidon16,
 ];
 
+export const BN254_FIELD_SIZE =
+	21888242871839275222246405745257275088548364400416034343698204186575808495617n;
+
 export function poseidonHash(inputs: (number | bigint | string)[]): bigint {
+	inputs.forEach((x) => {
+		const b = BigInt(x);
+		if (b < 0 || b >= BN254_FIELD_SIZE) {
+			throw new Error(`Element ${b} not in the BN254 field`);
+		}
+	});
+
 	const hashFN = poseidonNumToHashFN[inputs.length - 1];
 
 	if (hashFN) {
diff --git a/sdk/zklogin/test/poseidon.test.ts b/sdk/zklogin/test/poseidon.test.ts
new file mode 100644
index 0000000000000..7499b7164e5b4
--- /dev/null
+++ b/sdk/zklogin/test/poseidon.test.ts
@@ -0,0 +1,25 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
+import { expect, test } from 'vitest';
+
+import { BN254_FIELD_SIZE, poseidonHash } from '../src/poseidon';
+
+test('can hash single input', () => {
+	const result = poseidonHash([123]);
+	expect(result).toBeTypeOf('bigint');
+});
+
+test('can hash multiple inputs', () => {
+	const result = poseidonHash([1, 2, 3, 4, 5]);
+	expect(result).toBeTypeOf('bigint');
+});
+
+test('throws error for invalid input', () => {
+	expect(() => poseidonHash([-1])).toThrowError('Element -1 not in the BN254 field');
+});
+
+test('throws error for invalid input greater than BN254_FIELD_SIZE', () => {
+	expect(() => poseidonHash([BN254_FIELD_SIZE])).toThrowError(
+		'Element 21888242871839275222246405745257275088548364400416034343698204186575808495617 not in the BN254 field',
+	);
+});
diff --git a/sdk/zksend/CHANGELOG.md b/sdk/zksend/CHANGELOG.md
index dc8bfd9852092..7b41cfc38edc4 100644
--- a/sdk/zksend/CHANGELOG.md
+++ b/sdk/zksend/CHANGELOG.md
@@ -1,5 +1,50 @@
 # @mysten/zksend
 
+## 0.10.6
+
+### Patch Changes
+
+- Updated dependencies [143cd9d]
+- Updated dependencies [4357ac6]
+- Updated dependencies [4019dd7]
+- Updated dependencies [4019dd7]
+- Updated dependencies [00a974d]
+  - @mysten/sui@1.7.0
+  - @mysten/wallet-standard@0.13.2
+
+## 0.10.5
+
+### Patch Changes
+
+- Updated dependencies [a3e32fe]
+  - @mysten/sui@1.6.0
+  - @mysten/wallet-standard@0.13.1
+
+## 0.10.4
+
+### Patch Changes
+
+- Updated dependencies [0851b31]
+- Updated dependencies [f37b3c2]
+  - @mysten/wallet-standard@0.13.0
+  - @mysten/sui@1.5.0
+
+## 0.10.3
+
+### Patch Changes
+
+- Updated dependencies [4419234]
+  - @mysten/sui@1.4.0
+  - @mysten/wallet-standard@0.12.14
+
+## 0.10.2
+
+### Patch Changes
+
+- Updated dependencies [a45f461]
+  - @mysten/sui@1.3.1
+  - @mysten/wallet-standard@0.12.13
+
 ## 0.10.1
 
 ### Patch Changes
diff --git a/sdk/zksend/package.json b/sdk/zksend/package.json
index 8ab8fbae955c5..e105d7deb5bbf 100644
--- a/sdk/zksend/package.json
+++ b/sdk/zksend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@mysten/zksend",
-	"version": "0.10.1",
+	"version": "0.10.6",
 	"description": "TODO: Write Description",
 	"license": "Apache-2.0",
 	"author": "Mysten Labs <build@mystenlabs.com>",
diff --git a/sui-execution/README.md b/sui-execution/README.md
index bdf9f62b26882..6ea2ee002b5ba 100644
--- a/sui-execution/README.md
+++ b/sui-execution/README.md
@@ -3,7 +3,7 @@
 The `sui-execution` crate is responsible for abstracting access to the
 execution layer.  It allows us to isolate big changes to the execution
 layer that need to be gated behind protocol config changes, to
-minimise the risk of inadvertantly changing behaviour that is relevant
+minimise the risk of inadvertently changing behaviour that is relevant
 for state sync (which would cause a fork).
 
 The Execution Layer include:
diff --git a/sui-execution/latest/sui-adapter/Cargo.toml b/sui-execution/latest/sui-adapter/Cargo.toml
index 04f1d9734cf8d..7a58fe23095ff 100644
--- a/sui-execution/latest/sui-adapter/Cargo.toml
+++ b/sui-execution/latest/sui-adapter/Cargo.toml
@@ -7,6 +7,9 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 anyhow = { workspace = true, features = ["backtrace"] }
 bcs.workspace = true
diff --git a/sui-execution/latest/sui-adapter/src/adapter.rs b/sui-execution/latest/sui-adapter/src/adapter.rs
index 25da7df5a7617..149fa4b1a83b7 100644
--- a/sui-execution/latest/sui-adapter/src/adapter.rs
+++ b/sui-execution/latest/sui-adapter/src/adapter.rs
@@ -70,6 +70,8 @@ mod checked {
                 // Don't augment errors with execution state on-chain
                 error_execution_state: false,
                 binary_config: to_binary_config(protocol_config),
+                rethrow_serialization_type_layout_errors: protocol_config
+                    .rethrow_serialization_type_layout_errors(),
             },
         )
         .map_err(|_| SuiError::ExecutionInvariantViolation)
diff --git a/sui-execution/latest/sui-move-natives/src/crypto/group_ops.rs b/sui-execution/latest/sui-move-natives/src/crypto/group_ops.rs
index 7a740b6f2b191..93535741f7567 100644
--- a/sui-execution/latest/sui-move-natives/src/crypto/group_ops.rs
+++ b/sui-execution/latest/sui-move-natives/src/crypto/group_ops.rs
@@ -571,8 +571,8 @@ fn multi_scalar_mul<G, const SCALAR_SIZE: usize, const POINT_SIZE: usize>(
     base_cost: Option<InternalGas>,
     base_cost_per_addition: Option<InternalGas>,
     max_len: u32,
-    scalars: &Vec<u8>,
-    points: &Vec<u8>,
+    scalars: &[u8],
+    points: &[u8],
 ) -> PartialVMResult<NativeResult>
 where
     G: GroupElement
diff --git a/sui-execution/latest/sui-move-natives/src/lib.rs b/sui-execution/latest/sui-move-natives/src/lib.rs
index 36fb6865d69eb..e2f50dfe1b86a 100644
--- a/sui-execution/latest/sui-move-natives/src/lib.rs
+++ b/sui-execution/latest/sui-move-natives/src/lib.rs
@@ -1088,7 +1088,7 @@ pub fn get_object_id(object: Value) -> Result<Value, PartialVMError> {
     get_nested_struct_field(object, &[0, 0, 0])
 }
 
-// Extract a field valye that's nested inside value `v`. The offset of each nesting
+// Extract a field value that's nested inside value `v`. The offset of each nesting
 // is determined by `offsets`.
 pub fn get_nested_struct_field(mut v: Value, offsets: &[usize]) -> Result<Value, PartialVMError> {
     for offset in offsets {
diff --git a/sui-execution/latest/sui-verifier/src/entry_points_verifier.rs b/sui-execution/latest/sui-verifier/src/entry_points_verifier.rs
index e3147b9d5a24d..9eadf862fcad0 100644
--- a/sui-execution/latest/sui-verifier/src/entry_points_verifier.rs
+++ b/sui-execution/latest/sui-verifier/src/entry_points_verifier.rs
@@ -28,8 +28,8 @@ use crate::{verification_failure, INIT_FN_NAME};
 /// - The function must have `Visibility::Private`
 /// - The function can have at most two parameters:
 ///   - mandatory &mut TxContext or &TxContext (see `is_tx_context`) in the last position
-///   - optional one-time witness type (see one_time_witness verifier pass) passed by value in the first
-///   position
+///   - optional one-time witness type (see one_time_witness verifier pass) passed by value in the
+///     first position
 ///
 /// For transaction entry points
 /// - The function must have `is_entry` true
diff --git a/sui-execution/v0/sui-adapter/Cargo.toml b/sui-execution/v0/sui-adapter/Cargo.toml
index 0eb11447ba112..745245766b109 100644
--- a/sui-execution/v0/sui-adapter/Cargo.toml
+++ b/sui-execution/v0/sui-adapter/Cargo.toml
@@ -7,6 +7,9 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 anyhow = { workspace = true, features = ["backtrace"] }
 bcs.workspace = true
diff --git a/sui-execution/v0/sui-adapter/src/adapter.rs b/sui-execution/v0/sui-adapter/src/adapter.rs
index 7570eac77a7d1..73fccf3124b9a 100644
--- a/sui-execution/v0/sui-adapter/src/adapter.rs
+++ b/sui-execution/v0/sui-adapter/src/adapter.rs
@@ -72,6 +72,8 @@ mod checked {
 
                 profiler_config: vm_profiler_config,
                 binary_config: to_binary_config(protocol_config),
+                rethrow_serialization_type_layout_errors: protocol_config
+                    .rethrow_serialization_type_layout_errors(),
             },
         )
         .map_err(|_| SuiError::ExecutionInvariantViolation)
diff --git a/sui-execution/v0/sui-move-natives/src/lib.rs b/sui-execution/v0/sui-move-natives/src/lib.rs
index 15d6fa6c0445d..e524becdbfe30 100644
--- a/sui-execution/v0/sui-move-natives/src/lib.rs
+++ b/sui-execution/v0/sui-move-natives/src/lib.rs
@@ -707,7 +707,7 @@ pub fn get_object_id(object: Value) -> Result<Value, PartialVMError> {
     get_nested_struct_field(object, &[0, 0, 0])
 }
 
-// Extract a field valye that's nested inside value `v`. The offset of each nesting
+// Extract a field value that's nested inside value `v`. The offset of each nesting
 // is determined by `offsets`.
 pub fn get_nested_struct_field(mut v: Value, offsets: &[usize]) -> Result<Value, PartialVMError> {
     for offset in offsets {
diff --git a/sui-execution/v0/sui-verifier/Cargo.toml b/sui-execution/v0/sui-verifier/Cargo.toml
index bb3dde2501689..e5304b9386808 100644
--- a/sui-execution/v0/sui-verifier/Cargo.toml
+++ b/sui-execution/v0/sui-verifier/Cargo.toml
@@ -7,6 +7,9 @@ description = "Move framework for Sui platform"
 license = "Apache-2.0"
 publish = false
 
+[lints]
+workspace = true
+
 [dependencies]
 move-binary-format.workspace = true
 move-bytecode-utils.workspace = true
diff --git a/sui-execution/v0/sui-verifier/src/entry_points_verifier.rs b/sui-execution/v0/sui-verifier/src/entry_points_verifier.rs
index b32ba8fcde498..002d0b3a795c3 100644
--- a/sui-execution/v0/sui-verifier/src/entry_points_verifier.rs
+++ b/sui-execution/v0/sui-verifier/src/entry_points_verifier.rs
@@ -27,7 +27,7 @@ use crate::{verification_failure, INIT_FN_NAME};
 /// - The function can have at most two parameters:
 ///   - mandatory &mut TxContext or &TxContext (see `is_tx_context`) in the last position
 ///   - optional one-time witness type (see one_time_witness verifier pass) passed by value in the first
-///   position
+///     position
 ///
 /// For transaction entry points
 /// - The function must have `is_entry` true
diff --git a/sui-execution/v1/sui-adapter/Cargo.toml b/sui-execution/v1/sui-adapter/Cargo.toml
index 8dce979551406..d986af97a9856 100644
--- a/sui-execution/v1/sui-adapter/Cargo.toml
+++ b/sui-execution/v1/sui-adapter/Cargo.toml
@@ -7,6 +7,9 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 anyhow = { workspace = true, features = ["backtrace"] }
 bcs.workspace = true
diff --git a/sui-execution/v1/sui-adapter/src/adapter.rs b/sui-execution/v1/sui-adapter/src/adapter.rs
index bd9f4eeccb2d0..633abec22e6b2 100644
--- a/sui-execution/v1/sui-adapter/src/adapter.rs
+++ b/sui-execution/v1/sui-adapter/src/adapter.rs
@@ -72,6 +72,8 @@ mod checked {
                 // Don't augment errors with execution state on-chain
                 error_execution_state: false,
                 binary_config: to_binary_config(protocol_config),
+                rethrow_serialization_type_layout_errors: protocol_config
+                    .rethrow_serialization_type_layout_errors(),
             },
         )
         .map_err(|_| SuiError::ExecutionInvariantViolation)
diff --git a/sui-execution/v1/sui-move-natives/src/lib.rs b/sui-execution/v1/sui-move-natives/src/lib.rs
index b49ce1a218c6c..8a3621a1df8ea 100644
--- a/sui-execution/v1/sui-move-natives/src/lib.rs
+++ b/sui-execution/v1/sui-move-natives/src/lib.rs
@@ -762,7 +762,7 @@ pub fn get_object_id(object: Value) -> Result<Value, PartialVMError> {
     get_nested_struct_field(object, &[0, 0, 0])
 }
 
-// Extract a field valye that's nested inside value `v`. The offset of each nesting
+// Extract a field value that's nested inside value `v`. The offset of each nesting
 // is determined by `offsets`.
 pub fn get_nested_struct_field(mut v: Value, offsets: &[usize]) -> Result<Value, PartialVMError> {
     for offset in offsets {
diff --git a/sui-execution/v1/sui-verifier/src/entry_points_verifier.rs b/sui-execution/v1/sui-verifier/src/entry_points_verifier.rs
index d107c81b98f4b..2f6a706e0f24d 100644
--- a/sui-execution/v1/sui-verifier/src/entry_points_verifier.rs
+++ b/sui-execution/v1/sui-verifier/src/entry_points_verifier.rs
@@ -27,7 +27,7 @@ use crate::{verification_failure, INIT_FN_NAME};
 /// - The function can have at most two parameters:
 ///   - mandatory &mut TxContext or &TxContext (see `is_tx_context`) in the last position
 ///   - optional one-time witness type (see one_time_witness verifier pass) passed by value in the first
-///   position
+///     position
 ///
 /// For transaction entry points
 /// - The function must have `is_entry` true
diff --git a/sui-execution/v2/sui-adapter/Cargo.toml b/sui-execution/v2/sui-adapter/Cargo.toml
index ae29ab4845fc0..cb8bf360a0b12 100644
--- a/sui-execution/v2/sui-adapter/Cargo.toml
+++ b/sui-execution/v2/sui-adapter/Cargo.toml
@@ -7,6 +7,9 @@ license = "Apache-2.0"
 publish = false
 edition = "2021"
 
+[lints]
+workspace = true
+
 [dependencies]
 anyhow = { workspace = true, features = ["backtrace"] }
 bcs.workspace = true
diff --git a/sui-execution/v2/sui-adapter/src/adapter.rs b/sui-execution/v2/sui-adapter/src/adapter.rs
index d8d0d1bfbc7d7..b7f6ccfb3e04c 100644
--- a/sui-execution/v2/sui-adapter/src/adapter.rs
+++ b/sui-execution/v2/sui-adapter/src/adapter.rs
@@ -70,6 +70,8 @@ mod checked {
                 // Don't augment errors with execution state on-chain
                 error_execution_state: false,
                 binary_config: to_binary_config(protocol_config),
+                rethrow_serialization_type_layout_errors: protocol_config
+                    .rethrow_serialization_type_layout_errors(),
             },
         )
         .map_err(|_| SuiError::ExecutionInvariantViolation)
diff --git a/sui-execution/v2/sui-move-natives/src/crypto/group_ops.rs b/sui-execution/v2/sui-move-natives/src/crypto/group_ops.rs
index 54cc84f55be48..8f1e459486371 100644
--- a/sui-execution/v2/sui-move-natives/src/crypto/group_ops.rs
+++ b/sui-execution/v2/sui-move-natives/src/crypto/group_ops.rs
@@ -563,8 +563,8 @@ fn multi_scalar_mul<G, const SCALAR_SIZE: usize, const POINT_SIZE: usize>(
     base_cost: Option<InternalGas>,
     base_cost_per_addition: Option<InternalGas>,
     max_len: u32,
-    scalars: &Vec<u8>,
-    points: &Vec<u8>,
+    scalars: &[u8],
+    points: &[u8],
 ) -> PartialVMResult<NativeResult>
 where
     G: GroupElement
diff --git a/sui-execution/v2/sui-move-natives/src/lib.rs b/sui-execution/v2/sui-move-natives/src/lib.rs
index 34c693ecbc3e3..d4147e52d11d2 100644
--- a/sui-execution/v2/sui-move-natives/src/lib.rs
+++ b/sui-execution/v2/sui-move-natives/src/lib.rs
@@ -917,7 +917,7 @@ pub fn get_object_id(object: Value) -> Result<Value, PartialVMError> {
     get_nested_struct_field(object, &[0, 0, 0])
 }
 
-// Extract a field valye that's nested inside value `v`. The offset of each nesting
+// Extract a field value that's nested inside value `v`. The offset of each nesting
 // is determined by `offsets`.
 pub fn get_nested_struct_field(mut v: Value, offsets: &[usize]) -> Result<Value, PartialVMError> {
     for offset in offsets {
diff --git a/sui-execution/v2/sui-verifier/src/entry_points_verifier.rs b/sui-execution/v2/sui-verifier/src/entry_points_verifier.rs
index 9785762cf5581..6e17dba9ffa3b 100644
--- a/sui-execution/v2/sui-verifier/src/entry_points_verifier.rs
+++ b/sui-execution/v2/sui-verifier/src/entry_points_verifier.rs
@@ -29,7 +29,7 @@ use crate::{verification_failure, INIT_FN_NAME};
 /// - The function can have at most two parameters:
 ///   - mandatory &mut TxContext or &TxContext (see `is_tx_context`) in the last position
 ///   - optional one-time witness type (see one_time_witness verifier pass) passed by value in the first
-///   position
+///     position
 ///
 /// For transaction entry points
 /// - The function must have `is_entry` true
diff --git a/sui_programmability/examples/README.md b/sui_programmability/examples/README.md
deleted file mode 100644
index b2601469571c6..0000000000000
--- a/sui_programmability/examples/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
->[!IMPORTANT]
-> These examples have moved! **Find the latest versions in the [examples](../../examples) directory** which contains up-to-date [Move](../../examples/move) and end-to-end examples!