diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 84f486156..08aa21a9c 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -231,50 +231,51 @@ jobs:
           fi
           make CERAMIC_ONE_IMAGE_TAG="${{ needs.build.outputs.image_tag }}"  TEST_SELECTOR="$test_selector" HERMETIC_CMD=../bin/hermetic-driver hermetic-tests
 
-  run-migration-tests:
-    name: Run Migration Tests
-    runs-on: ubuntu-latest
-    environment: tnet-prod-2024
-    needs:
-      - build-driver
-      - publish-suite
-      - generate-matrix #Needed to know the BUILD_TAG
-      - build
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3
-      -
-        name: Setup GKE auth
-        uses: 'google-github-actions/auth@v1'
-        with:
-          credentials_json: ${{ secrets.GKE_SA_KEY }}
-      -
-        name: Get GKE credentials
-        uses: 'google-github-actions/get-gke-credentials@v1'
-        with:
-          cluster_name: ${{ vars.GKE_CLUSTER }}
-          location: ${{ vars.GKE_ZONE }}
-      - uses: actions/download-artifact@master
-        with:
-          name: hermetic-driver
-          path: ./bin
-      -
-        name: Test migration ${{ matrix.networks }}
-        run: |
-          set -euxo pipefail
-          cd tests
-          export BUILD_TAG=${{ needs.generate-matrix.outputs.build_tag }}
-          TEST_NETWORK=./migration-networks/basic-go-rust-post.yaml
-          chmod +x ../bin/hermetic-driver
-
-          make CERAMIC_ONE_IMAGE_TAG="${{ needs.build.outputs.image_tag }}" HERMETIC_CMD=../bin/hermetic-driver migration-tests
+#  run-migration-tests:
+#    name: Run Migration Tests
+#    runs-on: ubuntu-latest
+#    environment: tnet-prod-2024
+#    needs:
+#      - build-driver
+#      - publish-suite
+#      - generate-matrix #Needed to know the BUILD_TAG
+#      - build
+#    steps:
+#      -
+#        name: Checkout
+#        uses: actions/checkout@v3
+#      -
+#        name: Setup GKE auth
+#        uses: 'google-github-actions/auth@v1'
+#        with:
+#          credentials_json: ${{ secrets.GKE_SA_KEY }}
+#      -
+#        name: Get GKE credentials
+#        uses: 'google-github-actions/get-gke-credentials@v1'
+#        with:
+#          cluster_name: ${{ vars.GKE_CLUSTER }}
+#          location: ${{ vars.GKE_ZONE }}
+#      - uses: actions/download-artifact@master
+#        with:
+#          name: hermetic-driver
+#          path: ./bin
+#      -
+#        name: Test migration ${{ matrix.networks }}
+#        run: |
+#          set -euxo pipefail
+#          cd tests
+#          export BUILD_TAG=${{ needs.generate-matrix.outputs.build_tag }}
+#          TEST_NETWORK=./migration-networks/basic-go-rust-post.yaml
+#          chmod +x ../bin/hermetic-driver
+#
+#          make CERAMIC_ONE_IMAGE_TAG="${{ needs.build.outputs.image_tag }}" HERMETIC_CMD=../bin/hermetic-driver migration-tests
 
   integration-test-results:
     name: Hermetic Test Results
     if: ${{ always() }}
     runs-on: ubuntu-latest
-    needs: [run-integration-tests, run-migration-tests]
+#    needs: [run-integration-tests, run-migration-tests]
+    needs: [run-integration-tests]
     steps:
       - run: exit 1
         # see https://stackoverflow.com/a/67532120/4907315
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 70712debc..6c99e66df 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -15,6 +15,18 @@ Using the makefile is not necessary during your development cycle, feel free to
 
 However running `make` before publishing a PR will provide a good signal if you PR will pass CI.
 
+### Migrations
+
+If you need to add to the sqlite database schema, you will need to add a migration using the sqlx CLI. 
+
+```sh
+cargo install sqlx-cli
+# use the name of the migration and the source directory
+sqlx migrate add -r "chain_proof" --source ./migrations/sqlite
+```
+
+After the up and down files are generated, write the apply/revert SQL in the up/down files. This will be applied automatically at startup.
+
 ### Testing Specific Changes
 
 The above `make` targets test changes as a whole.
diff --git a/Cargo.lock b/Cargo.lock
index f0d240e04..bc64e16d8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -75,7 +75,7 @@ dependencies = [
  "once_cell",
  "serde",
  "version_check",
- "zerocopy",
+ "zerocopy 0.7.35",
 ]
 
 [[package]]
@@ -110,9 +110,9 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
 
 [[package]]
 name = "alloy"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f18703431261fdb54ca49eb949aa1bb8fcb436cf7c1283a0fbbc3d3cd9fadd7"
