diff --git a/generator/Cargo.lock b/generator/Cargo.lock
index cfff5054..a5eef0b9 100644
--- a/generator/Cargo.lock
+++ b/generator/Cargo.lock
@@ -1176,7 +1176,7 @@ dependencies = [
 [[package]]
 name = "native-sdk"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "radix-engine-common",
  "radix-engine-derive",
@@ -1394,7 +1394,7 @@ dependencies = [
 [[package]]
 name = "radix-engine"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bitflags 1.3.2",
  "colored",
@@ -1424,7 +1424,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-common"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bech32",
  "blake2",
@@ -1445,7 +1445,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-derive"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1456,7 +1456,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-interface"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bitflags 1.3.2",
  "const-sha1",
@@ -1476,7 +1476,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-macros"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1486,7 +1486,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-profiling"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "fixedstr",
 ]
@@ -1494,7 +1494,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-queries"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "hex",
  "itertools",
@@ -1510,7 +1510,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-store-interface"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "hex",
  "itertools",
@@ -1524,7 +1524,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-stores"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "hex",
  "itertools",
@@ -1725,7 +1725,7 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
 [[package]]
 name = "resources-tracker-macro"
 version = "0.1.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1894,7 +1894,7 @@ dependencies = [
 [[package]]
 name = "sbor"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "const-sha1",
  "hex",
@@ -1908,7 +1908,7 @@ dependencies = [
 [[package]]
 name = "sbor-derive"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "proc-macro2",
  "sbor-derive-common",
@@ -1917,7 +1917,7 @@ dependencies = [
 [[package]]
 name = "sbor-derive-common"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "const-sha1",
  "itertools",
@@ -1990,7 +1990,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 [[package]]
 name = "scrypto"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bech32",
  "const-sha1",
@@ -2012,7 +2012,7 @@ dependencies = [
 [[package]]
 name = "scrypto-derive"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2027,7 +2027,7 @@ dependencies = [
 [[package]]
 name = "scrypto-schema"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bitflags 1.3.2",
  "radix-engine-common",
@@ -2038,7 +2038,7 @@ dependencies = [
 [[package]]
 name = "scrypto-unit"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "radix-engine",
  "radix-engine-interface",
@@ -2587,7 +2587,7 @@ dependencies = [
 [[package]]
 name = "transaction"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bech32",
  "ed25519-dalek",
@@ -2604,7 +2604,7 @@ dependencies = [
 [[package]]
 name = "transaction-scenarios"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "hex",
  "itertools",
@@ -2708,7 +2708,7 @@ checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa"
 [[package]]
 name = "utils"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "indexmap 2.0.0-pre",
  "serde",
diff --git a/generator/Cargo.toml b/generator/Cargo.toml
index 4252d377..138e4610 100644
--- a/generator/Cargo.toml
+++ b/generator/Cargo.toml
@@ -5,15 +5,15 @@ edition = "2021"
 
 [dependencies]
 # radixdlt-scrypto dependencies.
-sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e", features = ["serde"] }
-scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e", features = ["serde"] }
-scrypto-unit = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e" }
-transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e" }
-transaction-scenarios = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e" }
-radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e" }
-radix-engine-stores = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e" }
-radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e", features = ["serde"] }
-radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e" }
+sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", features = ["serde"] }
+scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", features = ["serde"] }
+scrypto-unit = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
+transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
+transaction-scenarios = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
+radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
+radix-engine-stores = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
+radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", features = ["serde"] }
+radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
 
 # Core Radix Engine Toolkit and Toolkit Native Library
 radix-engine-toolkit-core = { path = "../radix-engine-toolkit-core", default-features = false, features = ["moka"]}
diff --git a/radix-engine-toolkit-core/Cargo.lock b/radix-engine-toolkit-core/Cargo.lock
index e2478b6b..a075aa9e 100644
--- a/radix-engine-toolkit-core/Cargo.lock
+++ b/radix-engine-toolkit-core/Cargo.lock
@@ -710,7 +710,7 @@ dependencies = [
 [[package]]
 name = "native-sdk"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "radix-engine-common",
  "radix-engine-derive",
@@ -838,7 +838,7 @@ dependencies = [
 [[package]]
 name = "radix-engine"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bitflags 1.3.2",
  "colored",
@@ -869,7 +869,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-common"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bech32",
  "blake2",
@@ -890,7 +890,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-derive"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -901,7 +901,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-interface"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bitflags 1.3.2",
  "const-sha1",
@@ -921,7 +921,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-macros"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -931,7 +931,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-profiling"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "fixedstr",
 ]
@@ -939,7 +939,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-queries"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "hex",
  "itertools",
@@ -955,7 +955,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-store-interface"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "hex",
  "itertools",
@@ -969,7 +969,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-stores"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "hex",
  "itertools",
@@ -1084,7 +1084,7 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
 [[package]]
 name = "resources-tracker-macro"
 version = "0.1.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1138,7 +1138,7 @@ dependencies = [
 [[package]]
 name = "sbor"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "const-sha1",
  "hex",
@@ -1152,7 +1152,7 @@ dependencies = [
 [[package]]
 name = "sbor-derive"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "proc-macro2",
  "sbor-derive-common",
@@ -1161,7 +1161,7 @@ dependencies = [
 [[package]]
 name = "sbor-derive-common"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "const-sha1",
  "itertools",
@@ -1202,7 +1202,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 [[package]]
 name = "scrypto"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bech32",
  "const-sha1",
@@ -1224,7 +1224,7 @@ dependencies = [
 [[package]]
 name = "scrypto-derive"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1239,7 +1239,7 @@ dependencies = [
 [[package]]
 name = "scrypto-schema"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bitflags 1.3.2",
  "radix-engine-common",
@@ -1250,7 +1250,7 @@ dependencies = [
 [[package]]
 name = "scrypto-unit"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "radix-engine",
  "radix-engine-interface",
@@ -1579,7 +1579,7 @@ dependencies = [
 [[package]]
 name = "transaction"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bech32",
  "ed25519-dalek",
@@ -1629,7 +1629,7 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 [[package]]
 name = "utils"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "indexmap 2.0.0-pre",
  "serde",
diff --git a/radix-engine-toolkit-core/Cargo.toml b/radix-engine-toolkit-core/Cargo.toml
index 7fcef59c..7eb600a5 100644
--- a/radix-engine-toolkit-core/Cargo.toml
+++ b/radix-engine-toolkit-core/Cargo.toml
@@ -6,15 +6,15 @@ build = "build.rs"
 
 [dependencies]
 # radixdlt-scrypto dependencies.
-sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e", features = ["serde"] }
-scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e", features = ["serde"] }
-transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e" }
-radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e", default-features= false, features = ["std"] }
-radix-engine-stores = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e" }
-radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e", features = ["serde"] }
-radix-engine-queries = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e", default-features= false, features = ["std"] }
-radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e" }
-radix-engine-store-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e" }
+sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", features = ["serde"] }
+scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", features = ["serde"] }
+transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
+radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", default-features= false, features = ["std"] }
+radix-engine-stores = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
+radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", features = ["serde"] }
+radix-engine-queries = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", default-features= false, features = ["std"] }
+radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
+radix-engine-store-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
 
 # Bech32 encoding and decoding of addresses. Used for the Olympia <-> Babylon address derivations.
 bech32 = { version = "0.9.1" }
@@ -35,7 +35,7 @@ sbor-json = { path = "../sbor-json" }
 cargo_toml = { version = "0.15.3" }
 
 [dev-dependencies]
-scrypto-unit = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e", default-features = false, features = ["std", "resource_tracker"] }
+scrypto-unit = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", default-features = false, features = ["std", "resource_tracker"] }
 
 [features]
 default = ["moka"]
diff --git a/radix-engine-toolkit-core/src/utils.rs b/radix-engine-toolkit-core/src/utils.rs
index 66b2a6e2..27682b7e 100644
--- a/radix-engine-toolkit-core/src/utils.rs
+++ b/radix-engine-toolkit-core/src/utils.rs
@@ -16,6 +16,7 @@
 // under the License.
 
 use radix_engine::system::system_substates::{KeyValueEntrySubstate, KeyValueEntrySubstateV1};
+use radix_engine::track::{BatchPartitionUpdate, NodeStateUpdates, PartitionStateUpdates};
 use radix_engine_common::prelude::NetworkDefinition;
 use radix_engine_queries::typed_substate_layout::{
     to_typed_substate_key, to_typed_substate_value, NonFungibleResourceManagerDataEntryPayload,
@@ -246,44 +247,52 @@ pub fn metadata_of_newly_created_entities(
         };
 
         let entry = map.entry(global_address).or_default();
-        if let Some(key_update_map) = receipt
+        if let Some(NodeStateUpdates::Delta { by_partition }) = receipt
             .expect_commit_success()
             .state_updates
-            .system_updates
-            .get(&(*global_address.as_node_id(), METADATA_BASE_PARTITION))
+            .by_node
+            .get(global_address.as_node_id())
         {
-            for (substate_key, database_update) in key_update_map.iter() {
-                if let DatabaseUpdate::Set(data) = database_update {
-                    if let Ok((
-                        TypedSubstateKey::MetadataModule(key),
-                        TypedSubstateValue::MetadataModule(value),
-                    )) = to_typed_substate_key(
-                        global_address.as_node_id().entity_type().unwrap(),
-                        METADATA_BASE_PARTITION,
-                        substate_key,
-                    )
-                    .and_then(|typed_substate_key| {
-                        to_typed_substate_value(&typed_substate_key, data)
-                            .map(|typed_substate_value| (typed_substate_key, typed_substate_value))
-                    }) {
-                        let TypedMetadataModuleSubstateKey::MetadataEntryKey(key) = key;
-                        let value = match value {
-                            TypedMetadataModuleSubstateValue::MetadataEntry(
-                                KeyValueEntrySubstate::V1(KeyValueEntrySubstateV1 {
-                                    value, ..
-                                }),
-                            ) => value,
-                        };
-                        entry.insert(
-                            key,
-                            value.map(|metadata_entry| {
-                                let VersionedMetadataEntry::V1(metadata) = metadata_entry.content;
-                                metadata
-                            }),
-                        );
-                    }
-                } else {
-                    continue;
+            let entries = match by_partition.get(&METADATA_BASE_PARTITION) {
+                Some(PartitionStateUpdates::Delta { by_substate }) => by_substate
+                    .iter()
+                    .filter_map(|(key, value)| match value {
+                        DatabaseUpdate::Set(value) => Some((key.clone(), value.clone())),
+                        DatabaseUpdate::Delete => None,
+                    })
+                    .collect::<IndexMap<_, _>>(),
+                Some(PartitionStateUpdates::Batch(BatchPartitionUpdate::Reset {
+                    new_substate_values,
+                })) => new_substate_values.clone(),
+                None => continue,
+            };
+
+            for (substate_key, data) in entries.into_iter() {
+                if let Ok((
+                    TypedSubstateKey::MetadataModule(key),
+                    TypedSubstateValue::MetadataModule(value),
+                )) = to_typed_substate_key(
+                    global_address.as_node_id().entity_type().unwrap(),
+                    METADATA_BASE_PARTITION,
+                    &substate_key,
+                )
+                .and_then(|typed_substate_key| {
+                    to_typed_substate_value(&typed_substate_key, &data)
+                        .map(|typed_substate_value| (typed_substate_key, typed_substate_value))
+                }) {
+                    let TypedMetadataModuleSubstateKey::MetadataEntryKey(key) = key;
+                    let value = match value {
+                        TypedMetadataModuleSubstateValue::MetadataEntry(
+                            KeyValueEntrySubstate::V1(KeyValueEntrySubstateV1 { value, .. }),
+                        ) => value,
+                    };
+                    entry.insert(
+                        key,
+                        value.map(|metadata_entry| {
+                            let VersionedMetadataEntry::V1(metadata) = metadata_entry.content;
+                            metadata
+                        }),
+                    );
                 }
             }
         }
@@ -321,67 +330,99 @@ pub fn data_of_newly_minted_non_fungibles(
 ) -> HashMap<ResourceAddress, HashMap<NonFungibleLocalId, ScryptoValue>> {
     let mut map = HashMap::<ResourceAddress, HashMap<NonFungibleLocalId, ScryptoValue>>::new();
     let commit_result = receipt.expect_commit_success();
-    for ((node_id, partition_number), database_update_map) in
-        commit_result.state_updates.system_updates.iter()
-    {
-        // Only care about non-fungible resource manager nodes, ignore everything else
+
+    for (node_id, node_state_update) in commit_result.state_updates.by_node.iter() {
         if !node_id.entity_type().map_or(false, |entity_type| {
             entity_type.is_global_non_fungible_resource_manager()
         }) {
             continue;
         }
 
-        for (substate_key, database_update) in database_update_map {
-            if let DatabaseUpdate::Set(data) = database_update {
-                if let Ok((
-                    TypedSubstateKey::MainModule(
-                        TypedMainModuleSubstateKey::NonFungibleResourceManager(
-                            NonFungibleResourceManagerTypedSubstateKey::DataKeyValueEntry(
-                                NonFungibleResourceManagerDataKeyPayload {
-                                    content: non_fungible_local_id,
-                                },
-                            ),
+        let NodeStateUpdates::Delta { by_partition } = node_state_update;
+
+        let entries: IndexMap<(PartitionNumber, SubstateKey), Vec<u8>> = by_partition
+            .iter()
+            .flat_map(
+                |(partition_number, partition_state_update)| match partition_state_update {
+                    PartitionStateUpdates::Delta { by_substate } => by_substate
+                        .iter()
+                        .filter_map(|(key, value)| match value {
+                            DatabaseUpdate::Set(value) => {
+                                Some(((*partition_number, key.clone()), value.clone()))
+                            }
+                            DatabaseUpdate::Delete => None,
+                        })
+                        .collect::<IndexMap<(PartitionNumber, SubstateKey), Vec<u8>>>(),
+                    PartitionStateUpdates::Batch(BatchPartitionUpdate::Reset {
+                        new_substate_values,
+                    }) => new_substate_values
+                        .iter()
+                        .map(|(substate_key, data)| {
+                            ((*partition_number, substate_key.clone()), data.clone())
+                        })
+                        .collect(),
+                },
+            )
+            .collect();
+
+        for ((partition_number, substate_key), data) in entries {
+            if let Ok((
+                TypedSubstateKey::MainModule(
+                    TypedMainModuleSubstateKey::NonFungibleResourceManager(
+                        NonFungibleResourceManagerTypedSubstateKey::DataKeyValueEntry(
+                            NonFungibleResourceManagerDataKeyPayload {
+                                content: non_fungible_local_id,
+                            },
                         ),
                     ),
-                    TypedSubstateValue::MainModule(
-                        TypedMainModuleSubstateValue::NonFungibleResourceManager(
-                            NonFungibleResourceManagerTypedSubstateValue::DataKeyValue(
-                                NonFungibleResourceManagerDataEntrySubstate::V1(
-                                    KeyValueEntrySubstateV1 {
-                                        value:
-                                            Some(NonFungibleResourceManagerDataEntryPayload {
-                                                content: non_fungible_data,
-                                            }),
-                                        ..
-                                    },
-                                ),
+                ),
+                TypedSubstateValue::MainModule(
+                    TypedMainModuleSubstateValue::NonFungibleResourceManager(
+                        NonFungibleResourceManagerTypedSubstateValue::DataKeyValue(
+                            NonFungibleResourceManagerDataEntrySubstate::V1(
+                                KeyValueEntrySubstateV1 {
+                                    value:
+                                        Some(NonFungibleResourceManagerDataEntryPayload {
+                                            content: non_fungible_data,
+                                        }),
+                                    ..
+                                },
                             ),
                         ),
                     ),
-                )) = to_typed_substate_key(
-                    node_id.entity_type().unwrap(),
-                    *partition_number,
-                    substate_key,
-                )
-                .and_then(|typed_substate_key| {
-                    to_typed_substate_value(&typed_substate_key, data)
-                        .map(|typed_substate_value| (typed_substate_key, typed_substate_value))
-                }) {
-                    let resource_address = ResourceAddress::new_or_panic(node_id.0);
-                    let non_fungible_local_id = non_fungible_local_id;
-                    let non_fungible_data = scrypto_decode::<ScryptoValue>(
-                        &scrypto_encode(&non_fungible_data).unwrap(),
-                    )
-                    .unwrap();
+                ),
+            )) = to_typed_substate_key(
+                node_id.entity_type().unwrap(),
+                partition_number,
+                &substate_key,
+            )
+            .and_then(|typed_substate_key| {
+                to_typed_substate_value(&typed_substate_key, &data)
+                    .map(|typed_substate_value| (typed_substate_key, typed_substate_value))
+            }) {
+                let resource_address = ResourceAddress::new_or_panic(node_id.0);
+                let non_fungible_local_id = non_fungible_local_id;
+                let non_fungible_data =
+                    scrypto_decode::<ScryptoValue>(&scrypto_encode(&non_fungible_data).unwrap())
+                        .unwrap();
 
-                    map.entry(resource_address)
-                        .or_default()
-                        .insert(non_fungible_local_id, non_fungible_data);
-                }
-            } else {
-                continue;
+                map.entry(resource_address)
+                    .or_default()
+                    .insert(non_fungible_local_id, non_fungible_data);
             }
         }
     }
+
+    // for ((node_id, partition_number), database_update_map) in
+    //     commit_result.state_updates.by_node.iter()
+    // {
+    //     // Only care about non-fungible resource manager nodes, ignore everything else
+    //     if !node_id.entity_type().map_or(false, |entity_type| {
+    //         entity_type.is_global_non_fungible_resource_manager()
+    //     }) {
+    //         continue;
+    //     }
+
+    // }
     map
 }
diff --git a/radix-engine-toolkit-core/tests/utils.rs b/radix-engine-toolkit-core/tests/utils.rs
index 5a564952..a8ea5497 100644
--- a/radix-engine-toolkit-core/tests/utils.rs
+++ b/radix-engine-toolkit-core/tests/utils.rs
@@ -15,19 +15,16 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use radix_engine::system::bootstrap::{Bootstrapper, GenesisReceipts};
-use radix_engine::transaction::{
-    CommitResult, TransactionReceipt, TransactionResult, VersionedTransactionReceipt,
-};
+use radix_engine::system::bootstrap::*;
+use radix_engine::transaction::*;
 use radix_engine::types::*;
-use radix_engine::vm::wasm::{DefaultWasmEngine, WasmValidatorConfigV1};
-use radix_engine::vm::{DefaultNativeVm, ScryptoVm, Vm};
-use radix_engine_interface::metadata_init;
-use radix_engine_stores::memory_db::InMemorySubstateDatabase;
-use radix_engine_toolkit_core::functions::execution::ExecutionAnalysisTransactionReceipt;
-use radix_engine_toolkit_core::functions::utils::decode_transaction_id;
-use scrypto::api::node_modules::metadata::MetadataValue;
-use scrypto::prelude::ModuleConfig;
+use radix_engine::vm::wasm::*;
+use radix_engine::vm::*;
+use radix_engine_interface::*;
+use radix_engine_stores::memory_db::*;
+use radix_engine_toolkit_core::functions::execution::*;
+use radix_engine_toolkit_core::functions::utils::*;
+use scrypto::prelude::*;
 use scrypto::*;
 use scrypto_unit::*;
 use transaction::prelude::*;
@@ -166,7 +163,7 @@ fn able_to_extract_metadata_of_new_entities_in_genesis() {
         wasm_validator_config: WasmValidatorConfigV1::new(),
     };
     let native_vm = DefaultNativeVm::new();
-    let vm = Vm::new(&scrypto_vm, native_vm.clone());
+    let vm = Vm::new(&scrypto_vm, native_vm);
     let mut substate_db = InMemorySubstateDatabase::standard();
     let mut bootstrapper =
         Bootstrapper::new(NetworkDefinition::simulator(), &mut substate_db, vm, false);
diff --git a/radix-engine-toolkit-uniffi/Cargo.lock b/radix-engine-toolkit-uniffi/Cargo.lock
index 577358e2..9eee91b9 100644
--- a/radix-engine-toolkit-uniffi/Cargo.lock
+++ b/radix-engine-toolkit-uniffi/Cargo.lock
@@ -909,7 +909,7 @@ dependencies = [
 [[package]]
 name = "native-sdk"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "radix-engine-common",
  "radix-engine-derive",
@@ -1053,7 +1053,7 @@ dependencies = [
 [[package]]
 name = "radix-engine"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bitflags 1.3.2",
  "colored",
@@ -1083,7 +1083,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-common"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bech32",
  "blake2",
@@ -1104,7 +1104,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-derive"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1115,7 +1115,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-interface"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bitflags 1.3.2",
  "const-sha1",
@@ -1135,7 +1135,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-macros"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1145,7 +1145,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-profiling"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "fixedstr",
 ]
@@ -1153,7 +1153,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-queries"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "hex",
  "itertools",
@@ -1169,7 +1169,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-store-interface"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "hex",
  "itertools",
@@ -1183,7 +1183,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-stores"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "hex",
  "itertools",
@@ -1318,7 +1318,7 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
 [[package]]
 name = "resources-tracker-macro"
 version = "0.1.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1372,7 +1372,7 @@ dependencies = [
 [[package]]
 name = "sbor"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "const-sha1",
  "hex",
@@ -1386,7 +1386,7 @@ dependencies = [
 [[package]]
 name = "sbor-derive"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "proc-macro2",
  "sbor-derive-common",
@@ -1395,7 +1395,7 @@ dependencies = [
 [[package]]
 name = "sbor-derive-common"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "const-sha1",
  "itertools",
@@ -1456,7 +1456,7 @@ dependencies = [
 [[package]]
 name = "scrypto"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bech32",
  "const-sha1",
@@ -1478,7 +1478,7 @@ dependencies = [
 [[package]]
 name = "scrypto-derive"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1493,7 +1493,7 @@ dependencies = [
 [[package]]
 name = "scrypto-schema"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bitflags 1.3.2",
  "radix-engine-common",
@@ -1504,7 +1504,7 @@ dependencies = [
 [[package]]
 name = "scrypto-unit"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "radix-engine",
  "radix-engine-interface",
@@ -1854,7 +1854,7 @@ dependencies = [
 [[package]]
 name = "transaction"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bech32",
  "ed25519-dalek",
@@ -1871,7 +1871,7 @@ dependencies = [
 [[package]]
 name = "transaction-scenarios"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "hex",
  "itertools",
@@ -2055,7 +2055,7 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 [[package]]
 name = "utils"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "indexmap 2.0.0-pre",
  "serde",
diff --git a/radix-engine-toolkit-uniffi/Cargo.toml b/radix-engine-toolkit-uniffi/Cargo.toml
index a13b25fa..9fe23a03 100644
--- a/radix-engine-toolkit-uniffi/Cargo.toml
+++ b/radix-engine-toolkit-uniffi/Cargo.toml
@@ -6,13 +6,13 @@ build = "build.rs"
 
 [dependencies]
 # radixdlt-scrypto dependencies.
-sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e", features = ["serde"] }
-scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e", features = ["serde"] }
-transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e" }
-radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e", default-features= false, features = ["std", "moka"] }
-radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e", features = ["serde"] }
-radix-engine-queries = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e", default-features = false, features = ["std", "moka"] }
-radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e" }
+sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", features = ["serde"] }
+scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", features = ["serde"] }
+transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
+radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", default-features= false, features = ["std", "moka"] }
+radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", features = ["serde"] }
+radix-engine-queries = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", default-features = false, features = ["std", "moka"] }
+radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
 
 # Core Radix Engine Toolkit
 radix-engine-toolkit-core = { path = "../radix-engine-toolkit-core" }
@@ -30,9 +30,9 @@ uniffi = { git = "https://github.com/mozilla/uniffi-rs/", rev = "7b18fa787336aa7
 [dev-dependencies]
 # The UniFFI crate for generating bindings to other languages
 uniffi = { git = "https://github.com/mozilla/uniffi-rs/", rev = "7b18fa787336aa738f205a44f7b2df728e83a097", features = ["bindgen-tests"] }
-scrypto-unit = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e", default-features = false, features = ["std", "moka"] }
-radix-engine-stores = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e" }
-transaction-scenarios = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e" }
+scrypto-unit = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", default-features = false, features = ["std", "moka"] }
+radix-engine-stores = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
+transaction-scenarios = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
 
 [lib]
 crate-type = ["staticlib", "cdylib", "lib"]
diff --git a/radix-engine-toolkit/Cargo.lock b/radix-engine-toolkit/Cargo.lock
index 74932b12..e48c85fb 100644
--- a/radix-engine-toolkit/Cargo.lock
+++ b/radix-engine-toolkit/Cargo.lock
@@ -747,7 +747,7 @@ dependencies = [
 [[package]]
 name = "native-sdk"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "radix-engine-common",
  "radix-engine-derive",
@@ -875,7 +875,7 @@ dependencies = [
 [[package]]
 name = "radix-engine"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bitflags 1.3.2",
  "colored",
@@ -906,7 +906,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-common"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bech32",
  "blake2",
@@ -927,7 +927,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-derive"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -938,7 +938,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-interface"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bitflags 1.3.2",
  "const-sha1",
@@ -958,7 +958,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-macros"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -968,7 +968,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-profiling"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "fixedstr",
 ]
@@ -976,7 +976,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-queries"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "hex",
  "itertools",
@@ -992,7 +992,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-store-interface"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "hex",
  "itertools",
@@ -1006,7 +1006,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-stores"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "hex",
  "itertools",
@@ -1142,7 +1142,7 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
 [[package]]
 name = "resources-tracker-macro"
 version = "0.1.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1196,7 +1196,7 @@ dependencies = [
 [[package]]
 name = "sbor"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "const-sha1",
  "hex",
@@ -1210,7 +1210,7 @@ dependencies = [
 [[package]]
 name = "sbor-derive"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "proc-macro2",
  "sbor-derive-common",
@@ -1219,7 +1219,7 @@ dependencies = [
 [[package]]
 name = "sbor-derive-common"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "const-sha1",
  "itertools",
@@ -1285,7 +1285,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 [[package]]
 name = "scrypto"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bech32",
  "const-sha1",
@@ -1307,7 +1307,7 @@ dependencies = [
 [[package]]
 name = "scrypto-derive"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1322,7 +1322,7 @@ dependencies = [
 [[package]]
 name = "scrypto-schema"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bitflags 1.3.2",
  "radix-engine-common",
@@ -1654,7 +1654,7 @@ dependencies = [
 [[package]]
 name = "transaction"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bech32",
  "ed25519-dalek",
@@ -1726,7 +1726,7 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 [[package]]
 name = "utils"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "indexmap 2.0.0-pre",
  "serde",
diff --git a/radix-engine-toolkit/Cargo.toml b/radix-engine-toolkit/Cargo.toml
index 0672ceb6..389e66da 100644
--- a/radix-engine-toolkit/Cargo.toml
+++ b/radix-engine-toolkit/Cargo.toml
@@ -5,11 +5,11 @@ edition = "2021"
 
 [dependencies]
 # radixdlt-scrypto dependencies.
-sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e", features = ["serde"] }
-scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e", features = ["serde"] }
-transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e" }
-radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e", default-features= false, features = ["std"] }
-radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e", features = ["serde"] }
+sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", features = ["serde"] }
+scrypto = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", features = ["serde"] }
+transaction = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
+radix-engine = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", default-features= false, features = ["std"] }
+radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", features = ["serde"] }
 
 # Core Radix Engine Toolkit
 radix-engine-toolkit-core = { path = "../radix-engine-toolkit-core", default-features = false }
diff --git a/sbor-json/Cargo.lock b/sbor-json/Cargo.lock
index 5c6ef14a..34c726f3 100644
--- a/sbor-json/Cargo.lock
+++ b/sbor-json/Cargo.lock
@@ -420,7 +420,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-common"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bech32",
  "blake2",
@@ -441,7 +441,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-derive"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -452,7 +452,7 @@ dependencies = [
 [[package]]
 name = "radix-engine-interface"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bitflags",
  "const-sha1",
@@ -513,7 +513,7 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 [[package]]
 name = "sbor"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "const-sha1",
  "hex",
@@ -527,7 +527,7 @@ dependencies = [
 [[package]]
 name = "sbor-derive"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "proc-macro2",
  "sbor-derive-common",
@@ -536,7 +536,7 @@ dependencies = [
 [[package]]
 name = "sbor-derive-common"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "const-sha1",
  "itertools",
@@ -562,7 +562,7 @@ dependencies = [
 [[package]]
 name = "scrypto-schema"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "bitflags",
  "radix-engine-common",
@@ -746,7 +746,7 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 [[package]]
 name = "utils"
 version = "0.13.0"
-source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d414dad35e#d414dad35e3aa62a3f3e015f2a467211346ea1f0"
+source = "git+https://github.com/radixdlt/radixdlt-scrypto?tag=rcnet-v3.1-d8dbe49f#d8dbe49f243c8ff5e6f47fe014d28a20e5d70ce6"
 dependencies = [
  "indexmap 2.0.0-pre",
  "serde",
diff --git a/sbor-json/Cargo.toml b/sbor-json/Cargo.toml
index 26af2719..d3749e91 100644
--- a/sbor-json/Cargo.toml
+++ b/sbor-json/Cargo.toml
@@ -6,9 +6,9 @@ description = "The implementation of the SBOR JSON representations"
 
 [dependencies]
 # The Scrypto dependencies needed.
-sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e", features = ["serde"] }
-radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e", features = ["serde"] }
-radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d414dad35e" }
+sbor = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", features = ["serde"] }
+radix-engine-common = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f", features = ["serde"] }
+radix-engine-interface = { git = "https://github.com/radixdlt/radixdlt-scrypto", tag = "rcnet-v3.1-d8dbe49f" }
 
 # The serde dependenices used for the serialization and deserialization of the JSON representations.
 serde = { version = "1.0.185", features = ["derive"] }