diff --git a/Directory.Packages.props b/Directory.Packages.props
index 8cd4bf366..04bdb248f 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -23,7 +23,7 @@
     <PackageVersion Include="prometheus-net" Version="8.2.1" />
     <PackageVersion Include="prometheus-net.AspNetCore" Version="8.2.1" />
     <PackageVersion Include="prometheus-net.AspNetCore.HealthChecks" Version="8.2.1" />
-    <PackageVersion Include="RadixDlt.RadixEngineToolkit" Version="2.2.0-dev7" />
+    <PackageVersion Include="RadixDlt.RadixEngineToolkit" Version="2.2.0-dev8" />
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
     <!-- build time dependencies -->
     <PackageVersion Include="coverlet.collector" Version="6.0.1" />
diff --git a/apps/DataAggregator/packages.lock.json b/apps/DataAggregator/packages.lock.json
index 4d62b9c5f..8f6ec903d 100644
--- a/apps/DataAggregator/packages.lock.json
+++ b/apps/DataAggregator/packages.lock.json
@@ -652,7 +652,7 @@
           "Microsoft.Extensions.Http.Polly": "[8.0.2, )",
           "RadixDlt.NetworkGateway.Abstractions": "[1.9.0-develop, )",
           "RadixDlt.NetworkGateway.GatewayApiSdk": "[1.9.0-develop, )",
-          "RadixDlt.RadixEngineToolkit": "[2.2.0-dev7, )"
+          "RadixDlt.RadixEngineToolkit": "[2.2.0-dev8, )"
         }
       },
       "radixdlt.networkgateway.gatewayapisdk": {
@@ -677,7 +677,7 @@
           "RadixDlt.NetworkGateway.Abstractions": "[1.9.0-develop, )",
           "RadixDlt.NetworkGateway.DataAggregator": "[1.9.0-develop, )",
           "RadixDlt.NetworkGateway.GatewayApi": "[1.9.0-develop, )",
-          "RadixDlt.RadixEngineToolkit": "[2.2.0-dev7, )"
+          "RadixDlt.RadixEngineToolkit": "[2.2.0-dev8, )"
         }
       },
       "radixdlt.networkgateway.prometheusintegration": {
@@ -864,9 +864,9 @@
       },
       "RadixDlt.RadixEngineToolkit": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0-dev6, )",
-        "resolved": "2.2.0-dev7",
-        "contentHash": "pelTlaGFYo/c0JZona5Q/XETESOaCZj+OxIog+bOTRBYJ0SAGJGD+MU6XTWP3ijmnbNuk9WCW/Xqp80sobpRIg=="
+        "requested": "[2.2.0-dev7, )",
+        "resolved": "2.2.0-dev8",
+        "contentHash": "jngrwh6yj09Wt8KevTQoVgspZ8g0ydR3dvXpY0mAeQrt2RZ+KeQqRModr8u2NIy/dTBznaCBnq5yEqf5QEW7mg=="
       }
     }
   }
diff --git a/apps/DatabaseMigrations/packages.lock.json b/apps/DatabaseMigrations/packages.lock.json
index 66dc17e16..c4ee12489 100644
--- a/apps/DatabaseMigrations/packages.lock.json
+++ b/apps/DatabaseMigrations/packages.lock.json
@@ -585,7 +585,7 @@
           "Microsoft.Extensions.Http.Polly": "[8.0.2, )",
           "RadixDlt.NetworkGateway.Abstractions": "[1.9.0-develop, )",
           "RadixDlt.NetworkGateway.GatewayApiSdk": "[1.9.0-develop, )",
-          "RadixDlt.RadixEngineToolkit": "[2.2.0-dev7, )"
+          "RadixDlt.RadixEngineToolkit": "[2.2.0-dev8, )"
         }
       },
       "radixdlt.networkgateway.gatewayapisdk": {
@@ -610,7 +610,7 @@
           "RadixDlt.NetworkGateway.Abstractions": "[1.9.0-develop, )",
           "RadixDlt.NetworkGateway.DataAggregator": "[1.9.0-develop, )",
           "RadixDlt.NetworkGateway.GatewayApi": "[1.9.0-develop, )",
-          "RadixDlt.RadixEngineToolkit": "[2.2.0-dev7, )"
+          "RadixDlt.RadixEngineToolkit": "[2.2.0-dev8, )"
         }
       },
       "Dapper": {
@@ -789,9 +789,9 @@
       },
       "RadixDlt.RadixEngineToolkit": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0-dev6, )",