+checksum = "056f2c01b2aed86e15b43c47d109bfc8b82553dc34e66452875e51247ec31ab2"
 dependencies = [
  "alloy-consensus",
  "alloy-core",
@@ -129,19 +129,20 @@ dependencies = [
 
 [[package]]
 name = "alloy-chains"
-version = "0.1.34"
+version = "0.1.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8158b4878c67837e5413721cc44298e6a2d88d39203175ea025e51892a16ba4c"
+checksum = "28e2652684758b0d9b389d248b209ed9fd9989ef489a550265fe4bb8454fe7eb"
 dependencies = [
+ "alloy-primitives",
  "num_enum 0.7.3",
- "strum",
+ "strum 0.27.1",
 ]
 
 [[package]]
 name = "alloy-consensus"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "089cd553dc0b372831f3ce871a31921ba8a851ddd51f312a89fb987a00fb6e2c"
+checksum = "705687d5bfd019fee57cf9e206b27b30a9a9617535d5590a02b171e813208f8e"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -155,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-core"
-version = "0.8.5"
+version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ce854562e7cafd5049189d0268d6e5cba05fe6c9cb7c6f8126a79b94800629c"
+checksum = "9d8bcce99ad10fe02640cfaec1c6bc809b837c783c1d52906aa5af66e2a196f6"
 dependencies = [
  "alloy-dyn-abi",
  "alloy-json-abi",
@@ -168,9 +169,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-dyn-abi"
-version = "0.8.5"
+version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b499852e1d0e9b8c6db0f24c48998e647c0d5762a01090f955106a7700e4611"
+checksum = "eb8e762aefd39a397ff485bc86df673465c4ad3ec8819cc60833a8a3ba5cdc87"
 dependencies = [
  "alloy-json-abi",
  "alloy-primitives",
@@ -180,7 +181,7 @@ dependencies = [
  "itoa",
  "serde",
  "serde_json",
- "winnow 0.6.20",
+ "winnow 0.7.6",
 ]
 
 [[package]]
@@ -208,9 +209,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-eips"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdfe755025743aa133536db98904e6e4b5481c5b2ec864ff56b5b516611a8d34"
+checksum = "6ffb906284a1e1f63c4607da2068c8197458a352d0b3e9796e67353d72a9be85"
 dependencies = [
  "alloy-eip2930",
  "alloy-eip7702",
@@ -226,9 +227,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-genesis"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cbb8b3851cf6e8cc81c697352b4120f34bda362aa279e59e670c3660efa9db0"
+checksum = "8429cf4554eed9b40feec7f4451113e76596086447550275e3def933faf47ce3"
 dependencies = [
  "alloy-primitives",
  "alloy-serde",
@@ -237,9 +238,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-json-abi"
-version = "0.8.5"
+version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a438d4486b5d525df3b3004188f9d5cd1d65cd30ecc41e5a3ccef6f6342e8af9"
+checksum = "fe6beff64ad0aa6ad1019a3db26fef565aefeb011736150ab73ed3366c3cfd1b"
 dependencies = [
  "alloy-primitives",
  "alloy-sol-type-parser",
@@ -249,9 +250,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-json-rpc"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e136f67d5921b150124e8a76573357005a4ae419ddfe4a2a2b96d21e3a67b9c4"
+checksum = "f8fa8a1a3c4cbd221f2b8e3693aeb328fca79a757fe556ed08e47bbbc2a70db7"
 dependencies = [
  "alloy-primitives",
  "alloy-sol-types",
@@ -263,9 +264,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-network"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7050e189311c607064b08383db700787f2ed49b8db4cd9b7e26f6f124729abac"
+checksum = "85fa23a6a9d612b52e402c995f2d582c25165ec03ac6edf64c861a76bc5b87cd"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -284,9 +285,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-network-primitives"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915a5f401d05d9d721ca18b0498956c8e771285b3ab211d0695c3c6e8b9121ea"
+checksum = "801492711d4392b2ccf5fc0bc69e299fa1aab15167d74dcaa9aab96a54f684bd"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -297,17 +298,17 @@ dependencies = [
 
 [[package]]
 name = "alloy-primitives"
-version = "0.8.5"
+version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "260d3ff3bff0bb84599f032a2f2c6828180b0ea0cd41fdaf44f39cef3ba41861"
+checksum = "8c77490fe91a0ce933a1f219029521f20fc28c2c0ca95d53fa4da9c00b8d9d4e"
 dependencies = [
  "alloy-rlp",
  "bytes 1.7.2",
  "cfg-if",
  "const-hex",
- "derive_more 1.0.0",
- "hashbrown 0.14.5",
- "hex-literal",
+ "derive_more 2.0.1",
+ "foldhash",
+ "hashbrown 0.15.2",
  "indexmap 2.7.1",
  "itoa",
  "k256 0.13.4",
@@ -324,9 +325,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-provider"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed3b9667c337d9d0fa25cb476f4d8af84aee8a25fbcccf9b1aa6d554306885e4"
+checksum = "fcfaa4ffec0af04e3555686b8aacbcdf7d13638133a0672749209069750f78a6"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -358,9 +359,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rlp"
-version = "0.3.8"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26154390b1d205a4a7ac7352aa2eb4f81f391399d4e2f546fb81a2f8bb383f62"
+checksum = "3d6c1d995bff8d011f7cd6c81820d51825e6e06d6db73914c1630ecf544d83d6"
 dependencies = [
  "alloy-rlp-derive",
  "arrayvec 0.7.6",
@@ -369,9 +370,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rlp-derive"
-version = "0.3.8"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d0f2d905ebd295e7effec65e5f6868d153936130ae718352771de3e7d03c75c"
+checksum = "a40e1ef334153322fd878d07e86af7a529bcb86b2439525920a88eba87bcf943"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -380,9 +381,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-client"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a86e548f0e92e2bcaafb0b3a8f4238384798dca780d69f3f1b1eb7ade2812924"
+checksum = "370143ed581aace6e663342d21d209c6b2e34ee6142f7d6675adb518deeaf0dc"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -402,9 +403,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7acf60f133ed3308e42ecff81b6ff76be2d4e2a14af2d537413267bcdccd1c49"
+checksum = "9ffc534b7919e18f35e3aa1f507b6f3d9d92ec298463a9f6beaac112809d8d06"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
@@ -414,9 +415,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-eth"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2f4ebadbae37cfd66c4912a56b1dde9573c2440533d43b90bf0c1740179ee4"
+checksum = "413f4aa3ccf2c3e4234a047c5fa4727916d7daf25a89f9b765df0ba09784fd87"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -433,9 +434,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-serde"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54e75aed754756184a2071b0a0f5680b76ae5aaf3faf8006b461811c4c2cac06"
+checksum = "9dff0ab1cdd43ca001e324dc27ee0e8606bd2161d6623c63e0e0b8c4dfc13600"
 dependencies = [
  "alloy-primitives",
  "serde",
@@ -444,9 +445,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-signer"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e204a603220a68d07796d9e12ebf3a6f701c5d26925be3d0d7962901d6e037e"
+checksum = "2fd4e0ad79c81a27ca659be5d176ca12399141659fef2bcbfdc848da478f4504"
 dependencies = [
  "alloy-primitives",
  "async-trait",
@@ -458,9 +459,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-sol-macro"
-version = "0.8.5"
+version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68e7f6e8fe5b443f82b3f1e15abfa191128f71569148428e49449d01f6f49e8b"
+checksum = "e10ae8e9a91d328ae954c22542415303919aabe976fe7a92eb06db1b68fd59f2"
 dependencies = [
  "alloy-sol-macro-expander",
  "alloy-sol-macro-input",
@@ -472,9 +473,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-sol-macro-expander"
-version = "0.8.5"
+version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b96ce28d2fde09abb6135f410c41fad670a3a770b6776869bd852f1df102e6f"
+checksum = "83ad5da86c127751bc607c174d6c9fe9b85ef0889a9ca0c641735d77d4f98f26"
 dependencies = [
  "alloy-sol-macro-input",
  "const-hex",
@@ -490,13 +491,14 @@ dependencies = [
 
 [[package]]
 name = "alloy-sol-macro-input"
-version = "0.8.5"
+version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "906746396a8296537745711630d9185746c0b50c033d5e9d18b0a6eba3d53f90"
+checksum = "ba3d30f0d3f9ba3b7686f3ff1de9ee312647aac705604417a2f40c604f409a9e"
 dependencies = [
  "const-hex",
  "dunce",
  "heck 0.5.0",
+ "macro-string",
  "proc-macro2",
  "quote",
  "syn 2.0.98",
@@ -505,19 +507,19 @@ dependencies = [
 
 [[package]]
 name = "alloy-sol-type-parser"
-version = "0.8.5"
+version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc85178909a49c8827ffccfc9103a7ce1767ae66a801b69bdc326913870bf8e6"
+checksum = "6d162f8524adfdfb0e4bd0505c734c985f3e2474eb022af32eef0d52a4f3935c"
 dependencies = [
  "serde",
- "winnow 0.6.20",
+ "winnow 0.7.6",
 ]
 
 [[package]]
 name = "alloy-sol-types"
-version = "0.8.5"
+version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d86a533ce22525969661b25dfe296c112d35eb6861f188fd284f8bd4bb3842ae"
+checksum = "d43d5e60466a440230c07761aa67671d4719d46f43be8ea6e7ed334d8db4a9ab"
 dependencies = [
  "alloy-json-abi",
  "alloy-primitives",
@@ -528,9 +530,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c68e829f89855f79d9635800cf8d0c23f7faaecdade1dc446716f27304dd08e"
+checksum = "2ac3e97dad3d31770db0fc89bd6a63b789fbae78963086733f960cf32c483904"
 dependencies = [
  "alloy-json-rpc",
  "base64 0.22.1",
@@ -547,9 +549,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-http"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91b27d8c6bed88f19e9c5da656cb9e5c69882d8ee8a457f0546ff12d89c766d1"
+checksum = "b367dcccada5b28987c2296717ee04b9a5637aacd78eacb1726ef211678b5212"
 dependencies = [
  "alloy-json-rpc",
  "alloy-transport",
@@ -1467,9 +1469,9 @@ dependencies = [
 
 [[package]]
 name = "auto_impl"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42"
+checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1852,9 +1854,9 @@ dependencies = [
 
 [[package]]
 name = "blst"
-version = "0.3.13"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4378725facc195f1a538864863f6de233b500a8862747e7f165078a419d5e874"
+checksum = "47c79a94619fade3c0b887670333513a67ac28a6a7e653eb260bf0d4103db38d"
 dependencies = [
  "cc",
  "glob",
@@ -1930,9 +1932,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "byte-slice-cast"
-version = "1.2.2"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
+checksum = "7575182f7272186991736b70173b0ea045398f984bf5ebbb3804736ce1330c9d"
 
 [[package]]
 name = "bytecount"
@@ -2087,9 +2089,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.24"
+version = "1.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938"
+checksum = "525046617d8376e3db1deffb079e91cef90a89fc3ca5c185bbf8c9ecdd15cd5c"
 dependencies = [
  "jobserver",
  "libc",
@@ -2316,6 +2318,7 @@ dependencies = [
 name = "ceramic-event-svc"
 version = "0.54.2"
 dependencies = [
+ "alloy",
  "anyhow",
  "async-trait",
  "bytes 1.7.2",
@@ -2336,19 +2339,23 @@ dependencies = [
  "ipld-core",
  "iroh-bitswap",
  "itertools 0.13.0",
+ "lru 0.10.1",
  "mockall",
  "multibase 0.9.1",
  "multihash 0.19.1",
  "multihash-codetable",
  "multihash-derive 0.9.0",
+ "once_cell",
  "paste",
  "prettytable-rs",
  "prometheus-client",
  "rand 0.8.5",
  "recon",
+ "reqwest 0.11.27",
  "serde",
  "serde_ipld_dagcbor",
  "sqlx",
+ "ssi",
  "test-log",
  "thiserror 1.0.64",
  "tmpdir",
@@ -2719,12 +2726,10 @@ dependencies = [
  "ed25519-dalek 2.1.1",
  "ipld-core",
  "k256 0.13.4",
- "lru 0.10.1",
  "multibase 0.9.1",
  "multihash-codetable",
  "once_cell",
  "p256 0.13.2",
- "reqwest 0.11.27",
  "serde",
  "serde_ipld_dagcbor",
  "serde_json",
@@ -2960,8 +2965,8 @@ version = "7.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7"
 dependencies = [
- "strum",
- "strum_macros",
+ "strum 0.26.3",
+ "strum_macros 0.26.4",
  "unicode-width",
 ]
 
@@ -3015,9 +3020,9 @@ dependencies = [
 
 [[package]]
 name = "const-hex"
-version = "1.13.1"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0121754e84117e65f9d90648ee6aa4882a6e63110307ab73967a4c5e7e69e586"
+checksum = "4b0485bab839b018a8f1723fc5391819fea5f8f0f32288ef8a735fd096b6160c"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -4147,7 +4152,16 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
 dependencies = [
- "derive_more-impl",
+ "derive_more-impl 1.0.0",
+]
+
+[[package]]
+name = "derive_more"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "093242cf7570c207c83073cf82f79706fe7b8317e98620a47d5be7c3d8497678"
+dependencies = [
+ "derive_more-impl 2.0.1",
 ]
 
 [[package]]
@@ -4162,6 +4176,18 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "derive_more-impl"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+ "unicode-xid",
+]
+
 [[package]]
 name = "did-method-key"
 version = "0.2.2"
@@ -4371,9 +4397,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.13.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 dependencies = [
  "serde",
 ]
@@ -4597,6 +4623,17 @@ dependencies = [
  "bytes 1.7.2",
 ]
 
+[[package]]
+name = "fastrlp"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce8dba4714ef14b8274c371879b175aa55b16b30f269663f19d576f380018dc4"
+dependencies = [
+ "arrayvec 0.7.6",
+ "auto_impl",
+ "bytes 1.7.2",
+]
+
 [[package]]
 name = "ff"
 version = "0.12.1"
@@ -5208,7 +5245,6 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
  "ahash 0.8.11",
  "allocator-api2",
- "serde",
 ]
 
 [[package]]
@@ -5220,6 +5256,7 @@ dependencies = [
  "allocator-api2",
  "equivalent",
  "foldhash",
+ "serde",
 ]
 
 [[package]]
@@ -5289,12 +5326,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "hex-literal"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
-
 [[package]]
 name = "hex_fmt"
 version = "0.3.0"
@@ -5897,13 +5928,13 @@ dependencies = [
 
 [[package]]
 name = "impl-trait-for-tuples"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
+checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.98",
 ]
 
 [[package]]
@@ -7624,6 +7655,17 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "macro-string"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b27834086c65ec3f9387b096d66e99f221cf081c2b738042aa252bcd41204e3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "match_cfg"
 version = "0.1.0"
@@ -8312,12 +8354,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.1"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
-dependencies = [
- "portable-atomic",
-]
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "oorandom"
@@ -8737,12 +8776,12 @@ checksum = "b687ff7b5da449d39e418ad391e5e08da53ec334903ddbb921db208908fc372c"
 
 [[package]]
 name = "pest"
-version = "2.7.13"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdbef9d1d47087a895abd220ed25eb4ad973a5e26f6a4367b038c25e28dfc2d9"
+checksum = "198db74531d58c70a361c42201efde7e2591e976d518caf7662a47dc5720e7b6"
 dependencies = [
  "memchr",
- "thiserror 1.0.64",
+ "thiserror 2.0.11",
  "ucd-trie",
 ]
 
@@ -9033,7 +9072,7 @@ version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
 dependencies = [
- "zerocopy",
+ "zerocopy 0.7.35",
 ]
 
 [[package]]
@@ -9246,12 +9285,12 @@ dependencies = [
 
 [[package]]
 name = "proptest"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c2511913b88df1637da85cc8d96ec8e43a3f8bb8ccb71ee1ac240d6f3df58d"
+checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50"
 dependencies = [
- "bit-set 0.5.3",
- "bit-vec 0.6.3",
+ "bit-set 0.8.0",
+ "bit-vec 0.8.0",
  "bitflags 2.6.0",
  "lazy_static",
  "num-traits",
@@ -9609,6 +9648,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "rand"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
+dependencies = [
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.3",
+ "zerocopy 0.8.24",
+]
+
 [[package]]
 name = "rand_chacha"
 version = "0.2.2"
@@ -9629,6 +9679,16 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.9.3",
+]
+
 [[package]]
 name = "rand_core"
 version = "0.5.1"
@@ -9647,6 +9707,15 @@ dependencies = [
  "getrandom 0.2.15",
 ]
 
+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+dependencies = [
+ "getrandom 0.3.1",
+]
+
 [[package]]
 name = "rand_hc"
 version = "0.2.0"
@@ -10136,21 +10205,24 @@ dependencies = [
 
 [[package]]
 name = "ruint"
-version = "1.12.3"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c3cc4c2511671f327125da14133d0c5c5d137f006a1017a16f557bc85b16286"
+checksum = "78a46eb779843b2c4f21fac5773e25d6d5b7c8f0922876c91541790d2ca27eef"
 dependencies = [
  "alloy-rlp",
  "ark-ff 0.3.0",
  "ark-ff 0.4.2",
  "bytes 1.7.2",
- "fastrlp",
+ "fastrlp 0.3.1",
+ "fastrlp 0.4.0",
  "num-bigint",
+ "num-integer",
  "num-traits",
  "parity-scale-codec",
  "primitive-types 0.12.2",
  "proptest",
  "rand 0.8.5",
+ "rand 0.9.0",
  "rlp",
  "ruint-macro",
  "serde",
@@ -10172,9 +10244,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustc-hex"
@@ -10528,9 +10600,9 @@ dependencies = [
 
 [[package]]
 name = "semver-parser"
-version = "0.10.2"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
+checksum = "9900206b54a3527fdc7b8a938bffd94a568bac4f4aa8113b209df75a09c0dec2"
 dependencies = [
  "pest",
 ]
@@ -11785,8 +11857,14 @@ name = "strum"
 version = "0.26.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
+
+[[package]]
+name = "strum"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f64def088c51c9510a8579e3c5d67c65349dcf755e5479ad3d010aa6454e2c32"
 dependencies = [
- "strum_macros",
+ "strum_macros 0.27.1",
 ]
 
 [[package]]
@@ -11802,6 +11880,19 @@ dependencies = [
  "syn 2.0.98",
 ]
 
+[[package]]
+name = "strum_macros"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "substrait"
 version = "0.52.3"
@@ -11877,9 +11968,9 @@ dependencies = [
 
 [[package]]
 name = "syn-solidity"
-version = "0.8.5"
+version = "0.8.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ab661c8148c2261222a4d641ad5477fd4bea79406a99056096a0b41b35617a5"
+checksum = "4560533fbd6914b94a8fb5cc803ed6801c3455668db3b810702c57612bac9412"
 dependencies = [
  "paste",
  "proc-macro2",
@@ -13000,9 +13091,9 @@ checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64"
 
 [[package]]
 name = "wait-timeout"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
+checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11"
 dependencies = [
  "libc",
 ]
@@ -13427,9 +13518,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.20"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
+checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10"
 dependencies = [
  "memchr",
 ]
@@ -13621,7 +13712,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
  "byteorder",
- "zerocopy-derive",
+ "zerocopy-derive 0.7.35",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879"
+dependencies = [
+ "zerocopy-derive 0.8.24",
 ]
 
 [[package]]
@@ -13635,6 +13735,17 @@ dependencies = [
  "syn 2.0.98",
 ]
 
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "zerofrom"
 version = "0.1.5"
diff --git a/Cargo.toml b/Cargo.toml
index 1619779f0..ced2b3a8a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -42,6 +42,7 @@ members = [
 #   e.g. anyhow's backtrace feature.
 
 ahash = "0.8"
+alloy = { version = "0.4", features = ["k256", "provider-http", "rpc-types"] }
 anyhow = { version = "1" }
 arrow = { version = "54", features = ["prettyprint"] }
 arrow-array = "54"
diff --git a/event-svc/Cargo.toml b/event-svc/Cargo.toml
index 321c641f8..6b1a6b929 100644
--- a/event-svc/Cargo.toml
+++ b/event-svc/Cargo.toml
@@ -8,6 +8,8 @@ repository.workspace = true
 publish = false
 
 [dependencies]
+# will probably need contract and signer-local features for self anchoring
+alloy.workspace = true
 anyhow.workspace = true
 async-trait.workspace = true
 bytes.workspace = true
@@ -29,10 +31,14 @@ itertools.workspace = true
 multihash-codetable.workspace = true
 multihash-derive.workspace = true
 multihash.workspace = true
+lru.workspace = true
+once_cell.workspace = true
 prometheus-client.workspace = true
 recon.workspace = true
+reqwest.workspace = true
 serde.workspace = true
 serde_ipld_dagcbor.workspace = true
+ssi.workspace = true
 sqlx.workspace = true
 thiserror.workspace = true
 tokio.workspace = true
diff --git a/validation/src/blockchain/eth_rpc/http.rs b/event-svc/src/blockchain/eth_rpc/http.rs
similarity index 96%
rename from validation/src/blockchain/eth_rpc/http.rs
rename to event-svc/src/blockchain/eth_rpc/http.rs
index 146b47a31..08a26b0a7 100644
--- a/validation/src/blockchain/eth_rpc/http.rs
+++ b/event-svc/src/blockchain/eth_rpc/http.rs
@@ -5,7 +5,9 @@ use std::{
     sync::{Arc, Mutex},
 };
 
-use crate::eth_rpc::{ChainInclusion, ChainInclusionProof, Error};
+use crate::eth_rpc::{
+    types::ChainProofMetadata, ChainInclusion, ChainInclusionProof, Error, Timestamp,
+};
 use alloy::{
     hex,
     primitives::{BlockHash, TxHash},
@@ -60,7 +62,6 @@ const BLOCK_CACHE_SIZE: usize = 50;
 
 type Result<T> = std::result::Result<T, Error>;
 
-#[derive(Debug)]
 /// Http client to interact with EIP chains
 pub struct HttpEthRpc {
     chain_id: caip2::ChainId,
@@ -195,11 +196,6 @@ fn get_root_cid_from_input(input: &str, tx_type: EthProofType) -> anyhow::Result
     }
 }
 
-/// Get the expected transaction hash for a given root CID (this is v1 proof type)
-fn expected_tx_hash(cid: Cid) -> anyhow::Result<TxHash> {
-    Ok(TxHash::from_str(&hex::encode(cid.hash().digest()))?)
-}
-
 #[async_trait::async_trait]
 impl ChainInclusion for HttpEthRpc {
     fn chain_id(&self) -> &caip2::ChainId {
@@ -209,7 +205,7 @@ impl ChainInclusion for HttpEthRpc {
     /// Get the block chain transaction if it exists with the block timestamp information
     async fn get_chain_inclusion_proof(&self, input: &AnchorProof) -> Result<ChainInclusionProof> {
         // transaction to blockHash, blockNumber, input
-        let tx_hash = expected_tx_hash(input.tx_hash())
+        let tx_hash = crate::blockchain::tx_hash_try_from_cid(input.tx_hash())
             .map_err(|e| Error::InvalidArgument(format!("invalid transaction hash: {}", e)))?;
         let tx_hash_res = match self.eth_transaction_by_hash(tx_hash).await? {
             Some(tx) => tx,
@@ -240,7 +236,8 @@ impl ChainInclusion for HttpEthRpc {
             trace!(?blk_hash_res, "blockByHash response");
             let tx_type = EthProofType::from_str(input.tx_type())
                 .map_err(|e| Error::InvalidProof(e.to_string()))?;
-            let root_cid = get_root_cid_from_input(&tx_hash_res.input.to_string(), tx_type)
+            let tx_input = tx_hash_res.input.to_string();
+            let root_cid = get_root_cid_from_input(&tx_input, tx_type)
                 .map_err(|e| Error::InvalidProof(e.to_string()))?;
 
             if let Some(threshold) = BLOCK_THRESHHOLDS.get(self.chain_id()) {
@@ -253,8 +250,14 @@ impl ChainInclusion for HttpEthRpc {
             }
 
             Ok(ChainInclusionProof {
-                timestamp: blk_hash_res.header.timestamp,
+                timestamp: Timestamp::from_unix_ts(blk_hash_res.header.timestamp),
+                block_hash: block_hash.to_string(),
                 root_cid,
+                metadata: ChainProofMetadata {
+                    chain_id: self.chain_id.clone(),
+                    tx_hash: tx_hash.to_string(),
+                    tx_input,
+                },
             })
         } else {
             Err(Error::TxNotMined {
diff --git a/event-svc/src/blockchain/eth_rpc/mod.rs b/event-svc/src/blockchain/eth_rpc/mod.rs
new file mode 100644
index 000000000..a8358032c
--- /dev/null
+++ b/event-svc/src/blockchain/eth_rpc/mod.rs
@@ -0,0 +1,8 @@
+mod http;
+mod types;
+
+pub use http::HttpEthRpc;
+pub use types::{
+    BlockHash, ChainInclusion, ChainInclusionProof, ChainProofMetadata, Error, EthProofType,
+    Timestamp, TxHash,
+};
diff --git a/validation/src/blockchain/eth_rpc/types.rs b/event-svc/src/blockchain/eth_rpc/types.rs
similarity index 85%
rename from validation/src/blockchain/eth_rpc/types.rs
rename to event-svc/src/blockchain/eth_rpc/types.rs
index af4963752..c2d86d65c 100644
--- a/validation/src/blockchain/eth_rpc/types.rs
+++ b/event-svc/src/blockchain/eth_rpc/types.rs
@@ -92,13 +92,44 @@ impl FromStr for EthProofType {
     }
 }
 
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+/// A timestamp that is able to provide seconds since the unix epoch
+pub struct Timestamp(u64);
+
+impl Timestamp {
+    /// Create a timestamp from a unix epoch timestamp
+    pub const fn from_unix_ts(ts: u64) -> Self {
+        Self(ts)
+    }
+
+    /// A unix epoch timestamp
+    pub fn as_unix_ts(&self) -> u64 {
+        self.0
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 /// A proof of time derived from state on the blockchain
 pub struct ChainInclusionProof {
     /// The timestamp the proof was recorded
-    pub timestamp: u64,
+    pub timestamp: Timestamp,
+    /// The block hash in hex form with '0x' prefix
+    pub block_hash: String,
     /// The root CID of the proof
     pub root_cid: Cid,
+    /// The metadata about the proof and where it's stored
+    pub metadata: ChainProofMetadata,
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+/// Metadata about the proof and where it's stored
+pub struct ChainProofMetadata {
+    /// Chain ID of the proof
+    pub chain_id: ssi::caip2::ChainId,
+    /// The transaction hash in hex form with '0x' prefix
+    pub tx_hash: String,
+    /// The transaction input in hex form with '0x' prefix
+    pub tx_input: String,
 }
 
 #[async_trait::async_trait]
diff --git a/event-svc/src/blockchain/mod.rs b/event-svc/src/blockchain/mod.rs
new file mode 100644
index 000000000..5e35e113c
--- /dev/null
+++ b/event-svc/src/blockchain/mod.rs
@@ -0,0 +1,12 @@
+use std::str::FromStr as _;
+
+use alloy::primitives::TxHash;
+use ceramic_core::Cid;
+
+/// The ethereum RPC provider module
+pub mod eth_rpc;
+
+/// Get the expected transaction hash for a given root CID (this is v1 proof type)
+pub(crate) fn tx_hash_try_from_cid(cid: Cid) -> anyhow::Result<TxHash> {
+    Ok(TxHash::from_str(&hex::encode(cid.hash().digest()))?)
+}
diff --git a/event-svc/src/event/service.rs b/event-svc/src/event/service.rs
index d6ca10f02..81729c7fd 100644
--- a/event-svc/src/event/service.rs
+++ b/event-svc/src/event/service.rs
@@ -12,7 +12,9 @@ use super::{
 };
 use async_trait::async_trait;
 use ceramic_core::{EventId, Network, NodeId, SerializeExt};
-use ceramic_pipeline::{ConclusionData, ConclusionEvent, ConclusionInit, ConclusionTime};
+use ceramic_pipeline::{
+    concluder::TimeProof, ConclusionData, ConclusionEvent, ConclusionInit, ConclusionTime,
+};
 use ceramic_sql::sqlite::SqlitePool;
 use cid::Cid;
 use futures::stream::BoxStream;
@@ -21,8 +23,8 @@ use itertools::Itertools;
 use recon::ReconItem;
 use tracing::{trace, warn};
 
-use crate::event::validator::ChainInclusionProvider;
-use crate::store::{EventAccess, EventInsertable, EventRowDelivered};
+use crate::store::{ChainProof, EventAccess, EventInsertable, EventRowDelivered};
+use crate::{blockchain::tx_hash_try_from_cid, event::validator::ChainInclusionProvider};
 use crate::{Error, Result};
 
 /// How many events to select at once to see if they've become deliverable when we have downtime
@@ -269,6 +271,7 @@ impl EventService {
             valid,
             unvalidated,
             invalid,
+            proofs,
         } = self
             .event_validator
             .validate_events(validation_requirement, to_validate)
@@ -279,6 +282,7 @@ impl EventService {
             valid,
             unvalidated,
             invalid: invalid_events,
+            proofs,
         })
     }
 
@@ -293,6 +297,7 @@ impl EventService {
             valid,
             unvalidated,
             mut invalid,
+            proofs,
         } = self.validate_events(items, validation_req.as_ref()).await?;
 
         let to_insert: Vec<EventInsertable> = valid
@@ -307,6 +312,14 @@ impl EventService {
             self.track_pending(unvalidated);
         }
 
+        // Someday, we may want to have the validation/proof inclusion logic have knowledge of the database and persist/read
+        // from it directly, rather than only keeping proofs in memory + RPC calls. But for now, it's simpler to persist everything once here
+        // and then the pipeline is able to read from this table and use the timestamps for conclusion events etc.
+        let proofs = proofs.into_iter().map(|p| p.into()).collect::<Vec<_>>();
+        self.event_access
+            .persist_chain_inclusion_proofs(&proofs)
+            .await?;
+
         let (new, existed) = self
             .persist_events(to_insert, deliverable_req, &mut invalid)
             .await?;
@@ -391,11 +404,20 @@ impl EventService {
 
         match event {
             ceramic_event::unvalidated::Event::Time(time_event) => {
+                let proof = self.get_chain_proof(&time_event).await?;
+
                 Ok(ConclusionEvent::Time(ConclusionTime {
                     event_cid,
                     init,
                     previous: vec![*time_event.prev()],
                     order: delivered as u64,
+                    time_proof: TimeProof {
+                        before: proof
+                            .timestamp
+                            .try_into()
+                            .expect("conclusion timestamp overflow"),
+                        chain_id: proof.chain_id,
+                    },
                 }))
             }
             ceramic_event::unvalidated::Event::Signed(signed_event) => {
@@ -518,6 +540,24 @@ impl EventService {
             Ok(())
         }
     }
+
+    /// This is a helper function to get the chain proof for a given event from the database, or throw an error if it
+    /// wasn't found.
+    async fn get_chain_proof(
+        &self,
+        event: &ceramic_event::unvalidated::TimeEvent,
+    ) -> Result<ChainProof> {
+        let tx_hash = event.proof().tx_hash();
+        let tx_hash = tx_hash_try_from_cid(tx_hash).unwrap().to_string();
+        let chain_proof = self
+            .event_access
+            .get_chain_proof(event.proof().chain_id(), &tx_hash)
+            .await
+            .map_err(|e| {
+                Error::new_app(anyhow::anyhow!("Failed to discover chain proof: {:?}", e))
+            })?;
+        Ok(chain_proof)
+    }
 }
 
 // Small wrapper container around the data field to hold other mutable metadata for the
@@ -574,6 +614,8 @@ pub enum ValidationError {
         key: EventId,
         reason: String,
     },
+    // TODO: Add 'Soft error' -> should not kill recon conversation but should not be persisted.
+    // e.g. A time event could not be validated because no RPC provider was available.
 }
 
 #[derive(Debug, PartialEq, Eq, Default)]
diff --git a/event-svc/src/event/validator/event.rs b/event-svc/src/event/validator/event.rs
index d5dfb91d2..7eeb8ffe2 100644
--- a/event-svc/src/event/validator/event.rs
+++ b/event-svc/src/event/validator/event.rs
@@ -2,23 +2,23 @@ use std::sync::Arc;
 
 use ceramic_core::{Cid, EventId, NodeId};
 use ceramic_event::unvalidated;
-use ceramic_validation::eth_rpc;
 use ipld_core::ipld::Ipld;
 use recon::ReconItem;
 use tokio::try_join;
 
-use crate::event::validator::ChainInclusionProvider;
-use crate::store::EventAccess;
 use crate::{
+    blockchain::eth_rpc,
+    eth_rpc::ChainInclusionProof,
     event::{
         service::{ValidationError, ValidationRequirement},
         validator::{
             grouped::{GroupedEvents, SignedValidationBatch, TimeValidationBatch},
             signed::SignedEventValidator,
             time::TimeEventValidator,
+            ChainInclusionProvider,
         },
     },
-    store::EventInsertable,
+    store::{EventAccess, EventInsertable},
     Result,
 };
 
@@ -31,6 +31,8 @@ pub struct ValidatedEvents {
     pub unvalidated: Vec<UnvalidatedEvent>,
     /// Events that failed validation
     pub invalid: Vec<ValidationError>,
+    /// The proofs for the validated time events that can be stored for future time stamping
+    pub proofs: Vec<ChainInclusionProof>,
 }
 
 #[derive(Debug)]
@@ -107,6 +109,7 @@ impl ValidatedEvents {
             valid: Vec::with_capacity(valid),
             unvalidated: Vec::with_capacity(valid / 4),
             invalid: Vec::new(),
+            proofs: Vec::new(),
         }
     }
 
@@ -114,6 +117,7 @@ impl ValidatedEvents {
         self.valid.extend(other.valid);
         self.invalid.extend(other.invalid);
         self.unvalidated.extend(other.unvalidated);
+        self.proofs.extend(other.proofs);
     }
 }
 
@@ -124,7 +128,7 @@ pub struct EventValidator {
     /// It contains the ethereum RPC providers and lives for the live of the [`EventValidator`].
     /// The [`SignedEventValidator`] is currently constructed on a per validation request basis
     /// as it caches and drops events per batch.
-    time_event_verifier: TimeEventValidator,
+    time_event_validator: TimeEventValidator,
 }
 
 impl EventValidator {
@@ -133,41 +137,30 @@ impl EventValidator {
         event_access: Arc<EventAccess>,
         ethereum_rpc_providers: Vec<ChainInclusionProvider>,
     ) -> Result<Self> {
-        let time_event_verifier = TimeEventValidator::new_with_providers(ethereum_rpc_providers);
+        let time_event_validator = TimeEventValidator::new_with_providers(ethereum_rpc_providers);
 
         Ok(Self {
             event_access,
-            time_event_verifier,
+            time_event_validator,
         })
     }
 
     /// Validates the events with the given validation requirement
-    /// If the [`ValidationRequirement`] is None, it just returns every event as valid
+    /// Regardless of the validation requirement, time events are always validated.
+    /// If the [`ValidationRequirement`] is None, it just returns every data event as valid.
     pub(crate) async fn validate_events(
         &self,
         validation_req: Option<&ValidationRequirement>,
         parsed_events: Vec<UnvalidatedEvent>,
     ) -> Result<ValidatedEvents> {
-        let validation_req = if let Some(req) = validation_req {
-            req
-        } else {
-            // we don't validate so we just return done
-            return Ok(ValidatedEvents {
-                valid: parsed_events
-                    .into_iter()
-                    .map(ValidatedEvent::from_unvalidated_unchecked)
-                    .collect(),
-                unvalidated: Vec::new(),
-                invalid: Vec::new(),
-            });
-        };
-
         let mut validated = ValidatedEvents::new_with_expected_valid(parsed_events.len());
-        // partition the events by type of validation needed and delegate to validators
+
+        // Partition the events by type of validation needed and delegate to validators
         let grouped = GroupedEvents::from(parsed_events);
 
         let (validated_signed, validated_time) = try_join!(
             self.validate_signed_events(grouped.signed_batch, validation_req),
+            // Time events are always validated
             self.validate_time_events(grouped.time_batch)
         )?;
         validated.extend_with(validated_signed);
@@ -183,23 +176,33 @@ impl EventValidator {
     async fn validate_signed_events(
         &self,
         events: SignedValidationBatch,
-        validation_req: &ValidationRequirement,
+        validation_req: Option<&ValidationRequirement>,
     ) -> Result<ValidatedEvents> {
-        let opts = if validation_req.check_exp {
-            ceramic_validation::VerifyJwsOpts::default()
+        if let Some(req) = validation_req {
+            let opts = if req.check_exp {
+                ceramic_validation::VerifyJwsOpts::default()
+            } else {
+                ceramic_validation::VerifyJwsOpts {
+                    at_time: ceramic_validation::AtTime::SkipTimeChecks,
+                    ..Default::default()
+                }
+            };
+            SignedEventValidator::validate_events(
+                Arc::clone(&self.event_access),
+                &opts,
+                events,
+                req.require_local_init,
+            )
+            .await
         } else {
-            ceramic_validation::VerifyJwsOpts {
-                at_time: ceramic_validation::AtTime::SkipTimeChecks,
-                ..Default::default()
-            }
-        };
-        SignedEventValidator::validate_events(
-            Arc::clone(&self.event_access),
-            &opts,
-            events,
-            validation_req.require_local_init,
-        )
-        .await
+            // If no validation requirement is specified, we assume all events are valid.
+            Ok(ValidatedEvents {
+                valid: events.into(),
+                unvalidated: Vec::new(),
+                invalid: Vec::new(),
+                proofs: Vec::new(),
+            })
+        }
     }
 
     async fn validate_time_events(&self, events: TimeValidationBatch) -> Result<ValidatedEvents> {
@@ -207,12 +210,12 @@ impl EventValidator {
         for time_event in events.0 {
             // TODO: better transient error handling from RPC client
             match self
-                .time_event_verifier
+                .time_event_validator
                 .validate_chain_inclusion(time_event.as_time())
                 .await
             {
-                Ok(_t) => {
-                    // TODO(AES-345): Someday, we will use `t.as_unix_ts()` and care about the actual timestamp, but for now we just consider it valid
+                Ok(t) => {
+                    validated_events.proofs.push(t);
                     validated_events.valid.push(time_event.into());
                 }
                 Err(err) => {
diff --git a/event-svc/src/event/validator/grouped.rs b/event-svc/src/event/validator/grouped.rs
index 846adfd20..7618f456f 100644
--- a/event-svc/src/event/validator/grouped.rs
+++ b/event-svc/src/event/validator/grouped.rs
@@ -104,11 +104,22 @@ pub struct TimeValidationBatch(pub(crate) Vec<Time>);
 
 #[derive(Debug)]
 pub struct SignedValidationBatch {
-    pub data: Vec<SignedData>,
-    pub init: Vec<SignedInit>,
+    pub(crate) data: Vec<SignedData>,
+    pub(crate) init: Vec<SignedInit>,
     /// Possibly needed to verify data event controllers as these
     /// don't yet exist on disk, but the signatures aren't checked.
-    pub unsigned: Vec<Unsigned>,
+    pub(crate) unsigned: Vec<Unsigned>,
+}
+
+impl From<SignedValidationBatch> for Vec<ValidatedEvent> {
+    fn from(value: SignedValidationBatch) -> Self {
+        let mut events =
+            Vec::with_capacity(value.data.len() + value.init.len() + value.unsigned.len());
+        events.extend(value.data.into_iter().map(Into::into));
+        events.extend(value.init.into_iter().map(Into::into));
+        events.extend(value.unsigned.into_iter().map(Into::into));
+        events
+    }
 }
 
 impl From<Vec<UnvalidatedEvent>> for GroupedEvents {
diff --git a/event-svc/src/event/validator/time.rs b/event-svc/src/event/validator/time.rs
index 3ebacc043..4d76ecd65 100644
--- a/event-svc/src/event/validator/time.rs
+++ b/event-svc/src/event/validator/time.rs
@@ -5,18 +5,10 @@ use ceramic_core::ssi::caip2;
 use ceramic_event::unvalidated;
 use tracing::warn;
 
-use ceramic_validation::eth_rpc::{self, ChainInclusion, HttpEthRpc};
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Timestamp(u64);
-
-impl Timestamp {
-    /// A unix epoch timestamp
-    #[allow(dead_code)]
-    pub fn as_unix_ts(&self) -> u64 {
-        self.0
-    }
-}
+use crate::{
+    blockchain::eth_rpc::{self, ChainInclusion, HttpEthRpc},
+    eth_rpc::ChainInclusionProof,
+};
 
 /// Provider for validating chain inclusion of an AnchorProof on a remote blockchain.
 pub type ChainInclusionProvider = Arc<dyn ChainInclusion + Send + Sync>;
@@ -25,6 +17,7 @@ pub struct TimeEventValidator {
     /// we could support multiple providers for each chain (to get around rate limits)
     /// but we'll just force people to run a light client if they really need the throughput
     chain_providers: HashMap<caip2::ChainId, ChainInclusionProvider>,
+    // TODO: add a sql connection / block table access
 }
 
 impl std::fmt::Debug for TimeEventValidator {
@@ -83,7 +76,7 @@ impl TimeEventValidator {
     pub async fn validate_chain_inclusion(
         &self,
         event: &unvalidated::TimeEvent,
-    ) -> Result<Timestamp, eth_rpc::Error> {
+    ) -> Result<ChainInclusionProof, eth_rpc::Error> {
         let chain_id = caip2::ChainId::from_str(event.proof().chain_id())
             .map_err(|e| eth_rpc::Error::InvalidArgument(format!("invalid chain ID: {}", e)))?;
 
@@ -104,14 +97,17 @@ impl TimeEventValidator {
             )));
         }
 
-        Ok(Timestamp(chain_proof.timestamp))
+        Ok(chain_proof)
     }
 }
 
 #[cfg(test)]
 mod test {
+    use crate::{
+        blockchain::eth_rpc,
+        eth_rpc::{ChainProofMetadata, Timestamp},
+    };
     use ceramic_event::unvalidated;
-    use ceramic_validation::eth_rpc;
     use cid::Cid;
     use ipld_core::ipld::Ipld;
     use mockall::{mock, predicate};
@@ -119,7 +115,7 @@ mod test {
 
     use super::*;
 
-    const BLOCK_TIMESTAMP: u64 = 1725913338;
+    const BLOCK_TIMESTAMP: Timestamp = Timestamp::from_unix_ts(1725913338);
 
     fn time_event_single_event_batch() -> unvalidated::TimeEvent {
         unvalidated::Builder::time()
@@ -255,10 +251,13 @@ mod test {
         root_cid: Cid,
     ) -> TimeEventValidator {
         let mut mock_provider = MockEthRpcProviderTest::new();
-        let chain =
+        let chain_id =
             caip2::ChainId::from_str("eip155:11155111").expect("eip155:11155111 is a valid chain");
 
-        mock_provider.expect_chain_id().once().return_const(chain);
+        mock_provider
+            .expect_chain_id()
+            .once()
+            .return_const(chain_id.clone());
         mock_provider
             .expect_get_chain_inclusion_proof()
             .once()
@@ -267,6 +266,12 @@ mod test {
                 Ok(eth_rpc::ChainInclusionProof {
                     timestamp: BLOCK_TIMESTAMP,
                     root_cid,
+                    block_hash: "0x0".to_string(),
+                    metadata: ChainProofMetadata {
+                        chain_id: chain_id,
+                        tx_hash: "0x0".to_string(),
+                        tx_input: "0x0".to_string(),
+                    },
                 })
             });
         TimeEventValidator::new_with_providers(vec![Arc::new(mock_provider)])
@@ -278,8 +283,8 @@ mod test {
         let verifier = get_mock_provider(event.proof().clone(), event.proof().root()).await;
 
         match verifier.validate_chain_inclusion(&event).await {
-            Ok(ts) => {
-                assert_eq!(ts.as_unix_ts(), BLOCK_TIMESTAMP);
+            Ok(proof) => {
+                assert_eq!(proof.timestamp, BLOCK_TIMESTAMP);
             }
             Err(e) => panic!("should have passed: {:?}", e),
         }
@@ -314,7 +319,7 @@ mod test {
 
         match verifier.validate_chain_inclusion(&event).await {
             Ok(ts) => {
-                assert_eq!(ts.as_unix_ts(), BLOCK_TIMESTAMP);
+                assert_eq!(ts.timestamp, BLOCK_TIMESTAMP);
             }
             Err(e) => panic!("should have passed: {:?}", e),
         }
diff --git a/event-svc/src/lib.rs b/event-svc/src/lib.rs
index 8d564111e..5b46ce3bc 100644
--- a/event-svc/src/lib.rs
+++ b/event-svc/src/lib.rs
@@ -1,13 +1,14 @@
 //! The Event Service provides an API for ingesting and querying Ceramic Events.
 #![warn(missing_docs)]
 
+mod blockchain;
 mod error;
 mod event;
 pub mod store;
 #[cfg(test)]
 mod tests;
 
-pub use ceramic_validation::eth_rpc;
+pub use blockchain::eth_rpc;
 pub use error::Error;
 pub use event::ChainInclusionProvider;
 pub use event::{BlockStore, EventService, UndeliveredEventReview};
diff --git a/event-svc/src/store/mod.rs b/event-svc/src/store/mod.rs
index fd68d407e..8331cb5a7 100644
--- a/event-svc/src/store/mod.rs
+++ b/event-svc/src/store/mod.rs
@@ -5,7 +5,7 @@ mod sql;
 
 pub use metrics::{Metrics, StoreMetricsMiddleware};
 pub use sql::{
-    entities::{BlockHash, EventBlockRaw, EventInsertable},
+    entities::{BlockHash, ChainProof, EventBlockRaw, EventInsertable},
     BlockAccess, Error, EventAccess, EventBlockAccess, EventRowDelivered, InsertResult,
     InsertedEvent, Result, SqlitePool, SqliteRootStore,
 };
diff --git a/event-svc/src/store/sql/access/event.rs b/event-svc/src/store/sql/access/event.rs
index 28d51ae08..5a1fc5e21 100644
--- a/event-svc/src/store/sql/access/event.rs
+++ b/event-svc/src/store/sql/access/event.rs
@@ -15,10 +15,10 @@ use recon::{AssociativeHash, HashCount, Key, Sha256a};
 use crate::store::{
     sql::{
         entities::{
-            rebuild_car, BlockRow, CountRow, EventInsertable, OrderKey, ReconEventBlockRaw,
-            ReconHash,
+            rebuild_car, BlockRow, ChainProof, CountRow, EventInsertable, OrderKey,
+            ReconEventBlockRaw, ReconHash,
         },
-        query::{EventQuery, ReconQuery, SqlBackend},
+        query::{ChainProofQuery, EventQuery, ReconQuery, SqlBackend},
     },
     BlockAccess, Error, EventBlockAccess, Result,
 };
@@ -573,4 +573,37 @@ impl EventAccess {
             .collect::<Result<Vec<AnchorRequest>>>()?;
         Ok(rows)
     }
+
+    /// Persist chain inclusion proofs
+    pub async fn persist_chain_inclusion_proofs(&self, proofs: &[ChainProof]) -> Result<()> {
+        let mut tx = self.pool.writer().begin().await?;
+        for proof in proofs {
+            sqlx::query(ChainProofQuery::upsert_timestamp())
+                .bind(&proof.chain_id)
+                .bind(&proof.block_hash)
+                .bind(proof.timestamp)
+                .execute(&mut *tx)
+                .await?;
+
+            sqlx::query(ChainProofQuery::upsert_proof())
+                .bind(&proof.chain_id)
+                .bind(&proof.block_hash)
+                .bind(&proof.transaction_hash)
+                .bind(&proof.transaction_input)
+                .execute(&mut *tx)
+                .await?;
+        }
+        tx.commit().await?;
+        Ok(())
+    }
+
+    /// Get chain inclusion proof for a transaction hash
+    pub async fn get_chain_proof(&self, chain_id: &str, tx_hash: &str) -> Result<ChainProof> {
+        let row: ChainProof = sqlx::query_as(ChainProofQuery::by_chain_id_and_tx_hash())
+            .bind(chain_id)
+            .bind(tx_hash)
+            .fetch_one(self.pool.reader())
+            .await?;
+        Ok(row)
+    }
 }
diff --git a/event-svc/src/store/sql/entities/chain_proof.rs b/event-svc/src/store/sql/entities/chain_proof.rs
new file mode 100644
index 000000000..127e750b8
--- /dev/null
+++ b/event-svc/src/store/sql/entities/chain_proof.rs
@@ -0,0 +1,33 @@
+use crate::eth_rpc;
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash, sqlx::FromRow)]
+/// A chain inclusion proof stored in the database
+/// Unique by chain_id and transaction_hash
+pub struct ChainProof {
+    /// The chain ID of the proof
+    pub chain_id: String,
+    /// The transaction hash of the proof
+    pub transaction_hash: String,
+    /// The transaction input of the proof (i.e. the CID of the root of the Merkle tree being anchored)
+    pub transaction_input: String,
+    /// The block hash of the proof
+    pub block_hash: String,
+    /// The timestamp of the proof
+    pub timestamp: i64,
+}
+
+impl From<eth_rpc::ChainInclusionProof> for ChainProof {
+    fn from(value: eth_rpc::ChainInclusionProof) -> Self {
+        Self {
+            chain_id: value.metadata.chain_id.to_string(),
+            block_hash: value.block_hash,
+            transaction_hash: value.metadata.tx_hash,
+            transaction_input: value.metadata.tx_input,
+            timestamp: value
+                .timestamp
+                .as_unix_ts()
+                .try_into()
+                .expect("chain proof timestamp overflow"),
+        }
+    }
+}
diff --git a/event-svc/src/store/sql/entities/mod.rs b/event-svc/src/store/sql/entities/mod.rs
index 059cee3b0..cc2a9a5f3 100644
--- a/event-svc/src/store/sql/entities/mod.rs
+++ b/event-svc/src/store/sql/entities/mod.rs
@@ -1,10 +1,12 @@
 mod block;
+mod chain_proof;
 mod event;
 mod event_block;
 mod hash;
 mod utils;
 
 pub use block::{BlockBytes, BlockRow};
+pub use chain_proof::ChainProof;
 pub use event::{rebuild_car, EventInsertable};
 pub use event_block::{EventBlockRaw, ReconEventBlockRaw};
 pub use hash::{BlockHash, ReconHash};
diff --git a/event-svc/src/store/sql/query.rs b/event-svc/src/store/sql/query.rs
index fddda2afb..b51ba3166 100644
--- a/event-svc/src/store/sql/query.rs
+++ b/event-svc/src/store/sql/query.rs
@@ -274,3 +274,68 @@ impl ReconQuery {
         }
     }
 }
+
+/// Represents access to the ceramic_one_chain_proof and ceramic_one_chain_timestamp tables
+/// In the future, transactions could be stored without block information, and retried until we discover something.
+/// For now, we only store the transaction when we discover the block information and timestamp.
+pub struct ChainProofQuery;
+
+impl ChainProofQuery {
+    /// Requires binding 3 parameters
+    ///     $1: chain_id
+    ///     $2: block_hash
+    ///     $3: timestamp
+    pub fn upsert_timestamp() -> &'static str {
+        r#"
+            INSERT INTO ceramic_one_chain_timestamp (
+                chain_id, block_hash, timestamp
+            ) VALUES (
+                $1, $2, $3
+            ) ON CONFLICT DO UPDATE SET timestamp = $3;
+        "#
+    }
+
+    /// Requires binding 4 parameters
+    ///     $1: chain_id
+    ///     $2: block_hash
+    ///     $3: transaction_hash
+    ///     $4: transaction_input
+    pub fn upsert_proof() -> &'static str {
+        r#"
+            INSERT INTO ceramic_one_chain_proof (
+                chain_id, block_hash, transaction_hash, transaction_input
+            ) VALUES (
+                $1, $2, $3, $4
+            ) ON CONFLICT DO UPDATE SET block_hash = $2;
+        "#
+    }
+
+    /// Requires binding 2 parameters
+    ///     $1: chain_id
+    ///     $2: transaction_hash
+    pub fn by_chain_id_and_tx_hash() -> &'static str {
+        r#"
+            SELECT 
+                p.chain_id,
+                p.transaction_hash,
+                p.transaction_input,
+                p.block_hash,
+                COALESCE(
+                    (SELECT t.timestamp 
+                     FROM ceramic_one_chain_timestamp t 
+                     WHERE t.chain_id = p.chain_id 
+                     AND t.block_hash = p.block_hash),
+                    NULL
+                ) as timestamp
+            FROM ceramic_one_chain_proof p
+            WHERE p.chain_id = $1 
+            AND p.transaction_hash = $2 
+            AND EXISTS (
+                SELECT 1
+                FROM ceramic_one_chain_timestamp t
+                WHERE t.chain_id = p.chain_id
+                AND t.block_hash = p.block_hash
+            )
+        "#
+    }
+}
diff --git a/event-svc/src/tests/event.rs b/event-svc/src/tests/event.rs
index f7ebbdf60..fd16c63bf 100644
--- a/event-svc/src/tests/event.rs
+++ b/event-svc/src/tests/event.rs
@@ -1,6 +1,6 @@
 use std::str::FromStr;
 
-use crate::{EventService, UndeliveredEventReview};
+use crate::{blockchain::tx_hash_try_from_cid, EventService, UndeliveredEventReview};
 use anyhow::Error;
 use bytes::Bytes;
 use ceramic_api::{ApiItem, EventService as ApiEventService};
@@ -661,11 +661,70 @@ where
     );
 }
 
+mockall::mock! {
+    #[derive(Debug)]
+    pub ChainInclusion {}
+    #[async_trait::async_trait]
+    impl crate::eth_rpc::ChainInclusion for ChainInclusion {
+        fn chain_id(&self) -> &ssi::caip2::ChainId;
+        async fn get_chain_inclusion_proof(
+            &self,
+            input: &unvalidated::AnchorProof,
+        ) -> Result<crate::eth_rpc::ChainInclusionProof, crate::eth_rpc::Error>;
+    }
+}
+
+pub fn get_mock_chain_provider(
+    chain_id: &str,
+    inputs: Vec<unvalidated::AnchorProof>,
+) -> Arc<dyn crate::eth_rpc::ChainInclusion + Send + Sync + 'static> {
+    let mut mock_provider = MockChainInclusion::new();
+    let chain_id = ssi::caip2::ChainId::from_str(chain_id).expect("valid chain");
+    mock_provider
+        .expect_chain_id()
+        .once()
+        .return_const(chain_id.clone());
+    for input in inputs {
+        let root_cid = input.root();
+        let chain_id = chain_id.clone();
+        mock_provider
+            .expect_get_chain_inclusion_proof()
+            .times(1)
+            .with(mockall::predicate::eq(input))
+            .returning(move |p| {
+                Ok(crate::eth_rpc::ChainInclusionProof {
+                    timestamp: crate::eth_rpc::Timestamp::from_unix_ts(1744383131980),
+                    root_cid,
+                    block_hash: format!("0xblock_hash{}", p.tx_hash().to_string()),
+                    metadata: crate::eth_rpc::ChainProofMetadata {
+                        chain_id: chain_id.clone(),
+                        tx_hash: tx_hash_try_from_cid(p.tx_hash()).unwrap().to_string(),
+                        tx_input: format!("0x{}{}", p.tx_type(), p.tx_hash().to_string()),
+                    },
+                })
+            });
+    }
+    Arc::new(mock_provider)
+}
+
 #[test(tokio::test)]
 async fn test_conclusion_events_since() -> Result<(), Box<dyn std::error::Error>> {
     let pool = SqlitePool::connect_in_memory().await?;
-    let service = EventService::try_new(pool, UndeliveredEventReview::Skip, false, vec![]).await?;
+
     let test_events = generate_chained_events().await;
+    let proofs: Vec<unvalidated::AnchorProof> = test_events
+        .iter()
+        .filter_map(|(_, e)| match e {
+            unvalidated::Event::Time(time_event) => Some(time_event.proof().clone()),
+            _ => None,
+        })
+        .collect();
+    let chain_provider = get_mock_chain_provider("test:chain", proofs);
+
+    let providers = vec![chain_provider];
+
+    let service =
+        EventService::try_new(pool, UndeliveredEventReview::Skip, false, providers).await?;
 
     ceramic_api::EventService::insert_many(
         &service,
@@ -686,36 +745,36 @@ async fn test_conclusion_events_since() -> Result<(), Box<dyn std::error::Error>
     let conclusion_events = service.conclusion_events_since(0, 6).await?;
 
     expect![[r#"
-        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------------------------+----------------------------------------------------------------------+
-        | index | event_type | stream_cid                                                    | stream_type | controller                                               | dimensions                                                                                                                                                                                                                                         | event_cid                                                     | data                                                              | previous                                                             |
-        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------------------------+----------------------------------------------------------------------+
-        | 1     | Data       | bagcqcerahx5i27vqxigdq3xulceu5qv6yzdvxzamfueubsyxam5kmjcpp45q | 3           | did:key:z6Mkk3rtfoKDMMG4zyarNGwCQs44GSQ49pcYKQspHJPXSnVw | [model: "ce0102015512204bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459a", controller: "6469643a6b65793a7a364d6b6b337274666f4b444d4d47347a7961724e4777435173343447535134397063594b517370484a5058536e5677", context: "", unique: ""] | bagcqcerahx5i27vqxigdq3xulceu5qv6yzdvxzamfueubsyxam5kmjcpp45q | {"metadata":{"shouldIndex":true},"content":null}                  | []                                                                   |
-        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------------------------+----------------------------------------------------------------------+
-        | 2     | Data       | bafyreihum3smvdc36yl2qnbl4gqv3nfxwdxj7v2zdozcrrqgmtc3zfhb7i   | 2           | did:key:z6Mkk3rtfoKDMMG4zyarNGwCQs44GSQ49pcYKQspHJPXSnVw | [model: "ce01040171710b0009686d6f64656c2d7631", controller: "6469643a6b65793a7a364d6b6b337274666f4b444d4d47347a7961724e4777435173343447535134397063594b517370484a5058536e5677", context: "", unique: ""]                                           | bafyreihum3smvdc36yl2qnbl4gqv3nfxwdxj7v2zdozcrrqgmtc3zfhb7i   | {"metadata":{"shouldIndex":true},"content":null}                  | []                                                                   |
-        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------------------------+----------------------------------------------------------------------+
-        | 3     | Data       | bafyreihum3smvdc36yl2qnbl4gqv3nfxwdxj7v2zdozcrrqgmtc3zfhb7i   | 2           | did:key:z6Mkk3rtfoKDMMG4zyarNGwCQs44GSQ49pcYKQspHJPXSnVw | [model: "ce01040171710b0009686d6f64656c2d7631", controller: "6469643a6b65793a7a364d6b6b337274666f4b444d4d47347a7961724e4777435173343447535134397063594b517370484a5058536e5677", context: "", unique: ""]                                           | bagcqcerarwe3qynbdke6u3gckhnbwzpxbg6ehov262cq5pbwxsc63kqkhlma | {"metadata":{"shouldIndex":false},"content":{"stream2":"data_1"}} | [Cid(bafyreihum3smvdc36yl2qnbl4gqv3nfxwdxj7v2zdozcrrqgmtc3zfhb7i)]   |
-        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------------------------+----------------------------------------------------------------------+
-        | 4     | Data       | bagcqcerahx5i27vqxigdq3xulceu5qv6yzdvxzamfueubsyxam5kmjcpp45q | 3           | did:key:z6Mkk3rtfoKDMMG4zyarNGwCQs44GSQ49pcYKQspHJPXSnVw | [model: "ce0102015512204bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459a", controller: "6469643a6b65793a7a364d6b6b337274666f4b444d4d47347a7961724e4777435173343447535134397063594b517370484a5058536e5677", context: "", unique: ""] | bagcqcerakug4jvwbhisuo4zlhzkinwfca2dbcv63ea7jan27zlwhzpxyrleq | {"metadata":{},"content":{"stream_1":"data_1"}}                   | [Cid(bagcqcerahx5i27vqxigdq3xulceu5qv6yzdvxzamfueubsyxam5kmjcpp45q)] |
-        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------------------------+----------------------------------------------------------------------+
-        | 5     | Time       | bafyreihum3smvdc36yl2qnbl4gqv3nfxwdxj7v2zdozcrrqgmtc3zfhb7i   | 2           | did:key:z6Mkk3rtfoKDMMG4zyarNGwCQs44GSQ49pcYKQspHJPXSnVw | [model: "ce01040171710b0009686d6f64656c2d7631", controller: "6469643a6b65793a7a364d6b6b337274666f4b444d4d47347a7961724e4777435173343447535134397063594b517370484a5058536e5677", context: "", unique: ""]                                           | bafyreicor5mbc2ioqiub6dixpedkmjvp22dehayay3bfpe65zlcmlfw4ga   |                                                                   | [Cid(bagcqcerarwe3qynbdke6u3gckhnbwzpxbg6ehov262cq5pbwxsc63kqkhlma)] |
-        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------------------------+----------------------------------------------------------------------+
-        | 6     | Data       | bagcqcerahx5i27vqxigdq3xulceu5qv6yzdvxzamfueubsyxam5kmjcpp45q | 3           | did:key:z6Mkk3rtfoKDMMG4zyarNGwCQs44GSQ49pcYKQspHJPXSnVw | [model: "ce0102015512204bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459a", controller: "6469643a6b65793a7a364d6b6b337274666f4b444d4d47347a7961724e4777435173343447535134397063594b517370484a5058536e5677", context: "", unique: ""] | bagcqceraccgbaicjznz45ov4wgc3wnr62zqwba24sxzreqerlzdklidysfdq | {"metadata":{},"content":{"stream_1":"data_2"}}                   | [Cid(bagcqcerakug4jvwbhisuo4zlhzkinwfca2dbcv63ea7jan27zlwhzpxyrleq)] |
-        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------------------------+----------------------------------------------------------------------+
+        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------------------------+----------------------------------------------------------------------+---------------+------------+
+        | index | event_type | stream_cid                                                    | stream_type | controller                                               | dimensions                                                                                                                                                                                                                                         | event_cid                                                     | data                                                              | previous                                                             | before        | chain_id   |
+        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------------------------+----------------------------------------------------------------------+---------------+------------+
+        | 1     | Data       | bagcqcerahx5i27vqxigdq3xulceu5qv6yzdvxzamfueubsyxam5kmjcpp45q | 3           | did:key:z6Mkk3rtfoKDMMG4zyarNGwCQs44GSQ49pcYKQspHJPXSnVw | [model: "ce0102015512204bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459a", controller: "6469643a6b65793a7a364d6b6b337274666f4b444d4d47347a7961724e4777435173343447535134397063594b517370484a5058536e5677", context: "", unique: ""] | bagcqcerahx5i27vqxigdq3xulceu5qv6yzdvxzamfueubsyxam5kmjcpp45q | {"metadata":{"shouldIndex":true},"content":null}                  | []                                                                   |               |            |
+        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------------------------+----------------------------------------------------------------------+---------------+------------+
+        | 2     | Data       | bafyreihum3smvdc36yl2qnbl4gqv3nfxwdxj7v2zdozcrrqgmtc3zfhb7i   | 2           | did:key:z6Mkk3rtfoKDMMG4zyarNGwCQs44GSQ49pcYKQspHJPXSnVw | [model: "ce01040171710b0009686d6f64656c2d7631", controller: "6469643a6b65793a7a364d6b6b337274666f4b444d4d47347a7961724e4777435173343447535134397063594b517370484a5058536e5677", context: "", unique: ""]                                           | bafyreihum3smvdc36yl2qnbl4gqv3nfxwdxj7v2zdozcrrqgmtc3zfhb7i   | {"metadata":{"shouldIndex":true},"content":null}                  | []                                                                   |               |            |
+        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------------------------+----------------------------------------------------------------------+---------------+------------+
+        | 3     | Data       | bafyreihum3smvdc36yl2qnbl4gqv3nfxwdxj7v2zdozcrrqgmtc3zfhb7i   | 2           | did:key:z6Mkk3rtfoKDMMG4zyarNGwCQs44GSQ49pcYKQspHJPXSnVw | [model: "ce01040171710b0009686d6f64656c2d7631", controller: "6469643a6b65793a7a364d6b6b337274666f4b444d4d47347a7961724e4777435173343447535134397063594b517370484a5058536e5677", context: "", unique: ""]                                           | bagcqcerarwe3qynbdke6u3gckhnbwzpxbg6ehov262cq5pbwxsc63kqkhlma | {"metadata":{"shouldIndex":false},"content":{"stream2":"data_1"}} | [Cid(bafyreihum3smvdc36yl2qnbl4gqv3nfxwdxj7v2zdozcrrqgmtc3zfhb7i)]   |               |            |
+        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------------------------+----------------------------------------------------------------------+---------------+------------+
+        | 4     | Data       | bagcqcerahx5i27vqxigdq3xulceu5qv6yzdvxzamfueubsyxam5kmjcpp45q | 3           | did:key:z6Mkk3rtfoKDMMG4zyarNGwCQs44GSQ49pcYKQspHJPXSnVw | [model: "ce0102015512204bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459a", controller: "6469643a6b65793a7a364d6b6b337274666f4b444d4d47347a7961724e4777435173343447535134397063594b517370484a5058536e5677", context: "", unique: ""] | bagcqcerakug4jvwbhisuo4zlhzkinwfca2dbcv63ea7jan27zlwhzpxyrleq | {"metadata":{},"content":{"stream_1":"data_1"}}                   | [Cid(bagcqcerahx5i27vqxigdq3xulceu5qv6yzdvxzamfueubsyxam5kmjcpp45q)] |               |            |
+        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------------------------+----------------------------------------------------------------------+---------------+------------+
+        | 5     | Time       | bafyreihum3smvdc36yl2qnbl4gqv3nfxwdxj7v2zdozcrrqgmtc3zfhb7i   | 2           | did:key:z6Mkk3rtfoKDMMG4zyarNGwCQs44GSQ49pcYKQspHJPXSnVw | [model: "ce01040171710b0009686d6f64656c2d7631", controller: "6469643a6b65793a7a364d6b6b337274666f4b444d4d47347a7961724e4777435173343447535134397063594b517370484a5058536e5677", context: "", unique: ""]                                           | bafyreicor5mbc2ioqiub6dixpedkmjvp22dehayay3bfpe65zlcmlfw4ga   |                                                                   | [Cid(bagcqcerarwe3qynbdke6u3gckhnbwzpxbg6ehov262cq5pbwxsc63kqkhlma)] | 1744383131980 | test:chain |
+        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------------------------+----------------------------------------------------------------------+---------------+------------+
+        | 6     | Data       | bagcqcerahx5i27vqxigdq3xulceu5qv6yzdvxzamfueubsyxam5kmjcpp45q | 3           | did:key:z6Mkk3rtfoKDMMG4zyarNGwCQs44GSQ49pcYKQspHJPXSnVw | [model: "ce0102015512204bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459a", controller: "6469643a6b65793a7a364d6b6b337274666f4b444d4d47347a7961724e4777435173343447535134397063594b517370484a5058536e5677", context: "", unique: ""] | bagcqceraccgbaicjznz45ov4wgc3wnr62zqwba24sxzreqerlzdklidysfdq | {"metadata":{},"content":{"stream_1":"data_2"}}                   | [Cid(bagcqcerakug4jvwbhisuo4zlhzkinwfca2dbcv63ea7jan27zlwhzpxyrleq)] |               |            |
+        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------------------------+----------------------------------------------------------------------+---------------+------------+
     "#]].assert_eq(&events_to_table(&conclusion_events));
 
     // Fetch conclusion events, with non zero watermark
     let conclusion_events = service.conclusion_events_since(3, 6).await?;
 
     expect![[r#"
-        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------+----------------------------------------------------------------------+
-        | index | event_type | stream_cid                                                    | stream_type | controller                                               | dimensions                                                                                                                                                                                                                                         | event_cid                                                     | data                                            | previous                                                             |
-        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------+----------------------------------------------------------------------+
-        | 4     | Data       | bagcqcerahx5i27vqxigdq3xulceu5qv6yzdvxzamfueubsyxam5kmjcpp45q | 3           | did:key:z6Mkk3rtfoKDMMG4zyarNGwCQs44GSQ49pcYKQspHJPXSnVw | [model: "ce0102015512204bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459a", controller: "6469643a6b65793a7a364d6b6b337274666f4b444d4d47347a7961724e4777435173343447535134397063594b517370484a5058536e5677", context: "", unique: ""] | bagcqcerakug4jvwbhisuo4zlhzkinwfca2dbcv63ea7jan27zlwhzpxyrleq | {"metadata":{},"content":{"stream_1":"data_1"}} | [Cid(bagcqcerahx5i27vqxigdq3xulceu5qv6yzdvxzamfueubsyxam5kmjcpp45q)] |
-        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------+----------------------------------------------------------------------+
-        | 5     | Time       | bafyreihum3smvdc36yl2qnbl4gqv3nfxwdxj7v2zdozcrrqgmtc3zfhb7i   | 2           | did:key:z6Mkk3rtfoKDMMG4zyarNGwCQs44GSQ49pcYKQspHJPXSnVw | [model: "ce01040171710b0009686d6f64656c2d7631", controller: "6469643a6b65793a7a364d6b6b337274666f4b444d4d47347a7961724e4777435173343447535134397063594b517370484a5058536e5677", context: "", unique: ""]                                           | bafyreicor5mbc2ioqiub6dixpedkmjvp22dehayay3bfpe65zlcmlfw4ga   |                                                 | [Cid(bagcqcerarwe3qynbdke6u3gckhnbwzpxbg6ehov262cq5pbwxsc63kqkhlma)] |
-        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------+----------------------------------------------------------------------+
-        | 6     | Data       | bagcqcerahx5i27vqxigdq3xulceu5qv6yzdvxzamfueubsyxam5kmjcpp45q | 3           | did:key:z6Mkk3rtfoKDMMG4zyarNGwCQs44GSQ49pcYKQspHJPXSnVw | [model: "ce0102015512204bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459a", controller: "6469643a6b65793a7a364d6b6b337274666f4b444d4d47347a7961724e4777435173343447535134397063594b517370484a5058536e5677", context: "", unique: ""] | bagcqceraccgbaicjznz45ov4wgc3wnr62zqwba24sxzreqerlzdklidysfdq | {"metadata":{},"content":{"stream_1":"data_2"}} | [Cid(bagcqcerakug4jvwbhisuo4zlhzkinwfca2dbcv63ea7jan27zlwhzpxyrleq)] |
-        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------+----------------------------------------------------------------------+
+        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------+----------------------------------------------------------------------+---------------+------------+
+        | index | event_type | stream_cid                                                    | stream_type | controller                                               | dimensions                                                                                                                                                                                                                                         | event_cid                                                     | data                                            | previous                                                             | before        | chain_id   |
+        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------+----------------------------------------------------------------------+---------------+------------+
+        | 4     | Data       | bagcqcerahx5i27vqxigdq3xulceu5qv6yzdvxzamfueubsyxam5kmjcpp45q | 3           | did:key:z6Mkk3rtfoKDMMG4zyarNGwCQs44GSQ49pcYKQspHJPXSnVw | [model: "ce0102015512204bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459a", controller: "6469643a6b65793a7a364d6b6b337274666f4b444d4d47347a7961724e4777435173343447535134397063594b517370484a5058536e5677", context: "", unique: ""] | bagcqcerakug4jvwbhisuo4zlhzkinwfca2dbcv63ea7jan27zlwhzpxyrleq | {"metadata":{},"content":{"stream_1":"data_1"}} | [Cid(bagcqcerahx5i27vqxigdq3xulceu5qv6yzdvxzamfueubsyxam5kmjcpp45q)] |               |            |
+        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------+----------------------------------------------------------------------+---------------+------------+
+        | 5     | Time       | bafyreihum3smvdc36yl2qnbl4gqv3nfxwdxj7v2zdozcrrqgmtc3zfhb7i   | 2           | did:key:z6Mkk3rtfoKDMMG4zyarNGwCQs44GSQ49pcYKQspHJPXSnVw | [model: "ce01040171710b0009686d6f64656c2d7631", controller: "6469643a6b65793a7a364d6b6b337274666f4b444d4d47347a7961724e4777435173343447535134397063594b517370484a5058536e5677", context: "", unique: ""]                                           | bafyreicor5mbc2ioqiub6dixpedkmjvp22dehayay3bfpe65zlcmlfw4ga   |                                                 | [Cid(bagcqcerarwe3qynbdke6u3gckhnbwzpxbg6ehov262cq5pbwxsc63kqkhlma)] | 1744383131980 | test:chain |
+        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------+----------------------------------------------------------------------+---------------+------------+
+        | 6     | Data       | bagcqcerahx5i27vqxigdq3xulceu5qv6yzdvxzamfueubsyxam5kmjcpp45q | 3           | did:key:z6Mkk3rtfoKDMMG4zyarNGwCQs44GSQ49pcYKQspHJPXSnVw | [model: "ce0102015512204bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459a", controller: "6469643a6b65793a7a364d6b6b337274666f4b444d4d47347a7961724e4777435173343447535134397063594b517370484a5058536e5677", context: "", unique: ""] | bagcqceraccgbaicjznz45ov4wgc3wnr62zqwba24sxzreqerlzdklidysfdq | {"metadata":{},"content":{"stream_1":"data_2"}} | [Cid(bagcqcerakug4jvwbhisuo4zlhzkinwfca2dbcv63ea7jan27zlwhzpxyrleq)] |               |            |
+        +-------+------------+---------------------------------------------------------------+-------------+----------------------------------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+-------------------------------------------------+----------------------------------------------------------------------+---------------+------------+
     "#]].assert_eq(&events_to_table(&conclusion_events));
 
     Ok(())
@@ -734,6 +793,8 @@ fn events_to_table(conclusion_events: &[ConclusionEvent]) -> String {
         Cell::new("event_cid"),
         Cell::new("data"),
         Cell::new("previous"),
+        Cell::new("before"),
+        Cell::new("chain_id"),
     ]));
 
     for event in conclusion_events {
@@ -747,6 +808,8 @@ fn events_to_table(conclusion_events: &[ConclusionEvent]) -> String {
             event_cid,
             data,
             previous,
+            before,
+            chain_id,
         ) = match event {
             ConclusionEvent::Data(data_event) => (
                 "Data",
@@ -758,6 +821,9 @@ fn events_to_table(conclusion_events: &[ConclusionEvent]) -> String {
                 &data_event.event_cid,
                 std::str::from_utf8(&data_event.data).expect("data is JSON"),
                 format!("{:?}", data_event.previous),
+                // Data events don't have time proof fields
+                String::new(),
+                &String::new(),
             ),
             ConclusionEvent::Time(time_event) => (
                 "Time",
@@ -769,6 +835,8 @@ fn events_to_table(conclusion_events: &[ConclusionEvent]) -> String {
                 &time_event.event_cid,
                 "", // Time events don't have data
                 format!("{:?}", time_event.previous),
+                format!("{:?}", time_event.time_proof.before),
+                &time_event.time_proof.chain_id,
             ),
         };
 
@@ -788,6 +856,8 @@ fn events_to_table(conclusion_events: &[ConclusionEvent]) -> String {
             Cell::new(&event_cid.to_string()),
             Cell::new(data),
             Cell::new(&previous),
+            Cell::new(&before),
+            Cell::new(chain_id),
         ]));
     }
 
diff --git a/event-svc/src/tests/migration.rs b/event-svc/src/tests/migration.rs
index 787482fae..adad2c43e 100644
--- a/event-svc/src/tests/migration.rs
+++ b/event-svc/src/tests/migration.rs
@@ -17,7 +17,9 @@ use ceramic_car::CarReader;
 use ceramic_core::{DidDocument, EventId, Network, SerializeExt, StreamId};
 use ceramic_event::unvalidated;
 
-use crate::{event::BlockStore, EventService};
+use crate::{
+    event::BlockStore, tests::event::get_mock_chain_provider, EventService, UndeliveredEventReview,
+};
 
 struct InMemBlockStore {
     blocks: BTreeMap<Cid, Vec<u8>>,
@@ -47,14 +49,18 @@ async fn blocks_from_cars(cars: Vec<Vec<u8>>) -> InMemBlockStore {
     }
     InMemBlockStore { blocks }
 }
-async fn test_migration(cars: Vec<Vec<u8>>) {
+async fn test_migration(cars: Vec<Vec<u8>>, proofs: Vec<unvalidated::AnchorProof>) {
     let expected_events: BTreeSet<_> = cars
         .iter()
         .map(|car| multibase::encode(multibase::Base::Base64Url, car))
         .collect();
     let blocks = blocks_from_cars(cars).await;
     let conn = crate::store::SqlitePool::connect_in_memory().await.unwrap();
-    let service = EventService::new_with_event_validation(conn).await.unwrap();
+    let chain_provider = get_mock_chain_provider("eip155:11155111", proofs);
+    let providers = vec![chain_provider];
+    let service = EventService::try_new(conn, UndeliveredEventReview::Skip, true, providers)
+        .await
+        .unwrap();
     service
         .migrate_from_ipfs(Network::Local(42), blocks, false, vec![], false, None)
         .await
@@ -204,32 +210,42 @@ async fn random_time_event(prev: Cid) -> Box<unvalidated::TimeEvent> {
 }
 #[test(tokio::test)]
 async fn unsigned_init_event() {
-    test_migration(vec![random_unsigned_init_event()
-        .await
-        .encode_car()
-        .unwrap()])
+    test_migration(
+        vec![random_unsigned_init_event().await.encode_car().unwrap()],
+        vec![],
+    )
     .await;
 }
 #[test(tokio::test)]
 async fn many_unsigned_init_events() {
-    test_migration(vec![
-        random_unsigned_init_event().await.encode_car().unwrap(),
-        random_unsigned_init_event().await.encode_car().unwrap(),
-        random_unsigned_init_event().await.encode_car().unwrap(),
-    ])
+    test_migration(
+        vec![
+            random_unsigned_init_event().await.encode_car().unwrap(),
+            random_unsigned_init_event().await.encode_car().unwrap(),
+            random_unsigned_init_event().await.encode_car().unwrap(),
+        ],
+        vec![],
+    )
     .await;
 }
 #[test(tokio::test)]
 async fn signed_init_event() {
-    test_migration(vec![random_signed_init_event().await.encode_car().unwrap()]).await;
+    test_migration(
+        vec![random_signed_init_event().await.encode_car().unwrap()],
+        vec![],
+    )
+    .await;
 }
 #[test(tokio::test)]
 async fn many_signed_init_events() {
-    test_migration(vec![
-        random_signed_init_event().await.encode_car().unwrap(),
-        random_signed_init_event().await.encode_car().unwrap(),
-        random_signed_init_event().await.encode_car().unwrap(),
-    ])
+    test_migration(
+        vec![
+            random_signed_init_event().await.encode_car().unwrap(),
+            random_signed_init_event().await.encode_car().unwrap(),
+            random_signed_init_event().await.encode_car().unwrap(),
+        ],
+        vec![],
+    )
     .await;
 }
 #[test(tokio::test)]
@@ -238,7 +254,7 @@ async fn signed_data_event() {
     for event in random_signed_data_event().await {
         cars.push(event.encode_car().unwrap());
     }
-    test_migration(cars).await;
+    test_migration(cars, vec![]).await;
 }
 #[test(tokio::test)]
 async fn many_signed_data_events() {
@@ -248,47 +264,63 @@ async fn many_signed_data_events() {
             cars.push(event.encode_car().unwrap());
         }
     }
-    test_migration(cars).await;
+    test_migration(cars, vec![]).await;
 }
 #[test(tokio::test)]
 async fn cacao_signed_data_event() {
-    test_migration(vec![new_cacao_signed_data_event()]).await;
+    test_migration(vec![new_cacao_signed_data_event()], vec![]).await;
 }
 #[test(tokio::test)]
 async fn unsigned_time_event() {
     let mut cars = Vec::new();
+    let mut proofs = Vec::new();
     for event in random_unsigned_init_time_event().await {
         cars.push(event.encode_car().unwrap());
+        if let unvalidated::Event::Time(time_event) = event {
+            proofs.push(time_event.proof().clone());
+        }
     }
-    test_migration(cars).await;
+    test_migration(cars, proofs).await;
 }
 #[test(tokio::test)]
 async fn signed_init_time_event() {
     let mut cars = Vec::new();
+    let mut proofs = Vec::new();
     for event in random_signed_init_time_event().await {
         cars.push(event.encode_car().unwrap());
+        if let unvalidated::Event::Time(time_event) = event {
+            proofs.push(time_event.proof().clone());
+        }
     }
 
-    test_migration(cars).await;
+    test_migration(cars, proofs).await;
 }
 #[test(tokio::test)]
 async fn many_time_events() {
     let mut cars = Vec::new();
+    let mut proofs = Vec::new();
     for _ in 0..3 {
         for event in random_unsigned_init_time_event().await {
             cars.push(event.encode_car().unwrap());
+            if let unvalidated::Event::Time(time_event) = event {
+                proofs.push(time_event.proof().clone());
+            }
         }
     }
     for _ in 0..3 {
         for event in random_signed_init_time_event().await {
             cars.push(event.encode_car().unwrap());
+            if let unvalidated::Event::Time(time_event) = event {
+                proofs.push(time_event.proof().clone());
+            }
         }
     }
-    test_migration(cars).await;
+    test_migration(cars, proofs).await;
 }
 #[test(tokio::test)]
 async fn all_events() {
     let mut cars = Vec::new();
+    let mut proofs = Vec::new();
 
     cars.push(new_cacao_signed_data_event());
 
@@ -306,12 +338,18 @@ async fn all_events() {
     for _ in 0..3 {
         for event in random_unsigned_init_time_event().await {
             cars.push(event.encode_car().unwrap());
+            if let unvalidated::Event::Time(time_event) = event {
+                proofs.push(time_event.proof().clone());
+            }
         }
     }
     for _ in 0..3 {
         for event in random_signed_init_time_event().await {
             cars.push(event.encode_car().unwrap());
+            if let unvalidated::Event::Time(time_event) = event {
+                proofs.push(time_event.proof().clone());
+            }
         }
     }
-    test_migration(cars).await;
+    test_migration(cars, proofs).await;
 }
diff --git a/flight/tests/server.rs b/flight/tests/server.rs
index deb84a857..f267c0201 100644
--- a/flight/tests/server.rs
+++ b/flight/tests/server.rs
@@ -9,6 +9,7 @@ use ceramic_core::{StreamId, StreamIdType, METAMODEL_STREAM_ID};
 use ceramic_flight::server::new_server;
 use ceramic_pipeline::{
     aggregator::{ModelAccountRelationV2, ModelDefinition, SubscribeSinceMsg},
+    concluder::TimeProof,
     ConclusionData, ConclusionEvent, ConclusionFeed, ConclusionInit, ConclusionTime,
     PipelineHandle,
 };
@@ -191,6 +192,10 @@ fn events(start_index: u64, highwater_mark: u64, limit: usize) -> Vec<Conclusion
                 "baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi",
             )
             .unwrap()],
+            time_proof: TimeProof {
+                before: 1744383131980,
+                chain_id: "test:chain".to_owned(),
+            },
         }),
         ConclusionEvent::Data(ConclusionData {
             order: start_index + 3,
@@ -241,7 +246,9 @@ async fn conclusion_events() -> Result<()> {
                 cid_string(event_cid) as event_cid,
                 event_type,
                 data::varchar as data,
-                array_cid_string(previous) as previous
+                array_cid_string(previous) as previous,
+                before,
+                chain_id
             FROM conclusion_events"#
                 .to_string(),
             None,
@@ -250,14 +257,14 @@ async fn conclusion_events() -> Result<()> {
     let batch = execute_flight(&mut client, info).await?;
     let formatted = pretty_format_batches(&[batch]).unwrap().to_string();
     expect![[r#"
-        +------------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+
-        | conclusion_event_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | previous                                                      |
-        +------------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+
-        | 1                      | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestColorModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"Color","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} |                                                               |
-        | 2                      | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                             |                                                               |
-        | 3                      | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | [baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi] |
-        | 4                      | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | {"content":[{"op":"replace","path":"/red","value":0}],"metadata":{"foo":2}}                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | [baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq] |
-        +------------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+"#]].assert_eq(&formatted);
+        +------------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+---------------+------------+
+        | conclusion_event_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | previous                                                      | before        | chain_id   |
+        +------------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+---------------+------------+
+        | 1                      | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestColorModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"Color","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} |                                                               |               |            |
+        | 2                      | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                             |                                                               |               |            |
+        | 3                      | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | [baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi] | 1744383131980 | test:chain |
+        | 4                      | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | {"content":[{"op":"replace","path":"/red","value":0}],"metadata":{"foo":2}}                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | [baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq] |               |            |
+        +------------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+---------------+------------+"#]].assert_eq(&formatted);
     Ok(())
 }
 
@@ -285,7 +292,9 @@ async fn conclusion_push_down_predicate() -> Result<()> {
                 cid_string(event_cid) as event_cid,
                 event_type,
                 data::varchar as data,
-                array_cid_string(previous) as previous
+                array_cid_string(previous) as previous,
+                before,
+                chain_id
             FROM conclusion_events
             WHERE conclusion_event_order > 42 LIMIT 2"#
                 .to_string(),
@@ -295,12 +304,12 @@ async fn conclusion_push_down_predicate() -> Result<()> {
     let batch = execute_flight(&mut client, info).await?;
     let formatted = pretty_format_batches(&[batch]).unwrap().to_string();
     expect![[r#"
-        +------------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+----------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+
-        | conclusion_event_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | data                                                                                                     | previous                                                      |
-        +------------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+----------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+
-        | 43                     | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}} |                                                               |
-        | 44                     | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          |                                                                                                          | [baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi] |
-        +------------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+----------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+"#]].assert_eq(&formatted);
+        +------------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+----------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+---------------+------------+
+        | conclusion_event_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | data                                                                                                     | previous                                                      | before        | chain_id   |
+        +------------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+----------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+---------------+------------+
+        | 43                     | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}} |                                                               |               |            |
+        | 44                     | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          |                                                                                                          | [baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi] | 1744383131980 | test:chain |
+        +------------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+----------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+---------------+------------+"#]].assert_eq(&formatted);
     Ok(())
 }
 
@@ -327,7 +336,9 @@ async fn conclusion_events_feed() -> Result<()> {
                 cid_string(event_cid) as event_cid,
                 event_type,
                 data::varchar as data,
-                array_cid_string(previous) as previous
+                array_cid_string(previous) as previous,
+                before,
+                chain_id
             FROM conclusion_events_feed LIMIT 4"#
                 .to_string(),
             None,
@@ -336,14 +347,14 @@ async fn conclusion_events_feed() -> Result<()> {
     let batch = execute_flight(&mut client, info).await?;
     let formatted = pretty_format_batches(&[batch]).unwrap().to_string();
     expect![[r#"
-        +------------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+
-        | conclusion_event_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | previous                                                      |
-        +------------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+
-        | 1                      | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestColorModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"Color","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} |                                                               |
-        | 2                      | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                             |                                                               |
-        | 3                      | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | [baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi] |
-        | 4                      | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | {"content":[{"op":"replace","path":"/red","value":0}],"metadata":{"foo":2}}                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | [baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq] |
-        +------------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+"#]].assert_eq(&formatted);
+        +------------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+---------------+------------+
+        | conclusion_event_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | previous                                                      | before        | chain_id   |
+        +------------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+---------------+------------+
+        | 1                      | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestColorModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"Color","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} |                                                               |               |            |
+        | 2                      | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                             |                                                               |               |            |
+        | 3                      | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | [baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi] | 1744383131980 | test:chain |
+        | 4                      | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | {"content":[{"op":"replace","path":"/red","value":0}],"metadata":{"foo":2}}                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | [baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq] |               |            |
+        +------------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------------------------+---------------+------------+"#]].assert_eq(&formatted);
     Ok(())
 }
 
@@ -383,7 +394,9 @@ async fn event_states_simple() -> Result<()> {
                 dimensions,
                 cid_string(event_cid) as event_cid,
                 event_type,
-                data::varchar as data
+                data::varchar as data,
+                before,
+                chain_id
             FROM event_states LIMIT 4"#
                 .to_string(),
             None,
@@ -392,14 +405,14 @@ async fn event_states_simple() -> Result<()> {
     let batch = execute_flight(&mut client, info).await?;
     let formatted = pretty_format_batches(&[batch]).unwrap().to_string();
     expect![[r#"
-        +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-        | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
-        +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-        | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestColorModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"Color","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} |
-        | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                             |
-        | 3                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                             |
-        | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":255,"creator":"alice","green":255,"red":0}}                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-        +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+"#]].assert_eq(&formatted);
+        +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------+------------+
+        | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | before        | chain_id   |
+        +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------+------------+
+        | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestColorModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"Color","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} |               |            |
+        | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                             |               |            |
+        | 3                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                             | 1744383131980 | test:chain |
+        | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":255,"creator":"alice","green":255,"red":0}}                                                                                                                                                                                                                                                                                                                                                                                                                                               |               |            |
+        +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------+------------+"#]].assert_eq(&formatted);
     Ok(())
 }
 #[test(tokio::test)]
@@ -424,7 +437,9 @@ async fn event_states_feed() -> Result<()> {
                 dimensions,
                 cid_string(event_cid) as event_cid,
                 event_type,
-                data::varchar as data
+                data::varchar as data,
+                before,
+                chain_id
             FROM event_states_feed LIMIT 4"#
                 .to_string(),
             None,
@@ -433,21 +448,21 @@ async fn event_states_feed() -> Result<()> {
     let batch = execute_flight(&mut client, info).await?;
     let formatted = pretty_format_batches(&[batch]).unwrap().to_string();
     expect![[r#"
-        +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-        | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
-        +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-        | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestColorModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"Color","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} |
-        | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                             |
-        | 3                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                             |
-        | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":255,"creator":"alice","green":255,"red":0}}                                                                                                                                                                                                                                                                                                                                                                                                                                               |
-        +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+"#]].assert_eq(&formatted);
+        +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------+------------+
+        | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | before        | chain_id   |
+        +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------+------------+
+        | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestColorModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"Color","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} |               |            |
+        | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                             |               |            |
+        | 3                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                             | 1744383131980 | test:chain |
+        | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":255,"creator":"alice","green":255,"red":0}}                                                                                                                                                                                                                                                                                                                                                                                                                                               |               |            |
+        +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------+------------+"#]].assert_eq(&formatted);
     Ok(())
 }
 
 #[test(tokio::test)]
 async fn event_states_feed_projection() -> Result<()> {
     // This ensures that a simple projection of the stream table works.
-    // Any extra functions or casts should not be used so we ensure we are excersicing the schema
+    // Any extra functions or casts should not be used so we ensure we are exercising the schema
     // of the stream table directly.
 
     let mut feed = MockFeed::new();
diff --git a/migrations/sqlite/20250410224437_chain_timestamp.down.sql b/migrations/sqlite/20250410224437_chain_timestamp.down.sql
new file mode 100644
index 000000000..4cbff89bc
--- /dev/null
+++ b/migrations/sqlite/20250410224437_chain_timestamp.down.sql
@@ -0,0 +1,2 @@
+-- Add down migration script here
+DROP TABLE IF EXISTS ceramic_one_chain_proof;
diff --git a/migrations/sqlite/20250410224437_chain_timestamp.up.sql b/migrations/sqlite/20250410224437_chain_timestamp.up.sql
new file mode 100644
index 000000000..d0e103550
--- /dev/null
+++ b/migrations/sqlite/20250410224437_chain_timestamp.up.sql
@@ -0,0 +1,10 @@
+-- Add up migration script here
+
+CREATE TABLE IF NOT EXISTS ceramic_one_chain_timestamp (
+    chain_id TEXT NOT NULL, -- caip-2 chain ID as a string
+    block_hash TEXT NOT NULL, -- '0x' prefixed hex string
+    "timestamp" INTEGER NOT NULL, -- unix timestamp
+    PRIMARY KEY (chain_id, block_hash)
+);
+
+CREATE INDEX IF NOT EXISTS idx_ceramic_one_chain_timestamp_block_hash ON ceramic_one_chain_timestamp (block_hash);
diff --git a/migrations/sqlite/20250410224445_chain_proof.down.sql b/migrations/sqlite/20250410224445_chain_proof.down.sql
new file mode 100644
index 000000000..4cbff89bc
--- /dev/null
+++ b/migrations/sqlite/20250410224445_chain_proof.down.sql
@@ -0,0 +1,2 @@
+-- Add down migration script here
+DROP TABLE IF EXISTS ceramic_one_chain_proof;
diff --git a/migrations/sqlite/20250410224445_chain_proof.up.sql b/migrations/sqlite/20250410224445_chain_proof.up.sql
new file mode 100644
index 000000000..3cc7caaf4
--- /dev/null
+++ b/migrations/sqlite/20250410224445_chain_proof.up.sql
@@ -0,0 +1,12 @@
+-- Add up migration script here
+
+CREATE TABLE IF NOT EXISTS ceramic_one_chain_proof (
+    chain_id TEXT NOT NULL, -- caip-2 chain ID as a string
+    transaction_hash TEXT NOT NULL, -- '0x' prefixed hex string
+    transaction_input TEXT NOT NULL, -- '0x' prefixed hex string
+    block_hash TEXT NULL, -- '0x' prefixed hex string
+    PRIMARY KEY (chain_id, transaction_hash)
+);
+
+CREATE INDEX IF NOT EXISTS idx_ceramic_one_chain_proof_block_hash ON ceramic_one_chain_proof (block_hash);
+CREATE INDEX IF NOT EXISTS idx_ceramic_one_chain_proof_chain_id_block_hash ON ceramic_one_chain_proof (chain_id, block_hash);
\ No newline at end of file
diff --git a/one/src/daemon.rs b/one/src/daemon.rs
index eaa508a5c..eb5b7b5af 100644
--- a/one/src/daemon.rs
+++ b/one/src/daemon.rs
@@ -8,8 +8,7 @@ use anyhow::{anyhow, bail, Result};
 use ceramic_anchor_remote::RemoteCas;
 use ceramic_anchor_service::AnchorService;
 use ceramic_core::NodeKey;
-use ceramic_event_svc::eth_rpc::HttpEthRpc;
-use ceramic_event_svc::{ChainInclusionProvider, EventService};
+use ceramic_event_svc::EventService;
 use ceramic_interest_svc::InterestService;
 use ceramic_kubo_rpc::Multiaddr;
 use ceramic_metrics::{config::Config as MetricsConfig, MetricsHandle};
@@ -276,56 +275,6 @@ pub struct DaemonOpts {
     object_store_url: url::Url,
 }
 
-async fn get_eth_rpc_providers(
-    ethereum_rpc_urls: Vec<String>,
-    network: &Network,
-) -> Result<Vec<ChainInclusionProvider>> {
-    let ethereum_rpc_urls = if ethereum_rpc_urls.is_empty() {
-        network.default_rpc_urls()?
-    } else {
-        ethereum_rpc_urls
-    };
-
-    let mut providers = Vec::new();
-    for url in ethereum_rpc_urls {
-        match HttpEthRpc::try_new(&url).await {
-            Ok(provider) => {
-                let provider_chain = provider.chain_id();
-                if network
-                    .supported_chain_ids()
-                    .is_none_or(|ids| ids.contains(provider_chain))
-                {
-                    info!(
-                        "Using ethereum rpc provider for chain: {} with url: {}",
-                        provider.chain_id(),
-                        provider.url()
-                    );
-                    let provider: ChainInclusionProvider = Arc::new(provider);
-                    providers.push(provider);
-                } else {
-                    warn!("Eth RPC provider {} uses chainid {} which isn't supported by Ceramic network {:?}", url, provider_chain,network);
-                }
-            }
-            Err(err) => {
-                warn!("failed to create RPC client with url: '{url}': {:?}", err);
-            }
-        }
-    }
-
-    if providers.is_empty() {
-        if *network == Network::Local || *network == Network::InMemory {
-            warn!("No usable ethereum RPC provided for network {}. All TimeEvent validation will fail", network.name());
-        } else {
-            bail!(
-                "No usable ethereum RPC configured for network {}",
-                network.name()
-            );
-        }
-    }
-
-    Ok(providers)
-}
-
 fn spawn_database_optimizer(
     sqlite_pool: SqlitePool,
     mut shutdown: ShutdownSignal,
@@ -422,7 +371,10 @@ pub async fn run(opts: DaemonOpts) -> Result<()> {
         None
     };
 
-    let rpc_providers = get_eth_rpc_providers(opts.ethereum_rpc_urls, &opts.network).await?;
+    let rpc_providers = opts
+        .network
+        .get_eth_rpc_providers(opts.ethereum_rpc_urls)
+        .await?;
 
     // Construct services from pool
     let peer_svc = Arc::new(PeerService::new(sqlite_pool.clone()));
diff --git a/one/src/lib.rs b/one/src/lib.rs
index a02a73aa8..2dad1d9ed 100644
--- a/one/src/lib.rs
+++ b/one/src/lib.rs
@@ -9,8 +9,9 @@ mod migrations;
 mod network;
 mod query;
 
-use anyhow::{anyhow, Result};
+use anyhow::{anyhow, bail, Result};
 use ceramic_core::ssi::caip2::ChainId;
+use ceramic_event_svc::{eth_rpc::HttpEthRpc, ChainInclusionProvider};
 use ceramic_metrics::config::Config as MetricsConfig;
 use ceramic_sql::sqlite::{SqliteOpts, SqlitePool};
 use clap::{Args, Parser, Subcommand, ValueEnum};
@@ -22,8 +23,7 @@ use multihash_codetable::Code;
 use multihash_derive::Hasher;
 use shutdown::Shutdown;
 use signal_hook_tokio::Signals;
-use std::str::FromStr;
-use std::{env, path::PathBuf};
+use std::{env, path::PathBuf, str::FromStr, sync::Arc};
 use tokio::io::AsyncReadExt;
 use tracing::{debug, error, info, warn};
 
@@ -121,7 +121,7 @@ impl Network {
     }
 
     /// Return the default ethereum rpc providers for each network.
-    pub fn default_rpc_urls(&self) -> Result<Vec<String>> {
+    fn default_rpc_urls(&self) -> Result<Vec<String>> {
         match self {
             Network::Mainnet => {
                 anyhow::bail!("no Ethereum RPC URLs specified for Mainnet")
@@ -151,7 +151,7 @@ impl Network {
     }
 
     /// return the allowed chain ids for this network. or None for any
-    pub fn supported_chain_ids(&self) -> Option<Vec<ChainId>> {
+    fn supported_chain_ids(&self) -> Option<Vec<ChainId>> {
         match self {
             Network::Mainnet => Some(vec![
                 ChainId::from_str("eip155:1").expect("eip155:1 is a valid chain")
@@ -168,7 +168,7 @@ impl Network {
     }
 
     /// Get the network as a unique name.
-    pub fn name(&self) -> String {
+    fn name(&self) -> String {
         match self {
             Network::Mainnet => "mainnet".to_owned(),
             Network::TestnetClay => "testnet-clay".to_owned(),
@@ -177,6 +177,56 @@ impl Network {
             Network::InMemory => "inmemory".to_owned(),
         }
     }
+
+    pub async fn get_eth_rpc_providers(
+        &self,
+        ethereum_rpc_urls: Vec<String>,
+    ) -> Result<Vec<ChainInclusionProvider>> {
+        let ethereum_rpc_urls = if ethereum_rpc_urls.is_empty() {
+            self.default_rpc_urls()?
+        } else {
+            ethereum_rpc_urls
+        };
+
+        let mut providers = Vec::new();
+        for url in ethereum_rpc_urls {
+            match HttpEthRpc::try_new(&url).await {
+                Ok(provider) => {
+                    let provider_chain = provider.chain_id();
+                    if self
+                        .supported_chain_ids()
+                        .is_none_or(|ids| ids.contains(provider_chain))
+                    {
+                        info!(
+                            "Using ethereum rpc provider for chain: {} with url: {}",
+                            provider.chain_id(),
+                            provider.url()
+                        );
+                        let provider: ChainInclusionProvider = Arc::new(provider);
+                        providers.push(provider);
+                    } else {
+                        warn!("Eth RPC provider {} uses chainid {} which isn't supported by Ceramic network {:?}", url, provider_chain, self);
+                    }
+                }
+                Err(err) => {
+                    warn!("failed to create RPC client with url: '{url}': {:?}", err);
+                }
+            }
+        }
+
+        if providers.is_empty() {
+            if *self == Network::Local || *self == Network::InMemory {
+                warn!("No usable ethereum RPC provided for network {}. All TimeEvent validation will fail", self.name());
+            } else {
+                bail!(
+                    "No usable ethereum RPC configured for network {}",
+                    self.name()
+                );
+            }
+        }
+
+        Ok(providers)
+    }
 }
 
 /// The default storage directory to use if none is provided. In order:
diff --git a/one/src/migrations.rs b/one/src/migrations.rs
index 3ea92c622..068ecdb06 100644
--- a/one/src/migrations.rs
+++ b/one/src/migrations.rs
@@ -15,7 +15,7 @@ use multihash_codetable::{Code, Multihash, MultihashDigest};
 use tokio::io::AsyncBufReadExt;
 use tracing::{debug, info};
 
-use crate::{default_directory, DBOpts, Info, LogOpts};
+use crate::{default_directory, DBOpts, Info, LogOpts, Network};
 
 #[derive(Subcommand, Debug)]
 pub enum EventsCommand {
@@ -109,6 +109,7 @@ pub struct FromIpfsOpts {
 
     /// Optional list of model stream ids. Only events from these models will be migrated.
     /// If the list is empty all events are migrated.
+    /// The 'metamodel' stream id is `kh4q0ozorrgaq2mezktnrmdwleo1d` if you want to migrate models.
     #[clap(long, value_delimiter = ',', env = "CERAMIC_ONE_MODEL_FILTER")]
     model_filter: Vec<String>,
 
@@ -117,10 +118,20 @@ pub struct FromIpfsOpts {
     #[clap(long, env = "CERAMIC_ONE_VALIDATE_SIGNATURES")]
     validate_signatures: bool,
 
-    /// Whether to validate the chain of time events.
+    /// Whether to validate the chain of time events matches the expected CAIP2 chain id.
     /// Events with invalid chains will be skipped and counted as errors.
-    #[clap(long, env = "CERAMIC_ONE_VALIDATE_CHAINS")]
+    /// For example, on mainnet, events are expected to have a chain id of 'eip155:1'.
+    #[clap(long, env = "CERAMIC_ONE_VALIDATE_CHAIN")]
     validate_chain: bool,
+
+    /// Ethereum RPC URLs used for time events validation. Required when connecting to mainnet and uses fallback URLs if not specified for other networks.
+    #[arg(
+        long,
+        use_value_delimiter = true,
+        value_delimiter = ',',
+        env = "CERAMIC_ONE_ETHEREUM_RPC_URLS"
+    )]
+    ethereum_rpc_urls: Vec<String>,
 }
 
 impl From<&FromIpfsOpts> for DBOpts {
@@ -163,13 +174,18 @@ async fn from_ipfs(opts: FromIpfsOpts) -> Result<()> {
     let network = opts.network.to_network(&opts.local_network_id)?;
     let db_opts: DBOpts = (&opts).into();
     let sqlite_pool = db_opts.get_sqlite_pool(SqliteOpts::default()).await?;
+    let rpc_providers = opts
+        .network
+        .get_eth_rpc_providers(opts.ethereum_rpc_urls)
+        .await?;
+
     // TODO: feature flags here? or just remove this entirely when enabling
     let event_svc = Arc::new(
         EventService::try_new(
             sqlite_pool,
             ceramic_event_svc::UndeliveredEventReview::Skip,
             false,
-            vec![],
+            rpc_providers,
         )
         .await?,
     );
@@ -195,17 +211,29 @@ async fn from_ipfs(opts: FromIpfsOpts) -> Result<()> {
                 .collect::<Result<Vec<Vec<u8>>, _>>()?,
             opts.validate_signatures,
             opts.validate_chain
-                .then(|| {
-                    opts.network
-                        .supported_chain_ids()
-                        .map(|chains| chains.into_iter().map(|chain| chain.to_string()).collect())
-                })
+                .then(|| allowed_chains(opts.network))
                 .flatten(),
         )
         .await?;
     Ok(())
 }
 
+/// Returns the allowed chain ids (historically) for the given network.
+/// [`Network::supported_chain_ids`] is for current chains
+fn allowed_chains(network: Network) -> Option<Vec<String>> {
+    match network {
+        Network::Mainnet => Some(vec!["eip155:1".to_string()]),
+        Network::TestnetClay => Some(vec![
+            "eip155:3".to_string(),
+            "eip155:5".to_string(),
+            "eip155:100".to_string(),
+        ]),
+        Network::DevUnstable => Some(vec!["eip155:11155111".to_string()]),
+        Network::Local => None,
+        Network::InMemory => None,
+    }
+}
+
 struct FSBlockStore {
     input_ipfs_path: PathBuf,
     sharded_paths: bool,
diff --git a/pipeline/src/aggregator/mod.rs b/pipeline/src/aggregator/mod.rs
index efd01ffc3..f8a0d7dfd 100644
--- a/pipeline/src/aggregator/mod.rs
+++ b/pipeline/src/aggregator/mod.rs
@@ -92,10 +92,10 @@ const EVENT_STATES_PERSISTENT_TABLE: &str = "ceramic._internal.event_states_pers
 // columns change). The revision is a physical versioning number and not directly associated with
 // the logical schema version of the table. There are many cases where the physical revision may
 // need to change while the logical version remains the same.
-const EVENT_STATES_TABLE_OBJECT_STORE_PATH: &str = "ceramic/rev2/event_states/";
+const EVENT_STATES_TABLE_OBJECT_STORE_PATH: &str = "ceramic/rev3/event_states/";
 
 const PENDING_EVENT_STATES_TABLE: &str = "ceramic._internal.pending_event_states";
-const PENDING_EVENT_STATES_TABLE_OBJECT_STORE_PATH: &str = "ceramic/rev0/pending_event_states/";
+const PENDING_EVENT_STATES_TABLE_OBJECT_STORE_PATH: &str = "ceramic/rev1/pending_event_states/";
 
 // Maximum number of rows to cache in memory before writing to object store.
 const DEFAULT_MAX_CACHED_ROWS: usize = 10_000;
@@ -344,6 +344,8 @@ impl Aggregator {
                         col("patch"),
                         col("model_version"),
                         col("model_definition"),
+                        col("before"),
+                        col("chain_id"),
                     ])
                     .context("select ready mids")?,
             )
@@ -466,6 +468,8 @@ impl Aggregator {
                 array_element(col("previous"), lit(1)).alias("previous"),
                 cid_part(array_element(col("previous"), lit(1)))
                     .alias("previous_event_cid_partition"),
+                col("before"),
+                col("chain_id"),
                 cid_part(col("event_cid")).alias("event_cid_partition"),
             ])?
             .join_on(
@@ -489,6 +493,8 @@ impl Aggregator {
                 col("previous_data"),
                 col("previous_height"),
                 anon_col("data").alias("data"),
+                anon_col("before").alias("before"),
+                anon_col("chain_id").alias("chain_id"),
                 col("event_cid_partition"),
             ])?)
     }
@@ -522,6 +528,8 @@ impl Aggregator {
                 "patch",
                 "model_version",
                 "model_definition",
+                "before",
+                "chain_id",
             ])
             .context("select pending events")?
             .cache()
@@ -572,6 +580,8 @@ impl Aggregator {
                     name: "patched.data".to_owned(),
                 })
                 .alias("data"),
+                col("before"),
+                col("chain_id"),
                 col("event_cid_partition"),
             ])?)
     }
@@ -593,6 +603,8 @@ impl Aggregator {
                 dimension_extract(col("dimensions"), lit("model")),
             )
             .alias("validation_errors"),
+            col("before"),
+            col("chain_id"),
             col("event_cid_partition"),
         ])?)
     }
@@ -657,6 +669,8 @@ impl Aggregator {
                     name: "patched.patch".to_owned(),
                 })
                 .alias("patch"),
+                col("before"),
+                col("chain_id"),
                 col("event_cid_partition"),
             ])
             .context("select")
@@ -694,6 +708,8 @@ impl Aggregator {
                 col("patch"),
                 col("model_version"),
                 col("model_definition"),
+                col("before"),
+                col("chain_id"),
             ])
             .context("select")
     }
@@ -719,6 +735,8 @@ impl Aggregator {
                     dimension_extract(col("dimensions"), lit("unique")),
                 )
                 .alias("validation_errors"),
+                col("before"),
+                col("chain_id"),
                 col("event_cid_partition"),
             ])
             .context("select")
@@ -765,6 +783,8 @@ impl Aggregator {
                 col("event_height"),
                 col("data"),
                 col("validation_errors"),
+                col("before"),
+                col("chain_id"),
                 col("event_cid_partition"),
             ])
             .context("select")?
@@ -870,6 +890,8 @@ actor_envelope! {
     AggregatorRecorder,
     SubscribeSince => SubscribeSinceMsg,
     NewConclusionEvents => NewConclusionEventsMsg,
+    // TODO: Remove this message and use the analogous message on the Resolver.
+    // This way the canonical stream state is provided via the API
     StreamState => StreamStateMsg,
 }
 
@@ -903,13 +925,6 @@ impl Handler<SubscribeSinceMsg> for Aggregator {
         // Execute query to get initial (historical) results
         let query_stream = df.execute_stream().await?;
 
-        // Create subscription stream
-        let subscription_stream = RecordBatchStreamAdapter::new(
-            schemas::event_states(),
-            tokio_stream::wrappers::BroadcastStream::new(subscription)
-                .map_err(|err| exec_datafusion_err!("{err}")),
-        );
-
         // Merge query results with subscription updates
         rows_since(RowsSinceInput {
             session_context: &ctx,
@@ -918,7 +933,11 @@ impl Handler<SubscribeSinceMsg> for Aggregator {
             projection: message.projection,
             filters: message.filters,
             limit: message.limit,
-            subscription: Box::pin(subscription_stream),
+            subscription: Box::pin(RecordBatchStreamAdapter::new(
+                schemas::event_states(),
+                tokio_stream::wrappers::BroadcastStream::new(subscription)
+                    .map_err(|err| exec_datafusion_err!("{err}")),
+            )),
             since: query_stream,
         })
     }
@@ -1188,9 +1207,11 @@ mod tests {
     use validation::model::{ModelAccountRelationV2, ModelDefinition};
 
     use crate::{
-        cid_string::cid_string, concluder::mock::MockConcluder, conclusion_events_to_record_batch,
-        pipeline_ctx, tests::TestContext, ConclusionData, ConclusionEvent, ConclusionInit,
-        ConclusionTime,
+        cid_string::cid_string,
+        concluder::{mock::MockConcluder, TimeProof},
+        conclusion_events_to_record_batch, pipeline_ctx,
+        tests::TestContext,
+        ConclusionData, ConclusionEvent, ConclusionInit, ConclusionTime,
     };
 
     async fn init() -> anyhow::Result<TestContext<AggregatorHandle>> {
@@ -1292,6 +1313,8 @@ mod tests {
                 col("event_height"),
                 cast(col("data"), DataType::Utf8).alias("data"),
                 col("validation_errors"),
+                col("before"),
+                col("chain_id"),
             ])
             .context("select")?
             .collect()
@@ -1394,6 +1417,10 @@ mod tests {
                     "baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi",
                 )
                 .unwrap()],
+                time_proof: TimeProof {
+                    before: 1744383131980,
+                    chain_id: "test:chain".to_owned(),
+                },
             }),
             ConclusionEvent::Data(ConclusionData {
                 order: 3,
@@ -1520,11 +1547,11 @@ mod tests {
         .await
         .unwrap();
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller  | dimensions                                                                        | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | validation_errors |
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631} | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} | []                |
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | event_state_order | stream_cid                                                  | stream_type | controller  | dimensions                                                                        | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | validation_errors | before | chain_id |
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631} | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} | []                |        |          |
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+"#]].assert_eq(&event_states.to_string());
     }
     #[test(tokio::test)]
     async fn single_init_event_projection() {
@@ -1601,14 +1628,14 @@ mod tests {
                 .unwrap();
 
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | validation_errors |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} | []                |
-            | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                |
-            | 3                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          | 1            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                |
-            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | 2            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":255,"creator":"alice","green":255,"red":0}}                                                                                                                                                                                                                                                                                                                                                                                                                                                    | []                |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+---------------+------------+
+            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | validation_errors | before        | chain_id   |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+---------------+------------+
+            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} | []                |               |            |
+            | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                |               |            |
+            | 3                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          | 1            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                | 1744383131980 | test:chain |
+            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | 2            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":255,"creator":"alice","green":255,"red":0}}                                                                                                                                                                                                                                                                                                                                                                                                                                                    | []                |               |            |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+---------------+------------+"#]].assert_eq(&event_states.to_string());
     }
     #[test(tokio::test)]
     async fn multiple_single_event_passes() {
@@ -1624,11 +1651,11 @@ mod tests {
         .await
         .unwrap();
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller  | dimensions                                                                        | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | validation_errors |
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631} | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} | []                |
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | event_state_order | stream_cid                                                  | stream_type | controller  | dimensions                                                                        | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | validation_errors | before | chain_id |
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631} | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} | []                |        |          |
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+"#]].assert_eq(&event_states.to_string());
         let event_states = do_pass(
             ctx.actor_handle.clone(),
             Some(1),
@@ -1637,11 +1664,11 @@ mod tests {
         .await
         .unwrap();
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------+-------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                     | validation_errors |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------+-------------------+
-            | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}} | []                |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------+-------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                     | validation_errors | before | chain_id |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}} | []                |        |          |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------+-------------------+--------+----------+"#]].assert_eq(&event_states.to_string());
         let event_states = do_pass(
             ctx.actor_handle.clone(),
             Some(2),
@@ -1650,11 +1677,11 @@ mod tests {
         .await
         .unwrap();
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------+-------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                     | validation_errors |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------+-------------------+
-            | 3                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          | 1            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}} | []                |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------+-------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------+-------------------+---------------+------------+
+            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                     | validation_errors | before        | chain_id   |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------+-------------------+---------------+------------+
+            | 3                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          | 1            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}} | []                | 1744383131980 | test:chain |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------+-------------------+---------------+------------+"#]].assert_eq(&event_states.to_string());
         let event_states = do_pass(
             ctx.actor_handle.clone(),
             Some(3),
@@ -1663,11 +1690,11 @@ mod tests {
         .await
         .unwrap();
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+--------------------------------------------------------------------------------------------------------+-------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                   | validation_errors |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+--------------------------------------------------------------------------------------------------------+-------------------+
-            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | 2            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":255,"creator":"alice","green":255,"red":0}} | []                |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+--------------------------------------------------------------------------------------------------------+-------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+--------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                   | validation_errors | before | chain_id |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+--------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | 2            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":255,"creator":"alice","green":255,"red":0}} | []                |        |          |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+--------------------------------------------------------------------------------------------------------+-------------------+--------+----------+"#]].assert_eq(&event_states.to_string());
         ctx.shutdown().await.unwrap();
     }
     #[test(tokio::test)]
@@ -1682,11 +1709,11 @@ mod tests {
         .await
         .unwrap();
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller  | dimensions                                                                        | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | validation_errors |
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631} | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} | []                |
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | event_state_order | stream_cid                                                  | stream_type | controller  | dimensions                                                                        | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | validation_errors | before | chain_id |
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631} | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} | []                |        |          |
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+"#]].assert_eq(&event_states.to_string());
         let event_states = do_pass(
             ctx.actor_handle.clone(),
             Some(1),
@@ -1695,13 +1722,13 @@ mod tests {
         .await
         .unwrap();
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------+-------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                     | validation_errors |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------+-------------------+
-            | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}} | []                |
-            | 3                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          | 1            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}} | []                |
-            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | 2            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":255,"creator":"alice","green":255,"red":0}}   | []                |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------+-------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------+-------------------+---------------+------------+
+            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                     | validation_errors | before        | chain_id   |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------+-------------------+---------------+------------+
+            | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}} | []                |               |            |
+            | 3                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          | 1            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}} | []                | 1744383131980 | test:chain |
+            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | 2            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":255,"creator":"alice","green":255,"red":0}}   | []                |               |            |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------+-------------------+---------------+------------+"#]].assert_eq(&event_states.to_string());
         ctx.shutdown().await.unwrap();
     }
     #[test(tokio::test)]
@@ -1724,15 +1751,15 @@ mod tests {
             .unwrap();
 
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | validation_errors                                                |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------+
-            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} | []                                                               |
-            | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                                                               |
-            | 3                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          | 1            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                                                               |
-            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | 2            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":255,"creator":"alice","green":255,"red":0}}                                                                                                                                                                                                                                                                                                                                                                                                                                                    | []                                                               |
-            | 5                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeicklrck72l22zzc324b7ordbhq2amnhhivabosngfkbhk2nmuyqom | 0          | 3            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":255,"color":"00FFFF","creator":"alice","green":255,"red":0}}                                                                                                                                                                                                                                                                                                                                                                                                                                   | [Additional properties are not allowed ('color' was unexpected)] |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------+---------------+------------+
+            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | validation_errors                                                | before        | chain_id   |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------+---------------+------------+
+            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} | []                                                               |               |            |
+            | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                                                               |               |            |
+            | 3                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          | 1            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                                                               | 1744383131980 | test:chain |
+            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | 2            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":255,"creator":"alice","green":255,"red":0}}                                                                                                                                                                                                                                                                                                                                                                                                                                                    | []                                                               |               |            |
+            | 5                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeicklrck72l22zzc324b7ordbhq2amnhhivabosngfkbhk2nmuyqom | 0          | 3            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":255,"color":"00FFFF","creator":"alice","green":255,"red":0}}                                                                                                                                                                                                                                                                                                                                                                                                                                   | [Additional properties are not allowed ('color' was unexpected)] |               |            |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------+---------------+------------+"#]].assert_eq(&event_states.to_string());
     }
 
     #[test(tokio::test)]
@@ -1772,16 +1799,16 @@ mod tests {
             .unwrap();
 
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | validation_errors |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} | []                |
-            | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                |
-            | 3                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeifiqq7nc3ok6wvvvoruf6ednyhwc5jjmbn7ks5kglc6dtchqai6vu | 0          | 1            | {"metadata":{"foo":1,"shouldIndex":true},"content":{"blue":127,"creator":"alice","green":255,"red":255}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                |
-            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          | 1            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                |
-            | 5                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | 2            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":255,"creator":"alice","green":255,"red":0}}                                                                                                                                                                                                                                                                                                                                                                                                                                                    | []                |
-            | 6                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeic5wirrpbvrghm4icaoezllghar5v4z6usf6zqepfwj7hxznvwh3e | 0          | 3            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":0,"creator":"alice","green":255,"red":0}}                                                                                                                                                                                                                                                                                                                                                                                                                                                      | []                |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+---------------+------------+
+            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | validation_errors | before        | chain_id   |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+---------------+------------+
+            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} | []                |               |            |
+            | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                |               |            |
+            | 3                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeifiqq7nc3ok6wvvvoruf6ednyhwc5jjmbn7ks5kglc6dtchqai6vu | 0          | 1            | {"metadata":{"foo":1,"shouldIndex":true},"content":{"blue":127,"creator":"alice","green":255,"red":255}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                |               |            |
+            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          | 1            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                | 1744383131980 | test:chain |
+            | 5                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | 2            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":255,"creator":"alice","green":255,"red":0}}                                                                                                                                                                                                                                                                                                                                                                                                                                                    | []                |               |            |
+            | 6                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeic5wirrpbvrghm4icaoezllghar5v4z6usf6zqepfwj7hxznvwh3e | 0          | 3            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":0,"creator":"alice","green":255,"red":0}}                                                                                                                                                                                                                                                                                                                                                                                                                                                      | []                |               |            |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+---------------+------------+"#]].assert_eq(&event_states.to_string());
     }
 
     #[test(tokio::test)]
@@ -1796,14 +1823,14 @@ mod tests {
             .await
             .unwrap();
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | validation_errors |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} | []                |
-            | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                |
-            | 3                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          | 1            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                |
-            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | 2            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":255,"creator":"alice","green":255,"red":0}}                                                                                                                                                                                                                                                                                                                                                                                                                                                    | []                |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+---------------+------------+
+            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | validation_errors | before        | chain_id   |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+---------------+------------+
+            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} | []                |               |            |
+            | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                |               |            |
+            | 3                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          | 1            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                | 1744383131980 | test:chain |
+            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | 2            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":255,"creator":"alice","green":255,"red":0}}                                                                                                                                                                                                                                                                                                                                                                                                                                                    | []                |               |            |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+---------------+------------+"#]].assert_eq(&event_states.to_string());
     }
     #[test(tokio::test)]
     async fn instance_before_model_multiple_passes() {
@@ -1828,12 +1855,12 @@ mod tests {
         .await
         .unwrap();
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | validation_errors |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} | []                |
-            | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | validation_errors | before | chain_id |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} | []                |        |          |
+            | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                |        |          |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+"#]].assert_eq(&event_states.to_string());
         let event_states = do_pass(
             ctx.actor_handle.clone(),
             Some(2),
@@ -1842,12 +1869,12 @@ mod tests {
         .await
         .unwrap();
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------+-------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                     | validation_errors |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------+-------------------+
-            | 3                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          | 1            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}} | []                |
-            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | 2            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":255,"creator":"alice","green":255,"red":0}}   | []                |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------+-------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------+-------------------+---------------+------------+
+            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                     | validation_errors | before        | chain_id   |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------+-------------------+---------------+------------+
+            | 3                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          | 1            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}} | []                | 1744383131980 | test:chain |
+            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | 2            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":255,"creator":"alice","green":255,"red":0}}   | []                |               |            |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------+-------------------+---------------+------------+"#]].assert_eq(&event_states.to_string());
         ctx.shutdown().await.unwrap();
     }
 
@@ -1876,14 +1903,14 @@ mod tests {
         let ctx = init_with_concluder(mock_concluder).await.unwrap();
         let event_states = do_pass(ctx.actor_handle.clone(), None, None).await.unwrap();
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | validation_errors |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} | []                |
-            | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                |
-            | 3                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          | 1            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                |
-            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | 2            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":255,"creator":"alice","green":255,"red":0}}                                                                                                                                                                                                                                                                                                                                                                                                                                                    | []                |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+---------------+------------+
+            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | validation_errors | before        | chain_id   |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+---------------+------------+
+            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} | []                |               |            |
+            | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                |               |            |
+            | 3                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          | 1            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                | 1744383131980 | test:chain |
+            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | 2            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":255,"creator":"alice","green":255,"red":0}}                                                                                                                                                                                                                                                                                                                                                                                                                                                    | []                |               |            |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+---------------+------------+"#]].assert_eq(&event_states.to_string());
         ctx.shutdown().await.unwrap();
     }
 
@@ -1926,12 +1953,12 @@ mod tests {
             .unwrap();
             let event_states = do_pass(ctx.actor_handle.clone(), None, None).await.unwrap();
             expect![[r#"
-                +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-                | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | validation_errors |
-                +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-                | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} | []                |
-                | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                |
-                +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+"#]].assert_eq(&event_states.to_string());
+                +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+                | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | validation_errors | before | chain_id |
+                +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+                | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} | []                |        |          |
+                | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                |        |          |
+                +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+"#]].assert_eq(&event_states.to_string());
             ctx.shutdown().await.unwrap();
         }
 
@@ -1975,14 +2002,14 @@ mod tests {
         }
         let event_states = pretty_event_states(batches).await.unwrap();
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | validation_errors |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} | []                |
-            | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                |
-            | 3                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          | 1            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                |
-            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | 2            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":255,"creator":"alice","green":255,"red":0}}                                                                                                                                                                                                                                                                                                                                                                                                                                                    | []                |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+---------------+------------+
+            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | validation_errors | before        | chain_id   |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+---------------+------------+
+            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} | []                |               |            |
+            | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                |               |            |
+            | 3                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeihyzbu2wxx4yj37mozb76gkxln2dt5zxxasivhuzbnxiqd5w4xygq | 1          | 1            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                | 1744383131980 | test:chain |
+            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | 2            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"blue":255,"creator":"alice","green":255,"red":0}}                                                                                                                                                                                                                                                                                                                                                                                                                                                    | []                |               |            |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+---------------+------------+"#]].assert_eq(&event_states.to_string());
         ctx.shutdown().await.unwrap();
     }
 
@@ -2014,12 +2041,12 @@ mod tests {
         let event_states = pretty_event_states(vec![batch]).await.unwrap();
 
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | validation_errors |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} | []                |
-            | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | validation_errors | before | chain_id |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}} | []                |        |          |
+            | 2                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{"foo":1,"shouldIndex":true}}                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                |        |          |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+"#]].assert_eq(&event_states.to_string());
         ctx.shutdown().await.unwrap();
     }
 
@@ -2176,12 +2203,12 @@ mod tests {
             .unwrap();
 
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller  | dimensions                                                                        | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | validation_errors |
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631} | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}}                                             | []                |
-            | 2                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631} | baeabeiavjadi73bzahaao2wqs4nffvkwbgpsyphcwue3wgsj457sb7eymm | 0          | 1            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"alpha":{"format":"int32","type":"integer"},"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}}} | []                |
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | event_state_order | stream_cid                                                  | stream_type | controller  | dimensions                                                                        | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | validation_errors | before | chain_id |
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631} | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}}                                             | []                |        |          |
+            | 2                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631} | baeabeiavjadi73bzahaao2wqs4nffvkwbgpsyphcwue3wgsj457sb7eymm | 0          | 1            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"alpha":{"format":"int32","type":"integer"},"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}}} | []                |        |          |
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+"#]].assert_eq(&event_states.to_string());
     }
     #[test(tokio::test)]
     async fn invalid_update_model_new_required() {
@@ -2212,12 +2239,12 @@ mod tests {
             .unwrap();
 
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller  | dimensions                                                                        | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | validation_errors                          |
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------+
-            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631} | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}}                                                     | []                                         |
-            | 2                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631} | baeabeiavjadi73bzahaao2wqs4nffvkwbgpsyphcwue3wgsj457sb7eymm | 0          | 1            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"alpha":{"format":"int32","type":"integer"},"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue","alpha"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}}} | [Cannot add a new required property alpha] |
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------+--------+----------+
+            | event_state_order | stream_cid                                                  | stream_type | controller  | dimensions                                                                        | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | validation_errors                          | before | chain_id |
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------+--------+----------+
+            | 1                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631} | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{"foo":1,"shouldIndex":true}}                                                     | []                                         |        |          |
+            | 2                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 2           | did:key:bob | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631} | baeabeiavjadi73bzahaao2wqs4nffvkwbgpsyphcwue3wgsj457sb7eymm | 0          | 1            | {"metadata":{"foo":2,"shouldIndex":true},"content":{"accountRelation":{"type":"list"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"alpha":{"format":"int32","type":"integer"},"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue","alpha"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}}} | [Cannot add a new required property alpha] |        |          |
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------+--------+----------+"#]].assert_eq(&event_states.to_string());
     }
     #[test(tokio::test)]
     async fn update_model_new_instance_new_schema_new_model() {
@@ -2254,11 +2281,11 @@ mod tests {
                 .unwrap();
 
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller  | dimensions                                                                                                                                      | event_cid                                                   | event_type | event_height | data                                                                                                                                                              | validation_errors |
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | 3                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 3           | did:key:jim | {controller: 6469643a6b65793a6a696d, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 7468676671} | baeabeify7qxwjujhkxhui4atl3a6r5bo6ggx7ehwuajnzh4ohcnqumtvoe | 0          | 0            | {"content":{"alpha":0.75,"blue":255,"creator":"jim","green":0,"red":0},"metadata":{"modelVersion":"baeabeiavjadi73bzahaao2wqs4nffvkwbgpsyphcwue3wgsj457sb7eymm"}} | []                |
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | event_state_order | stream_cid                                                  | stream_type | controller  | dimensions                                                                                                                                      | event_cid                                                   | event_type | event_height | data                                                                                                                                                              | validation_errors | before | chain_id |
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | 3                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 3           | did:key:jim | {controller: 6469643a6b65793a6a696d, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 7468676671} | baeabeify7qxwjujhkxhui4atl3a6r5bo6ggx7ehwuajnzh4ohcnqumtvoe | 0          | 0            | {"content":{"alpha":0.75,"blue":255,"creator":"jim","green":0,"red":0},"metadata":{"modelVersion":"baeabeiavjadi73bzahaao2wqs4nffvkwbgpsyphcwue3wgsj457sb7eymm"}} | []                |        |          |
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+"#]].assert_eq(&event_states.to_string());
     }
     #[test(tokio::test)]
     async fn update_model_new_instance_old_schema_new_model() {
@@ -2294,11 +2321,11 @@ mod tests {
                 .unwrap();
 
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller  | dimensions                                                                                                                                      | event_cid                                                   | event_type | event_height | data                                                                                                                                                 | validation_errors |
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | 3                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 3           | did:key:jim | {controller: 6469643a6b65793a6a696d, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 6537743266} | baeabeify7qxwjujhkxhui4atl3a6r5bo6ggx7ehwuajnzh4ohcnqumtvoe | 0          | 0            | {"content":{"blue":255,"creator":"jim","green":0,"red":0},"metadata":{"modelVersion":"baeabeiavjadi73bzahaao2wqs4nffvkwbgpsyphcwue3wgsj457sb7eymm"}} | []                |
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | event_state_order | stream_cid                                                  | stream_type | controller  | dimensions                                                                                                                                      | event_cid                                                   | event_type | event_height | data                                                                                                                                                 | validation_errors | before | chain_id |
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | 3                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 3           | did:key:jim | {controller: 6469643a6b65793a6a696d, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 6537743266} | baeabeify7qxwjujhkxhui4atl3a6r5bo6ggx7ehwuajnzh4ohcnqumtvoe | 0          | 0            | {"content":{"blue":255,"creator":"jim","green":0,"red":0},"metadata":{"modelVersion":"baeabeiavjadi73bzahaao2wqs4nffvkwbgpsyphcwue3wgsj457sb7eymm"}} | []                |        |          |
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+"#]].assert_eq(&event_states.to_string());
     }
     #[test(tokio::test)]
     async fn update_model_new_instance_new_schema_old_model() {
@@ -2335,11 +2362,11 @@ mod tests {
                 .unwrap();
 
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+---------------------------------------------------------------------------------------+------------------------------------------------------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller  | dimensions                                                                                                                                      | event_cid                                                   | event_type | event_height | data                                                                                  | validation_errors                                                |
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+---------------------------------------------------------------------------------------+------------------------------------------------------------------+
-            | 3                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 3           | did:key:jim | {controller: 6469643a6b65793a6a696d, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 6a34713672} | baeabeify7qxwjujhkxhui4atl3a6r5bo6ggx7ehwuajnzh4ohcnqumtvoe | 0          | 0            | {"content":{"alpha":0.75,"blue":255,"creator":"jim","green":0,"red":0},"metadata":{}} | [Additional properties are not allowed ('alpha' was unexpected)] |
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+---------------------------------------------------------------------------------------+------------------------------------------------------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+---------------------------------------------------------------------------------------+------------------------------------------------------------------+--------+----------+
+            | event_state_order | stream_cid                                                  | stream_type | controller  | dimensions                                                                                                                                      | event_cid                                                   | event_type | event_height | data                                                                                  | validation_errors                                                | before | chain_id |
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+---------------------------------------------------------------------------------------+------------------------------------------------------------------+--------+----------+
+            | 3                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 3           | did:key:jim | {controller: 6469643a6b65793a6a696d, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 6a34713672} | baeabeify7qxwjujhkxhui4atl3a6r5bo6ggx7ehwuajnzh4ohcnqumtvoe | 0          | 0            | {"content":{"alpha":0.75,"blue":255,"creator":"jim","green":0,"red":0},"metadata":{}} | [Additional properties are not allowed ('alpha' was unexpected)] |        |          |
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+---------------------------------------------------------------------------------------+------------------------------------------------------------------+--------+----------+"#]].assert_eq(&event_states.to_string());
     }
     #[test(tokio::test)]
     async fn update_model_new_instance_old_schema_old_model() {
@@ -2375,11 +2402,11 @@ mod tests {
                 .unwrap();
 
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+--------------------------------------------------------------------------+-------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller  | dimensions                                                                                                                                      | event_cid                                                   | event_type | event_height | data                                                                     | validation_errors |
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+--------------------------------------------------------------------------+-------------------+
-            | 3                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 3           | did:key:jim | {controller: 6469643a6b65793a6a696d, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 7468676671} | baeabeify7qxwjujhkxhui4atl3a6r5bo6ggx7ehwuajnzh4ohcnqumtvoe | 0          | 0            | {"content":{"blue":255,"creator":"jim","green":0,"red":0},"metadata":{}} | []                |
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+--------------------------------------------------------------------------+-------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+--------------------------------------------------------------------------+-------------------+--------+----------+
+            | event_state_order | stream_cid                                                  | stream_type | controller  | dimensions                                                                                                                                      | event_cid                                                   | event_type | event_height | data                                                                     | validation_errors | before | chain_id |
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+--------------------------------------------------------------------------+-------------------+--------+----------+
+            | 3                 | baeabeieatrkhby3dlzev6wuyin66mfvwmew2rm3vh7bo4nfigjflnbmf7u | 3           | did:key:jim | {controller: 6469643a6b65793a6a696d, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 7468676671} | baeabeify7qxwjujhkxhui4atl3a6r5bo6ggx7ehwuajnzh4ohcnqumtvoe | 0          | 0            | {"content":{"blue":255,"creator":"jim","green":0,"red":0},"metadata":{}} | []                |        |          |
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+--------------------------------------------------------------------------+-------------------+--------+----------+"#]].assert_eq(&event_states.to_string());
     }
     #[test(tokio::test)]
     async fn update_model_update_instance_new_schema_new_model() {
@@ -2405,11 +2432,11 @@ mod tests {
                 .unwrap();
 
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                               | validation_errors |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeify7qxwjujhkxhui4atl3a6r5bo6ggx7ehwuajnzh4ohcnqumtvoe | 0          | 1            | {"metadata":{"foo":1,"modelVersion":"baeabeiavjadi73bzahaao2wqs4nffvkwbgpsyphcwue3wgsj457sb7eymm","shouldIndex":true},"content":{"alpha":0.75,"blue":255,"creator":"alice","green":255,"red":255}} | []                |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                               | validation_errors | before | chain_id |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeify7qxwjujhkxhui4atl3a6r5bo6ggx7ehwuajnzh4ohcnqumtvoe | 0          | 1            | {"metadata":{"foo":1,"modelVersion":"baeabeiavjadi73bzahaao2wqs4nffvkwbgpsyphcwue3wgsj457sb7eymm","shouldIndex":true},"content":{"alpha":0.75,"blue":255,"creator":"alice","green":255,"red":255}} | []                |        |          |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+"#]].assert_eq(&event_states.to_string());
     }
     #[test(tokio::test)]
     async fn update_model_update_instance_old_schema_new_model() {
@@ -2435,11 +2462,11 @@ mod tests {
                 .unwrap();
 
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                | validation_errors |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeify7qxwjujhkxhui4atl3a6r5bo6ggx7ehwuajnzh4ohcnqumtvoe | 0          | 1            | {"metadata":{"foo":1,"modelVersion":"baeabeiavjadi73bzahaao2wqs4nffvkwbgpsyphcwue3wgsj457sb7eymm","shouldIndex":true},"content":{"blue":255,"creator":"alice","green":0,"red":255}} | []                |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                | validation_errors | before | chain_id |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeify7qxwjujhkxhui4atl3a6r5bo6ggx7ehwuajnzh4ohcnqumtvoe | 0          | 1            | {"metadata":{"foo":1,"modelVersion":"baeabeiavjadi73bzahaao2wqs4nffvkwbgpsyphcwue3wgsj457sb7eymm","shouldIndex":true},"content":{"blue":255,"creator":"alice","green":0,"red":255}} | []                |        |          |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+"#]].assert_eq(&event_states.to_string());
     }
     #[test(tokio::test)]
     async fn update_model_update_instance_new_schema_old_model() {
@@ -2465,11 +2492,11 @@ mod tests {
                 .unwrap();
 
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                  | validation_errors                                                |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------+
-            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeify7qxwjujhkxhui4atl3a6r5bo6ggx7ehwuajnzh4ohcnqumtvoe | 0          | 1            | {"metadata":{"foo":1,"shouldIndex":true},"content":{"alpha":0.75,"blue":255,"creator":"alice","green":255,"red":255}} | [Additional properties are not allowed ('alpha' was unexpected)] |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------+--------+----------+
+            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                  | validation_errors                                                | before | chain_id |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------+--------+----------+
+            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeify7qxwjujhkxhui4atl3a6r5bo6ggx7ehwuajnzh4ohcnqumtvoe | 0          | 1            | {"metadata":{"foo":1,"shouldIndex":true},"content":{"alpha":0.75,"blue":255,"creator":"alice","green":255,"red":255}} | [Additional properties are not allowed ('alpha' was unexpected)] |        |          |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------+--------+----------+"#]].assert_eq(&event_states.to_string());
     }
     #[test(tokio::test)]
     async fn update_model_update_instance_old_schema_old_model() {
@@ -2495,11 +2522,11 @@ mod tests {
                 .unwrap();
 
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+--------------------------------------------------------------------------------------------------------+-------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                   | validation_errors |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+--------------------------------------------------------------------------------------------------------+-------------------+
-            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeify7qxwjujhkxhui4atl3a6r5bo6ggx7ehwuajnzh4ohcnqumtvoe | 0          | 1            | {"metadata":{"foo":1,"shouldIndex":true},"content":{"blue":255,"creator":"alice","green":0,"red":255}} | []                |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+--------------------------------------------------------------------------------------------------------+-------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+--------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                   | validation_errors | before | chain_id |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+--------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | 4                 | baeabeicdwdrilh6gazn6a7eruxbt5q46cquzimxsk52vcwobfvjhlndafm | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce010201001220809c5470e3635e495f5a98437de616b6612da8b3753fc2ee34a8324ab68585fd, unique: 77676b3533} | baeabeify7qxwjujhkxhui4atl3a6r5bo6ggx7ehwuajnzh4ohcnqumtvoe | 0          | 1            | {"metadata":{"foo":1,"shouldIndex":true},"content":{"blue":255,"creator":"alice","green":0,"red":255}} | []                |        |          |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+--------------------------------------------------------------------------------------------------------+-------------------+--------+----------+"#]].assert_eq(&event_states.to_string());
     }
 
     //---------------------------------------------------------------
@@ -2618,13 +2645,13 @@ mod tests {
         .unwrap();
 
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+---------------+---------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                      | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | validation_errors |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+---------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+
-            | 1                 | baeabeibrydyefwuzizf6s32lbuu27rpjibrbtsziqukscbnuo3y52pgmha | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                               | baeabeibrydyefwuzizf6s32lbuu27rpjibrbtsziqukscbnuo3y52pgmha | 0          | 0            | {"content":{"accountRelation":{"type":"single"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{}} | []                |
-            | 2                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":null,"metadata":{}}                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | []                |
-            | 3                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | 1            | {"metadata":{},"content":{"blue":255,"creator":"sally","green":255,"red":255}}                                                                                                                                                                                                                                                                                                                                                                                                                                                    | []                |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+---------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+---------------+---------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                      | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | validation_errors | before | chain_id |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+---------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+
+            | 1                 | baeabeibrydyefwuzizf6s32lbuu27rpjibrbtsziqukscbnuo3y52pgmha | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                               | baeabeibrydyefwuzizf6s32lbuu27rpjibrbtsziqukscbnuo3y52pgmha | 0          | 0            | {"content":{"accountRelation":{"type":"single"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{}} | []                |        |          |
+            | 2                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":null,"metadata":{}}                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    | []                |        |          |
+            | 3                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | 1            | {"metadata":{},"content":{"blue":255,"creator":"sally","green":255,"red":255}}                                                                                                                                                                                                                                                                                                                                                                                                                                                    | []                |        |          |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+---------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------+--------+----------+"#]].assert_eq(&event_states.to_string());
     }
     #[test(tokio::test)]
     async fn update_single_relation_init_with_content() {
@@ -2725,13 +2752,13 @@ mod tests {
         .unwrap();
 
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+---------------+---------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                      | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | validation_errors                                                                      |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+---------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------+
-            | 1                 | baeabeibrydyefwuzizf6s32lbuu27rpjibrbtsziqukscbnuo3y52pgmha | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                               | baeabeibrydyefwuzizf6s32lbuu27rpjibrbtsziqukscbnuo3y52pgmha | 0          | 0            | {"content":{"accountRelation":{"type":"single"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{}} | []                                                                                     |
-            | 2                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{}}                                                                                                                                                                                                                                                                                                                                                                                                                                                    | [ModelInstanceDocuments with an account relation Single must not have initial content] |
-            | 3                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | 1            | {"metadata":{},"content":{"blue":255,"creator":"sally","green":255,"red":255}}                                                                                                                                                                                                                                                                                                                                                                                                                                                    | []                                                                                     |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+---------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+---------------+---------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------+--------+----------+
+            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                      | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              | validation_errors                                                                      | before | chain_id |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+---------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------+--------+----------+
+            | 1                 | baeabeibrydyefwuzizf6s32lbuu27rpjibrbtsziqukscbnuo3y52pgmha | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                               | baeabeibrydyefwuzizf6s32lbuu27rpjibrbtsziqukscbnuo3y52pgmha | 0          | 0            | {"content":{"accountRelation":{"type":"single"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{}} | []                                                                                     |        |          |
+            | 2                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{}}                                                                                                                                                                                                                                                                                                                                                                                                                                                    | [ModelInstanceDocuments with an account relation Single must not have initial content] |        |          |
+            | 3                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | 1            | {"metadata":{},"content":{"blue":255,"creator":"sally","green":255,"red":255}}                                                                                                                                                                                                                                                                                                                                                                                                                                                    | []                                                                                     |        |          |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+---------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------------------------------+--------+----------+"#]].assert_eq(&event_states.to_string());
     }
     #[test(tokio::test)]
     async fn update_list_relation_locked_fields() {
@@ -2833,13 +2860,13 @@ mod tests {
         .unwrap();
 
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | validation_errors                              |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------+
-            | 1                 | baeabeibrydyefwuzizf6s32lbuu27rpjibrbtsziqukscbnuo3y52pgmha | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeibrydyefwuzizf6s32lbuu27rpjibrbtsziqukscbnuo3y52pgmha | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"immutableFields":["creator"],"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{}} | []                                             |
-            | 2                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38, unique: 77776f7962} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{}}                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | []                                             |
-            | 3                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38, unique: 77776f7962} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | 1            | {"metadata":{},"content":{"blue":255,"creator":"sally","green":255,"red":255}}                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | [Immutable field 'creator' cannot be modified] |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------+--------+----------+
+            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | validation_errors                              | before | chain_id |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------+--------+----------+
+            | 1                 | baeabeibrydyefwuzizf6s32lbuu27rpjibrbtsziqukscbnuo3y52pgmha | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeibrydyefwuzizf6s32lbuu27rpjibrbtsziqukscbnuo3y52pgmha | 0          | 0            | {"content":{"accountRelation":{"type":"list"},"immutableFields":["creator"],"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{}} | []                                             |        |          |
+            | 2                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38, unique: 77776f7962} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":{"blue":255,"creator":"alice","green":255,"red":255},"metadata":{}}                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | []                                             |        |          |
+            | 3                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38, unique: 77776f7962} | baeabeibrtuyyqwd6y4aa62qxaimjhafielf7fc22fa5b7i7vptcu5263em | 0          | 1            | {"metadata":{},"content":{"blue":255,"creator":"sally","green":255,"red":255}}                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | [Immutable field 'creator' cannot be modified] |        |          |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------+--------+----------+"#]].assert_eq(&event_states.to_string());
     }
     #[test(tokio::test)]
     async fn update_single_relation_locked_fields() {
@@ -2974,14 +3001,14 @@ mod tests {
         .unwrap();
 
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+---------------+---------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                      | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | validation_errors                              |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+---------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------+
-            | 1                 | baeabeibrydyefwuzizf6s32lbuu27rpjibrbtsziqukscbnuo3y52pgmha | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                               | baeabeibrydyefwuzizf6s32lbuu27rpjibrbtsziqukscbnuo3y52pgmha | 0          | 0            | {"content":{"accountRelation":{"type":"single"},"immutableFields":["creator"],"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{}} | []                                             |
-            | 2                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":null,"metadata":{}}                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                                             |
-            | 3                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38} | baeabeigbuxpmhj2fkwe2oeqflwz6xair5i3sxnoyqzeh5rly25l3g5rlzy | 0          | 1            | {"metadata":{},"content":{"blue":255,"creator":"sally","green":255,"red":255}}                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                                             |
-            | 4                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38} | baeabeigyxnmgyi6mekyqbx3rpp5fi7chvl5tp6vjxaumsqgaa5ggqbq4lm | 0          | 2            | {"metadata":{"foo":2},"content":{"blue":255,"creator":"sally","green":255,"red":255}}                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | [Immutable field 'creator' cannot be modified] |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+---------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+---------------+---------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------+--------+----------+
+            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                      | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | validation_errors                              | before | chain_id |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+---------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------+--------+----------+
+            | 1                 | baeabeibrydyefwuzizf6s32lbuu27rpjibrbtsziqukscbnuo3y52pgmha | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                               | baeabeibrydyefwuzizf6s32lbuu27rpjibrbtsziqukscbnuo3y52pgmha | 0          | 0            | {"content":{"accountRelation":{"type":"single"},"immutableFields":["creator"],"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{}} | []                                             |        |          |
+            | 2                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":null,"metadata":{}}                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                                             |        |          |
+            | 3                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38} | baeabeigbuxpmhj2fkwe2oeqflwz6xair5i3sxnoyqzeh5rly25l3g5rlzy | 0          | 1            | {"metadata":{},"content":{"blue":255,"creator":"sally","green":255,"red":255}}                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  | []                                             |        |          |
+            | 4                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38} | baeabeigyxnmgyi6mekyqbx3rpp5fi7chvl5tp6vjxaumsqgaa5ggqbq4lm | 0          | 2            | {"metadata":{"foo":2},"content":{"blue":255,"creator":"sally","green":255,"red":255}}                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | [Immutable field 'creator' cannot be modified] |        |          |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+---------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------+--------+----------+"#]].assert_eq(&event_states.to_string());
     }
 
     #[test(tokio::test)]
@@ -3176,16 +3203,16 @@ mod tests {
         .unwrap();
 
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | validation_errors                                                                                           |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------+
-            | 1                 | baeabeibrydyefwuzizf6s32lbuu27rpjibrbtsziqukscbnuo3y52pgmha | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeibrydyefwuzizf6s32lbuu27rpjibrbtsziqukscbnuo3y52pgmha | 0          | 0            | {"content":{"accountRelation":{"fields":["creator"],"type":"set"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{}} | []                                                                                                          |
-            | 2                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38, unique: 616c696365} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":null,"metadata":{}}                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | []                                                                                                          |
-            | 3                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38, unique: 616c696365} | baeabeibhai2zanz5v4sobyzddgvrddweqardx47frsqexv3u45wxpr22ni | 0          | 1            | {"metadata":{},"content":{"blue":255,"creator":"alice","green":255,"red":255}}                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | []                                                                                                          |
-            | 4                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38, unique: 616c696365} | baeabeid7bnwog7iafyk7w543ufid7rjmvs72zvczbzpkltyy3bwaomxh7q | 0          | 1            |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | [cannot validate null instance document]                                                                    |
-            | 5                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38, unique: 616c696365} | baeabeigbuxpmhj2fkwe2oeqflwz6xair5i3sxnoyqzeh5rly25l3g5rlzy | 0          | 1            | {"metadata":{},"content":{"blue":255,"creator":"alice-not-unique-header","green":255,"red":255}}                                                                                                                                                                                                                                                                                                                                                                                                                                                    | [Unique content fields value does not match metadata. Expected 'alice' but found 'alice-not-unique-header'] |
-            | 6                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38, unique: 616c696365} | baeabeigyxnmgyi6mekyqbx3rpp5fi7chvl5tp6vjxaumsqgaa5ggqbq4lm | 0          | 2            | {"metadata":{},"content":{"blue":255,"creator":"sally","green":255,"red":255}}                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | [Set account relation field 'creator' cannot be modified]                                                   |
-            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------+--------+----------+
+            | event_state_order | stream_cid                                                  | stream_type | controller    | dimensions                                                                                                                                          | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | validation_errors                                                                                           | before | chain_id |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------+--------+----------+
+            | 1                 | baeabeibrydyefwuzizf6s32lbuu27rpjibrbtsziqukscbnuo3y52pgmha | 2           | did:key:bob   | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631}                                                                   | baeabeibrydyefwuzizf6s32lbuu27rpjibrbtsziqukscbnuo3y52pgmha | 0          | 0            | {"content":{"accountRelation":{"fields":["creator"],"type":"set"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{}} | []                                                                                                          |        |          |
+            | 2                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38, unique: 616c696365} | baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi | 0          | 0            | {"content":null,"metadata":{}}                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | []                                                                                                          |        |          |
+            | 3                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38, unique: 616c696365} | baeabeibhai2zanz5v4sobyzddgvrddweqardx47frsqexv3u45wxpr22ni | 0          | 1            | {"metadata":{},"content":{"blue":255,"creator":"alice","green":255,"red":255}}                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | []                                                                                                          |        |          |
+            | 4                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38, unique: 616c696365} | baeabeid7bnwog7iafyk7w543ufid7rjmvs72zvczbzpkltyy3bwaomxh7q | 0          | 1            |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | [cannot validate null instance document]                                                                    |        |          |
+            | 5                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38, unique: 616c696365} | baeabeigbuxpmhj2fkwe2oeqflwz6xair5i3sxnoyqzeh5rly25l3g5rlzy | 0          | 1            | {"metadata":{},"content":{"blue":255,"creator":"alice-not-unique-header","green":255,"red":255}}                                                                                                                                                                                                                                                                                                                                                                                                                                                    | [Unique content fields value does not match metadata. Expected 'alice' but found 'alice-not-unique-header'] |        |          |
+            | 6                 | baeabeihrpnqmppjqdohl2stvfevu7jn57zjqzqb4dflbl4ettogmt56xoy | 3           | did:key:alice | {controller: 6469643a6b65793a616c696365, model: ce01020100122031c0f042da99464be96f4b0d29afc5e9406219cb2885152105b476f1dd3ccc38, unique: 616c696365} | baeabeigyxnmgyi6mekyqbx3rpp5fi7chvl5tp6vjxaumsqgaa5ggqbq4lm | 0          | 2            | {"metadata":{},"content":{"blue":255,"creator":"sally","green":255,"red":255}}                                                                                                                                                                                                                                                                                                                                                                                                                                                                      | [Set account relation field 'creator' cannot be modified]                                                   |        |          |
+            +-------------------+-------------------------------------------------------------+-------------+---------------+-----------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------+--------+----------+"#]].assert_eq(&event_states.to_string());
     }
     #[test(tokio::test)]
     async fn model_definition_set_relation_no_fields() {
@@ -3232,10 +3259,10 @@ mod tests {
         .unwrap();
 
         expect![[r#"
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------+
-            | event_state_order | stream_cid                                                  | stream_type | controller  | dimensions                                                                        | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | validation_errors                                              |
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------+
-            | 1                 | baeabeibrydyefwuzizf6s32lbuu27rpjibrbtsziqukscbnuo3y52pgmha | 2           | did:key:bob | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631} | baeabeibrydyefwuzizf6s32lbuu27rpjibrbtsziqukscbnuo3y52pgmha | 0          | 0            | {"content":{"accountRelation":{"fields":[],"type":"set"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{}} | [Account relation of type Set must include at least one field] |
-            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------+"#]].assert_eq(&event_states.to_string());
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------+--------+----------+
+            | event_state_order | stream_cid                                                  | stream_type | controller  | dimensions                                                                        | event_cid                                                   | event_type | event_height | data                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | validation_errors                                              | before | chain_id |
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------+--------+----------+
+            | 1                 | baeabeibrydyefwuzizf6s32lbuu27rpjibrbtsziqukscbnuo3y52pgmha | 2           | did:key:bob | {controller: 6469643a6b65793a626f62, model: ce01040171710b0009686d6f64656c2d7631} | baeabeibrydyefwuzizf6s32lbuu27rpjibrbtsziqukscbnuo3y52pgmha | 0          | 0            | {"content":{"accountRelation":{"fields":[],"type":"set"},"implements":[],"interface":false,"name":"TestSmallModel","relations":{},"schema":{"$schema":"https://json-schema.org/draft/2020-12/schema","additionalProperties":false,"properties":{"blue":{"format":"int32","type":"integer"},"creator":{"type":"string"},"green":{"format":"int32","type":"integer"},"red":{"format":"int32","type":"integer"}},"required":["creator","red","green","blue"],"title":"SmallModel","type":"object"},"version":"2.0","views":{}},"metadata":{}} | [Account relation of type Set must include at least one field] |        |          |
+            +-------------------+-------------------------------------------------------------+-------------+-------------+-----------------------------------------------------------------------------------+-------------------------------------------------------------+------------+--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+----------------------------------------------------------------+--------+----------+"#]].assert_eq(&event_states.to_string());
     }
 }
diff --git a/pipeline/src/concluder/event.rs b/pipeline/src/concluder/event.rs
index 3ce48f458..268c1cd29 100644
--- a/pipeline/src/concluder/event.rs
+++ b/pipeline/src/concluder/event.rs
@@ -110,7 +110,17 @@ pub struct ConclusionTime {
     pub init: ConclusionInit,
     /// Ordered list of previous events this event references.
     pub previous: Vec<Cid>,
-    //TODO Add temporal conclusions, i.e the block timestamp of this event
+    /// Proof of time event anchoring
+    pub time_proof: TimeProof,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+/// Time event proof has been validated and resulted in a proof of time event anchoring
+pub struct TimeProof {
+    /// It is known that the time event existed before this time as a Unix timestamp in seconds.
+    pub before: u64,
+    /// Chain ID where this time event was anchored.
+    pub chain_id: String,
 }
 
 impl<'a> TryFrom<&'a unvalidated::Event<Ipld>> for ConclusionInit {
@@ -198,6 +208,8 @@ pub struct ConclusionEventBuilder {
     event_cid: BinaryBuilder,
     data: BinaryBuilder,
     previous: ListBuilder<BinaryBuilder>,
+    before: UInt64Builder,
+    chain_id: StringBuilder,
 }
 
 impl Default for ConclusionEventBuilder {
@@ -223,6 +235,8 @@ impl Default for ConclusionEventBuilder {
             data: BinaryBuilder::new(),
             previous: ListBuilder::new(BinaryBuilder::new())
                 .with_field(Field::new_list_field(DataType::Binary, false)),
+            before: UInt64Builder::new(),
+            chain_id: StringBuilder::new(),
         }
     }
 }
@@ -238,6 +252,8 @@ impl ConclusionEventBuilder {
                 }
                 self.previous.append(!data_event.previous.is_empty());
                 self.order.append_value(data_event.order);
+                self.before.append_null();
+                self.chain_id.append_null();
                 &data_event.init
             }
             ConclusionEvent::Time(time_event) => {
@@ -248,6 +264,12 @@ impl ConclusionEventBuilder {
                 }
                 self.previous.append(!time_event.previous.is_empty());
                 self.order.append_value(time_event.order);
+
+                // Add time proof data
+                self.before.append_value(time_event.time_proof.before);
+                self.chain_id
+                    .append_value(time_event.time_proof.chain_id.clone());
+
                 &time_event.init
             }
         };
@@ -279,6 +301,8 @@ impl ConclusionEventBuilder {
             ("event_type", Arc::new(self.event_type.finish()) as ArrayRef),
             ("data", Arc::new(self.data.finish()) as ArrayRef),
             ("previous", Arc::new(self.previous.finish()) as ArrayRef),
+            ("before", Arc::new(self.before.finish()) as ArrayRef),
+            ("chain_id", Arc::new(self.chain_id.finish()) as ArrayRef),
         ])
         .expect("unreachable, we should always construct a well formed struct array")
     }
@@ -463,6 +487,10 @@ mod tests {
                     ],
                 },
                 order: 2,
+                time_proof: TimeProof {
+                    before: 1744383131980,
+                    chain_id: "test:chain".to_owned(),
+                },
             }),
             ConclusionEvent::Data(ConclusionData {
                 event_cid: Cid::from_str(
@@ -498,14 +526,14 @@ mod tests {
 
         // Use expect_test to validate the output
         expect![[r#"
-            +------------------------+-------------------------------------------------------------+-------------+---------------+-------------------------------------------------------------+-------------------------------------------------------------+------------+------+----------------------------------------------------------------------------------------------------------------------------+
-            | conclusion_event_order | stream_cid                                                  | stream_type | controller    | dimensions                                                  | event_cid                                                   | event_type | data | previous                                                                                                                   |
-            +------------------------+-------------------------------------------------------------+-------------+---------------+-------------------------------------------------------------+-------------------------------------------------------------+------------+------+----------------------------------------------------------------------------------------------------------------------------+
-            | 0                      | baeabeif2fdfqe2hu6ugmvgozkk3bbp5cqi4udp5rerjmz4pdgbzf3fvobu | 2           | did:key:test1 | {controller: 6469643a6b65793a7465737431, model: 6d6f64656c} | baeabeif2fdfqe2hu6ugmvgozkk3bbp5cqi4udp5rerjmz4pdgbzf3fvobu | 0          | 123  |                                                                                                                            |
-            | 1                      | baeabeif2fdfqe2hu6ugmvgozkk3bbp5cqi4udp5rerjmz4pdgbzf3fvobu | 2           | did:key:test1 | {controller: 6469643a6b65793a7465737431, model: 6d6f64656c} | baeabeid2w5pgdsdh25nah7batmhxanbj3x2w2is3atser7qxboyojv236q | 0          | 456  | [baeabeif2fdfqe2hu6ugmvgozkk3bbp5cqi4udp5rerjmz4pdgbzf3fvobu]                                                              |
-            | 2                      | baeabeif2fdfqe2hu6ugmvgozkk3bbp5cqi4udp5rerjmz4pdgbzf3fvobu | 2           | did:key:test1 | {controller: 6469643a6b65793a7465737431, model: 6d6f64656c} | baeabeidtub3bnbojbickf6d4pqscaw6xpt5ksgido7kcsg2jyftaj237di | 1          |      | [baeabeid2w5pgdsdh25nah7batmhxanbj3x2w2is3atser7qxboyojv236q]                                                              |
-            | 3                      | baeabeif2fdfqe2hu6ugmvgozkk3bbp5cqi4udp5rerjmz4pdgbzf3fvobu | 2           | did:key:test1 | {controller: 6469643a6b65793a7465737431, model: 6d6f64656c} | baeabeiewqcj4bwhcssizv5kcyvsvm57bxghjpqshnbzkc6rijmwb4im4yq | 0          | 789  | [baeabeidtub3bnbojbickf6d4pqscaw6xpt5ksgido7kcsg2jyftaj237di, baeabeid2w5pgdsdh25nah7batmhxanbj3x2w2is3atser7qxboyojv236q] |
-            +------------------------+-------------------------------------------------------------+-------------+---------------+-------------------------------------------------------------+-------------------------------------------------------------+------------+------+----------------------------------------------------------------------------------------------------------------------------+"#]].assert_eq(&formatted);
+            +------------------------+-------------------------------------------------------------+-------------+---------------+-------------------------------------------------------------+-------------------------------------------------------------+------------+------+----------------------------------------------------------------------------------------------------------------------------+---------------+------------+
+            | conclusion_event_order | stream_cid                                                  | stream_type | controller    | dimensions                                                  | event_cid                                                   | event_type | data | previous                                                                                                                   | before        | chain_id   |
+            +------------------------+-------------------------------------------------------------+-------------+---------------+-------------------------------------------------------------+-------------------------------------------------------------+------------+------+----------------------------------------------------------------------------------------------------------------------------+---------------+------------+
+            | 0                      | baeabeif2fdfqe2hu6ugmvgozkk3bbp5cqi4udp5rerjmz4pdgbzf3fvobu | 2           | did:key:test1 | {controller: 6469643a6b65793a7465737431, model: 6d6f64656c} | baeabeif2fdfqe2hu6ugmvgozkk3bbp5cqi4udp5rerjmz4pdgbzf3fvobu | 0          | 123  |                                                                                                                            |               |            |
+            | 1                      | baeabeif2fdfqe2hu6ugmvgozkk3bbp5cqi4udp5rerjmz4pdgbzf3fvobu | 2           | did:key:test1 | {controller: 6469643a6b65793a7465737431, model: 6d6f64656c} | baeabeid2w5pgdsdh25nah7batmhxanbj3x2w2is3atser7qxboyojv236q | 0          | 456  | [baeabeif2fdfqe2hu6ugmvgozkk3bbp5cqi4udp5rerjmz4pdgbzf3fvobu]                                                              |               |            |
+            | 2                      | baeabeif2fdfqe2hu6ugmvgozkk3bbp5cqi4udp5rerjmz4pdgbzf3fvobu | 2           | did:key:test1 | {controller: 6469643a6b65793a7465737431, model: 6d6f64656c} | baeabeidtub3bnbojbickf6d4pqscaw6xpt5ksgido7kcsg2jyftaj237di | 1          |      | [baeabeid2w5pgdsdh25nah7batmhxanbj3x2w2is3atser7qxboyojv236q]                                                              | 1744383131980 | test:chain |
+            | 3                      | baeabeif2fdfqe2hu6ugmvgozkk3bbp5cqi4udp5rerjmz4pdgbzf3fvobu | 2           | did:key:test1 | {controller: 6469643a6b65793a7465737431, model: 6d6f64656c} | baeabeiewqcj4bwhcssizv5kcyvsvm57bxghjpqshnbzkc6rijmwb4im4yq | 0          | 789  | [baeabeidtub3bnbojbickf6d4pqscaw6xpt5ksgido7kcsg2jyftaj237di, baeabeid2w5pgdsdh25nah7batmhxanbj3x2w2is3atser7qxboyojv236q] |               |            |
+            +------------------------+-------------------------------------------------------------+-------------+---------------+-------------------------------------------------------------+-------------------------------------------------------------+------------+------+----------------------------------------------------------------------------------------------------------------------------+---------------+------------+"#]].assert_eq(&formatted);
     }
 
     // Applies various transformations on a record batch of conclusion_events data to make it easier to
@@ -547,6 +575,8 @@ mod tests {
                     vec![col("previous")],
                 ))
                 .alias("previous"),
+                col("before"),
+                col("chain_id"),
             ])
             .unwrap()
             .sort(vec![col("conclusion_event_order").sort(true, true)])
diff --git a/pipeline/src/concluder/metrics.rs b/pipeline/src/concluder/metrics.rs
index 75249804a..98d81f7de 100644
--- a/pipeline/src/concluder/metrics.rs
+++ b/pipeline/src/concluder/metrics.rs
@@ -3,7 +3,7 @@ use ceramic_metrics::Recorder;
 
 use crate::metrics::{MessageLabels, Metrics};
 
-use super::{ConcluderRecorder, EventsSinceMsg, NewEventsMsg};
+use super::{ConcluderRecorder, NewEventsMsg};
 
 impl Recorder<MessageEvent<NewEventsMsg>> for Metrics {
     fn record(&self, event: &MessageEvent<NewEventsMsg>) {
@@ -12,11 +12,4 @@ impl Recorder<MessageEvent<NewEventsMsg>> for Metrics {
             .inc();
     }
 }
-impl Recorder<MessageEvent<EventsSinceMsg>> for Metrics {
-    fn record(&self, event: &MessageEvent<EventsSinceMsg>) {
-        self.message_count
-            .get_or_create(&MessageLabels::from(event))
-            .inc();
-    }
-}
 impl ConcluderRecorder for Metrics {}
diff --git a/pipeline/src/concluder/mock.rs b/pipeline/src/concluder/mock.rs
index c4e08f311..52361d1c7 100644
--- a/pipeline/src/concluder/mock.rs
+++ b/pipeline/src/concluder/mock.rs
@@ -7,8 +7,7 @@ use prometheus_client::registry::Registry;
 use crate::metrics::Metrics;
 
 use super::{
-    Concluder, ConcluderActor, ConcluderEnvelope, ConcluderHandle, EventsSinceMsg, NewEventsMsg,
-    SubscribeSinceMsg,
+    Concluder, ConcluderActor, ConcluderEnvelope, ConcluderHandle, NewEventsMsg, SubscribeSinceMsg,
 };
 
 mock! {
@@ -28,11 +27,6 @@ mock! {
             &mut self,
             message: SubscribeSinceMsg,
         ) -> <SubscribeSinceMsg as Message>::Result;
-        #[allow(missing_docs)]
-        pub fn handle_events_since(
-            &mut self,
-            message: EventsSinceMsg,
-        ) -> <EventsSinceMsg as Message>::Result;
     }
 }
 
@@ -53,13 +47,6 @@ impl Handler<SubscribeSinceMsg> for MockConcluder {
     }
 }
 
-#[async_trait]
-impl Handler<EventsSinceMsg> for MockConcluder {
-    async fn handle(&mut self, message: EventsSinceMsg) -> <EventsSinceMsg as Message>::Result {
-        self.handle_events_since(message)
-    }
-}
-
 impl Actor for MockConcluder {
     type Envelope = ConcluderEnvelope;
 }
diff --git a/pipeline/src/concluder/mod.rs b/pipeline/src/concluder/mod.rs
index e9383e7cf..29c2862f2 100644
--- a/pipeline/src/concluder/mod.rs
+++ b/pipeline/src/concluder/mod.rs
@@ -42,7 +42,7 @@ use crate::{
 pub use crate::since::SubscribeSinceMsg;
 pub use event::{
     conclusion_events_to_record_batch, ConclusionData, ConclusionEvent, ConclusionInit,
-    ConclusionTime,
+    ConclusionTime, TimeProof,
 };
 pub use table::ConclusionFeed;
 
@@ -169,7 +169,6 @@ actor_envelope! {
     ConcluderRecorder,
     NewEvents => NewEventsMsg,
     SubscribeSince => SubscribeSinceMsg,
-    EventsSince => EventsSinceMsg,
 }
 
 /// Notify actor of new events
@@ -329,23 +328,6 @@ async fn events_since(
     Ok(conclusion_events.execute_stream().await?)
 }
 
-/// Request the events since a highwater mark
-#[derive(Debug)]
-pub struct EventsSinceMsg {
-    /// Optional filters to apply to the query
-    pub filters: Vec<Expr>,
-}
-impl Message for EventsSinceMsg {
-    type Result = anyhow::Result<SendableRecordBatchStream>;
-}
-
-#[async_trait]
-impl Handler<EventsSinceMsg> for Concluder {
-    async fn handle(&mut self, message: EventsSinceMsg) -> <EventsSinceMsg as Message>::Result {
-        events_since(&self.ctx, Some(message.filters), None).await
-    }
-}
-
 #[async_trait]
 impl FeedTableSource for ConcluderHandle {
     fn schema(&self) -> SchemaRef {
@@ -381,6 +363,7 @@ mod tests {
     use test_log::test;
 
     use crate::{
+        concluder::TimeProof,
         pipeline_ctx,
         tests::{MockConclusionFeed, TestContext},
         ConclusionData, ConclusionFeedSource, ConclusionInit, ConclusionTime, Metrics,
@@ -466,6 +449,10 @@ mod tests {
                         "baeabeials2i6o2ppkj55kfbh7r2fzc73r2esohqfivekpag553lyc7f6bi",
                     )
                     .unwrap()],
+                    time_proof: TimeProof {
+                        before: 1744383131980,
+                        chain_id: "test:chain".to_owned(),
+                    },
                 })])
             });
         mock_feed
diff --git a/pipeline/src/lib.rs b/pipeline/src/lib.rs
index 2d792b29a..f7a45dc45 100644
--- a/pipeline/src/lib.rs
+++ b/pipeline/src/lib.rs
@@ -17,6 +17,7 @@ pub mod concluder;
 mod config;
 pub mod dimension_extract;
 mod metrics;
+pub mod resolver;
 pub mod schemas;
 mod since;
 pub mod stream_id_string;
diff --git a/pipeline/src/metrics.rs b/pipeline/src/metrics.rs
index fb8d14c21..09f10d8e0 100644
--- a/pipeline/src/metrics.rs
+++ b/pipeline/src/metrics.rs
@@ -11,15 +11,24 @@ use prometheus_client::{
 pub struct Metrics {
     pub(crate) message_count: Family<MessageLabels, Counter>,
 
+    pub(crate) concluder_poll_new_events_loop_count: Counter,
+
     pub(crate) aggregator_new_conclusion_events_count: Counter,
 
-    pub(crate) concluder_poll_new_events_loop_count: Counter,
+    pub(crate) resolver_new_event_states_count: Counter,
 }
 impl Metrics {
     /// Register and construct Metrics
     pub fn register(registry: &mut Registry) -> Self {
         let sub_registry = registry.sub_registry_with_prefix("pipeline");
 
+        register!(
+            concluder_poll_new_events_loop_count,
+            "Number of times the loop to poll new conclusion events has run",
+            Counter::default(),
+            sub_registry
+        );
+
         register!(
             message_count,
             "Number of messages delivered to actors",
@@ -32,18 +41,18 @@ impl Metrics {
             Counter::default(),
             sub_registry
         );
-
         register!(
-            concluder_poll_new_events_loop_count,
-            "Number of times the loop to poll new conclusion events has run",
+            resolver_new_event_states_count,
+            "Number of new event states delivered to the resolver",
             Counter::default(),
             sub_registry
         );
 
         Self {
             message_count,
-            aggregator_new_conclusion_events_count,
             concluder_poll_new_events_loop_count,
+            aggregator_new_conclusion_events_count,
+            resolver_new_event_states_count,
         }
     }
 }
diff --git a/pipeline/src/resolver/metrics.rs b/pipeline/src/resolver/metrics.rs
new file mode 100644
index 000000000..f6c6798da
--- /dev/null
+++ b/pipeline/src/resolver/metrics.rs
@@ -0,0 +1,24 @@
+use ceramic_actor::MessageEvent;
+use ceramic_metrics::Recorder;
+
+use crate::metrics::{MessageLabels, Metrics};
+
+use super::{NewEventStatesMsg, ResolverRecorder, StreamStateMsg};
+
+impl Recorder<MessageEvent<NewEventStatesMsg>> for Metrics {
+    fn record(&self, event: &MessageEvent<NewEventStatesMsg>) {
+        self.message_count
+            .get_or_create(&MessageLabels::from(event))
+            .inc();
+        self.resolver_new_event_states_count
+            .inc_by(event.message.events.num_rows() as u64);
+    }
+}
+impl Recorder<MessageEvent<StreamStateMsg>> for Metrics {
+    fn record(&self, event: &MessageEvent<StreamStateMsg>) {
+        self.message_count
+            .get_or_create(&MessageLabels::from(event))
+            .inc();
+    }
+}
+impl ResolverRecorder for Metrics {}
diff --git a/pipeline/src/resolver/mock.rs b/pipeline/src/resolver/mock.rs
new file mode 100644
index 000000000..ae1dbf850
--- /dev/null
+++ b/pipeline/src/resolver/mock.rs
@@ -0,0 +1,80 @@
+//! Provides a mock implmentation of the aggregator actor.
+use async_trait::async_trait;
+use ceramic_actor::{Actor, Handler, Message};
+use mockall::mock;
+use prometheus_client::registry::Registry;
+
+use crate::metrics::Metrics;
+
+use super::{
+    NewEventStatesMsg, Resolver, ResolverActor, ResolverEnvelope, ResolverHandle, StreamStateMsg,
+    SubscribeSinceMsg,
+};
+
+mock! {
+    // mockall does not support multiple methods on the struct with the same name.
+    // This arises when implementing multiple traits that have methods with the same name as is
+    // the case with the [`ceramic_actor::Handler`] trait.
+    //
+    // We add a layer of indirection to get around this limitation.
+    pub Resolver {
+        #[allow(missing_docs)]
+        pub fn handle_subscribe_since(
+            &mut self,
+            message: SubscribeSinceMsg,
+        ) -> <SubscribeSinceMsg as Message>::Result;
+        #[allow(missing_docs)]
+        pub fn handle_new_event_states(
+            &mut self,
+            message: NewEventStatesMsg,
+        ) -> <NewEventStatesMsg as Message>::Result;
+        #[allow(missing_docs)]
+        pub fn handle_stream_state(
+            &mut self,
+            message: StreamStateMsg,
+        ) -> <StreamStateMsg
+            as Message>::Result;
+    }
+}
+
+#[async_trait]
+impl Handler<SubscribeSinceMsg> for MockResolver {
+    async fn handle(
+        &mut self,
+        message: SubscribeSinceMsg,
+    ) -> <SubscribeSinceMsg as Message>::Result {
+        self.handle_subscribe_since(message)
+    }
+}
+
+#[async_trait]
+impl Handler<NewEventStatesMsg> for MockResolver {
+    async fn handle(
+        &mut self,
+        message: NewEventStatesMsg,
+    ) -> <NewEventStatesMsg as Message>::Result {
+        self.handle_new_event_states(message)
+    }
+}
+
+#[async_trait]
+impl Handler<StreamStateMsg> for MockResolver {
+    async fn handle(&mut self, message: StreamStateMsg) -> <StreamStateMsg as Message>::Result {
+        self.handle_stream_state(message)
+    }
+}
+
+impl Actor for MockResolver {
+    type Envelope = ResolverEnvelope;
+}
+impl ResolverActor for MockResolver {}
+
+impl MockResolver {
+    /// Spawn a mock aggregator actor.
+    pub fn spawn(mock_actor: MockResolver) -> ResolverHandle {
+        let metrics = Metrics::register(&mut Registry::default());
+        let (handle, _task_handle) =
+            Resolver::spawn(1_000, mock_actor, metrics, std::future::pending());
+        handle
+    }
+}
diff --git a/pipeline/src/resolver/mod.rs b/pipeline/src/resolver/mod.rs
new file mode 100644
index 000000000..7fde13541
--- /dev/null
+++ b/pipeline/src/resolver/mod.rs
@@ -0,0 +1,615 @@
+//! Conflict resolution functions for Ceramic Model Instance Document streams.
+//!
+//! Subscribes to aggregated events and produces the tips and canonical tip for each stream.
+//!
+
+mod metrics;
+#[cfg(any(test, feature = "mock"))]
+pub mod mock;
+
+use std::{collections::HashMap, sync::Arc};
+
+use anyhow::Context;
+use arrow::{
+    array::{Array as _, ArrayAccessor as _, BinaryArray, RecordBatch},
+    compute::concat_batches,
+    datatypes::Int32Type,
+};
+use arrow_schema::{DataType, SchemaRef};
+use async_trait::async_trait;
+use ceramic_actor::{actor_envelope, Actor, Handler, Message};
+use ceramic_core::StreamId;
+use cid::Cid;
+use datafusion::{
+    common::{
+        cast::{
+            as_binary_array, as_dictionary_array, as_map_array, as_string_array, as_uint64_array,
+        },
+        exec_datafusion_err,
+    },
+    datasource::{
+        file_format::parquet::ParquetFormat,
+        listing::{ListingOptions, ListingTable, ListingTableConfig, ListingTableUrl},
+    },
+    execution::SendableRecordBatchStream,
+    functions_aggregate::expr_fn::last_value,
+    logical_expr::{col, lit, ExprFunctionExt as _},
+    physical_plan::stream::RecordBatchStreamAdapter,
+    prelude::{wildcard, Expr, SessionContext},
+};
+use futures::TryStreamExt as _;
+use shutdown::{Shutdown, ShutdownSignal};
+use tokio::{select, sync::broadcast, task::JoinHandle};
+use tracing::{debug, error, instrument};
+
+use crate::{
+    aggregator::AggregatorHandle,
+    cache_table::CacheTable,
+    metrics::Metrics,
+    schemas,
+    since::{gt_expression, rows_since, FeedTable, FeedTableSource, RowsSinceInput},
+    PipelineContext, Result, SessionContextRef,
+};
+// Use the SubscribeSinceMsg so its clear its a message for this actor
+pub use crate::since::SubscribeSinceMsg;
+
+const STREAM_TIPS_TABLE: &str = "ceramic.v0.stream_tips";
+const STREAM_TIPS_MEM_TABLE: &str = "ceramic._internal.stream_tips_mem";
+const STREAM_TIPS_PERSISTENT_TABLE: &str = "ceramic._internal.stream_tips_persistent";
+// Path within the object store where the stream tips table is stored
+// This path should be updated when the underlying storage structure changes. (i.e. the parition
+// columns change). The revision is a physical versioning number and not directly associated with
+// the logical schema version of the table. There are many cases where the physical revision may
+// need to change while the logical version remains the same.
+const STREAM_TIPS_TABLE_OBJECT_STORE_PATH: &str = "ceramic/rev0/stream_tips/";
+
+const STREAM_STATES_TABLE: &str = "ceramic.v0.stream_states";
+const STREAM_STATES_FEED_TABLE: &str = "ceramic.v0.stream_states_feed";
+const STREAM_STATES_MEM_TABLE: &str = "ceramic._internal.stream_states_mem";
+const STREAM_STATES_PERSISTENT_TABLE: &str = "ceramic._internal.stream_states_persistent";
+// Path within the object store where the stream states table is stored
+// This path should be updated when the underlying storage structure changes. (i.e. the parition
+// columns change). The revision is a physical versioning number and not directly associated with
+// the logical schema version of the table. There are many cases where the physical revision may
+// need to change while the logical version remains the same.
+const STREAM_STATES_TABLE_OBJECT_STORE_PATH: &str = "ceramic/rev0/stream_states/";
+
+// Maximum number of rows to cache in memory before writing to object store.
+const DEFAULT_MAX_CACHED_ROWS: usize = 10_000;
+
+/// Resolver is responsible for computing the tips of a stream and resolving the set of tips to a
+/// canonical tip.
+/// The resolver only operates on model and model instance stream types.
+#[derive(Actor)]
+pub struct Resolver {
+    ctx: SessionContextRef,
+    broadcast_tx: broadcast::Sender<RecordBatch>,
+    _max_cached_rows: usize,
+    _order: u64,
+}
+
+impl std::fmt::Debug for Resolver {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Resolver")
+            .field("ctx", &"Pipeline(SessionContext)")
+            .field("broadcast_tx", &self.broadcast_tx)
+            .finish()
+    }
+}
+
+impl Resolver {
+    /// Create a new resolver actor and spawn its tasks.
+    pub async fn spawn_new(
+        size: usize,
+        ctx: &PipelineContext,
+        max_cached_rows: Option<usize>,
+        aggregator: AggregatorHandle,
+        metrics: Metrics,
+        shutdown: Shutdown,
+    ) -> Result<(ResolverHandle, Vec<JoinHandle<()>>)> {
+        // Register stream_tips tables
+        let file_format = ParquetFormat::default().with_enable_pruning(true);
+        let listing_options = ListingOptions::new(Arc::new(file_format))
+            .with_file_extension(".parquet")
+            .with_table_partition_cols(vec![("stream_cid_partition".to_owned(), DataType::Int32)])
+            .with_file_sort_order(vec![vec![col("stream_cid").sort(true, true)]]);
+
+        // Set the path within the bucket for the event_states table
+        let mut stream_tips_url = ctx.object_store_url.clone();
+        stream_tips_url.set_path(STREAM_TIPS_TABLE_OBJECT_STORE_PATH);
+        // Register event_states_persistent as a listing table
+        ctx.session().register_table(
+            STREAM_TIPS_PERSISTENT_TABLE,
+            Arc::new(ListingTable::try_new(
+                ListingTableConfig::new(ListingTableUrl::parse(stream_tips_url)?)
+                    .with_listing_options(listing_options)
+                    // Use the non partitioned schema as the parquet files themselves do not
+                    // contain the partition columns.
+                    .with_schema(schemas::event_states()),
+            )?),
+        )?;
+
+        ctx.session().register_table(
+            STREAM_TIPS_MEM_TABLE,
+            Arc::new(CacheTable::try_new(
+                schemas::event_states_partitioned(),
+                vec![vec![RecordBatch::new_empty(
+                    schemas::event_states_partitioned(),
+                )]],
+            )?),
+        )?;
+
+        ctx.session().register_table(
+            STREAM_TIPS_TABLE,
+            ctx.session()
+                .table(STREAM_TIPS_MEM_TABLE)
+                .await?
+                .union(ctx.session().table(STREAM_TIPS_PERSISTENT_TABLE).await?)?
+                .into_view(),
+        )?;
+
+        // Register stream_states tables
+        let file_format = ParquetFormat::default().with_enable_pruning(true);
+        let listing_options = ListingOptions::new(Arc::new(file_format))
+            .with_file_extension(".parquet")
+            .with_table_partition_cols(vec![("stream_cid_partition".to_owned(), DataType::Int32)])
+            .with_file_sort_order(vec![vec![col("stream_cid").sort(true, true)]]);
+
+        // Set the path within the bucket for the event_states table
+        let mut stream_states_url = ctx.object_store_url.clone();
+        stream_states_url.set_path(STREAM_STATES_TABLE_OBJECT_STORE_PATH);
+        // Register event_states_persistent as a listing table
+        ctx.session().register_table(
+            STREAM_STATES_PERSISTENT_TABLE,
+            Arc::new(ListingTable::try_new(
+                ListingTableConfig::new(ListingTableUrl::parse(stream_states_url)?)
+                    .with_listing_options(listing_options)
+                    // Use the non partitioned schema as the parquet files themselves do not
+                    // contain the partition columns.
+                    .with_schema(schemas::event_states()),
+            )?),
+        )?;
+
+        ctx.session().register_table(
+            STREAM_STATES_MEM_TABLE,
+            Arc::new(CacheTable::try_new(
+                schemas::event_states_partitioned(),
+                vec![vec![RecordBatch::new_empty(
+                    schemas::event_states_partitioned(),
+                )]],
+            )?),
+        )?;
+
+        ctx.session().register_table(
+            STREAM_STATES_TABLE,
+            ctx.session()
+                .table(STREAM_STATES_MEM_TABLE)
+                .await?
+                .union(ctx.session().table(STREAM_STATES_PERSISTENT_TABLE).await?)?
+                .into_view(),
+        )?;
+
+        // TODO: This is a bit over simplified.
+        //
+        // Here we assume that the stream_tips and stream_states tables remain in lock step (i.e.
+        // we can atomically write to both)
+        //
+        // However that is not a safe assumption.
+        //
+        // I see two ways to solve this:
+        //
+        // 1. Use two different actors, a tips actor and a resolver actor.
+        //    Then have the resolver actor subscribe the tips actor and use the stream_tip_order to
+        //    ensure it makes forward progress atomically.
+        //
+        // 2. Keep this single actor but track the stream_tip_order and stream_state order
+        //    separately so that we get the same atomicity with the complexity of two actors.
+        //
+        // In short one complicated actor or two simpler actors.
+
+        // Query for max event_state_order and stream_state_order in persistent stream_states, this is where we should start
+        // the new order values.
+        let batches = ctx
+            .session()
+            .table(STREAM_STATES_PERSISTENT_TABLE)
+            .await?
+            .aggregate(
+                vec![],
+                vec![
+                    datafusion::functions_aggregate::min_max::max(col("event_state_order"))
+                        .alias("max_event_state_order"),
+                    datafusion::functions_aggregate::min_max::max(col("stream_state_order"))
+                        .alias("max_stream_state_order"),
+                ],
+            )?
+            .collect()
+            .await?;
+        let max_event_state_order = batches.first().and_then(|batch| {
+            batch
+                .column_by_name("max_event_state_order")
+                .and_then(|col| {
+                    as_uint64_array(&col)
+                        .ok()
+                        .and_then(|col| col.is_valid(0).then(|| col.value(0)))
+                })
+        });
+        let max_stream_state_order = batches.first().and_then(|batch| {
+            batch
+                .column_by_name("max_stream_state_order")
+                .and_then(|col| {
+                    as_uint64_array(&col)
+                        .ok()
+                        .and_then(|col| col.is_valid(0).then(|| col.value(0)))
+                })
+        });
+
+        // Spawn actor
+        let (broadcast_tx, _broadcast_rx) = broadcast::channel(1_000);
+        let resolver = Resolver {
+            ctx: ctx.session(),
+            broadcast_tx,
+            _max_cached_rows: max_cached_rows.unwrap_or(DEFAULT_MAX_CACHED_ROWS),
+            _order: max_stream_state_order.unwrap_or_default(),
+        };
+
+        let (handle, task_handle) = Self::spawn(size, resolver, metrics, shutdown.wait_fut());
+        let h = handle.clone();
+        let sub_handle = tokio::spawn(async move {
+            if let Err(err) =
+                aggregator_subscription(shutdown.wait_fut(), aggregator, h, max_event_state_order)
+                    .await
+            {
+                error!(%err, "resolver actor aggregator_subscription task failed");
+            }
+        });
+
+        ctx.session()
+            .register_table(
+                STREAM_STATES_FEED_TABLE,
+                Arc::new(FeedTable::new(handle.clone())),
+            )
+            .expect("should be able to register table");
+
+        Ok((handle, vec![task_handle, sub_handle]))
+    }
+
+    // Process batch of new event states.
+    // Return any new stream states.
+    #[instrument(skip(self, _event_states), err)]
+    async fn process_event_states_batch(
+        &mut self,
+        _event_states: RecordBatch,
+    ) -> Result<RecordBatch> {
+        // Psuedocode of the data flow of conflict resolution.
+        // The process involves two tables and two udf.
+        // The first table and udf are responsible for simply determining the new tips.
+        // This should be possible with just information about the previous pointers.
+        // (TODO: The previous value is not preserved from conclusion_events to event_states but is
+        // straightforward to do)
+        //
+        // The second table and udf then does actual conflict resolution given all the tips. This can then
+        // use time information event height and cids to have a deterministic and canonical tip for
+        // a stream.
+        //
+        // event_states
+        //  // Left join the new events with existing known stream tips
+        //  >> join(stream_tips)
+        //  // Now we have a new event and a list of existing tips. Pass all of this information
+        //  // into a udf. That UDF will produce a new row that contains a list of the new tips.
+        //  // The new tips may be the same, more or less than before.
+        //  // This should be possible without knowing the contents of the events themselves
+        //  >> compute_new_tips_udf()
+        //  // Write the new tips row per stream
+        //  >> write_to(stream_tips)
+        //  // Unnest the list of tips so we have a row per tip per stream
+        //  >> unnest(tips)
+        //  // Join the tips with the event_states table as the tips are just cids
+        //  >> join(event_states)
+        //  // Now we have a set of rows per stream one per tip.
+        //  // Use an aggregate udf to resolve the conflicts producing a single row per stream
+        //  >> aggregate(resolve_conflicts_udf(), group_by(stream_cid))
+        //  // Write these final rows to the stream_states table and return them as a batch from
+        //  // this function.
+        //  >> write_to(stream_states)
+        //
+        //  See process_conclusion_event_batch() as an example of how to build up these data flow
+        //  pipelines.
+        todo!()
+    }
+}
+
+async fn aggregator_subscription(
+    mut shutdown: ShutdownSignal,
+    aggregator: AggregatorHandle,
+    resolver: ResolverHandle,
+    offset: Option<u64>,
+) -> Result<()> {
+    debug!(?offset, "starting aggregator subscription");
+    let mut rx = aggregator
+        .send(SubscribeSinceMsg {
+            projection: None,
+            filters: offset.map(|o| vec![gt_expression("event_state_order", o)]),
+            limit: None,
+        })
+        .await??;
+    loop {
+        select! {
+            _ = &mut shutdown => { break }
+            r = rx.try_next() => {
+                match r {
+                    Ok(Some(batch)) => {
+                        if let Err(err) = resolver.send(NewEventStatesMsg { events: batch }).await? {
+                            error!(?err, "aggregator subscription loop failed to process new event states");
+                        }
+                    }
+                    // Subscription has finished, this means we are shutting down.
+                    Ok(None) => { break },
+                    Err(err) => {
+                        error!(%err, "aggregator subscription loop failed to retrieve new event states.");
+                    }
+                }
+            }
+        }
+    }
+    Ok(())
+}
+
+actor_envelope! {
+    ResolverEnvelope,
+    ResolverActor,
+    ResolverRecorder,
+    // Subscribe to the stream_states table, we do not yet expose a subscription to stream_tips
+    SubscribeSince => SubscribeSinceMsg,
+    NewEventStates => NewEventStatesMsg,
+    StreamState => StreamStateMsg,
+}
+
+#[async_trait]
+impl Handler<SubscribeSinceMsg> for Resolver {
+    async fn handle(
+        &mut self,
+        message: SubscribeSinceMsg,
+    ) -> <SubscribeSinceMsg as Message>::Result {
+        let subscription = self.broadcast_tx.subscribe();
+        let ctx = self.ctx.clone();
+        rows_since(RowsSinceInput {
+            session_context: &ctx,
+            schema: schemas::stream_states(),
+            order_col: "stream_state_order",
+            projection: message.projection,
+            filters: message.filters.clone(),
+            limit: message.limit,
+            subscription: Box::pin(RecordBatchStreamAdapter::new(
+                schemas::stream_states(),
+                tokio_stream::wrappers::BroadcastStream::new(subscription)
+                    .map_err(|err| exec_datafusion_err!("{err}")),
+            )),
+            // Future Optimization can be to send the projection and limit into the events_since call.
+            since: stream_states_since(&ctx, message.filters).await?,
+        })
+    }
+}
+
+async fn stream_states_since(
+    ctx: &SessionContext,
+    filters: Option<Vec<Expr>>,
+) -> Result<SendableRecordBatchStream> {
+    let mut stream_states = ctx
+        .table(STREAM_STATES_TABLE)
+        .await?
+        .select(vec![wildcard()])?
+        // Do not return the partition columns
+        .drop_columns(&["stream_cid_partition"])?
+        .sort(vec![col("stream_state_order").sort(true, true)])?;
+
+    if let Some(filters) = filters {
+        for filter in filters {
+            stream_states = stream_states.filter(filter)?;
+        }
+    }
+    Ok(stream_states.execute_stream().await?)
+}
+
+/// Inform the resolver about new event states.
+#[derive(Debug)]
+pub struct NewEventStatesMsg {
+    events: RecordBatch,
+}
+impl Message for NewEventStatesMsg {
+    type Result = anyhow::Result<()>;
+}
+
+#[async_trait]
+impl Handler<NewEventStatesMsg> for Resolver {
+    async fn handle(
+        &mut self,
+        message: NewEventStatesMsg,
+    ) -> <NewEventStatesMsg as Message>::Result {
+        debug!(event_count = message.events.num_rows(), "new event states");
+        let batch = self.process_event_states_batch(message.events).await?;
+        if batch.num_rows() > 0 {
+            let _ = self.broadcast_tx.send(batch);
+        }
+        Ok(())
+    }
+}
+
+/// Request the state of a stream
+#[derive(Debug)]
+pub struct StreamStateMsg {
+    /// Id of the stream
+    pub id: StreamId,
+}
+impl Message for StreamStateMsg {
+    type Result = anyhow::Result<Option<ResolvedStreamState>>;
+}
+
+/// State of a single stream after conflict resolution
+pub struct ResolvedStreamState {
+    /// Multibase encoding of the stream id
+    pub id: StreamId,
+
+    /// CID of the event that produced this state
+    pub event_cid: Cid,
+
+    /// Controller of the stream
+    pub controller: String,
+
+    /// Dimensions of the stream, each value is multibase encoded.
+    pub dimensions: HashMap<String, Vec<u8>>,
+
+    /// The data of the stream. Content is stream type specific.
+    pub data: Vec<u8>,
+}
+
+impl std::fmt::Debug for ResolvedStreamState {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        if !f.alternate() {
+            f.debug_struct("StreamState")
+                .field("id", &self.id)
+                .field("event_cid", &self.event_cid)
+                .field("controller", &self.controller)
+                .field("dimensions", &self.dimensions)
+                .field("data", &self.data)
+                .finish()
+        } else {
+            f.debug_struct("StreamState")
+                .field("id", &self.id.to_string())
+                .field("event_cid", &self.event_cid.to_string())
+                .field("controller", &self.controller)
+                .field(
+                    "dimensions",
+                    &self
+                        .dimensions
+                        .iter()
+                        .map(|(k, v)| (k, multibase::encode(multibase::Base::Base64Url, v)))
+                        .collect::<std::collections::BTreeMap<_, _>>(),
+                )
+                .field(
+                    "data",
+                    &multibase::encode(multibase::Base::Base64Url, &self.data),
+                )
+                .finish()
+        }
+    }
+}
+
+#[async_trait]
+impl Handler<StreamStateMsg> for Resolver {
+    #[instrument(skip(self), ret, err)]
+    async fn handle(&mut self, message: StreamStateMsg) -> <StreamStateMsg as Message>::Result {
+        let id = message.id;
+        let state_batch = self
+            .ctx
+            .table(STREAM_STATES_TABLE)
+            .await
+            .context("table not found {STREAM_STATES_TABLE}")?
+            .select(vec![
+                col("stream_state_order"),
+                col("stream_cid"),
+                col("event_cid"),
+                col("dimensions"),
+                col("controller"),
+                col("data"),
+            ])
+            .context("invalid select")?
+            .filter(col("stream_cid").eq(lit(id.cid.to_bytes())))
+            .context("invalid filter")?
+            .aggregate(
+                vec![col("stream_cid"), col("controller")],
+                vec![
+                    last_value(vec![col("data")])
+                        .order_by(vec![col("stream_state_order").sort(true, true)])
+                        .build()
+                        .context("invalid last_value data query")?
+                        .alias("data"),
+                    last_value(vec![col("event_cid")])
+                        .order_by(vec![col("stream_state_order").sort(true, true)])
+                        .build()
+                        .context("invalid last_value event_cid query")?
+                        .alias("event_cid"),
+                    last_value(vec![col("dimensions")])
+                        .order_by(vec![col("stream_state_order").sort(true, true)])
+                        .build()
+                        .context("invalid last_value dimensions query")?
+                        .alias("dimensions"),
+                ],
+            )
+            .context("invalid window")?
+            .collect()
+            .await
+            .context("invalid query")?;
+
+        let num_rows: usize = state_batch.iter().map(|b| b.num_rows()).sum();
+        if num_rows == 0 {
+            // No state for the stream id found
+            return Ok(None);
+        }
+        let batch = concat_batches(&state_batch[0].schema(), state_batch.iter())
+            .context("concat batches")?;
+
+        let data = as_binary_array(
+            batch
+                .column_by_name("data")
+                .ok_or_else(|| anyhow::anyhow!("state column should exist"))?,
+        )
+        .context("data as a binary column")?
+        .value(0);
+        let event_cid = as_binary_array(
+            batch
+                .column_by_name("event_cid")
+                .ok_or_else(|| anyhow::anyhow!("event_cid column should exist"))?,
+        )
+        .context("event_cid as a binary column")?;
+        let controller = as_string_array(
+            batch
+                .column_by_name("controller")
+                .ok_or_else(|| anyhow::anyhow!("controller column should exist"))?,
+        )
+        .context("controller as a string column")?;
+        let dimensions = as_map_array(
+            batch
+                .column_by_name("dimensions")
+                .ok_or_else(|| anyhow::anyhow!("dimensions column should exist"))?,
+        )?;
+        let keys =
+            as_string_array(dimensions.keys()).context("dimesions_keys as a string column")?;
+        let values = as_dictionary_array::<Int32Type>(dimensions.values())?
+            .downcast_dict::<BinaryArray>()
+            .ok_or_else(|| anyhow::anyhow!("dimensions values should be binary"))?;
+        let mut dimensions = HashMap::with_capacity(keys.len());
+        for i in 0..keys.len() {
+            let key = keys.value(i);
+            let value = values.value(i);
+            dimensions.insert(key.to_string(), value.to_vec());
+        }
+        Ok(Some(ResolvedStreamState {
+            id,
+            event_cid: Cid::read_bytes(event_cid.value(0)).context("event_cid as a CID")?,
+            controller: controller.value(0).to_string(),
+            dimensions,
+            data: data.to_vec(),
+        }))
+    }
+}
+
+#[async_trait]
+impl FeedTableSource for ResolverHandle {
+    fn schema(&self) -> SchemaRef {
+        schemas::event_states()
+    }
+    async fn subscribe_since(
+        &self,
+        projection: Option<Vec<usize>>,
+        filters: Option<Vec<Expr>>,
+        limit: Option<usize>,
+    ) -> anyhow::Result<SendableRecordBatchStream> {
+        Ok(self
+            .send(SubscribeSinceMsg {
+                projection,
+                filters,
+                limit,
+            })
+            .await??)
+    }
+}
diff --git a/pipeline/src/schemas.rs b/pipeline/src/schemas.rs
index c869b4a57..e87a94c86 100644
--- a/pipeline/src/schemas.rs
+++ b/pipeline/src/schemas.rs
@@ -7,6 +7,10 @@ static CONCLUSION_EVENTS: OnceLock<SchemaRef> = OnceLock::new();
 static EVENT_STATES: OnceLock<SchemaRef> = OnceLock::new();
 static EVENT_STATES_PARTITIONED: OnceLock<SchemaRef> = OnceLock::new();
 static PENDING_EVENT_STATES: OnceLock<SchemaRef> = OnceLock::new();
+static STREAM_TIPS: OnceLock<SchemaRef> = OnceLock::new();
+static STREAM_TIPS_PARTITIONED: OnceLock<SchemaRef> = OnceLock::new();
+static STREAM_STATES: OnceLock<SchemaRef> = OnceLock::new();
+static _STREAM_STATES_PARTITIONED: OnceLock<SchemaRef> = OnceLock::new();
 
 /// The `conclusion_events` table contains the raw events annotated with conclusions about each
 /// event.
@@ -56,6 +60,8 @@ pub fn conclusion_events() -> SchemaRef {
                     DataType::List(Arc::new(Field::new("item", DataType::Binary, false))),
                     true,
                 ),
+                Field::new("before", DataType::UInt64, true),
+                Field::new("chain_id", DataType::Utf8, true),
             ]))
             .finish(),
         )
