diff --git a/Cargo.lock b/Cargo.lock
index c04038391..c8c82c179 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -27,15 +27,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
-[[package]]
-name = "aead"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "aead"
 version = "0.5.2"
@@ -46,18 +37,6 @@ dependencies = [
  "generic-array",
 ]
 
-[[package]]
-name = "aes"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8"
-dependencies = [
- "cfg-if",
- "cipher 0.3.0",
- "cpufeatures",
- "opaque-debug",
-]
-
 [[package]]
 name = "aes"
 version = "0.8.3"
@@ -69,31 +48,17 @@ dependencies = [
  "cpufeatures",
 ]
 
-[[package]]
-name = "aes-gcm"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc3be92e19a7ef47457b8e6f90707e12b6ac5d20c6f3866584fa3be0787d839f"
-dependencies = [
- "aead 0.4.3",
- "aes 0.7.5",
- "cipher 0.3.0",
- "ctr 0.7.0",
- "ghash 0.4.4",
- "subtle",
-]
-
 [[package]]
 name = "aes-gcm"
 version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
 dependencies = [
- "aead 0.5.2",
- "aes 0.8.3",
+ "aead",
+ "aes",
  "cipher 0.4.4",
- "ctr 0.9.2",
- "ghash 0.5.0",
+ "ctr",
+ "ghash",
  "subtle",
 ]
 
@@ -103,7 +68,7 @@ version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
 dependencies = [
- "getrandom 0.2.11",
+ "getrandom",
  "once_cell",
  "version_check",
 ]
@@ -840,6 +805,15 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
+[[package]]
+name = "autotools"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aef8da1805e028a172334c3b680f93e71126f2327622faef2ec3d893c0a4ad77"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "axum"
 version = "0.6.20"