-        "resolved": "2.2.0-dev7",
-        "contentHash": "pelTlaGFYo/c0JZona5Q/XETESOaCZj+OxIog+bOTRBYJ0SAGJGD+MU6XTWP3ijmnbNuk9WCW/Xqp80sobpRIg=="
+        "requested": "[2.2.0-dev7, )",
+        "resolved": "2.2.0-dev8",
+        "contentHash": "jngrwh6yj09Wt8KevTQoVgspZ8g0ydR3dvXpY0mAeQrt2RZ+KeQqRModr8u2NIy/dTBznaCBnq5yEqf5QEW7mg=="
       }
     }
   }
diff --git a/apps/GatewayApi/packages.lock.json b/apps/GatewayApi/packages.lock.json
index 0e4ade645..793193308 100644
--- a/apps/GatewayApi/packages.lock.json
+++ b/apps/GatewayApi/packages.lock.json
@@ -710,7 +710,7 @@
           "Microsoft.Extensions.Http.Polly": "[8.0.2, )",
           "RadixDlt.NetworkGateway.Abstractions": "[1.9.0-develop, )",
           "RadixDlt.NetworkGateway.GatewayApiSdk": "[1.9.0-develop, )",
-          "RadixDlt.RadixEngineToolkit": "[2.2.0-dev7, )"
+          "RadixDlt.RadixEngineToolkit": "[2.2.0-dev8, )"
         }
       },
       "radixdlt.networkgateway.gatewayapisdk": {
@@ -735,7 +735,7 @@
           "RadixDlt.NetworkGateway.Abstractions": "[1.9.0-develop, )",
           "RadixDlt.NetworkGateway.DataAggregator": "[1.9.0-develop, )",
           "RadixDlt.NetworkGateway.GatewayApi": "[1.9.0-develop, )",
-          "RadixDlt.RadixEngineToolkit": "[2.2.0-dev7, )"
+          "RadixDlt.RadixEngineToolkit": "[2.2.0-dev8, )"
         }
       },
       "radixdlt.networkgateway.prometheusintegration": {
@@ -922,9 +922,9 @@
       },
       "RadixDlt.RadixEngineToolkit": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0-dev6, )",
-        "resolved": "2.2.0-dev7",
-        "contentHash": "pelTlaGFYo/c0JZona5Q/XETESOaCZj+OxIog+bOTRBYJ0SAGJGD+MU6XTWP3ijmnbNuk9WCW/Xqp80sobpRIg=="
+        "requested": "[2.2.0-dev7, )",
+        "resolved": "2.2.0-dev8",
+        "contentHash": "jngrwh6yj09Wt8KevTQoVgspZ8g0ydR3dvXpY0mAeQrt2RZ+KeQqRModr8u2NIy/dTBznaCBnq5yEqf5QEW7mg=="
       }
     }
   }
diff --git a/deployment/ci.env b/deployment/ci.env
index 43e787c15..2137566e7 100644
--- a/deployment/ci.env
+++ b/deployment/ci.env
@@ -1,4 +1,4 @@
 # Git commit version of most recent Node compatible with this Network Gateway (only used in CI/CD environments)
-FULLNODE_COMMIT=778a8bccf3c38832fd30e9f877ea15e52a292c0a
-FULLNODE_VERSION=sha-778a8bc
+FULLNODE_COMMIT=ab1926a2d8123dec062f57a4108580b42b6c8b76
+FULLNODE_VERSION=sha-616a186
 POSTGRES_VERSION=15.2.0