@@ -112,6 +118,8 @@ pub fn event_states() -> SchemaRef {
                     DataType::List(Field::new_list_field(DataType::Utf8, true).into()),
                     true,
                 ),
+                Field::new("before", DataType::UInt64, true),
+                Field::new("chain_id", DataType::Utf8, true),
             ]))
             .finish(),
         )
@@ -185,8 +193,155 @@ pub fn pending_event_states() -> SchemaRef {
                 Field::new("data", DataType::Binary, true),
                 Field::new("patch", DataType::Binary, true),
                 Field::new("model_version", DataType::Binary, true),
+                Field::new("before", DataType::UInt64, true),
+                Field::new("chain_id", DataType::Utf8, true),
             ]))
             .finish(),
         )
     }))
 }
+
+/// The `stream_tips` table contains the set of tips for each stream
+pub fn stream_tips() -> SchemaRef {
+    Arc::clone(STREAM_TIPS.get_or_init(|| {
+        Arc::new(
+            SchemaBuilder::from(&Fields::from(vec![
+                // Used to know how far through the event_states table the stream_tips table has
+                // processed.
+                Field::new("event_state_order", DataType::UInt64, false),
+                // An order that ensures an stream tip row comes after all rows needed to
+                // compute the tips of a stream. This order is stream type dependent, but holds for all
+                // stream types.
+                Field::new("stream_tip_order", DataType::UInt64, false),
+                Field::new("stream_cid", DataType::Binary, false),
+                Field::new("stream_type", DataType::UInt8, false),
+                Field::new("controller", DataType::Utf8, false),
+                Field::new(
+                    "dimensions",
+                    DataType::Map(
+                        Field::new(
+                            "entries",
+                            DataType::Struct(
+                                vec![
+                                    Field::new("key", DataType::Utf8, false),
+                                    Field::new(
+                                        "value",
+                                        DataType::Dictionary(
+                                            Box::new(DataType::Int32),
+                                            Box::new(DataType::Binary),
+                                        ),
+                                        true,
+                                    ),
+                                ]
+                                .into(),
+                            ),
+                            false,
+                        )
+                        .into(),
+                        false,
+                    ),
+                    true,
+                ),
+                Field::new("tips", DataType::new_list(DataType::Binary, false), false),
+            ]))
+            .finish(),
+        )
+    }))
+}
+
+/// The `stream_tips_partitioned` table contains the set of tips for a stream.
+/// This schema includes the partition columns of the table.
+pub fn stream_tips_partitioned() -> SchemaRef {
+    Arc::clone(STREAM_TIPS_PARTITIONED.get_or_init(|| {
+        Arc::new(
+            arrow_schema::SchemaBuilder::from(&arrow_schema::Fields::from(
+                // Append partition fields to the end of the unpartitioned schema
+                event_states()
+                    .fields()
+                    .into_iter()
+                    .cloned()
+                    .chain(vec![Arc::new(arrow_schema::Field::new(
+                        "stream_cid_partition",
+                        DataType::Int32,
+                        false,
+                    ))])
+                    .collect::<Vec<_>>(),
+            ))
+            .finish(),
+        )
+    }))
+}
+
+/// The `stream_states` table contains the canonical tip for each stream (after conflict resolution has selected from all divergent histories)
+pub fn stream_states() -> SchemaRef {
+    Arc::clone(STREAM_STATES.get_or_init(|| {
+        Arc::new(
+            SchemaBuilder::from(&Fields::from(vec![
+                // Used to know how far through the stream_tips table the stream_state table has
+                // processed.
+                Field::new("stream_tip_order", DataType::UInt64, false),
+                // An order that ensures each new stream state comes after all previous states of
+                // that stream. This order is stream type dependent, but holds for all
+                // stream types.
+                Field::new("stream_state_order", DataType::UInt64, false),
+                Field::new("stream_cid", DataType::Binary, false),
+                Field::new("stream_type", DataType::UInt8, false),
+                Field::new("controller", DataType::Utf8, false),
+                Field::new(
+                    "dimensions",
+                    DataType::Map(
+                        Field::new(
+                            "entries",
+                            DataType::Struct(
+                                vec![
+                                    Field::new("key", DataType::Utf8, false),
+                                    Field::new(
+                                        "value",
+                                        DataType::Dictionary(
+                                            Box::new(DataType::Int32),
+                                            Box::new(DataType::Binary),
+                                        ),
+                                        true,
+                                    ),
+                                ]
+                                .into(),
+                            ),
+                            false,
+                        )
+                        .into(),
+                        false,
+                    ),
+                    true,
+                ),
+                Field::new("event_cid", DataType::Binary, false),
+                Field::new("event_type", DataType::UInt8, false),
+                Field::new("event_height", DataType::UInt32, true),
+                Field::new("data", DataType::Binary, true),
+            ]))
+            .finish(),
+        )
+    }))
+}
+
+/// The `stream_states_partitioned` table contains the canonical tip for each stream.
+/// This schema includes the partition columns of the table.
+pub fn stream_states_partitioned() -> SchemaRef {
+    Arc::clone(STREAM_TIPS_PARTITIONED.get_or_init(|| {
+        Arc::new(
+            arrow_schema::SchemaBuilder::from(&arrow_schema::Fields::from(
+                // Append partition fields to the end of the unpartitioned schema
+                event_states()
+                    .fields()
+                    .into_iter()
+                    .cloned()
+                    .chain(vec![Arc::new(arrow_schema::Field::new(
+                        "stream_cid_partition",
+                        DataType::Int32,
+                        false,
+                    ))])
+                    .collect::<Vec<_>>(),
+            ))
+            .finish(),
+        )
+    }))
+}
diff --git a/pipeline/src/since/feed.rs b/pipeline/src/since/feed.rs
index 92c1255b3..90d5b0c9d 100644
--- a/pipeline/src/since/feed.rs
+++ b/pipeline/src/since/feed.rs
@@ -44,8 +44,6 @@ pub trait FeedTableSource: Clone + std::fmt::Debug + Sync + Send + 'static {
 }
 
 /// A table that when queried produces an unbounded stream of data.