@@ -867,7 +841,7 @@ dependencies = [
  "serde_json",
  "serde_path_to_error",
  "serde_urlencoded",
- "sha1",
+ "sha1 0.10.6",
  "sync_wrapper",
  "tokio",
  "tokio-tungstenite",
@@ -945,9 +919,9 @@ dependencies = [
 
 [[package]]
 name = "base58-monero"
-version = "1.0.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d079cdf47e1ca75554200bb2f30bff5a5af16964cac4a566b18de9a5d48db2b"
+checksum = "978e81a45367d2409ecd33369a45dda2e9a3ca516153ec194de1fbda4b9fb79d"
 dependencies = [
  "thiserror",
 ]
@@ -1143,47 +1117,26 @@ dependencies = [
 
 [[package]]
 name = "borsh"
-version = "0.10.3"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b"
+checksum = "f58b559fd6448c6e2fd0adb5720cd98a2506594cafa4737ff98c396f3e82f667"
 dependencies = [
  "borsh-derive",
- "hashbrown 0.13.2",
+ "cfg_aliases",
 ]
 
 [[package]]
 name = "borsh-derive"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7"
-dependencies = [
- "borsh-derive-internal",
- "borsh-schema-derive-internal",
- "proc-macro-crate 0.1.5",
- "proc-macro2",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "borsh-derive-internal"
-version = "0.10.3"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "borsh-schema-derive-internal"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd"
+checksum = "7aadb5b6ccbd078890f6d7003694e33816e6b784358f18e15e7e6d9f065a57cd"
 dependencies = [
+ "once_cell",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.48",
+ "syn_derive",
 ]
 
 [[package]]
@@ -1306,7 +1259,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "sha1",
+ "sha1 0.10.6",
  "sha2",
  "ssri",
  "tempfile",
@@ -1426,9 +1379,9 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ae3c82e4355234767756212c570e29833699ab63e6ffd161887314cc5b43847"
 dependencies = [
- "aead 0.5.2",
+ "aead",
  "cipher 0.4.4",
- "ctr 0.9.2",
+ "ctr",
  "subtle",
 ]
 
@@ -1448,26 +1401,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
-name = "chacha20"
-version = "0.7.3"
+name = "cfg_aliases"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f08493fa7707effc63254c66c6ea908675912493cd67952eda23c09fae2610b1"
-dependencies = [
- "cfg-if",
- "cipher 0.3.0",
- "cpufeatures",
-]
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
 [[package]]
 name = "chacha20"
-version = "0.8.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6"
+checksum = "f08493fa7707effc63254c66c6ea908675912493cd67952eda23c09fae2610b1"
 dependencies = [
  "cfg-if",
  "cipher 0.3.0",
  "cpufeatures",
- "zeroize",
 ]
 
 [[package]]
@@ -1481,29 +1428,16 @@ dependencies = [
  "cpufeatures",
 ]
 
-[[package]]
-name = "chacha20poly1305"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5"
-dependencies = [
- "aead 0.4.3",
- "chacha20 0.8.2",
- "cipher 0.3.0",
- "poly1305 0.7.2",
- "zeroize",
-]
-
 [[package]]
 name = "chacha20poly1305"
 version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
 dependencies = [
- "aead 0.5.2",
+ "aead",
  "chacha20 0.9.1",
  "cipher 0.4.4",
- "poly1305 0.8.0",
+ "poly1305",
  "zeroize",
 ]
 
@@ -2102,7 +2036,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
  "generic-array",
- "rand_core 0.6.4",
+ "rand_core",
  "subtle",
  "zeroize",
 ]
@@ -2114,19 +2048,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
  "generic-array",
- "rand_core 0.6.4",
+ "rand_core",
  "typenum",
 ]
 
-[[package]]
-name = "ctr"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a232f92a03f37dd7d7dd2adc67166c77e9cd88de5b019b9a9eecfaeaf7bfd481"
-dependencies = [
- "cipher 0.3.0",
-]
-
 [[package]]
 name = "ctr"
 version = "0.9.2"
@@ -2228,19 +2153,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "curve25519-dalek"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
-dependencies = [
- "byteorder",
- "digest 0.9.0",
- "rand_core 0.5.1",
- "subtle",
- "zeroize",
-]
-
 [[package]]
 name = "curve25519-dalek"
 version = "4.1.1"
@@ -2514,6 +2426,18 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7"
 
+[[package]]
+name = "dialoguer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87"
+dependencies = [
+ "console",
+ "shell-words",
+ "tempfile",
+ "zeroize",
+]
+
 [[package]]
 name = "diesel"
 version = "2.1.4"
@@ -2707,9 +2631,9 @@ version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0"
 dependencies = [
- "curve25519-dalek 4.1.1",
+ "curve25519-dalek",
  "ed25519",
- "rand_core 0.6.4",
+ "rand_core",
  "serde",
  "sha2",
  "subtle",
@@ -2737,7 +2661,7 @@ dependencies = [
  "hkdf",
  "pem-rfc7468",
  "pkcs8",
- "rand_core 0.6.4",
+ "rand_core",
  "sec1",
  "subtle",
  "zeroize",
@@ -3015,7 +2939,7 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
 dependencies = [
- "rand_core 0.6.4",
+ "rand_core",
  "subtle",
 ]
 
@@ -3099,6 +3023,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "fs_extra"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
+
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -3278,17 +3208,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.11"
@@ -3297,17 +3216,7 @@ checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
-]
-
-[[package]]
-name = "ghash"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99"
-dependencies = [
- "opaque-debug",
- "polyval 0.5.3",
+ "wasi",
 ]
 
 [[package]]
@@ -3317,7 +3226,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40"
 dependencies = [
  "opaque-debug",
- "polyval 0.6.1",
+ "polyval",
 ]
 
 [[package]]
@@ -3356,11 +3265,11 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "git2"
-version = "0.15.0"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2994bee4a3a6a51eb90c218523be382fd7ea09b16380b9312e9dbe955ff7c7d1"
+checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.1",
  "libc",
  "libgit2-sys",
  "log",
@@ -3416,7 +3325,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
 dependencies = [
  "ff",
- "rand_core 0.6.4",
+ "rand_core",
  "subtle",
 ]
 
@@ -3521,7 +3430,7 @@ dependencies = [
  "http",
  "httpdate",
  "mime",
- "sha1",
+ "sha1 0.10.6",
 ]
 
 [[package]]
@@ -3578,6 +3487,12 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
 
+[[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"
@@ -4102,6 +4017,7 @@ dependencies = [
  "tari_engine_types",
  "tari_indexer",
  "tari_indexer_client",
+ "tari_key_manager",
  "tari_p2p",
  "tari_shutdown",
  "tari_template_builtin",
@@ -4114,7 +4030,7 @@ dependencies = [
  "tari_wallet_daemon_client",
  "time",
  "tokio",
- "tonic 0.6.2",
+ "tonic 0.8.3",
 ]
 
 [[package]]
@@ -4356,7 +4272,7 @@ dependencies = [
  "regex-syntax 0.6.29",
  "string_cache",
  "term",
- "tiny-keccak",
+ "tiny-keccak 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-xid",
 ]
 
@@ -4398,9 +4314,9 @@ checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
 
 [[package]]
 name = "libgit2-sys"
-version = "0.14.2+1.5.1"
+version = "0.16.1+1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4"
+checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c"
 dependencies = [
  "cc",
  "libc",
@@ -4453,7 +4369,7 @@ dependencies = [
  "either",
  "futures 0.3.29",
  "futures-timer",
- "getrandom 0.2.11",
+ "getrandom",
  "instant",
  "libp2p-allow-block-list",
  "libp2p-autonat",
@@ -4606,7 +4522,7 @@ dependencies = [
  "fnv",
  "futures 0.3.29",
  "futures-ticker",
- "getrandom 0.2.11",
+ "getrandom",
  "hex_fmt",
  "instant",
  "libp2p-core",
@@ -4649,7 +4565,7 @@ dependencies = [
 [[package]]
 name = "libp2p-identity"
 version = "0.2.8"
-source = "git+https://github.com/tari-project/rust-libp2p.git?rev=5459d4d7cc79437d091fe3e390e8609a5ac06ea3#5459d4d7cc79437d091fe3e390e8609a5ac06ea3"
+source = "git+https://github.com/tari-project/rust-libp2p.git?rev=9b73988f611a877595de8a4a205aa86fb78cd626#9b73988f611a877595de8a4a205aa86fb78cd626"
 dependencies = [
  "bs58 0.5.0",
  "ed25519-dalek",
@@ -4726,7 +4642,7 @@ checksum = "8ecd0545ce077f6ea5434bcb76e8d0fe942693b4380aaad0d34a358c2bd05793"
 dependencies = [
  "asynchronous-codec 0.7.0",
  "bytes 1.5.0",
- "curve25519-dalek 4.1.1",
+ "curve25519-dalek",
  "futures 0.3.29",
  "libp2p-core",
  "libp2p-identity",
@@ -4981,6 +4897,43 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "libtor"
+version = "46.9.0+0.4.6.x"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18ca40c5090fd84877853f509dce8f906922e6c6fb0be12f4b61f6116710d457"
+dependencies = [
+ "libtor-derive",
+ "libtor-sys",
+ "log",
+ "rand",
+ "sha1 0.6.0",
+]
+
+[[package]]
+name = "libtor-derive"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "177781b25e83853831c5af66320ceaf5e456e1b6d533426fcd9c7544b5543043"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "libtor-sys"
+version = "46.9.1+0.4.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52bf218e9764d77c16b77b9a26f219c5302bf7be010fd82aba63b019dea41fea"
+dependencies = [
+ "autotools",
+ "cc",
+ "fs_extra",
+ "libz-sys",
+ "openssl-sys",
+]
+
 [[package]]
 name = "libz-sys"
 version = "1.1.12"
@@ -5300,7 +5253,7 @@ checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d"
 dependencies = [
  "byteorder",
  "keccak",
- "rand_core 0.6.4",
+ "rand_core",
  "zeroize",
 ]
 
@@ -5396,17 +5349,18 @@ dependencies = [
 
 [[package]]
 name = "minotari_app_grpc"
-version = "0.53.0-dan.0"
-source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#9a871656e4ce1464d54107a4e3fc52181ed13e02"
+version = "1.0.0-dan.5"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
 dependencies = [
  "argon2",
  "base64 0.13.1",
  "borsh",
  "chrono",
  "log",
- "prost 0.9.0",
- "prost-types 0.9.0",
+ "prost 0.11.9",
+ "prost-types 0.11.9",
  "rand",
+ "rcgen",
  "subtle",
  "tari_common_types",
  "tari_comms",
@@ -5415,17 +5369,19 @@ dependencies = [
  "tari_script",
  "tari_utilities",
  "thiserror",
- "tonic 0.6.2",
+ "tokio",
+ "tonic 0.8.3",
  "tonic-build",
  "zeroize",
 ]
 
 [[package]]
 name = "minotari_app_utilities"
-version = "0.53.0-dan.0"
-source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#9a871656e4ce1464d54107a4e3fc52181ed13e02"
+version = "1.0.0-dan.5"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
 dependencies = [
  "clap 3.2.25",
+ "dialoguer",
  "futures 0.3.29",
  "json5",
  "log",
@@ -5438,14 +5394,14 @@ dependencies = [
  "tari_utilities",
  "thiserror",
  "tokio",
+ "tonic 0.8.3",
 ]
 
 [[package]]
 name = "minotari_console_wallet"
-version = "0.53.0-dan.0"
-source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#9a871656e4ce1464d54107a4e3fc52181ed13e02"
+version = "1.0.0-dan.5"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
 dependencies = [
- "bitflags 2.4.1",
  "blake2",
  "chrono",
  "clap 3.2.25",
@@ -5478,14 +5434,16 @@ dependencies = [
  "tari_core",
  "tari_crypto",
  "tari_features",
+ "tari_hash_domains",
  "tari_key_manager",
+ "tari_libtor",
  "tari_p2p",
  "tari_script",
  "tari_shutdown",
  "tari_utilities",
  "thiserror",
  "tokio",
- "tonic 0.6.2",
+ "tonic 0.8.3",
  "tui",
  "unicode-segmentation",
  "unicode-width",
@@ -5496,8 +5454,8 @@ dependencies = [
 
 [[package]]
 name = "minotari_node"
-version = "0.53.0-dan.0"
-source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#9a871656e4ce1464d54107a4e3fc52181ed13e02"
+version = "1.0.0-dan.5"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -5529,7 +5487,8 @@ dependencies = [
  "tari_core",
  "tari_crypto",
  "tari_features",
- "tari_metrics 0.1.0 (git+https://github.com/tari-project/tari.git?branch=feature-dan2)",
+ "tari_libtor",
+ "tari_metrics",
  "tari_p2p",
  "tari_service_framework",
  "tari_shutdown",
@@ -5537,28 +5496,28 @@ dependencies = [
  "tari_utilities",
  "thiserror",
  "tokio",
- "tonic 0.6.2",
+ "tonic 0.8.3",
 ]
 
 [[package]]
 name = "minotari_node_grpc_client"
 version = "0.1.0"
-source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#9a871656e4ce1464d54107a4e3fc52181ed13e02"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
 dependencies = [
  "minotari_app_grpc",
 ]
 
 [[package]]
 name = "minotari_wallet"
-version = "0.53.0-dan.0"
-source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#9a871656e4ce1464d54107a4e3fc52181ed13e02"
+version = "1.0.0-dan.5"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
 dependencies = [
  "argon2",
  "async-trait",
  "bincode 1.3.3",
  "blake2",
  "borsh",
- "chacha20poly1305 0.10.1",
+ "chacha20poly1305",
  "chrono",
  "derivative",
  "diesel",
@@ -5569,7 +5528,7 @@ dependencies = [
  "itertools 0.10.5",
  "libsqlite3-sys",
  "log",
- "prost 0.9.0",
+ "prost 0.11.9",
  "rand",
  "serde",
  "serde_json",
@@ -5600,12 +5559,12 @@ dependencies = [
 [[package]]
 name = "minotari_wallet_grpc_client"
 version = "0.1.0"
-source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#9a871656e4ce1464d54107a4e3fc52181ed13e02"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
 dependencies = [
  "minotari_app_grpc",
  "tari_common_types",
  "thiserror",
- "tonic 0.6.2",
+ "tonic 0.8.3",
 ]
 
 [[package]]
@@ -5629,7 +5588,7 @@ checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
 dependencies = [
  "libc",
  "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
  "windows-sys 0.48.0",
 ]
 
@@ -5644,19 +5603,19 @@ dependencies = [
 
 [[package]]
 name = "monero"
-version = "0.18.2"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a8965a7510c5d9389e2086e406c292d6bbecac099eef195be55a2d2043448b9"
+checksum = "1b205707fd34b01a547f2fe77e687b40fed05966fb82e955b86ac55cd8ee31b5"
 dependencies = [
- "base58-monero 1.0.0",
- "curve25519-dalek 3.2.0",
+ "base58-monero 2.0.0",
+ "curve25519-dalek",
  "fixed-hash",
  "hex",
- "hex-literal",
- "sealed 0.4.0",
+ "hex-literal 0.4.1",
+ "sealed 0.5.0",
  "serde",
  "thiserror",
- "tiny-keccak",
+ "tiny-keccak 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -5704,7 +5663,7 @@ dependencies = [
 [[package]]
 name = "multiaddr"
 version = "0.18.1"
-source = "git+https://github.com/tari-project/rust-libp2p.git?rev=5459d4d7cc79437d091fe3e390e8609a5ac06ea3#5459d4d7cc79437d091fe3e390e8609a5ac06ea3"
+source = "git+https://github.com/tari-project/rust-libp2p.git?rev=9b73988f611a877595de8a4a205aa86fb78cd626#9b73988f611a877595de8a4a205aa86fb78cd626"
 dependencies = [
  "arrayref",
  "byteorder",
@@ -6154,6 +6113,15 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
+[[package]]
+name = "openssl-src"
+version = "300.2.1+3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "openssl-sys"
 version = "0.9.97"
@@ -6162,6 +6130,7 @@ checksum = "c3eaad34cdd97d81de97964fc7f29e2d104f483840d906ef56daa1912338460b"
 dependencies = [
  "cc",
  "libc",
+ "openssl-src",
  "pkg-config",
  "vcpkg",
 ]
@@ -6302,7 +6271,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700"
 dependencies = [
  "base64ct",
- "rand_core 0.6.4",
+ "rand_core",
  "subtle",
 ]
 
@@ -6458,7 +6427,7 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "27e1f8e085bfa9b85763fe3ddaacbe90a09cd847b3833129153a6cb063bbe132"
 dependencies = [
- "aes 0.8.3",
+ "aes",
  "base64 0.21.5",
  "bitfield",
  "block-padding",
@@ -6472,7 +6441,7 @@ dependencies = [
  "chrono",
  "cipher 0.4.4",
  "crc24",
- "curve25519-dalek 4.1.1",
+ "curve25519-dalek",
  "derive_builder",
  "des",
  "digest 0.10.7",
@@ -6493,7 +6462,7 @@ dependencies = [
  "rand",
  "ripemd",
  "rsa",
- "sha1",
+ "sha1 0.10.6",
  "sha2",
  "sha3",
  "signature",
@@ -6639,17 +6608,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "poly1305"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede"
-dependencies = [
- "cpufeatures",
- "opaque-debug",
- "universal-hash 0.4.0",
-]
-
 [[package]]
 name = "poly1305"
 version = "0.8.0"
@@ -6658,19 +6616,7 @@ checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
 dependencies = [
  "cpufeatures",
  "opaque-debug",
- "universal-hash 0.5.1",
-]
-
-[[package]]
-name = "polyval"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "opaque-debug",
- "universal-hash 0.4.0",
+ "universal-hash",
 ]
 
 [[package]]
@@ -6682,7 +6628,7 @@ dependencies = [
  "cfg-if",
  "cpufeatures",
  "opaque-debug",
- "universal-hash 0.5.1",
+ "universal-hash",
 ]
 
 [[package]]
@@ -6709,6 +6655,16 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
+[[package]]
+name = "prettyplease"
+version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
+dependencies = [
+ "proc-macro2",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "prettyplease"
 version = "0.2.15"
@@ -6740,15 +6696,6 @@ dependencies = [
  "uint",
 ]
 
-[[package]]
-name = "proc-macro-crate"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
-dependencies = [
- "toml 0.5.11",
-]
-
 [[package]]
 name = "proc-macro-crate"
 version = "1.1.3"
@@ -6768,6 +6715,15 @@ dependencies = [
  "toml_edit 0.20.7",
 ]
 
+[[package]]
+name = "proc-macro-crate"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+dependencies = [
+ "toml_edit 0.21.0",
+]
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -6887,20 +6843,22 @@ dependencies = [
 
 [[package]]
 name = "prost-build"
-version = "0.9.0"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5"
+checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270"
 dependencies = [
  "bytes 1.5.0",
- "heck 0.3.3",
+ "heck 0.4.1",
  "itertools 0.10.5",
  "lazy_static",
  "log",
  "multimap",
  "petgraph",
- "prost 0.9.0",
- "prost-types 0.9.0",
+ "prettyplease 0.1.25",
+ "prost 0.11.9",
+ "prost-types 0.11.9",
  "regex",
+ "syn 1.0.109",
  "tempfile",
  "which",
 ]
@@ -6918,7 +6876,7 @@ dependencies = [
  "multimap",
  "once_cell",
  "petgraph",
- "prettyplease",
+ "prettyplease 0.2.15",
  "prost 0.12.3",
  "prost-types 0.12.3",
  "regex",
@@ -7197,7 +7155,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
  "rand_chacha",
- "rand_core 0.6.4",
+ "rand_core",
 ]
 
 [[package]]
@@ -7207,16 +7165,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
+ "rand_core",
 ]
 
 [[package]]
@@ -7225,7 +7174,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.11",
+ "getrandom",
 ]
 
 [[package]]
@@ -7234,7 +7183,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
 dependencies = [
- "rand_core 0.6.4",
+ "rand_core",
 ]
 
 [[package]]
@@ -7305,7 +7254,7 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
 dependencies = [
- "getrandom 0.2.11",
+ "getrandom",
  "libredox",
  "thiserror",
 ]
@@ -7477,7 +7426,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
 dependencies = [
  "cc",
- "getrandom 0.2.11",
+ "getrandom",
  "libc",
  "spin 0.9.8",
  "untrusted 0.9.0",
@@ -7565,7 +7514,7 @@ dependencies = [
  "num-traits",
  "pkcs1",
  "pkcs8",
- "rand_core 0.6.4",
+ "rand_core",
  "signature",
  "spki",
  "subtle",
@@ -7747,6 +7696,18 @@ dependencies = [
  "sct",
 ]
 
+[[package]]
+name = "rustls-native-certs"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
+dependencies = [
+ "openssl-probe",
+ "rustls-pemfile 1.0.4",
+ "schannel",
+ "security-framework",
+]
+
 [[package]]
 name = "rustls-pemfile"
 version = "0.3.0"
@@ -7929,6 +7890,18 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "sealed"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4a8caec23b7800fb97971a1c6ae365b6239aaeddfb934d6265f8505e795699d"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "sec1"
 version = "0.7.3"
@@ -8159,6 +8132,12 @@ dependencies = [
  "digest 0.10.7",
 ]
 
+[[package]]
+name = "sha1"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
+
 [[package]]
 name = "sha1"
 version = "0.10.6"
@@ -8200,6 +8179,12 @@ dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "shell-words"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
+
 [[package]]
 name = "signal-hook"
 version = "0.3.17"
@@ -8238,7 +8223,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
 dependencies = [
  "digest 0.10.7",
- "rand_core 0.6.4",
+ "rand_core",
 ]
 
 [[package]]
@@ -8357,16 +8342,16 @@ dependencies = [
 
 [[package]]
 name = "snow"
-version = "0.9.3"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c9d1425eb528a21de2755c75af4c9b5d57f50a0d4c3b7f1828a4cd03f8ba155"
+checksum = "850948bee068e713b8ab860fe1adc4d109676ab4c3b621fd8147f06b261f2f85"
 dependencies = [
- "aes-gcm 0.9.2",
+ "aes-gcm",
  "blake2",
- "chacha20poly1305 0.9.1",
- "curve25519-dalek 4.1.1",
- "rand_core 0.6.4",
- "ring 0.16.20",
+ "chacha20poly1305",
+ "curve25519-dalek",
+ "rand_core",
+ "ring 0.17.7",
  "rustc_version 0.4.0",
  "sha2",
  "subtle",
@@ -8614,6 +8599,18 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "syn_derive"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
 [[package]]
 name = "sync_wrapper"
 version = "0.1.2"
@@ -8715,7 +8712,7 @@ dependencies = [
  "curve25519-dalek-derive",
  "fiat-crypto 0.1.20",
  "platforms",
- "rand_core 0.6.4",
+ "rand_core",
  "rustc_version 0.4.0",
  "serde",
  "subtle",
@@ -8736,7 +8733,7 @@ dependencies = [
  "tari_dan_common_types",
  "tari_utilities",
  "thiserror",
- "tonic 0.6.2",
+ "tonic 0.8.3",
 ]
 
 [[package]]
@@ -8764,7 +8761,7 @@ dependencies = [
  "lazy_static",
  "merlin",
  "rand",
- "rand_core 0.6.4",
+ "rand_core",
  "serde",
  "sha3",
  "tari-curve25519-dalek",
@@ -8774,8 +8771,8 @@ dependencies = [
 
 [[package]]
 name = "tari_common"
-version = "0.53.0-dan.0"
-source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#9a871656e4ce1464d54107a4e3fc52181ed13e02"
+version = "1.0.0-dan.5"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
 dependencies = [
  "anyhow",
  "blake2",
@@ -8786,7 +8783,7 @@ dependencies = [
  "log4rs 1.2.0 (git+https://github.com/tari-project/log4rs.git)",
  "multiaddr 0.14.0",
  "path-clean",
- "prost-build 0.9.0",
+ "prost-build 0.11.9",
  "serde",
  "serde_json",
  "serde_yaml 0.9.27",
@@ -8801,8 +8798,8 @@ dependencies = [
 
 [[package]]
 name = "tari_common_sqlite"
-version = "0.53.0-dan.0"
-source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#9a871656e4ce1464d54107a4e3fc52181ed13e02"
+version = "1.0.0-dan.5"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
 dependencies = [
  "diesel",
  "diesel_migrations",
@@ -8815,16 +8812,16 @@ dependencies = [
 
 [[package]]
 name = "tari_common_types"
-version = "0.53.0-dan.0"
-source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#9a871656e4ce1464d54107a4e3fc52181ed13e02"
+version = "1.0.0-dan.5"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
 dependencies = [
  "base64 0.21.5",
  "blake2",
  "borsh",
- "chacha20poly1305 0.10.1",
+ "chacha20poly1305",
  "digest 0.10.7",
- "lazy_static",
  "newtype-ops",
+ "once_cell",
  "primitive-types",
  "rand",
  "serde",
@@ -8837,8 +8834,8 @@ dependencies = [
 
 [[package]]
 name = "tari_comms"
-version = "0.53.0-dan.0"
-source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#9a871656e4ce1464d54107a4e3fc52181ed13e02"
+version = "1.0.0-dan.5"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -8851,7 +8848,6 @@ dependencies = [
  "derivative",
  "digest 0.10.7",
  "futures 0.3.29",
- "lazy_static",
  "lmdb-zero",
  "log",
  "log-mdc",
@@ -8859,7 +8855,7 @@ dependencies = [
  "nom",
  "once_cell",
  "pin-project 1.1.3",
- "prost 0.9.0",
+ "prost 0.11.9",
  "rand",
  "serde",
  "serde_derive",
@@ -8867,7 +8863,7 @@ dependencies = [
  "snow",
  "tari_common",
  "tari_crypto",
- "tari_metrics 0.1.0 (git+https://github.com/tari-project/tari.git?branch=feature-dan2)",
+ "tari_metrics",
  "tari_shutdown",
  "tari_storage",
  "tari_utilities",
@@ -8883,14 +8879,14 @@ dependencies = [
 
 [[package]]
 name = "tari_comms_dht"
-version = "0.53.0-dan.0"
-source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#9a871656e4ce1464d54107a4e3fc52181ed13e02"
+version = "1.0.0-dan.5"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
 dependencies = [
  "anyhow",
  "bitflags 2.4.1",
  "blake2",
  "chacha20 0.7.3",
- "chacha20poly1305 0.10.1",
+ "chacha20poly1305",
  "chrono",
  "diesel",
  "diesel_migrations",
@@ -8899,7 +8895,7 @@ dependencies = [
  "log",
  "log-mdc",
  "pin-project 0.4.30",
- "prost 0.9.0",
+ "prost 0.11.9",
  "rand",
  "serde",
  "tari_common",
@@ -8918,8 +8914,8 @@ dependencies = [
 
 [[package]]
 name = "tari_comms_rpc_macros"
-version = "0.53.0-dan.0"
-source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#9a871656e4ce1464d54107a4e3fc52181ed13e02"
+version = "1.0.0-dan.5"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8935,6 +8931,7 @@ dependencies = [
  "indexmap 2.1.0",
  "log",
  "serde",
+ "tari_common",
  "tari_common_types",
  "tari_dan_common_types",
  "tari_dan_storage",
@@ -8948,8 +8945,8 @@ dependencies = [
 
 [[package]]
 name = "tari_contacts"
-version = "0.53.0-dan.0"
-source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#9a871656e4ce1464d54107a4e3fc52181ed13e02"
+version = "1.0.0-dan.5"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
 dependencies = [
  "chrono",
  "diesel",
@@ -8958,7 +8955,7 @@ dependencies = [
  "log",
  "num-derive 0.3.3",
  "num-traits",
- "prost 0.9.0",
+ "prost 0.11.9",
  "rand",
  "serde",
  "serde_json",
@@ -8980,8 +8977,8 @@ dependencies = [
 
 [[package]]
 name = "tari_core"
-version = "0.53.0-dan.0"
-source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#9a871656e4ce1464d54107a4e3fc52181ed13e02"
+version = "1.0.0-dan.5"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
 dependencies = [
  "async-trait",
  "bincode 1.3.3",
@@ -8989,7 +8986,7 @@ dependencies = [
  "blake2",
  "borsh",
  "bytes 0.5.6",
- "chacha20poly1305 0.10.1",
+ "chacha20poly1305",
  "chrono",
  "decimal-rs",
  "derivative",
@@ -9008,12 +9005,13 @@ dependencies = [
  "num-traits",
  "once_cell",
  "primitive-types",
- "prost 0.9.0",
+ "prost 0.11.9",
  "rand",
  "randomx-rs",
  "serde",
  "serde_json",
  "serde_repr",
+ "sha2",
  "sha3",
  "strum",
  "strum_macros",
@@ -9024,6 +9022,7 @@ dependencies = [
  "tari_comms_dht",
  "tari_comms_rpc_macros",
  "tari_crypto",
+ "tari_hash_domains",
  "tari_key_manager",
  "tari_mmr",
  "tari_p2p",
@@ -9034,6 +9033,7 @@ dependencies = [
  "tari_test_utils",
  "tari_utilities",
  "thiserror",
+ "tiny-keccak 2.0.2 (git+https://github.com/tari-project/tiny-keccak?rev=bcddc65530d8646de7282cd8d18d891dc434b643)",
  "tokio",
  "tracing",
  "zeroize",
@@ -9041,9 +9041,9 @@ dependencies = [
 
 [[package]]
 name = "tari_crypto"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c74907b0c0237bc545e1da9b3ad6654fff934bdbd291bbe2a0e57e61933d6fc4"
+checksum = "63a3ed2c551101eb42b7f9386c207e28d53e6816f7b4c9a0883548922f317b3e"
 dependencies = [
  "blake2",
  "borsh",
@@ -9051,7 +9051,7 @@ dependencies = [
  "log",
  "once_cell",
  "rand_chacha",
- "rand_core 0.6.4",
+ "rand_core",
  "serde",
  "sha3",
  "snafu",
@@ -9127,6 +9127,7 @@ dependencies = [
  "tari_core",
  "tari_crypto",
  "tari_engine_types",
+ "tari_hash_domains",
  "tari_mmr",
  "ts-rs",
 ]
@@ -9147,6 +9148,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tari_bor",
+ "tari_common",
  "tari_common_types",
  "tari_crypto",
  "tari_dan_common_types",
@@ -9194,6 +9196,7 @@ dependencies = [
  "log",
  "rand",
  "serde",
+ "tari_common",
  "tari_common_types",
  "tari_core",
  "tari_crypto",
@@ -9318,7 +9321,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "blake2",
- "chacha20poly1305 0.10.1",
+ "chacha20poly1305",
  "chrono",
  "digest 0.10.7",
  "jsonwebtoken",
@@ -9379,8 +9382,10 @@ dependencies = [
  "serde",
  "serde_json",
  "tari_bor",
+ "tari_common",
  "tari_common_types",
  "tari_crypto",
+ "tari_hash_domains",
  "tari_template_abi",
  "tari_template_lib",
  "tari_utilities",
@@ -9396,6 +9401,7 @@ dependencies = [
  "async-trait",
  "log",
  "tari_base_node_client",
+ "tari_common",
  "tari_common_types",
  "tari_core",
  "tari_dan_common_types",
@@ -9409,8 +9415,16 @@ dependencies = [
 
 [[package]]
 name = "tari_features"
-version = "0.53.0-dan.0"
-source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#9a871656e4ce1464d54107a4e3fc52181ed13e02"
+version = "1.0.0-dan.5"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
+
+[[package]]
+name = "tari_hash_domains"
+version = "0.1.0"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
+dependencies = [
+ "tari_crypto",
+]
 
 [[package]]
 name = "tari_indexer"
@@ -9500,14 +9514,14 @@ dependencies = [
 
 [[package]]
 name = "tari_key_manager"
-version = "0.53.0-dan.0"
-source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#9a871656e4ce1464d54107a4e3fc52181ed13e02"
+version = "1.0.0-dan.5"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
 dependencies = [
  "argon2",
  "async-trait",
  "blake2",
  "chacha20 0.7.3",
- "chacha20poly1305 0.10.1",
+ "chacha20poly1305",
  "chrono",
  "crc32fast",
  "derivative",
@@ -9531,10 +9545,27 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "tari_libtor"
+version = "0.24.0"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
+dependencies = [
+ "derivative",
+ "libtor",
+ "log",
+ "openssl",
+ "rand",
+ "tari_common",
+ "tari_p2p",
+ "tari_shutdown",
+ "tempfile",
+ "tor-hash-passwd",
+]
+
 [[package]]
 name = "tari_metrics"
 version = "0.1.0"
-source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#9a871656e4ce1464d54107a4e3fc52181ed13e02"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
 dependencies = [
  "anyhow",
  "futures 0.3.29",
@@ -9547,20 +9578,10 @@ dependencies = [
  "warp",
 ]
 
-[[package]]
-name = "tari_metrics"
-version = "0.1.0"
-source = "git+https://github.com/tari-project/tari.git#f394fd815e89e56147a59a3640586cbbe0874338"
-dependencies = [
- "once_cell",
- "prometheus",
- "thiserror",
-]
-
 [[package]]
 name = "tari_mmr"
-version = "0.53.0-dan.0"
-source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#9a871656e4ce1464d54107a4e3fc52181ed13e02"
+version = "1.0.0-dan.5"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
 dependencies = [
  "borsh",
  "digest 0.10.7",
@@ -9590,8 +9611,8 @@ dependencies = [
 
 [[package]]
 name = "tari_p2p"
-version = "0.53.0-dan.0"
-source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#9a871656e4ce1464d54107a4e3fc52181ed13e02"
+version = "1.0.0-dan.5"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
 dependencies = [
  "anyhow",
  "fs2",
@@ -9599,7 +9620,7 @@ dependencies = [
  "lmdb-zero",
  "log",
  "pgp",
- "prost 0.9.0",
+ "prost 0.11.9",
  "rand",
  "reqwest",
  "rustls 0.20.9",
@@ -9637,7 +9658,7 @@ dependencies = [
  "prost 0.12.3",
  "prost-build 0.12.3",
  "proto_builder",
- "tari_metrics 0.1.0 (git+https://github.com/tari-project/tari.git)",
+ "tari_metrics",
  "tari_shutdown",
  "thiserror",
  "tokio",
@@ -9663,6 +9684,7 @@ dependencies = [
  "async-trait",
  "futures 0.3.29",
  "log",
+ "tari_common",
  "tari_consensus",
  "tari_dan_common_types",
  "tari_dan_p2p",
@@ -9687,7 +9709,7 @@ dependencies = [
 [[package]]
 name = "tari_script"
 version = "0.12.0"
-source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#9a871656e4ce1464d54107a4e3fc52181ed13e02"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
 dependencies = [
  "blake2",
  "borsh",
@@ -9703,8 +9725,8 @@ dependencies = [
 
 [[package]]
 name = "tari_service_framework"
-version = "0.53.0-dan.0"
-source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#9a871656e4ce1464d54107a4e3fc52181ed13e02"
+version = "1.0.0-dan.5"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -9718,8 +9740,8 @@ dependencies = [
 
 [[package]]
 name = "tari_shutdown"
-version = "0.53.0-dan.0"
-source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#9a871656e4ce1464d54107a4e3fc52181ed13e02"
+version = "1.0.0-dan.5"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
 dependencies = [
  "futures 0.3.29",
 ]
@@ -9772,8 +9794,8 @@ dependencies = [
 
 [[package]]
 name = "tari_storage"
-version = "0.53.0-dan.0"
-source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#9a871656e4ce1464d54107a4e3fc52181ed13e02"
+version = "1.0.0-dan.5"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
 dependencies = [
  "bincode 1.3.3",
  "lmdb-zero",
@@ -9845,6 +9867,7 @@ dependencies = [
  "rand",
  "serde",
  "tari_bor",
+ "tari_common",
  "tari_common_types",
  "tari_crypto",
  "tari_dan_common_types",
@@ -9858,8 +9881,8 @@ dependencies = [
 
 [[package]]
 name = "tari_test_utils"
-version = "0.53.0-dan.0"
-source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#9a871656e4ce1464d54107a4e3fc52181ed13e02"
+version = "1.0.0-dan.5"
+source = "git+https://github.com/tari-project/tari.git?branch=feature-dan2#e422a12d86b8f6f4df3dedb961883f8ee58c55d3"
 dependencies = [
  "futures 0.3.29",
  "rand",
@@ -9899,9 +9922,9 @@ dependencies = [
 
 [[package]]
 name = "tari_utilities"
-version = "0.6.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c396f014de7fa290ea8decd7238df9f1c175f243480a4ebef9ec61f144b1c95"
+checksum = "8c1bb0e5d1d812f2be2d6ad861caad68f75adb5b2e8376264850300deb16ddc7"
 dependencies = [
  "base58-monero 0.3.2",
  "base64 0.13.1",
@@ -9973,7 +9996,7 @@ dependencies = [
  "thiserror",
  "time",
  "tokio",
- "tonic 0.6.2",
+ "tonic 0.8.3",
  "tower-http",
 ]
 
@@ -10226,6 +10249,15 @@ dependencies = [
  "crunchy",
 ]
 
+[[package]]
+name = "tiny-keccak"
+version = "2.0.2"
+source = "git+https://github.com/tari-project/tiny-keccak?rev=bcddc65530d8646de7282cd8d18d891dc434b643#bcddc65530d8646de7282cd8d18d891dc434b643"
+dependencies = [
+ "borsh",
+ "crunchy",
+]
+
 [[package]]
 name = "tinyvec"
 version = "1.6.0"
@@ -10411,14 +10443,26 @@ dependencies = [
  "winnow",
 ]
 
+[[package]]
+name = "toml_edit"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
+dependencies = [
+ "indexmap 2.1.0",
+ "toml_datetime",
+ "winnow",
+]
+
 [[package]]
 name = "tonic"
-version = "0.6.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a"
+checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb"
 dependencies = [
  "async-stream",
  "async-trait",
+ "axum",
  "base64 0.13.1",
  "bytes 1.5.0",
  "futures-core",
@@ -10430,11 +10474,14 @@ dependencies = [
  "hyper-timeout",
  "percent-encoding",
  "pin-project 1.1.3",
- "prost 0.9.0",
- "prost-derive 0.9.0",
+ "prost 0.11.9",
+ "prost-derive 0.11.9",
+ "rustls-native-certs",
+ "rustls-pemfile 1.0.4",
  "tokio",
+ "tokio-rustls",
  "tokio-stream",
- "tokio-util 0.6.10",
+ "tokio-util 0.7.10",
  "tower",
  "tower-layer",
  "tower-service",
@@ -10472,16 +10519,30 @@ dependencies = [
 
 [[package]]
 name = "tonic-build"
-version = "0.6.2"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757"
+checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4"
 dependencies = [
+ "prettyplease 0.1.25",
  "proc-macro2",
- "prost-build 0.9.0",
+ "prost-build 0.11.9",
  "quote",
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "tor-hash-passwd"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b83cd43a176c0c19d5db4401283e8f5c296b9c6c7fa29029de15cc445f26e12"
+dependencies = [
+ "hex",
+ "hex-literal 0.3.4",
+ "rand",
+ "sha1 0.6.0",
+ "thiserror",
+]
+
 [[package]]
 name = "tower"
 version = "0.4.13"
@@ -10739,7 +10800,7 @@ dependencies = [
  "httparse",
  "log",
  "rand",
- "sha1",
+ "sha1 0.10.6",
  "thiserror",
  "url",
  "utf-8",
@@ -10877,16 +10938,6 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
-[[package]]
-name = "universal-hash"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402"
-dependencies = [
- "generic-array",
- "subtle",
-]
-
 [[package]]
 name = "universal-hash"
 version = "0.5.1"
@@ -10969,7 +11020,7 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
 dependencies = [
- "getrandom 0.2.11",
+ "getrandom",
 ]
 
 [[package]]
@@ -10978,7 +11029,7 @@ version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560"
 dependencies = [
- "getrandom 0.2.11",
+ "getrandom",
 ]
 
 [[package]]
@@ -11106,12 +11157,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -11546,8 +11591,8 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32b140b953f986e97828aa33ec6318186b05d862bee689efbc57af04a243e832"
 dependencies = [
- "aes 0.8.3",
- "aes-gcm 0.10.3",
+ "aes",
+ "aes-gcm",
  "async-trait",
  "bincode 1.3.3",
  "byteorder",
@@ -11560,13 +11605,13 @@ dependencies = [
  "p256",
  "p384",
  "rand",
- "rand_core 0.6.4",
+ "rand_core",
  "rcgen",
  "ring 0.16.20",
  "rustls 0.21.10",
  "sec1",
  "serde",
- "sha1",
+ "sha1 0.10.6",
  "sha2",
  "subtle",
  "thiserror",
@@ -11649,17 +11694,17 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c1db1f36c1c81e4b1e531c0b9678ba0c93809e196ce62122d87259bb71c03b9f"
 dependencies = [
- "aead 0.5.2",
- "aes 0.8.3",
- "aes-gcm 0.10.3",
+ "aead",
+ "aes",
+ "aes-gcm",
  "byteorder",
  "bytes 1.5.0",
- "ctr 0.9.2",
+ "ctr",
  "hmac",
  "log",
  "rtcp",
  "rtp",
- "sha1",
+ "sha1 0.10.6",
  "subtle",
  "thiserror",
  "tokio",
@@ -12049,8 +12094,8 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96"
 dependencies = [
- "curve25519-dalek 4.1.1",
- "rand_core 0.6.4",
+ "curve25519-dalek",
+ "rand_core",
  "serde",
  "zeroize",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 73a16511e..495d61a89 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -103,6 +103,7 @@ tari_wallet_daemon_client = { path = "clients/wallet_daemon_client" }
 transaction_generator = { path = "utilities/transaction_generator" }
 
 # external minotari/tari dependencies
+tari_hash_domains = { git = "https://github.com/tari-project/tari.git", branch = "feature-dan2" }
 minotari_app_grpc = { git = "https://github.com/tari-project/tari.git", branch = "feature-dan2" }
 minotari_app_utilities = { git = "https://github.com/tari-project/tari.git", branch = "feature-dan2" }
 minotari_console_wallet = { git = "https://github.com/tari-project/tari.git", branch = "feature-dan2" }
@@ -115,14 +116,14 @@ tari_common_types = { git = "https://github.com/tari-project/tari.git", branch =
 
 # avoid including default features so each crate can choose which ones to import
 tari_core = { git = "https://github.com/tari-project/tari.git", branch = "feature-dan2", default-features = false }
-tari_crypto = "0.19"
+tari_crypto = "0.20.0"
 tari_key_manager = { git = "https://github.com/tari-project/tari.git", branch = "feature-dan2" }
-tari_metrics = { git = "https://github.com/tari-project/tari.git" }
+tari_metrics = { git = "https://github.com/tari-project/tari.git", branch = "feature-dan2" }
 tari_mmr = { git = "https://github.com/tari-project/tari.git", branch = "feature-dan2" }
 tari_p2p = { git = "https://github.com/tari-project/tari.git", branch = "feature-dan2" }
 tari_shutdown = { git = "https://github.com/tari-project/tari.git", branch = "feature-dan2" }
 tari_storage = { git = "https://github.com/tari-project/tari.git", branch = "feature-dan2" }
-tari_utilities = "0.6"
+tari_utilities = "0.7.0"
 
 # third-party dependencies
 anyhow = "1.0.75"
@@ -136,7 +137,7 @@ bigdecimal = "0.4.1"
 bincode = "2.0.0-rc.3"
 bitflags = "2.4"
 blake2 = "0.10.6"
-borsh = "0.10"
+borsh = "1.3"
 bytes = "1.5"
 cacache = "12.0.0"
 cargo_metadata = "0.15.3"
@@ -174,7 +175,7 @@ itertools = "0.11.0"
 lazy_static = "1.4.0"
 libp2p = "0.53.1"
 # Adds support for Schnorr-Ristretto (sr25519)
-libp2p-identity = { git = "https://github.com/tari-project/rust-libp2p.git", rev = "5459d4d7cc79437d091fe3e390e8609a5ac06ea3" }
+libp2p-identity = "0.2.8"
 libsqlite3-sys = "0.25"
 liquid = "0.26.4"
 lmdb-zero = "0.4.4"
@@ -209,7 +210,7 @@ time = "0.3.15"
 tokio = { version = "1.34", default-features = false }
 tokio-stream = "0.1.7"
 tokio-util = "0.7.10"
-tonic = "0.6.2"
+tonic = "0.8.3"
 tower = "0.4"
 tower-http = { version = "0.3.5", default-features = false }
 tower-layer = "0.3"
@@ -236,14 +237,13 @@ overflow-checks = true
 # Temporarily lock pgp to commit (master branch at time of writing) because the currently released crate locks zeroize to =1.3
 liblmdb-sys = { git = "https://github.com/tari-project/lmdb-rs", tag = "0.7.6-tari.1" }
 # Use Tari's libp2p fork that adds support for Schnorr-Ristretto
-multiaddr = { git = "https://github.com/tari-project/rust-libp2p.git", rev = "5459d4d7cc79437d091fe3e390e8609a5ac06ea3" }
+multiaddr = { git = "https://github.com/tari-project/rust-libp2p.git", rev = "9b73988f611a877595de8a4a205aa86fb78cd626" }
 #libp2p = { git = "https://github.com/tari-project/rust-libp2p.git", rev = "ae1c06a9615a0ac020e459904ec984a6ab253678" }
-libp2p-identity = { git = "https://github.com/tari-project/rust-libp2p.git", rev = "5459d4d7cc79437d091fe3e390e8609a5ac06ea3" }
+libp2p-identity = { git = "https://github.com/tari-project/rust-libp2p.git", rev = "9b73988f611a877595de8a4a205aa86fb78cd626" }
 
 # Make a copy of this code, uncomment and replace account and my-branch with the name of your fork and the branch you want to temporarily use
 #[patch."https://github.com/tari-project/tari.git"]
 #minotari_app_grpc = { git = "https://github.com/account/tari.git", branch = "my-branch" }
-#minotari_app_grpc = { git = "https://github.com/account/tari.git", branch = "my-branch" }
 #minotari_wallet_grpc_client= { git = "https://github.com/account/tari.git", branch = "my-branch" }
 #minotari_node_grpc_client = { git = "https://github.com/account/tari.git", branch = "my-branch" }
 #tari_common = { git = "https://github.com/account/tari.git", branch = "my-branch" }
@@ -256,9 +256,12 @@ libp2p-identity = { git = "https://github.com/tari-project/rust-libp2p.git", rev
 #tari_p2p = { git = "https://github.com/account/tari.git", branch = "my-branch" }
 #tari_shutdown = { git = "https://github.com/account/tari.git", branch = "my-branch" }
 #tari_storage = { git = "https://github.com/account/tari.git", branch = "my-branch" }
-#minotari_wallet_grpc_client = { git = "https://github.com/account/tari.git", branch = "my-branch" }
 #tari_script = { git = "https://github.com/account/tari.git", branch = "my-branch" }
 #minotari_wallet = { git = "https://github.com/account/tari.git", branch = "my-branch" }
 #minotari_console_wallet = { git = "https://github.com/account/tari.git", branch = "my-branch" }
 #tari_service_framework = { git = "https://github.com/account/tari.git", branch = "my-branch" }
 #tari_comms_dht = { git = "https://github.com/account/tari.git", branch = "my-branch" }
+#minotari_app_utilities = { git = "https://github.com/account/tari.git", branch = "my-branch" }
+#minotari_node = { git = "https://github.com/account/tari.git", branch = "my-branch" }
+#tari_metrics = { git = "https://github.com/account/tari.git", branch = "my-branch" }
+
diff --git a/applications/tari_dan_app_utilities/src/base_layer_scanner.rs b/applications/tari_dan_app_utilities/src/base_layer_scanner.rs
index 988fbd749..04e2aac03 100644
--- a/applications/tari_dan_app_utilities/src/base_layer_scanner.rs
+++ b/applications/tari_dan_app_utilities/src/base_layer_scanner.rs
@@ -29,6 +29,7 @@ use tari_base_node_client::{
     BaseNodeClient,
     BaseNodeClientError,
 };
+use tari_common::configuration::Network;
 use tari_common_types::types::{Commitment, FixedHash, FixedHashSizeError};
 use tari_core::transactions::transaction_components::{
     CodeTemplateRegistration,
@@ -63,6 +64,7 @@ use crate::{
 const LOG_TARGET: &str = "tari::dan::base_layer_scanner";
 
 pub fn spawn<TAddr: NodeAddressable + 'static>(
+    network: Network,
     global_db: GlobalDb<SqliteGlobalDbAdapter<TAddr>>,
     base_node_client: GrpcBaseNodeClient,
     epoch_manager: EpochManagerHandle<TAddr>,
@@ -75,6 +77,7 @@ pub fn spawn<TAddr: NodeAddressable + 'static>(
 ) -> JoinHandle<anyhow::Result<()>> {
     task::spawn(async move {
         let base_layer_scanner = BaseLayerScanner::new(
+            network,
             global_db,
             base_node_client,
             epoch_manager,
@@ -92,6 +95,7 @@ pub fn spawn<TAddr: NodeAddressable + 'static>(
 }
 
 pub struct BaseLayerScanner<TAddr> {
+    network: Network,
     global_db: GlobalDb<SqliteGlobalDbAdapter<TAddr>>,
     last_scanned_height: u64,
     last_scanned_tip: Option<FixedHash>,
@@ -110,6 +114,7 @@ pub struct BaseLayerScanner<TAddr> {
 
 impl<TAddr: NodeAddressable + 'static> BaseLayerScanner<TAddr> {
     pub fn new(
+        network: Network,
         global_db: GlobalDb<SqliteGlobalDbAdapter<TAddr>>,
         base_node_client: GrpcBaseNodeClient,
         epoch_manager: EpochManagerHandle<TAddr>,
@@ -121,6 +126,7 @@ impl<TAddr: NodeAddressable + 'static> BaseLayerScanner<TAddr> {
         base_layer_scanning_interval: Duration,
     ) -> Self {
         Self {
+            network,
             global_db,
             last_scanned_tip: None,
             last_scanned_height: 0,
@@ -374,7 +380,7 @@ impl<TAddr: NodeAddressable + 'static> BaseLayerScanner<TAddr> {
         });
         self.state_store
             .with_write_tx(|tx| {
-                let genesis = Block::genesis();
+                let genesis = Block::genesis(self.network);
 
                 // TODO: This should be proposed in a block...
                 SubstateRecord {
diff --git a/applications/tari_dan_app_utilities/src/transaction_executor.rs b/applications/tari_dan_app_utilities/src/transaction_executor.rs
index 0ef3dd0a9..e1d256a0f 100644
--- a/applications/tari_dan_app_utilities/src/transaction_executor.rs
+++ b/applications/tari_dan_app_utilities/src/transaction_executor.rs
@@ -4,6 +4,7 @@
 use std::{sync::Arc, time::Instant};
 
 use log::*;
+use tari_common::configuration::Network;
 use tari_common_types::types::PublicKey;
 use tari_crypto::tari_utilities::ByteArray;
 use tari_dan_common_types::{services::template_provider::TemplateProvider, SubstateAddress};
@@ -36,13 +37,15 @@ pub trait TransactionExecutor {
 pub struct TariDanTransactionProcessor<TTemplateProvider> {
     template_provider: Arc<TTemplateProvider>,
     fee_table: FeeTable,
+    network: Network,
 }
 
 impl<TTemplateProvider> TariDanTransactionProcessor<TTemplateProvider> {
-    pub fn new(template_provider: TTemplateProvider, fee_table: FeeTable) -> Self {
+    pub fn new(network: Network, template_provider: TTemplateProvider, fee_table: FeeTable) -> Self {
         Self {
             template_provider: Arc::new(template_provider),
             fee_table,
+            network,
         }
     }
 }
@@ -74,6 +77,7 @@ where TTemplateProvider: TemplateProvider<Template = LoadedTemplate>
             auth_params,
             virtual_substates,
             modules,
+            self.network,
         );
         let tx_id = transaction.hash();
         let result = match processor.execute(transaction.clone()) {
diff --git a/applications/tari_indexer/src/bootstrap.rs b/applications/tari_indexer/src/bootstrap.rs
index c41a183d1..1f09048fb 100644
--- a/applications/tari_indexer/src/bootstrap.rs
+++ b/applications/tari_indexer/src/bootstrap.rs
@@ -112,6 +112,7 @@ pub async fn spawn_services(
     // Epoch manager
     let validator_node_client_factory = TariValidatorNodeRpcClientFactory::new(networking.clone());
     let (epoch_manager, _) = tari_epoch_manager::base_layer::spawn_service(
+        config.network,
         EpochManagerConfig {
             base_layer_confirmations: consensus_constants.base_layer_confirmations,
             committee_size: consensus_constants.committee_size,
@@ -129,6 +130,7 @@ pub async fn spawn_services(
 
     // Base Node scanner
     base_layer_scanner::spawn(
+        config.network,
         global_db,
         base_node_client.clone(),
         epoch_manager.clone(),
diff --git a/applications/tari_indexer/src/dry_run/processor.rs b/applications/tari_indexer/src/dry_run/processor.rs
index 696ba53a6..eb377d1db 100644
--- a/applications/tari_indexer/src/dry_run/processor.rs
+++ b/applications/tari_indexer/src/dry_run/processor.rs
@@ -23,6 +23,7 @@
 use std::{collections::HashMap, sync::Arc};
 
 use log::info;
+use tari_common::configuration::Network;
 use tari_dan_app_utilities::{
     template_manager::implementation::TemplateManager,
     transaction_executor::{TariDanTransactionProcessor, TransactionExecutor},
@@ -67,6 +68,7 @@ pub struct DryRunTransactionProcessor<TSubstateCache> {
     template_manager: TemplateManager<PeerAddress>,
     substate_scanner:
         Arc<SubstateScanner<EpochManagerHandle<PeerAddress>, TariValidatorNodeRpcClientFactory, TSubstateCache>>,
+    network: Network,
 }
 
 impl<TSubstateCache> DryRunTransactionProcessor<TSubstateCache>
@@ -79,6 +81,7 @@ where TSubstateCache: SubstateCache + 'static
             SubstateScanner<EpochManagerHandle<PeerAddress>, TariValidatorNodeRpcClientFactory, TSubstateCache>,
         >,
         template_manager: TemplateManager<PeerAddress>,
+        network: Network,
     ) -> Self {
         let transaction_autofiller = TransactionAutofiller::new(substate_scanner.clone());
 
@@ -88,6 +91,7 @@ where TSubstateCache: SubstateCache + 'static
             transaction_autofiller,
             template_manager,
             substate_scanner,
+            network,
         }
     }
 
@@ -138,7 +142,7 @@ where TSubstateCache: SubstateCache + 'static
             FeeTable::zero_rated()
         };
 
-        TariDanTransactionProcessor::new(self.template_manager.clone(), fee_table)
+        TariDanTransactionProcessor::new(self.network, self.template_manager.clone(), fee_table)
     }
 
     fn transaction_includes_fees(transaction: &Transaction) -> bool {
diff --git a/applications/tari_indexer/src/lib.rs b/applications/tari_indexer/src/lib.rs
index 71293fb10..6ee720283 100644
--- a/applications/tari_indexer/src/lib.rs
+++ b/applications/tari_indexer/src/lib.rs
@@ -126,6 +126,7 @@ pub async fn run_indexer(config: ApplicationConfig, mut shutdown_signal: Shutdow
         services.validator_node_client_factory.clone(),
         dan_layer_scanner,
         services.template_manager.clone(),
+        config.network,
     );
 
     // Run the JSON-RPC API
diff --git a/applications/tari_validator_node/src/bootstrap.rs b/applications/tari_validator_node/src/bootstrap.rs
index 5dc037dfa..e946610e3 100644
--- a/applications/tari_validator_node/src/bootstrap.rs
+++ b/applications/tari_validator_node/src/bootstrap.rs
@@ -31,7 +31,10 @@ use serde::Serialize;
 use sqlite_message_logger::SqliteMessageLogger;
 use tari_base_node_client::grpc::GrpcBaseNodeClient;
 use tari_common::{
-    configuration::bootstrap::{grpc_default_port, ApplicationType},
+    configuration::{
+        bootstrap::{grpc_default_port, ApplicationType},
+        Network,
+    },
     exit_codes::{ExitCode, ExitError},
 };
 use tari_common_types::types::PublicKey;
@@ -182,10 +185,11 @@ pub async fn spawn_services(
     // Connect to shard db
     let state_store =
         SqliteStateStore::connect(&format!("sqlite://{}", config.validator_node.state_db_path().display()))?;
-    state_store.with_write_tx(|tx| bootstrap_state(tx))?;
+    state_store.with_write_tx(|tx| bootstrap_state(tx, config.network))?;
 
     // Epoch manager
     let (epoch_manager, join_handle) = tari_epoch_manager::base_layer::spawn_service(
+        config.network,
         // TODO: We should be able to pass consensus constants here. However, these are currently located in dan_core
         // which depends on epoch_manager, so would be a circular dependency.
         EpochManagerConfig {
@@ -219,7 +223,7 @@ pub async fn spawn_services(
             per_log_cost: 1,
         }
     };
-    let payload_processor = TariDanTransactionProcessor::new(template_manager.clone(), fee_table);
+    let payload_processor = TariDanTransactionProcessor::new(config.network, template_manager.clone(), fee_table);
 
     let validator_node_client_factory = TariValidatorNodeRpcClientFactory::new(networking.clone());
 
@@ -238,6 +242,7 @@ pub async fn spawn_services(
         ConsensusOutboundMessaging::new(loopback_sender, networking.clone(), message_logger.clone());
 
     let (consensus_join_handle, consensus_handle, rx_consensus_to_mempool) = consensus::spawn(
+        config.network,
         state_store.clone(),
         keypair.clone(),
         epoch_manager.clone(),
@@ -291,6 +296,7 @@ pub async fn spawn_services(
 
     // Base Node scanner
     let join_handle = base_layer_scanner::spawn(
+        config.network,
         global_db.clone(),
         base_node_client.clone(),
         epoch_manager.clone(),
@@ -433,13 +439,13 @@ async fn spawn_p2p_rpc(
 }
 
 // TODO: Figure out the best way to have the engine shard store mirror these bootstrapped states.
-fn bootstrap_state<TTx>(tx: &mut TTx) -> Result<(), StorageError>
+fn bootstrap_state<TTx>(tx: &mut TTx, network: Network) -> Result<(), StorageError>
 where
     TTx: StateStoreWriteTransaction + DerefMut,
     TTx::Target: StateStoreReadTransaction,
     TTx::Addr: NodeAddressable + Serialize,
 {
-    let genesis_block = Block::genesis();
+    let genesis_block = Block::genesis(network);
     let substate_id = SubstateId::Resource(PUBLIC_IDENTITY_RESOURCE_ADDRESS);
     let substate_address = SubstateAddress::from_address(&substate_id, 0);
     let mut metadata: Metadata = Default::default();
diff --git a/applications/tari_validator_node/src/consensus/mod.rs b/applications/tari_validator_node/src/consensus/mod.rs
index b6175a896..d2e4e64a0 100644
--- a/applications/tari_validator_node/src/consensus/mod.rs
+++ b/applications/tari_validator_node/src/consensus/mod.rs
@@ -1,6 +1,7 @@
 //    Copyright 2023 The Tari Project
 //    SPDX-License-Identifier: BSD-3-Clause
 
+use tari_common::configuration::Network;
 use tari_consensus::hotstuff::{ConsensusWorker, ConsensusWorkerContext, HotstuffWorker};
 use tari_dan_storage::consensus_models::TransactionPool;
 use tari_epoch_manager::base_layer::EpochManagerHandle;
@@ -38,6 +39,7 @@ use tari_rpc_state_sync::RpcStateSyncManager;
 use crate::p2p::services::messaging::{ConsensusInboundMessaging, ConsensusOutboundMessaging};
 
 pub async fn spawn(
+    network: Network,
     store: SqliteStateStore<PeerAddress>,
     keypair: RistrettoKeypair,
     epoch_manager: EpochManagerHandle<PeerAddress>,
@@ -62,6 +64,7 @@ pub async fn spawn(
 
     let hotstuff_worker = HotstuffWorker::<TariConsensusSpec>::new(
         validator_addr,
+        network,
         inbound_messaging,
         outbound_messaging,
         rx_new_transactions,
@@ -80,7 +83,7 @@ pub async fn spawn(
     let context = ConsensusWorkerContext {
         epoch_manager: epoch_manager.clone(),
         hotstuff: hotstuff_worker,
-        state_sync: RpcStateSyncManager::new(epoch_manager, store, leader_strategy, client_factory),
+        state_sync: RpcStateSyncManager::new(network, epoch_manager, store, leader_strategy, client_factory),
         tx_current_state,
     };
 
diff --git a/applications/tari_validator_node/src/lib.rs b/applications/tari_validator_node/src/lib.rs
index 19086d889..449bcbb98 100644
--- a/applications/tari_validator_node/src/lib.rs
+++ b/applications/tari_validator_node/src/lib.rs
@@ -147,17 +147,13 @@ pub async fn run_validator_node(config: &ApplicationConfig, shutdown_signal: Shu
 
     fs::write(config.common.base_path.join("pid"), process::id().to_string())
         .map_err(|e| ExitError::new(ExitCode::UnknownError, e))?;
-    run_dan_node(services, shutdown_signal).await?;
-
-    Ok(())
-}
-
-async fn run_dan_node(services: Services, shutdown_signal: ShutdownSignal) -> Result<(), ExitError> {
     let node = DanNode::new(services);
     info!(target: LOG_TARGET, "🚀 Validator node started!");
     node.start(shutdown_signal)
         .await
-        .map_err(|e| ExitError::new(ExitCode::UnknownError, e))
+        .map_err(|e| ExitError::new(ExitCode::UnknownError, e))?;
+
+    Ok(())
 }
 
 async fn create_base_layer_clients(
diff --git a/dan_layer/common_types/Cargo.toml b/dan_layer/common_types/Cargo.toml
index a60c76346..67fbc26b5 100644
--- a/dan_layer/common_types/Cargo.toml
+++ b/dan_layer/common_types/Cargo.toml
@@ -7,9 +7,11 @@ repository.workspace = true
 license.workspace = true
 
 [dependencies]
+tari_common = { workspace = true }
 tari_common_types = { workspace = true }
 tari_crypto = { workspace = true, features = ["borsh"] }
 tari_engine_types = { workspace = true }
+tari_hash_domains = { workspace = true }
 tari_bor = { workspace = true, default-features = true }
 tari_mmr = { workspace = true }
 tari_core = { workspace = true, default-features = false, features = [
diff --git a/dan_layer/common_types/src/hashing.rs b/dan_layer/common_types/src/hashing.rs
index 87916be8e..76bcd7fd3 100644
--- a/dan_layer/common_types/src/hashing.rs
+++ b/dan_layer/common_types/src/hashing.rs
@@ -25,6 +25,7 @@
 
 use blake2::{digest::consts::U32, Blake2b};
 use tari_crypto::{hash_domain, hashing::DomainSeparatedHasher};
+use tari_hash_domains::ValidatorNodeBmtHashDomain;
 use tari_mmr::{BalancedBinaryMerkleProof, BalancedBinaryMerkleTree, MergedBalancedBinaryMerkleProof};
 
 use crate::hasher::{tari_hasher, TariHasher};
@@ -55,12 +56,6 @@ fn dan_hasher(label: &'static str) -> TariHasher {
     tari_hasher::<TariDanConsensusHashDomain>(label)
 }
 
-// From tari_core
-hash_domain!(
-    ValidatorNodeBmtHashDomain,
-    "com.tari.base_layer.core.validator_node_mmr",
-    1
-);
 pub type ValidatorNodeBmtHasherBlake2b = DomainSeparatedHasher<Blake2b<U32>, ValidatorNodeBmtHashDomain>;
 pub type ValidatorNodeBalancedMerkleTree = BalancedBinaryMerkleTree<ValidatorNodeBmtHasherBlake2b>;
 pub type ValidatorNodeMerkleProof = BalancedBinaryMerkleProof<ValidatorNodeBmtHasherBlake2b>;
diff --git a/dan_layer/common_types/src/validator_metadata.rs b/dan_layer/common_types/src/validator_metadata.rs
index 202133cb3..5171bf704 100644
--- a/dan_layer/common_types/src/validator_metadata.rs
+++ b/dan_layer/common_types/src/validator_metadata.rs
@@ -3,6 +3,7 @@
 
 use blake2::{digest::consts::U32, Blake2b};
 use serde::{Deserialize, Serialize};
+use tari_common::configuration::Network;
 use tari_common_types::types::{FixedHash, PublicKey, Signature};
 use tari_core::{consensus::DomainSeparatedConsensusHasher, transactions::TransactionHashDomain};
 
@@ -25,8 +26,8 @@ impl ValidatorMetadata {
     }
 }
 
-pub fn vn_node_hash(public_key: &PublicKey, substate_address: &SubstateAddress) -> FixedHash {
-    DomainSeparatedConsensusHasher::<TransactionHashDomain, Blake2b<U32>>::new("validator_node")
+pub fn vn_node_hash(network: Network, public_key: &PublicKey, substate_address: &SubstateAddress) -> FixedHash {
+    DomainSeparatedConsensusHasher::<TransactionHashDomain, Blake2b<U32>>::new_with_network("validator_node", network)
         .chain(public_key)
         .chain(&substate_address.0)
         .finalize()
diff --git a/dan_layer/consensus/Cargo.toml b/dan_layer/consensus/Cargo.toml
index 526b19dbb..7fdaef864 100644
--- a/dan_layer/consensus/Cargo.toml
+++ b/dan_layer/consensus/Cargo.toml
@@ -13,7 +13,8 @@ tari_dan_storage = { workspace = true }
 tari_transaction = { workspace = true }
 tari_epoch_manager = { workspace = true }
 
-# Used for PublicKey and Signature
+# Used for PublicKey and Signature and Network enum
+tari_common = { workspace = true }
 tari_common_types = { workspace = true }
 tari_mmr = { workspace = true }
 tari_shutdown = { workspace = true }
diff --git a/dan_layer/consensus/src/block_validations.rs b/dan_layer/consensus/src/block_validations.rs
index 5b04089ff..1919d82a4 100644
--- a/dan_layer/consensus/src/block_validations.rs
+++ b/dan_layer/consensus/src/block_validations.rs
@@ -1,6 +1,7 @@
 //   Copyright 2023 The Tari Project
 //   SPDX-License-Identifier: BSD-3-Clause
 
+use tari_common::configuration::Network;
 use tari_dan_common_types::{committee::Committee, DerivableFromPublicKey};
 use tari_dan_storage::consensus_models::Block;
 use tari_epoch_manager::EpochManagerReader;
@@ -10,6 +11,17 @@ use crate::{
     traits::{ConsensusSpec, LeaderStrategy, VoteSignatureService},
 };
 
+pub fn check_network(candidate_block: &Block, network: Network) -> Result<(), ProposalValidationError> {
+    if candidate_block.network() != network {
+        return Err(ProposalValidationError::InvalidNetwork {
+            block_network: candidate_block.network().to_string(),
+            expected_network: network.to_string(),
+            block_id: *candidate_block.id(),
+        });
+    }
+    Ok(())
+}
+
 pub fn check_hash_and_height(candidate_block: &Block) -> Result<(), ProposalValidationError> {
     if candidate_block.height().is_zero() || candidate_block.is_genesis() {
         return Err(ProposalValidationError::ProposingGenesisBlock {
@@ -91,7 +103,7 @@ pub async fn check_quorum_certificate<TConsensusSpec: ConsensusSpec>(
         let vn = epoch_manager
             .get_validator_node_by_public_key(candidate_block.justify().epoch(), signature.public_key())
             .await?;
-        vns.push(vn.node_hash());
+        vns.push(vn.get_node_hash(candidate_block.network()));
     }
     let merkle_root = epoch_manager
         .get_validator_node_merkle_root(candidate_block.justify().epoch())
diff --git a/dan_layer/consensus/src/hotstuff/common.rs b/dan_layer/consensus/src/hotstuff/common.rs
index de1601d30..dde7131ce 100644
--- a/dan_layer/consensus/src/hotstuff/common.rs
+++ b/dan_layer/consensus/src/hotstuff/common.rs
@@ -2,6 +2,7 @@
 //   SPDX-License-Identifier: BSD-3-Clause
 
 use log::*;
+use tari_common::configuration::Network;
 use tari_dan_common_types::{committee::Committee, Epoch, NodeAddressable, NodeHeight};
 use tari_dan_storage::consensus_models::{Block, QuorumCertificate};
 
@@ -15,6 +16,7 @@ const LOG_TARGET: &str = "tari::dan::consensus::hotstuff::common";
 pub const EXHAUST_DIVISOR: u64 = 0;
 
 pub fn calculate_dummy_blocks<TAddr: NodeAddressable, TLeaderStrategy: LeaderStrategy<TAddr>>(
+    network: Network,
     epoch: Epoch,
     high_qc: &QuorumCertificate,
     new_height: NodeHeight,
@@ -44,6 +46,7 @@ pub fn calculate_dummy_blocks<TAddr: NodeAddressable, TLeaderStrategy: LeaderStr
     loop {
         let leader = leader_strategy.get_leader_public_key(local_committee, current_height);
         let dummy_block = Block::dummy_block(
+            network,
             *parent_block.block_id(),
             leader.clone(),
             current_height,
diff --git a/dan_layer/consensus/src/hotstuff/error.rs b/dan_layer/consensus/src/hotstuff/error.rs
index 45a681ef1..f50ca271e 100644
--- a/dan_layer/consensus/src/hotstuff/error.rs
+++ b/dan_layer/consensus/src/hotstuff/error.rs
@@ -170,4 +170,10 @@ pub enum ProposalValidationError {
     QuorumWasNotReached { qc: QuorumCertificate },
     #[error("Merkle proof error: {0}")]
     BalancedBinaryMerkleProofError(#[from] BalancedBinaryMerkleProofError),
+    #[error("Invalid network in block {block_id}: expected {expected_network}, given {block_network}")]
+    InvalidNetwork {
+        expected_network: String,
+        block_network: String,
+        block_id: BlockId,
+    },
 }
diff --git a/dan_layer/consensus/src/hotstuff/on_inbound_message.rs b/dan_layer/consensus/src/hotstuff/on_inbound_message.rs
index b40d58549..3e19dd69e 100644
--- a/dan_layer/consensus/src/hotstuff/on_inbound_message.rs
+++ b/dan_layer/consensus/src/hotstuff/on_inbound_message.rs
@@ -7,6 +7,7 @@ use std::{
 };
 
 use log::*;
+use tari_common::configuration::Network;
 use tari_dan_common_types::{NodeAddressable, NodeHeight};
 use tari_dan_storage::{
     consensus_models::{Block, TransactionRecord},
@@ -18,7 +19,13 @@ use tari_transaction::TransactionId;
 use tokio::{sync::mpsc, time};
 
 use crate::{
-    block_validations::{check_hash_and_height, check_proposed_by_leader, check_quorum_certificate, check_signature},
+    block_validations::{
+        check_hash_and_height,
+        check_network,
+        check_proposed_by_leader,
+        check_quorum_certificate,
+        check_signature,
+    },
     hotstuff::error::HotStuffError,
     messages::{HotstuffMessage, ProposalMessage, RequestMissingTransactionsMessage},
     traits::{ConsensusSpec, OutboundMessaging},
@@ -29,6 +36,7 @@ const LOG_TARGET: &str = "tari::dan::consensus::hotstuff::inbound_messages";
 pub type IncomingMessageResult<TAddr> = Result<Option<(TAddr, HotstuffMessage)>, NeedsSync<TAddr>>;
 
 pub struct OnInboundMessage<TConsensusSpec: ConsensusSpec> {
+    network: Network,
     store: TConsensusSpec::StateStore,
     epoch_manager: TConsensusSpec::EpochManager,
     leader_strategy: TConsensusSpec::LeaderStrategy,
@@ -42,6 +50,7 @@ impl<TConsensusSpec> OnInboundMessage<TConsensusSpec>
 where TConsensusSpec: ConsensusSpec
 {
     pub fn new(
+        network: Network,
         store: TConsensusSpec::StateStore,
         epoch_manager: TConsensusSpec::EpochManager,
         leader_strategy: TConsensusSpec::LeaderStrategy,
@@ -50,6 +59,7 @@ where TConsensusSpec: ConsensusSpec
     ) -> Self {
         let (tx_msg_ready, rx_msg_ready) = mpsc::unbounded_channel();
         Self {
+            network,
             store,
             epoch_manager,
             leader_strategy,
@@ -97,6 +107,7 @@ where TConsensusSpec: ConsensusSpec
     }
 
     async fn check_proposal(&mut self, block: Block) -> Result<Option<Block>, HotStuffError> {
+        check_network(&block, self.network)?;
         check_hash_and_height(&block)?;
         let committee_for_block = self
             .epoch_manager
diff --git a/dan_layer/consensus/src/hotstuff/on_propose.rs b/dan_layer/consensus/src/hotstuff/on_propose.rs
index 9b8efab8e..650228030 100644
--- a/dan_layer/consensus/src/hotstuff/on_propose.rs
+++ b/dan_layer/consensus/src/hotstuff/on_propose.rs
@@ -5,6 +5,7 @@ use std::{collections::BTreeSet, num::NonZeroU64, ops::DerefMut};
 
 use indexmap::IndexMap;
 use log::*;
+use tari_common::configuration::Network;
 use tari_common_types::types::PublicKey;
 use tari_dan_common_types::{
     committee::{Committee, CommitteeShard},
@@ -39,6 +40,7 @@ use crate::{
 const LOG_TARGET: &str = "tari::dan::consensus::hotstuff::on_propose_locally";
 
 pub struct OnPropose<TConsensusSpec: ConsensusSpec> {
+    network: Network,
     store: TConsensusSpec::StateStore,
     epoch_manager: TConsensusSpec::EpochManager,
     transaction_pool: TransactionPool<TConsensusSpec::StateStore>,
@@ -50,6 +52,7 @@ impl<TConsensusSpec> OnPropose<TConsensusSpec>
 where TConsensusSpec: ConsensusSpec
 {
     pub fn new(
+        network: Network,
         store: TConsensusSpec::StateStore,
         epoch_manager: TConsensusSpec::EpochManager,
         transaction_pool: TransactionPool<TConsensusSpec::StateStore>,
@@ -57,6 +60,7 @@ where TConsensusSpec: ConsensusSpec
         outbound_messaging: TConsensusSpec::OutboundMessaging,
     ) -> Self {
         Self {
+            network,
             store,
             epoch_manager,
             transaction_pool,
@@ -257,6 +261,7 @@ where TConsensusSpec: ConsensusSpec
         foreign_indexes.sort_keys();
 
         let mut next_block = Block::new(
+            self.network,
             *parent_block.block_id(),
             high_qc,
             parent_block.height() + NodeHeight(1),
diff --git a/dan_layer/consensus/src/hotstuff/on_ready_to_vote_on_local_block.rs b/dan_layer/consensus/src/hotstuff/on_ready_to_vote_on_local_block.rs
index 5c392cb6c..13349d5de 100644
--- a/dan_layer/consensus/src/hotstuff/on_ready_to_vote_on_local_block.rs
+++ b/dan_layer/consensus/src/hotstuff/on_ready_to_vote_on_local_block.rs
@@ -4,6 +4,7 @@
 use std::{collections::HashSet, num::NonZeroU64, ops::DerefMut};
 
 use log::*;
+use tari_common::configuration::Network;
 use tari_dan_common_types::{
     committee::{Committee, CommitteeShard},
     optional::Optional,
@@ -56,6 +57,7 @@ pub struct OnReadyToVoteOnLocalBlock<TConsensusSpec: ConsensusSpec> {
     outbound_messaging: TConsensusSpec::OutboundMessaging,
     tx_events: broadcast::Sender<HotstuffEvent>,
     proposer: Proposer<TConsensusSpec>,
+    network: Network,
 }
 
 impl<TConsensusSpec> OnReadyToVoteOnLocalBlock<TConsensusSpec>
@@ -72,6 +74,7 @@ where TConsensusSpec: ConsensusSpec
         outbound_messaging: TConsensusSpec::OutboundMessaging,
         tx_events: broadcast::Sender<HotstuffEvent>,
         proposer: Proposer<TConsensusSpec>,
+        network: Network,
     ) -> Self {
         Self {
             validator_addr,
@@ -84,6 +87,7 @@ where TConsensusSpec: ConsensusSpec
             outbound_messaging,
             tx_events,
             proposer,
+            network,
         }
     }
 
@@ -849,7 +853,7 @@ where TConsensusSpec: ConsensusSpec
             .epoch_manager
             .get_validator_node(block.epoch(), &self.validator_addr)
             .await?;
-        let leaf_hash = vn.node_hash();
+        let leaf_hash = vn.get_node_hash(self.network);
 
         let signature = self.vote_signing_service.sign_vote(&leaf_hash, block.id(), &decision);
 
diff --git a/dan_layer/consensus/src/hotstuff/on_receive_local_proposal.rs b/dan_layer/consensus/src/hotstuff/on_receive_local_proposal.rs
index 897c0c1dd..506eaf2f9 100644
--- a/dan_layer/consensus/src/hotstuff/on_receive_local_proposal.rs
+++ b/dan_layer/consensus/src/hotstuff/on_receive_local_proposal.rs
@@ -8,6 +8,7 @@
 use std::ops::DerefMut;
 
 use log::*;
+use tari_common::configuration::Network;
 use tari_dan_common_types::{
     committee::{Committee, CommitteeShard},
     optional::Optional,
@@ -37,6 +38,7 @@ use crate::{
 const LOG_TARGET: &str = "tari::dan::consensus::hotstuff::on_receive_local_proposal";
 
 pub struct OnReceiveLocalProposalHandler<TConsensusSpec: ConsensusSpec> {
+    network: Network,
     store: TConsensusSpec::StateStore,
     epoch_manager: TConsensusSpec::EpochManager,
     leader_strategy: TConsensusSpec::LeaderStrategy,
@@ -57,8 +59,10 @@ impl<TConsensusSpec: ConsensusSpec> OnReceiveLocalProposalHandler<TConsensusSpec
         transaction_pool: TransactionPool<TConsensusSpec::StateStore>,
         tx_events: broadcast::Sender<HotstuffEvent>,
         proposer: Proposer<TConsensusSpec>,
+        network: Network,
     ) -> Self {
         Self {
+            network,
             store: store.clone(),
             epoch_manager: epoch_manager.clone(),
             leader_strategy: leader_strategy.clone(),
@@ -74,6 +78,7 @@ impl<TConsensusSpec: ConsensusSpec> OnReceiveLocalProposalHandler<TConsensusSpec
                 outbound_messaging,
                 tx_events,
                 proposer,
+                network,
             ),
         }
     }
@@ -323,6 +328,7 @@ impl<TConsensusSpec: ConsensusSpec> OnReceiveLocalProposalHandler<TConsensusSpec
 
                 // TODO: replace with actual leader's propose
                 dummy_blocks.push(Block::dummy_block(
+                    self.network,
                     *last_dummy_block.id(),
                     leader.clone(),
                     next_height,
diff --git a/dan_layer/consensus/src/hotstuff/on_receive_new_view.rs b/dan_layer/consensus/src/hotstuff/on_receive_new_view.rs
index 00a793130..3404de092 100644
--- a/dan_layer/consensus/src/hotstuff/on_receive_new_view.rs
+++ b/dan_layer/consensus/src/hotstuff/on_receive_new_view.rs
@@ -7,6 +7,7 @@ use std::{
 };
 
 use log::*;
+use tari_common::configuration::Network;
 use tari_dan_common_types::NodeHeight;
 use tari_dan_storage::{
     consensus_models::{Block, BlockId, LeafBlock, LockedBlock, QuorumCertificate},
@@ -24,6 +25,7 @@ use crate::{
 const LOG_TARGET: &str = "tari::dan::consensus::hotstuff::on_receive_new_view";
 
 pub struct OnReceiveNewViewHandler<TConsensusSpec: ConsensusSpec> {
+    network: Network,
     store: TConsensusSpec::StateStore,
     leader_strategy: TConsensusSpec::LeaderStrategy,
     epoch_manager: TConsensusSpec::EpochManager,
@@ -36,6 +38,7 @@ impl<TConsensusSpec> OnReceiveNewViewHandler<TConsensusSpec>
 where TConsensusSpec: ConsensusSpec
 {
     pub fn new(
+        network: Network,
         store: TConsensusSpec::StateStore,
         leader_strategy: TConsensusSpec::LeaderStrategy,
         epoch_manager: TConsensusSpec::EpochManager,
@@ -43,6 +46,7 @@ where TConsensusSpec: ConsensusSpec
         vote_receiver: VoteReceiver<TConsensusSpec>,
     ) -> Self {
         Self {
+            network,
             store,
             leader_strategy,
             epoch_manager,
@@ -188,8 +192,14 @@ where TConsensusSpec: ConsensusSpec
 
             // Determine how many missing blocks we must fill without actually creating them.
             // This node, as well as all other replicas, will create the blocks in on_receive_proposal.
-            let dummy_blocks =
-                calculate_dummy_blocks(epoch, &high_qc, new_height, &self.leader_strategy, &local_committee);
+            let dummy_blocks = calculate_dummy_blocks(
+                self.network,
+                epoch,
+                &high_qc,
+                new_height,
+                &self.leader_strategy,
+                &local_committee,
+            );
             // Set the last voted block so that we do not vote on other conflicting blocks
             if let Some(last_dummy) = dummy_blocks.last() {
                 debug!(target: LOG_TARGET, "🍼 dummy leaf block {}", last_dummy);
diff --git a/dan_layer/consensus/src/hotstuff/vote_receiver.rs b/dan_layer/consensus/src/hotstuff/vote_receiver.rs
index 74ac6e2e6..540708675 100644
--- a/dan_layer/consensus/src/hotstuff/vote_receiver.rs
+++ b/dan_layer/consensus/src/hotstuff/vote_receiver.rs
@@ -4,6 +4,7 @@
 use std::ops::DerefMut;
 
 use log::*;
+use tari_common::configuration::Network;
 use tari_common_types::types::FixedHash;
 use tari_dan_common_types::{committee::CommitteeShard, hashing::MergedValidatorNodeMerkleProof, optional::Optional};
 use tari_dan_storage::{
@@ -22,6 +23,7 @@ const LOG_TARGET: &str = "tari::dan::consensus::hotstuff::on_receive_vote";
 
 #[derive(Clone)]
 pub struct VoteReceiver<TConsensusSpec: ConsensusSpec> {
+    network: Network,
     store: TConsensusSpec::StateStore,
     leader_strategy: TConsensusSpec::LeaderStrategy,
     epoch_manager: TConsensusSpec::EpochManager,
@@ -33,6 +35,7 @@ impl<TConsensusSpec> VoteReceiver<TConsensusSpec>
 where TConsensusSpec: ConsensusSpec
 {
     pub fn new(
+        network: Network,
         store: TConsensusSpec::StateStore,
         leader_strategy: TConsensusSpec::LeaderStrategy,
         epoch_manager: TConsensusSpec::EpochManager,
@@ -40,6 +43,7 @@ where TConsensusSpec: ConsensusSpec
         pacemaker: PaceMakerHandle,
     ) -> Self {
         Self {
+            network,
             store,
             leader_strategy,
             epoch_manager,
@@ -109,7 +113,7 @@ where TConsensusSpec: ConsensusSpec
             });
         }
 
-        let sender_leaf_hash = sender_vn.node_hash();
+        let sender_leaf_hash = sender_vn.get_node_hash(self.network);
 
         self.validate_vote_message(&message, &sender_leaf_hash)?;
 
diff --git a/dan_layer/consensus/src/hotstuff/worker.rs b/dan_layer/consensus/src/hotstuff/worker.rs
index 29329a956..22b633ec6 100644
--- a/dan_layer/consensus/src/hotstuff/worker.rs
+++ b/dan_layer/consensus/src/hotstuff/worker.rs
@@ -8,6 +8,7 @@ use std::{
 };
 
 use log::*;
+use tari_common::configuration::Network;
 use tari_dan_common_types::{optional::Optional, NodeHeight};
 use tari_dan_storage::{
     consensus_models::{Block, HighQc, LastSentVote, LastVoted, LeafBlock, TransactionPool},
@@ -45,6 +46,7 @@ const LOG_TARGET: &str = "tari::dan::consensus::hotstuff::worker";
 
 pub struct HotstuffWorker<TConsensusSpec: ConsensusSpec> {
     validator_addr: TConsensusSpec::Addr,
+    network: Network,
 
     tx_events: broadcast::Sender<HotstuffEvent>,
     outbound_messaging: TConsensusSpec::OutboundMessaging,
@@ -75,6 +77,7 @@ impl<TConsensusSpec: ConsensusSpec> HotstuffWorker<TConsensusSpec> {
     #[allow(clippy::too_many_arguments)]
     pub fn new(
         validator_addr: TConsensusSpec::Addr,
+        network: Network,
         inbound_messaging: TConsensusSpec::InboundMessaging,
         outbound_messaging: TConsensusSpec::OutboundMessaging,
         rx_new_transactions: mpsc::Receiver<(TransactionId, usize)>,
@@ -90,6 +93,7 @@ impl<TConsensusSpec: ConsensusSpec> HotstuffWorker<TConsensusSpec> {
     ) -> Self {
         let pacemaker = PaceMaker::new();
         let vote_receiver = VoteReceiver::new(
+            network,
             state_store.clone(),
             leader_strategy.clone(),
             epoch_manager.clone(),
@@ -100,12 +104,14 @@ impl<TConsensusSpec: ConsensusSpec> HotstuffWorker<TConsensusSpec> {
             Proposer::<TConsensusSpec>::new(state_store.clone(), epoch_manager.clone(), outbound_messaging.clone());
         Self {
             validator_addr: validator_addr.clone(),
+            network,
             tx_events: tx_events.clone(),
             outbound_messaging: outbound_messaging.clone(),
             inbound_messaging,
             rx_new_transactions,
 
             on_inbound_message: OnInboundMessage::new(
+                network,
                 state_store.clone(),
                 epoch_manager.clone(),
                 leader_strategy.clone(),
@@ -131,6 +137,7 @@ impl<TConsensusSpec: ConsensusSpec> HotstuffWorker<TConsensusSpec> {
                 transaction_pool.clone(),
                 tx_events,
                 proposer.clone(),
+                network,
             ),
             on_receive_foreign_proposal: OnReceiveForeignProposalHandler::new(
                 state_store.clone(),
@@ -140,6 +147,7 @@ impl<TConsensusSpec: ConsensusSpec> HotstuffWorker<TConsensusSpec> {
             ),
             on_receive_vote: OnReceiveVoteHandler::new(vote_receiver.clone()),
             on_receive_new_view: OnReceiveNewViewHandler::new(
+                network,
                 state_store.clone(),
                 leader_strategy.clone(),
                 epoch_manager.clone(),
@@ -152,6 +160,7 @@ impl<TConsensusSpec: ConsensusSpec> HotstuffWorker<TConsensusSpec> {
             ),
             on_receive_requested_txs: OnReceiveRequestedTransactions::new(tx_mempool),
             on_propose: OnPropose::new(
+                network,
                 state_store.clone(),
                 epoch_manager.clone(),
                 transaction_pool.clone(),
@@ -528,7 +537,7 @@ where TConsensusSpec: ConsensusSpec
         let mut tx = self.state_store.create_write_tx()?;
 
         // The parent for genesis blocks refer to this zero block
-        let zero_block = Block::zero_block();
+        let zero_block = Block::zero_block(self.network);
         if !zero_block.exists(tx.deref_mut())? {
             debug!(target: LOG_TARGET, "Creating zero block");
             zero_block.justify().insert(&mut tx)?;
diff --git a/dan_layer/consensus_tests/src/support/validator/builder.rs b/dan_layer/consensus_tests/src/support/validator/builder.rs
index 4052dee27..be029ad1f 100644
--- a/dan_layer/consensus_tests/src/support/validator/builder.rs
+++ b/dan_layer/consensus_tests/src/support/validator/builder.rs
@@ -99,6 +99,7 @@ impl ValidatorBuilder {
                 .clone_for(self.address.clone(), self.public_key.clone(), self.shard);
         let worker = HotstuffWorker::<TestConsensusSpec>::new(
             self.address.clone(),
+            Default::default(),
             inbound_messaging,
             outbound_messaging,
             rx_new_transactions,
diff --git a/dan_layer/engine/Cargo.toml b/dan_layer/engine/Cargo.toml
index d04bc7eef..07b634018 100644
--- a/dan_layer/engine/Cargo.toml
+++ b/dan_layer/engine/Cargo.toml
@@ -9,6 +9,7 @@ license.workspace = true
 
 [dependencies]
 tari_bor = { workspace = true, default-features = true }
+tari_common = { workspace = true }
 tari_common_types = { workspace = true }
 tari_crypto = { workspace = true, features = ["borsh"] }
 tari_dan_common_types = { workspace = true }
diff --git a/dan_layer/engine/src/runtime/impl.rs b/dan_layer/engine/src/runtime/impl.rs
index 4a4381b7f..4d9631701 100644
--- a/dan_layer/engine/src/runtime/impl.rs
+++ b/dan_layer/engine/src/runtime/impl.rs
@@ -24,6 +24,7 @@ use std::sync::Arc;
 
 use indexmap::IndexMap;
 use log::{warn, *};
+use tari_common::configuration::Network;
 use tari_common_types::types::PublicKey;
 use tari_crypto::{range_proof::RangeProofService, ristretto::RistrettoPublicKey, tari_utilities::ByteArray};
 use tari_dan_common_types::{services::template_provider::TemplateProvider, Epoch};
@@ -103,7 +104,6 @@ use crate::{
     template::LoadedTemplate,
     transaction::TransactionProcessor,
 };
-
 const LOG_TARGET: &str = "tari::dan::engine::runtime::impl";
 
 #[derive(Clone)]
@@ -113,6 +113,7 @@ pub struct RuntimeInterfaceImpl<TTemplateProvider> {
     transaction_signer_public_key: RistrettoPublicKey,
     modules: Vec<Arc<dyn RuntimeModule>>,
     max_call_depth: usize,
+    network: Network,
 }
 
 pub struct StateFinalize {
@@ -127,6 +128,7 @@ impl<TTemplateProvider: TemplateProvider<Template = LoadedTemplate>> RuntimeInte
         signer_public_key: RistrettoPublicKey,
         modules: Vec<Arc<dyn RuntimeModule>>,
         max_call_depth: usize,
+        network: Network,
     ) -> Result<Self, RuntimeError> {
         let runtime = Self {
             tracker,
@@ -134,6 +136,7 @@ impl<TTemplateProvider: TemplateProvider<Template = LoadedTemplate>> RuntimeInte
             transaction_signer_public_key: signer_public_key,
             modules,
             max_call_depth,
+            network,
         };
         runtime.initialize_initial_scope()?;
         runtime.invoke_modules_on_initialize()?;
@@ -1588,7 +1591,7 @@ impl<TTemplateProvider: TemplateProvider<Template = LoadedTemplate>> RuntimeInte
         // 1. Must exist
         let unclaimed_output = self.tracker.take_unclaimed_confidential_output(output_address)?;
         // 2. owner_sig must be valid
-        let challenge = ownership_proof_hasher64()
+        let challenge = ownership_proof_hasher64(self.network)
             .chain_update(proof_of_knowledge.public_nonce())
             .chain_update(&unclaimed_output.commitment)
             .chain_update(&self.transaction_signer_public_key)
diff --git a/dan_layer/engine/src/transaction/processor.rs b/dan_layer/engine/src/transaction/processor.rs
index a170e1f92..1913c03c7 100644
--- a/dan_layer/engine/src/transaction/processor.rs
+++ b/dan_layer/engine/src/transaction/processor.rs
@@ -24,6 +24,7 @@ use std::sync::Arc;
 
 use log::*;
 use tari_bor::to_value;
+use tari_common::configuration::Network;
 use tari_dan_common_types::{services::template_provider::TemplateProvider, Epoch};
 use tari_engine_types::{
     commit_result::{ExecuteResult, FinalizeResult, RejectReason, TransactionResult},
@@ -69,6 +70,7 @@ pub struct TransactionProcessor<TTemplateProvider> {
     auth_params: AuthParams,
     virtual_substates: VirtualSubstates,
     modules: Vec<Arc<dyn RuntimeModule>>,
+    network: Network,
 }
 
 impl<TTemplateProvider: TemplateProvider<Template = LoadedTemplate> + 'static> TransactionProcessor<TTemplateProvider> {
@@ -78,6 +80,7 @@ impl<TTemplateProvider: TemplateProvider<Template = LoadedTemplate> + 'static> T
         auth_params: AuthParams,
         virtual_substates: VirtualSubstates,
         modules: Vec<Arc<dyn RuntimeModule>>,
+        network: Network,
     ) -> Self {
         Self {
             template_provider,
@@ -85,6 +88,7 @@ impl<TTemplateProvider: TemplateProvider<Template = LoadedTemplate> + 'static> T
             auth_params,
             virtual_substates,
             modules,
+            network,
         }
     }
 
@@ -96,6 +100,7 @@ impl<TTemplateProvider: TemplateProvider<Template = LoadedTemplate> + 'static> T
             auth_params,
             virtual_substates,
             modules,
+            network,
         } = self;
 
         let initial_auth_scope = AuthorizationScope::new(auth_params.initial_ownership_proofs);
@@ -106,6 +111,7 @@ impl<TTemplateProvider: TemplateProvider<Template = LoadedTemplate> + 'static> T
             transaction.signer_public_key().clone(),
             modules,
             MAX_CALL_DEPTH,
+            network,
         )?;
 
         let runtime = Runtime::new(Arc::new(runtime_interface));
diff --git a/dan_layer/engine_types/Cargo.toml b/dan_layer/engine_types/Cargo.toml
index d80cb1668..622cee73c 100644
--- a/dan_layer/engine_types/Cargo.toml
+++ b/dan_layer/engine_types/Cargo.toml
@@ -8,12 +8,14 @@ repository.workspace = true
 license.workspace = true
 
 [dependencies]
+tari_common = { workspace = true }
 tari_bor = { workspace = true, features = ["json_encoding"] }
 tari_common_types = { workspace = true }
 tari_crypto = { workspace = true, features = ["borsh"] }
 tari_template_abi = { workspace = true, features = ["std"] }
 tari_template_lib = { workspace = true }
 tari_utilities = { workspace = true }
+tari_hash_domains = { workspace = true }
 
 borsh = { workspace = true }
 # if we set this version in the workspace it would break other crates
diff --git a/dan_layer/engine_types/src/base_layer_hashing.rs b/dan_layer/engine_types/src/base_layer_hashing.rs
index 009ddafc0..71d8aad2a 100644
--- a/dan_layer/engine_types/src/base_layer_hashing.rs
+++ b/dan_layer/engine_types/src/base_layer_hashing.rs
@@ -24,98 +24,23 @@ use std::{io, io::Write};
 
 use blake2::Blake2b;
 use borsh::BorshSerialize;
-use digest::{
-    consts::{U32, U64},
-    Digest,
-};
-use tari_crypto::{
-    hash_domain,
-    hashing::{DomainSeparatedHasher, DomainSeparation},
-};
-use tari_template_lib::Hash;
-
-hash_domain!(ConfidentialOutputHashDomain, "com.tari.dan.confidential_output", 1);
-
-hash_domain!(
-    WalletOutputEncryptionKeysDomain,
-    "com.tari.base_layer.wallet.output_encryption_keys",
-    1
-);
-
-fn confidential_hasher32(label: &'static str) -> TariBaseLayerHasher32 {
-    TariBaseLayerHasher32::new_with_label::<ConfidentialOutputHashDomain>(label)
-}
+use digest::{consts::U64, Digest};
+use tari_common::configuration::Network;
+use tari_crypto::hashing::{DomainSeparatedHasher, DomainSeparation};
+use tari_hash_domains::{ConfidentialOutputHashDomain, WalletOutputEncryptionKeysDomain};
 
-fn confidential_hasher64(label: &'static str) -> TariBaseLayerHasher64 {
-    TariBaseLayerHasher64::new_with_label::<ConfidentialOutputHashDomain>(label)
+fn confidential_hasher64(network: Network, label: &'static str) -> TariBaseLayerHasher64 {
+    TariBaseLayerHasher64::new_with_label::<ConfidentialOutputHashDomain>(network, label)
 }
 
 type WalletOutputEncryptionKeysDomainHasher = DomainSeparatedHasher<Blake2b<U64>, WalletOutputEncryptionKeysDomain>;
+
 pub fn encrypted_data_hasher() -> WalletOutputEncryptionKeysDomainHasher {
     WalletOutputEncryptionKeysDomainHasher::new_with_label("")
 }
 
-pub fn ownership_proof_hasher32() -> TariBaseLayerHasher32 {
-    confidential_hasher32("commitment_signature")
-}
-
-pub fn ownership_proof_hasher64() -> TariBaseLayerHasher64 {
-    confidential_hasher64("commitment_signature")
-}
-
-#[derive(Debug, Clone)]
-pub struct TariBaseLayerHasher32 {
-    hasher: Blake2b<U32>,
-}
-
-impl TariBaseLayerHasher32 {
-    pub fn new_with_label<TDomain: DomainSeparation>(label: &'static str) -> Self {
-        let mut hasher = Blake2b::<U32>::new();
-        TDomain::add_domain_separation_tag(&mut hasher, label);
-        Self { hasher }
-    }
-
-    pub fn update<T: BorshSerialize>(&mut self, data: &T) {
-        BorshSerialize::serialize(data, &mut self.hash_writer())
-            .expect("Incorrect implementation of BorshSerialize encountered. Implementations MUST be infallible.");
-    }
-
-    pub fn chain<T: BorshSerialize>(mut self, data: &T) -> Self {
-        self.update(data);
-        self
-    }
-
-    pub fn chain_update<T: BorshSerialize>(self, data: &T) -> Self {
-        self.chain(data)
-    }
-
-    pub fn digest<T: BorshSerialize>(self, data: &T) -> Hash {
-        self.chain(data).result()
-    }
-
-    pub fn result(self) -> Hash {
-        let hash: [u8; 32] = self.hasher.finalize().into();
-        hash.into()
-    }
-
-    pub fn finalize_into(self, output: &mut digest::Output<Blake2b<U32>>) {
-        digest::FixedOutput::finalize_into(self.hasher, output)
-    }
-
-    fn hash_writer(&mut self) -> impl Write + '_ {
-        struct HashWriter<'a>(&'a mut Blake2b<U32>);
-        impl Write for HashWriter<'_> {
-            fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-                self.0.update(buf);
-                Ok(buf.len())
-            }
-
-            fn flush(&mut self) -> io::Result<()> {
-                Ok(())
-            }
-        }
-        HashWriter(&mut self.hasher)
-    }
+pub fn ownership_proof_hasher64(network: Network) -> TariBaseLayerHasher64 {
+    confidential_hasher64(network, "commitment_signature")
 }
 
 #[derive(Debug, Clone)]
@@ -124,9 +49,9 @@ pub struct TariBaseLayerHasher64 {
 }
 
 impl TariBaseLayerHasher64 {
-    pub fn new_with_label<TDomain: DomainSeparation>(label: &'static str) -> Self {
+    pub fn new_with_label<TDomain: DomainSeparation>(network: Network, label: &'static str) -> Self {
         let mut hasher = Blake2b::<U64>::new();
-        TDomain::add_domain_separation_tag(&mut hasher, label);
+        TDomain::add_domain_separation_tag(&mut hasher, &format!("{}.n{}", label, network.as_byte()));
         Self { hasher }
     }
 
diff --git a/dan_layer/engine_types/src/hashing.rs b/dan_layer/engine_types/src/hashing.rs
index 2459f20c6..b5777fdf7 100644
--- a/dan_layer/engine_types/src/hashing.rs
+++ b/dan_layer/engine_types/src/hashing.rs
@@ -50,8 +50,6 @@ pub fn template_hasher32() -> TariHasher32 {
     hasher32(EngineHashDomainLabel::Template)
 }
 
-hash_domain!(ConfidentialOutputHashDomain, "com.tari.dan.confidential_output", 1);
-
 #[derive(Debug, Clone)]
 pub struct TariHasher32 {
     hasher: Blake2b<U32>,
diff --git a/dan_layer/epoch_manager/Cargo.toml b/dan_layer/epoch_manager/Cargo.toml
index b8ad01331..46f8bf154 100644
--- a/dan_layer/epoch_manager/Cargo.toml
+++ b/dan_layer/epoch_manager/Cargo.toml
@@ -9,6 +9,7 @@ license.workspace = true
 
 [dependencies]
 tari_core = { workspace = true }
+tari_common = { workspace = true }
 tari_common_types = { workspace = true }
 tari_shutdown = { workspace = true }
 tari_dan_common_types = { workspace = true }
diff --git a/dan_layer/epoch_manager/src/base_layer/base_layer_epoch_manager.rs b/dan_layer/epoch_manager/src/base_layer/base_layer_epoch_manager.rs
index 0ccf75592..f04bd0bb6 100644
--- a/dan_layer/epoch_manager/src/base_layer/base_layer_epoch_manager.rs
+++ b/dan_layer/epoch_manager/src/base_layer/base_layer_epoch_manager.rs
@@ -28,6 +28,7 @@ use std::{
 
 use log::*;
 use tari_base_node_client::{grpc::GrpcBaseNodeClient, types::BaseLayerConsensusConstants, BaseNodeClient};
+use tari_common::configuration::Network;
 use tari_common_types::types::{FixedHash, PublicKey};
 use tari_core::{blocks::BlockHeader, transactions::transaction_components::ValidatorNodeRegistration};
 use tari_dan_common_types::{
@@ -51,6 +52,7 @@ const LOG_TARGET: &str = "tari::dan::epoch_manager::base_layer";
 
 #[derive(Clone)]
 pub struct BaseLayerEpochManager<TGlobalStore, TBaseNodeClient> {
+    network: Network,
     global_db: GlobalDb<TGlobalStore>,
     base_node_client: TBaseNodeClient,
     config: EpochManagerConfig,
@@ -67,6 +69,7 @@ impl<TAddr: NodeAddressable + DerivableFromPublicKey>
     BaseLayerEpochManager<SqliteGlobalDbAdapter<TAddr>, GrpcBaseNodeClient>
 {
     pub fn new(
+        network: Network,
         config: EpochManagerConfig,
         global_db: GlobalDb<SqliteGlobalDbAdapter<TAddr>>,
         base_node_client: GrpcBaseNodeClient,
@@ -74,6 +77,7 @@ impl<TAddr: NodeAddressable + DerivableFromPublicKey>
         node_public_key: PublicKey,
     ) -> Self {
         Self {
+            network,
             global_db,
             base_node_client,
             config,
@@ -496,7 +500,7 @@ impl<TAddr: NodeAddressable + DerivableFromPublicKey>
         }
         let vns = self.get_validator_nodes_per_epoch(epoch)?;
 
-        let vn_bmt_leaves = vns.iter().map(|vn| vn.node_hash().to_vec()).collect();
+        let vn_bmt_leaves = vns.iter().map(|vn| vn.get_node_hash(self.network).to_vec()).collect();
         let vn_bmt = ValidatorNodeBalancedMerkleTree::create(vn_bmt_leaves);
         let mut tx = self.global_db.create_transaction()?;
         self.global_db.bmt(&mut tx).insert_bmt(epoch.as_u64(), vn_bmt.clone())?;
@@ -519,7 +523,7 @@ impl<TAddr: NodeAddressable + DerivableFromPublicKey>
                     address: TAddr::derive_from_public_key(validator).to_string(),
                     epoch,
                 })?;
-            let leaf_index = bmt.find_leaf_index_for_hash(&vn.node_hash().to_vec())?;
+            let leaf_index = bmt.find_leaf_index_for_hash(&vn.get_node_hash(self.network).to_vec())?;
 
             let proof = ValidatorNodeMerkleProof::generate_proof(&bmt, leaf_index as usize)?;
             proofs.push(proof);
diff --git a/dan_layer/epoch_manager/src/base_layer/epoch_manager_service.rs b/dan_layer/epoch_manager/src/base_layer/epoch_manager_service.rs
index 89a72b0b3..0f7b43882 100644
--- a/dan_layer/epoch_manager/src/base_layer/epoch_manager_service.rs
+++ b/dan_layer/epoch_manager/src/base_layer/epoch_manager_service.rs
@@ -22,6 +22,7 @@
 
 use log::error;
 use tari_base_node_client::grpc::GrpcBaseNodeClient;
+use tari_common::configuration::Network;
 use tari_common_types::types::PublicKey;
 use tari_dan_common_types::{DerivableFromPublicKey, NodeAddressable};
 use tari_dan_storage::global::GlobalDb;
@@ -54,6 +55,7 @@ impl<TAddr: NodeAddressable + DerivableFromPublicKey + 'static>
     EpochManagerService<TAddr, SqliteGlobalDbAdapter<TAddr>, GrpcBaseNodeClient>
 {
     pub fn spawn(
+        network: Network,
         config: EpochManagerConfig,
         rx_request: Receiver<EpochManagerRequest<TAddr>>,
         shutdown: ShutdownSignal,
@@ -65,7 +67,14 @@ impl<TAddr: NodeAddressable + DerivableFromPublicKey + 'static>
             let (tx, _) = broadcast::channel(100);
             EpochManagerService {
                 rx_request,
-                inner: BaseLayerEpochManager::new(config, global_db, base_node_client, tx.clone(), node_public_key),
+                inner: BaseLayerEpochManager::new(
+                    network,
+                    config,
+                    global_db,
+                    base_node_client,
+                    tx.clone(),
+                    node_public_key,
+                ),
                 events: tx,
             }
             .run(shutdown)
diff --git a/dan_layer/epoch_manager/src/base_layer/initializer.rs b/dan_layer/epoch_manager/src/base_layer/initializer.rs
index a47bc3e2e..bc9a5434f 100644
--- a/dan_layer/epoch_manager/src/base_layer/initializer.rs
+++ b/dan_layer/epoch_manager/src/base_layer/initializer.rs
@@ -21,6 +21,7 @@
 //  USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 use tari_base_node_client::grpc::GrpcBaseNodeClient;
+use tari_common::configuration::Network;
 use tari_common_types::types::PublicKey;
 use tari_dan_common_types::{DerivableFromPublicKey, NodeAddressable};
 use tari_dan_storage::global::GlobalDb;
@@ -31,6 +32,7 @@ use tokio::{sync::mpsc, task::JoinHandle};
 use crate::base_layer::{config::EpochManagerConfig, epoch_manager_service::EpochManagerService, EpochManagerHandle};
 
 pub fn spawn_service<TAddr: NodeAddressable + DerivableFromPublicKey + 'static>(
+    network: Network,
     config: EpochManagerConfig,
     global_db: GlobalDb<SqliteGlobalDbAdapter<TAddr>>,
     base_node_client: GrpcBaseNodeClient,
@@ -40,6 +42,7 @@ pub fn spawn_service<TAddr: NodeAddressable + DerivableFromPublicKey + 'static>(
     let (tx_request, rx_request) = mpsc::channel(10);
     let epoch_manager = EpochManagerHandle::new(tx_request);
     let handle = EpochManagerService::spawn(
+        network,
         config,
         rx_request,
         shutdown,
diff --git a/dan_layer/p2p/proto/consensus.proto b/dan_layer/p2p/proto/consensus.proto
index b134369f9..1aeb8bccd 100644
--- a/dan_layer/p2p/proto/consensus.proto
+++ b/dan_layer/p2p/proto/consensus.proto
@@ -42,15 +42,16 @@ message VoteMessage {
 
 message Block {
   bytes parent_id = 1;
-  QuorumCertificate justify = 2;
-  uint64 height = 3;
-  uint64 epoch = 4;
-  bytes proposed_by = 6;
-  bytes merkle_root = 7;
-  repeated Command commands = 8;
-  uint64 total_leader_fee = 9;
-  bytes foreign_indexes = 10;
-  tari.dan.common.Signature signature = 11;
+  int32 network = 2;
+  QuorumCertificate justify = 3;
+  uint64 height = 4;
+  uint64 epoch = 5;
+  bytes proposed_by = 7;
+  bytes merkle_root = 8;
+  repeated Command commands = 9;
+  uint64 total_leader_fee = 10;
+  bytes foreign_indexes = 11;
+  tari.dan.common.Signature signature = 12;
 }
 
 message Command {
diff --git a/dan_layer/p2p/src/conversions/consensus.rs b/dan_layer/p2p/src/conversions/consensus.rs
index 1419e9091..4be5dd6e3 100644
--- a/dan_layer/p2p/src/conversions/consensus.rs
+++ b/dan_layer/p2p/src/conversions/consensus.rs
@@ -250,6 +250,7 @@ impl TryFrom<proto::consensus::RequestedTransactionMessage> for RequestedTransac
 impl From<&tari_dan_storage::consensus_models::Block> for proto::consensus::Block {
     fn from(value: &tari_dan_storage::consensus_models::Block) -> Self {
         Self {
+            network: value.network().as_byte().into(),
             height: value.height().as_u64(),
             epoch: value.epoch().as_u64(),
             parent_id: value.parent().as_bytes().to_vec(),
@@ -268,7 +269,12 @@ impl TryFrom<proto::consensus::Block> for tari_dan_storage::consensus_models::Bl
     type Error = anyhow::Error;
 
     fn try_from(value: proto::consensus::Block) -> Result<Self, Self::Error> {
+        let network = u8::try_from(value.network)
+            .map_err(|_| anyhow!("Block conversion: Invalid network byte {}", value.network))?
+            .try_into()?;
+
         Ok(Self::new(
+            network,
             value.parent_id.try_into()?,
             value
                 .justify
diff --git a/dan_layer/rpc_state_sync/Cargo.toml b/dan_layer/rpc_state_sync/Cargo.toml
index 45cadc686..aad981e7c 100644
--- a/dan_layer/rpc_state_sync/Cargo.toml
+++ b/dan_layer/rpc_state_sync/Cargo.toml
@@ -8,6 +8,7 @@ repository.workspace = true
 license.workspace = true
 
 [dependencies]
+tari_common = { workspace = true }
 tari_epoch_manager = { workspace = true }
 tari_dan_storage = { workspace = true }
 tari_validator_node_rpc = { workspace = true }
diff --git a/dan_layer/rpc_state_sync/src/manager.rs b/dan_layer/rpc_state_sync/src/manager.rs
index 094b564eb..c8d2fa96b 100644
--- a/dan_layer/rpc_state_sync/src/manager.rs
+++ b/dan_layer/rpc_state_sync/src/manager.rs
@@ -6,6 +6,7 @@ use std::{fmt::Display, ops::DerefMut};
 use async_trait::async_trait;
 use futures::StreamExt;
 use log::*;
+use tari_common::configuration::Network;
 use tari_consensus::{
     hotstuff::ProposalValidationError,
     traits::{ConsensusSpec, LeaderStrategy, SyncManager, SyncStatus},
@@ -42,6 +43,7 @@ const LOG_TARGET: &str = "tari::dan::comms_rpc_state_sync";
 const MAX_SUBSTATE_UPDATES: usize = 10000;
 
 pub struct RpcStateSyncManager<TConsensusSpec: ConsensusSpec> {
+    network: Network,
     epoch_manager: TConsensusSpec::EpochManager,
     state_store: TConsensusSpec::StateStore,
     leader_strategy: TConsensusSpec::LeaderStrategy,
@@ -52,12 +54,14 @@ impl<TConsensusSpec> RpcStateSyncManager<TConsensusSpec>
 where TConsensusSpec: ConsensusSpec<Addr = PeerAddress>
 {
     pub fn new(
+        network: Network,
         epoch_manager: TConsensusSpec::EpochManager,
         state_store: TConsensusSpec::StateStore,
         leader_strategy: TConsensusSpec::LeaderStrategy,
         client_factory: TariValidatorNodeRpcClientFactory,
     ) -> Self {
         Self {
+            network,
             epoch_manager,
             state_store,
             leader_strategy,
@@ -92,7 +96,7 @@ where TConsensusSpec: ConsensusSpec<Addr = PeerAddress>
     fn create_zero_block_if_required(&self) -> Result<(), CommsRpcConsensusSyncError> {
         let mut tx = self.state_store.create_write_tx()?;
 
-        let zero_block = Block::zero_block();
+        let zero_block = Block::zero_block(self.network);
         if !zero_block.exists(tx.deref_mut())? {
             debug!(target: LOG_TARGET, "Creating zero block");
             zero_block.justify().insert(&mut tx)?;
@@ -280,6 +284,7 @@ where TConsensusSpec: ConsensusSpec<Addr = PeerAddress>
                     let leader = self.leader_strategy.get_leader_public_key(&local_committee, next_height);
 
                     let dummy_block = Block::dummy_block(
+                       self.network,
                         last_dummy_block.id,
                         leader.clone(),
                         next_height,
@@ -456,7 +461,7 @@ where TConsensusSpec: ConsensusSpec<Addr = PeerAddress> + Send + Sync + 'static
             let locked_block = self
                 .state_store
                 .with_read_tx(|tx| LockedBlock::get(tx).optional())?
-                .unwrap_or_else(|| Block::zero_block().as_locked_block());
+                .unwrap_or_else(|| Block::zero_block(self.network).as_locked_block());
 
             match self.sync_with_peer(member, &locked_block).await {
                 Ok(()) => {
diff --git a/dan_layer/state_store_sqlite/migrations/2023-06-08-091819_create_state_store/up.sql b/dan_layer/state_store_sqlite/migrations/2023-06-08-091819_create_state_store/up.sql
index 441eecfbc..bd8ded096 100644
--- a/dan_layer/state_store_sqlite/migrations/2023-06-08-091819_create_state_store/up.sql
+++ b/dan_layer/state_store_sqlite/migrations/2023-06-08-091819_create_state_store/up.sql
@@ -7,7 +7,7 @@ create table quorum_certificates
     created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
 );
 
--- fetching by qc_id will be a very common operation
+-- fetching by qc_id is a very common operation
 create unique index quorum_certificates_uniq_idx_id on quorum_certificates (qc_id);
 
 create table blocks
@@ -15,6 +15,7 @@ create table blocks
     id               integer   not null primary key AUTOINCREMENT,
     block_id         text      not NULL,
     parent_block_id  text      not NULL,
+    network          text      not NULL,
     height           bigint    not NULL,
     epoch            bigint    not NULL,
     proposed_by      text      not NULL,
@@ -39,6 +40,7 @@ create table parked_blocks
     id               integer   not null primary key AUTOINCREMENT,
     block_id         text      not NULL,
     parent_block_id  text      not NULL,
+    network          text      not NULL,
     height           bigint    not NULL,
     epoch            bigint    not NULL,
     proposed_by      text      not NULL,
@@ -66,8 +68,8 @@ create table leaf_blocks
 create table substates
 (
     id                       integer   not NULL primary key AUTOINCREMENT,
-    shard_id                 text      not NULL,
     address                  text      not NULL,
+    substate_id              text      not NULL,
     version                  integer   not NULL,
     data                     text      not NULL,
     state_hash               text      not NULL,
@@ -88,7 +90,7 @@ create table substates
 );
 
 -- All shard ids are unique
-create unique index substates_uniq_shard_id on substates (shard_id);
+create unique index substates_uniq_shard_id on substates (address);
 -- querying for transaction ids that either Upd or Downd a substate
 create index substates_idx_created_by_transaction on substates (created_by_transaction);
 create index substates_idx_destroyed_by_transaction on substates (destroyed_by_transaction) where destroyed_by_transaction is not null;
@@ -214,15 +216,15 @@ create unique index transaction_pool_uniq_block_id_transaction_id on transaction
 
 create table locked_outputs
 (
-    id             integer   not null primary key AUTOINCREMENT,
-    block_id       text      not null,
-    transaction_id text      not null,
-    shard_id       text      not null,
-    created_at     timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    id               integer   not null primary key AUTOINCREMENT,
+    block_id         text      not null,
+    transaction_id   text      not null,
+    substate_address text      not null,
+    created_at       timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
     FOREIGN KEY (transaction_id) REFERENCES transactions (transaction_id),
     FOREIGN KEY (block_id) REFERENCES blocks (block_id)
 );
-create unique index locked_outputs_uniq_idx_shard_id on locked_outputs (shard_id);
+create unique index locked_outputs_uniq_idx_shard_id on locked_outputs (substate_address);
 
 create table votes
 (
@@ -250,12 +252,12 @@ CREATE TABLE missing_transactions
 
 CREATE TABLE foreign_proposals
 (
-    id         integer   not NULL primary key AUTOINCREMENT,
-    bucket     int       not NULL,
-    block_id   text      not NULL,
-    state      text      not NULL,
-    mined_at   bigint    NULL,
-    created_at timestamp not NULL DEFAULT CURRENT_TIMESTAMP,
+    id              integer   not NULL primary key AUTOINCREMENT,
+    bucket          int       not NULL,
+    block_id        text      not NULL,
+    state           text      not NULL,
+    proposed_height bigint    NULL,
+    created_at      timestamp not NULL DEFAULT CURRENT_TIMESTAMP,
     UNIQUE (bucket, block_id)
 );
 
diff --git a/dan_layer/state_store_sqlite/migrations/2024-01-18-100401_rename_fields/down.sql b/dan_layer/state_store_sqlite/migrations/2024-01-18-100401_rename_fields/down.sql
deleted file mode 100644
index d9a93fe9a..000000000
--- a/dan_layer/state_store_sqlite/migrations/2024-01-18-100401_rename_fields/down.sql
+++ /dev/null
@@ -1 +0,0 @@
--- This file should undo anything in `up.sql`
diff --git a/dan_layer/state_store_sqlite/migrations/2024-01-18-100401_rename_fields/up.sql b/dan_layer/state_store_sqlite/migrations/2024-01-18-100401_rename_fields/up.sql
deleted file mode 100644
index d85e5839d..000000000
--- a/dan_layer/state_store_sqlite/migrations/2024-01-18-100401_rename_fields/up.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-
-alter table substates
-    rename column address to substate_id;
-
-alter table substates
-    rename column shard_id to address;
-
-alter table locked_outputs
-    rename column shard_id to substate_address;
-
--- to rename an index we need to drop it and crete it again
-drop index substates_uniq_shard_id;
-create unique index substates_uniq_address on substates (address);
-
-drop index locked_outputs_uniq_idx_shard_id;
-create unique index locked_outputs_uniq_idx_substate_address on locked_outputs (substate_address);
-    
\ No newline at end of file
diff --git a/dan_layer/state_store_sqlite/migrations/2024-01-22-123711_rename_mined_at_to_proposed_at/down.sql b/dan_layer/state_store_sqlite/migrations/2024-01-22-123711_rename_mined_at_to_proposed_at/down.sql
deleted file mode 100644
index 291a97c5c..000000000
--- a/dan_layer/state_store_sqlite/migrations/2024-01-22-123711_rename_mined_at_to_proposed_at/down.sql
+++ /dev/null
@@ -1 +0,0 @@
--- This file should undo anything in `up.sql`
\ No newline at end of file
diff --git a/dan_layer/state_store_sqlite/migrations/2024-01-22-123711_rename_mined_at_to_proposed_at/up.sql b/dan_layer/state_store_sqlite/migrations/2024-01-22-123711_rename_mined_at_to_proposed_at/up.sql
deleted file mode 100644
index b1a8dec56..000000000
--- a/dan_layer/state_store_sqlite/migrations/2024-01-22-123711_rename_mined_at_to_proposed_at/up.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-ALTER TABLE foreign_proposals
-    RENAME COLUMN mined_at TO proposed_height;
-
-UPDATE foreign_proposals
-    SET state = 'Proposed'
-    WHERE state = 'Mined';
\ No newline at end of file
diff --git a/dan_layer/state_store_sqlite/src/schema.rs b/dan_layer/state_store_sqlite/src/schema.rs
index 3ae2673e1..bcd4f2817 100644
--- a/dan_layer/state_store_sqlite/src/schema.rs
+++ b/dan_layer/state_store_sqlite/src/schema.rs
@@ -5,6 +5,7 @@ diesel::table! {
         id -> Integer,
         block_id -> Text,
         parent_block_id -> Text,
+        network -> Text,
         height -> BigInt,
         epoch -> BigInt,
         proposed_by -> Text,
@@ -142,6 +143,7 @@ diesel::table! {
         id -> Integer,
         block_id -> Text,
         parent_block_id -> Text,
+        network -> Text,
         height -> BigInt,
         epoch -> BigInt,
         proposed_by -> Text,
diff --git a/dan_layer/state_store_sqlite/src/sql_models/block.rs b/dan_layer/state_store_sqlite/src/sql_models/block.rs
index 477d85e16..87d0e1bbc 100644
--- a/dan_layer/state_store_sqlite/src/sql_models/block.rs
+++ b/dan_layer/state_store_sqlite/src/sql_models/block.rs
@@ -19,6 +19,7 @@ pub struct Block {
     pub id: i32,
     pub block_id: String,
     pub parent_block_id: String,
+    pub network: String,
     pub height: i64,
     pub epoch: i64,
     pub proposed_by: String,
@@ -36,8 +37,14 @@ pub struct Block {
 
 impl Block {
     pub fn try_convert(self, qc: sql_models::QuorumCertificate) -> Result<consensus_models::Block, StorageError> {
+        let network = self.network.parse().map_err(|_| StorageError::DecodingError {
+            operation: "try_convert",
+            item: "block",
+            details: format!("Block #{} network byte is not a valid Network", self.id),
+        })?;
         Ok(consensus_models::Block::load(
             deserialize_hex_try_from(&self.block_id)?,
+            network,
             deserialize_hex_try_from(&self.parent_block_id)?,
             qc.try_into()?,
             NodeHeight(self.height as u64),
@@ -66,6 +73,7 @@ pub struct ParkedBlock {
     pub id: i32,
     pub block_id: String,
     pub parent_block_id: String,
+    pub network: String,
     pub height: i64,
     pub epoch: i64,
     pub proposed_by: String,
@@ -82,8 +90,14 @@ impl TryFrom<ParkedBlock> for consensus_models::Block {
     type Error = StorageError;
 
     fn try_from(value: ParkedBlock) -> Result<Self, Self::Error> {
+        let network = value.network.parse().map_err(|_| StorageError::DecodingError {
+            operation: "try_convert",
+            item: "block",
+            details: format!("Block #{} network byte is not a valid Network", value.id),
+        })?;
         Ok(consensus_models::Block::load(
             deserialize_hex_try_from(&value.block_id)?,
+            network,
             deserialize_hex_try_from(&value.parent_block_id)?,
             deserialize_json(&value.justify)?,
             NodeHeight(value.height as u64),
diff --git a/dan_layer/state_store_sqlite/src/writer.rs b/dan_layer/state_store_sqlite/src/writer.rs
index 0a68e1e03..16d9ad2ac 100644
--- a/dan_layer/state_store_sqlite/src/writer.rs
+++ b/dan_layer/state_store_sqlite/src/writer.rs
@@ -139,6 +139,7 @@ impl<'a, TAddr: NodeAddressable> SqliteStateStoreWriteTransaction<'a, TAddr> {
         let insert = (
             parked_blocks::block_id.eq(&block_id),
             parked_blocks::parent_block_id.eq(serialize_hex(block.parent())),
+            parked_blocks::network.eq(block.network().to_string()),
             parked_blocks::height.eq(block.height().as_u64() as i64),
             parked_blocks::epoch.eq(block.epoch().as_u64() as i64),
             parked_blocks::proposed_by.eq(serialize_hex(block.proposed_by().as_bytes())),
@@ -182,6 +183,7 @@ impl<TAddr: NodeAddressable> StateStoreWriteTransaction for SqliteStateStoreWrit
         let insert = (
             blocks::block_id.eq(serialize_hex(block.id())),
             blocks::parent_block_id.eq(serialize_hex(block.parent())),
+            blocks::network.eq(block.network().to_string()),
             blocks::height.eq(block.height().as_u64() as i64),
             blocks::epoch.eq(block.epoch().as_u64() as i64),
             blocks::proposed_by.eq(serialize_hex(block.proposed_by().as_bytes())),
diff --git a/dan_layer/state_store_sqlite/tests/tests.rs b/dan_layer/state_store_sqlite/tests/tests.rs
index 56c069462..b59db3717 100644
--- a/dan_layer/state_store_sqlite/tests/tests.rs
+++ b/dan_layer/state_store_sqlite/tests/tests.rs
@@ -43,9 +43,11 @@ mod confirm_all_transitions {
         let atom2 = create_tx_atom();
         let atom3 = create_tx_atom();
 
-        let zero_block = Block::zero_block();
+        let network = Default::default();
+        let zero_block = Block::zero_block(network);
         zero_block.insert(&mut tx).unwrap();
         let block1 = Block::new(
+            network,
             *zero_block.id(),
             zero_block.justify().clone(),
             NodeHeight(1),
diff --git a/dan_layer/storage/Cargo.toml b/dan_layer/storage/Cargo.toml
index d72b76ee5..5d698fcfd 100644
--- a/dan_layer/storage/Cargo.toml
+++ b/dan_layer/storage/Cargo.toml
@@ -9,6 +9,7 @@ license.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+tari_common = { workspace = true }
 tari_common_types = { workspace = true }
 tari_dan_common_types = { workspace = true }
 
diff --git a/dan_layer/storage/src/consensus_models/block.rs b/dan_layer/storage/src/consensus_models/block.rs
index d8bcf91d9..02e180856 100644
--- a/dan_layer/storage/src/consensus_models/block.rs
+++ b/dan_layer/storage/src/consensus_models/block.rs
@@ -11,6 +11,7 @@ use std::{
 use indexmap::IndexMap;
 use log::*;
 use serde::{Deserialize, Serialize};
+use tari_common::configuration::Network;
 use tari_common_types::types::{FixedHash, FixedHashSizeError, PublicKey};
 use tari_dan_common_types::{
     hashing,
@@ -54,6 +55,8 @@ const LOG_TARGET: &str = "tari::dan::storage::consensus_models::block";
 pub struct Block {
     // Header
     id: BlockId,
+    #[cfg_attr(feature = "ts", ts(type = "string"))]
+    network: Network,
     parent: BlockId,
     justify: QuorumCertificate,
     height: NodeHeight,
@@ -86,6 +89,7 @@ pub struct Block {
 
 impl Block {
     pub fn new(
+        network: Network,
         parent: BlockId,
         justify: QuorumCertificate,
         height: NodeHeight,
@@ -98,6 +102,7 @@ impl Block {
     ) -> Self {
         let mut block = Self {
             id: BlockId::genesis(),
+            network,
             parent,
             justify,
             height,
@@ -120,6 +125,7 @@ impl Block {
 
     pub fn load(
         id: BlockId,
+        network: Network,
         parent: BlockId,
         justify: QuorumCertificate,
         height: NodeHeight,
@@ -136,6 +142,7 @@ impl Block {
     ) -> Self {
         Self {
             id,
+            network,
             parent,
             justify,
             height,
@@ -154,8 +161,9 @@ impl Block {
         }
     }
 
-    pub fn genesis() -> Self {
+    pub fn genesis(network: Network) -> Self {
         Self::new(
+            network,
             BlockId::genesis(),
             QuorumCertificate::genesis(),
             NodeHeight(0),
@@ -169,8 +177,9 @@ impl Block {
     }
 
     /// This is the parent block for all genesis blocks. Its block ID is always zero.
-    pub fn zero_block() -> Self {
+    pub fn zero_block(network: Network) -> Self {
         Self {
+            network,
             id: BlockId::genesis(),
             parent: BlockId::genesis(),
             justify: QuorumCertificate::genesis(),
@@ -190,6 +199,7 @@ impl Block {
     }
 
     pub fn dummy_block(
+        network: Network,
         parent: BlockId,
         proposed_by: PublicKey,
         node_height: NodeHeight,
@@ -197,6 +207,7 @@ impl Block {
         epoch: Epoch,
     ) -> Self {
         let mut block = Self::new(
+            network,
             parent,
             high_qc,
             node_height,
@@ -214,6 +225,7 @@ impl Block {
 
     pub fn calculate_hash(&self) -> FixedHash {
         hashing::block_hasher()
+            .chain(&self.network)
             .chain(&self.parent)
             .chain(&self.justify)
             .chain(&self.height)
@@ -282,6 +294,10 @@ impl Block {
         &self.id
     }
 
+    pub fn network(&self) -> Network {
+        self.network
+    }
+
     pub fn parent(&self) -> &BlockId {
         &self.parent
     }
diff --git a/dan_layer/storage/src/global/models/validator_node.rs b/dan_layer/storage/src/global/models/validator_node.rs
index abbcd4413..c70a5ad5c 100644
--- a/dan_layer/storage/src/global/models/validator_node.rs
+++ b/dan_layer/storage/src/global/models/validator_node.rs
@@ -2,6 +2,7 @@
 //   SPDX-License-Identifier: BSD-3-Clause
 
 use serde::{Deserialize, Serialize};
+use tari_common::configuration::Network;
 use tari_common_types::types::{FixedHash, PublicKey};
 use tari_dan_common_types::{shard::Shard, vn_node_hash, Epoch, NodeAddressable, SubstateAddress};
 #[cfg(feature = "ts")]
@@ -22,8 +23,8 @@ pub struct ValidatorNode<TAddr> {
 }
 
 impl<TAddr: NodeAddressable> ValidatorNode<TAddr> {
-    pub fn node_hash(&self) -> FixedHash {
-        vn_node_hash(&self.public_key, &self.shard_key)
+    pub fn get_node_hash(&self, network: Network) -> FixedHash {
+        vn_node_hash(network, &self.public_key, &self.shard_key)
     }
 }
 
diff --git a/dan_layer/template_test_tooling/Cargo.toml b/dan_layer/template_test_tooling/Cargo.toml
index 9a6d1dd62..f04601033 100644
--- a/dan_layer/template_test_tooling/Cargo.toml
+++ b/dan_layer/template_test_tooling/Cargo.toml
@@ -10,6 +10,7 @@ license.workspace = true
 [dependencies]
 tari_dan_engine = { workspace = true }
 tari_crypto = { workspace = true }
+tari_common = { workspace = true }
 tari_common_types = { workspace = true }
 tari_template_lib = { workspace = true }
 tari_engine_types = { workspace = true }
diff --git a/dan_layer/template_test_tooling/src/template_test.rs b/dan_layer/template_test_tooling/src/template_test.rs
index 5181a70d8..64d348521 100644
--- a/dan_layer/template_test_tooling/src/template_test.rs
+++ b/dan_layer/template_test_tooling/src/template_test.rs
@@ -11,6 +11,7 @@ use std::{
 use anyhow::anyhow;
 use serde::de::DeserializeOwned;
 use tari_bor::{decode_exact, to_value};
+use tari_common::configuration::Network;
 use tari_crypto::{
     keys::PublicKey,
     ristretto::{RistrettoPublicKey, RistrettoSecretKey},
@@ -433,6 +434,7 @@ impl TemplateTest {
             auth_params,
             self.virtual_substates.clone(),
             modules,
+            Network::LocalNet,
         );
 
         let tx_id = *transaction.id();
diff --git a/dan_layer/template_test_tooling/templates/faucet/Cargo.lock b/dan_layer/template_test_tooling/templates/faucet/Cargo.lock
index 600c8b42c..a2c1bcc1d 100644
--- a/dan_layer/template_test_tooling/templates/faucet/Cargo.lock
+++ b/dan_layer/template_test_tooling/templates/faucet/Cargo.lock
@@ -3,10 +3,65 @@
 version = 3
 
 [[package]]
-name = "Inflector"
-version = "0.11.4"
+name = "android-tzdata"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "base64"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
+[[package]]
+name = "bumpalo"
+version = "3.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+
+[[package]]
+name = "cc"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "num-traits",
+ "serde",
+ "windows-targets",
+]
 
 [[package]]
 name = "ciborium"
@@ -32,6 +87,57 @@ dependencies = [
  "half",
 ]
 
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+
+[[package]]
+name = "darling"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+ "serde",
+]
+
 [[package]]
 name = "faucet2"
 version = "0.1.0"
@@ -39,18 +145,124 @@ dependencies = [
  "tari_template_lib",
 ]
 
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
 [[package]]
 name = "half"
 version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
 
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown",
+ "serde",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
+
+[[package]]
+name = "js-sys"
+version = "0.3.67"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.152"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
+
+[[package]]
+name = "log"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
 [[package]]
 name = "newtype-ops"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d36047f46c69ef97b60e7b069a26ce9a15cd8a7852eddb6991ea94a83ba36a78"
 
+[[package]]
+name = "num-traits"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.78"
@@ -69,35 +281,77 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "ryu"
+version = "1.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
+
 [[package]]
 name = "serde"
-version = "1.0.156"
+version = "1.0.195"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "314b5b092c0ade17c00142951e50ced110ec27cea304b1037c6969246c2469a4"
+checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
-name = "serde-byte-array"
-version = "0.1.2"
+name = "serde_derive"
+version = "1.0.195"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.48",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63213ee4ed648dbd87db6fa993d4275b46bfb4ddfd95b3756045007c2b28f742"
+checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4"
 dependencies = [
+ "itoa",
+ "ryu",
  "serde",
 ]
 
 [[package]]
-name = "serde_derive"
-version = "1.0.156"
+name = "serde_with"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7e29c4601e36bcec74a223228dce795f4cd3616341a4af93520ca1a837c087d"
+checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe"
 dependencies = [
+ "base64",
+ "chrono",
+ "hex",
+ "indexmap",
+ "serde",
+ "serde_json",
+ "serde_with_macros",
+ "time",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f"
+dependencies = [
+ "darling",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.48",
 ]
 
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -127,7 +381,6 @@ dependencies = [
  "ciborium",
  "ciborium-io",
  "serde",
- "ts-rs",
 ]
 
 [[package]]
@@ -136,7 +389,6 @@ version = "0.3.0"
 dependencies = [
  "serde",
  "tari_bor",
- "ts-rs",
 ]
 
 [[package]]
@@ -145,11 +397,10 @@ version = "0.3.0"
 dependencies = [
  "newtype-ops",
  "serde",
- "serde-byte-array",
+ "serde_with",
  "tari_bor",
  "tari_template_abi",
  "tari_template_macros",
- "ts-rs",
 ]
 
 [[package]]
@@ -164,90 +415,156 @@ dependencies = [
 ]
 
 [[package]]
-name = "termcolor"
-version = "1.4.1"
+name = "time"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
+dependencies = [
+ "deranged",
+ "itoa",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
 dependencies = [
- "winapi-util",
+ "time-core",
 ]
 
 [[package]]
-name = "thiserror"
-version = "1.0.56"
+name = "unicode-ident"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
+checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406"
 dependencies = [
- "thiserror-impl",
+ "cfg-if",
+ "wasm-bindgen-macro",
 ]
 
 [[package]]
-name = "thiserror-impl"
-version = "1.0.56"
+name = "wasm-bindgen-backend"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
+checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd"
 dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
  "proc-macro2",
  "quote",
  "syn 2.0.48",
+ "wasm-bindgen-shared",
 ]
 
 [[package]]
-name = "ts-rs"
-version = "7.1.1"
+name = "wasm-bindgen-macro"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc2cae1fc5d05d47aa24b64f9a4f7cba24cdc9187a2084dd97ac57bef5eccae6"
+checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999"
 dependencies = [
- "thiserror",
- "ts-rs-macros",
+ "quote",
+ "wasm-bindgen-macro-support",
 ]
 
 [[package]]
-name = "ts-rs-macros"
-version = "7.1.1"
+name = "wasm-bindgen-macro-support"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73f7f9b821696963053a89a7bd8b292dc34420aea8294d7b225274d488f3ec92"
+checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7"
 dependencies = [
- "Inflector",
  "proc-macro2",
  "quote",
  "syn 2.0.48",
- "termcolor",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
 ]
 
 [[package]]
-name = "unicode-ident"
-version = "1.0.8"
+name = "wasm-bindgen-shared"
+version = "0.2.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b"
 
 [[package]]
-name = "winapi"
-version = "0.3.9"
+name = "windows-core"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
+ "windows-targets",
 ]
 
 [[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
+name = "windows-targets"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
 
 [[package]]
-name = "winapi-util"
-version = "0.1.6"
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
-dependencies = [
- "winapi",
-]
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
 
 [[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
+name = "windows_x86_64_msvc"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
diff --git a/integration_tests/Cargo.toml b/integration_tests/Cargo.toml
index 99f8b7d01..305d708fe 100644
--- a/integration_tests/Cargo.toml
+++ b/integration_tests/Cargo.toml
@@ -15,7 +15,7 @@ minotari_node = { workspace = true }
 minotari_node_grpc_client = { workspace = true }
 tari_common = { workspace = true }
 tari_common_types = { workspace = true }
-minotari_console_wallet = { workspace = true }
+minotari_console_wallet = { workspace = true, features = ["grpc"] }
 minotari_wallet = { workspace = true }
 tari_p2p = { workspace = true }
 tari_shutdown = { workspace = true }
@@ -38,6 +38,7 @@ tari_validator_node = { workspace = true }
 tari_wallet_daemon_client = { workspace = true }
 tari_base_node_client = { workspace = true }
 tari_transaction_manifest = { workspace = true }
+tari_key_manager = { workspace = true }
 #tari_dan_wallet_sdk = { workspace = true }
 
 tari_comms = { git = "https://github.com/tari-project/tari.git", branch = "feature-dan2" }
diff --git a/integration_tests/src/lib.rs b/integration_tests/src/lib.rs
index 281da4579..27a24f14b 100644
--- a/integration_tests/src/lib.rs
+++ b/integration_tests/src/lib.rs
@@ -31,9 +31,20 @@ use http_server::MockHttpServer;
 use indexer::IndexerProcess;
 use indexmap::IndexMap;
 use miner::MinerProcess;
-use tari_common_types::types::PublicKey;
-use tari_core::transactions::test_helpers::{create_test_core_key_manager_with_memory_db, TestKeyManager};
-use tari_crypto::ristretto::{RistrettoComSig, RistrettoSecretKey};
+use rand::rngs::OsRng;
+use tari_common::configuration::Network;
+use tari_common_types::{
+    tari_address::TariAddress,
+    types::{PrivateKey, PublicKey},
+};
+use tari_core::{
+    consensus::ConsensusManager,
+    transactions::key_manager::{create_memory_db_key_manager, MemoryDbKeyManager, TariKeyId},
+};
+use tari_crypto::{
+    keys::{PublicKey as _, SecretKey},
+    ristretto::{RistrettoComSig, RistrettoSecretKey},
+};
 use tari_validator_node_cli::versioned_substate_id::VersionedSubstateId;
 use template::RegisteredTemplate;
 use validator_node::ValidatorNodeProcess;
@@ -72,11 +83,16 @@ pub struct TariWorld {
     pub addresses: IndexMap<String, String>,
     pub num_databases_saved: usize,
     pub account_keys: IndexMap<String, (RistrettoSecretKey, PublicKey)>,
-    pub key_manager: TestKeyManager,
+    pub key_manager: MemoryDbKeyManager,
     /// Key name -> key index
     pub wallet_keys: IndexMap<String, u64>,
     pub claim_public_keys: IndexMap<String, PublicKey>,
     pub wallet_daemons: IndexMap<String, DanWalletDaemonProcess>,
+    /// Used for all one-sided coinbase payments
+    pub wallet_private_key: PrivateKey,
+    /// A receiver wallet address that is used for default one-sided coinbase payments
+    pub default_payment_address: TariAddress,
+    pub consensus_manager: ConsensusManager,
     pub fees_enabled: bool,
 }
 
@@ -198,10 +214,23 @@ impl TariWorld {
             break;
         }
     }
+
+    pub async fn script_key_id(&self) -> TariKeyId {
+        use tari_key_manager::key_manager_service::KeyManagerInterface;
+        match self.key_manager.import_key(self.wallet_private_key.clone()).await {
+            Ok(key_id) => key_id,
+            Err(_) => tari_core::transactions::transaction_protocol::sender::KeyId::Imported {
+                key: PublicKey::from_secret_key(&self.wallet_private_key),
+            },
+        }
+    }
 }
 
 impl Default for TariWorld {
     fn default() -> Self {
+        let wallet_private_key = PrivateKey::random(&mut OsRng);
+        let default_payment_address =
+            TariAddress::new(PublicKey::from_secret_key(&wallet_private_key), Network::LocalNet);
         Self {
             base_nodes: IndexMap::new(),
             wallets: IndexMap::new(),
@@ -220,10 +249,13 @@ impl Default for TariWorld {
             addresses: IndexMap::new(),
             num_databases_saved: 0,
             account_keys: IndexMap::new(),
-            key_manager: create_test_core_key_manager_with_memory_db(),
+            key_manager: create_memory_db_key_manager(),
             wallet_keys: IndexMap::new(),
             claim_public_keys: IndexMap::new(),
             wallet_daemons: IndexMap::new(),
+            wallet_private_key,
+            default_payment_address,
+            consensus_manager: ConsensusManager::builder(Network::LocalNet).build().unwrap(),
             fees_enabled: true,
         }
     }
diff --git a/integration_tests/src/miner.rs b/integration_tests/src/miner.rs
index b538c50c9..e1ae0fdf8 100644
--- a/integration_tests/src/miner.rs
+++ b/integration_tests/src/miner.rs
@@ -23,24 +23,26 @@
 use std::time::Duration;
 
 use minotari_app_grpc::{
-    authentication::ClientAuthenticationInterceptor,
-    tari_rpc::{
-        pow_algo::PowAlgos,
-        wallet_client::WalletClient,
-        GetCoinbaseRequest,
-        NewBlockTemplate,
-        NewBlockTemplateRequest,
-        NewBlockTemplateResponse,
-        PowAlgo,
-    },
+    tari_rpc,
+    tari_rpc::{pow_algo::PowAlgos, GetIdentityRequest, NewBlockTemplate, NewBlockTemplateRequest, PowAlgo},
 };
 use minotari_node_grpc_client::BaseNodeGrpcClient;
-use tonic::codegen::InterceptedService;
+use tari_common::configuration::Network;
+use tari_common_types::{tari_address::TariAddress, types::PublicKey};
+use tari_core::{
+    consensus::ConsensusManager,
+    transactions::{
+        generate_coinbase_with_wallet_output,
+        key_manager::{MemoryDbKeyManager, TariKeyId},
+        tari_amount::MicroMinotari,
+        transaction_components::{RangeProofType, WalletOutput},
+    },
+};
+use tari_crypto::tari_utilities::ByteArray;
 
 use crate::TariWorld;
 
 type BaseNodeClient = BaseNodeGrpcClient<tonic::transport::Channel>;
-type WalletGrpcClient = WalletClient<InterceptedService<tonic::transport::Channel, ClientAuthenticationInterceptor>>;
 
 #[derive(Debug)]
 pub struct MinerProcess {
@@ -63,11 +65,21 @@ pub async fn mine_blocks(world: &mut TariWorld, miner_name: String, num_blocks:
     let mut base_client = create_base_node_client(world, &miner_name).await;
     let mut wallet_client = world.get_wallet(&miner.wallet_name).create_client().await;
 
+    let wallet_pk = PublicKey::from_canonical_bytes(
+        &wallet_client
+            .identify(GetIdentityRequest {})
+            .await
+            .unwrap()
+            .into_inner()
+            .public_key,
+    )
+    .unwrap();
+    let payment_address = TariAddress::new(wallet_pk, Network::LocalNet);
+
     for _ in 0..num_blocks {
-        mine_block(&mut base_client, &mut wallet_client).await;
+        mine_block(world, &payment_address, &mut base_client).await;
         // Makes less likely that base layer will fail with
-        // "Chain storage error: You tried to execute an invalid Database operation: UTXO 248a... was already marked as
-        // deleted."
+        // "Sparse Merkle Tree error: A duplicate key was found when trying to insert"
         tokio::time::sleep(Duration::from_millis(100)).await;
     }
 }
@@ -80,8 +92,17 @@ async fn create_base_node_client(world: &TariWorld, miner_name: &String) -> Base
     BaseNodeClient::connect(base_node_grpc_url).await.unwrap()
 }
 
-async fn mine_block(base_client: &mut BaseNodeClient, wallet_client: &mut WalletGrpcClient) {
-    let block_template = create_block_template_with_coinbase(base_client, wallet_client).await;
+async fn mine_block(world: &TariWorld, payment_address: &TariAddress, base_client: &mut BaseNodeClient) {
+    let (block_template, _) = create_block_template_with_coinbase(
+        base_client,
+        0,
+        &world.key_manager,
+        &world.script_key_id().await,
+        payment_address,
+        false,
+        &world.consensus_manager,
+    )
+    .await;
 
     // Ask the base node for a valid block using the template
     let block_result = base_client
@@ -91,7 +112,7 @@ async fn mine_block(base_client: &mut BaseNodeClient, wallet_client: &mut Wallet
         .into_inner();
     let block = block_result.block.unwrap();
 
-    // We don't need to mine, as Localnet blocks have difficulty 1s
+    // We don't need to mine, as Localnet blocks have difficulty target of 1s
     let submit_res = base_client.submit_block(block).await.unwrap().into_inner();
     log::info!(
         "Block {} successfully mined at height {:?}",
@@ -99,53 +120,57 @@ async fn mine_block(base_client: &mut BaseNodeClient, wallet_client: &mut Wallet
         block_template.header.unwrap().height
     );
 }
-
 async fn create_block_template_with_coinbase(
     base_client: &mut BaseNodeClient,
-    wallet_client: &mut WalletGrpcClient,
-) -> NewBlockTemplate {
+    weight: u64,
+    key_manager: &MemoryDbKeyManager,
+    script_key_id: &TariKeyId,
+    wallet_payment_address: &TariAddress,
+    stealth_payment: bool,
+    consensus_manager: &ConsensusManager,
+) -> (NewBlockTemplate, WalletOutput) {
     // get the block template from the base node
     let template_req = NewBlockTemplateRequest {
         algo: Some(PowAlgo {
             pow_algo: PowAlgos::Sha3x.into(),
         }),
-        max_weight: 0,
+        max_weight: weight,
     };
-    let template_res = base_client
+
+    let template_response = base_client
         .get_new_block_template(template_req)
         .await
         .unwrap()
         .into_inner();
 
-    let NewBlockTemplateResponse {
-        new_block_template: Some(mut template),
-        miner_data: Some(miner_data),
-        ..
-    } = template_res
-    else {
-        panic!("Failed to get block template");
-    };
+    let mut block_template = template_response.new_block_template.clone().unwrap();
 
+    let template = template_response.new_block_template.as_ref().unwrap();
+    let miner_data = template_response.miner_data.as_ref().unwrap();
+    let fee = miner_data.total_fees;
+    let reward = miner_data.reward;
     let height = template.header.as_ref().unwrap().height;
-    let coinbase_res = wallet_client
-        .get_coinbase(GetCoinbaseRequest {
-            reward: miner_data.reward,
-            fee: miner_data.total_fees,
-            height,
-            extra: vec![],
-        })
-        .await
-        .unwrap()
-        .into_inner();
-
-    let mut transaction_body = coinbase_res.transaction.unwrap().body.unwrap();
-    let tx_out = transaction_body.outputs.remove(0);
-    let tx_kernel = transaction_body.kernels.remove(0);
 
     // add the coinbase outputs and kernels to the block template
-    let body = template.body.as_mut().unwrap();
-    body.outputs.push(tx_out);
-    body.kernels.push(tx_kernel);
-
-    template
+    let (_, coinbase_output, coinbase_kernel, coinbase_wallet_output) = generate_coinbase_with_wallet_output(
+        MicroMinotari::from(fee),
+        MicroMinotari::from(reward),
+        height,
+        &[],
+        key_manager,
+        script_key_id,
+        wallet_payment_address,
+        stealth_payment,
+        consensus_manager.consensus_constants(height),
+        RangeProofType::BulletProofPlus,
+    )
+    .await
+    .unwrap();
+    let body = block_template.body.as_mut().unwrap();
+
+    let grpc_output = tari_rpc::TransactionOutput::try_from(coinbase_output).unwrap();
+    body.outputs.push(grpc_output);
+    body.kernels.push(coinbase_kernel.into());
+
+    (block_template, coinbase_wallet_output)
 }
diff --git a/integration_tests/src/wallet.rs b/integration_tests/src/wallet.rs
index 15e1a5284..86c1508f4 100644
--- a/integration_tests/src/wallet.rs
+++ b/integration_tests/src/wallet.rs
@@ -136,6 +136,7 @@ pub async fn spawn_wallet(world: &mut TariWorld, wallet_name: String, base_node_
 
             eprintln!("Using wallet temp_dir: {}", temp_dir.display());
 
+            wallet_config.wallet.set_base_path(temp_dir.clone());
             wallet_config.wallet.network = Network::LocalNet;
             wallet_config.wallet.password = Some("test".into());
             wallet_config.wallet.grpc_enabled = true;
@@ -143,7 +144,11 @@ pub async fn spawn_wallet(world: &mut TariWorld, wallet_name: String, base_node_
                 Some(Multiaddr::from_str(&format!("/ip4/127.0.0.1/tcp/{}", grpc_port)).unwrap());
             wallet_config.wallet.data_dir = temp_dir.join("data/wallet");
             wallet_config.wallet.db_file = temp_dir.join("db/console_wallet.db");
-
+            wallet_config.wallet.contacts_auto_ping_interval = Duration::from_secs(2);
+            wallet_config
+                .wallet
+                .base_node_service_config
+                .base_node_monitor_max_refresh_interval = Duration::from_secs(15);
             wallet_config.wallet.p2p.transport.transport_type = TransportType::Tcp;
             wallet_config.wallet.p2p.transport.tcp.listener_address =
                 Multiaddr::from_str(&format!("/ip4/127.0.0.1/tcp/{}", port)).unwrap();
diff --git a/integration_tests/tests/log4rs/cucumber.yml b/integration_tests/tests/log4rs/cucumber.yml
index 679072e84..4673f99c1 100644
--- a/integration_tests/tests/log4rs/cucumber.yml
+++ b/integration_tests/tests/log4rs/cucumber.yml
@@ -134,22 +134,27 @@ loggers:
     additive: false
 
   # Route log events sent to the "core" logger to the "base_layer" appender
+  key_manager:
+    level: debug
+    appenders:
+      - base_layer
+  # Route log events sent to the "core" logger to the "base_layer" appender
   c:
-    level: info
+    level: debug
     appenders:
       - base_layer
   # Route log events sent to the "wallet" logger to the "base_layer" appender
   wallet:
-    level: info
+    level: debug
     appenders:
       - console_wallet
   # Route log events sent to the "comms" logger to the "network" appender
   comms:
-    level: info
+    level: debug
     appenders:
       - network
   # Route log events sent to the "p2p" logger to the "network" appender
   p2p:
-    level: info
+    level: debug
     appenders:
       - network
diff --git a/integration_tests/tests/steps/wallet.rs b/integration_tests/tests/steps/wallet.rs
index 0c047f37c..69be8a786 100644
--- a/integration_tests/tests/steps/wallet.rs
+++ b/integration_tests/tests/steps/wallet.rs
@@ -4,7 +4,7 @@
 use std::time::Duration;
 
 use cucumber::{given, when};
-use minotari_app_grpc::tari_rpc::GetBalanceRequest;
+use minotari_app_grpc::tari_rpc::{GetBalanceRequest, ValidateRequest};
 use tari_common_types::types::{Commitment, PrivateKey, PublicKey};
 use tari_crypto::{ristretto::RistrettoComSig, tari_utilities::ByteArray};
 use tokio::time::sleep;
@@ -86,6 +86,7 @@ async fn check_balance(world: &mut TariWorld, wallet_name: String, balance: u64,
         _ => panic!("Unknown unit {}", units),
     };
     loop {
+        let _result = client.validate_all_transactions(ValidateRequest {}).await;
         let resp = client.get_balance(GetBalanceRequest {}).await.unwrap().into_inner();
         if resp.available_balance >= balance {
             break;