diff --git a/src/RadixDlt.NetworkGateway.GatewayApi/packages.lock.json b/src/RadixDlt.NetworkGateway.GatewayApi/packages.lock.json
index fa3082f6e..89608af4c 100644
--- a/src/RadixDlt.NetworkGateway.GatewayApi/packages.lock.json
+++ b/src/RadixDlt.NetworkGateway.GatewayApi/packages.lock.json
@@ -25,9 +25,9 @@
       },
       "RadixDlt.RadixEngineToolkit": {
         "type": "Direct",
-        "requested": "[2.2.0-dev7, )",
-        "resolved": "2.2.0-dev7",
-        "contentHash": "pelTlaGFYo/c0JZona5Q/XETESOaCZj+OxIog+bOTRBYJ0SAGJGD+MU6XTWP3ijmnbNuk9WCW/Xqp80sobpRIg=="
+        "requested": "[2.2.0-dev8, )",
+        "resolved": "2.2.0-dev8",
+        "contentHash": "jngrwh6yj09Wt8KevTQoVgspZ8g0ydR3dvXpY0mAeQrt2RZ+KeQqRModr8u2NIy/dTBznaCBnq5yEqf5QEW7mg=="
       },
       "StyleCop.Analyzers": {
         "type": "Direct",
diff --git a/src/RadixDlt.NetworkGateway.PostgresIntegration/LedgerExtension/ManifestAddressesExtractor.cs b/src/RadixDlt.NetworkGateway.PostgresIntegration/LedgerExtension/ManifestAddressesExtractor.cs
index 0202706c2..fd0236d37 100644
--- a/src/RadixDlt.NetworkGateway.PostgresIntegration/LedgerExtension/ManifestAddressesExtractor.cs
+++ b/src/RadixDlt.NetworkGateway.PostgresIntegration/LedgerExtension/ManifestAddressesExtractor.cs
@@ -106,7 +106,7 @@ public static ManifestAddresses ExtractAddresses(ToolkitModel.TransactionManifes
     {
         var allAddresses = manifest.ExtractAddresses();
 
-        var manifestSummary = manifest.StaticAnalysisAndValidate(networkId);
+        var manifestSummary = manifest.StaticallyAnalyze(networkId);
 
         var presentedProofs = ExtractProofs(manifestSummary.presentedProofs);
         var accountsRequiringAuth = manifestSummary.accountsRequiringAuth.Select(x => (EntityAddress)x.AddressString()).ToList();
@@ -166,7 +166,7 @@ public static ManifestAddresses ExtractAddresses(ToolkitModel.TransactionManifes
     {
         var allAddresses = manifest.ExtractAddresses();
 
-        var manifestSummary = manifest.StaticAnalysisAndValidate(networkId);
+        var manifestSummary = manifest.StaticallyAnalyze(networkId);
 
         var presentedProofs = ExtractProofs(manifestSummary.presentedProofs);
         var accountsRequiringAuth = manifestSummary.accountsRequiringAuth.Select(x => (EntityAddress)x.AddressString()).ToList();
diff --git a/src/RadixDlt.NetworkGateway.PostgresIntegration/LedgerExtension/Processors/LedgerTransactionMarkers/ManifestProcessor.cs b/src/RadixDlt.NetworkGateway.PostgresIntegration/LedgerExtension/Processors/LedgerTransactionMarkers/ManifestProcessor.cs
index a4e573f9b..ef0455b6a 100644
--- a/src/RadixDlt.NetworkGateway.PostgresIntegration/LedgerExtension/Processors/LedgerTransactionMarkers/ManifestProcessor.cs
+++ b/src/RadixDlt.NetworkGateway.PostgresIntegration/LedgerExtension/Processors/LedgerTransactionMarkers/ManifestProcessor.cs
@@ -159,7 +159,7 @@ public LedgerTransactionManifestClass[] GetManifestClasses(long stateVersion)
 
     private void AnalyzeManifestClasses(ToolkitModel.TransactionManifestV1 toolkitManifest, long stateVersion)
     {
-        var manifestSummary = toolkitManifest.StaticAnalysisAndValidate(_networkConfiguration.Id);
+        var manifestSummary = toolkitManifest.StaticallyAnalyze(_networkConfiguration.Id);
 
         foreach (var manifestClass in manifestSummary.classification)
         {
@@ -174,7 +174,7 @@ private void AnalyzeManifestClasses(ToolkitModel.TransactionManifestV1 toolkitMa
     // TODO PP: that's ugly duplication, consider refactoring that.
     private void AnalyzeManifestClasses(ToolkitModel.TransactionManifestV2 toolkitManifest, long stateVersion)
     {
-        var manifestSummary = toolkitManifest.StaticAnalysisAndValidate(_networkConfiguration.Id);
+        var manifestSummary = toolkitManifest.StaticallyAnalyze(_networkConfiguration.Id);
 
         foreach (var manifestClass in manifestSummary.classification)
         {
diff --git a/src/RadixDlt.NetworkGateway.PostgresIntegration/packages.lock.json b/src/RadixDlt.NetworkGateway.PostgresIntegration/packages.lock.json
index c55c4cccf..d48cbbff5 100644
--- a/src/RadixDlt.NetworkGateway.PostgresIntegration/packages.lock.json
+++ b/src/RadixDlt.NetworkGateway.PostgresIntegration/packages.lock.json
@@ -74,9 +74,9 @@
       },
       "RadixDlt.RadixEngineToolkit": {
         "type": "Direct",
-        "requested": "[2.2.0-dev7, )",
-        "resolved": "2.2.0-dev7",
-        "contentHash": "pelTlaGFYo/c0JZona5Q/XETESOaCZj+OxIog+bOTRBYJ0SAGJGD+MU6XTWP3ijmnbNuk9WCW/Xqp80sobpRIg=="
+        "requested": "[2.2.0-dev8, )",
+        "resolved": "2.2.0-dev8",
+        "contentHash": "jngrwh6yj09Wt8KevTQoVgspZ8g0ydR3dvXpY0mAeQrt2RZ+KeQqRModr8u2NIy/dTBznaCBnq5yEqf5QEW7mg=="
       },
       "StyleCop.Analyzers": {
         "type": "Direct",
@@ -661,7 +661,7 @@
           "Microsoft.Extensions.Http.Polly": "[8.0.2, )",
           "RadixDlt.NetworkGateway.Abstractions": "[1.9.0-develop, )",
           "RadixDlt.NetworkGateway.GatewayApiSdk": "[1.9.0-develop, )",
-          "RadixDlt.RadixEngineToolkit": "[2.2.0-dev7, )"
+          "RadixDlt.RadixEngineToolkit": "[2.2.0-dev8, )"
         }
       },
       "radixdlt.networkgateway.gatewayapisdk": {
diff --git a/src/RadixDlt.NetworkGateway.PrometheusIntegration/packages.lock.json b/src/RadixDlt.NetworkGateway.PrometheusIntegration/packages.lock.json
index 36354bd8d..7244fe635 100644
--- a/src/RadixDlt.NetworkGateway.PrometheusIntegration/packages.lock.json
+++ b/src/RadixDlt.NetworkGateway.PrometheusIntegration/packages.lock.json
@@ -383,7 +383,7 @@
           "Microsoft.Extensions.Http.Polly": "[8.0.2, )",
           "RadixDlt.NetworkGateway.Abstractions": "[1.9.0-develop, )",
           "RadixDlt.NetworkGateway.GatewayApiSdk": "[1.9.0-develop, )",
-          "RadixDlt.RadixEngineToolkit": "[2.2.0-dev7, )"
+          "RadixDlt.RadixEngineToolkit": "[2.2.0-dev8, )"
         }
       },
       "radixdlt.networkgateway.gatewayapisdk": {
@@ -507,9 +507,9 @@
       },
       "RadixDlt.RadixEngineToolkit": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0-dev6, )",
-        "resolved": "2.2.0-dev7",
-        "contentHash": "pelTlaGFYo/c0JZona5Q/XETESOaCZj+OxIog+bOTRBYJ0SAGJGD+MU6XTWP3ijmnbNuk9WCW/Xqp80sobpRIg=="
+        "requested": "[2.2.0-dev7, )",
+        "resolved": "2.2.0-dev8",
+        "contentHash": "jngrwh6yj09Wt8KevTQoVgspZ8g0ydR3dvXpY0mAeQrt2RZ+KeQqRModr8u2NIy/dTBznaCBnq5yEqf5QEW7mg=="
       }
     }
   }
diff --git a/tests/RadixDlt.NetworkGateway.UnitTests/packages.lock.json b/tests/RadixDlt.NetworkGateway.UnitTests/packages.lock.json
index 2a21378a9..65a5d5fc3 100644
--- a/tests/RadixDlt.NetworkGateway.UnitTests/packages.lock.json
+++ b/tests/RadixDlt.NetworkGateway.UnitTests/packages.lock.json
@@ -719,7 +719,7 @@
           "Microsoft.Extensions.Http.Polly": "[8.0.2, )",
           "RadixDlt.NetworkGateway.Abstractions": "[1.9.0-develop, )",
           "RadixDlt.NetworkGateway.GatewayApiSdk": "[1.9.0-develop, )",
-          "RadixDlt.RadixEngineToolkit": "[2.2.0-dev7, )"
+          "RadixDlt.RadixEngineToolkit": "[2.2.0-dev8, )"
         }
       },
       "radixdlt.networkgateway.gatewayapisdk": {
@@ -744,7 +744,7 @@
           "RadixDlt.NetworkGateway.Abstractions": "[1.9.0-develop, )",
           "RadixDlt.NetworkGateway.DataAggregator": "[1.9.0-develop, )",
           "RadixDlt.NetworkGateway.GatewayApi": "[1.9.0-develop, )",
-          "RadixDlt.RadixEngineToolkit": "[2.2.0-dev7, )"
+          "RadixDlt.RadixEngineToolkit": "[2.2.0-dev8, )"
         }
       },
       "Dapper": {
@@ -923,9 +923,9 @@
       },
       "RadixDlt.RadixEngineToolkit": {
         "type": "CentralTransitive",
-        "requested": "[2.2.0-dev6, )",
-        "resolved": "2.2.0-dev7",
-        "contentHash": "pelTlaGFYo/c0JZona5Q/XETESOaCZj+OxIog+bOTRBYJ0SAGJGD+MU6XTWP3ijmnbNuk9WCW/Xqp80sobpRIg=="
+        "requested": "[2.2.0-dev7, )",
+        "resolved": "2.2.0-dev8",
+        "contentHash": "jngrwh6yj09Wt8KevTQoVgspZ8g0ydR3dvXpY0mAeQrt2RZ+KeQqRModr8u2NIy/dTBznaCBnq5yEqf5QEW7mg=="
       }
     }
   }