-/// It is assumed that the table contains an "conclusion_event_order" column and new data arrives in increasing
-/// "conclusion_event_order" order.
 #[derive(Debug)]
 pub struct FeedTable<S> {
     source: S,
diff --git a/tests/networks/experimental-rust.yaml b/tests/networks/experimental-rust.yaml
deleted file mode 100644
index 36a85aa06..000000000
--- a/tests/networks/experimental-rust.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-apiVersion: "keramik.3box.io/v1alpha1"
-kind: Network
-metadata:
-  name: experimental-rust
-spec:
-  replicas: 2
-  ceramic:
-    - env:
-        CERAMIC_DISABLE_ANCHORING: "true"
-      image: "ceramicnetwork/composedb:dev"
-      imagePullPolicy: Always # Ensures the image is always pulled before starting the pod
-      ipfs:
-        rust:
-          env:
-            CERAMIC_ONE_ETHEREUM_RPC_URLS: "http://ganache:8545"
-            CERAMIC_ONE_FLIGHT_SQL_BIND_ADDRESS: "0.0.0.0:5102"
-            CERAMIC_ONE_EXPERIMENTAL_FEATURES: "true"
-            CERAMIC_ONE_REMOTE_ANCHOR_SERVICE_URL: "http://cas:8081"
-            CERAMIC_ONE_ANCHOR_INTERVAL: 1
-            CERAMIC_ONE_ANCHOR_POLL_INTERVAL: 5
-          resourceLimits:
-            cpu: "4"
-            memory: "1Gi"
-  # Use Kubo with CAS because it still needs pubsub
-  cas:
-    casResourceLimits:
-      cpu: "2"
-      memory: "4Gi"
-    ipfs:
-      go: {}
-  monitoring:
-    namespaced: true
diff --git a/tests/suite/src/__tests__/correctness/fast/anchor.test.ts b/tests/suite/src/__tests__/correctness/fast/anchor.test.ts
index 414ad8f8b..b17e7061f 100644
--- a/tests/suite/src/__tests__/correctness/fast/anchor.test.ts
+++ b/tests/suite/src/__tests__/correctness/fast/anchor.test.ts
@@ -7,7 +7,7 @@ import * as helpers from '../../../utils/dynamoDbHelpers.js'
 
 const ComposeDbUrls = String(process.env.COMPOSEDB_URLS).split(',')
 
-describe('anchor', () => {
+describe.skip('anchor', () => {
   beforeAll(async () => await helpers.createTestTable())
   afterAll(async () => await helpers.cleanup())
 
diff --git a/tests/suite/src/__tests__/correctness/fast/flight-sql.test.ts b/tests/suite/src/__tests__/correctness/fast/flight-sql.test.ts
index 65702846c..3f847fdd6 100644
--- a/tests/suite/src/__tests__/correctness/fast/flight-sql.test.ts
+++ b/tests/suite/src/__tests__/correctness/fast/flight-sql.test.ts
@@ -249,7 +249,7 @@ describe('flight sql', () => {
 
     // Expect stream query to be complete
     expect(await query.next()).toBeNull()
-  }, 10000)
+  }, 20000)
 
   test('prepared feed query', async () => {
     const testModel: ModelDefinition = {
diff --git a/tests/suite/src/__tests__/correctness/slow/ceramic-cas-integration.test.ts b/tests/suite/src/__tests__/correctness/slow/ceramic-cas-integration.test.ts
index 906241a1f..a6fa2421e 100644
--- a/tests/suite/src/__tests__/correctness/slow/ceramic-cas-integration.test.ts
+++ b/tests/suite/src/__tests__/correctness/slow/ceramic-cas-integration.test.ts
@@ -13,7 +13,7 @@ const ComposeDbUrls = String(process.env.COMPOSEDB_URLS).split(',')
 const adminSeeds = String(process.env.COMPOSEDB_ADMIN_DID_SEEDS).split(',')
 
 // Skipped https://linear.app/3boxlabs/issue/WS1-1460/unskip-ceramic-cas-basic-integration
-describe('Ceramic<->CAS basic integration', () => {
+describe.skip('Ceramic<->CAS basic integration', () => {
   jest.setTimeout(1000 * 60 * 30) // 30 minutes (default max wait time for an anchor is 30 minutes)
 
   let ceramic: CeramicClient
diff --git a/validation/Cargo.toml b/validation/Cargo.toml
index 2f0a4047b..f09b01fd4 100644
--- a/validation/Cargo.toml
+++ b/validation/Cargo.toml
@@ -10,6 +10,7 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+alloy.workspace = true
 anyhow.workspace = true
 async-trait.workspace = true
 base64.workspace = true
@@ -19,12 +20,10 @@ chrono.workspace = true
 ed25519-dalek.workspace = true
 ipld-core.workspace = true
 k256.workspace = true
-lru.workspace = true
 multibase.workspace = true
 multihash-codetable.workspace = true
 once_cell.workspace = true
 p256.workspace = true
-reqwest.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 serde_ipld_dagcbor.workspace = true
@@ -33,8 +32,6 @@ ssi.workspace = true
 tokio.workspace = true
 tracing.workspace = true
 unsigned-varint.workspace = true
-# will probably need contract and signer-local features for self anchoring
-alloy = { version = "0.4", features = ["k256", "provider-http", "rpc-types"] }
 
 [dev-dependencies]
 ceramic-car.workspace = true
diff --git a/validation/src/blockchain/eth_rpc/mod.rs b/validation/src/blockchain/eth_rpc/mod.rs
deleted file mode 100644
index b345b7f31..000000000
--- a/validation/src/blockchain/eth_rpc/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-mod http;
-mod types;
-
-pub use http::HttpEthRpc;
-pub use types::{BlockHash, ChainInclusion, ChainInclusionProof, Error, EthProofType, TxHash};
diff --git a/validation/src/blockchain/mod.rs b/validation/src/blockchain/mod.rs
deleted file mode 100644
index 18385f4fd..000000000
--- a/validation/src/blockchain/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-/// The ethereum RPC provider module
-pub mod eth_rpc;
diff --git a/validation/src/lib.rs b/validation/src/lib.rs
index 5bb192cdd..bec3a1821 100644
--- a/validation/src/lib.rs
+++ b/validation/src/lib.rs
@@ -2,13 +2,11 @@
 //! as well as interacting with blockchains for time event validation.
 #![warn(missing_docs)]
 
-mod blockchain;
 mod signature;
 mod siwx_message;
 #[cfg(test)]
 mod test;
 mod verifier;
 
-pub use blockchain::eth_rpc;
 pub use ceramic_event::unvalidated::signed::cacao;
 pub use verifier::{cacao_verifier, event_verifier, AtTime, VerifyCacaoOpts, VerifyJwsOpts};