diff --git a/Cargo.lock b/Cargo.lock
index 41106e1..f840f0a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -167,9 +167,9 @@ dependencies = [
 
 [[package]]
 name = "async-channel"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
 dependencies = [
  "concurrent-queue",
  "event-listener",
@@ -273,7 +273,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.25",
 ]
 
 [[package]]
@@ -295,7 +295,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.25",
 ]
 
 [[package]]
@@ -306,7 +306,7 @@ checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.25",
 ]
 
 [[package]]
@@ -691,9 +691,9 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.1.4"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2"
+checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c"
 dependencies = [
  "serde",
 ]
@@ -706,9 +706,9 @@ checksum = "7b02b629252fe8ef6460461409564e2c21d0c8e77e0944f3d189ff06c4e932ad"
 
 [[package]]
 name = "cargo-platform"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27"
+checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479"
 dependencies = [
  "serde",
 ]
@@ -890,7 +890,7 @@ dependencies = [
  "getrandom 0.2.10",
  "hmac",
  "once_cell",
- "pbkdf2 0.12.1",
+ "pbkdf2 0.12.2",
  "rand 0.8.5",
  "sha2 0.10.7",
  "thiserror",
@@ -940,9 +940,9 @@ dependencies = [
 
 [[package]]
 name = "const-oid"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6340df57935414636969091153f35f68d9f00bbc8fb4a9c6054706c213e6c6bc"
+checksum = "795bc6e66a8e340f075fcf6227e417a2dc976b92b91f3cdc778bb858778b6747"
 
 [[package]]
 name = "const_format"
@@ -1240,12 +1240,12 @@ dependencies = [
 
 [[package]]
 name = "dashmap"
-version = "5.4.0"
+version = "5.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
+checksum = "6943ae99c34386c84a470c499d3414f66502a41340aa895406e0d2e4a207b91d"
 dependencies = [
  "cfg-if",
- "hashbrown 0.12.3",
+ "hashbrown 0.14.0",
  "lock_api",
  "once_cell",
  "parking_lot_core",
@@ -1544,9 +1544,9 @@ dependencies = [
 
 [[package]]
 name = "equivalent"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "erasable"
@@ -1715,8 +1715,8 @@ dependencies = [
  "reqwest",
  "serde",
  "serde_json",
- "syn 2.0.23",
- "toml 0.7.5",
+ "syn 2.0.25",
+ "toml 0.7.6",
  "walkdir",
 ]
 
@@ -1733,7 +1733,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_json",
- "syn 2.0.23",
+ "syn 2.0.25",
 ]
 
 [[package]]
@@ -1790,7 +1790,7 @@ dependencies = [
  "serde",
  "serde_json",
  "strum",
- "syn 2.0.23",
+ "syn 2.0.25",
  "tempfile",
  "thiserror",
  "tiny-keccak",
@@ -2170,7 +2170,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.25",
 ]
 
 [[package]]
@@ -2294,7 +2294,7 @@ dependencies = [
 [[package]]
 name = "graphcast-sdk"
 version = "0.3.4"
-source = "git+https://github.com/graphops/graphcast-sdk?rev=99d942e#99d942edebb70e2c148c2d0a2008344060107903"
+source = "git+https://github.com/graphops/graphcast-sdk?branch=hope/subgraph-owner-check#29fdf3c1f4ab0b655e424d288c282e67e0a6cc07"
 dependencies = [
  "anyhow",
  "async-graphql",
@@ -2326,7 +2326,7 @@ dependencies = [
  "teloxide",
  "thiserror",
  "tokio",
- "toml 0.7.5",
+ "toml 0.7.6",
  "tracing",
  "tracing-subscriber",
  "url",
@@ -2863,12 +2863,12 @@ checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
 
 [[package]]
 name = "is-terminal"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb"
+checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
  "hermit-abi 0.3.2",
- "rustix 0.38.3",
+ "rustix 0.38.4",
  "windows-sys",
 ]
 
@@ -3381,7 +3381,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.25",
 ]
 
 [[package]]
@@ -3507,7 +3507,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.25",
 ]
 
 [[package]]
@@ -3691,9 +3691,9 @@ dependencies = [
 
 [[package]]
 name = "pbkdf2"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0ca0b5a68607598bf3bad68f32227a8164f6254833f84eafaac409cd6746c31"
+checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
 dependencies = [
  "digest 0.10.7",
  "hmac",
@@ -3771,7 +3771,7 @@ dependencies = [
  "phf_shared 0.11.2",
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.25",
 ]
 
 [[package]]
@@ -3809,7 +3809,7 @@ checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.25",
 ]
 
 [[package]]
@@ -3945,14 +3945,14 @@ version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e30165d31df606f5726b090ec7592c308a0eaf61721ff64c9a3018e344a8753e"
 dependencies = [
- "portable-atomic 1.3.3",
+ "portable-atomic 1.4.0",
 ]
 
 [[package]]
 name = "portable-atomic"
-version = "1.3.3"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794"
+checksum = "d220334a184db82b31b83f5ff093e3315280fb2b6bbc032022b2304a509aab7a"
 
 [[package]]
 name = "ppv-lite86"
@@ -3973,7 +3973,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92139198957b410250d43fad93e630d956499a625c527eda65175c8680f83387"
 dependencies = [
  "proc-macro2",
- "syn 2.0.23",
+ "syn 2.0.25",
 ]
 
 [[package]]
@@ -4026,9 +4026,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.63"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb"
+checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da"
 dependencies = [
  "unicode-ident",
 ]
@@ -4057,7 +4057,7 @@ dependencies = [
  "reqwest",
  "serde",
  "serde_json",
- "time 0.3.22",
+ "time 0.3.23",
  "url",
 ]
 
@@ -4269,14 +4269,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.9.0"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89089e897c013b3deb627116ae56a6955a72b8bed395c9526af31c9fe528b484"
+checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.3.0",
- "regex-syntax 0.7.3",
+ "regex-automata 0.3.3",
+ "regex-syntax 0.7.4",
 ]
 
 [[package]]
@@ -4290,13 +4290,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.3.0"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa250384981ea14565685dea16a9ccc4d1c541a13f82b9c168572264d1df8c56"
+checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.7.3",
+ "regex-syntax 0.7.4",
 ]
 
 [[package]]
@@ -4307,9 +4307,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846"
+checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
 
 [[package]]
 name = "reqwest"
@@ -4483,9 +4483,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.3"
+version = "0.38.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4"
+checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5"
 dependencies = [
  "bitflags 2.3.3",
  "errno",
@@ -4496,13 +4496,13 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.21.2"
+version = "0.21.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f"
+checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36"
 dependencies = [
  "log",
  "ring",
- "rustls-webpki",
+ "rustls-webpki 0.101.1",
  "sct",
 ]
 
@@ -4537,6 +4537,16 @@ dependencies = [
  "untrusted",
 ]
 
+[[package]]
+name = "rustls-webpki"
+version = "0.101.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15f36a6828982f422756984e47912a7a51dcbc2a197aa791158f8ca61cd8204e"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.13"
@@ -4787,29 +4797,29 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
 
 [[package]]
 name = "serde"
-version = "1.0.166"
+version = "1.0.171"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8"
+checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.166"
+version = "1.0.171"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6"
+checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.25",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.100"
+version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c"
+checksum = "b5062a995d481b2308b6064e9af76011f2921c35f97b0468811ed9f6cd91dfed"
 dependencies = [
  "itoa",
  "ryu",
@@ -4818,9 +4828,9 @@ dependencies = [
 
 [[package]]
 name = "serde_path_to_error"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b1b6471d7496b051e03f1958802a73f88b947866f5146f329e47e36554f4e55"
+checksum = "8acc4422959dd87a76cb117c191dcbffc20467f06c9100b76721dab370f24d3a"
 dependencies = [
  "itoa",
  "serde",
@@ -5027,9 +5037,9 @@ dependencies = [
 
 [[package]]
 name = "slack-morphism"
-version = "1.12.0"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48ae1450a14bf7a4588b25fdee8668d94eb69f079581ddaf48a1a767befd2e9e"
+checksum = "68424167daf78e9e80d440d21fdac021c2693b111470f55bd1be1083c8391112"
 dependencies = [
  "async-recursion",
  "async-trait",
@@ -5067,9 +5077,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
 
 [[package]]
 name = "smart-default"
@@ -5161,7 +5171,7 @@ dependencies = [
  "quote",
  "regex-syntax 0.6.29",
  "strsim",
- "syn 2.0.23",
+ "syn 2.0.25",
  "unicode-width",
 ]
 
@@ -5251,9 +5261,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.23"
+version = "2.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737"
+checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5465,22 +5475,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "thiserror"
-version = "1.0.41"
+version = "1.0.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c16a64ba9387ef3fdae4f9c1a7f07a0997fce91985c0336f1ddc1822b3b37802"
+checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.41"
+version = "1.0.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d14928354b01c4d6a4f0e549069adef399a284e7995c7ccca94e8a07a5346c59"
+checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.25",
 ]
 
 [[package]]
@@ -5505,9 +5515,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.22"
+version = "0.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd"
+checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446"
 dependencies = [
  "serde",
  "time-core",
@@ -5522,9 +5532,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
 
 [[package]]
 name = "time-macros"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
+checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4"
 dependencies = [
  "time-core",
 ]
@@ -5592,7 +5602,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.25",
 ]
 
 [[package]]
@@ -5680,9 +5690,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.7.5"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240"
+checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -5701,9 +5711,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.19.11"
+version = "0.19.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7"
+checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78"
 dependencies = [
  "indexmap 2.0.0",
  "serde",
@@ -5799,7 +5809,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.25",
 ]
 
 [[package]]
@@ -5932,9 +5942,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
+checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
 
 [[package]]
 name = "uint"
@@ -6183,7 +6193,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.25",
  "wasm-bindgen-shared",
 ]
 
@@ -6217,7 +6227,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.23",
+ "syn 2.0.25",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6276,7 +6286,7 @@ version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338"
 dependencies = [
- "rustls-webpki",
+ "rustls-webpki 0.100.1",
 ]
 
 [[package]]
@@ -6398,9 +6408,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
 
 [[package]]
 name = "winnow"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448"
+checksum = "81a2094c43cc94775293eaa0e499fbc30048a6d824ac82c0351a8c0bf9112529"
 dependencies = [
  "memchr",
 ]
@@ -6492,7 +6502,7 @@ dependencies = [
  "hmac",
  "pbkdf2 0.11.0",
  "sha1",
- "time 0.3.22",
+ "time 0.3.23",
  "zstd",
 ]
 
diff --git a/one-shot/Cargo.toml b/one-shot/Cargo.toml
index a17332c..2c5f038 100644
--- a/one-shot/Cargo.toml
+++ b/one-shot/Cargo.toml
@@ -10,7 +10,7 @@ keywords = ["graphprotocol", "data-integrity", "Indexer", "waku", "p2p"]
 categories = ["network-programming", "web-programming::http-client"]
 
 [dependencies]
-graphcast-sdk = { package = "graphcast-sdk", git = "https://github.com/graphops/graphcast-sdk", rev = "99d942e" } 
+graphcast-sdk = { package = "graphcast-sdk", git = "https://github.com/graphops/graphcast-sdk", branch = "hope/subgraph-owner-check" }
 poi-radio = { path = "../poi-radio" }
 prost = "0.11"
 once_cell = "1.17"
diff --git a/poi-radio/Cargo.toml b/poi-radio/Cargo.toml
index 6f69c94..6d08901 100644
--- a/poi-radio/Cargo.toml
+++ b/poi-radio/Cargo.toml
@@ -10,7 +10,7 @@ keywords = ["graphprotocol", "data-integrity", "Indexer", "waku", "p2p"]
 categories = ["network-programming", "web-programming::http-client"]
 
 [dependencies]
-graphcast-sdk = { package = "graphcast-sdk", git = "https://github.com/graphops/graphcast-sdk", rev = "99d942e" } 
+graphcast-sdk = { package = "graphcast-sdk", git = "https://github.com/graphops/graphcast-sdk", branch = "hope/subgraph-owner-check" }
 prost = "0.11"
 once_cell = "1.17"
 chrono = "0.4"
diff --git a/poi-radio/src/operator/mod.rs b/poi-radio/src/operator/mod.rs
index a6119bf..4ff0b70 100644
--- a/poi-radio/src/operator/mod.rs
+++ b/poi-radio/src/operator/mod.rs
@@ -133,7 +133,7 @@ impl RadioOperator {
                 let callbook = agent.callbook.clone();
                 let nonces = agent.nonces.clone();
                 let local_sender = agent.graphcast_identity.graphcast_id.clone();
-                if let Ok(msg) = agent.decoder::<PublicPoiMessage>(msg.payload()).await {
+                if let Ok(msg) = agent.decode::<PublicPoiMessage>(msg.payload()).await {
                     trace!(
                         message = tracing::field::debug(&msg),
                         "Parseable as Public PoI message, now validate",
@@ -175,8 +175,7 @@ impl RadioOperator {
                                 .unwrap(),
                         );
                     };
-                } else if let Ok(msg) = agent.decoder::<VersionUpgradeMessage>(msg.payload()).await
-                {
+                } else if let Ok(msg) = agent.decode::<VersionUpgradeMessage>(msg.payload()).await {
                     trace!(
                         message = tracing::field::debug(&msg),
                         "Parseable as Version Upgrade message, now validate",
diff --git a/test-runner/Cargo.toml b/test-runner/Cargo.toml
index 4cd1ff3..7e44ee4 100644
--- a/test-runner/Cargo.toml
+++ b/test-runner/Cargo.toml
@@ -23,7 +23,7 @@ categories = [
 [dependencies]
 waku = { version = "0.1.1", package = "waku-bindings" }
 test-utils = { path = "../test-utils" }
-graphcast-sdk = { package = "graphcast-sdk", git = "https://github.com/graphops/graphcast-sdk", rev = "99d942e" } 
+graphcast-sdk = { package = "graphcast-sdk", git = "https://github.com/graphops/graphcast-sdk", branch = "hope/subgraph-owner-check" }
 poi-radio = { path = "../poi-radio" }
 tokio = { version = "1.1.1", features = ["full", "rt"] }
 tracing = "0.1"
diff --git a/test-runner/src/main.rs b/test-runner/src/main.rs
index 03f24ba..a20defd 100644
--- a/test-runner/src/main.rs
+++ b/test-runner/src/main.rs
@@ -38,16 +38,16 @@ pub async fn main() {
     let config = test_config();
 
     std::env::set_var(
-        "RUST_LOG",
-        "off,hyper=off,graphcast_sdk=trace,poi_radio=trace,test_runner=trace,test_sender=trace,test_utils=trace",
-    );
+            "RUST_LOG",
+            "off,hyper=off,graphcast_sdk=trace,poi_radio=trace,test_runner=trace,test_sender=trace,test_utils=trace",
+        );
     init_tracing(config.log_format).expect("Could not set up global default subscriber for logger, check environmental variable `RUST_LOG` or the CLI input `log-level");
 
     let start_time = Instant::now();
 
-    let mut retry_count = 3;
-    let mut initial_test_results: HashMap<String, bool> = HashMap::new();
+    let mut retry_count = 5;
     let mut initial_tests_passed = false;
+    let mut initial_test_results: HashMap<String, bool> = HashMap::new();
 
     while retry_count > 0 && !initial_tests_passed {
         let initial_tests = vec![
@@ -68,58 +68,51 @@ pub async fn main() {
         }
     }
 
-    if initial_tests_passed {
-        let poi_tests = vec![
-            ("poi_divergent_test", tokio::spawn(poi_divergent_test())),
-            ("poi_match_test", tokio::spawn(poi_match_test())),
-        ];
-
-        let (poi_tests_passed, poi_test_results) = run_tests(poi_tests).await;
-        if poi_tests_passed {
-            let remaining_tests = vec![
-                (
-                    "invalid_block_hash_test",
-                    tokio::spawn(invalid_block_hash_test()),
-                ),
-                ("invalid_sender_test", tokio::spawn(invalid_sender_test())),
-                ("invalid_nonce_test", tokio::spawn(invalid_nonce_test())),
-                ("invalid_payload_test", tokio::spawn(invalid_payload_test())),
-            ];
-
-            let (remaining_tests_passed, remaining_test_results) = run_tests(remaining_tests).await;
-
-            print_test_summary(
-                initial_test_results,
-                poi_test_results,
-                remaining_test_results,
-                remaining_tests_passed,
-                start_time,
-            );
-        } else {
-            print_test_summary(
-                initial_test_results,
-                poi_test_results,
-                HashMap::new(),
-                false,
-                start_time,
-            );
-        }
-    } else {
-        print_test_summary(
-            initial_test_results,
-            HashMap::new(),
-            HashMap::new(),
-            false,
-            start_time,
-        );
-    }
+    let poi_tests = vec![
+        ("poi_divergent_test", tokio::spawn(poi_divergent_test())),
+        ("poi_match_test", tokio::spawn(poi_match_test())),
+    ];
+
+    let (poi_tests_passed, poi_test_results) = run_tests(poi_tests).await;
+
+    let validity_tests_group_1 = vec![
+        (
+            "invalid_block_hash_test",
+            tokio::spawn(invalid_block_hash_test()),
+        ),
+        ("invalid_sender_test", tokio::spawn(invalid_sender_test())),
+    ];
+
+    let (validity_tests_group_1_passed, validity_test_results_group_1) =
+        run_tests(validity_tests_group_1).await;
+
+    let validity_tests_group_2 = vec![
+        ("invalid_nonce_test", tokio::spawn(invalid_nonce_test())),
+        ("invalid_payload_test", tokio::spawn(invalid_payload_test())),
+    ];
+
+    let (validity_tests_group_2_passed, validity_test_results_group_2) =
+        run_tests(validity_tests_group_2).await;
+
+    print_test_summary(
+        initial_test_results,
+        poi_test_results,
+        validity_test_results_group_1,
+        validity_test_results_group_2,
+        initial_tests_passed
+            && poi_tests_passed
+            && validity_tests_group_1_passed
+            && validity_tests_group_2_passed,
+        start_time,
+    );
 }
 
 fn print_test_summary(
     initial_test_results: HashMap<String, bool>,
     poi_test_results: HashMap<String, bool>,
-    remaining_test_results: HashMap<String, bool>,
-    remaining_tests_passed: bool,
+    validity_test_results_group_1: HashMap<String, bool>,
+    validity_test_results_group_2: HashMap<String, bool>,
+    tests_passed: bool,
     start_time: Instant,
 ) {
     let elapsed_time = start_time.elapsed();
@@ -128,7 +121,8 @@ fn print_test_summary(
     for (test_name, passed) in initial_test_results
         .iter()
         .chain(&poi_test_results)
-        .chain(&remaining_test_results)
+        .chain(&validity_test_results_group_1)
+        .chain(&validity_test_results_group_2)
     {
         if *passed {
             info!("{}: PASSED", test_name);
@@ -137,7 +131,7 @@ fn print_test_summary(
         }
     }
 
-    if remaining_tests_passed {
+    if tests_passed {
         info!(
             "All tests passed ✅. Time elapsed: {}s",
             elapsed_time.as_secs()
diff --git a/test-runner/src/topics.rs b/test-runner/src/topics.rs
index 357cc1e..df4fc14 100644
--- a/test-runner/src/topics.rs
+++ b/test-runner/src/topics.rs
@@ -25,7 +25,7 @@ pub async fn topics_test() {
     let mut config = test_config();
     config.persistence_file_path = Some(store_path.clone());
     config.topics = radio_topics.clone();
-    config.topic_update_interval = 10;
+    config.topic_update_interval = 90;
 
     let mut test_sender_config = TestSenderConfig {
         topics: test_sender_topics,
@@ -108,16 +108,16 @@ pub async fn topics_test() {
 
     tokio::time::sleep(Duration::from_secs(50)).await;
 
+    let persisted_state = PersistedState::load_cache(&store_path);
+    debug!("persisted state {:?}", persisted_state);
+
+    let remote_messages = persisted_state.remote_messages();
+
     let test_hash = "QmonlyintestsenderXyZABCdeFgHIjklMNOpqrstuvWXYZabcdEFG";
-    let mut has_test_hash = test_result(&store_path, test_hash);
-
-    let max_test_attempts = 3;
-    let mut num_test_attempts = 0;
-    while num_test_attempts < max_test_attempts && !has_test_hash {
-        tokio::time::sleep(Duration::from_secs(config.topic_update_interval + 1)).await;
-        has_test_hash = test_result(&store_path, test_hash);
-        num_test_attempts += 1;
-    }
+    let has_test_hash = remote_messages
+        .iter()
+        .any(|msg| msg.identifier == test_hash);
+
     assert!(
         has_test_hash,
         "Expected remote message not found with identifier {}",
@@ -126,13 +126,3 @@ pub async fn topics_test() {
 
     teardown(process_manager, &store_path);
 }
-
-fn test_result(store_path: &str, test_hash: &str) -> bool {
-    let persisted_state = PersistedState::load_cache(store_path);
-    debug!("persisted state {:?}", persisted_state);
-
-    let remote_messages = persisted_state.remote_messages();
-    remote_messages
-        .iter()
-        .any(|msg| msg.identifier == test_hash)
-}
diff --git a/test-sender/Cargo.toml b/test-sender/Cargo.toml
index b012fa5..8714dc8 100644
--- a/test-sender/Cargo.toml
+++ b/test-sender/Cargo.toml
@@ -22,7 +22,7 @@ categories = [
 
 [dependencies]
 waku = { version = "0.1.1", package = "waku-bindings" }
-graphcast-sdk = { package = "graphcast-sdk", git = "https://github.com/graphops/graphcast-sdk", rev = "99d942e" } 
+graphcast-sdk = { package = "graphcast-sdk", git = "https://github.com/graphops/graphcast-sdk", branch = "hope/subgraph-owner-check" }
 test-utils = { path = "../test-utils" }
 poi-radio = { path = "../poi-radio" }
 tokio = { version = "1.1.1", features = ["full", "rt"] }
diff --git a/test-sender/src/main.rs b/test-sender/src/main.rs
index 2e0bf96..ff41c43 100644
--- a/test-sender/src/main.rs
+++ b/test-sender/src/main.rs
@@ -78,12 +78,9 @@ async fn start_sender(config: TestSenderConfig) {
             let content_topic = format!("/{}/0/{}/proto", config.radio_name, topic);
             let content_topic = WakuContentTopic::from_str(&content_topic).unwrap();
 
-            let timestamp =
-                if let Some(n) = config.nonce.clone().and_then(|x| x.parse::<i64>().ok()) {
-                    n
-                } else {
-                    Utc::now().timestamp()
-                };
+            let nonce = config.nonce.clone().and_then(|s| s.parse::<i64>().ok());
+
+            let timestamp = Utc::now().timestamp();
             let block_number = (timestamp + 9) / 10 * 10;
 
             let radio_payload_clone = config.radio_payload.clone();
@@ -92,7 +89,7 @@ async fn start_sender(config: TestSenderConfig) {
                     let radio_payload = PublicPoiMessage::build(
                         topic.clone(),
                         config.poi.clone().unwrap(),
-                        timestamp,
+                        nonce.unwrap_or(timestamp),
                         NetworkName::Goerli,
                         block_number.try_into().unwrap(),
                         config.block_hash.clone().unwrap(),
diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml
index fe3fe8e..eeab7cb 100644
--- a/test-utils/Cargo.toml
+++ b/test-utils/Cargo.toml
@@ -22,7 +22,7 @@ categories = [
 
 [dependencies]
 waku = { version = "0.1.1", package = "waku-bindings" }
-graphcast-sdk = { package = "graphcast-sdk", git = "https://github.com/graphops/graphcast-sdk", rev = "99d942e" } 
+graphcast-sdk = { package = "graphcast-sdk", git = "https://github.com/graphops/graphcast-sdk", branch = "hope/subgraph-owner-check" }
 poi-radio = { path = "../poi-radio" }
 tokio = { version = "1.1.1", features = ["full", "rt"] }
 tracing = "0.1"
diff --git a/test-utils/src/lib.rs b/test-utils/src/lib.rs
index 5629d94..9338b57 100644
--- a/test-utils/src/lib.rs
+++ b/test-utils/src/lib.rs
@@ -8,7 +8,6 @@ use std::{
     time::Duration,
 };
 
-use chrono::Utc;
 use config::TestSenderConfig;
 use graphcast_sdk::graphcast_agent::message_typing::GraphcastMessage;
 use graphcast_sdk::graphcast_agent::message_typing::IdentityValidation;
@@ -96,12 +95,7 @@ pub async fn setup(
                 "4dbba1ba9fb18b0034965712598be1368edcf91ae2c551d59462aab578dab9c5".to_string(),
             ))
             .arg("--nonce")
-            .arg(
-                &test_sender_config
-                    .nonce
-                    .clone()
-                    .unwrap_or(Utc::now().timestamp().to_string()),
-            )
+            .arg(test_sender_config.nonce.as_deref().unwrap_or("None"))
             .arg("--radio-payload")
             .arg(
                 test_sender_config