From 97eb0411d3ec31d8037ca5923c73fbb95c11eeb1 Mon Sep 17 00:00:00 2001
From: Lukasz Rubaszewski <117115317+lrubasze@users.noreply.github.com>
Date: Mon, 28 Oct 2024 23:36:08 +0100
Subject: [PATCH] Update scenarios for cuttlefish

---
 .../001--access-controller-v2-instantiate.txt | 12 +++++------
 ...-access-controller-v2-deposit-fees-xrd.txt | 12 +++++------
 .../001--access-controller-v2-instantiate.txt | 20 +++++++++----------
 ...-access-controller-v2-deposit-fees-xrd.txt | 20 +++++++++----------
 ...ess-controller-v2-lock-fee-and-recover.txt |  4 ++--
 .../access-controller-v2/scenario_summary.txt |  4 ++--
 ...thorized-depositors-configure-accounts.txt |  8 ++++----
 ...zed-depositors-attempt-deposit-success.txt | 10 +++++-----
 ...eposit-failure-if-badge-is-not-present.txt | 12 +++++------
 ...f-badge-is-not-an-authorized-depositor.txt | 14 ++++++-------
 ...thorized-depositors-configure-accounts.txt | 20 +++++++++----------
 ...zed-depositors-attempt-deposit-success.txt | 20 +++++++++----------
 ...eposit-failure-if-badge-is-not-present.txt | 20 +++++++++----------
 ...f-badge-is-not-an-authorized-depositor.txt | 20 +++++++++----------
 .../scenario_summary.txt                      |  4 ++--
 .../001--account-locker-create-accounts.txt   | 10 +++++-----
 ...--account-locker-create-account-locker.txt |  8 ++++----
 .../003--account-locker-create-resources.txt  |  8 ++++----
 ...ocker-setting-up-account-deposit-rules.txt |  8 ++++----
 ...gibles-and-try-direct-deposit-succeeds.txt | 10 +++++-----
 ...ngibles-and-try-direct-deposit-refunds.txt |  8 ++++----
 ...-fungibles-and-dont-try-direct-deposit.txt | 12 +++++------
 ...rdrop-fungibles-and-try-direct-deposit.txt |  8 ++++----
 ...-fungibles-and-dont-try-direct-deposit.txt |  8 ++++----
 ...gibles-and-try-direct-deposit-succeeds.txt | 10 +++++-----
 ...ngibles-and-try-direct-deposit-refunds.txt | 10 +++++-----
 ...-fungibles-and-dont-try-direct-deposit.txt | 10 +++++-----
 ...ibles-by-amount-and-try-direct-deposit.txt |  8 ++++----
 ...-by-amount-and-dont-try-direct-deposit.txt |  8 ++++----
 ...ungibles-by-ids-and-try-direct-deposit.txt | 12 +++++------
 ...les-by-ids-and-dont-try-direct-deposit.txt |  8 ++++----
 ...aller-badge-is-an-authorized-depositor.txt | 10 +++++-----
 ...count-locker-claim-fungibles-by-amount.txt |  8 ++++----
 ...t-locker-claim-non-fungibles-by-amount.txt | 12 +++++------
 ...ount-locker-claim-non-fungibles-by-ids.txt | 12 +++++------
 ...unt-locker-recover-fungibles-by-amount.txt | 10 +++++-----
 ...locker-recover-non-fungibles-by-amount.txt |  8 ++++----
 ...nt-locker-recover-non-fungibles-by-ids.txt |  8 ++++----
 .../001--account-locker-create-accounts.txt   | 20 +++++++++----------
 ...--account-locker-create-account-locker.txt | 20 +++++++++----------
 .../003--account-locker-create-resources.txt  | 20 +++++++++----------
 ...ocker-setting-up-account-deposit-rules.txt | 20 +++++++++----------
 ...gibles-and-try-direct-deposit-succeeds.txt | 20 +++++++++----------
 ...ngibles-and-try-direct-deposit-refunds.txt | 20 +++++++++----------
 ...-fungibles-and-dont-try-direct-deposit.txt | 20 +++++++++----------
 ...rdrop-fungibles-and-try-direct-deposit.txt | 20 +++++++++----------
 ...-fungibles-and-dont-try-direct-deposit.txt | 20 +++++++++----------
 ...gibles-and-try-direct-deposit-succeeds.txt | 20 +++++++++----------
 ...ngibles-and-try-direct-deposit-refunds.txt | 20 +++++++++----------
 ...-fungibles-and-dont-try-direct-deposit.txt | 20 +++++++++----------
 ...ibles-by-amount-and-try-direct-deposit.txt | 20 +++++++++----------
 ...-by-amount-and-dont-try-direct-deposit.txt | 20 +++++++++----------
 ...ungibles-by-ids-and-try-direct-deposit.txt | 20 +++++++++----------
 ...les-by-ids-and-dont-try-direct-deposit.txt | 20 +++++++++----------
 ...aller-badge-is-an-authorized-depositor.txt | 20 +++++++++----------
 ...count-locker-claim-fungibles-by-amount.txt | 20 +++++++++----------
 ...t-locker-claim-non-fungibles-by-amount.txt | 20 +++++++++----------
 ...ount-locker-claim-non-fungibles-by-ids.txt | 20 +++++++++----------
 ...unt-locker-recover-fungibles-by-amount.txt | 20 +++++++++----------
 ...locker-recover-non-fungibles-by-amount.txt | 20 +++++++++----------
 ...nt-locker-recover-non-fungibles-by-ids.txt | 20 +++++++++----------
 .../account_locker/scenario_summary.txt       |  4 ++--
 .../costings/001--create-accounts.txt         | 12 +++++------
 .../receipts/001--create-accounts.txt         | 20 +++++++++----------
 .../receipts/002--trivial_subintent.txt       |  4 ++--
 .../receipts/003--with_timestamp_range.txt    |  4 ++--
 .../receipts/004--depth_four_transaction.txt  |  4 ++--
 ...05--transaction_with_complex_subintent.txt |  4 ++--
 .../basic_subintents/scenario_summary.txt     |  4 ++--
 .../costings/001--fungible-max-div-create.txt |  8 ++++----
 .../costings/002--fungible-max-div-mint.txt   | 12 +++++------
 .../costings/003--fungible-max-div-burn.txt   | 10 +++++-----
 ...04--fungible-max-div-transfer-32-times.txt |  8 ++++----
 .../005--fungible-max-div-freeze-withdraw.txt | 10 +++++-----
 .../006--fungible-max-div-freeze-deposit.txt  | 10 +++++-----
 .../007--fungible-max-div-freeze-burn.txt     | 10 +++++-----
 ...--fungible-max-div-recall-frozen-vault.txt |  8 ++++----
 ...09--fungible-max-div-unfreeze-withdraw.txt | 10 +++++-----
 ...010--fungible-max-div-unfreeze-deposit.txt | 10 +++++-----
 .../011--fungible-max-div-unfreeze-burn.txt   | 10 +++++-----
 ...fungible-max-div-recall-unfrozen-vault.txt | 12 +++++------
 ...fungible-max-div-freeze-withdraw-again.txt | 10 +++++-----
 .../costings/014--fungible-min-div-create.txt | 10 +++++-----
 ...gible-min-div-mint-correct-granularity.txt | 12 +++++------
 ...ungible-min-div-mint-wrong-granularity.txt | 12 +++++------
 ...e-min-div-transfer-correct-granularity.txt | 10 +++++-----
 ...ble-min-div-transfer-wrong-granularity.txt | 10 +++++-----
 ...n-div-create-proof-correct-granularity.txt | 10 +++++-----
 ...min-div-create-proof-wrong-granularity.txt | 10 +++++-----
 ...ble-min-div-recall-correct-granularity.txt | 12 +++++------
 ...gible-min-div-recall-wrong-granularity.txt | 10 +++++-----
 .../receipts/001--fungible-max-div-create.txt | 20 +++++++++----------
 .../receipts/002--fungible-max-div-mint.txt   | 20 +++++++++----------
 .../receipts/003--fungible-max-div-burn.txt   | 20 +++++++++----------
 ...04--fungible-max-div-transfer-32-times.txt | 20 +++++++++----------
 .../005--fungible-max-div-freeze-withdraw.txt | 20 +++++++++----------
 .../006--fungible-max-div-freeze-deposit.txt  | 20 +++++++++----------
 .../007--fungible-max-div-freeze-burn.txt     | 20 +++++++++----------
 ...--fungible-max-div-recall-frozen-vault.txt | 20 +++++++++----------
 ...09--fungible-max-div-unfreeze-withdraw.txt | 20 +++++++++----------
 ...010--fungible-max-div-unfreeze-deposit.txt | 20 +++++++++----------
 .../011--fungible-max-div-unfreeze-burn.txt   | 20 +++++++++----------
 ...fungible-max-div-recall-unfrozen-vault.txt | 20 +++++++++----------
 ...fungible-max-div-freeze-withdraw-again.txt | 20 +++++++++----------
 .../receipts/014--fungible-min-div-create.txt | 20 +++++++++----------
 ...gible-min-div-mint-correct-granularity.txt | 20 +++++++++----------
 ...ungible-min-div-mint-wrong-granularity.txt | 20 +++++++++----------
 ...e-min-div-transfer-correct-granularity.txt | 20 +++++++++----------
 ...ble-min-div-transfer-wrong-granularity.txt | 20 +++++++++----------
 ...n-div-create-proof-correct-granularity.txt | 20 +++++++++----------
 ...min-div-create-proof-wrong-granularity.txt | 20 +++++++++----------
 ...ble-min-div-recall-correct-granularity.txt | 20 +++++++++----------
 ...gible-min-div-recall-wrong-granularity.txt | 20 +++++++++----------
 .../fungible_resource/scenario_summary.txt    |  4 ++--
 .../001--global_n_owned_emitting_events.txt   | 14 ++++++-------
 .../001--global_n_owned_emitting_events.txt   | 20 +++++++++----------
 .../global_n_owned/scenario_summary.txt       |  4 ++--
 .../001--kv-store-with-remote-type.txt        | 12 +++++------
 .../001--kv-store-with-remote-type.txt        | 20 +++++++++----------
 .../scenario_summary.txt                      |  4 ++--
 .../001--max_transaction-publish-package.txt  | 14 ++++++-------
 ...002--max_transaction-with-large-events.txt | 12 +++++------
 ...x_transaction-with-large-state-updates.txt | 10 +++++-----
 .../001--max_transaction-publish-package.txt  | 20 +++++++++----------
 ...002--max_transaction-with-large-events.txt | 20 +++++++++----------
 ...x_transaction-with-large-state-updates.txt | 20 +++++++++----------
 .../max_transaction/scenario_summary.txt      |  4 ++--
 .../001--maya-router-create-accounts.txt      |  8 ++++----
 .../costings/002--faucet-top-up.txt           | 18 ++++++++---------
 .../003--maya-router-create-resources.txt     |  8 ++++----
 ...4--maya-router-publish-and-instantiate.txt | 10 +++++-----
 .../001--maya-router-create-accounts.txt      | 20 +++++++++----------
 .../receipts/002--faucet-top-up.txt           | 20 +++++++++----------
 .../003--maya-router-create-resources.txt     | 20 +++++++++----------
 ...4--maya-router-publish-and-instantiate.txt | 20 +++++++++----------
 .../maya_router/scenario_summary.txt          |  4 ++--
 ...-metadata-create-package-with-metadata.txt | 10 +++++-----
 ...etadata-create-component-with-metadata.txt | 14 ++++++-------
 ...metadata-create-resource-with-metadata.txt | 10 +++++-----
 ...esource-with-metadata-partially-locked.txt | 10 +++++-----
 ...update-initially-locked-metadata-fails.txt |  8 ++++----
 ...ata-update-updatable-metadata-succeeds.txt | 10 +++++-----
 .../costings/007--metadata-lock-metadata.txt  |  8 ++++----
 ...metadata-on-dashboard-account-succeeds.txt |  8 ++++----
 ...t-metadata-on-sandbox-account-succeeds.txt | 10 +++++-----
 ...-update-recently-locked-metadata-fails.txt |  8 ++++----
 ...-metadata-create-package-with-metadata.txt | 20 +++++++++----------
 ...etadata-create-component-with-metadata.txt | 20 +++++++++----------
 ...metadata-create-resource-with-metadata.txt | 20 +++++++++----------
 ...esource-with-metadata-partially-locked.txt | 20 +++++++++----------
 ...update-initially-locked-metadata-fails.txt | 20 +++++++++----------
 ...ata-update-updatable-metadata-succeeds.txt | 20 +++++++++----------
 .../receipts/007--metadata-lock-metadata.txt  | 20 +++++++++----------
 ...metadata-on-dashboard-account-succeeds.txt | 20 +++++++++----------
 ...t-metadata-on-sandbox-account-succeeds.txt | 20 +++++++++----------
 ...-update-recently-locked-metadata-fails.txt | 20 +++++++++----------
 .../cuttlefish/metadata/scenario_summary.txt  |  4 ++--
 .../001--non-fungible-resource-create.txt     |  8 ++++----
 ...2--non-fungible-resource-create-string.txt | 10 +++++-----
 ...03--non-fungible-resource-create-bytes.txt |  8 ++++----
 ...004--non-fungible-resource-create-ruid.txt |  8 ++++----
 ...05--non-fungible-resource-mint-32-nfts.txt |  8 ++++----
 .../006--non-fungible-resource-burn.txt       | 12 +++++------
 .../007--non-fungible-resource-transfer.txt   |  8 ++++----
 ...--non-fungible-resource-freeze-deposit.txt |  8 ++++----
 ...--non-fungible-resource-freeze-deposit.txt |  8 ++++----
 ...-fungible-resource-recall-frozen-vault.txt | 10 +++++-----
 ...on-fungible-resource-unfreeze-withdraw.txt | 10 +++++-----
 ...non-fungible-resource-unfreeze-deposit.txt | 10 +++++-----
 ...3--non-fungible-resource-unfreeze-burn.txt | 10 +++++-----
 ...ungible-resource-recall-unfrozen-vault.txt |  8 ++++----
 ...e-resource-with-supply-with-empty-data.txt |  8 ++++----
 ...ith-supply-with-metadata-standard-data.txt |  8 ++++----
 ...ungible-transfer-metadata-standard-nfs.txt | 10 +++++-----
 ...resource-with-supply-with-complex-data.txt |  8 ++++----
 .../019--non-fungible-mutate-data.txt         | 10 +++++-----
 .../001--non-fungible-resource-create.txt     | 20 +++++++++----------
 ...2--non-fungible-resource-create-string.txt | 20 +++++++++----------
 ...03--non-fungible-resource-create-bytes.txt | 20 +++++++++----------
 ...004--non-fungible-resource-create-ruid.txt | 20 +++++++++----------
 ...05--non-fungible-resource-mint-32-nfts.txt | 20 +++++++++----------
 .../006--non-fungible-resource-burn.txt       | 20 +++++++++----------
 .../007--non-fungible-resource-transfer.txt   | 20 +++++++++----------
 ...--non-fungible-resource-freeze-deposit.txt | 20 +++++++++----------
 ...--non-fungible-resource-freeze-deposit.txt | 20 +++++++++----------
 ...-fungible-resource-recall-frozen-vault.txt | 20 +++++++++----------
 ...on-fungible-resource-unfreeze-withdraw.txt | 20 +++++++++----------
 ...non-fungible-resource-unfreeze-deposit.txt | 20 +++++++++----------
 ...3--non-fungible-resource-unfreeze-burn.txt | 20 +++++++++----------
 ...ungible-resource-recall-unfrozen-vault.txt | 20 +++++++++----------
 ...e-resource-with-supply-with-empty-data.txt | 20 +++++++++----------
 ...ith-supply-with-metadata-standard-data.txt | 20 +++++++++----------
 ...ungible-transfer-metadata-standard-nfs.txt | 20 +++++++++----------
 ...resource-with-supply-with-complex-data.txt | 20 +++++++++----------
 .../019--non-fungible-mutate-data.txt         | 20 +++++++++----------
 .../scenario_summary.txt                      |  4 ++--
 ...resource-with-remote-type-registration.txt |  8 ++++----
 ...non-fungible-resource-with-remote-type.txt | 10 +++++-----
 ...resource-with-remote-type-registration.txt | 20 +++++++++----------
 ...non-fungible-resource-with-remote-type.txt | 20 +++++++++----------
 .../scenario_summary.txt                      |  4 ++--
 .../001--radiswap-create-new-resources.txt    |  8 ++++----
 ...wner-badge-and-dapp-definition-account.txt |  8 ++++----
 ...003--radiswap-publish-and-create-pools.txt | 14 ++++++-------
 .../costings/004--radiswap-add-liquidity.txt  | 16 +++++++--------
 .../005--radiswap-distribute-tokens.txt       | 10 +++++-----
 .../costings/006--radiswap-swap-tokens.txt    | 20 +++++++++----------
 .../costings/007--radiswap-remove-tokens.txt  | 12 +++++------
 .../008--radiswap-set-two-way-linking.txt     | 10 +++++-----
 .../001--radiswap-create-new-resources.txt    | 20 +++++++++----------
 ...wner-badge-and-dapp-definition-account.txt | 20 +++++++++----------
 ...003--radiswap-publish-and-create-pools.txt | 20 +++++++++----------
 .../receipts/004--radiswap-add-liquidity.txt  | 20 +++++++++----------
 .../005--radiswap-distribute-tokens.txt       | 20 +++++++++----------
 .../receipts/006--radiswap-swap-tokens.txt    | 20 +++++++++----------
 .../receipts/007--radiswap-remove-tokens.txt  | 20 +++++++++----------
 .../008--radiswap-set-two-way-linking.txt     | 20 +++++++++----------
 .../cuttlefish/radiswap/scenario_summary.txt  |  4 ++--
 .../001--royalties--publish-package.txt       |  8 ++++----
 ...002--royalties--instantiate-components.txt | 20 +++++++++----------
 ...003--royalties--set-components-royalty.txt | 10 +++++-----
 ...lties--call_all_components_all_methods.txt | 16 +++++++--------
 .../001--royalties--publish-package.txt       | 20 +++++++++----------
 ...002--royalties--instantiate-components.txt | 20 +++++++++----------
 ...003--royalties--set-components-royalty.txt | 20 +++++++++----------
 ...lties--call_all_components_all_methods.txt | 20 +++++++++----------
 .../cuttlefish/royalties/scenario_summary.txt |  4 ++--
 .../costings/001--faucet-top-up.txt           | 14 ++++++-------
 .../002--transfer--try_deposit_or_abort.txt   | 10 +++++-----
 .../003--transfer--try_deposit_or_refund.txt  |  8 ++++----
 ...--transfer--try_deposit_batch_or_abort.txt |  8 ++++----
 ...-transfer--try_deposit_batch_or_refund.txt | 12 +++++------
 .../006--self-transfer--deposit_batch.txt     | 12 +++++------
 .../007--multi-transfer--deposit_batch.txt    | 10 +++++-----
 .../receipts/001--faucet-top-up.txt           | 20 +++++++++----------
 .../002--transfer--try_deposit_or_abort.txt   | 20 +++++++++----------
 .../003--transfer--try_deposit_or_refund.txt  | 20 +++++++++----------
 ...--transfer--try_deposit_batch_or_abort.txt | 20 +++++++++----------
 ...-transfer--try_deposit_batch_or_refund.txt | 20 +++++++++----------
 .../006--self-transfer--deposit_batch.txt     | 20 +++++++++----------
 .../007--multi-transfer--deposit_batch.txt    | 20 +++++++++----------
 .../transfer_xrd/scenario_summary.txt         |  4 ++--
 242 files changed, 1717 insertions(+), 1717 deletions(-)

diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/access-controller-v2/costings/001--access-controller-v2-instantiate.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/access-controller-v2/costings/001--access-controller-v2-instantiate.txt
index 26d41996eb..560dfbaeb0 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/access-controller-v2/costings/001--access-controller-v2-instantiate.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/access-controller-v2/costings/001--access-controller-v2-instantiate.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.94481573742,    100.0%
-- Execution Cost (XRD)                                                     ,               0.32974775,     34.9%
+Total Cost (XRD)                                                           ,            0.94517978742,    100.0%
+- Execution Cost (XRD)                                                     ,                0.3301118,     34.9%
 - Finalization Cost (XRD)                                                  ,                0.1960235,     20.7%
-- Storage Cost (XRD)                                                       ,            0.41904448742,     44.4%
+- Storage Cost (XRD)                                                       ,            0.41904448742,     44.3%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  6594955,    100.0%
+Execution Cost Breakdown                                                   ,                  6602236,    100.0%
 - AfterInvoke                                                              ,                      846,      0.0%
 - AllocateNodeId                                                           ,                     3201,      0.0%
 - BeforeInvoke                                                             ,                     5962,      0.1%
@@ -44,8 +44,8 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.7%
 - RunNativeCode::put_FungibleVault                                         ,                    24554,      0.4%
 - RunNativeCode::take_FungibleVault                                        ,                    42457,      0.6%
-- RunWasmCode::Faucet_free                                                 ,                    34815,      0.5%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.4%
+- RunWasmCode::Faucet_free                                                 ,                    39243,      0.6%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.4%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      944,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/access-controller-v2/costings/002--access-controller-v2-deposit-fees-xrd.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/access-controller-v2/costings/002--access-controller-v2-deposit-fees-xrd.txt
index 89b081556f..89a83548f5 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/access-controller-v2/costings/002--access-controller-v2-deposit-fees-xrd.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/access-controller-v2/costings/002--access-controller-v2-deposit-fees-xrd.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.41395877987,    100.0%
-- Execution Cost (XRD)                                                     ,               0.27693935,     66.9%
-- Finalization Cost (XRD)                                                  ,               0.03125695,      7.6%
+Total Cost (XRD)                                                           ,            0.41432282987,    100.0%
+- Execution Cost (XRD)                                                     ,                0.2773034,     66.9%
+- Finalization Cost (XRD)                                                  ,               0.03125695,      7.5%
 - Storage Cost (XRD)                                                       ,            0.10576247987,     25.5%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5538787,    100.0%
+Execution Cost Breakdown                                                   ,                  5546068,    100.0%
 - AfterInvoke                                                              ,                      520,      0.0%
 - AllocateNodeId                                                           ,                     1843,      0.0%
 - BeforeInvoke                                                             ,                     1796,      0.0%
@@ -41,8 +41,8 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.8%
 - RunNativeCode::put_FungibleVault                                         ,                    24554,      0.4%
 - RunNativeCode::take_FungibleVault                                        ,                    42457,      0.8%
-- RunWasmCode::Faucet_free                                                 ,                    34815,      0.6%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.4%
+- RunWasmCode::Faucet_free                                                 ,                    39243,      0.7%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    14880,      0.3%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/access-controller-v2/receipts/001--access-controller-v2-instantiate.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/access-controller-v2/receipts/001--access-controller-v2-instantiate.txt
index f05a35eeca..b351533999 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/access-controller-v2/receipts/001--access-controller-v2-instantiate.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/access-controller-v2/receipts/001--access-controller-v2-instantiate.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.94481573742 XRD
-├─ Network execution: 0.32974775 XRD, 6594955 execution cost units
+TRANSACTION COST: 0.94517978742 XRD
+├─ Network execution: 0.3301118 XRD, 6602236 execution cost units
 ├─ Network finalization: 0.1960235 XRD, 3920470 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.41904448742 XRD
@@ -28,15 +28,15 @@ EVENTS: 7
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.94481573742"),
+     amount: Decimal("0.94517978742"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.47240786871"),
+     amount: Decimal("0.47258989371"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.47240786871"),
+     amount: Decimal("0.47258989371"),
    }
 
 STATE UPDATES: 9 entities
@@ -46,7 +46,7 @@ STATE UPDATES: 9 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.236203934355"),
+             0u8 => Decimal("0.236294946855"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -79,7 +79,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999989999.05518426258")),
+         LiquidFungibleResource(Decimal("99999999999989999.05482021258")),
        )
 ├─ internal_keyvaluestore_sim1krn7clzr3qmq2zhwr77mdenksxswf00yeh8tn3vyzesg4kr3p54gv8 across 1 partitions
   └─ Partition(64): 1 change
@@ -432,7 +432,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.47240786871")),
+         LiquidFungibleResource(Decimal("0.47258989371")),
        )
 
 OUTPUTS: 4
@@ -444,13 +444,13 @@ OUTPUTS: 4
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -10000.94481573742
+   Change: -10000.94517978742
 ├─ Vault: internal_vault_sim1tz3wnsxw770s9kgtfudv4kktz6juv48d7v59qd7exlq98a53knngw6
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
    Change: 10000
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.47240786871
+   Change: 0.47258989371
 
 NEW ENTITIES: 2
 └─ Component: accesscontroller_sim1c09uvtxa5efafuetf983dcz5s5d8whtwcxe559kn3ywruchlxh0twh
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/access-controller-v2/receipts/002--access-controller-v2-deposit-fees-xrd.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/access-controller-v2/receipts/002--access-controller-v2-deposit-fees-xrd.txt
index 5dc55601ed..961c29443d 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/access-controller-v2/receipts/002--access-controller-v2-deposit-fees-xrd.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/access-controller-v2/receipts/002--access-controller-v2-deposit-fees-xrd.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.41395877987 XRD
-├─ Network execution: 0.27693935 XRD, 5538787 execution cost units
+TRANSACTION COST: 0.41432282987 XRD
+├─ Network execution: 0.2773034 XRD, 5546068 execution cost units
 ├─ Network finalization: 0.03125695 XRD, 625139 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.10576247987 XRD
@@ -32,15 +32,15 @@ EVENTS: 8
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.41395877987"),
+     amount: Decimal("0.41432282987"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.206979389935"),
+     amount: Decimal("0.207161414935"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.206979389935"),
+     amount: Decimal("0.207161414935"),
    }
 
 STATE UPDATES: 8 entities
@@ -50,7 +50,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.3396936293225"),
+             0u8 => Decimal("0.3398756543225"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -103,7 +103,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999979998.64122548271")),
+         LiquidFungibleResource(Decimal("99999999999979998.64049738271")),
        )
 ├─ internal_keyvaluestore_sim1krn7clzr3qmq2zhwr77mdenksxswf00yeh8tn3vyzesg4kr3p54gv8 across 1 partitions
   └─ Partition(64): 1 change
@@ -142,7 +142,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.679387258645")),
+         LiquidFungibleResource(Decimal("0.679751308645")),
        )
 
 OUTPUTS: 4
@@ -154,12 +154,12 @@ OUTPUTS: 4
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -10000.41395877987
+   Change: -10000.41432282987
 ├─ Vault: internal_vault_sim1trlz48lr8t38e6xlc9n304ahr62r8te03exlrh097s495vmk35e6vz
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
    Change: 10000
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.206979389935
+   Change: 0.207161414935
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/access-controller-v2/receipts/003--access-controller-v2-lock-fee-and-recover.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/access-controller-v2/receipts/003--access-controller-v2-lock-fee-and-recover.txt
index 4b90059748..4ae05317c0 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/access-controller-v2/receipts/003--access-controller-v2-lock-fee-and-recover.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/access-controller-v2/receipts/003--access-controller-v2-lock-fee-and-recover.txt
@@ -172,7 +172,7 @@ STATE UPDATES: 5 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.426474117095"),
+             0u8 => Decimal("0.426656142095"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -270,7 +270,7 @@ STATE UPDATES: 5 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.85294823419")),
+         LiquidFungibleResource(Decimal("0.85331228419")),
        )
 
 OUTPUTS: 3
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/access-controller-v2/scenario_summary.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/access-controller-v2/scenario_summary.txt
index 50453825ad..b96422136b 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/access-controller-v2/scenario_summary.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/access-controller-v2/scenario_summary.txt
@@ -2,8 +2,8 @@ Name: access-controller-v2
 
 == SUMMARY HASHES ==
 These Cuttlefish hashes are permitted to change only until the scenario is deployed to a permanent network, else it can cause divergence.
-State changes: 04d963aff2e82429 (allowed to change if not deployed to any network)
-Events       : 5194e6ef6d25254a (allowed to change if not deployed to any network)
+State changes: 77fa8c1dbad7811f (allowed to change if not deployed to any network)
+Events       : 5bf8e1c82eaa1a62 (allowed to change if not deployed to any network)
 
 == INTERESTING ADDRESSES ==
 - access_controller_v2_component_address: accesscontroller_sim1c09uvtxa5efafuetf983dcz5s5d8whtwcxe559kn3ywruchlxh0twh
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/costings/001--account-authorized-depositors-configure-accounts.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/costings/001--account-authorized-depositors-configure-accounts.txt
index 2272066899..1a95c58769 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/costings/001--account-authorized-depositors-configure-accounts.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/costings/001--account-authorized-depositors-configure-accounts.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.88885487317,    100.0%
-- Execution Cost (XRD)                                                     ,               0.29540385,     33.2%
+Total Cost (XRD)                                                           ,            0.88899752317,    100.0%
+- Execution Cost (XRD)                                                     ,                0.2955465,     33.2%
 - Finalization Cost (XRD)                                                  ,               0.17202235,     19.4%
 - Storage Cost (XRD)                                                       ,            0.42142867317,     47.4%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5908077,    100.0%
+Execution Cost Breakdown                                                   ,                  5910930,    100.0%
 - AfterInvoke                                                              ,                      868,      0.0%
 - AllocateNodeId                                                           ,                     3686,      0.1%
 - BeforeInvoke                                                             ,                     4842,      0.1%
@@ -44,7 +44,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::on_virtualize                                             ,                    69040,      1.2%
 - RunNativeCode::put_FungibleVault                                         ,                    24554,      0.4%
 - RunNativeCode::set_default_deposit_rule                                  ,                   119482,      2.0%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.4%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                     1183,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/costings/002--account-authorized-depositors-attempt-deposit-success.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/costings/002--account-authorized-depositors-attempt-deposit-success.txt
index 7ae04ebadb..ff8905555d 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/costings/002--account-authorized-depositors-attempt-deposit-success.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/costings/002--account-authorized-depositors-attempt-deposit-success.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.52560467719,    100.0%
-- Execution Cost (XRD)                                                     ,                0.3526864,     67.1%
+Total Cost (XRD)                                                           ,            0.52596872719,    100.0%
+- Execution Cost (XRD)                                                     ,               0.35305045,     67.1%
 - Finalization Cost (XRD)                                                  ,               0.03625675,      6.9%
 - Storage Cost (XRD)                                                       ,            0.13666152719,     26.0%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  7053728,    100.0%
+Execution Cost Breakdown                                                   ,                  7061009,    100.0%
 - AfterInvoke                                                              ,                      704,      0.0%
 - AllocateNodeId                                                           ,                     2522,      0.0%
 - BeforeInvoke                                                             ,                     3790,      0.1%
@@ -49,8 +49,8 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::take_FungibleVault                                        ,                    42457,      0.6%
 - RunNativeCode::try_deposit_or_refund                                     ,                    88114,      1.2%
 - RunNativeCode::unlock_amount_FungibleVault                               ,                    23272,      0.3%
-- RunWasmCode::Faucet_free                                                 ,                    34815,      0.5%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.3%
+- RunWasmCode::Faucet_free                                                 ,                    39243,      0.6%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.4%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    23880,      0.3%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/costings/003--account-authorized-depositors-attempt-deposit-failure-if-badge-is-not-present.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/costings/003--account-authorized-depositors-attempt-deposit-failure-if-badge-is-not-present.txt
index 6b1f4f2469..1b1226e616 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/costings/003--account-authorized-depositors-attempt-deposit-failure-if-badge-is-not-present.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/costings/003--account-authorized-depositors-attempt-deposit-failure-if-badge-is-not-present.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,             0.3217417664,    100.0%
-- Execution Cost (XRD)                                                     ,                0.2759654,     85.8%
+Total Cost (XRD)                                                           ,             0.3221058164,    100.0%
+- Execution Cost (XRD)                                                     ,               0.27632945,     85.8%
 - Finalization Cost (XRD)                                                  ,                        0,      0.0%
 - Storage Cost (XRD)                                                       ,             0.0457763664,     14.2%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5519308,    100.0%
+Execution Cost Breakdown                                                   ,                  5526589,    100.0%
 - AfterInvoke                                                              ,                      386,      0.0%
 - AllocateNodeId                                                           ,                     1455,      0.0%
 - BeforeInvoke                                                             ,                     1566,      0.0%
@@ -18,7 +18,7 @@ Execution Cost Breakdown                                                   ,
 - OpenSubstate::GlobalConsensusManager                                     ,                    43783,      0.8%
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   127933,      2.3%
 - OpenSubstate::GlobalGenericComponent                                     ,                    47373,      0.9%
-- OpenSubstate::GlobalPackage                                              ,                  2589103,     46.9%
+- OpenSubstate::GlobalPackage                                              ,                  2589103,     46.8%
 - OpenSubstate::GlobalPreallocatedSecp256k1Account                         ,                   285342,      5.2%
 - OpenSubstate::InternalFungibleVault                                      ,                   100390,      1.8%
 - OpenSubstate::InternalGenericComponent                                   ,                    36179,      0.7%
@@ -37,8 +37,8 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.8%
 - RunNativeCode::take_FungibleVault                                        ,                    42457,      0.8%
 - RunNativeCode::try_deposit_or_refund                                     ,                    88114,      1.6%
-- RunWasmCode::Faucet_free                                                 ,                    34815,      0.6%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.4%
+- RunWasmCode::Faucet_free                                                 ,                    39243,      0.7%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    19200,      0.3%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/costings/004--account-authorized-depositors-attempt-deposit-failure-if-badge-is-not-an-authorized-depositor.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/costings/004--account-authorized-depositors-attempt-deposit-failure-if-badge-is-not-an-authorized-depositor.txt
index 7f4ee4f240..aee1423c21 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/costings/004--account-authorized-depositors-attempt-deposit-failure-if-badge-is-not-an-authorized-depositor.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/costings/004--account-authorized-depositors-attempt-deposit-failure-if-badge-is-not-an-authorized-depositor.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,             0.3359765164,    100.0%
-- Execution Cost (XRD)                                                     ,               0.29020015,     86.4%
+Total Cost (XRD)                                                           ,             0.3363405664,    100.0%
+- Execution Cost (XRD)                                                     ,                0.2905642,     86.4%
 - Finalization Cost (XRD)                                                  ,                        0,      0.0%
 - Storage Cost (XRD)                                                       ,             0.0457763664,     13.6%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5804003,    100.0%
+Execution Cost Breakdown                                                   ,                  5811284,    100.0%
 - AfterInvoke                                                              ,                      566,      0.0%
 - AllocateNodeId                                                           ,                     1843,      0.0%
 - BeforeInvoke                                                             ,                     2028,      0.0%
@@ -19,7 +19,7 @@ Execution Cost Breakdown                                                   ,
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   130251,      2.2%
 - OpenSubstate::GlobalGenericComponent                                     ,                    47373,      0.8%
 - OpenSubstate::GlobalNonFungibleResourceManager                           ,                    41401,      0.7%
-- OpenSubstate::GlobalPackage                                              ,                  2604179,     44.9%
+- OpenSubstate::GlobalPackage                                              ,                  2604179,     44.8%
 - OpenSubstate::GlobalPreallocatedSecp256k1Account                         ,                   405872,      7.0%
 - OpenSubstate::InternalFungibleVault                                      ,                   100390,      1.7%
 - OpenSubstate::InternalGenericComponent                                   ,                    57145,      1.0%
@@ -28,7 +28,7 @@ Execution Cost Breakdown                                                   ,
 - PrepareWasmCode                                                          ,                   707732,     12.2%
 - QueryActor                                                               ,                     1500,      0.0%
 - QueryTransactionHash                                                     ,                      500,      0.0%
-- ReadSubstate                                                             ,                   868704,     15.0%
+- ReadSubstate                                                             ,                   868704,     14.9%
 - RunNativeCode::Worktop_drop                                              ,                    17918,      0.3%
 - RunNativeCode::Worktop_put                                               ,                    58066,      1.0%
 - RunNativeCode::Worktop_take_all                                          ,                    14602,      0.3%
@@ -39,8 +39,8 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.8%
 - RunNativeCode::take_FungibleVault                                        ,                    42457,      0.7%
 - RunNativeCode::try_deposit_or_refund                                     ,                    88114,      1.5%
-- RunWasmCode::Faucet_free                                                 ,                    34815,      0.6%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.4%
+- RunWasmCode::Faucet_free                                                 ,                    39243,      0.7%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    19200,      0.3%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/receipts/001--account-authorized-depositors-configure-accounts.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/receipts/001--account-authorized-depositors-configure-accounts.txt
index 882539a86b..6a4cfe5750 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/receipts/001--account-authorized-depositors-configure-accounts.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/receipts/001--account-authorized-depositors-configure-accounts.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.88885487317 XRD
-├─ Network execution: 0.29540385 XRD, 5908077 execution cost units
+TRANSACTION COST: 0.88899752317 XRD
+├─ Network execution: 0.2955465 XRD, 5910930 execution cost units
 ├─ Network finalization: 0.17202235 XRD, 3440447 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.42142867317 XRD
@@ -47,15 +47,15 @@ EVENTS: 11
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.88885487317"),
+     amount: Decimal("0.88899752317"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.444427436585"),
+     amount: Decimal("0.444498761585"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.444427436585"),
+     amount: Decimal("0.444498761585"),
    }
 
 STATE UPDATES: 9 entities
@@ -65,7 +65,7 @@ STATE UPDATES: 9 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.2222137182925"),
+             0u8 => Decimal("0.2222493807925"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -98,7 +98,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999999.11114512683")),
+         LiquidFungibleResource(Decimal("99999999999999999.11100247683")),
        )
 ├─ account_sim16996e320lnez82q6430eunaz9l3n5fnwk6eh9avrmtmj22e7jmhemw across 6 partitions
   ├─ Partition(2): 2 changes
@@ -434,7 +434,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.444427436585")),
+         LiquidFungibleResource(Decimal("0.444498761585")),
        )
 
 OUTPUTS: 7
@@ -452,13 +452,13 @@ OUTPUTS: 7
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.88885487317
+   Change: -0.88899752317
 ├─ Vault: internal_vault_sim1tqvjs768h738fh68a8k9g3umfruja74v7fepgqn0zks3d0a05gs4s5
    ResAddr: resource_sim1t5jzke2dmva79yatdnv2tzecqavwatcmgylgpur9a5r7nxgfd664lz
    Change: 1
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.444427436585
+   Change: 0.444498761585
 
 NEW ENTITIES: 3
 ├─ Component: account_sim16996e320lnez82q6430eunaz9l3n5fnwk6eh9avrmtmj22e7jmhemw
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/receipts/002--account-authorized-depositors-attempt-deposit-success.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/receipts/002--account-authorized-depositors-attempt-deposit-success.txt
index fc08e664f3..0b077c6d61 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/receipts/002--account-authorized-depositors-attempt-deposit-success.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/receipts/002--account-authorized-depositors-attempt-deposit-success.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.52560467719 XRD
-├─ Network execution: 0.3526864 XRD, 7053728 execution cost units
+TRANSACTION COST: 0.52596872719 XRD
+├─ Network execution: 0.35305045 XRD, 7061009 execution cost units
 ├─ Network finalization: 0.03625675 XRD, 725135 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.13666152719 XRD
@@ -33,15 +33,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.52560467719"),
+     amount: Decimal("0.52596872719"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.262802338595"),
+     amount: Decimal("0.262984363595"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.262802338595"),
+     amount: Decimal("0.262984363595"),
    }
 
 STATE UPDATES: 9 entities
@@ -51,7 +51,7 @@ STATE UPDATES: 9 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.35361488759"),
+             0u8 => Decimal("0.35374156259"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -84,7 +84,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999989998.58554044964")),
+         LiquidFungibleResource(Decimal("99999999999989998.58503374964")),
        )
 ├─ internal_keyvaluestore_sim1krn7clzr3qmq2zhwr77mdenksxswf00yeh8tn3vyzesg4kr3p54gv8 across 1 partitions
   └─ Partition(64): 1 change
@@ -135,7 +135,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.70722977518")),
+         LiquidFungibleResource(Decimal("0.70748312518")),
        )
 
 OUTPUTS: 5
@@ -148,12 +148,12 @@ OUTPUTS: 5
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -10000.52560467719
+   Change: -10000.52596872719
 ├─ Vault: internal_vault_sim1trlmc306p05rqg76se06hkhq9wh2mlkv5m2pmx92gvg0ykly7s4lma
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
    Change: 10000
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.262802338595
+   Change: 0.262984363595
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/receipts/003--account-authorized-depositors-attempt-deposit-failure-if-badge-is-not-present.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/receipts/003--account-authorized-depositors-attempt-deposit-failure-if-badge-is-not-present.txt
index 4322a81171..3bab3e83a9 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/receipts/003--account-authorized-depositors-attempt-deposit-failure-if-badge-is-not-present.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/receipts/003--account-authorized-depositors-attempt-deposit-failure-if-badge-is-not-present.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED FAILURE: SystemError(AssertAccessRuleFailed)
 
-TRANSACTION COST: 0.3217417664 XRD
-├─ Network execution: 0.2759654 XRD, 5519308 execution cost units
+TRANSACTION COST: 0.3221058164 XRD
+├─ Network execution: 0.27632945 XRD, 5526589 execution cost units
 ├─ Network finalization: 0 XRD, 0 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.0457763664 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.3217417664"),
+     amount: Decimal("0.3221058164"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.1608708832"),
+     amount: Decimal("0.1610529082"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.1608708832"),
+     amount: Decimal("0.1610529082"),
    }
 
 STATE UPDATES: 4 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 4 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.43405032919"),
+             0u8 => Decimal("0.43426801669"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -60,21 +60,21 @@ STATE UPDATES: 4 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999989998.26379868324")),
+         LiquidFungibleResource(Decimal("99999999999989998.26292793324")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.86810065838")),
+         LiquidFungibleResource(Decimal("0.86853603338")),
        )
 
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.3217417664
+   Change: -0.3221058164
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.1608708832
+   Change: 0.1610529082
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/receipts/004--account-authorized-depositors-attempt-deposit-failure-if-badge-is-not-an-authorized-depositor.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/receipts/004--account-authorized-depositors-attempt-deposit-failure-if-badge-is-not-an-authorized-depositor.txt
index 0067409d93..1902a05f13 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/receipts/004--account-authorized-depositors-attempt-deposit-failure-if-badge-is-not-an-authorized-depositor.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/receipts/004--account-authorized-depositors-attempt-deposit-failure-if-badge-is-not-an-authorized-depositor.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED FAILURE: ApplicationError(FungibleResourceManagerError(DropNonEmptyBucket))
 
-TRANSACTION COST: 0.3359765164 XRD
-├─ Network execution: 0.29020015 XRD, 5804003 execution cost units
+TRANSACTION COST: 0.3363405664 XRD
+├─ Network execution: 0.2905642 XRD, 5811284 execution cost units
 ├─ Network finalization: 0 XRD, 0 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.0457763664 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.3359765164"),
+     amount: Decimal("0.3363405664"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.1679882582"),
+     amount: Decimal("0.1681702832"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.1679882582"),
+     amount: Decimal("0.1681702832"),
    }
 
 STATE UPDATES: 4 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 4 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.51804445829"),
+             0u8 => Decimal("0.51835315829"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -60,21 +60,21 @@ STATE UPDATES: 4 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999989997.92782216684")),
+         LiquidFungibleResource(Decimal("99999999999989997.92658736684")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("1.03608891658")),
+         LiquidFungibleResource(Decimal("1.03670631658")),
        )
 
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.3359765164
+   Change: -0.3363405664
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.1679882582
+   Change: 0.1681702832
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/scenario_summary.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/scenario_summary.txt
index 8b870157f2..e363ae7d16 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/scenario_summary.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_authorized_depositors/scenario_summary.txt
@@ -2,8 +2,8 @@ Name: account_authorized_depositors
 
 == SUMMARY HASHES ==
 These Cuttlefish hashes are permitted to change only until the scenario is deployed to a permanent network, else it can cause divergence.
-State changes: 19ccbaaaf7817ccd (allowed to change if not deployed to any network)
-Events       : 941b776a1bd50472 (allowed to change if not deployed to any network)
+State changes: c4953a6de71affbe (allowed to change if not deployed to any network)
+Events       : 9d45f4d0b3d3b985 (allowed to change if not deployed to any network)
 
 == INTERESTING ADDRESSES ==
 - source_account: account_sim16996e320lnez82q6430eunaz9l3n5fnwk6eh9avrmtmj22e7jmhemw
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/001--account-locker-create-accounts.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/001--account-locker-create-accounts.txt
index 3c62ed7efb..7bc7e327dd 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/001--account-locker-create-accounts.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/001--account-locker-create-accounts.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.67025233325,    100.0%
-- Execution Cost (XRD)                                                     ,               0.22265655,     33.2%
+Total Cost (XRD)                                                           ,            0.67039498325,    100.0%
+- Execution Cost (XRD)                                                     ,                0.2227992,     33.2%
 - Finalization Cost (XRD)                                                  ,               0.13526745,     20.2%
 - Storage Cost (XRD)                                                       ,            0.31232833325,     46.6%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  4453131,    100.0%
+Execution Cost Breakdown                                                   ,                  4455984,    100.0%
 - AfterInvoke                                                              ,                     1030,      0.0%
 - AllocateNodeId                                                           ,                     4462,      0.1%
 - BeforeInvoke                                                             ,                     4270,      0.1%
@@ -21,7 +21,7 @@ Execution Cost Breakdown                                                   ,
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   121872,      2.7%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      1.0%
 - OpenSubstate::GlobalNonFungibleResourceManager                           ,                    50023,      1.1%
-- OpenSubstate::GlobalPackage                                              ,                  2198522,     49.4%
+- OpenSubstate::GlobalPackage                                              ,                  2198522,     49.3%
 - OpenSubstate::InternalFungibleVault                                      ,                    90202,      2.0%
 - OpenSubstate::InternalGenericComponent                                   ,                    47680,      1.1%
 - OpenSubstate::InternalKeyValueStore                                      ,                    40536,      0.9%
@@ -35,7 +35,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::create_with_data                                          ,                   137355,      3.1%
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.3%
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.0%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.6%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.6%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                     1855,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/002--account-locker-create-account-locker.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/002--account-locker-create-account-locker.txt
index f1f7495835..8754abe5d8 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/002--account-locker-create-account-locker.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/002--account-locker-create-account-locker.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.71703632689,    100.0%
-- Execution Cost (XRD)                                                     ,                0.2633991,     36.7%
+Total Cost (XRD)                                                           ,            0.71717897689,    100.0%
+- Execution Cost (XRD)                                                     ,               0.26354175,     36.7%
 - Finalization Cost (XRD)                                                  ,                 0.146268,     20.4%
 - Storage Cost (XRD)                                                       ,            0.30736922689,     42.9%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5267982,    100.0%
+Execution Cost Breakdown                                                   ,                  5270835,    100.0%
 - AfterInvoke                                                              ,                      840,      0.0%
 - AllocateNodeId                                                           ,                     3007,      0.1%
 - BeforeInvoke                                                             ,                     3836,      0.1%
@@ -42,7 +42,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.9%
 - RunNativeCode::put_FungibleVault                                         ,                    24554,      0.5%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      2.3%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.5%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      824,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/003--account-locker-create-resources.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/003--account-locker-create-resources.txt
index 9bf1bf543b..ba25b42399 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/003--account-locker-create-resources.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/003--account-locker-create-resources.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.70117770564,    100.0%
-- Execution Cost (XRD)                                                     ,                0.1916238,     27.3%
+Total Cost (XRD)                                                           ,            0.70132035564,    100.0%
+- Execution Cost (XRD)                                                     ,               0.19176645,     27.3%
 - Finalization Cost (XRD)                                                  ,               0.19026375,     27.1%
 - Storage Cost (XRD)                                                       ,            0.31929015564,     45.5%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  3832476,    100.0%
+Execution Cost Breakdown                                                   ,                  3835329,    100.0%
 - AfterInvoke                                                              ,                      454,      0.0%
 - AllocateNodeId                                                           ,                     2134,      0.1%
 - BeforeInvoke                                                             ,                     2636,      0.1%
@@ -35,7 +35,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::create_with_data                                          ,                    54942,      1.4%
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.4%
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.2%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.6%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.7%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                     1016,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/004--account-locker-setting-up-account-deposit-rules.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/004--account-locker-setting-up-account-deposit-rules.txt
index cb26262ea0..7151184482 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/004--account-locker-setting-up-account-deposit-rules.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/004--account-locker-setting-up-account-deposit-rules.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.42376999385,    100.0%
-- Execution Cost (XRD)                                                     ,               0.23086785,     54.5%
+Total Cost (XRD)                                                           ,            0.42391264385,    100.0%
+- Execution Cost (XRD)                                                     ,                0.2310105,     54.5%
 - Finalization Cost (XRD)                                                  ,               0.03125435,      7.4%
 - Storage Cost (XRD)                                                       ,            0.16164779385,     38.1%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  4617357,    100.0%
+Execution Cost Breakdown                                                   ,                  4620210,    100.0%
 - AfterInvoke                                                              ,                       94,      0.0%
 - AllocateNodeId                                                           ,                      970,      0.0%
 - BeforeInvoke                                                             ,                     1256,      0.0%
@@ -34,7 +34,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.0%
 - RunNativeCode::set_default_deposit_rule                                  ,                    59741,      1.3%
 - RunNativeCode::set_resource_preference                                   ,                   132054,      2.9%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.5%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.6%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    37560,      0.8%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/005--account-locker-send-fungibles-and-try-direct-deposit-succeeds.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/005--account-locker-send-fungibles-and-try-direct-deposit-succeeds.txt
index 1fac9c3bc6..fec1b6bef6 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/005--account-locker-send-fungibles-and-try-direct-deposit-succeeds.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/005--account-locker-send-fungibles-and-try-direct-deposit-succeeds.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.46517753228,    100.0%
-- Execution Cost (XRD)                                                     ,               0.29578765,     63.6%
+Total Cost (XRD)                                                           ,            0.46532018228,    100.0%
+- Execution Cost (XRD)                                                     ,                0.2959303,     63.6%
 - Finalization Cost (XRD)                                                  ,               0.03625695,      7.8%
 - Storage Cost (XRD)                                                       ,            0.13313293228,     28.6%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5915753,    100.0%
+Execution Cost Breakdown                                                   ,                  5918606,    100.0%
 - AfterInvoke                                                              ,                      568,      0.0%
 - AllocateNodeId                                                           ,                     2231,      0.0%
 - BeforeInvoke                                                             ,                     3620,      0.1%
@@ -28,7 +28,7 @@ Execution Cost Breakdown                                                   ,
 - PinNode                                                                  ,                      264,      0.0%
 - PrepareWasmCode                                                          ,                   353866,      6.0%
 - QueryActor                                                               ,                     4500,      0.1%
-- ReadSubstate                                                             ,                   541449,      9.2%
+- ReadSubstate                                                             ,                   541449,      9.1%
 - RunNativeCode::AuthZone_push                                             ,                    23850,      0.4%
 - RunNativeCode::Worktop_drop                                              ,                    17918,      0.3%
 - RunNativeCode::Worktop_put                                               ,                    29033,      0.5%
@@ -47,7 +47,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::store_account_locker                                      ,                    62556,      1.1%
 - RunNativeCode::try_deposit_or_refund                                     ,                    88114,      1.5%
 - RunNativeCode::unlock_amount_FungibleVault                               ,                    23272,      0.4%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.4%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    25440,      0.4%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/006--account-locker-send-fungibles-and-try-direct-deposit-refunds.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/006--account-locker-send-fungibles-and-try-direct-deposit-refunds.txt
index 693216f03a..83cf386796 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/006--account-locker-send-fungibles-and-try-direct-deposit-refunds.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/006--account-locker-send-fungibles-and-try-direct-deposit-refunds.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.53579939639,    100.0%
-- Execution Cost (XRD)                                                     ,               0.30566605,     57.0%
+Total Cost (XRD)                                                           ,            0.53594204639,    100.0%
+- Execution Cost (XRD)                                                     ,                0.3058087,     57.1%
 - Finalization Cost (XRD)                                                  ,               0.05151015,      9.6%
 - Storage Cost (XRD)                                                       ,            0.17862319639,     33.3%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  6113321,    100.0%
+Execution Cost Breakdown                                                   ,                  6116174,    100.0%
 - AfterInvoke                                                              ,                      682,      0.0%
 - AllocateNodeId                                                           ,                     2425,      0.0%
 - BeforeInvoke                                                             ,                     3706,      0.1%
@@ -47,7 +47,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::store_account_locker                                      ,                    62556,      1.0%
 - RunNativeCode::try_deposit_or_refund                                     ,                    88114,      1.4%
 - RunNativeCode::unlock_amount_FungibleVault                               ,                    23272,      0.4%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.4%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.4%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    25440,      0.4%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/007--account-locker-send-fungibles-and-dont-try-direct-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/007--account-locker-send-fungibles-and-dont-try-direct-deposit.txt
index 4683a76802..4742faebf8 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/007--account-locker-send-fungibles-and-dont-try-direct-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/007--account-locker-send-fungibles-and-dont-try-direct-deposit.txt
@@ -1,14 +1,14 @@
-Total Cost (XRD)                                                           ,            0.50129634194,    100.0%
-- Execution Cost (XRD)                                                     ,                 0.282381,     56.3%
+Total Cost (XRD)                                                           ,            0.50143899194,    100.0%
+- Execution Cost (XRD)                                                     ,               0.28252365,     56.3%
 - Finalization Cost (XRD)                                                  ,                0.0512594,     10.2%
 - Storage Cost (XRD)                                                       ,            0.16765594194,     33.4%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5647620,    100.0%
+Execution Cost Breakdown                                                   ,                  5650473,    100.0%
 - AfterInvoke                                                              ,                      560,      0.0%
 - AllocateNodeId                                                           ,                     2231,      0.0%
 - BeforeInvoke                                                             ,                     3302,      0.1%
-- CheckReference                                                           ,                   240076,      4.3%
+- CheckReference                                                           ,                   240076,      4.2%
 - CloseSubstate                                                            ,                    46698,      0.8%
 - CreateNode                                                               ,                    19818,      0.4%
 - DropNode                                                                 ,                    32775,      0.6%
@@ -18,7 +18,7 @@ Execution Cost Breakdown                                                   ,
 - MarkSubstateAsTransient                                                  ,                      220,      0.0%
 - OpenSubstate::GlobalAccount                                              ,                   246095,      4.4%
 - OpenSubstate::GlobalAccountLocker                                        ,                   204622,      3.6%
-- OpenSubstate::GlobalFungibleResourceManager                              ,                   341815,      6.1%
+- OpenSubstate::GlobalFungibleResourceManager                              ,                   341815,      6.0%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      0.8%
 - OpenSubstate::GlobalNonFungibleResourceManager                           ,                    40685,      0.7%
 - OpenSubstate::GlobalPackage                                              ,                  2501664,     44.3%
@@ -46,7 +46,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::put_FungibleVault                                         ,                    24554,      0.4%
 - RunNativeCode::store_account_locker                                      ,                    62556,      1.1%
 - RunNativeCode::unlock_amount_FungibleVault                               ,                    23272,      0.4%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.4%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    25440,      0.5%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/008--account-locker-airdrop-fungibles-and-try-direct-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/008--account-locker-airdrop-fungibles-and-try-direct-deposit.txt
index 8fbada6935..9474679661 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/008--account-locker-airdrop-fungibles-and-try-direct-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/008--account-locker-airdrop-fungibles-and-try-direct-deposit.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.61621290122,    100.0%
-- Execution Cost (XRD)                                                     ,                 0.372817,     60.5%
+Total Cost (XRD)                                                           ,            0.61635555122,    100.0%
+- Execution Cost (XRD)                                                     ,               0.37295965,     60.5%
 - Finalization Cost (XRD)                                                  ,                0.0475112,      7.7%
 - Storage Cost (XRD)                                                       ,            0.19588470122,     31.8%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  7456340,    100.0%
+Execution Cost Breakdown                                                   ,                  7459193,    100.0%
 - AfterInvoke                                                              ,                     1066,      0.0%
 - AllocateNodeId                                                           ,                     3686,      0.0%
 - BeforeInvoke                                                             ,                     5694,      0.1%
@@ -49,7 +49,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::take_FungibleBucket                                       ,                    59565,      0.8%
 - RunNativeCode::try_deposit_or_refund                                     ,                   264342,      3.5%
 - RunNativeCode::unlock_amount_FungibleVault                               ,                    23272,      0.3%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.3%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.4%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    31360,      0.4%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/009--account-locker-airdrop-fungibles-and-dont-try-direct-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/009--account-locker-airdrop-fungibles-and-dont-try-direct-deposit.txt
index e72ff3f0d0..2b599ab286 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/009--account-locker-airdrop-fungibles-and-dont-try-direct-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/009--account-locker-airdrop-fungibles-and-dont-try-direct-deposit.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.61542839676,    100.0%
-- Execution Cost (XRD)                                                     ,               0.33076825,     53.7%
+Total Cost (XRD)                                                           ,            0.61557104676,    100.0%
+- Execution Cost (XRD)                                                     ,                0.3309109,     53.8%
 - Finalization Cost (XRD)                                                  ,                0.0622633,     10.1%
 - Storage Cost (XRD)                                                       ,            0.22239684676,     36.1%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  6615365,    100.0%
+Execution Cost Breakdown                                                   ,                  6618218,    100.0%
 - AfterInvoke                                                              ,                      928,      0.0%
 - AllocateNodeId                                                           ,                     3395,      0.1%
 - BeforeInvoke                                                             ,                     4654,      0.1%
@@ -48,7 +48,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::put_FungibleVault                                         ,                    73662,      1.1%
 - RunNativeCode::take_FungibleBucket                                       ,                    59565,      0.9%
 - RunNativeCode::unlock_amount_FungibleVault                               ,                    23272,      0.4%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.4%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.4%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    31360,      0.5%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/010--account-locker-send-non-fungibles-and-try-direct-deposit-succeeds.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/010--account-locker-send-non-fungibles-and-try-direct-deposit-succeeds.txt
index e272a8ecb5..e8e18cbeaa 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/010--account-locker-send-non-fungibles-and-try-direct-deposit-succeeds.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/010--account-locker-send-non-fungibles-and-try-direct-deposit-succeeds.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.51112871523,    100.0%
-- Execution Cost (XRD)                                                     ,                0.3255403,     63.7%
+Total Cost (XRD)                                                           ,            0.51127136523,    100.0%
+- Execution Cost (XRD)                                                     ,               0.32568295,     63.7%
 - Finalization Cost (XRD)                                                  ,                0.0462566,      9.0%
 - Storage Cost (XRD)                                                       ,            0.13933181523,     27.3%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  6510806,    100.0%
+Execution Cost Breakdown                                                   ,                  6513659,    100.0%
 - AfterInvoke                                                              ,                      542,      0.0%
 - AllocateNodeId                                                           ,                     2231,      0.0%
 - BeforeInvoke                                                             ,                     3634,      0.1%
@@ -21,7 +21,7 @@ Execution Cost Breakdown                                                   ,
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   164648,      2.5%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      0.7%
 - OpenSubstate::GlobalNonFungibleResourceManager                           ,                   463748,      7.1%
-- OpenSubstate::GlobalPackage                                              ,                  2822803,     43.4%
+- OpenSubstate::GlobalPackage                                              ,                  2822803,     43.3%
 - OpenSubstate::InternalFungibleVault                                      ,                   179737,      2.8%
 - OpenSubstate::InternalGenericComponent                                   ,                    67715,      1.0%
 - OpenSubstate::InternalKeyValueStore                                      ,                    40536,      0.6%
@@ -49,7 +49,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::store_account_locker                                      ,                    62556,      1.0%
 - RunNativeCode::try_deposit_or_refund                                     ,                    88114,      1.4%
 - RunNativeCode::unlock_amount_FungibleVault                               ,                    23272,      0.4%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.4%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.4%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      151,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/011--account-locker-send-non-fungibles-and-try-direct-deposit-refunds.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/011--account-locker-send-non-fungibles-and-try-direct-deposit-refunds.txt
index e272a8ecb5..e8e18cbeaa 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/011--account-locker-send-non-fungibles-and-try-direct-deposit-refunds.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/011--account-locker-send-non-fungibles-and-try-direct-deposit-refunds.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.51112871523,    100.0%
-- Execution Cost (XRD)                                                     ,                0.3255403,     63.7%
+Total Cost (XRD)                                                           ,            0.51127136523,    100.0%
+- Execution Cost (XRD)                                                     ,               0.32568295,     63.7%
 - Finalization Cost (XRD)                                                  ,                0.0462566,      9.0%
 - Storage Cost (XRD)                                                       ,            0.13933181523,     27.3%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  6510806,    100.0%
+Execution Cost Breakdown                                                   ,                  6513659,    100.0%
 - AfterInvoke                                                              ,                      542,      0.0%
 - AllocateNodeId                                                           ,                     2231,      0.0%
 - BeforeInvoke                                                             ,                     3634,      0.1%
@@ -21,7 +21,7 @@ Execution Cost Breakdown                                                   ,
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   164648,      2.5%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      0.7%
 - OpenSubstate::GlobalNonFungibleResourceManager                           ,                   463748,      7.1%
-- OpenSubstate::GlobalPackage                                              ,                  2822803,     43.4%
+- OpenSubstate::GlobalPackage                                              ,                  2822803,     43.3%
 - OpenSubstate::InternalFungibleVault                                      ,                   179737,      2.8%
 - OpenSubstate::InternalGenericComponent                                   ,                    67715,      1.0%
 - OpenSubstate::InternalKeyValueStore                                      ,                    40536,      0.6%
@@ -49,7 +49,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::store_account_locker                                      ,                    62556,      1.0%
 - RunNativeCode::try_deposit_or_refund                                     ,                    88114,      1.4%
 - RunNativeCode::unlock_amount_FungibleVault                               ,                    23272,      0.4%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.4%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.4%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      151,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/012--account-locker-send-non-fungibles-and-dont-try-direct-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/012--account-locker-send-non-fungibles-and-dont-try-direct-deposit.txt
index fb0c523fdd..902c891d83 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/012--account-locker-send-non-fungibles-and-dont-try-direct-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/012--account-locker-send-non-fungibles-and-dont-try-direct-deposit.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.49630855327,    100.0%
-- Execution Cost (XRD)                                                     ,               0.30804945,     62.1%
+Total Cost (XRD)                                                           ,            0.49645120327,    100.0%
+- Execution Cost (XRD)                                                     ,                0.3081921,     62.1%
 - Finalization Cost (XRD)                                                  ,                 0.046257,      9.3%
 - Storage Cost (XRD)                                                       ,            0.14200210327,     28.6%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  6160989,    100.0%
+Execution Cost Breakdown                                                   ,                  6163842,    100.0%
 - AfterInvoke                                                              ,                      534,      0.0%
 - AllocateNodeId                                                           ,                     2134,      0.0%
 - BeforeInvoke                                                             ,                     3316,      0.1%
@@ -29,7 +29,7 @@ Execution Cost Breakdown                                                   ,
 - PinNode                                                                  ,                      252,      0.0%
 - PrepareWasmCode                                                          ,                   353866,      5.7%
 - QueryActor                                                               ,                     4500,      0.1%
-- ReadSubstate                                                             ,                   576095,      9.4%
+- ReadSubstate                                                             ,                   576095,      9.3%
 - RunNativeCode::AuthZone_push                                             ,                    23850,      0.4%
 - RunNativeCode::Worktop_drop                                              ,                    17918,      0.3%
 - RunNativeCode::Worktop_put                                               ,                    29033,      0.5%
@@ -48,7 +48,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::put_NonFungibleVault                                      ,                    35354,      0.6%
 - RunNativeCode::store_account_locker                                      ,                    62556,      1.0%
 - RunNativeCode::unlock_amount_FungibleVault                               ,                    23272,      0.4%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.4%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.4%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      151,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/013--account-locker-airdrop-non-fungibles-by-amount-and-try-direct-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/013--account-locker-airdrop-non-fungibles-by-amount-and-try-direct-deposit.txt
index c82f31e159..b0f630135b 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/013--account-locker-airdrop-non-fungibles-by-amount-and-try-direct-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/013--account-locker-airdrop-non-fungibles-by-amount-and-try-direct-deposit.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.71662556101,    100.0%
-- Execution Cost (XRD)                                                     ,                0.4191023,     58.5%
+Total Cost (XRD)                                                           ,            0.71676821101,    100.0%
+- Execution Cost (XRD)                                                     ,               0.41924495,     58.5%
 - Finalization Cost (XRD)                                                  ,                0.0775106,     10.8%
 - Storage Cost (XRD)                                                       ,            0.22001266101,     30.7%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  8382046,    100.0%
+Execution Cost Breakdown                                                   ,                  8384899,    100.0%
 - AfterInvoke                                                              ,                      962,      0.0%
 - AllocateNodeId                                                           ,                     3686,      0.0%
 - BeforeInvoke                                                             ,                     5852,      0.1%
@@ -51,7 +51,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::take_NonFungibleBucket                                    ,                    67842,      0.8%
 - RunNativeCode::try_deposit_or_refund                                     ,                   264342,      3.2%
 - RunNativeCode::unlock_amount_FungibleVault                               ,                    23272,      0.3%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.3%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.3%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      453,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/014--account-locker-airdrop-non-fungibles-by-amount-and-dont-try-direct-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/014--account-locker-airdrop-non-fungibles-by-amount-and-dont-try-direct-deposit.txt
index e9fe0ea9be..726e00a71e 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/014--account-locker-airdrop-non-fungibles-by-amount-and-dont-try-direct-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/014--account-locker-airdrop-non-fungibles-by-amount-and-dont-try-direct-deposit.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.66653331381,    100.0%
-- Execution Cost (XRD)                                                     ,                0.3730744,     56.0%
+Total Cost (XRD)                                                           ,            0.66667596381,    100.0%
+- Execution Cost (XRD)                                                     ,               0.37321705,     56.0%
 - Finalization Cost (XRD)                                                  ,               0.07726095,     11.6%
 - Storage Cost (XRD)                                                       ,            0.21619796381,     32.4%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  7461488,    100.0%
+Execution Cost Breakdown                                                   ,                  7464341,    100.0%
 - AfterInvoke                                                              ,                      850,      0.0%
 - AllocateNodeId                                                           ,                     3298,      0.0%
 - BeforeInvoke                                                             ,                     4780,      0.1%
@@ -50,7 +50,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::put_NonFungibleVault                                      ,                   106062,      1.4%
 - RunNativeCode::take_NonFungibleBucket                                    ,                    67842,      0.9%
 - RunNativeCode::unlock_amount_FungibleVault                               ,                    23272,      0.3%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.3%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.4%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      453,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/015--account-locker-airdrop-non-fungibles-by-ids-and-try-direct-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/015--account-locker-airdrop-non-fungibles-by-ids-and-try-direct-deposit.txt
index c16a4c4478..3590b4f555 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/015--account-locker-airdrop-non-fungibles-by-ids-and-try-direct-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/015--account-locker-airdrop-non-fungibles-by-ids-and-try-direct-deposit.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.65617344779,    100.0%
-- Execution Cost (XRD)                                                     ,                0.4121994,     62.8%
-- Finalization Cost (XRD)                                                  ,                0.0672582,     10.3%
+Total Cost (XRD)                                                           ,            0.65631609779,    100.0%
+- Execution Cost (XRD)                                                     ,               0.41234205,     62.8%
+- Finalization Cost (XRD)                                                  ,                0.0672582,     10.2%
 - Storage Cost (XRD)                                                       ,            0.17671584779,     26.9%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  8243988,    100.0%
+Execution Cost Breakdown                                                   ,                  8246841,    100.0%
 - AfterInvoke                                                              ,                      898,      0.0%
 - AllocateNodeId                                                           ,                     3492,      0.0%
 - BeforeInvoke                                                             ,                     5678,      0.1%
@@ -16,7 +16,7 @@ Execution Cost Breakdown                                                   ,
 - GetOwnedNodes                                                            ,                     1000,      0.0%
 - LockFee                                                                  ,                      500,      0.0%
 - MarkSubstateAsTransient                                                  ,                      165,      0.0%
-- OpenSubstate::GlobalAccount                                              ,                   944038,     11.5%
+- OpenSubstate::GlobalAccount                                              ,                   944038,     11.4%
 - OpenSubstate::GlobalAccountLocker                                        ,                    84694,      1.0%
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   164648,      2.0%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      0.5%
@@ -50,7 +50,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::take_non_fungibles_NonFungibleBucket                      ,                    69156,      0.8%
 - RunNativeCode::try_deposit_or_refund                                     ,                   264342,      3.2%
 - RunNativeCode::unlock_amount_FungibleVault                               ,                    23272,      0.3%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.3%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.3%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      453,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/016--account-locker-airdrop-non-fungibles-by-ids-and-dont-try-direct-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/016--account-locker-airdrop-non-fungibles-by-ids-and-dont-try-direct-deposit.txt
index 9504f85375..c8db2e7f03 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/016--account-locker-airdrop-non-fungibles-by-ids-and-dont-try-direct-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/016--account-locker-airdrop-non-fungibles-by-ids-and-dont-try-direct-deposit.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.60608120059,    100.0%
-- Execution Cost (XRD)                                                     ,                0.3661715,     60.4%
+Total Cost (XRD)                                                           ,            0.60622385059,    100.0%
+- Execution Cost (XRD)                                                     ,               0.36631415,     60.4%
 - Finalization Cost (XRD)                                                  ,               0.06700855,     11.1%
 - Storage Cost (XRD)                                                       ,            0.17290115059,     28.5%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  7323430,    100.0%
+Execution Cost Breakdown                                                   ,                  7326283,    100.0%
 - AfterInvoke                                                              ,                      786,      0.0%
 - AllocateNodeId                                                           ,                     3104,      0.0%
 - BeforeInvoke                                                             ,                     4606,      0.1%
@@ -49,7 +49,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::put_NonFungibleVault                                      ,                   106062,      1.4%
 - RunNativeCode::take_non_fungibles_NonFungibleBucket                      ,                    69156,      0.9%
 - RunNativeCode::unlock_amount_FungibleVault                               ,                    23272,      0.3%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.3%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.4%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      453,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/017--account-locker-global-caller-badge-is-an-authorized-depositor.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/017--account-locker-global-caller-badge-is-an-authorized-depositor.txt
index 1fac9c3bc6..fec1b6bef6 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/017--account-locker-global-caller-badge-is-an-authorized-depositor.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/017--account-locker-global-caller-badge-is-an-authorized-depositor.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.46517753228,    100.0%
-- Execution Cost (XRD)                                                     ,               0.29578765,     63.6%
+Total Cost (XRD)                                                           ,            0.46532018228,    100.0%
+- Execution Cost (XRD)                                                     ,                0.2959303,     63.6%
 - Finalization Cost (XRD)                                                  ,               0.03625695,      7.8%
 - Storage Cost (XRD)                                                       ,            0.13313293228,     28.6%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5915753,    100.0%
+Execution Cost Breakdown                                                   ,                  5918606,    100.0%
 - AfterInvoke                                                              ,                      568,      0.0%
 - AllocateNodeId                                                           ,                     2231,      0.0%
 - BeforeInvoke                                                             ,                     3620,      0.1%
@@ -28,7 +28,7 @@ Execution Cost Breakdown                                                   ,
 - PinNode                                                                  ,                      264,      0.0%
 - PrepareWasmCode                                                          ,                   353866,      6.0%
 - QueryActor                                                               ,                     4500,      0.1%
-- ReadSubstate                                                             ,                   541449,      9.2%
+- ReadSubstate                                                             ,                   541449,      9.1%
 - RunNativeCode::AuthZone_push                                             ,                    23850,      0.4%
 - RunNativeCode::Worktop_drop                                              ,                    17918,      0.3%
 - RunNativeCode::Worktop_put                                               ,                    29033,      0.5%
@@ -47,7 +47,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::store_account_locker                                      ,                    62556,      1.1%
 - RunNativeCode::try_deposit_or_refund                                     ,                    88114,      1.5%
 - RunNativeCode::unlock_amount_FungibleVault                               ,                    23272,      0.4%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.4%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    25440,      0.4%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/018--account-locker-claim-fungibles-by-amount.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/018--account-locker-claim-fungibles-by-amount.txt
index cada0e2e13..3d9a7a02ab 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/018--account-locker-claim-fungibles-by-amount.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/018--account-locker-claim-fungibles-by-amount.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.43425317401,    100.0%
-- Execution Cost (XRD)                                                     ,               0.26856355,     61.8%
+Total Cost (XRD)                                                           ,            0.43439582401,    100.0%
+- Execution Cost (XRD)                                                     ,                0.2687062,     61.9%
 - Finalization Cost (XRD)                                                  ,               0.03150765,      7.3%
 - Storage Cost (XRD)                                                       ,            0.13418197401,     30.9%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5371271,    100.0%
+Execution Cost Breakdown                                                   ,                  5374124,    100.0%
 - AfterInvoke                                                              ,                      676,      0.0%
 - AllocateNodeId                                                           ,                     1940,      0.0%
 - BeforeInvoke                                                             ,                     2138,      0.0%
@@ -42,7 +42,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.8%
 - RunNativeCode::put_FungibleVault                                         ,                    24554,      0.5%
 - RunNativeCode::take_FungibleVault                                        ,                    42457,      0.8%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.5%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    20840,      0.4%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/019--account-locker-claim-non-fungibles-by-amount.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/019--account-locker-claim-non-fungibles-by-amount.txt
index a104071320..f4e2a68cdc 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/019--account-locker-claim-non-fungibles-by-amount.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/019--account-locker-claim-non-fungibles-by-amount.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.39575012313,    100.0%
-- Execution Cost (XRD)                                                     ,               0.26998645,     68.2%
+Total Cost (XRD)                                                           ,            0.39589277313,    100.0%
+- Execution Cost (XRD)                                                     ,                0.2701291,     68.2%
 - Finalization Cost (XRD)                                                  ,               0.03125455,      7.9%
 - Storage Cost (XRD)                                                       ,            0.09450912313,     23.9%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5399729,    100.0%
+Execution Cost Breakdown                                                   ,                  5402582,    100.0%
 - AfterInvoke                                                              ,                      560,      0.0%
 - AllocateNodeId                                                           ,                     1746,      0.0%
 - BeforeInvoke                                                             ,                     2100,      0.0%
@@ -28,7 +28,7 @@ Execution Cost Breakdown                                                   ,
 - OpenSubstate::InternalKeyValueStore                                      ,                   161799,      3.0%
 - OpenSubstate::InternalNonFungibleVault                                   ,                   170520,      3.2%
 - PinNode                                                                  ,                      216,      0.0%
-- PrepareWasmCode                                                          ,                   353866,      6.6%
+- PrepareWasmCode                                                          ,                   353866,      6.5%
 - QueryActor                                                               ,                     3000,      0.1%
 - ReadSubstate                                                             ,                   523280,      9.7%
 - RunNativeCode::AuthZone_assert_access_rule                               ,                    13204,      0.2%
@@ -36,7 +36,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::Worktop_drop                                              ,                    17918,      0.3%
 - RunNativeCode::Worktop_put                                               ,                    29033,      0.5%
 - RunNativeCode::claim_account_locker                                      ,                    69736,      1.3%
-- RunNativeCode::deposit_batch                                             ,                   110731,      2.1%
+- RunNativeCode::deposit_batch                                             ,                   110731,      2.0%
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.3%
 - RunNativeCode::get_amount_NonFungibleBucket                              ,                    13581,      0.3%
 - RunNativeCode::get_non_fungible_local_ids_NonFungibleBucket              ,                    23886,      0.4%
@@ -44,7 +44,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.8%
 - RunNativeCode::put_NonFungibleVault                                      ,                    35354,      0.7%
 - RunNativeCode::take_NonFungibleVault                                     ,                    64737,      1.2%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.5%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      151,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/020--account-locker-claim-non-fungibles-by-ids.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/020--account-locker-claim-non-fungibles-by-ids.txt
index f5b94ba3b3..204b20770a 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/020--account-locker-claim-non-fungibles-by-ids.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/020--account-locker-claim-non-fungibles-by-ids.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.39407684056,    100.0%
-- Execution Cost (XRD)                                                     ,                0.2682178,     68.1%
+Total Cost (XRD)                                                           ,            0.39421949056,    100.0%
+- Execution Cost (XRD)                                                     ,               0.26836045,     68.1%
 - Finalization Cost (XRD)                                                  ,               0.03125455,      7.9%
 - Storage Cost (XRD)                                                       ,            0.09460449056,     24.0%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5364356,    100.0%
+Execution Cost Breakdown                                                   ,                  5367209,    100.0%
 - AfterInvoke                                                              ,                      560,      0.0%
 - AllocateNodeId                                                           ,                     1746,      0.0%
 - BeforeInvoke                                                             ,                     2104,      0.0%
@@ -21,7 +21,7 @@ Execution Cost Breakdown                                                   ,
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   121872,      2.3%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      0.8%
 - OpenSubstate::GlobalNonFungibleResourceManager                           ,                   128557,      2.4%
-- OpenSubstate::GlobalPackage                                              ,                  2577705,     48.1%
+- OpenSubstate::GlobalPackage                                              ,                  2577705,     48.0%
 - OpenSubstate::InternalFungibleVault                                      ,                    90202,      1.7%
 - OpenSubstate::InternalGenericComponent                                   ,                    59380,      1.1%
 - OpenSubstate::InternalKeyValueStore                                      ,                   161799,      3.0%
@@ -29,7 +29,7 @@ Execution Cost Breakdown                                                   ,
 - PinNode                                                                  ,                      216,      0.0%
 - PrepareWasmCode                                                          ,                   353866,      6.6%
 - QueryActor                                                               ,                     3000,      0.1%
-- ReadSubstate                                                             ,                   523280,      9.8%
+- ReadSubstate                                                             ,                   523280,      9.7%
 - RemoveSubstate                                                           ,                    40717,      0.8%
 - RunNativeCode::AuthZone_assert_access_rule                               ,                    13204,      0.2%
 - RunNativeCode::Worktop_drain                                             ,                    11224,      0.2%
@@ -44,7 +44,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.8%
 - RunNativeCode::put_NonFungibleVault                                      ,                    35354,      0.7%
 - RunNativeCode::take_non_fungibles                                        ,                    64562,      1.2%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.5%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      151,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/021--account-locker-recover-fungibles-by-amount.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/021--account-locker-recover-fungibles-by-amount.txt
index eb0aa73dde..b9cacb69af 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/021--account-locker-recover-fungibles-by-amount.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/021--account-locker-recover-fungibles-by-amount.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.43348299717,    100.0%
-- Execution Cost (XRD)                                                     ,               0.29097445,     67.1%
+Total Cost (XRD)                                                           ,            0.43362564717,    100.0%
+- Execution Cost (XRD)                                                     ,                0.2911171,     67.1%
 - Finalization Cost (XRD)                                                  ,               0.02625565,      6.1%
 - Storage Cost (XRD)                                                       ,            0.11625289717,     26.8%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5819489,    100.0%
+Execution Cost Breakdown                                                   ,                  5822342,    100.0%
 - AfterInvoke                                                              ,                      616,      0.0%
 - AllocateNodeId                                                           ,                     2134,      0.0%
 - BeforeInvoke                                                             ,                     3426,      0.1%
@@ -21,7 +21,7 @@ Execution Cost Breakdown                                                   ,
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   291970,      5.0%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      0.8%
 - OpenSubstate::GlobalNonFungibleResourceManager                           ,                    41352,      0.7%
-- OpenSubstate::GlobalPackage                                              ,                  2371668,     40.8%
+- OpenSubstate::GlobalPackage                                              ,                  2371668,     40.7%
 - OpenSubstate::InternalFungibleVault                                      ,                   349614,      6.0%
 - OpenSubstate::InternalGenericComponent                                   ,                    75830,      1.3%
 - OpenSubstate::InternalKeyValueStore                                      ,                   161799,      2.8%
@@ -46,7 +46,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::recover_account_locker                                    ,                    56273,      1.0%
 - RunNativeCode::take_FungibleVault                                        ,                    42457,      0.7%
 - RunNativeCode::unlock_amount_FungibleVault                               ,                    23272,      0.4%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.4%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    29840,      0.5%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/022--account-locker-recover-non-fungibles-by-amount.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/022--account-locker-recover-non-fungibles-by-amount.txt
index 0be92f2c26..1738a6d678 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/022--account-locker-recover-non-fungibles-by-amount.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/022--account-locker-recover-non-fungibles-by-amount.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.45502652974,    100.0%
-- Execution Cost (XRD)                                                     ,                 0.302614,     66.5%
+Total Cost (XRD)                                                           ,            0.45516917974,    100.0%
+- Execution Cost (XRD)                                                     ,               0.30275665,     66.5%
 - Finalization Cost (XRD)                                                  ,                 0.036255,      8.0%
 - Storage Cost (XRD)                                                       ,            0.11615752974,     25.5%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  6052280,    100.0%
+Execution Cost Breakdown                                                   ,                  6055133,    100.0%
 - AfterInvoke                                                              ,                      564,      0.0%
 - AllocateNodeId                                                           ,                     2134,      0.0%
 - BeforeInvoke                                                             ,                     3490,      0.1%
@@ -49,7 +49,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::recover_account_locker                                    ,                    56273,      0.9%
 - RunNativeCode::take_NonFungibleVault                                     ,                    64737,      1.1%
 - RunNativeCode::unlock_amount_FungibleVault                               ,                    23272,      0.4%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.4%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      151,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/023--account-locker-recover-non-fungibles-by-ids.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/023--account-locker-recover-non-fungibles-by-ids.txt
index e151ed405e..f8c8f4d51a 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/023--account-locker-recover-non-fungibles-by-ids.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/costings/023--account-locker-recover-non-fungibles-by-ids.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.52402928291,    100.0%
-- Execution Cost (XRD)                                                     ,               0.32140535,     61.3%
+Total Cost (XRD)                                                           ,            0.52417193291,    100.0%
+- Execution Cost (XRD)                                                     ,                 0.321548,     61.3%
 - Finalization Cost (XRD)                                                  ,               0.04650745,      8.9%
 - Storage Cost (XRD)                                                       ,            0.15611648291,     29.8%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  6428107,    100.0%
+Execution Cost Breakdown                                                   ,                  6430960,    100.0%
 - AfterInvoke                                                              ,                      628,      0.0%
 - AllocateNodeId                                                           ,                     2328,      0.0%
 - BeforeInvoke                                                             ,                     3596,      0.1%
@@ -50,7 +50,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::recover_non_fungibles_account_locker                      ,                    64973,      1.0%
 - RunNativeCode::take_non_fungibles                                        ,                    64562,      1.0%
 - RunNativeCode::unlock_amount_FungibleVault                               ,                    23272,      0.4%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.4%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.4%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      151,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/001--account-locker-create-accounts.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/001--account-locker-create-accounts.txt
index 5baf5b1578..6666d208e5 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/001--account-locker-create-accounts.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/001--account-locker-create-accounts.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.67025233325 XRD
-├─ Network execution: 0.22265655 XRD, 4453131 execution cost units
+TRANSACTION COST: 0.67039498325 XRD
+├─ Network execution: 0.2227992 XRD, 4455984 execution cost units
 ├─ Network finalization: 0.13526745 XRD, 2705349 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.31232833325 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.67025233325"),
+     amount: Decimal("0.67039498325"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.335126166625"),
+     amount: Decimal("0.335197491625"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.335126166625"),
+     amount: Decimal("0.335197491625"),
    }
 
 STATE UPDATES: 10 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 10 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.1675630833125"),
+             0u8 => Decimal("0.1675987458125"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -67,7 +67,7 @@ STATE UPDATES: 10 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999999.32974766675")),
+         LiquidFungibleResource(Decimal("99999999999999999.32960501675")),
        )
 ├─ account_sim1cx4qy6q2aa9vgl3x87nny50nephemg6yntq95neulu85hndy5wwzkh across 5 partitions
   ├─ Partition(2): 1 change
@@ -418,7 +418,7 @@ STATE UPDATES: 10 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.335126166625")),
+         LiquidFungibleResource(Decimal("0.335197491625")),
        )
 
 OUTPUTS: 6
@@ -432,10 +432,10 @@ OUTPUTS: 6
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.67025233325
+   Change: -0.67039498325
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.335126166625
+   Change: 0.335197491625
 
 NEW ENTITIES: 5
 ├─ Component: account_sim1cx4qy6q2aa9vgl3x87nny50nephemg6yntq95neulu85hndy5wwzkh
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/002--account-locker-create-account-locker.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/002--account-locker-create-account-locker.txt
index 08532393a0..e5eabf0e9c 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/002--account-locker-create-account-locker.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/002--account-locker-create-account-locker.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.71703632689 XRD
-├─ Network execution: 0.2633991 XRD, 5267982 execution cost units
+TRANSACTION COST: 0.71717897689 XRD
+├─ Network execution: 0.26354175 XRD, 5270835 execution cost units
 ├─ Network finalization: 0.146268 XRD, 2925360 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.30736922689 XRD
@@ -33,15 +33,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.71703632689"),
+     amount: Decimal("0.71717897689"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.358518163445"),
+     amount: Decimal("0.358589488445"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.358518163445"),
+     amount: Decimal("0.358589488445"),
    }
 
 STATE UPDATES: 9 entities
@@ -51,7 +51,7 @@ STATE UPDATES: 9 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.346822165035"),
+             0u8 => Decimal("0.346893490035"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -90,7 +90,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999998.61271133986")),
+         LiquidFungibleResource(Decimal("99999999999999998.61242603986")),
        )
 ├─ locker_sim1dp8g5xtahznlr27t3jagtplg24d5sfqr2r799h3qfl3jpmdxu7wlr3 across 4 partitions
   ├─ Partition(2): 1 change
@@ -350,7 +350,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.69364433007")),
+         LiquidFungibleResource(Decimal("0.69378698007")),
        )
 
 OUTPUTS: 3
@@ -364,13 +364,13 @@ OUTPUTS: 3
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.71703632689
+   Change: -0.71717897689
 ├─ Vault: internal_vault_sim1tzjmjma6hatpvy7uzs07x06dlqzry6cwz55grlkwpkxxgd6medwp2f
    ResAddr: resource_sim1tkgvw0yvyt0vpyzrlkw38rplh5pmgny372rcpxp3973df6yfwqttyw
    Change: 1
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.358518163445
+   Change: 0.358589488445
 
 NEW ENTITIES: 2
 └─ Component: locker_sim1dp8g5xtahznlr27t3jagtplg24d5sfqr2r799h3qfl3jpmdxu7wlr3
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/003--account-locker-create-resources.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/003--account-locker-create-resources.txt
index 1d2092845e..9193eb7349 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/003--account-locker-create-resources.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/003--account-locker-create-resources.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.70117770564 XRD
-├─ Network execution: 0.1916238 XRD, 3832476 execution cost units
+TRANSACTION COST: 0.70132035564 XRD
+├─ Network execution: 0.19176645 XRD, 3835329 execution cost units
 ├─ Network finalization: 0.19026375 XRD, 3805275 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.31929015564 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.70117770564"),
+     amount: Decimal("0.70132035564"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.35058885282"),
+     amount: Decimal("0.35066017782"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.35058885282"),
+     amount: Decimal("0.35066017782"),
    }
 
 STATE UPDATES: 7 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 7 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.522116591445"),
+             0u8 => Decimal("0.522223578945"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -67,7 +67,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999997.91153363422")),
+         LiquidFungibleResource(Decimal("99999999999999997.91110568422")),
        )
 ├─ resource_sim1t5820sqdx0jf9zgjd5ge6y0fvfxsnx6dlh5sgfkm4nemgz44q0v7xk across 4 partitions
   ├─ Partition(5): 1 change
@@ -322,7 +322,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("1.04423318289")),
+         LiquidFungibleResource(Decimal("1.04444715789")),
        )
 
 OUTPUTS: 3
@@ -333,10 +333,10 @@ OUTPUTS: 3
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.70117770564
+   Change: -0.70132035564
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.35058885282
+   Change: 0.35066017782
 
 NEW ENTITIES: 2
 ├─ Resource: resource_sim1t5820sqdx0jf9zgjd5ge6y0fvfxsnx6dlh5sgfkm4nemgz44q0v7xk
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/004--account-locker-setting-up-account-deposit-rules.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/004--account-locker-setting-up-account-deposit-rules.txt
index 69ddd5c736..7de38b652f 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/004--account-locker-setting-up-account-deposit-rules.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/004--account-locker-setting-up-account-deposit-rules.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.42376999385 XRD
-├─ Network execution: 0.23086785 XRD, 4617357 execution cost units
+TRANSACTION COST: 0.42391264385 XRD
+├─ Network execution: 0.2310105 XRD, 4620210 execution cost units
 ├─ Network finalization: 0.03125435 XRD, 625087 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.16164779385 XRD
@@ -39,15 +39,15 @@ EVENTS: 8
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.42376999385"),
+     amount: Decimal("0.42391264385"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.211884996925"),
+     amount: Decimal("0.211956321925"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.211884996925"),
+     amount: Decimal("0.211956321925"),
    }
 
 STATE UPDATES: 8 entities
@@ -57,7 +57,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.6280590899075"),
+             0u8 => Decimal("0.6282017399075"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -115,13 +115,13 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999997.48776364037")),
+         LiquidFungibleResource(Decimal("99999999999999997.48719304037")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("1.256118179815")),
+         LiquidFungibleResource(Decimal("1.256403479815")),
        )
 
 OUTPUTS: 5
@@ -134,9 +134,9 @@ OUTPUTS: 5
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.42376999385
+   Change: -0.42391264385
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.211884996925
+   Change: 0.211956321925
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/005--account-locker-send-fungibles-and-try-direct-deposit-succeeds.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/005--account-locker-send-fungibles-and-try-direct-deposit-succeeds.txt
index fc8dc95b06..5fcdea528a 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/005--account-locker-send-fungibles-and-try-direct-deposit-succeeds.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/005--account-locker-send-fungibles-and-try-direct-deposit-succeeds.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.46517753228 XRD
-├─ Network execution: 0.29578765 XRD, 5915753 execution cost units
+TRANSACTION COST: 0.46532018228 XRD
+├─ Network execution: 0.2959303 XRD, 5918606 execution cost units
 ├─ Network finalization: 0.03625695 XRD, 725139 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.13313293228 XRD
@@ -33,15 +33,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.46517753228"),
+     amount: Decimal("0.46532018228"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.23258876614"),
+     amount: Decimal("0.23266009114"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.23258876614"),
+     amount: Decimal("0.23266009114"),
    }
 
 STATE UPDATES: 9 entities
@@ -51,7 +51,7 @@ STATE UPDATES: 9 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.7443534729775"),
+             0u8 => Decimal("0.7445317854775"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -96,7 +96,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999997.02258610809")),
+         LiquidFungibleResource(Decimal("99999999999999997.02187285809")),
        )
 ├─ internal_vault_sim1tzjmjma6hatpvy7uzs07x06dlqzry6cwz55grlkwpkxxgd6medwp2f across 1 partitions
   └─ Partition(64): 1 change
@@ -137,7 +137,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("1.488706945955")),
+         LiquidFungibleResource(Decimal("1.489063570955")),
        )
 
 OUTPUTS: 5
@@ -150,12 +150,12 @@ OUTPUTS: 5
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.46517753228
+   Change: -0.46532018228
 ├─ Vault: internal_vault_sim1tq9fel5e3slzv27grm0ym4qpe3c4934d7qttkahkayyngt75577yp4
    ResAddr: resource_sim1t5820sqdx0jf9zgjd5ge6y0fvfxsnx6dlh5sgfkm4nemgz44q0v7xk
    Change: 100
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.23258876614
+   Change: 0.23266009114
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/006--account-locker-send-fungibles-and-try-direct-deposit-refunds.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/006--account-locker-send-fungibles-and-try-direct-deposit-refunds.txt
index a3c06754b8..0dd21bfaa7 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/006--account-locker-send-fungibles-and-try-direct-deposit-refunds.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/006--account-locker-send-fungibles-and-try-direct-deposit-refunds.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.53579939639 XRD
-├─ Network execution: 0.30566605 XRD, 6113321 execution cost units
+TRANSACTION COST: 0.53594204639 XRD
+├─ Network execution: 0.3058087 XRD, 6116174 execution cost units
 ├─ Network finalization: 0.05151015 XRD, 1030203 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.17862319639 XRD
@@ -41,15 +41,15 @@ EVENTS: 9
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.53579939639"),
+     amount: Decimal("0.53594204639"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.267899698195"),
+     amount: Decimal("0.267971023195"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.267899698195"),
+     amount: Decimal("0.267971023195"),
    }
 
 STATE UPDATES: 10 entities
@@ -59,7 +59,7 @@ STATE UPDATES: 10 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.878303322075"),
+             0u8 => Decimal("0.878517297075"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -104,7 +104,7 @@ STATE UPDATES: 10 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999996.4867867117")),
+         LiquidFungibleResource(Decimal("99999999999999996.4859308117")),
        )
 ├─ internal_vault_sim1tzjmjma6hatpvy7uzs07x06dlqzry6cwz55grlkwpkxxgd6medwp2f across 1 partitions
   └─ Partition(64): 1 change
@@ -190,7 +190,7 @@ STATE UPDATES: 10 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("1.75660664415")),
+         LiquidFungibleResource(Decimal("1.75703459415")),
        )
 
 OUTPUTS: 5
@@ -203,12 +203,12 @@ OUTPUTS: 5
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.53579939639
+   Change: -0.53594204639
 ├─ Vault: internal_vault_sim1tqf9qqqfurkf2qf7exnh2tupdqnrcf49seskepj9jjye78truj7dsx
    ResAddr: resource_sim1t5820sqdx0jf9zgjd5ge6y0fvfxsnx6dlh5sgfkm4nemgz44q0v7xk
    Change: 100
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.267899698195
+   Change: 0.267971023195
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/007--account-locker-send-fungibles-and-dont-try-direct-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/007--account-locker-send-fungibles-and-dont-try-direct-deposit.txt
index aecd0b5af8..c4f0c903b2 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/007--account-locker-send-fungibles-and-dont-try-direct-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/007--account-locker-send-fungibles-and-dont-try-direct-deposit.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.50129634194 XRD
-├─ Network execution: 0.282381 XRD, 5647620 execution cost units
+TRANSACTION COST: 0.50143899194 XRD
+├─ Network execution: 0.28252365 XRD, 5650473 execution cost units
 ├─ Network finalization: 0.0512594 XRD, 1025188 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.16765594194 XRD
@@ -36,15 +36,15 @@ EVENTS: 8
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.50129634194"),
+     amount: Decimal("0.50143899194"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.25064817097"),
+     amount: Decimal("0.25071949597"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.25064817097"),
+     amount: Decimal("0.25071949597"),
    }
 
 STATE UPDATES: 10 entities
@@ -54,7 +54,7 @@ STATE UPDATES: 10 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.00362740756"),
+             0u8 => Decimal("1.00387704506"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -99,7 +99,7 @@ STATE UPDATES: 10 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999995.98549036976")),
+         LiquidFungibleResource(Decimal("99999999999999995.98449181976")),
        )
 ├─ internal_vault_sim1tzjmjma6hatpvy7uzs07x06dlqzry6cwz55grlkwpkxxgd6medwp2f across 1 partitions
   └─ Partition(64): 1 change
@@ -185,7 +185,7 @@ STATE UPDATES: 10 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("2.00725481512")),
+         LiquidFungibleResource(Decimal("2.00775409012")),
        )
 
 OUTPUTS: 5
@@ -198,12 +198,12 @@ OUTPUTS: 5
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.50129634194
+   Change: -0.50143899194
 ├─ Vault: internal_vault_sim1tpgwdt3l9whdtw6e7m73xfnp8z34nj5atqh78rqtx7trdpvtl0k7z6
    ResAddr: resource_sim1t5820sqdx0jf9zgjd5ge6y0fvfxsnx6dlh5sgfkm4nemgz44q0v7xk
    Change: 100
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.25064817097
+   Change: 0.25071949597
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/008--account-locker-airdrop-fungibles-and-try-direct-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/008--account-locker-airdrop-fungibles-and-try-direct-deposit.txt
index 80c0ef1abf..2e38733cff 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/008--account-locker-airdrop-fungibles-and-try-direct-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/008--account-locker-airdrop-fungibles-and-try-direct-deposit.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.61621290122 XRD
-├─ Network execution: 0.372817 XRD, 7456340 execution cost units
+TRANSACTION COST: 0.61635555122 XRD
+├─ Network execution: 0.37295965 XRD, 7459193 execution cost units
 ├─ Network finalization: 0.0475112 XRD, 950224 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.19588470122 XRD
@@ -59,15 +59,15 @@ EVENTS: 13
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.61621290122"),
+     amount: Decimal("0.61635555122"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.30810645061"),
+     amount: Decimal("0.30817777561"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.30810645061"),
+     amount: Decimal("0.30817777561"),
    }
 
 STATE UPDATES: 11 entities
@@ -77,7 +77,7 @@ STATE UPDATES: 11 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.157680632865"),
+             0u8 => Decimal("1.157965932865"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -122,7 +122,7 @@ STATE UPDATES: 11 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999995.36927746854")),
+         LiquidFungibleResource(Decimal("99999999999999995.36813626854")),
        )
 ├─ internal_vault_sim1tzjmjma6hatpvy7uzs07x06dlqzry6cwz55grlkwpkxxgd6medwp2f across 1 partitions
   └─ Partition(64): 1 change
@@ -175,7 +175,7 @@ STATE UPDATES: 11 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("2.31536126573")),
+         LiquidFungibleResource(Decimal("2.31593186573")),
        )
 
 OUTPUTS: 5
@@ -188,7 +188,7 @@ OUTPUTS: 5
 BALANCE CHANGES: 5
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.61621290122
+   Change: -0.61635555122
 ├─ Vault: internal_vault_sim1tqf9qqqfurkf2qf7exnh2tupdqnrcf49seskepj9jjye78truj7dsx
    ResAddr: resource_sim1t5820sqdx0jf9zgjd5ge6y0fvfxsnx6dlh5sgfkm4nemgz44q0v7xk
    Change: 100
@@ -200,6 +200,6 @@ BALANCE CHANGES: 5
    Change: 100
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.30810645061
+   Change: 0.30817777561
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/009--account-locker-airdrop-fungibles-and-dont-try-direct-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/009--account-locker-airdrop-fungibles-and-dont-try-direct-deposit.txt
index 9922df7153..18b2828c85 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/009--account-locker-airdrop-fungibles-and-dont-try-direct-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/009--account-locker-airdrop-fungibles-and-dont-try-direct-deposit.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.61542839676 XRD
-├─ Network execution: 0.33076825 XRD, 6615365 execution cost units
+TRANSACTION COST: 0.61557104676 XRD
+├─ Network execution: 0.3309109 XRD, 6618218 execution cost units
 ├─ Network finalization: 0.0622633 XRD, 1245266 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.22239684676 XRD
@@ -60,15 +60,15 @@ EVENTS: 12
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.61542839676"),
+     amount: Decimal("0.61557104676"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.30771419838"),
+     amount: Decimal("0.30778552338"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.30771419838"),
+     amount: Decimal("0.30778552338"),
    }
 
 STATE UPDATES: 12 entities
@@ -78,7 +78,7 @@ STATE UPDATES: 12 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.311537732055"),
+             0u8 => Decimal("1.311858694555"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -123,7 +123,7 @@ STATE UPDATES: 12 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999994.75384907178")),
+         LiquidFungibleResource(Decimal("99999999999999994.75256522178")),
        )
 ├─ internal_vault_sim1tzjmjma6hatpvy7uzs07x06dlqzry6cwz55grlkwpkxxgd6medwp2f across 1 partitions
   └─ Partition(64): 1 change
@@ -221,7 +221,7 @@ STATE UPDATES: 12 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("2.62307546411")),
+         LiquidFungibleResource(Decimal("2.62371738911")),
        )
 
 OUTPUTS: 5
@@ -234,7 +234,7 @@ OUTPUTS: 5
 BALANCE CHANGES: 5
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.61542839676
+   Change: -0.61557104676
 ├─ Vault: internal_vault_sim1tqf9qqqfurkf2qf7exnh2tupdqnrcf49seskepj9jjye78truj7dsx
    ResAddr: resource_sim1t5820sqdx0jf9zgjd5ge6y0fvfxsnx6dlh5sgfkm4nemgz44q0v7xk
    Change: 100
@@ -246,6 +246,6 @@ BALANCE CHANGES: 5
    Change: 100
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.30771419838
+   Change: 0.30778552338
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/010--account-locker-send-non-fungibles-and-try-direct-deposit-succeeds.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/010--account-locker-send-non-fungibles-and-try-direct-deposit-succeeds.txt
index 4adfa80f7b..16d80f3b66 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/010--account-locker-send-non-fungibles-and-try-direct-deposit-succeeds.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/010--account-locker-send-non-fungibles-and-try-direct-deposit-succeeds.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.51112871523 XRD
-├─ Network execution: 0.3255403 XRD, 6510806 execution cost units
+TRANSACTION COST: 0.51127136523 XRD
+├─ Network execution: 0.32568295 XRD, 6513659 execution cost units
 ├─ Network finalization: 0.0462566 XRD, 925132 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.13933181523 XRD
@@ -39,15 +39,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.51112871523"),
+     amount: Decimal("0.51127136523"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.255564357615"),
+     amount: Decimal("0.255635682615"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.255564357615"),
+     amount: Decimal("0.255635682615"),
    }
 
 STATE UPDATES: 9 entities
@@ -57,7 +57,7 @@ STATE UPDATES: 9 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.4393199108625"),
+             0u8 => Decimal("1.4396765358625"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -105,7 +105,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999994.24272035655")),
+         LiquidFungibleResource(Decimal("99999999999999994.24129385655")),
        )
 ├─ internal_vault_sim1tzjmjma6hatpvy7uzs07x06dlqzry6cwz55grlkwpkxxgd6medwp2f across 1 partitions
   └─ Partition(64): 1 change
@@ -151,7 +151,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("2.878639821725")),
+         LiquidFungibleResource(Decimal("2.879353071725")),
        )
 
 OUTPUTS: 5
@@ -164,12 +164,12 @@ OUTPUTS: 5
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.51112871523
+   Change: -0.51127136523
 ├─ Vault: internal_vault_sim1nz49q5dgwxz5dg2spgwd2vqsfawzywahlw5ztxwpcyjl4p8le2crd6
    ResAddr: resource_sim1n2pnt93g8hmwdkyh4xjw0ldmad3p25hx93t2rw58ke974tpeqemklu
    Change: +{#1#}, -{}
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.255564357615
+   Change: 0.255635682615
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/011--account-locker-send-non-fungibles-and-try-direct-deposit-refunds.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/011--account-locker-send-non-fungibles-and-try-direct-deposit-refunds.txt
index a87264d642..616be04208 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/011--account-locker-send-non-fungibles-and-try-direct-deposit-refunds.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/011--account-locker-send-non-fungibles-and-try-direct-deposit-refunds.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.51112871523 XRD
-├─ Network execution: 0.3255403 XRD, 6510806 execution cost units
+TRANSACTION COST: 0.51127136523 XRD
+├─ Network execution: 0.32568295 XRD, 6513659 execution cost units
 ├─ Network finalization: 0.0462566 XRD, 925132 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.13933181523 XRD
@@ -39,15 +39,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.51112871523"),
+     amount: Decimal("0.51127136523"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.255564357615"),
+     amount: Decimal("0.255635682615"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.255564357615"),
+     amount: Decimal("0.255635682615"),
    }
 
 STATE UPDATES: 9 entities
@@ -57,7 +57,7 @@ STATE UPDATES: 9 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.56710208967"),
+             0u8 => Decimal("1.56749437717"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -105,7 +105,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999993.73159164132")),
+         LiquidFungibleResource(Decimal("99999999999999993.73002249132")),
        )
 ├─ internal_vault_sim1tzjmjma6hatpvy7uzs07x06dlqzry6cwz55grlkwpkxxgd6medwp2f across 1 partitions
   └─ Partition(64): 1 change
@@ -151,7 +151,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("3.13420417934")),
+         LiquidFungibleResource(Decimal("3.13498875434")),
        )
 
 OUTPUTS: 5
@@ -164,12 +164,12 @@ OUTPUTS: 5
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.51112871523
+   Change: -0.51127136523
 ├─ Vault: internal_vault_sim1nzxzp4wznnrxj7xw0ujvpm36q8mvv8kjyjld486cqcsalfk030437p
    ResAddr: resource_sim1n2pnt93g8hmwdkyh4xjw0ldmad3p25hx93t2rw58ke974tpeqemklu
    Change: +{#2#}, -{}
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.255564357615
+   Change: 0.255635682615
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/012--account-locker-send-non-fungibles-and-dont-try-direct-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/012--account-locker-send-non-fungibles-and-dont-try-direct-deposit.txt
index 7756c3562e..eb4023fc90 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/012--account-locker-send-non-fungibles-and-dont-try-direct-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/012--account-locker-send-non-fungibles-and-dont-try-direct-deposit.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.49630855327 XRD
-├─ Network execution: 0.30804945 XRD, 6160989 execution cost units
+TRANSACTION COST: 0.49645120327 XRD
+├─ Network execution: 0.3081921 XRD, 6163842 execution cost units
 ├─ Network finalization: 0.046257 XRD, 925140 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.14200210327 XRD
@@ -42,15 +42,15 @@ EVENTS: 8
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.49630855327"),
+     amount: Decimal("0.49645120327"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.248154276635"),
+     amount: Decimal("0.248225601635"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.248154276635"),
+     amount: Decimal("0.248225601635"),
    }
 
 STATE UPDATES: 9 entities
@@ -60,7 +60,7 @@ STATE UPDATES: 9 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.6911792279875"),
+             0u8 => Decimal("1.6916071779875"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -102,7 +102,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999993.23528308805")),
+         LiquidFungibleResource(Decimal("99999999999999993.23357128805")),
        )
 ├─ internal_vault_sim1tzjmjma6hatpvy7uzs07x06dlqzry6cwz55grlkwpkxxgd6medwp2f across 1 partitions
   └─ Partition(64): 1 change
@@ -152,7 +152,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("3.382358455975")),
+         LiquidFungibleResource(Decimal("3.383214355975")),
        )
 
 OUTPUTS: 5
@@ -165,12 +165,12 @@ OUTPUTS: 5
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.49630855327
+   Change: -0.49645120327
 ├─ Vault: internal_vault_sim1nrstdzgdlu2ka8r8jfzl0a7xj84nznpjr3h63ev255xtz82xuhz405
    ResAddr: resource_sim1n2pnt93g8hmwdkyh4xjw0ldmad3p25hx93t2rw58ke974tpeqemklu
    Change: +{#3#}, -{}
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.248154276635
+   Change: 0.248225601635
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/013--account-locker-airdrop-non-fungibles-by-amount-and-try-direct-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/013--account-locker-airdrop-non-fungibles-by-amount-and-try-direct-deposit.txt
index 364019b270..6fc86f76c5 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/013--account-locker-airdrop-non-fungibles-by-amount-and-try-direct-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/013--account-locker-airdrop-non-fungibles-by-amount-and-try-direct-deposit.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.71662556101 XRD
-├─ Network execution: 0.4191023 XRD, 8382046 execution cost units
+TRANSACTION COST: 0.71676821101 XRD
+├─ Network execution: 0.41924495 XRD, 8384899 execution cost units
 ├─ Network finalization: 0.0775106 XRD, 1550212 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.22001266101 XRD
@@ -77,15 +77,15 @@ EVENTS: 13
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.71662556101"),
+     amount: Decimal("0.71676821101"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.358312780505"),
+     amount: Decimal("0.358384105505"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.358312780505"),
+     amount: Decimal("0.358384105505"),
    }
 
 STATE UPDATES: 11 entities
@@ -95,7 +95,7 @@ STATE UPDATES: 11 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.87033561824"),
+             0u8 => Decimal("1.87079923074"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -141,7 +141,7 @@ STATE UPDATES: 11 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999992.51865752704")),
+         LiquidFungibleResource(Decimal("99999999999999992.51680307704")),
        )
 ├─ internal_vault_sim1tzjmjma6hatpvy7uzs07x06dlqzry6cwz55grlkwpkxxgd6medwp2f across 1 partitions
   └─ Partition(64): 1 change
@@ -213,7 +213,7 @@ STATE UPDATES: 11 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("3.74067123648")),
+         LiquidFungibleResource(Decimal("3.74159846148")),
        )
 
 OUTPUTS: 5
@@ -226,7 +226,7 @@ OUTPUTS: 5
 BALANCE CHANGES: 5
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.71662556101
+   Change: -0.71676821101
 ├─ Vault: internal_vault_sim1nzxzp4wznnrxj7xw0ujvpm36q8mvv8kjyjld486cqcsalfk030437p
    ResAddr: resource_sim1n2pnt93g8hmwdkyh4xjw0ldmad3p25hx93t2rw58ke974tpeqemklu
    Change: +{#4#}, -{}
@@ -238,6 +238,6 @@ BALANCE CHANGES: 5
    Change: +{#5#}, -{}
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.358312780505
+   Change: 0.358384105505
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/014--account-locker-airdrop-non-fungibles-by-amount-and-dont-try-direct-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/014--account-locker-airdrop-non-fungibles-by-amount-and-dont-try-direct-deposit.txt
index 15240e35cd..b1863a4646 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/014--account-locker-airdrop-non-fungibles-by-amount-and-dont-try-direct-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/014--account-locker-airdrop-non-fungibles-by-amount-and-dont-try-direct-deposit.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.66653331381 XRD
-├─ Network execution: 0.3730744 XRD, 7461488 execution cost units
+TRANSACTION COST: 0.66667596381 XRD
+├─ Network execution: 0.37321705 XRD, 7464341 execution cost units
 ├─ Network finalization: 0.07726095 XRD, 1545219 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.21619796381 XRD
@@ -76,15 +76,15 @@ EVENTS: 12
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.66653331381"),
+     amount: Decimal("0.66667596381"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.333266656905"),
+     amount: Decimal("0.333337981905"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.333266656905"),
+     amount: Decimal("0.333337981905"),
    }
 
 STATE UPDATES: 11 entities
@@ -94,7 +94,7 @@ STATE UPDATES: 11 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("2.0369689466925"),
+             0u8 => Decimal("2.0374682216925"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -140,7 +140,7 @@ STATE UPDATES: 11 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999991.85212421323")),
+         LiquidFungibleResource(Decimal("99999999999999991.85012711323")),
        )
 ├─ internal_vault_sim1tzjmjma6hatpvy7uzs07x06dlqzry6cwz55grlkwpkxxgd6medwp2f across 1 partitions
   └─ Partition(64): 1 change
@@ -212,7 +212,7 @@ STATE UPDATES: 11 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("4.073937893385")),
+         LiquidFungibleResource(Decimal("4.074936443385")),
        )
 
 OUTPUTS: 5
@@ -225,7 +225,7 @@ OUTPUTS: 5
 BALANCE CHANGES: 5
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.66653331381
+   Change: -0.66667596381
 ├─ Vault: internal_vault_sim1np4v02tu69ju0s5ac7xpt9jk590fa4epxx398539ycc057wqqfjdq9
    ResAddr: resource_sim1n2pnt93g8hmwdkyh4xjw0ldmad3p25hx93t2rw58ke974tpeqemklu
    Change: +{#7#}, -{}
@@ -237,6 +237,6 @@ BALANCE CHANGES: 5
    Change: +{#8#}, -{}
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.333266656905
+   Change: 0.333337981905
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/015--account-locker-airdrop-non-fungibles-by-ids-and-try-direct-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/015--account-locker-airdrop-non-fungibles-by-ids-and-try-direct-deposit.txt
index b5473ae071..ef96da7d95 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/015--account-locker-airdrop-non-fungibles-by-ids-and-try-direct-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/015--account-locker-airdrop-non-fungibles-by-ids-and-try-direct-deposit.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.65617344779 XRD
-├─ Network execution: 0.4121994 XRD, 8243988 execution cost units
+TRANSACTION COST: 0.65631609779 XRD
+├─ Network execution: 0.41234205 XRD, 8246841 execution cost units
 ├─ Network finalization: 0.0672582 XRD, 1345164 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.17671584779 XRD
@@ -73,15 +73,15 @@ EVENTS: 12
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.65617344779"),
+     amount: Decimal("0.65631609779"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.328086723895"),
+     amount: Decimal("0.328158048895"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.328086723895"),
+     amount: Decimal("0.328158048895"),
    }
 
 STATE UPDATES: 10 entities
@@ -91,7 +91,7 @@ STATE UPDATES: 10 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("2.20101230864"),
+             0u8 => Decimal("2.20154724614"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -137,7 +137,7 @@ STATE UPDATES: 10 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999991.19595076544")),
+         LiquidFungibleResource(Decimal("99999999999999991.19381101544")),
        )
 ├─ internal_vault_sim1tzjmjma6hatpvy7uzs07x06dlqzry6cwz55grlkwpkxxgd6medwp2f across 1 partitions
   └─ Partition(64): 1 change
@@ -182,7 +182,7 @@ STATE UPDATES: 10 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("4.40202461728")),
+         LiquidFungibleResource(Decimal("4.40309449228")),
        )
 
 OUTPUTS: 5
@@ -195,7 +195,7 @@ OUTPUTS: 5
 BALANCE CHANGES: 5
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.65617344779
+   Change: -0.65631609779
 ├─ Vault: internal_vault_sim1nzxzp4wznnrxj7xw0ujvpm36q8mvv8kjyjld486cqcsalfk030437p
    ResAddr: resource_sim1n2pnt93g8hmwdkyh4xjw0ldmad3p25hx93t2rw58ke974tpeqemklu
    Change: +{#10#}, -{}
@@ -207,6 +207,6 @@ BALANCE CHANGES: 5
    Change: +{#12#}, -{}
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.328086723895
+   Change: 0.328158048895
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/016--account-locker-airdrop-non-fungibles-by-ids-and-dont-try-direct-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/016--account-locker-airdrop-non-fungibles-by-ids-and-dont-try-direct-deposit.txt
index 49fc104faf..212c53b653 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/016--account-locker-airdrop-non-fungibles-by-ids-and-dont-try-direct-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/016--account-locker-airdrop-non-fungibles-by-ids-and-dont-try-direct-deposit.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.60608120059 XRD
-├─ Network execution: 0.3661715 XRD, 7323430 execution cost units
+TRANSACTION COST: 0.60622385059 XRD
+├─ Network execution: 0.36631415 XRD, 7326283 execution cost units
 ├─ Network finalization: 0.06700855 XRD, 1340171 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.17290115059 XRD
@@ -72,15 +72,15 @@ EVENTS: 11
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.60608120059"),
+     amount: Decimal("0.60622385059"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.303040600295"),
+     amount: Decimal("0.303111925295"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.303040600295"),
+     amount: Decimal("0.303111925295"),
    }
 
 STATE UPDATES: 10 entities
@@ -90,7 +90,7 @@ STATE UPDATES: 10 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("2.3525326087875"),
+             0u8 => Decimal("2.3531032087875"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -136,7 +136,7 @@ STATE UPDATES: 10 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999990.58986956485")),
+         LiquidFungibleResource(Decimal("99999999999999990.58758716485")),
        )
 ├─ internal_vault_sim1tzjmjma6hatpvy7uzs07x06dlqzry6cwz55grlkwpkxxgd6medwp2f across 1 partitions
   └─ Partition(64): 1 change
@@ -181,7 +181,7 @@ STATE UPDATES: 10 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("4.705065217575")),
+         LiquidFungibleResource(Decimal("4.706206417575")),
        )
 
 OUTPUTS: 5
@@ -194,7 +194,7 @@ OUTPUTS: 5
 BALANCE CHANGES: 5
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.60608120059
+   Change: -0.60622385059
 ├─ Vault: internal_vault_sim1np4v02tu69ju0s5ac7xpt9jk590fa4epxx398539ycc057wqqfjdq9
    ResAddr: resource_sim1n2pnt93g8hmwdkyh4xjw0ldmad3p25hx93t2rw58ke974tpeqemklu
    Change: +{#13#}, -{}
@@ -206,6 +206,6 @@ BALANCE CHANGES: 5
    Change: +{#15#}, -{}
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.303040600295
+   Change: 0.303111925295
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/017--account-locker-global-caller-badge-is-an-authorized-depositor.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/017--account-locker-global-caller-badge-is-an-authorized-depositor.txt
index 6aa1087a92..99ffa48302 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/017--account-locker-global-caller-badge-is-an-authorized-depositor.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/017--account-locker-global-caller-badge-is-an-authorized-depositor.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.46517753228 XRD
-├─ Network execution: 0.29578765 XRD, 5915753 execution cost units
+TRANSACTION COST: 0.46532018228 XRD
+├─ Network execution: 0.2959303 XRD, 5918606 execution cost units
 ├─ Network finalization: 0.03625695 XRD, 725139 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.13313293228 XRD
@@ -33,15 +33,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.46517753228"),
+     amount: Decimal("0.46532018228"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.23258876614"),
+     amount: Decimal("0.23266009114"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.23258876614"),
+     amount: Decimal("0.23266009114"),
    }
 
 STATE UPDATES: 9 entities
@@ -51,7 +51,7 @@ STATE UPDATES: 9 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("2.4688269918575"),
+             0u8 => Decimal("2.4694332543575"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -96,7 +96,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999990.12469203257")),
+         LiquidFungibleResource(Decimal("99999999999999990.12226698257")),
        )
 ├─ internal_vault_sim1tzjmjma6hatpvy7uzs07x06dlqzry6cwz55grlkwpkxxgd6medwp2f across 1 partitions
   └─ Partition(64): 1 change
@@ -137,7 +137,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("4.937653983715")),
+         LiquidFungibleResource(Decimal("4.938866508715")),
        )
 
 OUTPUTS: 5
@@ -150,12 +150,12 @@ OUTPUTS: 5
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.46517753228
+   Change: -0.46532018228
 ├─ Vault: internal_vault_sim1tpqxdp75lc02x9w24dud57q22t9nu3e4g3cav9zzhestx7fcs3u4gg
    ResAddr: resource_sim1t5820sqdx0jf9zgjd5ge6y0fvfxsnx6dlh5sgfkm4nemgz44q0v7xk
    Change: 100
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.23258876614
+   Change: 0.23266009114
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/018--account-locker-claim-fungibles-by-amount.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/018--account-locker-claim-fungibles-by-amount.txt
index b9d7908e2f..d48868a72e 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/018--account-locker-claim-fungibles-by-amount.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/018--account-locker-claim-fungibles-by-amount.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.43425317401 XRD
-├─ Network execution: 0.26856355 XRD, 5371271 execution cost units
+TRANSACTION COST: 0.43439582401 XRD
+├─ Network execution: 0.2687062 XRD, 5374124 execution cost units
 ├─ Network finalization: 0.03150765 XRD, 630153 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.13418197401 XRD
@@ -41,15 +41,15 @@ EVENTS: 9
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.43425317401"),
+     amount: Decimal("0.43439582401"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.217126587005"),
+     amount: Decimal("0.217197912005"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.217126587005"),
+     amount: Decimal("0.217197912005"),
    }
 
 STATE UPDATES: 8 entities
@@ -59,7 +59,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("2.57739028536"),
+             0u8 => Decimal("2.57803221036"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -98,7 +98,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999989.69043885856")),
+         LiquidFungibleResource(Decimal("99999999999999989.68787115856")),
        )
 ├─ internal_vault_sim1tqf9qqqfurkf2qf7exnh2tupdqnrcf49seskepj9jjye78truj7dsx across 1 partitions
   └─ Partition(64): 1 change
@@ -139,7 +139,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("5.15478057072")),
+         LiquidFungibleResource(Decimal("5.15606442072")),
        )
 
 OUTPUTS: 3
@@ -150,7 +150,7 @@ OUTPUTS: 3
 BALANCE CHANGES: 4
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.43425317401
+   Change: -0.43439582401
 ├─ Vault: internal_vault_sim1tqf9qqqfurkf2qf7exnh2tupdqnrcf49seskepj9jjye78truj7dsx
    ResAddr: resource_sim1t5820sqdx0jf9zgjd5ge6y0fvfxsnx6dlh5sgfkm4nemgz44q0v7xk
    Change: -1
@@ -159,6 +159,6 @@ BALANCE CHANGES: 4
    Change: 1
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.217126587005
+   Change: 0.217197912005
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/019--account-locker-claim-non-fungibles-by-amount.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/019--account-locker-claim-non-fungibles-by-amount.txt
index e1679a565f..e417c984e8 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/019--account-locker-claim-non-fungibles-by-amount.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/019--account-locker-claim-non-fungibles-by-amount.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.39575012313 XRD
-├─ Network execution: 0.26998645 XRD, 5399729 execution cost units
+TRANSACTION COST: 0.39589277313 XRD
+├─ Network execution: 0.2701291 XRD, 5402582 execution cost units
 ├─ Network finalization: 0.03125455 XRD, 625091 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.09450912313 XRD
@@ -45,15 +45,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.39575012313"),
+     amount: Decimal("0.39589277313"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.197875061565"),
+     amount: Decimal("0.197946386565"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.197875061565"),
+     amount: Decimal("0.197946386565"),
    }
 
 STATE UPDATES: 7 entities
@@ -63,7 +63,7 @@ STATE UPDATES: 7 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("2.6763278161425"),
+             0u8 => Decimal("2.6770054036425"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -96,7 +96,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999989.29468873543")),
+         LiquidFungibleResource(Decimal("99999999999999989.29197838543")),
        )
 ├─ internal_vault_sim1np4v02tu69ju0s5ac7xpt9jk590fa4epxx398539ycc057wqqfjdq9 across 2 partitions
   ├─ Partition(64): 1 change
@@ -121,7 +121,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("5.352655632285")),
+         LiquidFungibleResource(Decimal("5.354010807285")),
        )
 
 OUTPUTS: 3
@@ -132,7 +132,7 @@ OUTPUTS: 3
 BALANCE CHANGES: 4
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.39575012313
+   Change: -0.39589277313
 ├─ Vault: internal_vault_sim1np4v02tu69ju0s5ac7xpt9jk590fa4epxx398539ycc057wqqfjdq9
    ResAddr: resource_sim1n2pnt93g8hmwdkyh4xjw0ldmad3p25hx93t2rw58ke974tpeqemklu
    Change: +{}, -{#13#}
@@ -141,6 +141,6 @@ BALANCE CHANGES: 4
    Change: +{#13#}, -{}
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.197875061565
+   Change: 0.197946386565
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/020--account-locker-claim-non-fungibles-by-ids.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/020--account-locker-claim-non-fungibles-by-ids.txt
index ab89dc501d..21616ac036 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/020--account-locker-claim-non-fungibles-by-ids.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/020--account-locker-claim-non-fungibles-by-ids.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.39407684056 XRD
-├─ Network execution: 0.2682178 XRD, 5364356 execution cost units
+TRANSACTION COST: 0.39421949056 XRD
+├─ Network execution: 0.26836045 XRD, 5367209 execution cost units
 ├─ Network finalization: 0.03125455 XRD, 625091 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.09460449056 XRD
@@ -45,15 +45,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.39407684056"),
+     amount: Decimal("0.39421949056"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.19703842028"),
+     amount: Decimal("0.19710974528"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.19703842028"),
+     amount: Decimal("0.19710974528"),
    }
 
 STATE UPDATES: 7 entities
@@ -63,7 +63,7 @@ STATE UPDATES: 7 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("2.7748470262825"),
+             0u8 => Decimal("2.7755602762825"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -96,7 +96,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999988.90061189487")),
+         LiquidFungibleResource(Decimal("99999999999999988.89775889487")),
        )
 ├─ internal_vault_sim1nrstdzgdlu2ka8r8jfzl0a7xj84nznpjr3h63ev255xtz82xuhz405 across 2 partitions
   ├─ Partition(64): 1 change
@@ -121,7 +121,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("5.549694052565")),
+         LiquidFungibleResource(Decimal("5.551120552565")),
        )
 
 OUTPUTS: 3
@@ -132,7 +132,7 @@ OUTPUTS: 3
 BALANCE CHANGES: 4
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.39407684056
+   Change: -0.39421949056
 ├─ Vault: internal_vault_sim1nrstdzgdlu2ka8r8jfzl0a7xj84nznpjr3h63ev255xtz82xuhz405
    ResAddr: resource_sim1n2pnt93g8hmwdkyh4xjw0ldmad3p25hx93t2rw58ke974tpeqemklu
    Change: +{}, -{#3#}
@@ -141,6 +141,6 @@ BALANCE CHANGES: 4
    Change: +{#3#}, -{}
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.19703842028
+   Change: 0.19710974528
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/021--account-locker-recover-fungibles-by-amount.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/021--account-locker-recover-fungibles-by-amount.txt
index 1dad223af4..de2c5c5678 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/021--account-locker-recover-fungibles-by-amount.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/021--account-locker-recover-fungibles-by-amount.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.43348299717 XRD
-├─ Network execution: 0.29097445 XRD, 5819489 execution cost units
+TRANSACTION COST: 0.43362564717 XRD
+├─ Network execution: 0.2911171 XRD, 5822342 execution cost units
 ├─ Network finalization: 0.02625565 XRD, 525113 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.11625289717 XRD
@@ -37,15 +37,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.43348299717"),
+     amount: Decimal("0.43362564717"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.216741498585"),
+     amount: Decimal("0.216812823585"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.216741498585"),
+     amount: Decimal("0.216812823585"),
    }
 
 STATE UPDATES: 8 entities
@@ -55,7 +55,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("2.883217775575"),
+             0u8 => Decimal("2.883966688075"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -88,7 +88,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999988.4671288977")),
+         LiquidFungibleResource(Decimal("99999999999999988.4641332477")),
        )
 ├─ internal_vault_sim1tzjmjma6hatpvy7uzs07x06dlqzry6cwz55grlkwpkxxgd6medwp2f across 1 partitions
   └─ Partition(64): 1 change
@@ -112,7 +112,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("5.76643555115")),
+         LiquidFungibleResource(Decimal("5.76793337615")),
        )
 
 OUTPUTS: 4
@@ -124,7 +124,7 @@ OUTPUTS: 4
 BALANCE CHANGES: 4
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.43348299717
+   Change: -0.43362564717
 ├─ Vault: internal_vault_sim1tqf9qqqfurkf2qf7exnh2tupdqnrcf49seskepj9jjye78truj7dsx
    ResAddr: resource_sim1t5820sqdx0jf9zgjd5ge6y0fvfxsnx6dlh5sgfkm4nemgz44q0v7xk
    Change: -1
@@ -133,6 +133,6 @@ BALANCE CHANGES: 4
    Change: 1
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.216741498585
+   Change: 0.216812823585
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/022--account-locker-recover-non-fungibles-by-amount.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/022--account-locker-recover-non-fungibles-by-amount.txt
index 5de756641d..bf38aaa347 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/022--account-locker-recover-non-fungibles-by-amount.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/022--account-locker-recover-non-fungibles-by-amount.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.45502652974 XRD
-├─ Network execution: 0.302614 XRD, 6052280 execution cost units
+TRANSACTION COST: 0.45516917974 XRD
+├─ Network execution: 0.30275665 XRD, 6055133 execution cost units
 ├─ Network finalization: 0.036255 XRD, 725100 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.11615752974 XRD
@@ -45,15 +45,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.45502652974"),
+     amount: Decimal("0.45516917974"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.22751326487"),
+     amount: Decimal("0.22758458987"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.22751326487"),
+     amount: Decimal("0.22758458987"),
    }
 
 STATE UPDATES: 8 entities
@@ -63,7 +63,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("2.99697440801"),
+             0u8 => Decimal("2.99775898301"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -96,7 +96,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999988.01210236796")),
+         LiquidFungibleResource(Decimal("99999999999999988.00896406796")),
        )
 ├─ internal_vault_sim1tzjmjma6hatpvy7uzs07x06dlqzry6cwz55grlkwpkxxgd6medwp2f across 1 partitions
   └─ Partition(64): 1 change
@@ -127,7 +127,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("5.99394881602")),
+         LiquidFungibleResource(Decimal("5.99551796602")),
        )
 
 OUTPUTS: 4
@@ -139,7 +139,7 @@ OUTPUTS: 4
 BALANCE CHANGES: 4
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.45502652974
+   Change: -0.45516917974
 ├─ Vault: internal_vault_sim1np4v02tu69ju0s5ac7xpt9jk590fa4epxx398539ycc057wqqfjdq9
    ResAddr: resource_sim1n2pnt93g8hmwdkyh4xjw0ldmad3p25hx93t2rw58ke974tpeqemklu
    Change: +{}, -{#7#}
@@ -148,6 +148,6 @@ BALANCE CHANGES: 4
    Change: +{#7#}, -{}
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.22751326487
+   Change: 0.22758458987
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/023--account-locker-recover-non-fungibles-by-ids.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/023--account-locker-recover-non-fungibles-by-ids.txt
index e91cff7867..f4a8c43de9 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/023--account-locker-recover-non-fungibles-by-ids.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/receipts/023--account-locker-recover-non-fungibles-by-ids.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.52402928291 XRD
-├─ Network execution: 0.32140535 XRD, 6428107 execution cost units
+TRANSACTION COST: 0.52417193291 XRD
+├─ Network execution: 0.321548 XRD, 6430960 execution cost units
 ├─ Network finalization: 0.04650745 XRD, 930149 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.15611648291 XRD
@@ -49,15 +49,15 @@ EVENTS: 9
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.52402928291"),
+     amount: Decimal("0.52417193291"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.262014641455"),
+     amount: Decimal("0.262085966455"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.262014641455"),
+     amount: Decimal("0.262085966455"),
    }
 
 STATE UPDATES: 9 entities
@@ -67,7 +67,7 @@ STATE UPDATES: 9 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("3.1279817287375"),
+             0u8 => Decimal("3.1288019662375"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -106,7 +106,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999987.48807308505")),
+         LiquidFungibleResource(Decimal("99999999999999987.48479213505")),
        )
 ├─ internal_vault_sim1tzjmjma6hatpvy7uzs07x06dlqzry6cwz55grlkwpkxxgd6medwp2f across 1 partitions
   └─ Partition(64): 1 change
@@ -160,7 +160,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("6.255963457475")),
+         LiquidFungibleResource(Decimal("6.257603932475")),
        )
 
 OUTPUTS: 4
@@ -172,7 +172,7 @@ OUTPUTS: 4
 BALANCE CHANGES: 4
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.52402928291
+   Change: -0.52417193291
 ├─ Vault: internal_vault_sim1nrxkgnug32kd87wny27junyc3s9dey2a7ulpylsz9tz3gjql8cwcjf
    ResAddr: resource_sim1n2pnt93g8hmwdkyh4xjw0ldmad3p25hx93t2rw58ke974tpeqemklu
    Change: +{}, -{#15#}
@@ -181,6 +181,6 @@ BALANCE CHANGES: 4
    Change: +{#15#}, -{}
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.262014641455
+   Change: 0.262085966455
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/scenario_summary.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/scenario_summary.txt
index 099d4098a1..b0091039bc 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/scenario_summary.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/account_locker/scenario_summary.txt
@@ -2,8 +2,8 @@ Name: account_locker
 
 == SUMMARY HASHES ==
 These Cuttlefish hashes are permitted to change only until the scenario is deployed to a permanent network, else it can cause divergence.
-State changes: 8ca0a4503efd9644 (allowed to change if not deployed to any network)
-Events       : 02c2fb5be437a178 (allowed to change if not deployed to any network)
+State changes: 481d1522641a89a6 (allowed to change if not deployed to any network)
+Events       : f59f601046fd60d9 (allowed to change if not deployed to any network)
 
 == INTERESTING ADDRESSES ==
 - badge_holder_account: account_sim1cx4qy6q2aa9vgl3x87nny50nephemg6yntq95neulu85hndy5wwzkh
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/costings/001--create-accounts.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/costings/001--create-accounts.txt
index 0e91d66ec4..cc3ca854f1 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/costings/001--create-accounts.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/costings/001--create-accounts.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.66101676762,    100.0%
-- Execution Cost (XRD)                                                     ,                0.3380931,     51.1%
+Total Cost (XRD)                                                           ,            0.66138081762,    100.0%
+- Execution Cost (XRD)                                                     ,               0.33845715,     51.2%
 - Finalization Cost (XRD)                                                  ,                0.0812626,     12.3%
-- Storage Cost (XRD)                                                       ,            0.24166106762,     36.6%
+- Storage Cost (XRD)                                                       ,            0.24166106762,     36.5%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  6761862,    100.0%
+Execution Cost Breakdown                                                   ,                  6769143,    100.0%
 - AfterInvoke                                                              ,                      904,      0.0%
 - AllocateNodeId                                                           ,                     3395,      0.1%
 - BeforeInvoke                                                             ,                     3326,      0.0%
@@ -45,8 +45,8 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.7%
 - RunNativeCode::put_FungibleVault                                         ,                    24554,      0.4%
 - RunNativeCode::take_FungibleVault                                        ,                    42457,      0.6%
-- RunWasmCode::Faucet_free                                                 ,                    34815,      0.5%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.4%
+- RunWasmCode::Faucet_free                                                 ,                    39243,      0.6%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.4%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      742,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/receipts/001--create-accounts.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/receipts/001--create-accounts.txt
index 3b167e57cc..31cd4bc725 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/receipts/001--create-accounts.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/receipts/001--create-accounts.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.66101676762 XRD
-├─ Network execution: 0.3380931 XRD, 6761862 execution cost units
+TRANSACTION COST: 0.66138081762 XRD
+├─ Network execution: 0.33845715 XRD, 6769143 execution cost units
 ├─ Network finalization: 0.0812626 XRD, 1625252 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.24166106762 XRD
@@ -33,15 +33,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.66101676762"),
+     amount: Decimal("0.66138081762"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.33050838381"),
+     amount: Decimal("0.33069040881"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.33050838381"),
+     amount: Decimal("0.33069040881"),
    }
 
 STATE UPDATES: 9 entities
@@ -51,7 +51,7 @@ STATE UPDATES: 9 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.165254191905"),
+             0u8 => Decimal("0.165345204405"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -84,7 +84,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999989999.33898323238")),
+         LiquidFungibleResource(Decimal("99999999999989999.33861918238")),
        )
 ├─ internal_keyvaluestore_sim1krn7clzr3qmq2zhwr77mdenksxswf00yeh8tn3vyzesg4kr3p54gv8 across 1 partitions
   └─ Partition(64): 1 change
@@ -266,7 +266,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.33050838381")),
+         LiquidFungibleResource(Decimal("0.33069040881")),
        )
 
 OUTPUTS: 7
@@ -281,13 +281,13 @@ OUTPUTS: 7
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -10000.66101676762
+   Change: -10000.66138081762
 ├─ Vault: internal_vault_sim1trj4jx6nhjzx3jshetvefjfkrys34c2f3uw5j5vzydyltn5s5rce95
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
    Change: 10000
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.33050838381
+   Change: 0.33069040881
 
 NEW ENTITIES: 2
 ├─ Component: account_sim1c9efznpk7w0xwdav45jj944cj677hcqj9el3atswwfw4dt84z3pun5
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/receipts/002--trivial_subintent.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/receipts/002--trivial_subintent.txt
index e6d385c74a..d2b9152333 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/receipts/002--trivial_subintent.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/receipts/002--trivial_subintent.txt
@@ -34,7 +34,7 @@ STATE UPDATES: 4 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.2039595030975"),
+             0u8 => Decimal("0.2040505155975"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -70,7 +70,7 @@ STATE UPDATES: 4 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.407919006195")),
+         LiquidFungibleResource(Decimal("0.408101031195")),
        )
 
 OUTPUTS: 2
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/receipts/003--with_timestamp_range.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/receipts/003--with_timestamp_range.txt
index e99555524c..0c8960240a 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/receipts/003--with_timestamp_range.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/receipts/003--with_timestamp_range.txt
@@ -34,7 +34,7 @@ STATE UPDATES: 4 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.2371386465425"),
+             0u8 => Decimal("0.2372296590425"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -66,7 +66,7 @@ STATE UPDATES: 4 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.474277293085")),
+         LiquidFungibleResource(Decimal("0.474459318085")),
        )
 
 OUTPUTS: 1
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/receipts/004--depth_four_transaction.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/receipts/004--depth_four_transaction.txt
index 9abc5e7b11..1493286437 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/receipts/004--depth_four_transaction.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/receipts/004--depth_four_transaction.txt
@@ -34,7 +34,7 @@ STATE UPDATES: 4 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.288334446665"),
+             0u8 => Decimal("0.288425459165"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -78,7 +78,7 @@ STATE UPDATES: 4 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.57666889333")),
+         LiquidFungibleResource(Decimal("0.57685091833")),
        )
 
 OUTPUTS: 2
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/receipts/005--transaction_with_complex_subintent.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/receipts/005--transaction_with_complex_subintent.txt
index a741a55b14..aacc6d0330 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/receipts/005--transaction_with_complex_subintent.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/receipts/005--transaction_with_complex_subintent.txt
@@ -34,7 +34,7 @@ STATE UPDATES: 4 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.341536406105"),
+             0u8 => Decimal("0.341627418605"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -66,7 +66,7 @@ STATE UPDATES: 4 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.68307281221")),
+         LiquidFungibleResource(Decimal("0.68325483721")),
        )
 
 BALANCE CHANGES: 2
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/scenario_summary.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/scenario_summary.txt
index 81745f7f2d..2be7338c82 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/scenario_summary.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/basic_subintents/scenario_summary.txt
@@ -2,8 +2,8 @@ Name: basic_subintents
 
 == SUMMARY HASHES ==
 These Cuttlefish hashes are permitted to change only until the scenario is deployed to a permanent network, else it can cause divergence.
-State changes: 4e3c88d00319c870 (allowed to change if not deployed to any network)
-Events       : 3623f04c0569d07a (allowed to change if not deployed to any network)
+State changes: 9d7dcf421aebebd1 (allowed to change if not deployed to any network)
+Events       : 1570604f260ab90d (allowed to change if not deployed to any network)
 
 == INTERESTING ADDRESSES ==
 - parent_account: account_sim1c9efznpk7w0xwdav45jj944cj677hcqj9el3atswwfw4dt84z3pun5
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/001--fungible-max-div-create.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/001--fungible-max-div-create.txt
index b3025c3a96..6e9d851875 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/001--fungible-max-div-create.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/001--fungible-max-div-create.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.68786245819,    100.0%
-- Execution Cost (XRD)                                                     ,               0.25280995,     36.8%
+Total Cost (XRD)                                                           ,            0.68800510819,    100.0%
+- Execution Cost (XRD)                                                     ,                0.2529526,     36.8%
 - Finalization Cost (XRD)                                                  ,               0.13626635,     19.8%
 - Storage Cost (XRD)                                                       ,            0.29878615819,     43.4%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5056199,    100.0%
+Execution Cost Breakdown                                                   ,                  5059052,    100.0%
 - AfterInvoke                                                              ,                      716,      0.0%
 - AllocateNodeId                                                           ,                     2813,      0.1%
 - BeforeInvoke                                                             ,                     3538,      0.1%
@@ -42,7 +42,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::on_virtualize                                             ,                    34520,      0.7%
 - RunNativeCode::put_FungibleVault                                         ,                    24554,      0.5%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      2.4%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.5%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      846,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/002--fungible-max-div-mint.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/002--fungible-max-div-mint.txt
index 05a5fdda52..efa61296ee 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/002--fungible-max-div-mint.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/002--fungible-max-div-mint.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.29179799273,    100.0%
-- Execution Cost (XRD)                                                     ,               0.20798815,     71.3%
+Total Cost (XRD)                                                           ,            0.29194064273,    100.0%
+- Execution Cost (XRD)                                                     ,                0.2081308,     71.3%
 - Finalization Cost (XRD)                                                  ,                0.0160036,      5.5%
 - Storage Cost (XRD)                                                       ,            0.06780624273,     23.2%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  4159763,    100.0%
+Execution Cost Breakdown                                                   ,                  4162616,    100.0%
 - AfterInvoke                                                              ,                      324,      0.0%
 - AllocateNodeId                                                           ,                     1358,      0.0%
 - BeforeInvoke                                                             ,                     1382,      0.0%
@@ -17,8 +17,8 @@ Execution Cost Breakdown                                                   ,
 - LockFee                                                                  ,                      500,      0.0%
 - MarkSubstateAsTransient                                                  ,                       55,      0.0%
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   253204,      6.1%
-- OpenSubstate::GlobalGenericComponent                                     ,                    43690,      1.1%
-- OpenSubstate::GlobalPackage                                              ,                  1908517,     45.9%
+- OpenSubstate::GlobalGenericComponent                                     ,                    43690,      1.0%
+- OpenSubstate::GlobalPackage                                              ,                  1908517,     45.8%
 - OpenSubstate::GlobalPreallocatedSecp256k1Account                         ,                   285944,      6.9%
 - OpenSubstate::InternalFungibleVault                                      ,                   215750,      5.2%
 - OpenSubstate::InternalGenericComponent                                   ,                    42563,      1.0%
@@ -36,7 +36,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::mint_FungibleResourceManager                              ,                    39230,      0.9%
 - RunNativeCode::put_FungibleVault                                         ,                    24554,      0.6%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      2.9%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.6%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.7%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    14640,      0.4%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/003--fungible-max-div-burn.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/003--fungible-max-div-burn.txt
index 132b7e5e93..8496c6d2a4 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/003--fungible-max-div-burn.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/003--fungible-max-div-burn.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.29849867199,    100.0%
-- Execution Cost (XRD)                                                     ,                0.2068687,     69.3%
+Total Cost (XRD)                                                           ,            0.29864132199,    100.0%
+- Execution Cost (XRD)                                                     ,               0.20701135,     69.3%
 - Finalization Cost (XRD)                                                  ,                0.0160036,      5.4%
 - Storage Cost (XRD)                                                       ,            0.07562637199,     25.3%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  4137374,    100.0%
+Execution Cost Breakdown                                                   ,                  4140227,    100.0%
 - AfterInvoke                                                              ,                      378,      0.0%
 - AllocateNodeId                                                           ,                     1358,      0.0%
 - BeforeInvoke                                                             ,                     1456,      0.0%
@@ -24,7 +24,7 @@ Execution Cost Breakdown                                                   ,
 - OpenSubstate::InternalGenericComponent                                   ,                    43504,      1.1%
 - OpenSubstate::InternalKeyValueStore                                      ,                    40536,      1.0%
 - PinNode                                                                  ,                      168,      0.0%
-- PrepareWasmCode                                                          ,                   353866,      8.6%
+- PrepareWasmCode                                                          ,                   353866,      8.5%
 - QueryActor                                                               ,                     2500,      0.1%
 - ReadSubstate                                                             ,                   483874,     11.7%
 - RunNativeCode::Worktop_drop                                              ,                    17918,      0.4%
@@ -36,7 +36,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.1%
 - RunNativeCode::take_FungibleVault                                        ,                    42457,      1.0%
 - RunNativeCode::withdraw                                                  ,                    57851,      1.4%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.6%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.7%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    17840,      0.4%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/004--fungible-max-div-transfer-32-times.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/004--fungible-max-div-transfer-32-times.txt
index 45fe7fdd21..ea8b68e6d4 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/004--fungible-max-div-transfer-32-times.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/004--fungible-max-div-transfer-32-times.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            2.01447265695,    100.0%
-- Execution Cost (XRD)                                                     ,               0.80039025,     39.7%
+Total Cost (XRD)                                                           ,            2.01461530695,    100.0%
+- Execution Cost (XRD)                                                     ,                0.8005329,     39.7%
 - Finalization Cost (XRD)                                                  ,               0.08254785,      4.1%
 - Storage Cost (XRD)                                                       ,            1.13153455695,     56.2%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                 16007805,    100.0%
+Execution Cost Breakdown                                                   ,                 16010658,    100.0%
 - AfterInvoke                                                              ,                     8446,      0.1%
 - AllocateNodeId                                                           ,                    24056,      0.2%
 - BeforeInvoke                                                             ,                    28576,      0.2%
@@ -46,7 +46,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      0.8%
 - RunNativeCode::try_deposit_or_abort                                      ,                  3135616,     19.6%
 - RunNativeCode::withdraw                                                  ,                    57851,      0.4%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.2%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.2%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      371,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/005--fungible-max-div-freeze-withdraw.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/005--fungible-max-div-freeze-withdraw.txt
index c11335ed5e..ac46d6a131 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/005--fungible-max-div-freeze-withdraw.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/005--fungible-max-div-freeze-withdraw.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.19198286004,    100.0%
-- Execution Cost (XRD)                                                     ,                0.1359137,     70.8%
+Total Cost (XRD)                                                           ,            0.19212551004,    100.0%
+- Execution Cost (XRD)                                                     ,               0.13605635,     70.8%
 - Finalization Cost (XRD)                                                  ,                0.0152519,      7.9%
-- Storage Cost (XRD)                                                       ,            0.04081726004,     21.3%
+- Storage Cost (XRD)                                                       ,            0.04081726004,     21.2%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  2718274,    100.0%
+Execution Cost Breakdown                                                   ,                  2721127,    100.0%
 - AfterInvoke                                                              ,                       76,      0.0%
 - AllocateNodeId                                                           ,                      679,      0.0%
 - BeforeInvoke                                                             ,                      612,      0.0%
@@ -30,7 +30,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::freeze_FungibleVault                                      ,                    19090,      0.7%
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.5%
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.7%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.9%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      1.0%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    14120,      0.5%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/006--fungible-max-div-freeze-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/006--fungible-max-div-freeze-deposit.txt
index c11335ed5e..ac46d6a131 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/006--fungible-max-div-freeze-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/006--fungible-max-div-freeze-deposit.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.19198286004,    100.0%
-- Execution Cost (XRD)                                                     ,                0.1359137,     70.8%
+Total Cost (XRD)                                                           ,            0.19212551004,    100.0%
+- Execution Cost (XRD)                                                     ,               0.13605635,     70.8%
 - Finalization Cost (XRD)                                                  ,                0.0152519,      7.9%
-- Storage Cost (XRD)                                                       ,            0.04081726004,     21.3%
+- Storage Cost (XRD)                                                       ,            0.04081726004,     21.2%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  2718274,    100.0%
+Execution Cost Breakdown                                                   ,                  2721127,    100.0%
 - AfterInvoke                                                              ,                       76,      0.0%
 - AllocateNodeId                                                           ,                      679,      0.0%
 - BeforeInvoke                                                             ,                      612,      0.0%
@@ -30,7 +30,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::freeze_FungibleVault                                      ,                    19090,      0.7%
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.5%
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.7%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.9%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      1.0%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    14120,      0.5%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/007--fungible-max-div-freeze-burn.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/007--fungible-max-div-freeze-burn.txt
index c11335ed5e..ac46d6a131 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/007--fungible-max-div-freeze-burn.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/007--fungible-max-div-freeze-burn.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.19198286004,    100.0%
-- Execution Cost (XRD)                                                     ,                0.1359137,     70.8%
+Total Cost (XRD)                                                           ,            0.19212551004,    100.0%
+- Execution Cost (XRD)                                                     ,               0.13605635,     70.8%
 - Finalization Cost (XRD)                                                  ,                0.0152519,      7.9%
-- Storage Cost (XRD)                                                       ,            0.04081726004,     21.3%
+- Storage Cost (XRD)                                                       ,            0.04081726004,     21.2%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  2718274,    100.0%
+Execution Cost Breakdown                                                   ,                  2721127,    100.0%
 - AfterInvoke                                                              ,                       76,      0.0%
 - AllocateNodeId                                                           ,                      679,      0.0%
 - BeforeInvoke                                                             ,                      612,      0.0%
@@ -30,7 +30,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::freeze_FungibleVault                                      ,                    19090,      0.7%
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.5%
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.7%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.9%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      1.0%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    14120,      0.5%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/008--fungible-max-div-recall-frozen-vault.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/008--fungible-max-div-recall-frozen-vault.txt
index 7ac6b17457..2ac5c95d81 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/008--fungible-max-div-recall-frozen-vault.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/008--fungible-max-div-recall-frozen-vault.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.30009958853,    100.0%
-- Execution Cost (XRD)                                                     ,               0.20556725,     68.5%
+Total Cost (XRD)                                                           ,            0.30024223853,    100.0%
+- Execution Cost (XRD)                                                     ,                0.2057099,     68.5%
 - Finalization Cost (XRD)                                                  ,               0.02100405,      7.0%
 - Storage Cost (XRD)                                                       ,            0.07352828853,     24.5%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  4111345,    100.0%
+Execution Cost Breakdown                                                   ,                  4114198,    100.0%
 - AfterInvoke                                                              ,                      324,      0.0%
 - AllocateNodeId                                                           ,                     1358,      0.0%
 - BeforeInvoke                                                             ,                     1386,      0.0%
@@ -36,7 +36,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::put_FungibleVault                                         ,                    24554,      0.6%
 - RunNativeCode::recall_FungibleVault                                      ,                    42221,      1.0%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      2.9%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.6%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.7%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    17600,      0.4%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/009--fungible-max-div-unfreeze-withdraw.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/009--fungible-max-div-unfreeze-withdraw.txt
index 9bb61947d1..15569f82ed 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/009--fungible-max-div-unfreeze-withdraw.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/009--fungible-max-div-unfreeze-withdraw.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,             0.1920901949,    100.0%
-- Execution Cost (XRD)                                                     ,                0.1358303,     70.7%
+Total Cost (XRD)                                                           ,             0.1922328449,    100.0%
+- Execution Cost (XRD)                                                     ,               0.13597295,     70.7%
 - Finalization Cost (XRD)                                                  ,                0.0152519,      7.9%
 - Storage Cost (XRD)                                                       ,             0.0410079949,     21.3%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  2716606,    100.0%
+Execution Cost Breakdown                                                   ,                  2719459,    100.0%
 - AfterInvoke                                                              ,                       76,      0.0%
 - AllocateNodeId                                                           ,                      679,      0.0%
 - BeforeInvoke                                                             ,                      616,      0.0%
@@ -18,7 +18,7 @@ Execution Cost Breakdown                                                   ,
 - MarkSubstateAsTransient                                                  ,                       55,      0.0%
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   203519,      7.5%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      1.6%
-- OpenSubstate::GlobalPackage                                              ,                  1253926,     46.2%
+- OpenSubstate::GlobalPackage                                              ,                  1253926,     46.1%
 - OpenSubstate::InternalFungibleVault                                      ,                   134289,      4.9%
 - OpenSubstate::InternalGenericComponent                                   ,                    10266,      0.4%
 - OpenSubstate::InternalKeyValueStore                                      ,                    40536,      1.5%
@@ -30,7 +30,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.5%
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.7%
 - RunNativeCode::unfreeze_FungibleVault                                    ,                    17338,      0.6%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.9%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      1.0%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    14200,      0.5%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/010--fungible-max-div-unfreeze-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/010--fungible-max-div-unfreeze-deposit.txt
index 9bb61947d1..15569f82ed 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/010--fungible-max-div-unfreeze-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/010--fungible-max-div-unfreeze-deposit.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,             0.1920901949,    100.0%
-- Execution Cost (XRD)                                                     ,                0.1358303,     70.7%
+Total Cost (XRD)                                                           ,             0.1922328449,    100.0%
+- Execution Cost (XRD)                                                     ,               0.13597295,     70.7%
 - Finalization Cost (XRD)                                                  ,                0.0152519,      7.9%
 - Storage Cost (XRD)                                                       ,             0.0410079949,     21.3%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  2716606,    100.0%
+Execution Cost Breakdown                                                   ,                  2719459,    100.0%
 - AfterInvoke                                                              ,                       76,      0.0%
 - AllocateNodeId                                                           ,                      679,      0.0%
 - BeforeInvoke                                                             ,                      616,      0.0%
@@ -18,7 +18,7 @@ Execution Cost Breakdown                                                   ,
 - MarkSubstateAsTransient                                                  ,                       55,      0.0%
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   203519,      7.5%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      1.6%
-- OpenSubstate::GlobalPackage                                              ,                  1253926,     46.2%
+- OpenSubstate::GlobalPackage                                              ,                  1253926,     46.1%
 - OpenSubstate::InternalFungibleVault                                      ,                   134289,      4.9%
 - OpenSubstate::InternalGenericComponent                                   ,                    10266,      0.4%
 - OpenSubstate::InternalKeyValueStore                                      ,                    40536,      1.5%
@@ -30,7 +30,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.5%
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.7%
 - RunNativeCode::unfreeze_FungibleVault                                    ,                    17338,      0.6%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.9%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      1.0%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    14200,      0.5%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/011--fungible-max-div-unfreeze-burn.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/011--fungible-max-div-unfreeze-burn.txt
index 9bb61947d1..15569f82ed 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/011--fungible-max-div-unfreeze-burn.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/011--fungible-max-div-unfreeze-burn.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,             0.1920901949,    100.0%
-- Execution Cost (XRD)                                                     ,                0.1358303,     70.7%
+Total Cost (XRD)                                                           ,             0.1922328449,    100.0%
+- Execution Cost (XRD)                                                     ,               0.13597295,     70.7%
 - Finalization Cost (XRD)                                                  ,                0.0152519,      7.9%
 - Storage Cost (XRD)                                                       ,             0.0410079949,     21.3%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  2716606,    100.0%
+Execution Cost Breakdown                                                   ,                  2719459,    100.0%
 - AfterInvoke                                                              ,                       76,      0.0%
 - AllocateNodeId                                                           ,                      679,      0.0%
 - BeforeInvoke                                                             ,                      616,      0.0%
@@ -18,7 +18,7 @@ Execution Cost Breakdown                                                   ,
 - MarkSubstateAsTransient                                                  ,                       55,      0.0%
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   203519,      7.5%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      1.6%
-- OpenSubstate::GlobalPackage                                              ,                  1253926,     46.2%
+- OpenSubstate::GlobalPackage                                              ,                  1253926,     46.1%
 - OpenSubstate::InternalFungibleVault                                      ,                   134289,      4.9%
 - OpenSubstate::InternalGenericComponent                                   ,                    10266,      0.4%
 - OpenSubstate::InternalKeyValueStore                                      ,                    40536,      1.5%
@@ -30,7 +30,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.5%
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.7%
 - RunNativeCode::unfreeze_FungibleVault                                    ,                    17338,      0.6%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.9%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      1.0%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    14200,      0.5%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/012--fungible-max-div-recall-unfrozen-vault.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/012--fungible-max-div-recall-unfrozen-vault.txt
index 8d386f24f5..0901e3fa7d 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/012--fungible-max-div-recall-unfrozen-vault.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/012--fungible-max-div-recall-unfrozen-vault.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.29109843853,    100.0%
-- Execution Cost (XRD)                                                     ,               0.20156655,     69.2%
+Total Cost (XRD)                                                           ,            0.29124108853,    100.0%
+- Execution Cost (XRD)                                                     ,                0.2017092,     69.3%
 - Finalization Cost (XRD)                                                  ,                0.0160036,      5.5%
-- Storage Cost (XRD)                                                       ,            0.07352828853,     25.3%
+- Storage Cost (XRD)                                                       ,            0.07352828853,     25.2%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  4031331,    100.0%
+Execution Cost Breakdown                                                   ,                  4034184,    100.0%
 - AfterInvoke                                                              ,                      324,      0.0%
 - AllocateNodeId                                                           ,                     1358,      0.0%
 - BeforeInvoke                                                             ,                     1386,      0.0%
@@ -18,7 +18,7 @@ Execution Cost Breakdown                                                   ,
 - MarkSubstateAsTransient                                                  ,                       55,      0.0%
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   288706,      7.2%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      1.1%
-- OpenSubstate::GlobalPackage                                              ,                  1776336,     44.1%
+- OpenSubstate::GlobalPackage                                              ,                  1776336,     44.0%
 - OpenSubstate::GlobalPreallocatedSecp256k1Account                         ,                   285944,      7.1%
 - OpenSubstate::InternalFungibleVault                                      ,                   180931,      4.5%
 - OpenSubstate::InternalGenericComponent                                   ,                    42947,      1.1%
@@ -36,7 +36,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::put_FungibleVault                                         ,                    24554,      0.6%
 - RunNativeCode::recall_FungibleVault                                      ,                    42221,      1.0%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      3.0%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.6%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.7%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    17600,      0.4%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/013--fungible-max-div-freeze-withdraw-again.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/013--fungible-max-div-freeze-withdraw-again.txt
index c11335ed5e..ac46d6a131 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/013--fungible-max-div-freeze-withdraw-again.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/013--fungible-max-div-freeze-withdraw-again.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.19198286004,    100.0%
-- Execution Cost (XRD)                                                     ,                0.1359137,     70.8%
+Total Cost (XRD)                                                           ,            0.19212551004,    100.0%
+- Execution Cost (XRD)                                                     ,               0.13605635,     70.8%
 - Finalization Cost (XRD)                                                  ,                0.0152519,      7.9%
-- Storage Cost (XRD)                                                       ,            0.04081726004,     21.3%
+- Storage Cost (XRD)                                                       ,            0.04081726004,     21.2%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  2718274,    100.0%
+Execution Cost Breakdown                                                   ,                  2721127,    100.0%
 - AfterInvoke                                                              ,                       76,      0.0%
 - AllocateNodeId                                                           ,                      679,      0.0%
 - BeforeInvoke                                                             ,                      612,      0.0%
@@ -30,7 +30,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::freeze_FungibleVault                                      ,                    19090,      0.7%
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.5%
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.7%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.9%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      1.0%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    14120,      0.5%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/014--fungible-min-div-create.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/014--fungible-min-div-create.txt
index 6ca78ce922..cf49ed77c9 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/014--fungible-min-div-create.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/014--fungible-min-div-create.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.58241920439,    100.0%
-- Execution Cost (XRD)                                                     ,                0.2403144,     41.3%
+Total Cost (XRD)                                                           ,            0.58256185439,    100.0%
+- Execution Cost (XRD)                                                     ,               0.24045705,     41.3%
 - Finalization Cost (XRD)                                                  ,               0.10626115,     18.2%
 - Storage Cost (XRD)                                                       ,            0.23584365439,     40.5%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  4806288,    100.0%
+Execution Cost Breakdown                                                   ,                  4809141,    100.0%
 - AfterInvoke                                                              ,                      582,      0.0%
 - AllocateNodeId                                                           ,                     2231,      0.0%
 - BeforeInvoke                                                             ,                     2518,      0.1%
@@ -19,7 +19,7 @@ Execution Cost Breakdown                                                   ,
 - MoveModule                                                               ,                     3920,      0.1%
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   134252,      2.8%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      0.9%
-- OpenSubstate::GlobalPackage                                              ,                  2488148,     51.8%
+- OpenSubstate::GlobalPackage                                              ,                  2488148,     51.7%
 - OpenSubstate::GlobalPreallocatedSecp256k1Account                         ,                   406740,      8.5%
 - OpenSubstate::InternalFungibleVault                                      ,                    97340,      2.0%
 - OpenSubstate::InternalGenericComponent                                   ,                    50613,      1.1%
@@ -40,7 +40,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.9%
 - RunNativeCode::put_FungibleVault                                         ,                    24554,      0.5%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      2.5%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.5%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.6%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      475,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/015--fungible-min-div-mint-correct-granularity.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/015--fungible-min-div-mint-correct-granularity.txt
index 05a5fdda52..efa61296ee 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/015--fungible-min-div-mint-correct-granularity.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/015--fungible-min-div-mint-correct-granularity.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.29179799273,    100.0%
-- Execution Cost (XRD)                                                     ,               0.20798815,     71.3%
+Total Cost (XRD)                                                           ,            0.29194064273,    100.0%
+- Execution Cost (XRD)                                                     ,                0.2081308,     71.3%
 - Finalization Cost (XRD)                                                  ,                0.0160036,      5.5%
 - Storage Cost (XRD)                                                       ,            0.06780624273,     23.2%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  4159763,    100.0%
+Execution Cost Breakdown                                                   ,                  4162616,    100.0%
 - AfterInvoke                                                              ,                      324,      0.0%
 - AllocateNodeId                                                           ,                     1358,      0.0%
 - BeforeInvoke                                                             ,                     1382,      0.0%
@@ -17,8 +17,8 @@ Execution Cost Breakdown                                                   ,
 - LockFee                                                                  ,                      500,      0.0%
 - MarkSubstateAsTransient                                                  ,                       55,      0.0%
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   253204,      6.1%
-- OpenSubstate::GlobalGenericComponent                                     ,                    43690,      1.1%
-- OpenSubstate::GlobalPackage                                              ,                  1908517,     45.9%
+- OpenSubstate::GlobalGenericComponent                                     ,                    43690,      1.0%
+- OpenSubstate::GlobalPackage                                              ,                  1908517,     45.8%
 - OpenSubstate::GlobalPreallocatedSecp256k1Account                         ,                   285944,      6.9%
 - OpenSubstate::InternalFungibleVault                                      ,                   215750,      5.2%
 - OpenSubstate::InternalGenericComponent                                   ,                    42563,      1.0%
@@ -36,7 +36,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::mint_FungibleResourceManager                              ,                    39230,      0.9%
 - RunNativeCode::put_FungibleVault                                         ,                    24554,      0.6%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      2.9%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.6%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.7%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    14640,      0.4%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/016--fungible-min-div-mint-wrong-granularity.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/016--fungible-min-div-mint-wrong-granularity.txt
index eba6549cc6..1ffb01bb43 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/016--fungible-min-div-mint-wrong-granularity.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/016--fungible-min-div-mint-wrong-granularity.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.16578667938,    100.0%
-- Execution Cost (XRD)                                                     ,                0.1308822,     78.9%
+Total Cost (XRD)                                                           ,            0.16592932938,    100.0%
+- Execution Cost (XRD)                                                     ,               0.13102485,     79.0%
 - Finalization Cost (XRD)                                                  ,                        0,      0.0%
-- Storage Cost (XRD)                                                       ,            0.03490447938,     21.1%
+- Storage Cost (XRD)                                                       ,            0.03490447938,     21.0%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  2617644,    100.0%
+Execution Cost Breakdown                                                   ,                  2620497,    100.0%
 - AfterInvoke                                                              ,                       64,      0.0%
 - AllocateNodeId                                                           ,                      582,      0.0%
 - BeforeInvoke                                                             ,                      478,      0.0%
@@ -17,7 +17,7 @@ Execution Cost Breakdown                                                   ,
 - MarkSubstateAsTransient                                                  ,                       55,      0.0%
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   207059,      7.9%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      1.7%
-- OpenSubstate::GlobalPackage                                              ,                  1216522,     46.5%
+- OpenSubstate::GlobalPackage                                              ,                  1216522,     46.4%
 - OpenSubstate::InternalFungibleVault                                      ,                    90202,      3.4%
 - OpenSubstate::InternalGenericComponent                                   ,                     4538,      0.2%
 - OpenSubstate::InternalKeyValueStore                                      ,                    40536,      1.5%
@@ -28,7 +28,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.6%
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.7%
 - RunNativeCode::mint_FungibleResourceManager                              ,                    39230,      1.5%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.9%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      1.0%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    14640,      0.6%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/017--fungible-min-div-transfer-correct-granularity.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/017--fungible-min-div-transfer-correct-granularity.txt
index 61e3440a36..22704753fe 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/017--fungible-min-div-transfer-correct-granularity.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/017--fungible-min-div-transfer-correct-granularity.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.40596197083,    100.0%
-- Execution Cost (XRD)                                                     ,                0.2377521,     58.6%
+Total Cost (XRD)                                                           ,            0.40610462083,    100.0%
+- Execution Cost (XRD)                                                     ,               0.23789475,     58.6%
 - Finalization Cost (XRD)                                                  ,               0.03650745,      9.0%
 - Storage Cost (XRD)                                                       ,            0.13170242083,     32.4%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  4755042,    100.0%
+Execution Cost Breakdown                                                   ,                  4757895,    100.0%
 - AfterInvoke                                                              ,                      504,      0.0%
 - AllocateNodeId                                                           ,                     1746,      0.0%
 - BeforeInvoke                                                             ,                     1764,      0.0%
@@ -36,9 +36,9 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.0%
 - RunNativeCode::put_FungibleVault                                         ,                    24554,      0.5%
 - RunNativeCode::take_FungibleVault                                        ,                    42457,      0.9%
-- RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      2.6%
+- RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      2.5%
 - RunNativeCode::withdraw                                                  ,                    57851,      1.2%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.5%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.6%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    18960,      0.4%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/018--fungible-min-div-transfer-wrong-granularity.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/018--fungible-min-div-transfer-wrong-granularity.txt
index 479d7f7b5b..29ff6bc4cc 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/018--fungible-min-div-transfer-wrong-granularity.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/018--fungible-min-div-transfer-wrong-granularity.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.21006701182,    100.0%
-- Execution Cost (XRD)                                                     ,               0.16486285,     78.5%
+Total Cost (XRD)                                                           ,            0.21020966182,    100.0%
+- Execution Cost (XRD)                                                     ,                0.1650055,     78.5%
 - Finalization Cost (XRD)                                                  ,                        0,      0.0%
 - Storage Cost (XRD)                                                       ,            0.04520416182,     21.5%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  3297257,    100.0%
+Execution Cost Breakdown                                                   ,                  3300110,    100.0%
 - AfterInvoke                                                              ,                       64,      0.0%
 - AllocateNodeId                                                           ,                      679,      0.0%
 - BeforeInvoke                                                             ,                      672,      0.0%
@@ -25,12 +25,12 @@ Execution Cost Breakdown                                                   ,
 - PinNode                                                                  ,                       84,      0.0%
 - PrepareWasmCode                                                          ,                   353866,     10.7%
 - QueryActor                                                               ,                     1500,      0.0%
-- ReadSubstate                                                             ,                   427023,     13.0%
+- ReadSubstate                                                             ,                   427023,     12.9%
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.4%
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.4%
 - RunNativeCode::take_FungibleVault                                        ,                    42457,      1.3%
 - RunNativeCode::withdraw                                                  ,                    57851,      1.8%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.7%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.8%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    18960,      0.6%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/019--fungible-min-div-create-proof-correct-granularity.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/019--fungible-min-div-create-proof-correct-granularity.txt
index 1625c70c60..f414f21e41 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/019--fungible-min-div-create-proof-correct-granularity.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/019--fungible-min-div-create-proof-correct-granularity.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.26085126042,    100.0%
-- Execution Cost (XRD)                                                     ,                0.1984876,     76.1%
+Total Cost (XRD)                                                           ,            0.26099391042,    100.0%
+- Execution Cost (XRD)                                                     ,               0.19863025,     76.1%
 - Finalization Cost (XRD)                                                  ,               0.01525215,      5.8%
 - Storage Cost (XRD)                                                       ,            0.04711151042,     18.1%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  3969752,    100.0%
+Execution Cost Breakdown                                                   ,                  3972605,    100.0%
 - AfterInvoke                                                              ,                      246,      0.0%
 - AllocateNodeId                                                           ,                     1164,      0.0%
 - BeforeInvoke                                                             ,                     2256,      0.1%
@@ -16,7 +16,7 @@ Execution Cost Breakdown                                                   ,
 - GetOwnedNodes                                                            ,                     1000,      0.0%
 - LockFee                                                                  ,                      500,      0.0%
 - MarkSubstateAsTransient                                                  ,                      165,      0.0%
-- OpenSubstate::GlobalFungibleResourceManager                              ,                   164784,      4.2%
+- OpenSubstate::GlobalFungibleResourceManager                              ,                   164784,      4.1%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      1.1%
 - OpenSubstate::GlobalNonFungibleResourceManager                           ,                    40685,      1.0%
 - OpenSubstate::GlobalPackage                                              ,                  1898289,     47.8%
@@ -38,7 +38,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::on_drop_FungibleProof                                     ,                    14191,      0.4%
 - RunNativeCode::on_move_FungibleProof                                     ,                    16180,      0.4%
 - RunNativeCode::unlock_amount_FungibleVault                               ,                    23272,      0.6%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.6%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.7%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    16760,      0.4%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/020--fungible-min-div-create-proof-wrong-granularity.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/020--fungible-min-div-create-proof-wrong-granularity.txt
index c7d3ead5d4..968f023818 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/020--fungible-min-div-create-proof-wrong-granularity.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/020--fungible-min-div-create-proof-wrong-granularity.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.20042050317,    100.0%
-- Execution Cost (XRD)                                                     ,               0.16046155,     80.1%
+Total Cost (XRD)                                                           ,            0.20056315317,    100.0%
+- Execution Cost (XRD)                                                     ,                0.1606042,     80.1%
 - Finalization Cost (XRD)                                                  ,                        0,      0.0%
 - Storage Cost (XRD)                                                       ,            0.03995895317,     19.9%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  3209231,    100.0%
+Execution Cost Breakdown                                                   ,                  3212084,    100.0%
 - AfterInvoke                                                              ,                       64,      0.0%
 - AllocateNodeId                                                           ,                      679,      0.0%
 - BeforeInvoke                                                             ,                      736,      0.0%
@@ -28,9 +28,9 @@ Execution Cost Breakdown                                                   ,
 - ReadSubstate                                                             ,                   425123,     13.2%
 - RunNativeCode::create_proof_of_amount                                    ,                    62543,      1.9%
 - RunNativeCode::create_proof_of_amount_FungibleVault                      ,                    38091,      1.2%
-- RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.5%
+- RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.4%
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.4%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.8%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.9%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    16760,      0.5%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/021--fungible-min-div-recall-correct-granularity.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/021--fungible-min-div-recall-correct-granularity.txt
index 8d386f24f5..0901e3fa7d 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/021--fungible-min-div-recall-correct-granularity.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/021--fungible-min-div-recall-correct-granularity.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.29109843853,    100.0%
-- Execution Cost (XRD)                                                     ,               0.20156655,     69.2%
+Total Cost (XRD)                                                           ,            0.29124108853,    100.0%
+- Execution Cost (XRD)                                                     ,                0.2017092,     69.3%
 - Finalization Cost (XRD)                                                  ,                0.0160036,      5.5%
-- Storage Cost (XRD)                                                       ,            0.07352828853,     25.3%
+- Storage Cost (XRD)                                                       ,            0.07352828853,     25.2%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  4031331,    100.0%
+Execution Cost Breakdown                                                   ,                  4034184,    100.0%
 - AfterInvoke                                                              ,                      324,      0.0%
 - AllocateNodeId                                                           ,                     1358,      0.0%
 - BeforeInvoke                                                             ,                     1386,      0.0%
@@ -18,7 +18,7 @@ Execution Cost Breakdown                                                   ,
 - MarkSubstateAsTransient                                                  ,                       55,      0.0%
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   288706,      7.2%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      1.1%
-- OpenSubstate::GlobalPackage                                              ,                  1776336,     44.1%
+- OpenSubstate::GlobalPackage                                              ,                  1776336,     44.0%
 - OpenSubstate::GlobalPreallocatedSecp256k1Account                         ,                   285944,      7.1%
 - OpenSubstate::InternalFungibleVault                                      ,                   180931,      4.5%
 - OpenSubstate::InternalGenericComponent                                   ,                    42947,      1.1%
@@ -36,7 +36,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::put_FungibleVault                                         ,                    24554,      0.6%
 - RunNativeCode::recall_FungibleVault                                      ,                    42221,      1.0%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      3.0%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.6%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.7%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    17600,      0.4%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/022--fungible-min-div-recall-wrong-granularity.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/022--fungible-min-div-recall-wrong-granularity.txt
index f13377f737..4c2768066d 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/022--fungible-min-div-recall-wrong-granularity.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/costings/022--fungible-min-div-recall-wrong-granularity.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,             0.1683664692,    100.0%
-- Execution Cost (XRD)                                                     ,                0.1264048,     75.1%
+Total Cost (XRD)                                                           ,             0.1685091192,    100.0%
+- Execution Cost (XRD)                                                     ,               0.12654745,     75.1%
 - Finalization Cost (XRD)                                                  ,                        0,      0.0%
 - Storage Cost (XRD)                                                       ,             0.0419616692,     24.9%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  2528096,    100.0%
+Execution Cost Breakdown                                                   ,                  2530949,    100.0%
 - AfterInvoke                                                              ,                       64,      0.0%
 - AllocateNodeId                                                           ,                      582,      0.0%
 - BeforeInvoke                                                             ,                      482,      0.0%
@@ -17,7 +17,7 @@ Execution Cost Breakdown                                                   ,
 - MarkSubstateAsTransient                                                  ,                       55,      0.0%
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   243851,      9.6%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      1.7%
-- OpenSubstate::GlobalPackage                                              ,                  1084341,     42.9%
+- OpenSubstate::GlobalPackage                                              ,                  1084341,     42.8%
 - OpenSubstate::InternalFungibleVault                                      ,                    93947,      3.7%
 - OpenSubstate::InternalGenericComponent                                   ,                     4538,      0.2%
 - OpenSubstate::InternalKeyValueStore                                      ,                    40536,      1.6%
@@ -28,7 +28,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.6%
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.8%
 - RunNativeCode::recall_FungibleVault                                      ,                    42221,      1.7%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      1.0%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      1.1%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    17600,      0.7%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/001--fungible-max-div-create.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/001--fungible-max-div-create.txt
index 994f59a9c7..66c78d5fa8 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/001--fungible-max-div-create.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/001--fungible-max-div-create.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.68786245819 XRD
-├─ Network execution: 0.25280995 XRD, 5056199 execution cost units
+TRANSACTION COST: 0.68800510819 XRD
+├─ Network execution: 0.2529526 XRD, 5059052 execution cost units
 ├─ Network finalization: 0.13626635 XRD, 2725327 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.29878615819 XRD
@@ -33,15 +33,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.68786245819"),
+     amount: Decimal("0.68800510819"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.343931229095"),
+     amount: Decimal("0.344002554095"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.343931229095"),
+     amount: Decimal("0.344002554095"),
    }
 
 STATE UPDATES: 8 entities
@@ -51,7 +51,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.1719656145475"),
+             0u8 => Decimal("0.1720012770475"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -84,7 +84,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999999.31213754181")),
+         LiquidFungibleResource(Decimal("99999999999999999.31199489181")),
        )
 ├─ resource_sim1t5cryrd2t8xhdk3cra2flmvqydf7l5l3kschqerv7w0prljc2uhh09 across 4 partitions
   ├─ Partition(5): 1 change
@@ -326,7 +326,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.343931229095")),
+         LiquidFungibleResource(Decimal("0.344002554095")),
        )
 
 OUTPUTS: 3
@@ -340,13 +340,13 @@ OUTPUTS: 3
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.68786245819
+   Change: -0.68800510819
 ├─ Vault: internal_vault_sim1tqqp6e7t3gyracm4g475nack22pmw0dq0wd3hgl8wcggz34rl8xvst
    ResAddr: resource_sim1t5cryrd2t8xhdk3cra2flmvqydf7l5l3kschqerv7w0prljc2uhh09
    Change: 100000
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.343931229095
+   Change: 0.344002554095
 
 NEW ENTITIES: 2
 └─ Component: account_sim16996e320lnez82q6430eunaz9l3n5fnwk6eh9avrmtmj22e7jmhemw
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/002--fungible-max-div-mint.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/002--fungible-max-div-mint.txt
index b032de29d9..171a6afb9b 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/002--fungible-max-div-mint.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/002--fungible-max-div-mint.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.29179799273 XRD
-├─ Network execution: 0.20798815 XRD, 4159763 execution cost units
+TRANSACTION COST: 0.29194064273 XRD
+├─ Network execution: 0.2081308 XRD, 4162616 execution cost units
 ├─ Network finalization: 0.0160036 XRD, 320072 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.06780624273 XRD
@@ -29,15 +29,15 @@ EVENTS: 7
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.29179799273"),
+     amount: Decimal("0.29194064273"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.145898996365"),
+     amount: Decimal("0.145970321365"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.145898996365"),
+     amount: Decimal("0.145970321365"),
    }
 
 STATE UPDATES: 6 entities
@@ -47,7 +47,7 @@ STATE UPDATES: 6 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.24491511273"),
+             0u8 => Decimal("0.24498643773"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -80,7 +80,7 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999999.02033954908")),
+         LiquidFungibleResource(Decimal("99999999999999999.02005424908")),
        )
 ├─ internal_vault_sim1tqqp6e7t3gyracm4g475nack22pmw0dq0wd3hgl8wcggz34rl8xvst across 1 partitions
   └─ Partition(64): 1 change
@@ -92,7 +92,7 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.48983022546")),
+         LiquidFungibleResource(Decimal("0.48997287546")),
        )
 
 OUTPUTS: 3
@@ -103,12 +103,12 @@ OUTPUTS: 3
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.29179799273
+   Change: -0.29194064273
 ├─ Vault: internal_vault_sim1tqqp6e7t3gyracm4g475nack22pmw0dq0wd3hgl8wcggz34rl8xvst
    ResAddr: resource_sim1t5cryrd2t8xhdk3cra2flmvqydf7l5l3kschqerv7w0prljc2uhh09
    Change: 100
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.145898996365
+   Change: 0.145970321365
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/003--fungible-max-div-burn.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/003--fungible-max-div-burn.txt
index 8e7dc7f5bb..51c4979524 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/003--fungible-max-div-burn.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/003--fungible-max-div-burn.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.29849867199 XRD
-├─ Network execution: 0.2068687 XRD, 4137374 execution cost units
+TRANSACTION COST: 0.29864132199 XRD
+├─ Network execution: 0.20701135 XRD, 4140227 execution cost units
 ├─ Network finalization: 0.0160036 XRD, 320072 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.07562637199 XRD
@@ -29,15 +29,15 @@ EVENTS: 7
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.29849867199"),
+     amount: Decimal("0.29864132199"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.149249335995"),
+     amount: Decimal("0.149320660995"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.149249335995"),
+     amount: Decimal("0.149320660995"),
    }
 
 STATE UPDATES: 6 entities
@@ -47,7 +47,7 @@ STATE UPDATES: 6 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.3195397807275"),
+             0u8 => Decimal("0.3196467682275"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -80,7 +80,7 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999998.72184087709")),
+         LiquidFungibleResource(Decimal("99999999999999998.72141292709")),
        )
 ├─ internal_vault_sim1tqqp6e7t3gyracm4g475nack22pmw0dq0wd3hgl8wcggz34rl8xvst across 1 partitions
   └─ Partition(64): 1 change
@@ -92,7 +92,7 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.639079561455")),
+         LiquidFungibleResource(Decimal("0.639293536455")),
        )
 
 OUTPUTS: 4
@@ -104,12 +104,12 @@ OUTPUTS: 4
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.29849867199
+   Change: -0.29864132199
 ├─ Vault: internal_vault_sim1tqqp6e7t3gyracm4g475nack22pmw0dq0wd3hgl8wcggz34rl8xvst
    ResAddr: resource_sim1t5cryrd2t8xhdk3cra2flmvqydf7l5l3kschqerv7w0prljc2uhh09
    Change: -10
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.149249335995
+   Change: 0.149320660995
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/004--fungible-max-div-transfer-32-times.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/004--fungible-max-div-transfer-32-times.txt
index 4eb8a54a69..36658d6dd2 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/004--fungible-max-div-transfer-32-times.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/004--fungible-max-div-transfer-32-times.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 2.01447265695 XRD
-├─ Network execution: 0.80039025 XRD, 16007805 execution cost units
+TRANSACTION COST: 2.01461530695 XRD
+├─ Network execution: 0.8005329 XRD, 16010658 execution cost units
 ├─ Network finalization: 0.08254785 XRD, 1650957 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 1.13153455695 XRD
@@ -326,15 +326,15 @@ EVENTS: 73
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("2.01447265695"),
+     amount: Decimal("2.01461530695"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("1.007236328475"),
+     amount: Decimal("1.007307653475"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("1.007236328475"),
+     amount: Decimal("1.007307653475"),
    }
 
 STATE UPDATES: 8 entities
@@ -344,7 +344,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.823157944965"),
+             0u8 => Decimal("0.823300594965"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -377,7 +377,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999996.70736822014")),
+         LiquidFungibleResource(Decimal("99999999999999996.70679762014")),
        )
 ├─ internal_vault_sim1tqqp6e7t3gyracm4g475nack22pmw0dq0wd3hgl8wcggz34rl8xvst across 1 partitions
   └─ Partition(64): 1 change
@@ -523,7 +523,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("1.64631588993")),
+         LiquidFungibleResource(Decimal("1.64660118993")),
        )
 
 OUTPUTS: 67
@@ -598,7 +598,7 @@ OUTPUTS: 67
 BALANCE CHANGES: 4
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -2.01447265695
+   Change: -2.01461530695
 ├─ Vault: internal_vault_sim1tqqp6e7t3gyracm4g475nack22pmw0dq0wd3hgl8wcggz34rl8xvst
    ResAddr: resource_sim1t5cryrd2t8xhdk3cra2flmvqydf7l5l3kschqerv7w0prljc2uhh09
    Change: -0.032
@@ -607,7 +607,7 @@ BALANCE CHANGES: 4
    Change: 0.032
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 1.007236328475
+   Change: 1.007307653475
 
 NEW ENTITIES: 1
 └─ Component: account_sim168qgdkgfqxpnswu38wy6fy5v0q0um52zd0umuely5t9xrf88t3unc0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/005--fungible-max-div-freeze-withdraw.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/005--fungible-max-div-freeze-withdraw.txt
index db6ebb1aaf..9ffc2e1cf6 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/005--fungible-max-div-freeze-withdraw.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/005--fungible-max-div-freeze-withdraw.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.19198286004 XRD
-├─ Network execution: 0.1359137 XRD, 2718274 execution cost units
+TRANSACTION COST: 0.19212551004 XRD
+├─ Network execution: 0.13605635 XRD, 2721127 execution cost units
 ├─ Network finalization: 0.0152519 XRD, 305038 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.04081726004 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.19198286004"),
+     amount: Decimal("0.19212551004"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.09599143002"),
+     amount: Decimal("0.09606275502"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.09599143002"),
+     amount: Decimal("0.09606275502"),
    }
 
 STATE UPDATES: 6 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 6 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.871153659975"),
+             0u8 => Decimal("0.871331972475"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -75,13 +75,13 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999996.5153853601")),
+         LiquidFungibleResource(Decimal("99999999999999996.5146721101")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("1.74230731995")),
+         LiquidFungibleResource(Decimal("1.74266394495")),
        )
 
 OUTPUTS: 2
@@ -91,9 +91,9 @@ OUTPUTS: 2
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.19198286004
+   Change: -0.19212551004
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.09599143002
+   Change: 0.09606275502
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/006--fungible-max-div-freeze-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/006--fungible-max-div-freeze-deposit.txt
index 2fcc8a7395..0abf24b6be 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/006--fungible-max-div-freeze-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/006--fungible-max-div-freeze-deposit.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.19198286004 XRD
-├─ Network execution: 0.1359137 XRD, 2718274 execution cost units
+TRANSACTION COST: 0.19212551004 XRD
+├─ Network execution: 0.13605635 XRD, 2721127 execution cost units
 ├─ Network finalization: 0.0152519 XRD, 305038 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.04081726004 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.19198286004"),
+     amount: Decimal("0.19212551004"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.09599143002"),
+     amount: Decimal("0.09606275502"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.09599143002"),
+     amount: Decimal("0.09606275502"),
    }
 
 STATE UPDATES: 6 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 6 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.919149374985"),
+             0u8 => Decimal("0.919363349985"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -75,13 +75,13 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999996.32340250006")),
+         LiquidFungibleResource(Decimal("99999999999999996.32254660006")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("1.83829874997")),
+         LiquidFungibleResource(Decimal("1.83872669997")),
        )
 
 OUTPUTS: 2
@@ -91,9 +91,9 @@ OUTPUTS: 2
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.19198286004
+   Change: -0.19212551004
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.09599143002
+   Change: 0.09606275502
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/007--fungible-max-div-freeze-burn.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/007--fungible-max-div-freeze-burn.txt
index 986b785612..3640649267 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/007--fungible-max-div-freeze-burn.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/007--fungible-max-div-freeze-burn.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.19198286004 XRD
-├─ Network execution: 0.1359137 XRD, 2718274 execution cost units
+TRANSACTION COST: 0.19212551004 XRD
+├─ Network execution: 0.13605635 XRD, 2721127 execution cost units
 ├─ Network finalization: 0.0152519 XRD, 305038 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.04081726004 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.19198286004"),
+     amount: Decimal("0.19212551004"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.09599143002"),
+     amount: Decimal("0.09606275502"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.09599143002"),
+     amount: Decimal("0.09606275502"),
    }
 
 STATE UPDATES: 6 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 6 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.967145089995"),
+             0u8 => Decimal("0.967394727495"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -75,13 +75,13 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999996.13141964002")),
+         LiquidFungibleResource(Decimal("99999999999999996.13042109002")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("1.93429017999")),
+         LiquidFungibleResource(Decimal("1.93478945499")),
        )
 
 OUTPUTS: 2
@@ -91,9 +91,9 @@ OUTPUTS: 2
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.19198286004
+   Change: -0.19212551004
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.09599143002
+   Change: 0.09606275502
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/008--fungible-max-div-recall-frozen-vault.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/008--fungible-max-div-recall-frozen-vault.txt
index 9fd380767a..f601ff7885 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/008--fungible-max-div-recall-frozen-vault.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/008--fungible-max-div-recall-frozen-vault.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.30009958853 XRD
-├─ Network execution: 0.20556725 XRD, 4111345 execution cost units
+TRANSACTION COST: 0.30024223853 XRD
+├─ Network execution: 0.2057099 XRD, 4114198 execution cost units
 ├─ Network finalization: 0.02100405 XRD, 420081 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.07352828853 XRD
@@ -29,15 +29,15 @@ EVENTS: 7
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.30009958853"),
+     amount: Decimal("0.30024223853"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.150049794265"),
+     amount: Decimal("0.150121119265"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.150049794265"),
+     amount: Decimal("0.150121119265"),
    }
 
 STATE UPDATES: 7 entities
@@ -47,7 +47,7 @@ STATE UPDATES: 7 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.0421699871275"),
+             0u8 => Decimal("1.0424552871275"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -86,7 +86,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999995.83132005149")),
+         LiquidFungibleResource(Decimal("99999999999999995.83017885149")),
        )
 ├─ internal_vault_sim1trl737k2t8f0y32gd9p4pdm4rkszwtgmd9rknragf3rgegns5pts2p across 1 partitions
   └─ Partition(64): 1 change
@@ -98,7 +98,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("2.084339974255")),
+         LiquidFungibleResource(Decimal("2.084910574255")),
        )
 
 OUTPUTS: 3
@@ -112,12 +112,12 @@ BALANCE CHANGES: 4
    Change: -1
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.30009958853
+   Change: -0.30024223853
 ├─ Vault: internal_vault_sim1trl737k2t8f0y32gd9p4pdm4rkszwtgmd9rknragf3rgegns5pts2p
    ResAddr: resource_sim1t5cryrd2t8xhdk3cra2flmvqydf7l5l3kschqerv7w0prljc2uhh09
    Change: 1
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.150049794265
+   Change: 0.150121119265
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/009--fungible-max-div-unfreeze-withdraw.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/009--fungible-max-div-unfreeze-withdraw.txt
index 9f9c47cfc8..d570cfbdf9 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/009--fungible-max-div-unfreeze-withdraw.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/009--fungible-max-div-unfreeze-withdraw.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.1920901949 XRD
-├─ Network execution: 0.1358303 XRD, 2716606 execution cost units
+TRANSACTION COST: 0.1922328449 XRD
+├─ Network execution: 0.13597295 XRD, 2719459 execution cost units
 ├─ Network finalization: 0.0152519 XRD, 305038 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.0410079949 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.1920901949"),
+     amount: Decimal("0.1922328449"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.09604509745"),
+     amount: Decimal("0.09611642245"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.09604509745"),
+     amount: Decimal("0.09611642245"),
    }
 
 STATE UPDATES: 6 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 6 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.0901925358525"),
+             0u8 => Decimal("1.0905134983525"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -75,13 +75,13 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999995.63922985659")),
+         LiquidFungibleResource(Decimal("99999999999999995.63794600659")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("2.180385071705")),
+         LiquidFungibleResource(Decimal("2.181026996705")),
        )
 
 OUTPUTS: 2
@@ -91,9 +91,9 @@ OUTPUTS: 2
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.1920901949
+   Change: -0.1922328449
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.09604509745
+   Change: 0.09611642245
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/010--fungible-max-div-unfreeze-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/010--fungible-max-div-unfreeze-deposit.txt
index eae1dee48e..e28bb023f5 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/010--fungible-max-div-unfreeze-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/010--fungible-max-div-unfreeze-deposit.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.1920901949 XRD
-├─ Network execution: 0.1358303 XRD, 2716606 execution cost units
+TRANSACTION COST: 0.1922328449 XRD
+├─ Network execution: 0.13597295 XRD, 2719459 execution cost units
 ├─ Network finalization: 0.0152519 XRD, 305038 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.0410079949 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.1920901949"),
+     amount: Decimal("0.1922328449"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.09604509745"),
+     amount: Decimal("0.09611642245"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.09604509745"),
+     amount: Decimal("0.09611642245"),
    }
 
 STATE UPDATES: 6 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 6 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.1382150845775"),
+             0u8 => Decimal("1.1385717095775"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -75,13 +75,13 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999995.44713966169")),
+         LiquidFungibleResource(Decimal("99999999999999995.44571316169")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("2.276430169155")),
+         LiquidFungibleResource(Decimal("2.277143419155")),
        )
 
 OUTPUTS: 2
@@ -91,9 +91,9 @@ OUTPUTS: 2
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.1920901949
+   Change: -0.1922328449
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.09604509745
+   Change: 0.09611642245
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/011--fungible-max-div-unfreeze-burn.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/011--fungible-max-div-unfreeze-burn.txt
index 5ad074a51c..6bf17abfdb 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/011--fungible-max-div-unfreeze-burn.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/011--fungible-max-div-unfreeze-burn.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.1920901949 XRD
-├─ Network execution: 0.1358303 XRD, 2716606 execution cost units
+TRANSACTION COST: 0.1922328449 XRD
+├─ Network execution: 0.13597295 XRD, 2719459 execution cost units
 ├─ Network finalization: 0.0152519 XRD, 305038 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.0410079949 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.1920901949"),
+     amount: Decimal("0.1922328449"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.09604509745"),
+     amount: Decimal("0.09611642245"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.09604509745"),
+     amount: Decimal("0.09611642245"),
    }
 
 STATE UPDATES: 6 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 6 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.1862376333025"),
+             0u8 => Decimal("1.1866299208025"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -75,13 +75,13 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999995.25504946679")),
+         LiquidFungibleResource(Decimal("99999999999999995.25348031679")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("2.372475266605")),
+         LiquidFungibleResource(Decimal("2.373259841605")),
        )
 
 OUTPUTS: 2
@@ -91,9 +91,9 @@ OUTPUTS: 2
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.1920901949
+   Change: -0.1922328449
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.09604509745
+   Change: 0.09611642245
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/012--fungible-max-div-recall-unfrozen-vault.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/012--fungible-max-div-recall-unfrozen-vault.txt
index bc96f63f1f..80af58ae8d 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/012--fungible-max-div-recall-unfrozen-vault.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/012--fungible-max-div-recall-unfrozen-vault.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.29109843853 XRD
-├─ Network execution: 0.20156655 XRD, 4031331 execution cost units
+TRANSACTION COST: 0.29124108853 XRD
+├─ Network execution: 0.2017092 XRD, 4034184 execution cost units
 ├─ Network finalization: 0.0160036 XRD, 320072 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.07352828853 XRD
@@ -29,15 +29,15 @@ EVENTS: 7
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.29109843853"),
+     amount: Decimal("0.29124108853"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.145549219265"),
+     amount: Decimal("0.145620544265"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.145549219265"),
+     amount: Decimal("0.145620544265"),
    }
 
 STATE UPDATES: 6 entities
@@ -47,7 +47,7 @@ STATE UPDATES: 6 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.259012242935"),
+             0u8 => Decimal("1.259440192935"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -86,13 +86,13 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999994.96395102826")),
+         LiquidFungibleResource(Decimal("99999999999999994.96223922826")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("2.51802448587")),
+         LiquidFungibleResource(Decimal("2.51888038587")),
        )
 
 OUTPUTS: 3
@@ -103,9 +103,9 @@ OUTPUTS: 3
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.29109843853
+   Change: -0.29124108853
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.145549219265
+   Change: 0.145620544265
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/013--fungible-max-div-freeze-withdraw-again.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/013--fungible-max-div-freeze-withdraw-again.txt
index a538646ffd..986d65a31d 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/013--fungible-max-div-freeze-withdraw-again.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/013--fungible-max-div-freeze-withdraw-again.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.19198286004 XRD
-├─ Network execution: 0.1359137 XRD, 2718274 execution cost units
+TRANSACTION COST: 0.19212551004 XRD
+├─ Network execution: 0.13605635 XRD, 2721127 execution cost units
 ├─ Network finalization: 0.0152519 XRD, 305038 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.04081726004 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.19198286004"),
+     amount: Decimal("0.19212551004"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.09599143002"),
+     amount: Decimal("0.09606275502"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.09599143002"),
+     amount: Decimal("0.09606275502"),
    }
 
 STATE UPDATES: 6 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 6 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.307007957945"),
+             0u8 => Decimal("1.307471570445"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -75,13 +75,13 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999994.77196816822")),
+         LiquidFungibleResource(Decimal("99999999999999994.77011371822")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("2.61401591589")),
+         LiquidFungibleResource(Decimal("2.61494314089")),
        )
 
 OUTPUTS: 2
@@ -91,9 +91,9 @@ OUTPUTS: 2
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.19198286004
+   Change: -0.19212551004
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.09599143002
+   Change: 0.09606275502
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/014--fungible-min-div-create.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/014--fungible-min-div-create.txt
index 5eee98ffce..d2059f2eaa 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/014--fungible-min-div-create.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/014--fungible-min-div-create.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.58241920439 XRD
-├─ Network execution: 0.2403144 XRD, 4806288 execution cost units
+TRANSACTION COST: 0.58256185439 XRD
+├─ Network execution: 0.24045705 XRD, 4809141 execution cost units
 ├─ Network finalization: 0.10626115 XRD, 2125223 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.23584365439 XRD
@@ -33,15 +33,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.58241920439"),
+     amount: Decimal("0.58256185439"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.291209602195"),
+     amount: Decimal("0.291280927195"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.291209602195"),
+     amount: Decimal("0.291280927195"),
    }
 
 STATE UPDATES: 8 entities
@@ -51,7 +51,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.4526127590425"),
+             0u8 => Decimal("1.4531120340425"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -84,7 +84,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999994.18954896383")),
+         LiquidFungibleResource(Decimal("99999999999999994.18755186383")),
        )
 ├─ resource_sim1tk8mv5cp2uuhjgw34qqh9v7jf6atjsnyrym9f3653k7pyd4gamsx96 across 4 partitions
   ├─ Partition(5): 1 change
@@ -233,7 +233,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("2.905225518085")),
+         LiquidFungibleResource(Decimal("2.906224068085")),
        )
 
 OUTPUTS: 3
@@ -247,13 +247,13 @@ OUTPUTS: 3
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.58241920439
+   Change: -0.58256185439
 ├─ Vault: internal_vault_sim1tpcy68e3056prrst2k9qvk04727s0q9yqwvj63hun7azu7lujcn9ex
    ResAddr: resource_sim1tk8mv5cp2uuhjgw34qqh9v7jf6atjsnyrym9f3653k7pyd4gamsx96
    Change: 100000
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.291209602195
+   Change: 0.291280927195
 
 NEW ENTITIES: 1
 └─ Resource: resource_sim1tk8mv5cp2uuhjgw34qqh9v7jf6atjsnyrym9f3653k7pyd4gamsx96
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/015--fungible-min-div-mint-correct-granularity.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/015--fungible-min-div-mint-correct-granularity.txt
index 10644ad7a4..5aa980d412 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/015--fungible-min-div-mint-correct-granularity.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/015--fungible-min-div-mint-correct-granularity.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.29179799273 XRD
-├─ Network execution: 0.20798815 XRD, 4159763 execution cost units
+TRANSACTION COST: 0.29194064273 XRD
+├─ Network execution: 0.2081308 XRD, 4162616 execution cost units
 ├─ Network finalization: 0.0160036 XRD, 320072 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.06780624273 XRD
@@ -29,15 +29,15 @@ EVENTS: 7
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.29179799273"),
+     amount: Decimal("0.29194064273"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.145898996365"),
+     amount: Decimal("0.145970321365"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.145898996365"),
+     amount: Decimal("0.145970321365"),
    }
 
 STATE UPDATES: 6 entities
@@ -47,7 +47,7 @@ STATE UPDATES: 6 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.525562257225"),
+             0u8 => Decimal("1.526097194725"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -80,7 +80,7 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999993.8977509711")),
+         LiquidFungibleResource(Decimal("99999999999999993.8956112211")),
        )
 ├─ internal_vault_sim1tpcy68e3056prrst2k9qvk04727s0q9yqwvj63hun7azu7lujcn9ex across 1 partitions
   └─ Partition(64): 1 change
@@ -92,7 +92,7 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("3.05112451445")),
+         LiquidFungibleResource(Decimal("3.05219438945")),
        )
 
 OUTPUTS: 3
@@ -103,12 +103,12 @@ OUTPUTS: 3
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.29179799273
+   Change: -0.29194064273
 ├─ Vault: internal_vault_sim1tpcy68e3056prrst2k9qvk04727s0q9yqwvj63hun7azu7lujcn9ex
    ResAddr: resource_sim1tk8mv5cp2uuhjgw34qqh9v7jf6atjsnyrym9f3653k7pyd4gamsx96
    Change: 166
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.145898996365
+   Change: 0.145970321365
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/016--fungible-min-div-mint-wrong-granularity.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/016--fungible-min-div-mint-wrong-granularity.txt
index adbb0a73f0..c6e5a75378 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/016--fungible-min-div-mint-wrong-granularity.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/016--fungible-min-div-mint-wrong-granularity.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED FAILURE: ApplicationError(FungibleResourceManagerError(InvalidAmount(1.1, 0)))
 
-TRANSACTION COST: 0.16578667938 XRD
-├─ Network execution: 0.1308822 XRD, 2617644 execution cost units
+TRANSACTION COST: 0.16592932938 XRD
+├─ Network execution: 0.13102485 XRD, 2620497 execution cost units
 ├─ Network finalization: 0 XRD, 0 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.03490447938 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.16578667938"),
+     amount: Decimal("0.16592932938"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.08289333969"),
+     amount: Decimal("0.08296466469"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.08289333969"),
+     amount: Decimal("0.08296466469"),
    }
 
 STATE UPDATES: 4 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 4 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.56700892707"),
+             0u8 => Decimal("1.56757952707"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -60,21 +60,21 @@ STATE UPDATES: 4 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999993.73196429172")),
+         LiquidFungibleResource(Decimal("99999999999999993.72968189172")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("3.13401785414")),
+         LiquidFungibleResource(Decimal("3.13515905414")),
        )
 
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.16578667938
+   Change: -0.16592932938
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.08289333969
+   Change: 0.08296466469
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/017--fungible-min-div-transfer-correct-granularity.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/017--fungible-min-div-transfer-correct-granularity.txt
index 33a3dc15c9..690ab255a2 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/017--fungible-min-div-transfer-correct-granularity.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/017--fungible-min-div-transfer-correct-granularity.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.40596197083 XRD
-├─ Network execution: 0.2377521 XRD, 4755042 execution cost units
+TRANSACTION COST: 0.40610462083 XRD
+├─ Network execution: 0.23789475 XRD, 4757895 execution cost units
 ├─ Network finalization: 0.03650745 XRD, 730149 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.13170242083 XRD
@@ -38,15 +38,15 @@ EVENTS: 9
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.40596197083"),
+     amount: Decimal("0.40610462083"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.202980985415"),
+     amount: Decimal("0.203052310415"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.202980985415"),
+     amount: Decimal("0.203052310415"),
    }
 
 STATE UPDATES: 8 entities
@@ -56,7 +56,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.6684994197775"),
+             0u8 => Decimal("1.6691056822775"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -89,7 +89,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999993.32600232089")),
+         LiquidFungibleResource(Decimal("99999999999999993.32357727089")),
        )
 ├─ internal_vault_sim1tpcy68e3056prrst2k9qvk04727s0q9yqwvj63hun7azu7lujcn9ex across 1 partitions
   └─ Partition(64): 1 change
@@ -142,7 +142,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("3.336998839555")),
+         LiquidFungibleResource(Decimal("3.338211364555")),
        )
 
 OUTPUTS: 3
@@ -153,7 +153,7 @@ OUTPUTS: 3
 BALANCE CHANGES: 4
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.40596197083
+   Change: -0.40610462083
 ├─ Vault: internal_vault_sim1tpcy68e3056prrst2k9qvk04727s0q9yqwvj63hun7azu7lujcn9ex
    ResAddr: resource_sim1tk8mv5cp2uuhjgw34qqh9v7jf6atjsnyrym9f3653k7pyd4gamsx96
    Change: -234
@@ -162,6 +162,6 @@ BALANCE CHANGES: 4
    Change: 234
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.202980985415
+   Change: 0.203052310415
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/018--fungible-min-div-transfer-wrong-granularity.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/018--fungible-min-div-transfer-wrong-granularity.txt
index 8f2224fce0..1318533ed3 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/018--fungible-min-div-transfer-wrong-granularity.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/018--fungible-min-div-transfer-wrong-granularity.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED FAILURE: ApplicationError(VaultError(InvalidAmount(0.0001)))
 
-TRANSACTION COST: 0.21006701182 XRD
-├─ Network execution: 0.16486285 XRD, 3297257 execution cost units
+TRANSACTION COST: 0.21020966182 XRD
+├─ Network execution: 0.1650055 XRD, 3300110 execution cost units
 ├─ Network finalization: 0 XRD, 0 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.04520416182 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.21006701182"),
+     amount: Decimal("0.21020966182"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.10503350591"),
+     amount: Decimal("0.10510483091"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.10503350591"),
+     amount: Decimal("0.10510483091"),
    }
 
 STATE UPDATES: 4 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 4 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.7210161727325"),
+             0u8 => Decimal("1.7216580977325"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -60,21 +60,21 @@ STATE UPDATES: 4 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999993.11593530907")),
+         LiquidFungibleResource(Decimal("99999999999999993.11336760907")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("3.442032345465")),
+         LiquidFungibleResource(Decimal("3.443316195465")),
        )
 
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.21006701182
+   Change: -0.21020966182
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.10503350591
+   Change: 0.10510483091
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/019--fungible-min-div-create-proof-correct-granularity.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/019--fungible-min-div-create-proof-correct-granularity.txt
index 2ce2063174..32f54cfcf2 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/019--fungible-min-div-create-proof-correct-granularity.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/019--fungible-min-div-create-proof-correct-granularity.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.26085126042 XRD
-├─ Network execution: 0.1984876 XRD, 3969752 execution cost units
+TRANSACTION COST: 0.26099391042 XRD
+├─ Network execution: 0.19863025 XRD, 3972605 execution cost units
 ├─ Network finalization: 0.01525215 XRD, 305043 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.04711151042 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.26085126042"),
+     amount: Decimal("0.26099391042"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.13042563021"),
+     amount: Decimal("0.13049695521"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.13042563021"),
+     amount: Decimal("0.13049695521"),
    }
 
 STATE UPDATES: 6 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 6 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.7862289878375"),
+             0u8 => Decimal("1.7869065753375"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -67,7 +67,7 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999992.85508404865")),
+         LiquidFungibleResource(Decimal("99999999999999992.85237369865")),
        )
 ├─ internal_vault_sim1tpcy68e3056prrst2k9qvk04727s0q9yqwvj63hun7azu7lujcn9ex across 1 partitions
   └─ Partition(64): 1 change
@@ -79,7 +79,7 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("3.572457975675")),
+         LiquidFungibleResource(Decimal("3.573813150675")),
        )
 
 OUTPUTS: 2
@@ -89,9 +89,9 @@ OUTPUTS: 2
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.26085126042
+   Change: -0.26099391042
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.13042563021
+   Change: 0.13049695521
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/020--fungible-min-div-create-proof-wrong-granularity.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/020--fungible-min-div-create-proof-wrong-granularity.txt
index 608b2f0e1e..b25cb217e0 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/020--fungible-min-div-create-proof-wrong-granularity.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/020--fungible-min-div-create-proof-wrong-granularity.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED FAILURE: ApplicationError(VaultError(InvalidAmount(0.0001)))
 
-TRANSACTION COST: 0.20042050317 XRD
-├─ Network execution: 0.16046155 XRD, 3209231 execution cost units
+TRANSACTION COST: 0.20056315317 XRD
+├─ Network execution: 0.1606042 XRD, 3212084 execution cost units
 ├─ Network finalization: 0 XRD, 0 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.03995895317 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.20042050317"),
+     amount: Decimal("0.20056315317"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.100210251585"),
+     amount: Decimal("0.100281576585"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.100210251585"),
+     amount: Decimal("0.100281576585"),
    }
 
 STATE UPDATES: 4 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 4 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.83633411363"),
+             0u8 => Decimal("1.83704736363"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -60,21 +60,21 @@ STATE UPDATES: 4 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999992.65466354548")),
+         LiquidFungibleResource(Decimal("99999999999999992.65181054548")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("3.67266822726")),
+         LiquidFungibleResource(Decimal("3.67409472726")),
        )
 
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.20042050317
+   Change: -0.20056315317
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.100210251585
+   Change: 0.100281576585
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/021--fungible-min-div-recall-correct-granularity.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/021--fungible-min-div-recall-correct-granularity.txt
index 2f1f5c899a..b606194831 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/021--fungible-min-div-recall-correct-granularity.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/021--fungible-min-div-recall-correct-granularity.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.29109843853 XRD
-├─ Network execution: 0.20156655 XRD, 4031331 execution cost units
+TRANSACTION COST: 0.29124108853 XRD
+├─ Network execution: 0.2017092 XRD, 4034184 execution cost units
 ├─ Network finalization: 0.0160036 XRD, 320072 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.07352828853 XRD
@@ -29,15 +29,15 @@ EVENTS: 7
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.29109843853"),
+     amount: Decimal("0.29124108853"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.145549219265"),
+     amount: Decimal("0.145620544265"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.145549219265"),
+     amount: Decimal("0.145620544265"),
    }
 
 STATE UPDATES: 6 entities
@@ -47,7 +47,7 @@ STATE UPDATES: 6 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.9091087232625"),
+             0u8 => Decimal("1.9098576357625"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -86,13 +86,13 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999992.36356510695")),
+         LiquidFungibleResource(Decimal("99999999999999992.36056945695")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("3.818217446525")),
+         LiquidFungibleResource(Decimal("3.819715271525")),
        )
 
 OUTPUTS: 3
@@ -103,9 +103,9 @@ OUTPUTS: 3
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.29109843853
+   Change: -0.29124108853
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.145549219265
+   Change: 0.145620544265
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/022--fungible-min-div-recall-wrong-granularity.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/022--fungible-min-div-recall-wrong-granularity.txt
index f8939ee3a8..07e66c2964 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/022--fungible-min-div-recall-wrong-granularity.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/receipts/022--fungible-min-div-recall-wrong-granularity.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED FAILURE: ApplicationError(VaultError(InvalidAmount(123.12321)))
 
-TRANSACTION COST: 0.1683664692 XRD
-├─ Network execution: 0.1264048 XRD, 2528096 execution cost units
+TRANSACTION COST: 0.1685091192 XRD
+├─ Network execution: 0.12654745 XRD, 2530949 execution cost units
 ├─ Network finalization: 0 XRD, 0 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.0419616692 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.1683664692"),
+     amount: Decimal("0.1685091192"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.0841832346"),
+     amount: Decimal("0.0842545596"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.0841832346"),
+     amount: Decimal("0.0842545596"),
    }
 
 STATE UPDATES: 4 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 4 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.9512003405625"),
+             0u8 => Decimal("1.9519849155625"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -60,21 +60,21 @@ STATE UPDATES: 4 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999992.19519863775")),
+         LiquidFungibleResource(Decimal("99999999999999992.19206033775")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("3.902400681125")),
+         LiquidFungibleResource(Decimal("3.903969831125")),
        )
 
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.1683664692
+   Change: -0.1685091192
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.0841832346
+   Change: 0.0842545596
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/scenario_summary.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/scenario_summary.txt
index e4dd307883..017a1834dd 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/scenario_summary.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/fungible_resource/scenario_summary.txt
@@ -2,8 +2,8 @@ Name: fungible_resource
 
 == SUMMARY HASHES ==
 These Cuttlefish hashes are permitted to change only until the scenario is deployed to a permanent network, else it can cause divergence.
-State changes: 5f8731c4b3d3b573 (allowed to change if not deployed to any network)
-Events       : ad1cf70007eef78b (allowed to change if not deployed to any network)
+State changes: 41f5f980b941716f (allowed to change if not deployed to any network)
+Events       : 53ab4d89ce1efce1 (allowed to change if not deployed to any network)
 
 == INTERESTING ADDRESSES ==
 - user_account_1: account_sim16996e320lnez82q6430eunaz9l3n5fnwk6eh9avrmtmj22e7jmhemw
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/global_n_owned/costings/001--global_n_owned_emitting_events.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/global_n_owned/costings/001--global_n_owned_emitting_events.txt
index 093cd97c93..ff941ac71a 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/global_n_owned/costings/001--global_n_owned_emitting_events.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/global_n_owned/costings/001--global_n_owned_emitting_events.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,           31.11874008773,    100.0%
-- Execution Cost (XRD)                                                     ,               0.73828155,      2.4%
+Total Cost (XRD)                                                           ,           31.11930353773,    100.0%
+- Execution Cost (XRD)                                                     ,                 0.738845,      2.4%
 - Finalization Cost (XRD)                                                  ,                0.1288607,      0.4%
 - Storage Cost (XRD)                                                       ,           30.25159783773,     97.2%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                 14765631,    100.0%
+Execution Cost Breakdown                                                   ,                 14776900,    100.0%
 - AfterInvoke                                                              ,                      530,      0.0%
 - AllocateNodeId                                                           ,                     2619,      0.0%
 - BeforeInvoke                                                             ,                   174964,      1.2%
@@ -34,10 +34,10 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.1%
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.3%
 - RunNativeCode::publish_wasm_advanced                                     ,                  4176881,     28.3%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.2%
-- RunWasmCode::GlobalBp_emit_event                                         ,                    13600,      0.1%
-- RunWasmCode::GlobalBp_new                                                ,                    47465,      0.3%
-- RunWasmCode::OwnedBp_emit_event                                          ,                    10305,      0.1%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.2%
+- RunWasmCode::GlobalBp_emit_event                                         ,                    14737,      0.1%
+- RunWasmCode::GlobalBp_new                                                ,                    54033,      0.4%
+- RunWasmCode::OwnedBp_emit_event                                          ,                    11016,      0.1%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      776,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/global_n_owned/receipts/001--global_n_owned_emitting_events.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/global_n_owned/receipts/001--global_n_owned_emitting_events.txt
index a1c669cbfe..dd6544c946 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/global_n_owned/receipts/001--global_n_owned_emitting_events.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/global_n_owned/receipts/001--global_n_owned_emitting_events.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 31.11874008773 XRD
-├─ Network execution: 0.73828155 XRD, 14765631 execution cost units
+TRANSACTION COST: 31.11930353773 XRD
+├─ Network execution: 0.738845 XRD, 14776900 execution cost units
 ├─ Network finalization: 0.1288607 XRD, 2577214 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 30.25159783773 XRD
@@ -24,15 +24,15 @@ EVENTS: 7
    Event: GlobalBpEvent
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("31.11874008773"),
+     amount: Decimal("31.11930353773"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("15.559370043865"),
+     amount: Decimal("15.559651768865"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("15.559370043865"),
+     amount: Decimal("15.559651768865"),
    }
 
 STATE UPDATES: 9 entities
@@ -42,7 +42,7 @@ STATE UPDATES: 9 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("7.7796850219325"),
+             0u8 => Decimal("7.7798258844325"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -75,7 +75,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999968.88125991227")),
+         LiquidFungibleResource(Decimal("99999999999999968.88069646227")),
        )
 ├─ package_sim1pkaulm4hum34fy2k0tnflzmyh2qvv9vq9kwlpxwrh68k9t36zkng96 across 11 partitions
   ├─ Partition(1): 2 changes
@@ -687,7 +687,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("15.559370043865")),
+         LiquidFungibleResource(Decimal("15.559651768865")),
        )
 
 OUTPUTS: 4
@@ -699,10 +699,10 @@ OUTPUTS: 4
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -31.11874008773
+   Change: -31.11930353773
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 15.559370043865
+   Change: 15.559651768865
 
 NEW ENTITIES: 2
 └─ Package: package_sim1pkaulm4hum34fy2k0tnflzmyh2qvv9vq9kwlpxwrh68k9t36zkng96
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/global_n_owned/scenario_summary.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/global_n_owned/scenario_summary.txt
index 17a6b3ddfa..de3cc9bcfb 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/global_n_owned/scenario_summary.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/global_n_owned/scenario_summary.txt
@@ -2,8 +2,8 @@ Name: global_n_owned
 
 == SUMMARY HASHES ==
 These Cuttlefish hashes are permitted to change only until the scenario is deployed to a permanent network, else it can cause divergence.
-State changes: 8b185a122796d1f7 (allowed to change if not deployed to any network)
-Events       : 011d0ff4510ec313 (allowed to change if not deployed to any network)
+State changes: 834dfb443034d666 (allowed to change if not deployed to any network)
+Events       : 08b2ebf0208dbef5 (allowed to change if not deployed to any network)
 
 == INTERESTING ADDRESSES ==
 - global_n_owned_package_address: package_sim1pkaulm4hum34fy2k0tnflzmyh2qvv9vq9kwlpxwrh68k9t36zkng96
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/kv_store_with_remote_type/costings/001--kv-store-with-remote-type.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/kv_store_with_remote_type/costings/001--kv-store-with-remote-type.txt
index f68f4939f9..f72cea8e9a 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/kv_store_with_remote_type/costings/001--kv-store-with-remote-type.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/kv_store_with_remote_type/costings/001--kv-store-with-remote-type.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            37.0786903014,    100.0%
-- Execution Cost (XRD)                                                     ,               0.73703315,      2.0%
+Total Cost (XRD)                                                           ,            37.0792237014,    100.0%
+- Execution Cost (XRD)                                                     ,               0.73756655,      2.0%
 - Finalization Cost (XRD)                                                  ,                0.1039411,      0.3%
 - Storage Cost (XRD)                                                       ,            36.2377160514,     97.7%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                 14740663,    100.0%
+Execution Cost Breakdown                                                   ,                 14751331,    100.0%
 - AfterInvoke                                                              ,                      460,      0.0%
 - AllocateNodeId                                                           ,                     2425,      0.0%
 - BeforeInvoke                                                             ,                   208346,      1.4%
@@ -33,9 +33,9 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::create_with_data                                          ,                    54942,      0.4%
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.1%
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.3%
-- RunNativeCode::publish_wasm_advanced                                     ,                  4918202,     33.4%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.2%
-- RunWasmCode::KVStore_create_key_value_store_with_remote_type             ,                    54973,      0.4%
+- RunNativeCode::publish_wasm_advanced                                     ,                  4918202,     33.3%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.2%
+- RunWasmCode::KVStore_create_key_value_store_with_remote_type             ,                    62788,      0.4%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      774,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/kv_store_with_remote_type/receipts/001--kv-store-with-remote-type.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/kv_store_with_remote_type/receipts/001--kv-store-with-remote-type.txt
index 2737f45947..5ec21c381f 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/kv_store_with_remote_type/receipts/001--kv-store-with-remote-type.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/kv_store_with_remote_type/receipts/001--kv-store-with-remote-type.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 37.0786903014 XRD
-├─ Network execution: 0.73703315 XRD, 14740663 execution cost units
+TRANSACTION COST: 37.0792237014 XRD
+├─ Network execution: 0.73756655 XRD, 14751331 execution cost units
 ├─ Network finalization: 0.1039411 XRD, 2078822 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 36.2377160514 XRD
@@ -20,15 +20,15 @@ EVENTS: 5
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("37.0786903014"),
+     amount: Decimal("37.0792237014"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("18.5393451507"),
+     amount: Decimal("18.5396118507"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("18.5393451507"),
+     amount: Decimal("18.5396118507"),
    }
 
 STATE UPDATES: 9 entities
@@ -38,7 +38,7 @@ STATE UPDATES: 9 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("9.26967257535"),
+             0u8 => Decimal("9.26980592535"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -71,7 +71,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999962.9213096986")),
+         LiquidFungibleResource(Decimal("99999999999999962.9207762986")),
        )
 ├─ package_sim1phrx0wcqf0t56shsrygqjvrmll7m39n5jayzkuk2f0w76f698cfwwt across 11 partitions
   ├─ Partition(1): 1 change
@@ -427,7 +427,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("18.5393451507")),
+         LiquidFungibleResource(Decimal("18.5396118507")),
        )
 
 OUTPUTS: 4
@@ -439,10 +439,10 @@ OUTPUTS: 4
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -37.0786903014
+   Change: -37.0792237014
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 18.5393451507
+   Change: 18.5396118507
 
 NEW ENTITIES: 2
 └─ Package: package_sim1phrx0wcqf0t56shsrygqjvrmll7m39n5jayzkuk2f0w76f698cfwwt
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/kv_store_with_remote_type/scenario_summary.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/kv_store_with_remote_type/scenario_summary.txt
index 4305874970..19a0aba563 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/kv_store_with_remote_type/scenario_summary.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/kv_store_with_remote_type/scenario_summary.txt
@@ -2,8 +2,8 @@ Name: kv_store_with_remote_type
 
 == SUMMARY HASHES ==
 These Cuttlefish hashes are permitted to change only until the scenario is deployed to a permanent network, else it can cause divergence.
-State changes: f0d65cf28cabfcbe (allowed to change if not deployed to any network)
-Events       : 76f4fe0cba4a7992 (allowed to change if not deployed to any network)
+State changes: 0c2b31941d451b07 (allowed to change if not deployed to any network)
+Events       : d7c4cfa51519f6cf (allowed to change if not deployed to any network)
 
 == INTERESTING ADDRESSES ==
 - kv_store_with_remote_type_package_address: package_sim1phrx0wcqf0t56shsrygqjvrmll7m39n5jayzkuk2f0w76f698cfwwt
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/costings/001--max_transaction-publish-package.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/costings/001--max_transaction-publish-package.txt
index aa52f3baad..710452c6d9 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/costings/001--max_transaction-publish-package.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/costings/001--max_transaction-publish-package.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            43.9742614389,    100.0%
-- Execution Cost (XRD)                                                     ,               0.83703315,      1.9%
+Total Cost (XRD)                                                           ,            43.9747102889,    100.0%
+- Execution Cost (XRD)                                                     ,                 0.837482,      1.9%
 - Finalization Cost (XRD)                                                  ,               0.10458285,      0.2%
 - Storage Cost (XRD)                                                       ,            43.0326454389,     97.9%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                 16740663,    100.0%
+Execution Cost Breakdown                                                   ,                 16749640,    100.0%
 - AfterInvoke                                                              ,                      460,      0.0%
 - AllocateNodeId                                                           ,                     2425,      0.0%
 - BeforeInvoke                                                             ,                   248008,      1.5%
@@ -33,13 +33,13 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::create_with_data                                          ,                    54942,      0.3%
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.1%
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.3%
-- RunNativeCode::publish_wasm_advanced                                     ,                  5802440,     34.7%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.1%
-- RunWasmCode::MaxTransaction_new                                          ,                    46462,      0.3%
+- RunNativeCode::publish_wasm_advanced                                     ,                  5802440,     34.6%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.2%
+- RunWasmCode::MaxTransaction_new                                          ,                    52586,      0.3%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      788,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
-- ValidateTxPayload                                                        ,                  4947640,     29.6%
+- ValidateTxPayload                                                        ,                  4947640,     29.5%
 - VerifyTxSignatures                                                       ,                     7000,      0.0%
 - WriteSubstate                                                            ,                     6922,      0.0%
 Finalization Cost Breakdown                                                ,                  2091657,    100.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/costings/002--max_transaction-with-large-events.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/costings/002--max_transaction-with-large-events.txt
index bd4676f726..97ae728e8f 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/costings/002--max_transaction-with-large-events.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/costings/002--max_transaction-with-large-events.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,          799.32719144787,    100.0%
-- Execution Cost (XRD)                                                     ,                 1.046472,      0.1%
+Total Cost (XRD)                                                           ,          799.32741399787,    100.0%
+- Execution Cost (XRD)                                                     ,               1.04669455,      0.1%
 - Finalization Cost (XRD)                                                  ,                0.1784497,      0.0%
 - Storage Cost (XRD)                                                       ,          798.10226974787,     99.8%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                 20929440,    100.0%
+Execution Cost Breakdown                                                   ,                 20933891,    100.0%
 - AfterInvoke                                                              ,                       76,      0.0%
 - AllocateNodeId                                                           ,                      679,      0.0%
 - BeforeInvoke                                                             ,                      644,      0.0%
@@ -12,7 +12,7 @@ Execution Cost Breakdown                                                   ,
 - CloseSubstate                                                            ,                    11352,      0.1%
 - CreateNode                                                               ,                     6032,      0.0%
 - DropNode                                                                 ,                    10841,      0.1%
-- EmitEvent                                                                ,                 16839736,     80.5%
+- EmitEvent                                                                ,                 16839736,     80.4%
 - GetOwnedNodes                                                            ,                     1000,      0.0%
 - LockFee                                                                  ,                      500,      0.0%
 - MarkSubstateAsTransient                                                  ,                       55,      0.0%
@@ -29,8 +29,8 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::Worktop_drop                                              ,                    17918,      0.1%
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.1%
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.2%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.1%
-- RunWasmCode::MaxTransaction_max_events                                   ,                    13798,      0.1%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.1%
+- RunWasmCode::MaxTransaction_max_events                                   ,                    15396,      0.1%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    11960,      0.1%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/costings/003--max_transaction-with-large-state-updates.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/costings/003--max_transaction-with-large-state-updates.txt
index c4dc1426e8..fd829a3183 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/costings/003--max_transaction-with-large-state-updates.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/costings/003--max_transaction-with-large-state-updates.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,         4205.56759160162,    100.0%
-- Execution Cost (XRD)                                                     ,               4.78799965,      0.1%
+Total Cost (XRD)                                                           ,         4205.56796520162,    100.0%
+- Execution Cost (XRD)                                                     ,               4.78837325,      0.1%
 - Finalization Cost (XRD)                                                  ,                0.6707546,      0.0%
 - Storage Cost (XRD)                                                       ,         4200.10883735162,     99.9%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                 95759993,    100.0%
+Execution Cost Breakdown                                                   ,                 95767465,    100.0%
 - AfterInvoke                                                              ,                       76,      0.0%
 - AllocateNodeId                                                           ,                      679,      0.0%
 - BeforeInvoke                                                             ,                      630,      0.0%
@@ -29,8 +29,8 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::Worktop_drop                                              ,                    17918,      0.0%
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.0%
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.0%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.0%
-- RunWasmCode::MaxTransaction_max_state_updates                            ,                    40394,      0.0%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.0%
+- RunWasmCode::MaxTransaction_max_state_updates                            ,                    45013,      0.0%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    11600,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/receipts/001--max_transaction-publish-package.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/receipts/001--max_transaction-publish-package.txt
index a43947244b..12a1a6146f 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/receipts/001--max_transaction-publish-package.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/receipts/001--max_transaction-publish-package.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 43.9742614389 XRD
-├─ Network execution: 0.83703315 XRD, 16740663 execution cost units
+TRANSACTION COST: 43.9747102889 XRD
+├─ Network execution: 0.837482 XRD, 16749640 execution cost units
 ├─ Network finalization: 0.10458285 XRD, 2091657 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 43.0326454389 XRD
@@ -20,15 +20,15 @@ EVENTS: 5
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("43.9742614389"),
+     amount: Decimal("43.9747102889"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("21.98713071945"),
+     amount: Decimal("21.98735514445"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("21.98713071945"),
+     amount: Decimal("21.98735514445"),
    }
 
 STATE UPDATES: 9 entities
@@ -38,7 +38,7 @@ STATE UPDATES: 9 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("10.993565359725"),
+             0u8 => Decimal("10.993677572225"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -71,7 +71,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999956.0257385611")),
+         LiquidFungibleResource(Decimal("99999999999999956.0252897111")),
        )
 ├─ package_sim1ph5xhxsxn2ekenmudd0p5rmsjggmzkxcd8eu3pjjame6f2mxc0jwmn across 11 partitions
   ├─ Partition(1): 1 change
@@ -521,7 +521,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("21.98713071945")),
+         LiquidFungibleResource(Decimal("21.98735514445")),
        )
 
 OUTPUTS: 4
@@ -533,10 +533,10 @@ OUTPUTS: 4
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -43.9742614389
+   Change: -43.9747102889
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 21.98713071945
+   Change: 21.98735514445
 
 NEW ENTITIES: 2
 └─ Package: package_sim1ph5xhxsxn2ekenmudd0p5rmsjggmzkxcd8eu3pjjame6f2mxc0jwmn
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/receipts/002--max_transaction-with-large-events.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/receipts/002--max_transaction-with-large-events.txt
index a8a4320b34..cb2a28dbfa 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/receipts/002--max_transaction-with-large-events.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/receipts/002--max_transaction-with-large-events.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 799.32719144787 XRD
-├─ Network execution: 1.046472 XRD, 20929440 execution cost units
+TRANSACTION COST: 799.32741399787 XRD
+├─ Network execution: 1.04669455 XRD, 20933891 execution cost units
 ├─ Network finalization: 0.1784497 XRD, 3568994 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 798.10226974787 XRD
@@ -1036,15 +1036,15 @@ EVENTS: 259
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("799.32719144787"),
+     amount: Decimal("799.32741399787"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("399.663595723935"),
+     amount: Decimal("399.663706998935"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("399.663595723935"),
+     amount: Decimal("399.663706998935"),
    }
 
 STATE UPDATES: 5 entities
@@ -1054,7 +1054,7 @@ STATE UPDATES: 5 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("210.8253632216925"),
+             0u8 => Decimal("210.8255310716925"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -1087,13 +1087,13 @@ STATE UPDATES: 5 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999156.69854711323")),
+         LiquidFungibleResource(Decimal("99999999999999156.69787571323")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("421.650726443385")),
+         LiquidFungibleResource(Decimal("421.651062143385")),
        )
 
 OUTPUTS: 2
@@ -1103,9 +1103,9 @@ OUTPUTS: 2
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -799.32719144787
+   Change: -799.32741399787
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 399.663595723935
+   Change: 399.663706998935
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/receipts/003--max_transaction-with-large-state-updates.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/receipts/003--max_transaction-with-large-state-updates.txt
index c54c711118..1192c29b97 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/receipts/003--max_transaction-with-large-state-updates.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/receipts/003--max_transaction-with-large-state-updates.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 4205.56759160162 XRD
-├─ Network execution: 4.78799965 XRD, 95759993 execution cost units
+TRANSACTION COST: 4205.56796520162 XRD
+├─ Network execution: 4.78837325 XRD, 95767465 execution cost units
 ├─ Network finalization: 0.6707546 XRD, 13415092 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 4200.10883735162 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("4205.56759160162"),
+     amount: Decimal("4205.56796520162"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("2102.78379580081"),
+     amount: Decimal("2102.78398260081"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("2102.78379580081"),
+     amount: Decimal("2102.78398260081"),
    }
 
 STATE UPDATES: 7 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 7 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1262.2172611220975"),
+             0u8 => Decimal("1262.2175223720975"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -73,7 +73,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999994951.13095551161")),
+         LiquidFungibleResource(Decimal("99999999999994951.12991051161")),
        )
 ├─ internal_keyvaluestore_sim1krwy3nu9853y0gqa3kpcrrvjx9je56r3pm53wcwmy6m5ahsx3l8rev across 1 partitions
   └─ Partition(64): 21 changes
@@ -123,7 +123,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("2524.434522244195")),
+         LiquidFungibleResource(Decimal("2524.435044744195")),
        )
 
 OUTPUTS: 2
@@ -133,9 +133,9 @@ OUTPUTS: 2
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -4205.56759160162
+   Change: -4205.56796520162
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 2102.78379580081
+   Change: 2102.78398260081
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/scenario_summary.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/scenario_summary.txt
index 5a9787f4db..a698c7bf24 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/scenario_summary.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/max_transaction/scenario_summary.txt
@@ -2,8 +2,8 @@ Name: max_transaction
 
 == SUMMARY HASHES ==
 These Cuttlefish hashes are permitted to change only until the scenario is deployed to a permanent network, else it can cause divergence.
-State changes: 0b72c2d3e74a6013 (allowed to change if not deployed to any network)
-Events       : 1358a6ea2351b6f7 (allowed to change if not deployed to any network)
+State changes: 754215d81b2ea988 (allowed to change if not deployed to any network)
+Events       : 0fd005f8a53a8630 (allowed to change if not deployed to any network)
 
 == INTERESTING ADDRESSES ==
 - component_with_large_state: component_sim1crawpnl7k2d2vlv9q730c3g2yrj59hpc0hzhy24v48qrw6lhxecxcg
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/costings/001--maya-router-create-accounts.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/costings/001--maya-router-create-accounts.txt
index 4f98fef58a..38aa8aa839 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/costings/001--maya-router-create-accounts.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/costings/001--maya-router-create-accounts.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.39881102299,    100.0%
-- Execution Cost (XRD)                                                     ,               0.19616945,     49.2%
+Total Cost (XRD)                                                           ,            0.39895367299,    100.0%
+- Execution Cost (XRD)                                                     ,                0.1963121,     49.2%
 - Finalization Cost (XRD)                                                  ,                 0.060258,     15.1%
 - Storage Cost (XRD)                                                       ,            0.14238357299,     35.7%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  3923389,    100.0%
+Execution Cost Breakdown                                                   ,                  3926242,    100.0%
 - AfterInvoke                                                              ,                      454,      0.0%
 - AllocateNodeId                                                           ,                     2134,      0.1%
 - BeforeInvoke                                                             ,                     2020,      0.1%
@@ -35,7 +35,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::create_with_data                                          ,                    54942,      1.4%
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.4%
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.2%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.6%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.7%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      742,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/costings/002--faucet-top-up.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/costings/002--faucet-top-up.txt
index dadbae1e36..4e8451450b 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/costings/002--faucet-top-up.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/costings/002--faucet-top-up.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.43698665544,    100.0%
-- Execution Cost (XRD)                                                     ,                0.2905265,     66.5%
-- Finalization Cost (XRD)                                                  ,                0.0312563,      7.2%
-- Storage Cost (XRD)                                                       ,            0.11520385544,     26.4%
+Total Cost (XRD)                                                           ,            0.43735070544,    100.0%
+- Execution Cost (XRD)                                                     ,               0.29089055,     66.5%
+- Finalization Cost (XRD)                                                  ,                0.0312563,      7.1%
+- Storage Cost (XRD)                                                       ,            0.11520385544,     26.3%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5810530,    100.0%
+Execution Cost Breakdown                                                   ,                  5817811,    100.0%
 - AfterInvoke                                                              ,                      520,      0.0%
 - AllocateNodeId                                                           ,                     1843,      0.0%
 - BeforeInvoke                                                             ,                     1796,      0.0%
@@ -20,7 +20,7 @@ Execution Cost Breakdown                                                   ,
 - OpenSubstate::GlobalConsensusManager                                     ,                    43783,      0.8%
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   173556,      3.0%
 - OpenSubstate::GlobalGenericComponent                                     ,                    47373,      0.8%
-- OpenSubstate::GlobalPackage                                              ,                  2602605,     44.8%
+- OpenSubstate::GlobalPackage                                              ,                  2602605,     44.7%
 - OpenSubstate::InternalFungibleVault                                      ,                   106652,      1.8%
 - OpenSubstate::InternalGenericComponent                                   ,                    49147,      0.8%
 - OpenSubstate::InternalKeyValueStore                                      ,                   202765,      3.5%
@@ -28,7 +28,7 @@ Execution Cost Breakdown                                                   ,
 - PrepareWasmCode                                                          ,                   707732,     12.2%
 - QueryActor                                                               ,                     2500,      0.0%
 - QueryTransactionHash                                                     ,                      500,      0.0%
-- ReadSubstate                                                             ,                   869143,     15.0%
+- ReadSubstate                                                             ,                   869143,     14.9%
 - RunNativeCode::Worktop_drop                                              ,                    17918,      0.3%
 - RunNativeCode::Worktop_put                                               ,                    29033,      0.5%
 - RunNativeCode::Worktop_take_all                                          ,                    14602,      0.3%
@@ -40,8 +40,8 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::put_FungibleVault                                         ,                    24554,      0.4%
 - RunNativeCode::take_FungibleVault                                        ,                    42457,      0.7%
 - RunNativeCode::try_deposit_or_abort                                      ,                    97988,      1.7%
-- RunWasmCode::Faucet_free                                                 ,                    34815,      0.6%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.4%
+- RunWasmCode::Faucet_free                                                 ,                    39243,      0.7%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    14880,      0.3%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/costings/003--maya-router-create-resources.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/costings/003--maya-router-create-resources.txt
index b3fbe8f81f..c478b74299 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/costings/003--maya-router-create-resources.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/costings/003--maya-router-create-resources.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            1.06948032912,    100.0%
-- Execution Cost (XRD)                                                     ,                0.2796739,     26.2%
+Total Cost (XRD)                                                           ,            1.06962297912,    100.0%
+- Execution Cost (XRD)                                                     ,               0.27981655,     26.2%
 - Finalization Cost (XRD)                                                  ,                0.2572747,     24.1%
 - Storage Cost (XRD)                                                       ,            0.53253172912,     49.8%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5593478,    100.0%
+Execution Cost Breakdown                                                   ,                  5596331,    100.0%
 - AfterInvoke                                                              ,                     1080,      0.0%
 - AllocateNodeId                                                           ,                     3686,      0.1%
 - BeforeInvoke                                                             ,                     5462,      0.1%
@@ -40,7 +40,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.8%
 - RunNativeCode::put_FungibleVault                                         ,                    49108,      0.9%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      2.2%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.4%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      864,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/costings/004--maya-router-publish-and-instantiate.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/costings/004--maya-router-publish-and-instantiate.txt
index 60032391a4..80b6081277 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/costings/004--maya-router-publish-and-instantiate.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/costings/004--maya-router-publish-and-instantiate.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            68.2978544291,    100.0%
-- Execution Cost (XRD)                                                     ,                1.2583043,      1.8%
+Total Cost (XRD)                                                           ,            68.2985665791,    100.0%
+- Execution Cost (XRD)                                                     ,               1.25901645,      1.8%
 - Finalization Cost (XRD)                                                  ,               0.15169575,      0.2%
 - Storage Cost (XRD)                                                       ,            66.8878543791,     97.9%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                 25166086,    100.0%
+Execution Cost Breakdown                                                   ,                 25180329,    100.0%
 - AfterInvoke                                                              ,                      710,      0.0%
 - AllocateNodeId                                                           ,                     3201,      0.0%
 - BeforeInvoke                                                             ,                   410742,      1.6%
@@ -37,8 +37,8 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::instantiate_account_locker                                ,                    49102,      0.2%
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.2%
 - RunNativeCode::publish_wasm_advanced                                     ,                  9388601,     37.3%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.1%
-- RunWasmCode::MayaRouter_instantiate                                      ,                    82650,      0.3%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.1%
+- RunWasmCode::MayaRouter_instantiate                                      ,                    94040,      0.4%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                     1163,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/receipts/001--maya-router-create-accounts.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/receipts/001--maya-router-create-accounts.txt
index 3bfa9de159..f81fc19197 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/receipts/001--maya-router-create-accounts.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/receipts/001--maya-router-create-accounts.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.39881102299 XRD
-├─ Network execution: 0.19616945 XRD, 3923389 execution cost units
+TRANSACTION COST: 0.39895367299 XRD
+├─ Network execution: 0.1963121 XRD, 3926242 execution cost units
 ├─ Network finalization: 0.060258 XRD, 1205160 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.14238357299 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.39881102299"),
+     amount: Decimal("0.39895367299"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.199405511495"),
+     amount: Decimal("0.199476836495"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.199405511495"),
+     amount: Decimal("0.199476836495"),
    }
 
 STATE UPDATES: 7 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 7 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.0997027557475"),
+             0u8 => Decimal("0.0997384182475"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -67,7 +67,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999999.60118897701")),
+         LiquidFungibleResource(Decimal("99999999999999999.60104632701")),
        )
 ├─ account_sim1cy2m8fzpwz7uyvkdlrleay34k94yz63skerrshcrl0d3fpm2cnmlqy across 5 partitions
   ├─ Partition(2): 1 change
@@ -211,7 +211,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.199405511495")),
+         LiquidFungibleResource(Decimal("0.199476836495")),
        )
 
 OUTPUTS: 3
@@ -222,10 +222,10 @@ OUTPUTS: 3
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.39881102299
+   Change: -0.39895367299
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.199405511495
+   Change: 0.199476836495
 
 NEW ENTITIES: 2
 ├─ Component: account_sim1cy2m8fzpwz7uyvkdlrleay34k94yz63skerrshcrl0d3fpm2cnmlqy
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/receipts/002--faucet-top-up.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/receipts/002--faucet-top-up.txt
index 47965548e5..e1bbeca127 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/receipts/002--faucet-top-up.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/receipts/002--faucet-top-up.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.43698665544 XRD
-├─ Network execution: 0.2905265 XRD, 5810530 execution cost units
+TRANSACTION COST: 0.43735070544 XRD
+├─ Network execution: 0.29089055 XRD, 5817811 execution cost units
 ├─ Network finalization: 0.0312563 XRD, 625126 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.11520385544 XRD
@@ -33,15 +33,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.43698665544"),
+     amount: Decimal("0.43735070544"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.21849332772"),
+     amount: Decimal("0.21867535272"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.21849332772"),
+     amount: Decimal("0.21867535272"),
    }
 
 STATE UPDATES: 8 entities
@@ -51,7 +51,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.2089494196075"),
+             0u8 => Decimal("0.2090760946075"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -90,7 +90,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999989999.16420232157")),
+         LiquidFungibleResource(Decimal("99999999999989999.16369562157")),
        )
 ├─ internal_keyvaluestore_sim1krn7clzr3qmq2zhwr77mdenksxswf00yeh8tn3vyzesg4kr3p54gv8 across 1 partitions
   └─ Partition(64): 1 change
@@ -129,7 +129,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.417898839215")),
+         LiquidFungibleResource(Decimal("0.418152189215")),
        )
 
 OUTPUTS: 4
@@ -141,12 +141,12 @@ OUTPUTS: 4
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -10000.43698665544
+   Change: -10000.43735070544
 ├─ Vault: internal_vault_sim1tzd883cmyxpkvj3s540tqfq5dhh887ymjlapc59pdhmf9qh66kqxr3
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
    Change: 10000
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.21849332772
+   Change: 0.21867535272
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/receipts/003--maya-router-create-resources.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/receipts/003--maya-router-create-resources.txt
index c59a6da99a..1782e7aee2 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/receipts/003--maya-router-create-resources.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/receipts/003--maya-router-create-resources.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 1.06948032912 XRD
-├─ Network execution: 0.2796739 XRD, 5593478 execution cost units
+TRANSACTION COST: 1.06962297912 XRD
+├─ Network execution: 0.27981655 XRD, 5596331 execution cost units
 ├─ Network finalization: 0.2572747 XRD, 5145494 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.53253172912 XRD
@@ -50,15 +50,15 @@ EVENTS: 12
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("1.06948032912"),
+     amount: Decimal("1.06962297912"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.53474016456"),
+     amount: Decimal("0.53481148956"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.53474016456"),
+     amount: Decimal("0.53481148956"),
    }
 
 STATE UPDATES: 10 entities
@@ -68,7 +68,7 @@ STATE UPDATES: 10 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.4763195018875"),
+             0u8 => Decimal("0.4764818393875"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -111,7 +111,7 @@ STATE UPDATES: 10 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999989998.09472199245")),
+         LiquidFungibleResource(Decimal("99999999999989998.09407264245")),
        )
 ├─ resource_sim1tkl8f4ev0djxy2jjy4fpnaexhw0t0t39seqs26u0mfqjzn3e4m80zf across 5 partitions
   ├─ Partition(2): 6 changes
@@ -456,7 +456,7 @@ STATE UPDATES: 10 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.952639003775")),
+         LiquidFungibleResource(Decimal("0.952963678775")),
        )
 
 OUTPUTS: 4
@@ -474,7 +474,7 @@ OUTPUTS: 4
 BALANCE CHANGES: 4
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -1.06948032912
+   Change: -1.06962297912
 ├─ Vault: internal_vault_sim1tryac3w8efhstsnsygpr8y7dkgjh23eqw8samk73rr69qumddqxnnv
    ResAddr: resource_sim1tkl8f4ev0djxy2jjy4fpnaexhw0t0t39seqs26u0mfqjzn3e4m80zf
    Change: 100000000000
@@ -483,7 +483,7 @@ BALANCE CHANGES: 4
    Change: 100000000000
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.53474016456
+   Change: 0.53481148956
 
 NEW ENTITIES: 2
 ├─ Resource: resource_sim1tkl8f4ev0djxy2jjy4fpnaexhw0t0t39seqs26u0mfqjzn3e4m80zf
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/receipts/004--maya-router-publish-and-instantiate.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/receipts/004--maya-router-publish-and-instantiate.txt
index a084c09b21..0f0025abab 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/receipts/004--maya-router-publish-and-instantiate.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/receipts/004--maya-router-publish-and-instantiate.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 68.2978544291 XRD
-├─ Network execution: 1.2583043 XRD, 25166086 execution cost units
+TRANSACTION COST: 68.2985665791 XRD
+├─ Network execution: 1.25901645 XRD, 25180329 execution cost units
 ├─ Network finalization: 0.15169575 XRD, 3033915 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 66.8878543791 XRD
@@ -20,15 +20,15 @@ EVENTS: 5
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("68.2978544291"),
+     amount: Decimal("68.2985665791"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("34.14892721455"),
+     amount: Decimal("34.14928328955"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("34.14892721455"),
+     amount: Decimal("34.14928328955"),
    }
 
 STATE UPDATES: 10 entities
@@ -38,7 +38,7 @@ STATE UPDATES: 10 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("17.5507831091625"),
+             0u8 => Decimal("17.5511234841625"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -71,7 +71,7 @@ STATE UPDATES: 10 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999989929.79686756335")),
+         LiquidFungibleResource(Decimal("99999999999989929.79550606335")),
        )
 ├─ package_sim1pha7h60q9p4hx40chf8uxntzs3tqgnd72kfu2akz2lx67hq5e32ex3 across 12 partitions
   ├─ Partition(1): 1 change
@@ -375,7 +375,7 @@ STATE UPDATES: 10 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("35.101566218325")),
+         LiquidFungibleResource(Decimal("35.102246968325")),
        )
 
 OUTPUTS: 4
@@ -387,10 +387,10 @@ OUTPUTS: 4
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -68.2978544291
+   Change: -68.2985665791
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 34.14892721455
+   Change: 34.14928328955
 
 NEW ENTITIES: 3
 └─ Package: package_sim1pha7h60q9p4hx40chf8uxntzs3tqgnd72kfu2akz2lx67hq5e32ex3
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/scenario_summary.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/scenario_summary.txt
index 5525ff011d..69804b2f63 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/scenario_summary.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/maya_router/scenario_summary.txt
@@ -2,8 +2,8 @@ Name: maya_router
 
 == SUMMARY HASHES ==
 These Cuttlefish hashes are permitted to change only until the scenario is deployed to a permanent network, else it can cause divergence.
-State changes: 8ef00407fa8506c5 (allowed to change if not deployed to any network)
-Events       : ba3ae485775f5d72 (allowed to change if not deployed to any network)
+State changes: 350c77f28f8aa8cd (allowed to change if not deployed to any network)
+Events       : cad9b74b646b8a48 (allowed to change if not deployed to any network)
 
 == INTERESTING ADDRESSES ==
 - owner_account: account_sim1cy2m8fzpwz7uyvkdlrleay34k94yz63skerrshcrl0d3fpm2cnmlqy
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/001--metadata-create-package-with-metadata.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/001--metadata-create-package-with-metadata.txt
index b7da1e693f..fe88bda8cf 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/001--metadata-create-package-with-metadata.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/001--metadata-create-package-with-metadata.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,           50.38646230485,    100.0%
-- Execution Cost (XRD)                                                     ,               1.03884935,      2.1%
+Total Cost (XRD)                                                           ,           50.38682635485,    100.0%
+- Execution Cost (XRD)                                                     ,                1.0392134,      2.1%
 - Finalization Cost (XRD)                                                  ,                0.2910838,      0.6%
 - Storage Cost (XRD)                                                       ,           49.05652915485,     97.4%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                 20776987,    100.0%
+Execution Cost Breakdown                                                   ,                 20784268,    100.0%
 - AfterInvoke                                                              ,                      914,      0.0%
 - AllocateNodeId                                                           ,                     3395,      0.0%
 - BeforeInvoke                                                             ,                   295208,      1.4%
@@ -46,8 +46,8 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::put_FungibleVault                                         ,                    24554,      0.1%
 - RunNativeCode::take_FungibleVault                                        ,                    42457,      0.2%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      0.6%
-- RunWasmCode::Faucet_free                                                 ,                    34815,      0.2%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.1%
+- RunWasmCode::Faucet_free                                                 ,                    39243,      0.2%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.1%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      774,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/002--metadata-create-component-with-metadata.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/002--metadata-create-component-with-metadata.txt
index 3822b6aabf..737837d855 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/002--metadata-create-component-with-metadata.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/002--metadata-create-component-with-metadata.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            1.82257928628,    100.0%
-- Execution Cost (XRD)                                                     ,               0.71653925,     39.3%
+Total Cost (XRD)                                                           ,            1.82345948628,    100.0%
+- Execution Cost (XRD)                                                     ,               0.71741945,     39.3%
 - Finalization Cost (XRD)                                                  ,               0.22904115,     12.6%
 - Storage Cost (XRD)                                                       ,            0.87699888628,     48.1%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                 14330785,    100.0%
+Execution Cost Breakdown                                                   ,                 14348389,    100.0%
 - AfterInvoke                                                              ,                      844,      0.0%
 - AllocateNodeId                                                           ,                     5529,      0.0%
 - BeforeInvoke                                                             ,                     7296,      0.1%
@@ -19,7 +19,7 @@ Execution Cost Breakdown                                                   ,
 - MoveModule                                                               ,                     1960,      0.0%
 - OpenSubstate::GlobalConsensusManager                                     ,                    43783,      0.3%
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   171184,      1.2%
-- OpenSubstate::GlobalGenericComponent                                     ,                  5242541,     36.6%
+- OpenSubstate::GlobalGenericComponent                                     ,                  5242541,     36.5%
 - OpenSubstate::GlobalNonFungibleResourceManager                           ,                    44020,      0.3%
 - OpenSubstate::GlobalPackage                                              ,                  3830264,     26.7%
 - OpenSubstate::GlobalPreallocatedSecp256k1Account                         ,                   285944,      2.0%
@@ -44,9 +44,9 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::set                                                       ,                   667872,      4.7%
 - RunNativeCode::take_FungibleVault                                        ,                    42457,      0.3%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      0.8%
-- RunWasmCode::Faucet_free                                                 ,                    34815,      0.2%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.2%
-- RunWasmCode::MetadataTest_new_with_address                               ,                    73344,      0.5%
+- RunWasmCode::Faucet_free                                                 ,                    39243,      0.3%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.2%
+- RunWasmCode::MetadataTest_new_with_address                               ,                    83667,      0.6%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      381,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/003--metadata-create-resource-with-metadata.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/003--metadata-create-resource-with-metadata.txt
index c58d21d4e4..64512dcff7 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/003--metadata-create-resource-with-metadata.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/003--metadata-create-resource-with-metadata.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            1.30572886636,    100.0%
-- Execution Cost (XRD)                                                     ,                 0.361168,     27.7%
+Total Cost (XRD)                                                           ,            1.30609291636,    100.0%
+- Execution Cost (XRD)                                                     ,               0.36153205,     27.7%
 - Finalization Cost (XRD)                                                  ,               0.27202975,     20.8%
 - Storage Cost (XRD)                                                       ,            0.67253111636,     51.5%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  7223360,    100.0%
+Execution Cost Breakdown                                                   ,                  7230641,    100.0%
 - AfterInvoke                                                              ,                      958,      0.0%
 - AllocateNodeId                                                           ,                     3104,      0.0%
 - BeforeInvoke                                                             ,                     9258,      0.1%
@@ -45,8 +45,8 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::put_FungibleVault                                         ,                    49108,      0.7%
 - RunNativeCode::take_FungibleVault                                        ,                    42457,      0.6%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      1.7%
-- RunWasmCode::Faucet_free                                                 ,                    34815,      0.5%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.3%
+- RunWasmCode::Faucet_free                                                 ,                    39243,      0.5%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.4%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      423,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/004--metadata-create-resource-with-metadata-partially-locked.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/004--metadata-create-resource-with-metadata-partially-locked.txt
index c55f2f3867..01c145b0e9 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/004--metadata-create-resource-with-metadata-partially-locked.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/004--metadata-create-resource-with-metadata-partially-locked.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.77304721926,    100.0%
-- Execution Cost (XRD)                                                     ,               0.35711055,     46.2%
+Total Cost (XRD)                                                           ,            0.77341126926,    100.0%
+- Execution Cost (XRD)                                                     ,                0.3574746,     46.2%
 - Finalization Cost (XRD)                                                  ,               0.12201425,     15.8%
 - Storage Cost (XRD)                                                       ,            0.29392241926,     38.0%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  7142211,    100.0%
+Execution Cost Breakdown                                                   ,                  7149492,    100.0%
 - AfterInvoke                                                              ,                      958,      0.0%
 - AllocateNodeId                                                           ,                     3104,      0.0%
 - BeforeInvoke                                                             ,                     3844,      0.1%
@@ -45,8 +45,8 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::put_FungibleVault                                         ,                    49108,      0.7%
 - RunNativeCode::take_FungibleVault                                        ,                    42457,      0.6%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      1.7%
-- RunWasmCode::Faucet_free                                                 ,                    34815,      0.5%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.3%
+- RunWasmCode::Faucet_free                                                 ,                    39243,      0.5%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.4%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      423,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/005--metadata-update-initially-locked-metadata-fails.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/005--metadata-update-initially-locked-metadata-fails.txt
index 3a8a199c4d..b1303a2f77 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/005--metadata-update-initially-locked-metadata-fails.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/005--metadata-update-initially-locked-metadata-fails.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.17866137938,    100.0%
-- Execution Cost (XRD)                                                     ,                0.1437569,     80.5%
+Total Cost (XRD)                                                           ,            0.17880402938,    100.0%
+- Execution Cost (XRD)                                                     ,               0.14389955,     80.5%
 - Finalization Cost (XRD)                                                  ,                        0,      0.0%
 - Storage Cost (XRD)                                                       ,            0.03490447938,     19.5%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  2875138,    100.0%
+Execution Cost Breakdown                                                   ,                  2877991,    100.0%
 - AfterInvoke                                                              ,                       64,      0.0%
 - AllocateNodeId                                                           ,                      582,      0.0%
 - BeforeInvoke                                                             ,                      472,      0.0%
@@ -28,7 +28,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.5%
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.6%
 - RunNativeCode::set                                                       ,                    20871,      0.7%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.9%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      1.0%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    14640,      0.5%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/006--metadata-update-updatable-metadata-succeeds.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/006--metadata-update-updatable-metadata-succeeds.txt
index ece3f5dbaf..072eac0d87 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/006--metadata-update-updatable-metadata-succeeds.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/006--metadata-update-updatable-metadata-succeeds.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,             0.2187539393,    100.0%
-- Execution Cost (XRD)                                                     ,               0.15461435,     70.7%
+Total Cost (XRD)                                                           ,             0.2188965893,    100.0%
+- Execution Cost (XRD)                                                     ,                 0.154757,     70.7%
 - Finalization Cost (XRD)                                                  ,                0.0155022,      7.1%
 - Storage Cost (XRD)                                                       ,             0.0486373893,     22.2%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  3092287,    100.0%
+Execution Cost Breakdown                                                   ,                  3095140,    100.0%
 - AfterInvoke                                                              ,                       76,      0.0%
 - AllocateNodeId                                                           ,                      679,      0.0%
 - BeforeInvoke                                                             ,                      630,      0.0%
@@ -18,7 +18,7 @@ Execution Cost Breakdown                                                   ,
 - MarkSubstateAsTransient                                                  ,                       55,      0.0%
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   364827,     11.8%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      1.4%
-- OpenSubstate::GlobalPackage                                              ,                  1501852,     48.6%
+- OpenSubstate::GlobalPackage                                              ,                  1501852,     48.5%
 - OpenSubstate::InternalFungibleVault                                      ,                    90202,      2.9%
 - OpenSubstate::InternalGenericComponent                                   ,                    11360,      0.4%
 - OpenSubstate::InternalKeyValueStore                                      ,                    40536,      1.3%
@@ -30,7 +30,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.5%
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.5%
 - RunNativeCode::set                                                       ,                    20871,      0.7%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.8%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.9%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    14480,      0.5%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/007--metadata-lock-metadata.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/007--metadata-lock-metadata.txt
index 07cd85c85e..9912520517 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/007--metadata-lock-metadata.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/007--metadata-lock-metadata.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.21135074719,    100.0%
-- Execution Cost (XRD)                                                     ,                0.1548047,     73.2%
+Total Cost (XRD)                                                           ,            0.21149339719,    100.0%
+- Execution Cost (XRD)                                                     ,               0.15494735,     73.3%
 - Finalization Cost (XRD)                                                  ,               0.01525195,      7.2%
 - Storage Cost (XRD)                                                       ,            0.04129409719,     19.5%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  3096094,    100.0%
+Execution Cost Breakdown                                                   ,                  3098947,    100.0%
 - AfterInvoke                                                              ,                       76,      0.0%
 - AllocateNodeId                                                           ,                      679,      0.0%
 - BeforeInvoke                                                             ,                      622,      0.0%
@@ -30,7 +30,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.5%
 - RunNativeCode::lock                                                      ,                    25245,      0.8%
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.5%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.8%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.9%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    14320,      0.5%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/008--metadata-set-metadata-on-dashboard-account-succeeds.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/008--metadata-set-metadata-on-dashboard-account-succeeds.txt
index fac4119193..29e1bb7352 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/008--metadata-set-metadata-on-dashboard-account-succeeds.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/008--metadata-set-metadata-on-dashboard-account-succeeds.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,               0.46873391,    100.0%
-- Execution Cost (XRD)                                                     ,               0.22198755,     47.4%
+Total Cost (XRD)                                                           ,               0.46887656,    100.0%
+- Execution Cost (XRD)                                                     ,                0.2221302,     47.4%
 - Finalization Cost (XRD)                                                  ,                0.0560115,     11.9%
 - Storage Cost (XRD)                                                       ,               0.19073486,     40.7%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  4439751,    100.0%
+Execution Cost Breakdown                                                   ,                  4442604,    100.0%
 - AfterInvoke                                                              ,                      222,      0.0%
 - AllocateNodeId                                                           ,                     1455,      0.0%
 - BeforeInvoke                                                             ,                     2114,      0.0%
@@ -36,7 +36,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.0%
 - RunNativeCode::on_virtualize                                             ,                    34520,      0.8%
 - RunNativeCode::set                                                       ,                    62613,      1.4%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.6%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.6%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      371,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/009--metadata-set-metadata-on-sandbox-account-succeeds.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/009--metadata-set-metadata-on-sandbox-account-succeeds.txt
index b20bf5942e..3065ea7243 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/009--metadata-set-metadata-on-sandbox-account-succeeds.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/009--metadata-set-metadata-on-sandbox-account-succeeds.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,             0.4066273693,    100.0%
-- Execution Cost (XRD)                                                     ,               0.21186395,     52.1%
+Total Cost (XRD)                                                           ,             0.4067700193,    100.0%
+- Execution Cost (XRD)                                                     ,                0.2120066,     52.1%
 - Finalization Cost (XRD)                                                  ,                0.0507586,     12.5%
 - Storage Cost (XRD)                                                       ,             0.1440048193,     35.4%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  4237279,    100.0%
+Execution Cost Breakdown                                                   ,                  4240132,    100.0%
 - AfterInvoke                                                              ,                      216,      0.0%
 - AllocateNodeId                                                           ,                     1358,      0.0%
 - BeforeInvoke                                                             ,                     1810,      0.0%
@@ -26,7 +26,7 @@ Execution Cost Breakdown                                                   ,
 - OpenSubstate::InternalGenericComponent                                   ,                    20149,      0.5%
 - OpenSubstate::InternalKeyValueStore                                      ,                    40536,      1.0%
 - PinNode                                                                  ,                      156,      0.0%
-- PrepareWasmCode                                                          ,                   353866,      8.4%
+- PrepareWasmCode                                                          ,                   353866,      8.3%
 - QueryActor                                                               ,                     1000,      0.0%
 - ReadSubstate                                                             ,                   451054,     10.6%
 - RunNativeCode::Worktop_drop                                              ,                    17918,      0.4%
@@ -36,7 +36,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.1%
 - RunNativeCode::on_virtualize                                             ,                    34520,      0.8%
 - RunNativeCode::set                                                       ,                    41742,      1.0%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.6%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.6%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      371,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/010--metadata-update-recently-locked-metadata-fails.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/010--metadata-update-recently-locked-metadata-fails.txt
index 3a8a199c4d..b1303a2f77 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/010--metadata-update-recently-locked-metadata-fails.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/costings/010--metadata-update-recently-locked-metadata-fails.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.17866137938,    100.0%
-- Execution Cost (XRD)                                                     ,                0.1437569,     80.5%
+Total Cost (XRD)                                                           ,            0.17880402938,    100.0%
+- Execution Cost (XRD)                                                     ,               0.14389955,     80.5%
 - Finalization Cost (XRD)                                                  ,                        0,      0.0%
 - Storage Cost (XRD)                                                       ,            0.03490447938,     19.5%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  2875138,    100.0%
+Execution Cost Breakdown                                                   ,                  2877991,    100.0%
 - AfterInvoke                                                              ,                       64,      0.0%
 - AllocateNodeId                                                           ,                      582,      0.0%
 - BeforeInvoke                                                             ,                      472,      0.0%
@@ -28,7 +28,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.5%
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.6%
 - RunNativeCode::set                                                       ,                    20871,      0.7%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.9%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      1.0%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    14640,      0.5%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/001--metadata-create-package-with-metadata.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/001--metadata-create-package-with-metadata.txt
index 722301af05..f4e1cc9f24 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/001--metadata-create-package-with-metadata.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/001--metadata-create-package-with-metadata.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 50.38646230485 XRD
-├─ Network execution: 1.03884935 XRD, 20776987 execution cost units
+TRANSACTION COST: 50.38682635485 XRD
+├─ Network execution: 1.0392134 XRD, 20784268 execution cost units
 ├─ Network finalization: 0.2910838 XRD, 5821676 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 49.05652915485 XRD
@@ -37,15 +37,15 @@ EVENTS: 9
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("50.38646230485"),
+     amount: Decimal("50.38682635485"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("25.193231152425"),
+     amount: Decimal("25.193413177425"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("25.193231152425"),
+     amount: Decimal("25.193413177425"),
    }
 
 STATE UPDATES: 10 entities
@@ -55,7 +55,7 @@ STATE UPDATES: 10 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("12.5966155762125"),
+             0u8 => Decimal("12.5967065887125"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -88,7 +88,7 @@ STATE UPDATES: 10 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999989949.61353769515")),
+         LiquidFungibleResource(Decimal("99999999999989949.61317364515")),
        )
 ├─ internal_keyvaluestore_sim1krn7clzr3qmq2zhwr77mdenksxswf00yeh8tn3vyzesg4kr3p54gv8 across 1 partitions
   └─ Partition(64): 1 change
@@ -853,7 +853,7 @@ STATE UPDATES: 10 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("25.193231152425")),
+         LiquidFungibleResource(Decimal("25.193413177425")),
        )
 
 OUTPUTS: 5
@@ -866,13 +866,13 @@ OUTPUTS: 5
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -10050.38646230485
+   Change: -10050.38682635485
 ├─ Vault: internal_vault_sim1tqtzph4pdwpxaf7s9qhr6fke8fj6082r3p9ux3w8zuj586dzlj2eh4
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
    Change: 10000
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 25.193231152425
+   Change: 25.193413177425
 
 NEW ENTITIES: 2
 └─ Package: package_sim1p5pjdx5g7h0ygzc3ev2r5vj3zprctn6vr7p7t3mqvzjp2r6frahcq3
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/002--metadata-create-component-with-metadata.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/002--metadata-create-component-with-metadata.txt
index 49c79acdc9..a070041075 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/002--metadata-create-component-with-metadata.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/002--metadata-create-component-with-metadata.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 1.82257928628 XRD
-├─ Network execution: 0.71653925 XRD, 14330785 execution cost units
+TRANSACTION COST: 1.82345948628 XRD
+├─ Network execution: 0.71741945 XRD, 14348389 execution cost units
 ├─ Network finalization: 0.22904115 XRD, 4580823 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.87699888628 XRD
@@ -313,15 +313,15 @@ EVENTS: 39
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("1.82257928628"),
+     amount: Decimal("1.82345948628"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.91128964314"),
+     amount: Decimal("0.91172974314"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.91128964314"),
+     amount: Decimal("0.91172974314"),
    }
 
 STATE UPDATES: 8 entities
@@ -331,7 +331,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("13.0522603977825"),
+             0u8 => Decimal("13.0525714602825"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -364,7 +364,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999979947.79095840887")),
+         LiquidFungibleResource(Decimal("99999999999979947.78971415887")),
        )
 ├─ internal_keyvaluestore_sim1krn7clzr3qmq2zhwr77mdenksxswf00yeh8tn3vyzesg4kr3p54gv8 across 1 partitions
   └─ Partition(64): 1 change
@@ -699,7 +699,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("26.104520795565")),
+         LiquidFungibleResource(Decimal("26.105142920565")),
        )
 
 OUTPUTS: 37
@@ -744,13 +744,13 @@ OUTPUTS: 37
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -10001.82257928628
+   Change: -10001.82345948628
 ├─ Vault: internal_vault_sim1tqtzph4pdwpxaf7s9qhr6fke8fj6082r3p9ux3w8zuj586dzlj2eh4
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
    Change: 10000
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.91128964314
+   Change: 0.91172974314
 
 NEW ENTITIES: 1
 └─ Component: component_sim1cz4djw7ufpm4rjkwnphzxrn2q7kx8k4a0k2l4wqfz0dwfv4fd9znvr
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/003--metadata-create-resource-with-metadata.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/003--metadata-create-resource-with-metadata.txt
index 3e0426b26f..269bcd8ccb 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/003--metadata-create-resource-with-metadata.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/003--metadata-create-resource-with-metadata.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 1.30572886636 XRD
-├─ Network execution: 0.361168 XRD, 7223360 execution cost units
+TRANSACTION COST: 1.30609291636 XRD
+├─ Network execution: 0.36153205 XRD, 7230641 execution cost units
 ├─ Network finalization: 0.27202975 XRD, 5440595 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.67253111636 XRD
@@ -46,15 +46,15 @@ EVENTS: 11
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("1.30572886636"),
+     amount: Decimal("1.30609291636"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.65286443318"),
+     amount: Decimal("0.65304645818"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.65286443318"),
+     amount: Decimal("0.65304645818"),
    }
 
 STATE UPDATES: 10 entities
@@ -64,7 +64,7 @@ STATE UPDATES: 10 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("13.3786926143725"),
+             0u8 => Decimal("13.3790946893725"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -97,7 +97,7 @@ STATE UPDATES: 10 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999969946.48522954251")),
+         LiquidFungibleResource(Decimal("99999999999969946.48362124251")),
        )
 ├─ internal_keyvaluestore_sim1krn7clzr3qmq2zhwr77mdenksxswf00yeh8tn3vyzesg4kr3p54gv8 across 1 partitions
   └─ Partition(64): 1 change
@@ -501,7 +501,7 @@ STATE UPDATES: 10 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("26.757385228745")),
+         LiquidFungibleResource(Decimal("26.758189378745")),
        )
 
 OUTPUTS: 4
@@ -516,7 +516,7 @@ OUTPUTS: 4
 BALANCE CHANGES: 4
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -10001.30572886636
+   Change: -10001.30609291636
 ├─ Vault: internal_vault_sim1tqtzph4pdwpxaf7s9qhr6fke8fj6082r3p9ux3w8zuj586dzlj2eh4
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
    Change: 10000
@@ -525,7 +525,7 @@ BALANCE CHANGES: 4
    Change: 100000000000
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.65286443318
+   Change: 0.65304645818
 
 NEW ENTITIES: 1
 └─ Resource: resource_sim1t5z9e7s76mryajk97lrmpe3cyxy2zaj456y2px85ksu2ts4n6qwa39
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/004--metadata-create-resource-with-metadata-partially-locked.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/004--metadata-create-resource-with-metadata-partially-locked.txt
index 18688073e1..08e0a39b24 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/004--metadata-create-resource-with-metadata-partially-locked.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/004--metadata-create-resource-with-metadata-partially-locked.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.77304721926 XRD
-├─ Network execution: 0.35711055 XRD, 7142211 execution cost units
+TRANSACTION COST: 0.77341126926 XRD
+├─ Network execution: 0.3574746 XRD, 7149492 execution cost units
 ├─ Network finalization: 0.12201425 XRD, 2440285 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.29392241926 XRD
@@ -46,15 +46,15 @@ EVENTS: 11
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.77304721926"),
+     amount: Decimal("0.77341126926"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.38652360963"),
+     amount: Decimal("0.38670563463"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.38652360963"),
+     amount: Decimal("0.38670563463"),
    }
 
 STATE UPDATES: 10 entities
@@ -64,7 +64,7 @@ STATE UPDATES: 10 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("13.5719544191875"),
+             0u8 => Decimal("13.5724475066875"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -97,7 +97,7 @@ STATE UPDATES: 10 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999959945.71218232325")),
+         LiquidFungibleResource(Decimal("99999999999959945.71020997325")),
        )
 ├─ internal_keyvaluestore_sim1krn7clzr3qmq2zhwr77mdenksxswf00yeh8tn3vyzesg4kr3p54gv8 across 1 partitions
   └─ Partition(64): 1 change
@@ -272,7 +272,7 @@ STATE UPDATES: 10 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("27.143908838375")),
+         LiquidFungibleResource(Decimal("27.144895013375")),
        )
 
 OUTPUTS: 4
@@ -287,7 +287,7 @@ OUTPUTS: 4
 BALANCE CHANGES: 4
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -10000.77304721926
+   Change: -10000.77341126926
 ├─ Vault: internal_vault_sim1tqtzph4pdwpxaf7s9qhr6fke8fj6082r3p9ux3w8zuj586dzlj2eh4
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
    Change: 10000
@@ -296,7 +296,7 @@ BALANCE CHANGES: 4
    Change: 100000000000
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.38652360963
+   Change: 0.38670563463
 
 NEW ENTITIES: 1
 └─ Resource: resource_sim1t4xqgmnnrx396mwjwy46844xmq83nrnwtw6uth6pa3uvxs65ltyavt
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/005--metadata-update-initially-locked-metadata-fails.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/005--metadata-update-initially-locked-metadata-fails.txt
index 0c5e335e08..3eba300a7e 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/005--metadata-update-initially-locked-metadata-fails.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/005--metadata-update-initially-locked-metadata-fails.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED FAILURE: SystemError(KeyValueEntryLocked)
 
-TRANSACTION COST: 0.17866137938 XRD
-├─ Network execution: 0.1437569 XRD, 2875138 execution cost units
+TRANSACTION COST: 0.17880402938 XRD
+├─ Network execution: 0.14389955 XRD, 2877991 execution cost units
 ├─ Network finalization: 0 XRD, 0 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.03490447938 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.17866137938"),
+     amount: Decimal("0.17880402938"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.08933068969"),
+     amount: Decimal("0.08940201469"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.08933068969"),
+     amount: Decimal("0.08940201469"),
    }
 
 STATE UPDATES: 4 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 4 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("13.6166197640325"),
+             0u8 => Decimal("13.6171485140325"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -60,21 +60,21 @@ STATE UPDATES: 4 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999959945.53352094387")),
+         LiquidFungibleResource(Decimal("99999999999959945.53140594387")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("27.233239528065")),
+         LiquidFungibleResource(Decimal("27.234297028065")),
        )
 
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.17866137938
+   Change: -0.17880402938
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.08933068969
+   Change: 0.08940201469
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/006--metadata-update-updatable-metadata-succeeds.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/006--metadata-update-updatable-metadata-succeeds.txt
index ece38c2de0..ddc1f5df70 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/006--metadata-update-updatable-metadata-succeeds.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/006--metadata-update-updatable-metadata-succeeds.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.2187539393 XRD
-├─ Network execution: 0.15461435 XRD, 3092287 execution cost units
+TRANSACTION COST: 0.2188965893 XRD
+├─ Network execution: 0.154757 XRD, 3095140 execution cost units
 ├─ Network finalization: 0.0155022 XRD, 310044 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.0486373893 XRD
@@ -23,15 +23,15 @@ EVENTS: 5
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.2187539393"),
+     amount: Decimal("0.2188965893"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.10937696965"),
+     amount: Decimal("0.10944829465"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.10937696965"),
+     amount: Decimal("0.10944829465"),
    }
 
 STATE UPDATES: 6 entities
@@ -41,7 +41,7 @@ STATE UPDATES: 6 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("13.6713082488575"),
+             0u8 => Decimal("13.6718726613575"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -82,13 +82,13 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999959945.31476700457")),
+         LiquidFungibleResource(Decimal("99999999999959945.31250935457")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("27.342616497715")),
+         LiquidFungibleResource(Decimal("27.343745322715")),
        )
 
 OUTPUTS: 2
@@ -98,9 +98,9 @@ OUTPUTS: 2
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.2187539393
+   Change: -0.2188965893
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.10937696965
+   Change: 0.10944829465
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/007--metadata-lock-metadata.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/007--metadata-lock-metadata.txt
index 347d6be1e8..7a055d048d 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/007--metadata-lock-metadata.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/007--metadata-lock-metadata.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.21135074719 XRD
-├─ Network execution: 0.1548047 XRD, 3096094 execution cost units
+TRANSACTION COST: 0.21149339719 XRD
+├─ Network execution: 0.15494735 XRD, 3098947 execution cost units
 ├─ Network finalization: 0.01525195 XRD, 305039 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.04129409719 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.21135074719"),
+     amount: Decimal("0.21149339719"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.105675373595"),
+     amount: Decimal("0.105746698595"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.105675373595"),
+     amount: Decimal("0.105746698595"),
    }
 
 STATE UPDATES: 6 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 6 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("13.724145935655"),
+             0u8 => Decimal("13.724746010655"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -75,13 +75,13 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999959945.10341625738")),
+         LiquidFungibleResource(Decimal("99999999999959945.10101595738")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("27.44829187131")),
+         LiquidFungibleResource(Decimal("27.44949202131")),
        )
 
 OUTPUTS: 2
@@ -91,9 +91,9 @@ OUTPUTS: 2
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.21135074719
+   Change: -0.21149339719
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.105675373595
+   Change: 0.105746698595
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/008--metadata-set-metadata-on-dashboard-account-succeeds.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/008--metadata-set-metadata-on-dashboard-account-succeeds.txt
index 628ed8190b..04b40b2e01 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/008--metadata-set-metadata-on-dashboard-account-succeeds.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/008--metadata-set-metadata-on-dashboard-account-succeeds.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.46873391 XRD
-├─ Network execution: 0.22198755 XRD, 4439751 execution cost units
+TRANSACTION COST: 0.46887656 XRD
+├─ Network execution: 0.2221302 XRD, 4442604 execution cost units
 ├─ Network finalization: 0.0560115 XRD, 1120230 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.19073486 XRD
@@ -37,15 +37,15 @@ EVENTS: 7
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.46873391"),
+     amount: Decimal("0.46887656"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.234366955"),
+     amount: Decimal("0.23443828"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.234366955"),
+     amount: Decimal("0.23443828"),
    }
 
 STATE UPDATES: 6 entities
@@ -55,7 +55,7 @@ STATE UPDATES: 6 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("13.841329413155"),
+             0u8 => Decimal("13.841965150655"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -88,7 +88,7 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999959944.63468234738")),
+         LiquidFungibleResource(Decimal("99999999999959944.63213939738")),
        )
 ├─ account_sim16xygyhqp3x3awxlz3c5dzrm7jqghgpgs776v4af0yfr7xljqv060nu across 5 partitions
   ├─ Partition(2): 5 changes
@@ -206,7 +206,7 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("27.68265882631")),
+         LiquidFungibleResource(Decimal("27.68393030131")),
        )
 
 OUTPUTS: 4
@@ -218,10 +218,10 @@ OUTPUTS: 4
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.46873391
+   Change: -0.46887656
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.234366955
+   Change: 0.23443828
 
 NEW ENTITIES: 1
 └─ Component: account_sim16xygyhqp3x3awxlz3c5dzrm7jqghgpgs776v4af0yfr7xljqv060nu
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/009--metadata-set-metadata-on-sandbox-account-succeeds.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/009--metadata-set-metadata-on-sandbox-account-succeeds.txt
index 8570e58d69..54a576b0b6 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/009--metadata-set-metadata-on-sandbox-account-succeeds.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/009--metadata-set-metadata-on-sandbox-account-succeeds.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.4066273693 XRD
-├─ Network execution: 0.21186395 XRD, 4237279 execution cost units
+TRANSACTION COST: 0.4067700193 XRD
+├─ Network execution: 0.2120066 XRD, 4240132 execution cost units
 ├─ Network finalization: 0.0507586 XRD, 1015172 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.1440048193 XRD
@@ -30,15 +30,15 @@ EVENTS: 6
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.4066273693"),
+     amount: Decimal("0.4067700193"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.20331368465"),
+     amount: Decimal("0.20338500965"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.20331368465"),
+     amount: Decimal("0.20338500965"),
    }
 
 STATE UPDATES: 6 entities
@@ -48,7 +48,7 @@ STATE UPDATES: 6 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("13.94298625548"),
+             0u8 => Decimal("13.94365765548"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -81,7 +81,7 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999959944.22805497808")),
+         LiquidFungibleResource(Decimal("99999999999959944.22536937808")),
        )
 ├─ account_sim168ydk240yx69yl7zdz2mzkdjc3r5p6n4gwypqsype2d6d942vg95h3 across 5 partitions
   ├─ Partition(2): 4 changes
@@ -193,7 +193,7 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("27.88597251096")),
+         LiquidFungibleResource(Decimal("27.88731531096")),
        )
 
 OUTPUTS: 3
@@ -204,10 +204,10 @@ OUTPUTS: 3
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.4066273693
+   Change: -0.4067700193
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.20331368465
+   Change: 0.20338500965
 
 NEW ENTITIES: 1
 └─ Component: account_sim168ydk240yx69yl7zdz2mzkdjc3r5p6n4gwypqsype2d6d942vg95h3
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/010--metadata-update-recently-locked-metadata-fails.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/010--metadata-update-recently-locked-metadata-fails.txt
index 00f83f3b1d..10f37c7e58 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/010--metadata-update-recently-locked-metadata-fails.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/receipts/010--metadata-update-recently-locked-metadata-fails.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED FAILURE: SystemError(KeyValueEntryLocked)
 
-TRANSACTION COST: 0.17866137938 XRD
-├─ Network execution: 0.1437569 XRD, 2875138 execution cost units
+TRANSACTION COST: 0.17880402938 XRD
+├─ Network execution: 0.14389955 XRD, 2877991 execution cost units
 ├─ Network finalization: 0 XRD, 0 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.03490447938 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.17866137938"),
+     amount: Decimal("0.17880402938"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.08933068969"),
+     amount: Decimal("0.08940201469"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.08933068969"),
+     amount: Decimal("0.08940201469"),
    }
 
 STATE UPDATES: 4 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 4 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("13.987651600325"),
+             0u8 => Decimal("13.988358662825"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -60,21 +60,21 @@ STATE UPDATES: 4 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999959944.0493935987")),
+         LiquidFungibleResource(Decimal("99999999999959944.0465653487")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("27.97530320065")),
+         LiquidFungibleResource(Decimal("27.97671732565")),
        )
 
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.17866137938
+   Change: -0.17880402938
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.08933068969
+   Change: 0.08940201469
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/scenario_summary.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/scenario_summary.txt
index aa0f516e0c..4bc0472bd6 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/scenario_summary.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/metadata/scenario_summary.txt
@@ -2,8 +2,8 @@ Name: metadata
 
 == SUMMARY HASHES ==
 These Cuttlefish hashes are permitted to change only until the scenario is deployed to a permanent network, else it can cause divergence.
-State changes: 2d4da7914b2e5ed1 (allowed to change if not deployed to any network)
-Events       : b4b01623a08c782b (allowed to change if not deployed to any network)
+State changes: a006a99675402afe (allowed to change if not deployed to any network)
+Events       : f0fe3846e72e57a2 (allowed to change if not deployed to any network)
 
 == INTERESTING ADDRESSES ==
 - user_account_1: account_sim16996e320lnez82q6430eunaz9l3n5fnwk6eh9avrmtmj22e7jmhemw
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/001--non-fungible-resource-create.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/001--non-fungible-resource-create.txt
index 3499ba7b59..f5b550387e 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/001--non-fungible-resource-create.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/001--non-fungible-resource-create.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.86122961999,    100.0%
-- Execution Cost (XRD)                                                     ,               0.27600795,     32.0%
+Total Cost (XRD)                                                           ,            0.86137226999,    100.0%
+- Execution Cost (XRD)                                                     ,                0.2761506,     32.1%
 - Finalization Cost (XRD)                                                  ,               0.16627255,     19.3%
 - Storage Cost (XRD)                                                       ,            0.41894911999,     48.6%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5520159,    100.0%
+Execution Cost Breakdown                                                   ,                  5523012,    100.0%
 - AfterInvoke                                                              ,                      690,      0.0%
 - AllocateNodeId                                                           ,                     2813,      0.1%
 - BeforeInvoke                                                             ,                     4554,      0.1%
@@ -44,7 +44,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::on_virtualize                                             ,                    34520,      0.6%
 - RunNativeCode::put_NonFungibleVault                                      ,                    35354,      0.6%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      2.2%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.4%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                     1105,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/002--non-fungible-resource-create-string.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/002--non-fungible-resource-create-string.txt
index a1319e5544..3afb0ae610 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/002--non-fungible-resource-create-string.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/002--non-fungible-resource-create-string.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.75135211441,    100.0%
-- Execution Cost (XRD)                                                     ,                0.2634653,     35.1%
+Total Cost (XRD)                                                           ,            0.75149476441,    100.0%
+- Execution Cost (XRD)                                                     ,               0.26360795,     35.1%
 - Finalization Cost (XRD)                                                  ,                0.1362671,     18.1%
 - Storage Cost (XRD)                                                       ,            0.35161971441,     46.8%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5269306,    100.0%
+Execution Cost Breakdown                                                   ,                  5272159,    100.0%
 - AfterInvoke                                                              ,                      554,      0.0%
 - AllocateNodeId                                                           ,                     2231,      0.0%
 - BeforeInvoke                                                             ,                     3492,      0.1%
@@ -20,7 +20,7 @@ Execution Cost Breakdown                                                   ,
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   121872,      2.3%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      0.8%
 - OpenSubstate::GlobalNonFungibleResourceManager                           ,                    14330,      0.3%
-- OpenSubstate::GlobalPackage                                              ,                  2727099,     51.8%
+- OpenSubstate::GlobalPackage                                              ,                  2727099,     51.7%
 - OpenSubstate::GlobalPreallocatedSecp256k1Account                         ,                   406740,      7.7%
 - OpenSubstate::InternalFungibleVault                                      ,                    90202,      1.7%
 - OpenSubstate::InternalGenericComponent                                   ,                    51081,      1.0%
@@ -43,7 +43,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.9%
 - RunNativeCode::put_NonFungibleVault                                      ,                    35354,      0.7%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      2.3%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.5%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      734,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/003--non-fungible-resource-create-bytes.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/003--non-fungible-resource-create-bytes.txt
index deb45fb6ef..1aa092d206 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/003--non-fungible-resource-create-bytes.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/003--non-fungible-resource-create-bytes.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.75710561021,    100.0%
-- Execution Cost (XRD)                                                     ,                0.2634963,     34.8%
+Total Cost (XRD)                                                           ,            0.75724826021,    100.0%
+- Execution Cost (XRD)                                                     ,               0.26363895,     34.8%
 - Finalization Cost (XRD)                                                  ,               0.13626755,     18.0%
 - Storage Cost (XRD)                                                       ,            0.35734176021,     47.2%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5269926,    100.0%
+Execution Cost Breakdown                                                   ,                  5272779,    100.0%
 - AfterInvoke                                                              ,                      574,      0.0%
 - AllocateNodeId                                                           ,                     2231,      0.0%
 - BeforeInvoke                                                             ,                     3512,      0.1%
@@ -43,7 +43,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.9%
 - RunNativeCode::put_NonFungibleVault                                      ,                    35354,      0.7%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      2.3%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.5%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      734,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/004--non-fungible-resource-create-ruid.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/004--non-fungible-resource-create-ruid.txt
index ad9628d9c4..35cf3b406c 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/004--non-fungible-resource-create-ruid.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/004--non-fungible-resource-create-ruid.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.76321259774,    100.0%
-- Execution Cost (XRD)                                                     ,               0.26283175,     34.4%
+Total Cost (XRD)                                                           ,            0.76335524774,    100.0%
+- Execution Cost (XRD)                                                     ,                0.2629744,     34.4%
 - Finalization Cost (XRD)                                                  ,                 0.136268,     17.9%
 - Storage Cost (XRD)                                                       ,            0.36411284774,     47.7%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5256635,    100.0%
+Execution Cost Breakdown                                                   ,                  5259488,    100.0%
 - AfterInvoke                                                              ,                      604,      0.0%
 - AllocateNodeId                                                           ,                     2231,      0.0%
 - BeforeInvoke                                                             ,                     3504,      0.1%
@@ -44,7 +44,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.9%
 - RunNativeCode::put_NonFungibleVault                                      ,                    35354,      0.7%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      2.3%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.5%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      734,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/005--non-fungible-resource-mint-32-nfts.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/005--non-fungible-resource-mint-32-nfts.txt
index c0b743a71b..b5fa7d1b38 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/005--non-fungible-resource-mint-32-nfts.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/005--non-fungible-resource-mint-32-nfts.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            2.04141269637,    100.0%
-- Execution Cost (XRD)                                                     ,                0.4980885,     24.4%
+Total Cost (XRD)                                                           ,            2.04155534637,    100.0%
+- Execution Cost (XRD)                                                     ,               0.49823115,     24.4%
 - Finalization Cost (XRD)                                                  ,                0.3360679,     16.5%
 - Storage Cost (XRD)                                                       ,            1.20725629637,     59.1%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  9961770,    100.0%
+Execution Cost Breakdown                                                   ,                  9964623,    100.0%
 - AfterInvoke                                                              ,                      856,      0.0%
 - AllocateNodeId                                                           ,                     1358,      0.0%
 - BeforeInvoke                                                             ,                     9500,      0.1%
@@ -39,7 +39,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::mint_NonFungibleResourceManager                           ,                    96256,      1.0%
 - RunNativeCode::put_NonFungibleVault                                      ,                    35354,      0.4%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      1.2%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.2%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.3%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                     4832,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/006--non-fungible-resource-burn.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/006--non-fungible-resource-burn.txt
index 7d8283bdc8..8b15032ff2 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/006--non-fungible-resource-burn.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/006--non-fungible-resource-burn.txt
@@ -1,15 +1,15 @@
-Total Cost (XRD)                                                           ,            0.42100291511,    100.0%
-- Execution Cost (XRD)                                                     ,                0.2620007,     62.2%
+Total Cost (XRD)                                                           ,            0.42114556511,    100.0%
+- Execution Cost (XRD)                                                     ,               0.26214335,     62.2%
 - Finalization Cost (XRD)                                                  ,               0.04675475,     11.1%
 - Storage Cost (XRD)                                                       ,            0.11224746511,     26.7%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5240014,    100.0%
+Execution Cost Breakdown                                                   ,                  5242867,    100.0%
 - AfterInvoke                                                              ,                      678,      0.0%
 - AllocateNodeId                                                           ,                     2231,      0.0%
 - BeforeInvoke                                                             ,                     2622,      0.1%
 - CheckReference                                                           ,                    80033,      1.5%
-- CloseSubstate                                                            ,                    49794,      1.0%
+- CloseSubstate                                                            ,                    49794,      0.9%
 - CreateNode                                                               ,                    19982,      0.4%
 - DrainSubstates                                                           ,                   120818,      2.3%
 - DropNode                                                                 ,                    35783,      0.7%
@@ -27,7 +27,7 @@ Execution Cost Breakdown                                                   ,
 - OpenSubstate::InternalKeyValueStore                                      ,                    40536,      0.8%
 - OpenSubstate::InternalNonFungibleVault                                   ,                   132271,      2.5%
 - PinNode                                                                  ,                      276,      0.0%
-- PrepareWasmCode                                                          ,                   353866,      6.8%
+- PrepareWasmCode                                                          ,                   353866,      6.7%
 - QueryActor                                                               ,                     4000,      0.1%
 - ReadSubstate                                                             ,                   571028,     10.9%
 - RemoveSubstate                                                           ,                    40717,      0.8%
@@ -44,7 +44,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::take_non_fungibles                                        ,                    64562,      1.2%
 - RunNativeCode::withdraw                                                  ,                    57851,      1.1%
 - RunNativeCode::withdraw_non_fungibles                                    ,                    81584,      1.6%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.5%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    24120,      0.5%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/007--non-fungible-resource-transfer.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/007--non-fungible-resource-transfer.txt
index 89176ed2a0..baa326ef3b 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/007--non-fungible-resource-transfer.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/007--non-fungible-resource-transfer.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.57087000949,    100.0%
-- Execution Cost (XRD)                                                     ,                0.2995224,     52.5%
+Total Cost (XRD)                                                           ,            0.57101265949,    100.0%
+- Execution Cost (XRD)                                                     ,               0.29966505,     52.5%
 - Finalization Cost (XRD)                                                  ,               0.07651195,     13.4%
 - Storage Cost (XRD)                                                       ,            0.19483565949,     34.1%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5990448,    100.0%
+Execution Cost Breakdown                                                   ,                  5993301,    100.0%
 - AfterInvoke                                                              ,                      586,      0.0%
 - AllocateNodeId                                                           ,                     2328,      0.0%
 - BeforeInvoke                                                             ,                     2848,      0.0%
@@ -46,7 +46,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::take_NonFungibleVault                                     ,                    64737,      1.1%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      2.0%
 - RunNativeCode::withdraw                                                  ,                    57851,      1.0%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.4%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      522,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/008--non-fungible-resource-freeze-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/008--non-fungible-resource-freeze-deposit.txt
index 035b0aa11a..2fa20f4505 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/008--non-fungible-resource-freeze-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/008--non-fungible-resource-freeze-deposit.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.20230061004,    100.0%
-- Execution Cost (XRD)                                                     ,               0.14623145,     72.3%
+Total Cost (XRD)                                                           ,            0.20244326004,    100.0%
+- Execution Cost (XRD)                                                     ,                0.1463741,     72.3%
 - Finalization Cost (XRD)                                                  ,                0.0152519,      7.5%
 - Storage Cost (XRD)                                                       ,            0.04081726004,     20.2%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  2924629,    100.0%
+Execution Cost Breakdown                                                   ,                  2927482,    100.0%
 - AfterInvoke                                                              ,                       76,      0.0%
 - AllocateNodeId                                                           ,                      679,      0.0%
 - BeforeInvoke                                                             ,                      612,      0.0%
@@ -32,7 +32,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::freeze_NonFungibleVault                                   ,                    36496,      1.2%
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.5%
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.5%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.8%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.9%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    14120,      0.5%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/009--non-fungible-resource-freeze-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/009--non-fungible-resource-freeze-deposit.txt
index 035b0aa11a..2fa20f4505 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/009--non-fungible-resource-freeze-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/009--non-fungible-resource-freeze-deposit.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.20230061004,    100.0%
-- Execution Cost (XRD)                                                     ,               0.14623145,     72.3%
+Total Cost (XRD)                                                           ,            0.20244326004,    100.0%
+- Execution Cost (XRD)                                                     ,                0.1463741,     72.3%
 - Finalization Cost (XRD)                                                  ,                0.0152519,      7.5%
 - Storage Cost (XRD)                                                       ,            0.04081726004,     20.2%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  2924629,    100.0%
+Execution Cost Breakdown                                                   ,                  2927482,    100.0%
 - AfterInvoke                                                              ,                       76,      0.0%
 - AllocateNodeId                                                           ,                      679,      0.0%
 - BeforeInvoke                                                             ,                      612,      0.0%
@@ -32,7 +32,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::freeze_NonFungibleVault                                   ,                    36496,      1.2%
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.5%
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.5%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.8%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.9%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    14120,      0.5%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/010--non-fungible-resource-recall-frozen-vault.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/010--non-fungible-resource-recall-frozen-vault.txt
index 81abb59aa8..4565750261 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/010--non-fungible-resource-recall-frozen-vault.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/010--non-fungible-resource-recall-frozen-vault.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.32258731512,    100.0%
-- Execution Cost (XRD)                                                     ,                0.2168157,     67.2%
+Total Cost (XRD)                                                           ,            0.32272996512,    100.0%
+- Execution Cost (XRD)                                                     ,               0.21695835,     67.2%
 - Finalization Cost (XRD)                                                  ,               0.03100355,      9.6%
 - Storage Cost (XRD)                                                       ,            0.07476806512,     23.2%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  4336314,    100.0%
+Execution Cost Breakdown                                                   ,                  4339167,    100.0%
 - AfterInvoke                                                              ,                      298,      0.0%
 - AllocateNodeId                                                           ,                     1358,      0.0%
 - BeforeInvoke                                                             ,                     1420,      0.0%
@@ -24,7 +24,7 @@ Execution Cost Breakdown                                                   ,
 - OpenSubstate::InternalFungibleVault                                      ,                    90202,      2.1%
 - OpenSubstate::InternalGenericComponent                                   ,                    43083,      1.0%
 - OpenSubstate::InternalKeyValueStore                                      ,                    40536,      0.9%
-- OpenSubstate::InternalNonFungibleVault                                   ,                   171392,      4.0%
+- OpenSubstate::InternalNonFungibleVault                                   ,                   171392,      3.9%
 - PinNode                                                                  ,                      168,      0.0%
 - PrepareWasmCode                                                          ,                   353866,      8.2%
 - QueryActor                                                               ,                     2000,      0.0%
@@ -40,7 +40,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::put_NonFungibleVault                                      ,                    35354,      0.8%
 - RunNativeCode::recall_non_fungibles                                      ,                    57416,      1.3%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      2.8%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.6%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.6%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      151,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/011--non-fungible-resource-unfreeze-withdraw.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/011--non-fungible-resource-unfreeze-withdraw.txt
index b0f5346882..facd0f20a0 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/011--non-fungible-resource-unfreeze-withdraw.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/011--non-fungible-resource-unfreeze-withdraw.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,             0.2023645949,    100.0%
-- Execution Cost (XRD)                                                     ,                0.1461047,     72.2%
+Total Cost (XRD)                                                           ,             0.2025072449,    100.0%
+- Execution Cost (XRD)                                                     ,               0.14624735,     72.2%
 - Finalization Cost (XRD)                                                  ,                0.0152519,      7.5%
 - Storage Cost (XRD)                                                       ,             0.0410079949,     20.3%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  2922094,    100.0%
+Execution Cost Breakdown                                                   ,                  2924947,    100.0%
 - AfterInvoke                                                              ,                       76,      0.0%
 - AllocateNodeId                                                           ,                      679,      0.0%
 - BeforeInvoke                                                             ,                      616,      0.0%
@@ -19,7 +19,7 @@ Execution Cost Breakdown                                                   ,
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   121872,      4.2%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      1.5%
 - OpenSubstate::GlobalNonFungibleResourceManager                           ,                    81868,      2.8%
-- OpenSubstate::GlobalPackage                                              ,                  1428558,     48.9%
+- OpenSubstate::GlobalPackage                                              ,                  1428558,     48.8%
 - OpenSubstate::InternalFungibleVault                                      ,                    90202,      3.1%
 - OpenSubstate::InternalGenericComponent                                   ,                    10266,      0.4%
 - OpenSubstate::InternalKeyValueStore                                      ,                    40536,      1.4%
@@ -32,7 +32,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.5%
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.5%
 - RunNativeCode::unfreeze_NonFungibleVault                                 ,                    33877,      1.2%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.8%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.9%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    14200,      0.5%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/012--non-fungible-resource-unfreeze-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/012--non-fungible-resource-unfreeze-deposit.txt
index b0f5346882..facd0f20a0 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/012--non-fungible-resource-unfreeze-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/012--non-fungible-resource-unfreeze-deposit.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,             0.2023645949,    100.0%
-- Execution Cost (XRD)                                                     ,                0.1461047,     72.2%
+Total Cost (XRD)                                                           ,             0.2025072449,    100.0%
+- Execution Cost (XRD)                                                     ,               0.14624735,     72.2%
 - Finalization Cost (XRD)                                                  ,                0.0152519,      7.5%
 - Storage Cost (XRD)                                                       ,             0.0410079949,     20.3%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  2922094,    100.0%
+Execution Cost Breakdown                                                   ,                  2924947,    100.0%
 - AfterInvoke                                                              ,                       76,      0.0%
 - AllocateNodeId                                                           ,                      679,      0.0%
 - BeforeInvoke                                                             ,                      616,      0.0%
@@ -19,7 +19,7 @@ Execution Cost Breakdown                                                   ,
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   121872,      4.2%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      1.5%
 - OpenSubstate::GlobalNonFungibleResourceManager                           ,                    81868,      2.8%
-- OpenSubstate::GlobalPackage                                              ,                  1428558,     48.9%
+- OpenSubstate::GlobalPackage                                              ,                  1428558,     48.8%
 - OpenSubstate::InternalFungibleVault                                      ,                    90202,      3.1%
 - OpenSubstate::InternalGenericComponent                                   ,                    10266,      0.4%
 - OpenSubstate::InternalKeyValueStore                                      ,                    40536,      1.4%
@@ -32,7 +32,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.5%
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.5%
 - RunNativeCode::unfreeze_NonFungibleVault                                 ,                    33877,      1.2%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.8%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.9%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    14200,      0.5%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/013--non-fungible-resource-unfreeze-burn.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/013--non-fungible-resource-unfreeze-burn.txt
index b0f5346882..facd0f20a0 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/013--non-fungible-resource-unfreeze-burn.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/013--non-fungible-resource-unfreeze-burn.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,             0.2023645949,    100.0%
-- Execution Cost (XRD)                                                     ,                0.1461047,     72.2%
+Total Cost (XRD)                                                           ,             0.2025072449,    100.0%
+- Execution Cost (XRD)                                                     ,               0.14624735,     72.2%
 - Finalization Cost (XRD)                                                  ,                0.0152519,      7.5%
 - Storage Cost (XRD)                                                       ,             0.0410079949,     20.3%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  2922094,    100.0%
+Execution Cost Breakdown                                                   ,                  2924947,    100.0%
 - AfterInvoke                                                              ,                       76,      0.0%
 - AllocateNodeId                                                           ,                      679,      0.0%
 - BeforeInvoke                                                             ,                      616,      0.0%
@@ -19,7 +19,7 @@ Execution Cost Breakdown                                                   ,
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   121872,      4.2%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      1.5%
 - OpenSubstate::GlobalNonFungibleResourceManager                           ,                    81868,      2.8%
-- OpenSubstate::GlobalPackage                                              ,                  1428558,     48.9%
+- OpenSubstate::GlobalPackage                                              ,                  1428558,     48.8%
 - OpenSubstate::InternalFungibleVault                                      ,                    90202,      3.1%
 - OpenSubstate::InternalGenericComponent                                   ,                    10266,      0.4%
 - OpenSubstate::InternalKeyValueStore                                      ,                    40536,      1.4%
@@ -32,7 +32,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.5%
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.5%
 - RunNativeCode::unfreeze_NonFungibleVault                                 ,                    33877,      1.2%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.8%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.9%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    14200,      0.5%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/014--non-fungible-resource-recall-unfrozen-vault.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/014--non-fungible-resource-recall-unfrozen-vault.txt
index 87133f7794..31103559ec 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/014--non-fungible-resource-recall-unfrozen-vault.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/014--non-fungible-resource-recall-unfrozen-vault.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.30372242619,    100.0%
-- Execution Cost (XRD)                                                     ,                 0.212815,     70.1%
+Total Cost (XRD)                                                           ,            0.30386507619,    100.0%
+- Execution Cost (XRD)                                                     ,               0.21295765,     70.1%
 - Finalization Cost (XRD)                                                  ,                0.0210031,      6.9%
 - Storage Cost (XRD)                                                       ,            0.06990432619,     23.0%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  4256300,    100.0%
+Execution Cost Breakdown                                                   ,                  4259153,    100.0%
 - AfterInvoke                                                              ,                      298,      0.0%
 - AllocateNodeId                                                           ,                     1358,      0.0%
 - BeforeInvoke                                                             ,                     1420,      0.0%
@@ -40,7 +40,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::put_NonFungibleVault                                      ,                    35354,      0.8%
 - RunNativeCode::recall_non_fungibles                                      ,                    57416,      1.3%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      2.8%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.6%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.6%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      151,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/015--non-fungible-create-resource-with-supply-with-empty-data.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/015--non-fungible-create-resource-with-supply-with-empty-data.txt
index 575a728dd4..3540291045 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/015--non-fungible-create-resource-with-supply-with-empty-data.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/015--non-fungible-create-resource-with-supply-with-empty-data.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.72575947002,    100.0%
-- Execution Cost (XRD)                                                     ,               0.26298495,     36.2%
+Total Cost (XRD)                                                           ,            0.72590212002,    100.0%
+- Execution Cost (XRD)                                                     ,                0.2631276,     36.2%
 - Finalization Cost (XRD)                                                  ,                0.1562636,     21.5%
 - Storage Cost (XRD)                                                       ,            0.30651092002,     42.2%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5259699,    100.0%
+Execution Cost Breakdown                                                   ,                  5262552,    100.0%
 - AfterInvoke                                                              ,                      592,      0.0%
 - AllocateNodeId                                                           ,                     2231,      0.0%
 - BeforeInvoke                                                             ,                     2616,      0.0%
@@ -43,7 +43,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.9%
 - RunNativeCode::put_NonFungibleVault                                      ,                    35354,      0.7%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      2.3%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.5%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      988,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/016--non-fungible-create-resource-with-supply-with-metadata-standard-data.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/016--non-fungible-create-resource-with-supply-with-metadata-standard-data.txt
index 09b980c74e..f87fa91099 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/016--non-fungible-create-resource-with-supply-with-metadata-standard-data.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/016--non-fungible-create-resource-with-supply-with-metadata-standard-data.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,             1.5461192445,    100.0%
-- Execution Cost (XRD)                                                     ,               0.27146135,     17.6%
+Total Cost (XRD)                                                           ,             1.5462618945,    100.0%
+- Execution Cost (XRD)                                                     ,                 0.271604,     17.6%
 - Finalization Cost (XRD)                                                  ,               0.21131105,     13.7%
 - Storage Cost (XRD)                                                       ,             1.0633468445,     68.8%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5429227,    100.0%
+Execution Cost Breakdown                                                   ,                  5432080,    100.0%
 - AfterInvoke                                                              ,                      646,      0.0%
 - AllocateNodeId                                                           ,                     2231,      0.0%
 - BeforeInvoke                                                             ,                    10678,      0.2%
@@ -43,7 +43,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.8%
 - RunNativeCode::put_NonFungibleVault                                      ,                    35354,      0.7%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      2.2%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.5%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                     1455,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/017--non-fungible-transfer-metadata-standard-nfs.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/017--non-fungible-transfer-metadata-standard-nfs.txt
index ca3673ab60..0befff021d 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/017--non-fungible-transfer-metadata-standard-nfs.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/017--non-fungible-transfer-metadata-standard-nfs.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.44436525747,    100.0%
-- Execution Cost (XRD)                                                     ,               0.25657795,     57.7%
+Total Cost (XRD)                                                           ,            0.44450790747,    100.0%
+- Execution Cost (XRD)                                                     ,                0.2567206,     57.8%
 - Finalization Cost (XRD)                                                  ,               0.05150725,     11.6%
 - Storage Cost (XRD)                                                       ,            0.13628005747,     30.7%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5131559,    100.0%
+Execution Cost Breakdown                                                   ,                  5134412,    100.0%
 - AfterInvoke                                                              ,                      488,      0.0%
 - AllocateNodeId                                                           ,                     1746,      0.0%
 - BeforeInvoke                                                             ,                     1868,      0.0%
@@ -19,7 +19,7 @@ Execution Cost Breakdown                                                   ,
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   121872,      2.4%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      0.9%
 - OpenSubstate::GlobalNonFungibleResourceManager                           ,                    94341,      1.8%
-- OpenSubstate::GlobalPackage                                              ,                  2152801,     42.0%
+- OpenSubstate::GlobalPackage                                              ,                  2152801,     41.9%
 - OpenSubstate::GlobalPreallocatedSecp256k1Account                         ,                   691764,     13.5%
 - OpenSubstate::InternalFungibleVault                                      ,                    90202,      1.8%
 - OpenSubstate::InternalGenericComponent                                   ,                    54290,      1.1%
@@ -42,7 +42,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::take_non_fungibles                                        ,                    64562,      1.3%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      2.4%
 - RunNativeCode::withdraw_non_fungibles                                    ,                    81584,      1.6%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.5%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      302,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/018--non-fungible-create-resource-with-supply-with-complex-data.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/018--non-fungible-create-resource-with-supply-with-complex-data.txt
index ef02d7c247..db1312ce51 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/018--non-fungible-create-resource-with-supply-with-complex-data.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/018--non-fungible-create-resource-with-supply-with-complex-data.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.81695454289,    100.0%
-- Execution Cost (XRD)                                                     ,               0.26887195,     32.9%
+Total Cost (XRD)                                                           ,            0.81709719289,    100.0%
+- Execution Cost (XRD)                                                     ,                0.2690146,     32.9%
 - Finalization Cost (XRD)                                                  ,               0.12627245,     15.5%
 - Storage Cost (XRD)                                                       ,            0.42181014289,     51.6%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5377439,    100.0%
+Execution Cost Breakdown                                                   ,                  5380292,    100.0%
 - AfterInvoke                                                              ,                      556,      0.0%
 - AllocateNodeId                                                           ,                     2231,      0.0%
 - BeforeInvoke                                                             ,                     4370,      0.1%
@@ -43,7 +43,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.8%
 - RunNativeCode::put_NonFungibleVault                                      ,                    35354,      0.7%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      2.3%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.5%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      700,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/019--non-fungible-mutate-data.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/019--non-fungible-mutate-data.txt
index 8289398d99..6be061e01d 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/019--non-fungible-mutate-data.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/costings/019--non-fungible-mutate-data.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            1.01265223973,    100.0%
-- Execution Cost (XRD)                                                     ,               0.17614035,     17.4%
+Total Cost (XRD)                                                           ,            1.01279488973,    100.0%
+- Execution Cost (XRD)                                                     ,                 0.176283,     17.4%
 - Finalization Cost (XRD)                                                  ,               0.01530295,      1.5%
 - Storage Cost (XRD)                                                       ,            0.82120893973,     81.1%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  3522807,    100.0%
+Execution Cost Breakdown                                                   ,                  3525660,    100.0%
 - AfterInvoke                                                              ,                       82,      0.0%
 - AllocateNodeId                                                           ,                      776,      0.0%
 - BeforeInvoke                                                             ,                     9054,      0.3%
@@ -22,7 +22,7 @@ Execution Cost Breakdown                                                   ,
 - OpenSubstate::GlobalPackage                                              ,                  1449523,     41.1%
 - OpenSubstate::InternalFungibleVault                                      ,                    90202,      2.6%
 - OpenSubstate::InternalGenericComponent                                   ,                    13522,      0.4%
-- OpenSubstate::InternalKeyValueStore                                      ,                    40536,      1.2%
+- OpenSubstate::InternalKeyValueStore                                      ,                    40536,      1.1%
 - PinNode                                                                  ,                       96,      0.0%
 - PrepareWasmCode                                                          ,                   353866,     10.0%
 - QueryActor                                                               ,                     1000,      0.0%
@@ -31,7 +31,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.4%
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.3%
 - RunNativeCode::update_non_fungible_data                                  ,                   106206,      3.0%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.7%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.8%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                   183160,      5.2%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/001--non-fungible-resource-create.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/001--non-fungible-resource-create.txt
index 965cff15da..15f669444e 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/001--non-fungible-resource-create.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/001--non-fungible-resource-create.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.86122961999 XRD
-├─ Network execution: 0.27600795 XRD, 5520159 execution cost units
+TRANSACTION COST: 0.86137226999 XRD
+├─ Network execution: 0.2761506 XRD, 5523012 execution cost units
 ├─ Network finalization: 0.16627255 XRD, 3325451 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.41894911999 XRD
@@ -39,15 +39,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.86122961999"),
+     amount: Decimal("0.86137226999"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.430614809995"),
+     amount: Decimal("0.430686134995"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.430614809995"),
+     amount: Decimal("0.430686134995"),
    }
 
 STATE UPDATES: 8 entities
@@ -57,7 +57,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.2153074049975"),
+             0u8 => Decimal("0.2153430674975"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -90,7 +90,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999999.13877038001")),
+         LiquidFungibleResource(Decimal("99999999999999999.13862773001")),
        )
 ├─ resource_sim1ntpe4zxy537sl7dduxwpxd3h548wf4dq6z2s6uks94pwzeeapq579l across 6 partitions
   ├─ Partition(1): 1 change
@@ -514,7 +514,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.430614809995")),
+         LiquidFungibleResource(Decimal("0.430686134995")),
        )
 
 OUTPUTS: 3
@@ -528,13 +528,13 @@ OUTPUTS: 3
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.86122961999
+   Change: -0.86137226999
 ├─ Vault: internal_vault_sim1nzupesg6es369wqjguu7umf92886ph6w3qj98uxq7tkavev439ut2q
    ResAddr: resource_sim1ntpe4zxy537sl7dduxwpxd3h548wf4dq6z2s6uks94pwzeeapq579l
    Change: +{#1#}, -{}
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.430614809995
+   Change: 0.430686134995
 
 NEW ENTITIES: 2
 └─ Component: account_sim16996e320lnez82q6430eunaz9l3n5fnwk6eh9avrmtmj22e7jmhemw
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/002--non-fungible-resource-create-string.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/002--non-fungible-resource-create-string.txt
index 5102378223..ba25956b73 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/002--non-fungible-resource-create-string.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/002--non-fungible-resource-create-string.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.75135211441 XRD
-├─ Network execution: 0.2634653 XRD, 5269306 execution cost units
+TRANSACTION COST: 0.75149476441 XRD
+├─ Network execution: 0.26360795 XRD, 5272159 execution cost units
 ├─ Network finalization: 0.1362671 XRD, 2725342 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.35161971441 XRD
@@ -39,15 +39,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.75135211441"),
+     amount: Decimal("0.75149476441"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.375676057205"),
+     amount: Decimal("0.375747382205"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.375676057205"),
+     amount: Decimal("0.375747382205"),
    }
 
 STATE UPDATES: 8 entities
@@ -57,7 +57,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.4031454336"),
+             0u8 => Decimal("0.4032167586"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -90,7 +90,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999998.3874182656")),
+         LiquidFungibleResource(Decimal("99999999999999998.3871329656")),
        )
 ├─ resource_sim1ngmh9yztljz0kg9pk0d8ul3wlxej866h0mhnvv5zkrmfsy25tdlxv2 across 6 partitions
   ├─ Partition(1): 1 change
@@ -411,7 +411,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.8062908672")),
+         LiquidFungibleResource(Decimal("0.8064335172")),
        )
 
 OUTPUTS: 3
@@ -425,13 +425,13 @@ OUTPUTS: 3
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.75135211441
+   Change: -0.75149476441
 ├─ Vault: internal_vault_sim1nzzvtpj0tjkaydq997fla88kg90hpn9km9cnev38ltuaalkm6qy48j
    ResAddr: resource_sim1ngmh9yztljz0kg9pk0d8ul3wlxej866h0mhnvv5zkrmfsy25tdlxv2
    Change: +{<my_nft>}, -{}
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.375676057205
+   Change: 0.375747382205
 
 NEW ENTITIES: 1
 └─ Resource: resource_sim1ngmh9yztljz0kg9pk0d8ul3wlxej866h0mhnvv5zkrmfsy25tdlxv2
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/003--non-fungible-resource-create-bytes.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/003--non-fungible-resource-create-bytes.txt
index 17a1aa3c5e..e42cd0b705 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/003--non-fungible-resource-create-bytes.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/003--non-fungible-resource-create-bytes.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.75710561021 XRD
-├─ Network execution: 0.2634963 XRD, 5269926 execution cost units
+TRANSACTION COST: 0.75724826021 XRD
+├─ Network execution: 0.26363895 XRD, 5272779 execution cost units
 ├─ Network finalization: 0.13626755 XRD, 2725351 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.35734176021 XRD
@@ -39,15 +39,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.75710561021"),
+     amount: Decimal("0.75724826021"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.378552805105"),
+     amount: Decimal("0.378624130105"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.378552805105"),
+     amount: Decimal("0.378624130105"),
    }
 
 STATE UPDATES: 8 entities
@@ -57,7 +57,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.5924218361525"),
+             0u8 => Decimal("0.5925288236525"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -90,7 +90,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999997.63031265539")),
+         LiquidFungibleResource(Decimal("99999999999999997.62988470539")),
        )
 ├─ resource_sim1nf89a30xn7gc79cytvgjca028gehd3ha3ydt0z0pp3rzlcuqv8d9fs across 6 partitions
   ├─ Partition(1): 1 change
@@ -411,7 +411,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("1.184843672305")),
+         LiquidFungibleResource(Decimal("1.185057647305")),
        )
 
 OUTPUTS: 3
@@ -425,13 +425,13 @@ OUTPUTS: 3
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.75710561021
+   Change: -0.75724826021
 ├─ Vault: internal_vault_sim1npk4ndjw8jn7kav0t2fc69geagkxdpdu7wvvnh4v2p4exwfn6dl0th
    ResAddr: resource_sim1nf89a30xn7gc79cytvgjca028gehd3ha3ydt0z0pp3rzlcuqv8d9fs
    Change: +{[00000000000000000000000000000000]}, -{}
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.378552805105
+   Change: 0.378624130105
 
 NEW ENTITIES: 1
 └─ Resource: resource_sim1nf89a30xn7gc79cytvgjca028gehd3ha3ydt0z0pp3rzlcuqv8d9fs
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/004--non-fungible-resource-create-ruid.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/004--non-fungible-resource-create-ruid.txt
index 030e449d75..6359bcc821 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/004--non-fungible-resource-create-ruid.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/004--non-fungible-resource-create-ruid.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.76321259774 XRD
-├─ Network execution: 0.26283175 XRD, 5256635 execution cost units
+TRANSACTION COST: 0.76335524774 XRD
+├─ Network execution: 0.2629744 XRD, 5259488 execution cost units
 ├─ Network finalization: 0.136268 XRD, 2725360 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.36411284774 XRD
@@ -39,15 +39,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.76321259774"),
+     amount: Decimal("0.76335524774"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.38160629887"),
+     amount: Decimal("0.38167762387"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.38160629887"),
+     amount: Decimal("0.38167762387"),
    }
 
 STATE UPDATES: 8 entities
@@ -57,7 +57,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.7832249855875"),
+             0u8 => Decimal("0.7833676355875"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -90,7 +90,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999996.86710005765")),
+         LiquidFungibleResource(Decimal("99999999999999996.86652945765")),
        )
 ├─ resource_sim1ngvvctr9hl04wrlyfudzyx3t3aam07ffk3f04z9lxd5ec2p87gftk7 across 6 partitions
   ├─ Partition(1): 1 change
@@ -411,7 +411,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("1.566449971175")),
+         LiquidFungibleResource(Decimal("1.566735271175")),
        )
 
 OUTPUTS: 3
@@ -425,13 +425,13 @@ OUTPUTS: 3
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.76321259774
+   Change: -0.76335524774
 ├─ Vault: internal_vault_sim1nz6ksuj04dn2dq5waa9jyzfm52erqd74ls0xx2r3rafv8xjs29efp5
    ResAddr: resource_sim1ngvvctr9hl04wrlyfudzyx3t3aam07ffk3f04z9lxd5ec2p87gftk7
    Change: +{{01dae3e6299cc23a-5a8ecfea5b6bdb5b-52be14aa0a43c7bc-8498ea430b50b164}}, -{}
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.38160629887
+   Change: 0.38167762387
 
 NEW ENTITIES: 1
 └─ Resource: resource_sim1ngvvctr9hl04wrlyfudzyx3t3aam07ffk3f04z9lxd5ec2p87gftk7
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/005--non-fungible-resource-mint-32-nfts.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/005--non-fungible-resource-mint-32-nfts.txt
index 53b3ff6943..d90e8c6347 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/005--non-fungible-resource-mint-32-nfts.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/005--non-fungible-resource-mint-32-nfts.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 2.04141269637 XRD
-├─ Network execution: 0.4980885 XRD, 9961770 execution cost units
+TRANSACTION COST: 2.04155534637 XRD
+├─ Network execution: 0.49823115 XRD, 9964623 execution cost units
 ├─ Network finalization: 0.3360679 XRD, 6721358 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 1.20725629637 XRD
@@ -128,15 +128,15 @@ EVENTS: 7
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("2.04141269637"),
+     amount: Decimal("2.04155534637"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("1.020706348185"),
+     amount: Decimal("1.020777673185"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("1.020706348185"),
+     amount: Decimal("1.020777673185"),
    }
 
 STATE UPDATES: 7 entities
@@ -146,7 +146,7 @@ STATE UPDATES: 7 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.29357815968"),
+             0u8 => Decimal("1.29375647218"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -501,7 +501,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999994.82568736128")),
+         LiquidFungibleResource(Decimal("99999999999999994.82497411128")),
        )
 ├─ internal_vault_sim1nzupesg6es369wqjguu7umf92886ph6w3qj98uxq7tkavev439ut2q across 2 partitions
   ├─ Partition(64): 1 change
@@ -642,7 +642,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("2.58715631936")),
+         LiquidFungibleResource(Decimal("2.58751294436")),
        )
 
 OUTPUTS: 3
@@ -653,12 +653,12 @@ OUTPUTS: 3
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -2.04141269637
+   Change: -2.04155534637
 ├─ Vault: internal_vault_sim1nzupesg6es369wqjguu7umf92886ph6w3qj98uxq7tkavev439ut2q
    ResAddr: resource_sim1ntpe4zxy537sl7dduxwpxd3h548wf4dq6z2s6uks94pwzeeapq579l
    Change: +{#100#, #101#, #102#, #103#, #104#, #105#, #106#, #107#, #108#, #109#, #110#, #111#, #112#, #113#, #114#, #115#, #116#, #117#, #118#, #119#, #120#, #121#, #122#, #123#, #124#, #125#, #126#, #127#, #128#, #129#, #130#, #131#}, -{}
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 1.020706348185
+   Change: 1.020777673185
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/006--non-fungible-resource-burn.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/006--non-fungible-resource-burn.txt
index 97ef51c517..7d502c6027 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/006--non-fungible-resource-burn.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/006--non-fungible-resource-burn.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.42100291511 XRD
-├─ Network execution: 0.2620007 XRD, 5240014 execution cost units
+TRANSACTION COST: 0.42114556511 XRD
+├─ Network execution: 0.26214335 XRD, 5242867 execution cost units
 ├─ Network finalization: 0.04675475 XRD, 935095 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.11224746511 XRD
@@ -57,15 +57,15 @@ EVENTS: 10
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.42100291511"),
+     amount: Decimal("0.42114556511"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.210501457555"),
+     amount: Decimal("0.210572782555"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.210501457555"),
+     amount: Decimal("0.210572782555"),
    }
 
 STATE UPDATES: 7 entities
@@ -75,7 +75,7 @@ STATE UPDATES: 7 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.3988288884575"),
+             0u8 => Decimal("1.3990428634575"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -116,7 +116,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999994.40468444617")),
+         LiquidFungibleResource(Decimal("99999999999999994.40382854617")),
        )
 ├─ internal_vault_sim1nzupesg6es369wqjguu7umf92886ph6w3qj98uxq7tkavev439ut2q across 2 partitions
   ├─ Partition(64): 1 change
@@ -132,7 +132,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("2.797657776915")),
+         LiquidFungibleResource(Decimal("2.798085726915")),
        )
 
 OUTPUTS: 7
@@ -147,12 +147,12 @@ OUTPUTS: 7
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.42100291511
+   Change: -0.42114556511
 ├─ Vault: internal_vault_sim1nzupesg6es369wqjguu7umf92886ph6w3qj98uxq7tkavev439ut2q
    ResAddr: resource_sim1ntpe4zxy537sl7dduxwpxd3h548wf4dq6z2s6uks94pwzeeapq579l
    Change: +{}, -{#110#, #126#, #127#}
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.210501457555
+   Change: 0.210572782555
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/007--non-fungible-resource-transfer.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/007--non-fungible-resource-transfer.txt
index f6c49cf609..4cbd0e2a12 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/007--non-fungible-resource-transfer.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/007--non-fungible-resource-transfer.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.57087000949 XRD
-├─ Network execution: 0.2995224 XRD, 5990448 execution cost units
+TRANSACTION COST: 0.57101265949 XRD
+├─ Network execution: 0.29966505 XRD, 5993301 execution cost units
 ├─ Network finalization: 0.07651195 XRD, 1530239 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.19483565949 XRD
@@ -46,15 +46,15 @@ EVENTS: 9
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.57087000949"),
+     amount: Decimal("0.57101265949"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.285435004745"),
+     amount: Decimal("0.285506329745"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.285435004745"),
+     amount: Decimal("0.285506329745"),
    }
 
 STATE UPDATES: 8 entities
@@ -64,7 +64,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.54154639083"),
+             0u8 => Decimal("1.54179602833"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -97,7 +97,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999993.83381443668")),
+         LiquidFungibleResource(Decimal("99999999999999993.83281588668")),
        )
 ├─ internal_vault_sim1nzupesg6es369wqjguu7umf92886ph6w3qj98uxq7tkavev439ut2q across 2 partitions
   ├─ Partition(64): 1 change
@@ -250,7 +250,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("3.08309278166")),
+         LiquidFungibleResource(Decimal("3.08359205666")),
        )
 
 OUTPUTS: 3
@@ -261,7 +261,7 @@ OUTPUTS: 3
 BALANCE CHANGES: 4
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.57087000949
+   Change: -0.57101265949
 ├─ Vault: internal_vault_sim1nzupesg6es369wqjguu7umf92886ph6w3qj98uxq7tkavev439ut2q
    ResAddr: resource_sim1ntpe4zxy537sl7dduxwpxd3h548wf4dq6z2s6uks94pwzeeapq579l
    Change: +{}, -{#111#}
@@ -270,7 +270,7 @@ BALANCE CHANGES: 4
    Change: +{#111#}, -{}
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.285435004745
+   Change: 0.285506329745
 
 NEW ENTITIES: 1
 └─ Component: account_sim168qgdkgfqxpnswu38wy6fy5v0q0um52zd0umuely5t9xrf88t3unc0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/008--non-fungible-resource-freeze-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/008--non-fungible-resource-freeze-deposit.txt
index 90e784d74f..0a99443ffb 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/008--non-fungible-resource-freeze-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/008--non-fungible-resource-freeze-deposit.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.20230061004 XRD
-├─ Network execution: 0.14623145 XRD, 2924629 execution cost units
+TRANSACTION COST: 0.20244326004 XRD
+├─ Network execution: 0.1463741 XRD, 2927482 execution cost units
 ├─ Network finalization: 0.0152519 XRD, 305038 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.04081726004 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.20230061004"),
+     amount: Decimal("0.20244326004"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.10115030502"),
+     amount: Decimal("0.10122163002"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.10115030502"),
+     amount: Decimal("0.10122163002"),
    }
 
 STATE UPDATES: 6 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 6 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.59212154334"),
+             0u8 => Decimal("1.59240684334"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -75,13 +75,13 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999993.63151382664")),
+         LiquidFungibleResource(Decimal("99999999999999993.63037262664")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("3.18424308668")),
+         LiquidFungibleResource(Decimal("3.18481368668")),
        )
 
 OUTPUTS: 2
@@ -91,9 +91,9 @@ OUTPUTS: 2
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.20230061004
+   Change: -0.20244326004
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.10115030502
+   Change: 0.10122163002
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/009--non-fungible-resource-freeze-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/009--non-fungible-resource-freeze-deposit.txt
index ad582ab443..88bc6652cc 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/009--non-fungible-resource-freeze-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/009--non-fungible-resource-freeze-deposit.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.20230061004 XRD
-├─ Network execution: 0.14623145 XRD, 2924629 execution cost units
+TRANSACTION COST: 0.20244326004 XRD
+├─ Network execution: 0.1463741 XRD, 2927482 execution cost units
 ├─ Network finalization: 0.0152519 XRD, 305038 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.04081726004 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.20230061004"),
+     amount: Decimal("0.20244326004"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.10115030502"),
+     amount: Decimal("0.10122163002"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.10115030502"),
+     amount: Decimal("0.10122163002"),
    }
 
 STATE UPDATES: 6 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 6 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.64269669585"),
+             0u8 => Decimal("1.64301765835"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -75,13 +75,13 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999993.4292132166")),
+         LiquidFungibleResource(Decimal("99999999999999993.4279293666")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("3.2853933917")),
+         LiquidFungibleResource(Decimal("3.2860353167")),
        )
 
 OUTPUTS: 2
@@ -91,9 +91,9 @@ OUTPUTS: 2
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.20230061004
+   Change: -0.20244326004
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.10115030502
+   Change: 0.10122163002
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/010--non-fungible-resource-recall-frozen-vault.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/010--non-fungible-resource-recall-frozen-vault.txt
index 4808188f45..c05f793574 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/010--non-fungible-resource-recall-frozen-vault.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/010--non-fungible-resource-recall-frozen-vault.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.32258731512 XRD
-├─ Network execution: 0.2168157 XRD, 4336314 execution cost units
+TRANSACTION COST: 0.32272996512 XRD
+├─ Network execution: 0.21695835 XRD, 4339167 execution cost units
 ├─ Network finalization: 0.03100355 XRD, 620071 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.07476806512 XRD
@@ -35,15 +35,15 @@ EVENTS: 7
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.32258731512"),
+     amount: Decimal("0.32272996512"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.16129365756"),
+     amount: Decimal("0.16136498256"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.16129365756"),
+     amount: Decimal("0.16136498256"),
    }
 
 STATE UPDATES: 7 entities
@@ -53,7 +53,7 @@ STATE UPDATES: 7 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.72334352463"),
+             0u8 => Decimal("1.72370014963"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -94,7 +94,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999993.10662590148")),
+         LiquidFungibleResource(Decimal("99999999999999993.10519940148")),
        )
 ├─ internal_vault_sim1nq4qqp48us7mydmk7sfmjasfku00yzampszkkte00xx434qwtdfu3z across 2 partitions
   ├─ Partition(64): 1 change
@@ -111,7 +111,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("3.44668704926")),
+         LiquidFungibleResource(Decimal("3.44740029926")),
        )
 
 OUTPUTS: 3
@@ -125,12 +125,12 @@ BALANCE CHANGES: 4
    Change: +{}, -{#120#}
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.32258731512
+   Change: -0.32272996512
 ├─ Vault: internal_vault_sim1nq4qqp48us7mydmk7sfmjasfku00yzampszkkte00xx434qwtdfu3z
    ResAddr: resource_sim1ntpe4zxy537sl7dduxwpxd3h548wf4dq6z2s6uks94pwzeeapq579l
    Change: +{#120#}, -{}
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.16129365756
+   Change: 0.16136498256
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/011--non-fungible-resource-unfreeze-withdraw.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/011--non-fungible-resource-unfreeze-withdraw.txt
index 170d96c136..c148c04834 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/011--non-fungible-resource-unfreeze-withdraw.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/011--non-fungible-resource-unfreeze-withdraw.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.2023645949 XRD
-├─ Network execution: 0.1461047 XRD, 2922094 execution cost units
+TRANSACTION COST: 0.2025072449 XRD
+├─ Network execution: 0.14624735 XRD, 2924947 execution cost units
 ├─ Network finalization: 0.0152519 XRD, 305038 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.0410079949 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.2023645949"),
+     amount: Decimal("0.2025072449"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.10118229745"),
+     amount: Decimal("0.10125362245"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.10118229745"),
+     amount: Decimal("0.10125362245"),
    }
 
 STATE UPDATES: 6 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 6 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.773934673355"),
+             0u8 => Decimal("1.774326960855"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -75,13 +75,13 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999992.90426130658")),
+         LiquidFungibleResource(Decimal("99999999999999992.90269215658")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("3.54786934671")),
+         LiquidFungibleResource(Decimal("3.54865392171")),
        )
 
 OUTPUTS: 2
@@ -91,9 +91,9 @@ OUTPUTS: 2
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.2023645949
+   Change: -0.2025072449
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.10118229745
+   Change: 0.10125362245
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/012--non-fungible-resource-unfreeze-deposit.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/012--non-fungible-resource-unfreeze-deposit.txt
index ea347071d8..c4e10d48f9 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/012--non-fungible-resource-unfreeze-deposit.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/012--non-fungible-resource-unfreeze-deposit.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.2023645949 XRD
-├─ Network execution: 0.1461047 XRD, 2922094 execution cost units
+TRANSACTION COST: 0.2025072449 XRD
+├─ Network execution: 0.14624735 XRD, 2924947 execution cost units
 ├─ Network finalization: 0.0152519 XRD, 305038 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.0410079949 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.2023645949"),
+     amount: Decimal("0.2025072449"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.10118229745"),
+     amount: Decimal("0.10125362245"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.10118229745"),
+     amount: Decimal("0.10125362245"),
    }
 
 STATE UPDATES: 6 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 6 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.82452582208"),
+             0u8 => Decimal("1.82495377208"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -75,13 +75,13 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999992.70189671168")),
+         LiquidFungibleResource(Decimal("99999999999999992.70018491168")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("3.64905164416")),
+         LiquidFungibleResource(Decimal("3.64990754416")),
        )
 
 OUTPUTS: 2
@@ -91,9 +91,9 @@ OUTPUTS: 2
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.2023645949
+   Change: -0.2025072449
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.10118229745
+   Change: 0.10125362245
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/013--non-fungible-resource-unfreeze-burn.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/013--non-fungible-resource-unfreeze-burn.txt
index 160d91bcad..d7f4e0c3e7 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/013--non-fungible-resource-unfreeze-burn.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/013--non-fungible-resource-unfreeze-burn.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.2023645949 XRD
-├─ Network execution: 0.1461047 XRD, 2922094 execution cost units
+TRANSACTION COST: 0.2025072449 XRD
+├─ Network execution: 0.14624735 XRD, 2924947 execution cost units
 ├─ Network finalization: 0.0152519 XRD, 305038 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.0410079949 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.2023645949"),
+     amount: Decimal("0.2025072449"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.10118229745"),
+     amount: Decimal("0.10125362245"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.10118229745"),
+     amount: Decimal("0.10125362245"),
    }
 
 STATE UPDATES: 6 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 6 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.875116970805"),
+             0u8 => Decimal("1.875580583305"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -75,13 +75,13 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999992.49953211678")),
+         LiquidFungibleResource(Decimal("99999999999999992.49767766678")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("3.75023394161")),
+         LiquidFungibleResource(Decimal("3.75116116661")),
        )
 
 OUTPUTS: 2
@@ -91,9 +91,9 @@ OUTPUTS: 2
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.2023645949
+   Change: -0.2025072449
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.10118229745
+   Change: 0.10125362245
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/014--non-fungible-resource-recall-unfrozen-vault.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/014--non-fungible-resource-recall-unfrozen-vault.txt
index b6ac271768..136739d477 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/014--non-fungible-resource-recall-unfrozen-vault.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/014--non-fungible-resource-recall-unfrozen-vault.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.30372242619 XRD
-├─ Network execution: 0.212815 XRD, 4256300 execution cost units
+TRANSACTION COST: 0.30386507619 XRD
+├─ Network execution: 0.21295765 XRD, 4259153 execution cost units
 ├─ Network finalization: 0.0210031 XRD, 420062 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.06990432619 XRD
@@ -35,15 +35,15 @@ EVENTS: 7
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.30372242619"),
+     amount: Decimal("0.30386507619"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.151861213095"),
+     amount: Decimal("0.151932538095"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.151861213095"),
+     amount: Decimal("0.151932538095"),
    }
 
 STATE UPDATES: 6 entities
@@ -53,7 +53,7 @@ STATE UPDATES: 6 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("1.9510475773525"),
+             0u8 => Decimal("1.9515468523525"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -97,13 +97,13 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999992.19580969059")),
+         LiquidFungibleResource(Decimal("99999999999999992.19381259059")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("3.902095154705")),
+         LiquidFungibleResource(Decimal("3.903093704705")),
        )
 
 OUTPUTS: 3
@@ -114,9 +114,9 @@ OUTPUTS: 3
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.30372242619
+   Change: -0.30386507619
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.151861213095
+   Change: 0.151932538095
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/015--non-fungible-create-resource-with-supply-with-empty-data.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/015--non-fungible-create-resource-with-supply-with-empty-data.txt
index 7f55e33107..d5ab5f12a0 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/015--non-fungible-create-resource-with-supply-with-empty-data.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/015--non-fungible-create-resource-with-supply-with-empty-data.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.72575947002 XRD
-├─ Network execution: 0.26298495 XRD, 5259699 execution cost units
+TRANSACTION COST: 0.72590212002 XRD
+├─ Network execution: 0.2631276 XRD, 5262552 execution cost units
 ├─ Network finalization: 0.1562636 XRD, 3125272 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.30651092002 XRD
@@ -45,15 +45,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.72575947002"),
+     amount: Decimal("0.72590212002"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.36287973501"),
+     amount: Decimal("0.36295106001"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.36287973501"),
+     amount: Decimal("0.36295106001"),
    }
 
 STATE UPDATES: 8 entities
@@ -63,7 +63,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("2.1324874448575"),
+             0u8 => Decimal("2.1330223823575"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -96,7 +96,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999991.47005022057")),
+         LiquidFungibleResource(Decimal("99999999999999991.46791047057")),
        )
 ├─ resource_sim1nfacl5anpn7rthz3czyh282v0p9qr22trqwql96vh38cz6mafqfvnx across 6 partitions
   ├─ Partition(1): 1 change
@@ -299,7 +299,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("4.264974889715")),
+         LiquidFungibleResource(Decimal("4.266044764715")),
        )
 
 OUTPUTS: 3
@@ -313,13 +313,13 @@ OUTPUTS: 3
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.72575947002
+   Change: -0.72590212002
 ├─ Vault: internal_vault_sim1nptkpwateyft954ecyn22njkpul50pta3sefh62mwuas6uzlh30042
    ResAddr: resource_sim1nfacl5anpn7rthz3czyh282v0p9qr22trqwql96vh38cz6mafqfvnx
    Change: +{#1#, #2#, #3#}, -{}
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.36287973501
+   Change: 0.36295106001
 
 NEW ENTITIES: 1
 └─ Resource: resource_sim1nfacl5anpn7rthz3czyh282v0p9qr22trqwql96vh38cz6mafqfvnx
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/016--non-fungible-create-resource-with-supply-with-metadata-standard-data.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/016--non-fungible-create-resource-with-supply-with-metadata-standard-data.txt
index 05e20459da..d72ba23934 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/016--non-fungible-create-resource-with-supply-with-metadata-standard-data.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/016--non-fungible-create-resource-with-supply-with-metadata-standard-data.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 1.5461192445 XRD
-├─ Network execution: 0.27146135 XRD, 5429227 execution cost units
+TRANSACTION COST: 1.5462618945 XRD
+├─ Network execution: 0.271604 XRD, 5432080 execution cost units
 ├─ Network finalization: 0.21131105 XRD, 4226221 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 1.0633468445 XRD
@@ -54,15 +54,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("1.5461192445"),
+     amount: Decimal("1.5462618945"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.77305962225"),
+     amount: Decimal("0.77313094725"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.77305962225"),
+     amount: Decimal("0.77313094725"),
    }
 
 STATE UPDATES: 8 entities
@@ -72,7 +72,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("2.5190172559825"),
+             0u8 => Decimal("2.5195878559825"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -105,7 +105,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999989.92393097607")),
+         LiquidFungibleResource(Decimal("99999999999999989.92164857607")),
        )
 ├─ resource_sim1ngy84t92hr3fthvrelg0kmcr2hwqxv00qed9wu2zkffa9yyv8h8zsn across 7 partitions
   ├─ Partition(1): 1 change
@@ -437,7 +437,7 @@ DEXes allow users to trade assets without the need for a trusted third party. Th
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("5.038034511965")),
+         LiquidFungibleResource(Decimal("5.039175711965")),
        )
 
 OUTPUTS: 3
@@ -451,13 +451,13 @@ OUTPUTS: 3
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -1.5461192445
+   Change: -1.5462618945
 ├─ Vault: internal_vault_sim1nrukmp5vx6sq3va905gnc6shf85ql9m83cachgjrjf80y54302yl8n
    ResAddr: resource_sim1ngy84t92hr3fthvrelg0kmcr2hwqxv00qed9wu2zkffa9yyv8h8zsn
    Change: +{#1#, #2#, #3#, #4#, #5#, #8#}, -{}
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.77305962225
+   Change: 0.77313094725
 
 NEW ENTITIES: 1
 └─ Resource: resource_sim1ngy84t92hr3fthvrelg0kmcr2hwqxv00qed9wu2zkffa9yyv8h8zsn
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/017--non-fungible-transfer-metadata-standard-nfs.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/017--non-fungible-transfer-metadata-standard-nfs.txt
index bfb469784e..9966534773 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/017--non-fungible-transfer-metadata-standard-nfs.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/017--non-fungible-transfer-metadata-standard-nfs.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.44436525747 XRD
-├─ Network execution: 0.25657795 XRD, 5131559 execution cost units
+TRANSACTION COST: 0.44450790747 XRD
+├─ Network execution: 0.2567206 XRD, 5134412 execution cost units
 ├─ Network finalization: 0.05150725 XRD, 1030145 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.13628005747 XRD
@@ -50,15 +50,15 @@ EVENTS: 9
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.44436525747"),
+     amount: Decimal("0.44450790747"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.222182628735"),
+     amount: Decimal("0.222253953735"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.222182628735"),
+     amount: Decimal("0.222253953735"),
    }
 
 STATE UPDATES: 8 entities
@@ -68,7 +68,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("2.63010857035"),
+             0u8 => Decimal("2.63071483285"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -101,7 +101,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999989.4795657186")),
+         LiquidFungibleResource(Decimal("99999999999999989.4771406686")),
        )
 ├─ internal_vault_sim1nrukmp5vx6sq3va905gnc6shf85ql9m83cachgjrjf80y54302yl8n across 2 partitions
   ├─ Partition(64): 1 change
@@ -160,7 +160,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("5.2602171407")),
+         LiquidFungibleResource(Decimal("5.2614296657")),
        )
 
 OUTPUTS: 3
@@ -171,7 +171,7 @@ OUTPUTS: 3
 BALANCE CHANGES: 4
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.44436525747
+   Change: -0.44450790747
 ├─ Vault: internal_vault_sim1nrukmp5vx6sq3va905gnc6shf85ql9m83cachgjrjf80y54302yl8n
    ResAddr: resource_sim1ngy84t92hr3fthvrelg0kmcr2hwqxv00qed9wu2zkffa9yyv8h8zsn
    Change: +{}, -{#4#, #8#}
@@ -180,6 +180,6 @@ BALANCE CHANGES: 4
    Change: +{#4#, #8#}, -{}
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.222182628735
+   Change: 0.222253953735
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/018--non-fungible-create-resource-with-supply-with-complex-data.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/018--non-fungible-create-resource-with-supply-with-complex-data.txt
index a8a2b51a59..e34189ee75 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/018--non-fungible-create-resource-with-supply-with-complex-data.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/018--non-fungible-create-resource-with-supply-with-complex-data.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.81695454289 XRD
-├─ Network execution: 0.26887195 XRD, 5377439 execution cost units
+TRANSACTION COST: 0.81709719289 XRD
+├─ Network execution: 0.2690146 XRD, 5380292 execution cost units
 ├─ Network finalization: 0.12627245 XRD, 2525449 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.42181014289 XRD
@@ -39,15 +39,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.81695454289"),
+     amount: Decimal("0.81709719289"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.408477271445"),
+     amount: Decimal("0.408548596445"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.408477271445"),
+     amount: Decimal("0.408548596445"),
    }
 
 STATE UPDATES: 8 entities
@@ -57,7 +57,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("2.8343472060725"),
+             0u8 => Decimal("2.8349891310725"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -90,7 +90,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999988.66261117571")),
+         LiquidFungibleResource(Decimal("99999999999999988.66004347571")),
        )
 ├─ resource_sim1ngcvdpjg2dg5gjx4sqp9zh88hhvuafu7vw92dfyfrga9u3lnd5vatm across 6 partitions
   ├─ Partition(1): 1 change
@@ -445,7 +445,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("5.668694412145")),
+         LiquidFungibleResource(Decimal("5.669978262145")),
        )
 
 OUTPUTS: 3
@@ -459,13 +459,13 @@ OUTPUTS: 3
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.81695454289
+   Change: -0.81709719289
 ├─ Vault: internal_vault_sim1nqvpupxfdwtvgqxp8jqddjtrrsd8u984qd6u93uz2mhezkdwsvx9u7
    ResAddr: resource_sim1ngcvdpjg2dg5gjx4sqp9zh88hhvuafu7vw92dfyfrga9u3lnd5vatm
    Change: +{#1#}, -{}
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.408477271445
+   Change: 0.408548596445
 
 NEW ENTITIES: 1
 └─ Resource: resource_sim1ngcvdpjg2dg5gjx4sqp9zh88hhvuafu7vw92dfyfrga9u3lnd5vatm
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/019--non-fungible-mutate-data.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/019--non-fungible-mutate-data.txt
index 2a3e894afe..db84a75eaa 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/019--non-fungible-mutate-data.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/receipts/019--non-fungible-mutate-data.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 1.01265223973 XRD
-├─ Network execution: 0.17614035 XRD, 3522807 execution cost units
+TRANSACTION COST: 1.01279488973 XRD
+├─ Network execution: 0.176283 XRD, 3525660 execution cost units
 ├─ Network finalization: 0.01530295 XRD, 306059 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.82120893973 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("1.01265223973"),
+     amount: Decimal("1.01279488973"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.506326119865"),
+     amount: Decimal("0.506397444865"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.506326119865"),
+     amount: Decimal("0.506397444865"),
    }
 
 STATE UPDATES: 6 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 6 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("3.087510266005"),
+             0u8 => Decimal("3.088187853505"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -71,13 +71,13 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999987.64995893598")),
+         LiquidFungibleResource(Decimal("99999999999999987.64724858598")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("6.17502053201")),
+         LiquidFungibleResource(Decimal("6.17637570701")),
        )
 
 OUTPUTS: 3
@@ -88,9 +88,9 @@ OUTPUTS: 3
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -1.01265223973
+   Change: -1.01279488973
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.506326119865
+   Change: 0.506397444865
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/scenario_summary.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/scenario_summary.txt
index af7c3abf3f..42105d522f 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/scenario_summary.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource/scenario_summary.txt
@@ -2,8 +2,8 @@ Name: non_fungible_resource
 
 == SUMMARY HASHES ==
 These Cuttlefish hashes are permitted to change only until the scenario is deployed to a permanent network, else it can cause divergence.
-State changes: f57bdeceb685429f (allowed to change if not deployed to any network)
-Events       : 0a7729c45f851905 (allowed to change if not deployed to any network)
+State changes: 85847b95ae7d5d8b (allowed to change if not deployed to any network)
+Events       : 6abae3108c71b8af (allowed to change if not deployed to any network)
 
 == INTERESTING ADDRESSES ==
 - main_account: account_sim16996e320lnez82q6430eunaz9l3n5fnwk6eh9avrmtmj22e7jmhemw
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource_with_remote_type/costings/001--non-fungible-resource-with-remote-type-registration.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource_with_remote_type/costings/001--non-fungible-resource-with-remote-type-registration.txt
index 1442fba24d..095ad3071a 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource_with_remote_type/costings/001--non-fungible-resource-with-remote-type-registration.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource_with_remote_type/costings/001--non-fungible-resource-with-remote-type-registration.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,           57.47030860011,    100.0%
-- Execution Cost (XRD)                                                     ,               1.02319135,      1.8%
+Total Cost (XRD)                                                           ,           57.47045125011,    100.0%
+- Execution Cost (XRD)                                                     ,                 1.023334,      1.8%
 - Finalization Cost (XRD)                                                  ,                0.1157698,      0.2%
 - Storage Cost (XRD)                                                       ,           56.33134745011,     98.0%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                 20463827,    100.0%
+Execution Cost Breakdown                                                   ,                 20466680,    100.0%
 - AfterInvoke                                                              ,                      474,      0.0%
 - AllocateNodeId                                                           ,                     2328,      0.0%
 - BeforeInvoke                                                             ,                   337732,      1.7%
@@ -39,7 +39,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.2%
 - RunNativeCode::on_virtualize                                             ,                    34520,      0.2%
 - RunNativeCode::publish_wasm_advanced                                     ,                  7772235,     38.0%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.1%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.1%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      774,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource_with_remote_type/costings/002--non-fungible-resource-with-remote-type.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource_with_remote_type/costings/002--non-fungible-resource-with-remote-type.txt
index ed458f6c70..46115a3f35 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource_with_remote_type/costings/002--non-fungible-resource-with-remote-type.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource_with_remote_type/costings/002--non-fungible-resource-with-remote-type.txt
@@ -1,15 +1,15 @@
-Total Cost (XRD)                                                           ,            0.72592866022,    100.0%
-- Execution Cost (XRD)                                                     ,                0.2698015,     37.2%
+Total Cost (XRD)                                                           ,            0.72607131022,    100.0%
+- Execution Cost (XRD)                                                     ,               0.26994415,     37.2%
 - Finalization Cost (XRD)                                                  ,                0.1362648,     18.8%
 - Storage Cost (XRD)                                                       ,            0.31986236022,     44.1%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5396030,    100.0%
+Execution Cost Breakdown                                                   ,                  5398883,    100.0%
 - AfterInvoke                                                              ,                      556,      0.0%
 - AllocateNodeId                                                           ,                     2231,      0.0%
 - BeforeInvoke                                                             ,                     3108,      0.1%
 - CheckReference                                                           ,                    80024,      1.5%
-- CloseSubstate                                                            ,                    35088,      0.7%
+- CloseSubstate                                                            ,                    35088,      0.6%
 - CreateNode                                                               ,                    20448,      0.4%
 - DropNode                                                                 ,                    32027,      0.6%
 - EmitEvent                                                                ,                     2782,      0.1%
@@ -43,7 +43,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::get_non_fungible_local_ids_NonFungibleBucket              ,                    11943,      0.2%
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.8%
 - RunNativeCode::put_NonFungibleVault                                      ,                    35354,      0.7%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.5%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      804,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource_with_remote_type/receipts/001--non-fungible-resource-with-remote-type-registration.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource_with_remote_type/receipts/001--non-fungible-resource-with-remote-type-registration.txt
index cb1d5e38eb..2a0b8e4069 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource_with_remote_type/receipts/001--non-fungible-resource-with-remote-type-registration.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource_with_remote_type/receipts/001--non-fungible-resource-with-remote-type-registration.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 57.47030860011 XRD
-├─ Network execution: 1.02319135 XRD, 20463827 execution cost units
+TRANSACTION COST: 57.47045125011 XRD
+├─ Network execution: 1.023334 XRD, 20466680 execution cost units
 ├─ Network finalization: 0.1157698 XRD, 2315396 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 56.33134745011 XRD
@@ -20,15 +20,15 @@ EVENTS: 5
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("57.47030860011"),
+     amount: Decimal("57.47045125011"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("28.735154300055"),
+     amount: Decimal("28.735225625055"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("28.735154300055"),
+     amount: Decimal("28.735225625055"),
    }
 
 STATE UPDATES: 8 entities
@@ -38,7 +38,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("14.3675771500275"),
+             0u8 => Decimal("14.3676128125275"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -71,7 +71,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999942.52969139989")),
+         LiquidFungibleResource(Decimal("99999999999999942.52954874989")),
        )
 ├─ package_sim1p4lm0y29mmmv8vplavve8he4swd06mvvtux6z6t9phyj63hgejdt2t across 12 partitions
   ├─ Partition(1): 1 change
@@ -294,7 +294,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("28.735154300055")),
+         LiquidFungibleResource(Decimal("28.735225625055")),
        )
 
 OUTPUTS: 3
@@ -305,10 +305,10 @@ OUTPUTS: 3
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -57.47030860011
+   Change: -57.47045125011
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 28.735154300055
+   Change: 28.735225625055
 
 NEW ENTITIES: 2
 └─ Package: package_sim1p4lm0y29mmmv8vplavve8he4swd06mvvtux6z6t9phyj63hgejdt2t
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource_with_remote_type/receipts/002--non-fungible-resource-with-remote-type.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource_with_remote_type/receipts/002--non-fungible-resource-with-remote-type.txt
index f0debccb5f..ef420be04a 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource_with_remote_type/receipts/002--non-fungible-resource-with-remote-type.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource_with_remote_type/receipts/002--non-fungible-resource-with-remote-type.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.72592866022 XRD
-├─ Network execution: 0.2698015 XRD, 5396030 execution cost units
+TRANSACTION COST: 0.72607131022 XRD
+├─ Network execution: 0.26994415 XRD, 5398883 execution cost units
 ├─ Network finalization: 0.1362648 XRD, 2725296 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.31986236022 XRD
@@ -39,15 +39,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.72592866022"),
+     amount: Decimal("0.72607131022"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.36296433011"),
+     amount: Decimal("0.36303565511"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.36296433011"),
+     amount: Decimal("0.36303565511"),
    }
 
 STATE UPDATES: 8 entities
@@ -57,7 +57,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("14.5490593150825"),
+             0u8 => Decimal("14.5491306400825"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -90,7 +90,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999941.80376273967")),
+         LiquidFungibleResource(Decimal("99999999999999941.80347743967")),
        )
 ├─ resource_sim1ngunzdy2nc7jvync9wq32k6q80w59fg0c354vyy048skx79g8kl9x6 across 5 partitions
   ├─ Partition(5): 1 change
@@ -286,7 +286,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("29.098118630165")),
+         LiquidFungibleResource(Decimal("29.098261280165")),
        )
 
 OUTPUTS: 3
@@ -300,13 +300,13 @@ OUTPUTS: 3
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.72592866022
+   Change: -0.72607131022
 ├─ Vault: internal_vault_sim1nz2n08mf56scr8xqfyw8cvwq9228edqm6as0sws7puc4j8tcwn2mpt
    ResAddr: resource_sim1ngunzdy2nc7jvync9wq32k6q80w59fg0c354vyy048skx79g8kl9x6
    Change: +{#1#}, -{}
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.36296433011
+   Change: 0.36303565511
 
 NEW ENTITIES: 1
 └─ Resource: resource_sim1ngunzdy2nc7jvync9wq32k6q80w59fg0c354vyy048skx79g8kl9x6
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource_with_remote_type/scenario_summary.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource_with_remote_type/scenario_summary.txt
index 97e68d4512..7469dfc047 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource_with_remote_type/scenario_summary.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/non_fungible_resource_with_remote_type/scenario_summary.txt
@@ -2,8 +2,8 @@ Name: non_fungible_resource_with_remote_type
 
 == SUMMARY HASHES ==
 These Cuttlefish hashes are permitted to change only until the scenario is deployed to a permanent network, else it can cause divergence.
-State changes: 21dce84c02b3a680 (allowed to change if not deployed to any network)
-Events       : 5b9265bee4e02411 (allowed to change if not deployed to any network)
+State changes: 139726937f7e3450 (allowed to change if not deployed to any network)
+Events       : 0a1e80862c88f4c4 (allowed to change if not deployed to any network)
 
 == INTERESTING ADDRESSES ==
 - package_with_registered_types: package_sim1p4lm0y29mmmv8vplavve8he4swd06mvvtux6z6t9phyj63hgejdt2t
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/001--radiswap-create-new-resources.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/001--radiswap-create-new-resources.txt
index 2929b62062..379ded3a49 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/001--radiswap-create-new-resources.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/001--radiswap-create-new-resources.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            1.62632758577,    100.0%
-- Execution Cost (XRD)                                                     ,               0.33193405,     20.4%
+Total Cost (XRD)                                                           ,            1.62647023577,    100.0%
+- Execution Cost (XRD)                                                     ,                0.3320767,     20.4%
 - Finalization Cost (XRD)                                                  ,               0.41329385,     25.4%
 - Storage Cost (XRD)                                                       ,            0.88109968577,     54.2%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  6638681,    100.0%
+Execution Cost Breakdown                                                   ,                  6641534,    100.0%
 - AfterInvoke                                                              ,                     1712,      0.0%
 - AllocateNodeId                                                           ,                     5723,      0.1%
 - BeforeInvoke                                                             ,                     9534,      0.1%
@@ -42,7 +42,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::on_virtualize                                             ,                    34520,      0.5%
 - RunNativeCode::put_FungibleVault                                         ,                    73662,      1.1%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      1.8%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.4%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.4%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                     1686,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/002--radiswap-create-owner-badge-and-dapp-definition-account.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/002--radiswap-create-owner-badge-and-dapp-definition-account.txt
index 882053a786..9c756e7e91 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/002--radiswap-create-owner-badge-and-dapp-definition-account.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/002--radiswap-create-owner-badge-and-dapp-definition-account.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            1.12200440354,    100.0%
-- Execution Cost (XRD)                                                     ,                0.3436575,     30.6%
+Total Cost (XRD)                                                           ,            1.12214705354,    100.0%
+- Execution Cost (XRD)                                                     ,               0.34380015,     30.6%
 - Finalization Cost (XRD)                                                  ,               0.21777715,     19.4%
 - Storage Cost (XRD)                                                       ,            0.56056975354,     50.0%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  6873150,    100.0%
+Execution Cost Breakdown                                                   ,                  6876003,    100.0%
 - AfterInvoke                                                              ,                      726,      0.0%
 - AllocateNodeId                                                           ,                     3395,      0.0%
 - BeforeInvoke                                                             ,                     5456,      0.1%
@@ -45,7 +45,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::put_NonFungibleVault                                      ,                    35354,      0.5%
 - RunNativeCode::set                                                       ,                   125226,      1.8%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      1.8%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.4%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.4%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                     1057,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/003--radiswap-publish-and-create-pools.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/003--radiswap-publish-and-create-pools.txt
index 2ee956ba43..7f40cf0f18 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/003--radiswap-publish-and-create-pools.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/003--radiswap-publish-and-create-pools.txt
@@ -1,16 +1,16 @@
-Total Cost (XRD)                                                           ,           59.02674408717,    100.0%
-- Execution Cost (XRD)                                                     ,               1.42194085,      2.4%
+Total Cost (XRD)                                                           ,           59.02884073717,    100.0%
+- Execution Cost (XRD)                                                     ,                1.4240375,      2.4%
 - Finalization Cost (XRD)                                                  ,                0.4588272,      0.8%
 - Storage Cost (XRD)                                                       ,           57.14597603717,     96.8%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                 28438817,    100.0%
+Execution Cost Breakdown                                                   ,                 28480750,    100.0%
 - AfterInvoke                                                              ,                     2492,      0.0%
 - AllocateNodeId                                                           ,                     9409,      0.0%
 - BeforeInvoke                                                             ,                   347642,      1.2%
 - CheckReference                                                           ,                   200075,      0.7%
 - CloseSubstate                                                            ,                   104103,      0.4%
-- CreateNode                                                               ,                   924410,      3.3%
+- CreateNode                                                               ,                   924410,      3.2%
 - DropNode                                                                 ,                   121164,      0.4%
 - EmitEvent                                                                ,                     8480,      0.0%
 - GetOwnedNodes                                                            ,                     1000,      0.0%
@@ -51,9 +51,9 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::put_FungibleVault                                         ,                    24554,      0.1%
 - RunNativeCode::take_FungibleVault                                        ,                    42457,      0.1%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      0.4%
-- RunWasmCode::Faucet_free                                                 ,                    34815,      0.1%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.1%
-- RunWasmCode::Radiswap_new                                                ,                   229606,      0.8%
+- RunWasmCode::Faucet_free                                                 ,                    39243,      0.1%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.1%
+- RunWasmCode::Radiswap_new                                                ,                   264258,      0.9%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                     2917,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/004--radiswap-add-liquidity.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/004--radiswap-add-liquidity.txt
index 76501f4fb2..138ea39ba4 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/004--radiswap-add-liquidity.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/004--radiswap-add-liquidity.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            1.29214966567,    100.0%
-- Execution Cost (XRD)                                                     ,                0.7885356,     61.0%
+Total Cost (XRD)                                                           ,            1.29319081567,    100.0%
+- Execution Cost (XRD)                                                     ,               0.78957675,     61.1%
 - Finalization Cost (XRD)                                                  ,               0.10602725,      8.2%
-- Storage Cost (XRD)                                                       ,            0.39758681567,     30.8%
+- Storage Cost (XRD)                                                       ,            0.39758681567,     30.7%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                 15770712,    100.0%
+Execution Cost Breakdown                                                   ,                 15791535,    100.0%
 - AfterInvoke                                                              ,                     3932,      0.0%
 - AllocateNodeId                                                           ,                     9603,      0.1%
 - BeforeInvoke                                                             ,                    10406,      0.1%
@@ -20,7 +20,7 @@ Execution Cost Breakdown                                                   ,
 - OpenSubstate::GlobalFungibleResourceManager                              ,                  1028596,      6.5%
 - OpenSubstate::GlobalGenericComponent                                     ,                   135757,      0.9%
 - OpenSubstate::GlobalPackage                                              ,                  4405038,     27.9%
-- OpenSubstate::GlobalPreallocatedSecp256k1Account                         ,                  1065784,      6.8%
+- OpenSubstate::GlobalPreallocatedSecp256k1Account                         ,                  1065784,      6.7%
 - OpenSubstate::GlobalTwoResourcePool                                      ,                   653312,      4.1%
 - OpenSubstate::InternalFungibleVault                                      ,                   725060,      4.6%
 - OpenSubstate::InternalGenericComponent                                   ,                   400119,      2.5%
@@ -49,9 +49,9 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::take_advanced_FungibleBucket                              ,                    93100,      0.6%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      0.8%
 - RunNativeCode::withdraw                                                  ,                   173553,      1.1%
-- RunWasmCode::Faucet_free                                                 ,                    34815,      0.2%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.2%
-- RunWasmCode::Radiswap_add_liquidity                                      ,                   101406,      0.6%
+- RunWasmCode::Faucet_free                                                 ,                    39243,      0.2%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.2%
+- RunWasmCode::Radiswap_add_liquidity                                      ,                   114948,      0.7%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    39200,      0.2%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/005--radiswap-distribute-tokens.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/005--radiswap-distribute-tokens.txt
index bc72d74dcc..ee899a48b7 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/005--radiswap-distribute-tokens.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/005--radiswap-distribute-tokens.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            3.42739163564,    100.0%
-- Execution Cost (XRD)                                                     ,               1.14335665,     33.4%
+Total Cost (XRD)                                                           ,            3.42775568564,    100.0%
+- Execution Cost (XRD)                                                     ,                1.1437207,     33.4%
 - Finalization Cost (XRD)                                                  ,               0.43886595,     12.8%
 - Storage Cost (XRD)                                                       ,            1.84516903564,     53.8%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                 22867133,    100.0%
+Execution Cost Breakdown                                                   ,                 22874414,    100.0%
 - AfterInvoke                                                              ,                     8528,      0.0%
 - AllocateNodeId                                                           ,                    21631,      0.1%
 - BeforeInvoke                                                             ,                    23866,      0.1%
@@ -47,8 +47,8 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::take_FungibleVault                                        ,                   806683,      3.5%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   485028,      2.1%
 - RunNativeCode::withdraw                                                  ,                  1041318,      4.6%
-- RunWasmCode::Faucet_free                                                 ,                    34815,      0.2%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.1%
+- RunWasmCode::Faucet_free                                                 ,                    39243,      0.2%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.1%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                     1113,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/006--radiswap-swap-tokens.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/006--radiswap-swap-tokens.txt
index 9765312fcc..18a595f0bb 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/006--radiswap-swap-tokens.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/006--radiswap-swap-tokens.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.60013484589,    100.0%
-- Execution Cost (XRD)                                                     ,                0.4173805,     69.5%
-- Finalization Cost (XRD)                                                  ,               0.03750975,      6.3%
+Total Cost (XRD)                                                           ,            0.60090454589,    100.0%
+- Execution Cost (XRD)                                                     ,                0.4181502,     69.6%
+- Finalization Cost (XRD)                                                  ,               0.03750975,      6.2%
 - Storage Cost (XRD)                                                       ,            0.14524459589,     24.2%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  8347610,    100.0%
+Execution Cost Breakdown                                                   ,                  8363004,    100.0%
 - AfterInvoke                                                              ,                     1432,      0.0%
 - AllocateNodeId                                                           ,                     3298,      0.0%
 - BeforeInvoke                                                             ,                     3698,      0.0%
@@ -18,10 +18,10 @@ Execution Cost Breakdown                                                   ,
 - MarkSubstateAsTransient                                                  ,                      165,      0.0%
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   339206,      4.1%
 - OpenSubstate::GlobalGenericComponent                                     ,                    87882,      1.1%
-- OpenSubstate::GlobalPackage                                              ,                  2992927,     35.9%
-- OpenSubstate::GlobalPreallocatedSecp256k1Account                         ,                   530957,      6.4%
+- OpenSubstate::GlobalPackage                                              ,                  2992927,     35.8%
+- OpenSubstate::GlobalPreallocatedSecp256k1Account                         ,                   530957,      6.3%
 - OpenSubstate::GlobalTwoResourcePool                                      ,                   657608,      7.9%
-- OpenSubstate::InternalFungibleVault                                      ,                   438878,      5.3%
+- OpenSubstate::InternalFungibleVault                                      ,                   438878,      5.2%
 - OpenSubstate::InternalGenericComponent                                   ,                   125725,      1.5%
 - OpenSubstate::InternalKeyValueStore                                      ,                    40536,      0.5%
 - PinNode                                                                  ,                      408,      0.0%
@@ -42,10 +42,10 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::put_FungibleVault                                         ,                    49108,      0.6%
 - RunNativeCode::take_FungibleVault                                        ,                    42457,      0.5%
 - RunNativeCode::take_advanced_FungibleVault                               ,                    44567,      0.5%
-- RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      1.5%
+- RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      1.4%
 - RunNativeCode::withdraw                                                  ,                    57851,      0.7%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.3%
-- RunWasmCode::Radiswap_swap                                               ,                    95093,      1.1%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.3%
+- RunWasmCode::Radiswap_swap                                               ,                   107634,      1.3%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    22200,      0.3%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/007--radiswap-remove-tokens.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/007--radiswap-remove-tokens.txt
index ad31b8d240..ae9a40f8de 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/007--radiswap-remove-tokens.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/007--radiswap-remove-tokens.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,             0.6665682726,    100.0%
-- Execution Cost (XRD)                                                     ,               0.44498675,     66.8%
+Total Cost (XRD)                                                           ,             0.6670722226,    100.0%
+- Execution Cost (XRD)                                                     ,                0.4454907,     66.8%
 - Finalization Cost (XRD)                                                  ,                0.0480128,      7.2%
 - Storage Cost (XRD)                                                       ,             0.1735687226,     26.0%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  8899735,    100.0%
+Execution Cost Breakdown                                                   ,                  8909814,    100.0%
 - AfterInvoke                                                              ,                     1654,      0.0%
 - AllocateNodeId                                                           ,                     3977,      0.0%
 - BeforeInvoke                                                             ,                     4284,      0.0%
@@ -43,9 +43,9 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::redeem_two_resource_pool                                  ,                   135373,      1.5%
 - RunNativeCode::take_FungibleVault                                        ,                   127371,      1.4%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      1.4%
-- RunNativeCode::withdraw                                                  ,                    57851,      0.7%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.3%
-- RunWasmCode::Radiswap_remove_liquidity                                   ,                    53469,      0.6%
+- RunNativeCode::withdraw                                                  ,                    57851,      0.6%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.3%
+- RunWasmCode::Radiswap_remove_liquidity                                   ,                    60695,      0.7%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    22680,      0.3%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/008--radiswap-set-two-way-linking.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/008--radiswap-set-two-way-linking.txt
index 044987e639..0df39447d6 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/008--radiswap-set-two-way-linking.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/costings/008--radiswap-set-two-way-linking.txt
@@ -1,14 +1,14 @@
-Total Cost (XRD)                                                           ,            1.82107864961,    100.0%
-- Execution Cost (XRD)                                                     ,                0.6531704,     35.9%
+Total Cost (XRD)                                                           ,            1.82122129961,    100.0%
+- Execution Cost (XRD)                                                     ,               0.65331305,     35.9%
 - Finalization Cost (XRD)                                                  ,                0.1830488,     10.1%
 - Storage Cost (XRD)                                                       ,            0.98485944961,     54.1%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                 13063408,    100.0%
+Execution Cost Breakdown                                                   ,                 13066261,    100.0%
 - AfterInvoke                                                              ,                     1212,      0.0%
 - AllocateNodeId                                                           ,                     7081,      0.1%
 - BeforeInvoke                                                             ,                    11868,      0.1%
-- CheckReference                                                           ,                   320115,      2.5%
+- CheckReference                                                           ,                   320115,      2.4%
 - CloseSubstate                                                            ,                   140481,      1.1%
 - CreateNode                                                               ,                    62852,      0.5%
 - DropNode                                                                 ,                   113003,      0.9%
@@ -42,7 +42,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::on_move_NonFungibleProof                                  ,                    17108,      0.1%
 - RunNativeCode::set                                                       ,                   647001,      5.0%
 - RunNativeCode::unlock_non_fungibles_NonFungibleVault                     ,                    34403,      0.3%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.2%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.2%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      151,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/001--radiswap-create-new-resources.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/001--radiswap-create-new-resources.txt
index c1198c9236..1d69dab417 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/001--radiswap-create-new-resources.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/001--radiswap-create-new-resources.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 1.62632758577 XRD
-├─ Network execution: 0.33193405 XRD, 6638681 execution cost units
+TRANSACTION COST: 1.62647023577 XRD
+├─ Network execution: 0.3320767 XRD, 6641534 execution cost units
 ├─ Network finalization: 0.41329385 XRD, 8265877 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.88109968577 XRD
@@ -67,15 +67,15 @@ EVENTS: 16
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("1.62632758577"),
+     amount: Decimal("1.62647023577"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.813163792885"),
+     amount: Decimal("0.813235117885"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.813163792885"),
+     amount: Decimal("0.813235117885"),
    }
 
 STATE UPDATES: 12 entities
@@ -85,7 +85,7 @@ STATE UPDATES: 12 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.4065818964425"),
+             0u8 => Decimal("0.4066175589425"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -118,7 +118,7 @@ STATE UPDATES: 12 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999998.37367241423")),
+         LiquidFungibleResource(Decimal("99999999999999998.37352976423")),
        )
 ├─ resource_sim1t5jlu5a523le5q26rclvu9agrr6yjw9783u58fz883gd4s3f47dg6p across 5 partitions
   ├─ Partition(2): 6 changes
@@ -747,7 +747,7 @@ STATE UPDATES: 12 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.813163792885")),
+         LiquidFungibleResource(Decimal("0.813235117885")),
        )
 
 OUTPUTS: 5
@@ -769,7 +769,7 @@ OUTPUTS: 5
 BALANCE CHANGES: 5
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -1.62632758577
+   Change: -1.62647023577
 ├─ Vault: internal_vault_sim1trjn2fuhqfhkgev8037gydh5gqgwqsfqr4usr0scxm6ledxt343tc4
    ResAddr: resource_sim1t5jlu5a523le5q26rclvu9agrr6yjw9783u58fz883gd4s3f47dg6p
    Change: 100000000000
@@ -781,7 +781,7 @@ BALANCE CHANGES: 5
    Change: 100000000000
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.813163792885
+   Change: 0.813235117885
 
 NEW ENTITIES: 4
 └─ Component: account_sim168qgdkgfqxpnswu38wy6fy5v0q0um52zd0umuely5t9xrf88t3unc0
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/002--radiswap-create-owner-badge-and-dapp-definition-account.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/002--radiswap-create-owner-badge-and-dapp-definition-account.txt
index 5df1c5058c..857adb71dc 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/002--radiswap-create-owner-badge-and-dapp-definition-account.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/002--radiswap-create-owner-badge-and-dapp-definition-account.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 1.12200440354 XRD
-├─ Network execution: 0.3436575 XRD, 6873150 execution cost units
+TRANSACTION COST: 1.12214705354 XRD
+├─ Network execution: 0.34380015 XRD, 6876003 execution cost units
 ├─ Network finalization: 0.21777715 XRD, 4355543 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.56056975354 XRD
@@ -87,15 +87,15 @@ EVENTS: 14
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("1.12200440354"),
+     amount: Decimal("1.12214705354"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.56100220177"),
+     amount: Decimal("0.56107352677"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.56100220177"),
+     amount: Decimal("0.56107352677"),
    }
 
 STATE UPDATES: 8 entities
@@ -105,7 +105,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.6870829973275"),
+             0u8 => Decimal("0.6871543223275"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -138,7 +138,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999997.25166801069")),
+         LiquidFungibleResource(Decimal("99999999999999997.25138271069")),
        )
 ├─ resource_sim1ngtf8aw0v8l0wsy0clun8j7wggkmdy5gc7zhyrdy0m4sw98zny9y7n across 7 partitions
   ├─ Partition(1): 1 change
@@ -494,7 +494,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("1.374165994655")),
+         LiquidFungibleResource(Decimal("1.374308644655")),
        )
 
 OUTPUTS: 9
@@ -514,13 +514,13 @@ OUTPUTS: 9
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -1.12200440354
+   Change: -1.12214705354
 ├─ Vault: internal_vault_sim1nq62dyu2curupg4unfaytkchtc9q70lg7ckfje4nxthrzpan8fsqtu
    ResAddr: resource_sim1ngtf8aw0v8l0wsy0clun8j7wggkmdy5gc7zhyrdy0m4sw98zny9y7n
    Change: +{#1#}, -{}
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.56100220177
+   Change: 0.56107352677
 
 NEW ENTITIES: 2
 └─ Component: account_sim129uea6ms5wjstpze559am5ddw293cr2nxeqrha4ae4536dlw5x8whd
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/003--radiswap-publish-and-create-pools.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/003--radiswap-publish-and-create-pools.txt
index 93ab6ec3f0..80fab85b0a 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/003--radiswap-publish-and-create-pools.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/003--radiswap-publish-and-create-pools.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 59.02674408717 XRD
-├─ Network execution: 1.42194085 XRD, 28438817 execution cost units
+TRANSACTION COST: 59.02884073717 XRD
+├─ Network execution: 1.4240375 XRD, 28480750 execution cost units
 ├─ Network finalization: 0.4588272 XRD, 9176544 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 57.14597603717 XRD
@@ -101,15 +101,15 @@ EVENTS: 17
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("59.02674408717"),
+     amount: Decimal("59.02884073717"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("29.513372043585"),
+     amount: Decimal("29.514420368585"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("29.513372043585"),
+     amount: Decimal("29.514420368585"),
    }
 
 STATE UPDATES: 22 entities
@@ -119,7 +119,7 @@ STATE UPDATES: 22 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("15.44376901912"),
+             0u8 => Decimal("15.44436450662"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -152,7 +152,7 @@ STATE UPDATES: 22 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999989938.22492392352")),
+         LiquidFungibleResource(Decimal("99999999999989938.22254197352")),
        )
 ├─ internal_keyvaluestore_sim1krn7clzr3qmq2zhwr77mdenksxswf00yeh8tn3vyzesg4kr3p54gv8 across 1 partitions
   └─ Partition(64): 1 change
@@ -1175,7 +1175,7 @@ STATE UPDATES: 22 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("30.88753803824")),
+         LiquidFungibleResource(Decimal("30.88872901324")),
        )
 
 OUTPUTS: 7
@@ -1190,13 +1190,13 @@ OUTPUTS: 7
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -10059.02674408717
+   Change: -10059.02884073717
 ├─ Vault: internal_vault_sim1tr4r3rur7229t56xpcz0s2cakhxydhjv44pmhu7gf5xkyws0jdzwya
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
    Change: 10000
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 29.513372043585
+   Change: 29.514420368585
 
 NEW ENTITIES: 7
 └─ Package: package_sim1p5wscdljf6s7yc0v5u9kjfaqmxk4ccqugvqfd58aazyrlk89u0dgsn
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/004--radiswap-add-liquidity.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/004--radiswap-add-liquidity.txt
index 4e8de5df0e..75f69f1509 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/004--radiswap-add-liquidity.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/004--radiswap-add-liquidity.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 1.29214966567 XRD
-├─ Network execution: 0.7885356 XRD, 15770712 execution cost units
+TRANSACTION COST: 1.29319081567 XRD
+├─ Network execution: 0.78957675 XRD, 15791535 execution cost units
 ├─ Network finalization: 0.10602725 XRD, 2120545 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.39758681567 XRD
@@ -139,15 +139,15 @@ EVENTS: 27
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("1.29214966567"),
+     amount: Decimal("1.29319081567"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.646074832835"),
+     amount: Decimal("0.646595407835"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.646074832835"),
+     amount: Decimal("0.646595407835"),
    }
 
 STATE UPDATES: 20 entities
@@ -157,7 +157,7 @@ STATE UPDATES: 20 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("15.7668064355375"),
+             0u8 => Decimal("15.7676622105375"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -202,7 +202,7 @@ STATE UPDATES: 20 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999979936.93277425785")),
+         LiquidFungibleResource(Decimal("99999999999979936.92935115785")),
        )
 ├─ internal_keyvaluestore_sim1krn7clzr3qmq2zhwr77mdenksxswf00yeh8tn3vyzesg4kr3p54gv8 across 1 partitions
   └─ Partition(64): 1 change
@@ -334,7 +334,7 @@ STATE UPDATES: 20 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("31.533612871075")),
+         LiquidFungibleResource(Decimal("31.535324421075")),
        )
 
 OUTPUTS: 12
@@ -360,7 +360,7 @@ OUTPUTS: 12
 BALANCE CHANGES: 11
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -10001.29214966567
+   Change: -10001.29319081567
 ├─ Vault: internal_vault_sim1trjn2fuhqfhkgev8037gydh5gqgwqsfqr4usr0scxm6ledxt343tc4
    ResAddr: resource_sim1t5jlu5a523le5q26rclvu9agrr6yjw9783u58fz883gd4s3f47dg6p
    Change: -7000
@@ -390,6 +390,6 @@ BALANCE CHANGES: 11
    Change: 6324.555320336758663998
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.646074832835
+   Change: 0.646595407835
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/005--radiswap-distribute-tokens.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/005--radiswap-distribute-tokens.txt
index b8a2fb245b..bec6386088 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/005--radiswap-distribute-tokens.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/005--radiswap-distribute-tokens.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 3.42739163564 XRD
-├─ Network execution: 1.14335665 XRD, 22867133 execution cost units
+TRANSACTION COST: 3.42775568564 XRD
+├─ Network execution: 1.1437207 XRD, 22874414 execution cost units
 ├─ Network finalization: 0.43886595 XRD, 8777319 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 1.84516903564 XRD
@@ -429,15 +429,15 @@ EVENTS: 98
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("3.42739163564"),
+     amount: Decimal("3.42775568564"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("1.71369581782"),
+     amount: Decimal("1.71387784282"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("1.71369581782"),
+     amount: Decimal("1.71387784282"),
    }
 
 STATE UPDATES: 34 entities
@@ -447,7 +447,7 @@ STATE UPDATES: 34 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("16.6236543444475"),
+             0u8 => Decimal("16.6246011319475"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -480,7 +480,7 @@ STATE UPDATES: 34 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999969933.50538262221")),
+         LiquidFungibleResource(Decimal("99999999999969933.50159547221")),
        )
 ├─ internal_keyvaluestore_sim1krn7clzr3qmq2zhwr77mdenksxswf00yeh8tn3vyzesg4kr3p54gv8 across 1 partitions
   └─ Partition(64): 1 change
@@ -1434,7 +1434,7 @@ STATE UPDATES: 34 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("33.247308688895")),
+         LiquidFungibleResource(Decimal("33.249202263895")),
        )
 
 OUTPUTS: 24
@@ -1466,7 +1466,7 @@ OUTPUTS: 24
 BALANCE CHANGES: 26
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -10003.42739163564
+   Change: -10003.42775568564
 ├─ Vault: internal_vault_sim1tzqt799quvgq2ddm4253zqupswy9ekqn7fmm6szn7z47rsxfv685g6
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
    Change: 9001
@@ -1541,7 +1541,7 @@ BALANCE CHANGES: 26
    Change: 333
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 1.71369581782
+   Change: 1.71387784282
 
 NEW ENTITIES: 3
 ├─ Component: account_sim168j3paqgngj74yzaljq4n422rtsmupaec3wnqq5425fd85cnd8xmdz
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/006--radiswap-swap-tokens.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/006--radiswap-swap-tokens.txt
index b201c8685e..52fac233f4 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/006--radiswap-swap-tokens.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/006--radiswap-swap-tokens.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.60013484589 XRD
-├─ Network execution: 0.4173805 XRD, 8347610 execution cost units
+TRANSACTION COST: 0.60090454589 XRD
+├─ Network execution: 0.4181502 XRD, 8363004 execution cost units
 ├─ Network finalization: 0.03750975 XRD, 750195 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.14524459589 XRD
@@ -63,15 +63,15 @@ EVENTS: 13
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.60013484589"),
+     amount: Decimal("0.60090454589"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.300067422945"),
+     amount: Decimal("0.300452272945"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.300067422945"),
+     amount: Decimal("0.300452272945"),
    }
 
 STATE UPDATES: 10 entities
@@ -81,7 +81,7 @@ STATE UPDATES: 10 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("16.77368805592"),
+             0u8 => Decimal("16.77482726842"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -120,7 +120,7 @@ STATE UPDATES: 10 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999969932.90524777632")),
+         LiquidFungibleResource(Decimal("99999999999969932.90069092632")),
        )
 ├─ internal_vault_sim1tq3ux37tj8mw4yx26j2uv0r0qxkdlcy0uhs0n6e2tjle20uk8pm2np across 1 partitions
   └─ Partition(64): 1 change
@@ -150,7 +150,7 @@ STATE UPDATES: 10 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("33.54737611184")),
+         LiquidFungibleResource(Decimal("33.54965453684")),
        )
 
 OUTPUTS: 5
@@ -163,7 +163,7 @@ OUTPUTS: 5
 BALANCE CHANGES: 6
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.60013484589
+   Change: -0.60090454589
 ├─ Vault: internal_vault_sim1tq3ux37tj8mw4yx26j2uv0r0qxkdlcy0uhs0n6e2tjle20uk8pm2np
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
    Change: -100
@@ -178,6 +178,6 @@ BALANCE CHANGES: 6
    Change: 69.30693069306930693
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.300067422945
+   Change: 0.300452272945
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/007--radiswap-remove-tokens.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/007--radiswap-remove-tokens.txt
index 3d4f312efe..5fab07185a 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/007--radiswap-remove-tokens.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/007--radiswap-remove-tokens.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.6665682726 XRD
-├─ Network execution: 0.44498675 XRD, 8899735 execution cost units
+TRANSACTION COST: 0.6670722226 XRD
+├─ Network execution: 0.4454907 XRD, 8909814 execution cost units
 ├─ Network finalization: 0.0480128 XRD, 960256 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.1735687226 XRD
@@ -77,15 +77,15 @@ EVENTS: 15
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.6665682726"),
+     amount: Decimal("0.6670722226"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.3332841363"),
+     amount: Decimal("0.3335361113"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.3332841363"),
+     amount: Decimal("0.3335361113"),
    }
 
 STATE UPDATES: 12 entities
@@ -95,7 +95,7 @@ STATE UPDATES: 12 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("16.94033012407"),
+             0u8 => Decimal("16.94159532407"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -140,7 +140,7 @@ STATE UPDATES: 12 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999969932.23867950372")),
+         LiquidFungibleResource(Decimal("99999999999969932.23361870372")),
        )
 ├─ internal_vault_sim1tp7shj4lnak2yuvqn5nr634kf354ddz0un56qsxl68j32aku5crjeu across 1 partitions
   └─ Partition(64): 1 change
@@ -176,7 +176,7 @@ STATE UPDATES: 12 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("33.88066024814")),
+         LiquidFungibleResource(Decimal("33.88319064814")),
        )
 
 OUTPUTS: 5
@@ -192,7 +192,7 @@ OUTPUTS: 5
 BALANCE CHANGES: 7
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.6665682726
+   Change: -0.6670722226
 ├─ Vault: internal_vault_sim1tp7shj4lnak2yuvqn5nr634kf354ddz0un56qsxl68j32aku5crjeu
    ResAddr: resource_sim1t5d6cc8v4sdv4wlwzf2qngh74028lumvd2ftes7tq7vnass85ap5m5
    Change: -100
@@ -210,6 +210,6 @@ BALANCE CHANGES: 7
    Change: 82.837626389512430492
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.3332841363
+   Change: 0.3335361113
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/008--radiswap-set-two-way-linking.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/008--radiswap-set-two-way-linking.txt
index ebd43bdb2d..484afd8a33 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/008--radiswap-set-two-way-linking.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/receipts/008--radiswap-set-two-way-linking.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 1.82107864961 XRD
-├─ Network execution: 0.6531704 XRD, 13063408 execution cost units
+TRANSACTION COST: 1.82122129961 XRD
+├─ Network execution: 0.65331305 XRD, 13066261 execution cost units
 ├─ Network finalization: 0.1830488 XRD, 3660976 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.98485944961 XRD
@@ -274,15 +274,15 @@ EVENTS: 35
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("1.82107864961"),
+     amount: Decimal("1.82122129961"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.910539324805"),
+     amount: Decimal("0.910610649805"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.910539324805"),
+     amount: Decimal("0.910610649805"),
    }
 
 STATE UPDATES: 13 entities
@@ -292,7 +292,7 @@ STATE UPDATES: 13 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("17.3955997864725"),
+             0u8 => Decimal("17.3969006489725"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -551,7 +551,7 @@ STATE UPDATES: 13 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999969930.41760085411")),
+         LiquidFungibleResource(Decimal("99999999999969930.41239740411")),
        )
 ├─ account_sim129uea6ms5wjstpze559am5ddw293cr2nxeqrha4ae4536dlw5x8whd across 1 partitions
   └─ Partition(2): 1 change
@@ -583,7 +583,7 @@ STATE UPDATES: 13 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("34.791199572945")),
+         LiquidFungibleResource(Decimal("34.793801297945")),
        )
 
 OUTPUTS: 33
@@ -624,9 +624,9 @@ OUTPUTS: 33
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -1.82107864961
+   Change: -1.82122129961
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.910539324805
+   Change: 0.910610649805
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/scenario_summary.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/scenario_summary.txt
index 404115cf91..f9ea13db25 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/scenario_summary.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/radiswap/scenario_summary.txt
@@ -2,8 +2,8 @@ Name: radiswap
 
 == SUMMARY HASHES ==
 These Cuttlefish hashes are permitted to change only until the scenario is deployed to a permanent network, else it can cause divergence.
-State changes: c88cfb41d5471d30 (allowed to change if not deployed to any network)
-Events       : 3e9f329a2e6a484a (allowed to change if not deployed to any network)
+State changes: 70dfe1467a69ef50 (allowed to change if not deployed to any network)
+Events       : 0d5dc610bf05b425 (allowed to change if not deployed to any network)
 
 == INTERESTING ADDRESSES ==
 - radiswap_dapp_definition_account: account_sim129uea6ms5wjstpze559am5ddw293cr2nxeqrha4ae4536dlw5x8whd
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/costings/001--royalties--publish-package.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/costings/001--royalties--publish-package.txt
index 1229b5c706..688b0fb4f3 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/costings/001--royalties--publish-package.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/costings/001--royalties--publish-package.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,           31.47003411469,    100.0%
-- Execution Cost (XRD)                                                     ,                0.6181983,      2.0%
+Total Cost (XRD)                                                           ,           31.47017676469,    100.0%
+- Execution Cost (XRD)                                                     ,               0.61834095,      2.0%
 - Finalization Cost (XRD)                                                  ,                0.0783874,      0.2%
 - Storage Cost (XRD)                                                       ,           30.77344841469,     97.8%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                 12363966,    100.0%
+Execution Cost Breakdown                                                   ,                 12366819,    100.0%
 - AfterInvoke                                                              ,                      326,      0.0%
 - AllocateNodeId                                                           ,                     1552,      0.0%
 - BeforeInvoke                                                             ,                   182304,      1.5%
@@ -36,7 +36,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.1%
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.4%
 - RunNativeCode::publish_wasm_advanced                                     ,                  4351685,     35.2%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.2%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.2%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      403,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/costings/002--royalties--instantiate-components.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/costings/002--royalties--instantiate-components.txt
index 7445dea1a5..d25372dde1 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/costings/002--royalties--instantiate-components.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/costings/002--royalties--instantiate-components.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,             1.0449135481,    100.0%
-- Execution Cost (XRD)                                                     ,               0.36352375,     34.8%
-- Finalization Cost (XRD)                                                  ,                0.2360239,     22.6%
-- Storage Cost (XRD)                                                       ,             0.4453658981,     42.6%
+Total Cost (XRD)                                                           ,             1.0469976481,    100.0%
+- Execution Cost (XRD)                                                     ,               0.36560785,     34.9%
+- Finalization Cost (XRD)                                                  ,                0.2360239,     22.5%
+- Storage Cost (XRD)                                                       ,             0.4453658981,     42.5%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  7270475,    100.0%
+Execution Cost Breakdown                                                   ,                  7312157,    100.0%
 - AfterInvoke                                                              ,                     1030,      0.0%
 - AllocateNodeId                                                           ,                     4074,      0.1%
 - BeforeInvoke                                                             ,                     4174,      0.1%
@@ -19,24 +19,24 @@ Execution Cost Breakdown                                                   ,
 - MoveModule                                                               ,                    11760,      0.2%
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   136104,      1.9%
 - OpenSubstate::GlobalGenericComponent                                     ,                    46666,      0.6%
-- OpenSubstate::GlobalPackage                                              ,                  3403443,     46.8%
+- OpenSubstate::GlobalPackage                                              ,                  3403443,     46.5%
 - OpenSubstate::InternalFungibleVault                                      ,                    95017,      1.3%
 - OpenSubstate::InternalGenericComponent                                   ,                    42997,      0.6%
 - OpenSubstate::InternalKeyValueStore                                      ,                    40536,      0.6%
 - PinNode                                                                  ,                      396,      0.0%
-- PrepareWasmCode                                                          ,                  1188958,     16.4%
+- PrepareWasmCode                                                          ,                  1188958,     16.3%
 - QueryActor                                                               ,                     2500,      0.0%
 - QueryCostingModule                                                       ,                     1500,      0.0%
 - QueryFeeReserve                                                          ,                     1500,      0.0%
-- ReadSubstate                                                             ,                  1315744,     18.1%
+- ReadSubstate                                                             ,                  1315744,     18.0%
 - RunNativeCode::Worktop_drop                                              ,                    17918,      0.2%
 - RunNativeCode::create                                                    ,                   154473,      2.1%
 - RunNativeCode::create_empty_vault_FungibleResourceManager                ,                   106710,      1.5%
 - RunNativeCode::create_with_data                                          ,                    82413,      1.1%
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.2%
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.6%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.3%
-- RunWasmCode::RoyaltiesBp_new                                             ,                   286473,      3.9%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.4%
+- RunWasmCode::RoyaltiesBp_new                                             ,                   325302,      4.4%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                     1245,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/costings/003--royalties--set-components-royalty.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/costings/003--royalties--set-components-royalty.txt
index 39ab8ed592..2696cdd3e4 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/costings/003--royalties--set-components-royalty.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/costings/003--royalties--set-components-royalty.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.35937313381,    100.0%
-- Execution Cost (XRD)                                                     ,                0.1832873,     51.0%
+Total Cost (XRD)                                                           ,            0.35951578381,    100.0%
+- Execution Cost (XRD)                                                     ,               0.18342995,     51.0%
 - Finalization Cost (XRD)                                                  ,                0.0552553,     15.4%
 - Storage Cost (XRD)                                                       ,            0.12083053381,     33.6%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  3665746,    100.0%
+Execution Cost Breakdown                                                   ,                  3668599,    100.0%
 - AfterInvoke                                                              ,                      124,      0.0%
 - AllocateNodeId                                                           ,                     1455,      0.0%
 - BeforeInvoke                                                             ,                     2254,      0.1%
@@ -23,7 +23,7 @@ Execution Cost Breakdown                                                   ,
 - OpenSubstate::InternalGenericComponent                                   ,                    18682,      0.5%
 - OpenSubstate::InternalKeyValueStore                                      ,                    40536,      1.1%
 - PinNode                                                                  ,                      180,      0.0%
-- PrepareWasmCode                                                          ,                   353866,      9.7%
+- PrepareWasmCode                                                          ,                   353866,      9.6%
 - QueryActor                                                               ,                     1000,      0.0%
 - QueryCostingModule                                                       ,                     4500,      0.1%
 - QueryFeeReserve                                                          ,                     4500,      0.1%
@@ -32,7 +32,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.4%
 - RunNativeCode::lock_fee                                                  ,                    45243,      1.2%
 - RunNativeCode::set_royalty                                               ,                   153756,      4.2%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.7%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.7%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    45680,      1.2%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/costings/004--royalties--call_all_components_all_methods.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/costings/004--royalties--call_all_components_all_methods.txt
index 16d3fe3a1b..c369fc512b 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/costings/004--royalties--call_all_components_all_methods.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/costings/004--royalties--call_all_components_all_methods.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,   347.667634537889999992,    100.0%
-- Execution Cost (XRD)                                                     ,                0.5693587,      0.2%
+Total Cost (XRD)                                                           ,   347.667976087889999992,    100.0%
+- Execution Cost (XRD)                                                     ,               0.56970025,      0.2%
 - Finalization Cost (XRD)                                                  ,                0.0102517,      0.0%
 - Storage Cost (XRD)                                                       ,            0.08802413789,      0.0%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,   346.999999999999999992,     99.8%
-Execution Cost Breakdown                                                   ,                 11387174,    100.0%
+Execution Cost Breakdown                                                   ,                 11394005,    100.0%
 - AfterInvoke                                                              ,                      124,      0.0%
 - AllocateNodeId                                                           ,                     1455,      0.0%
 - BeforeInvoke                                                             ,                     1666,      0.0%
@@ -25,14 +25,14 @@ Execution Cost Breakdown                                                   ,
 - PinNode                                                                  ,                      180,      0.0%
 - PrepareWasmCode                                                          ,                  2859142,     25.1%
 - QueryActor                                                               ,                     1000,      0.0%
-- ReadSubstate                                                             ,                  2955944,     26.0%
+- ReadSubstate                                                             ,                  2955944,     25.9%
 - RunNativeCode::Worktop_drop                                              ,                    17918,      0.2%
 - RunNativeCode::get_amount_FungibleVault                                  ,                    14451,      0.1%
 - RunNativeCode::lock_fee                                                  ,                    45243,      0.4%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.2%
-- RunWasmCode::RoyaltiesBp_method_with_no_package_royalty                  ,                    23736,      0.2%
-- RunWasmCode::RoyaltiesBp_method_with_usd_package_royalty                 ,                    23736,      0.2%
-- RunWasmCode::RoyaltiesBp_method_with_xrd_package_royalty                 ,                    23736,      0.2%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.2%
+- RunWasmCode::RoyaltiesBp_method_with_no_package_royalty                  ,                    25062,      0.2%
+- RunWasmCode::RoyaltiesBp_method_with_usd_package_royalty                 ,                    25062,      0.2%
+- RunWasmCode::RoyaltiesBp_method_with_xrd_package_royalty                 ,                    25062,      0.2%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    33920,      0.3%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/receipts/001--royalties--publish-package.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/receipts/001--royalties--publish-package.txt
index 993eada3ea..39a5b258da 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/receipts/001--royalties--publish-package.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/receipts/001--royalties--publish-package.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 31.47003411469 XRD
-├─ Network execution: 0.6181983 XRD, 12363966 execution cost units
+TRANSACTION COST: 31.47017676469 XRD
+├─ Network execution: 0.61834095 XRD, 12366819 execution cost units
 ├─ Network finalization: 0.0783874 XRD, 1567748 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 30.77344841469 XRD
@@ -20,15 +20,15 @@ EVENTS: 5
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("31.47003411469"),
+     amount: Decimal("31.47017676469"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("15.735017057345"),
+     amount: Decimal("15.735088382345"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("15.735017057345"),
+     amount: Decimal("15.735088382345"),
    }
 
 STATE UPDATES: 7 entities
@@ -38,7 +38,7 @@ STATE UPDATES: 7 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("7.8675085286725"),
+             0u8 => Decimal("7.8675441911725"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -71,7 +71,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999968.52996588531")),
+         LiquidFungibleResource(Decimal("99999999999999968.52982323531")),
        )
 ├─ package_sim1p4qz8edl2w0t5mzwt6zcq0nfnc0ax9rkfawnmsg0s974hxcsggr29z across 11 partitions
   ├─ Partition(1): 1 change
@@ -307,7 +307,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("15.735017057345")),
+         LiquidFungibleResource(Decimal("15.735088382345")),
        )
 
 OUTPUTS: 3
@@ -318,10 +318,10 @@ OUTPUTS: 3
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -31.47003411469
+   Change: -31.47017676469
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 15.735017057345
+   Change: 15.735088382345
 
 NEW ENTITIES: 1
 └─ Package: package_sim1p4qz8edl2w0t5mzwt6zcq0nfnc0ax9rkfawnmsg0s974hxcsggr29z
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/receipts/002--royalties--instantiate-components.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/receipts/002--royalties--instantiate-components.txt
index 5475c8d0dd..27c859069a 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/receipts/002--royalties--instantiate-components.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/receipts/002--royalties--instantiate-components.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 1.0449135481 XRD
-├─ Network execution: 0.36352375 XRD, 7270475 execution cost units
+TRANSACTION COST: 1.0469976481 XRD
+├─ Network execution: 0.36560785 XRD, 7312157 execution cost units
 ├─ Network finalization: 0.2360239 XRD, 4720478 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.4453658981 XRD
@@ -28,15 +28,15 @@ EVENTS: 7
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("1.0449135481"),
+     amount: Decimal("1.0469976481"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.52245677405"),
+     amount: Decimal("0.52349882405"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.52245677405"),
+     amount: Decimal("0.52349882405"),
    }
 
 STATE UPDATES: 11 entities
@@ -46,7 +46,7 @@ STATE UPDATES: 11 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("8.1287369156975"),
+             0u8 => Decimal("8.1292936031975"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -79,7 +79,7 @@ STATE UPDATES: 11 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999967.48505233721")),
+         LiquidFungibleResource(Decimal("99999999999999967.48282558721")),
        )
 ├─ component_sim1cr7guww2kc22r6vnk8ffep9sv2aphp0mg6hdngg8x2shzf2xn90zmw across 6 partitions
   ├─ Partition(3): 1 change
@@ -475,7 +475,7 @@ STATE UPDATES: 11 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("16.257473831395")),
+         LiquidFungibleResource(Decimal("16.258587206395")),
        )
 
 OUTPUTS: 4
@@ -487,10 +487,10 @@ OUTPUTS: 4
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -1.0449135481
+   Change: -1.0469976481
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.52245677405
+   Change: 0.52349882405
 
 NEW ENTITIES: 3
 ├─ Component: component_sim1cr7guww2kc22r6vnk8ffep9sv2aphp0mg6hdngg8x2shzf2xn90zmw
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/receipts/003--royalties--set-components-royalty.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/receipts/003--royalties--set-components-royalty.txt
index c968f2d9e0..63684d7823 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/receipts/003--royalties--set-components-royalty.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/receipts/003--royalties--set-components-royalty.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.35937313381 XRD
-├─ Network execution: 0.1832873 XRD, 3665746 execution cost units
+TRANSACTION COST: 0.35951578381 XRD
+├─ Network execution: 0.18342995 XRD, 3668599 execution cost units
 ├─ Network finalization: 0.0552553 XRD, 1105106 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.12083053381 XRD
@@ -16,15 +16,15 @@ EVENTS: 4
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.35937313381"),
+     amount: Decimal("0.35951578381"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.179686566905"),
+     amount: Decimal("0.179757891905"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.179686566905"),
+     amount: Decimal("0.179757891905"),
    }
 
 STATE UPDATES: 8 entities
@@ -34,7 +34,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("8.21858019915"),
+             0u8 => Decimal("8.21917254915"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -121,13 +121,13 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999967.1256792034")),
+         LiquidFungibleResource(Decimal("99999999999999967.1233098034")),
        )
 └─ internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel across 1 partitions
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("16.4371603983")),
+         LiquidFungibleResource(Decimal("16.4383450983")),
        )
 
 OUTPUTS: 10
@@ -145,9 +145,9 @@ OUTPUTS: 10
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.35937313381
+   Change: -0.35951578381
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.179686566905
+   Change: 0.179757891905
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/receipts/004--royalties--call_all_components_all_methods.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/receipts/004--royalties--call_all_components_all_methods.txt
index 75f28a8afb..a94ddcf716 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/receipts/004--royalties--call_all_components_all_methods.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/receipts/004--royalties--call_all_components_all_methods.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 347.667634537889999992 XRD
-├─ Network execution: 0.5693587 XRD, 11387174 execution cost units
+TRANSACTION COST: 347.667976087889999992 XRD
+├─ Network execution: 0.56970025 XRD, 11394005 execution cost units
 ├─ Network finalization: 0.0102517 XRD, 205034 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.08802413789 XRD
@@ -28,15 +28,15 @@ EVENTS: 7
    }
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("347.667634537889999992"),
+     amount: Decimal("347.667976087889999992"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.333817268945"),
+     amount: Decimal("0.333988043945"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.333817268945"),
+     amount: Decimal("0.333988043945"),
    }
 
 STATE UPDATES: 8 entities
@@ -46,7 +46,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("8.3854888336225"),
+             0u8 => Decimal("8.3861665711225"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -79,7 +79,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999999619.458044665510000008")),
+         LiquidFungibleResource(Decimal("99999999999999619.455333715510000008")),
        )
 ├─ internal_vault_sim1tqce6jxy9gwd6trwftkdhksyt4gfq348rypqeq00s40k7jk3z5r2ke across 1 partitions
   └─ Partition(64): 1 change
@@ -103,7 +103,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("16.770977667245")),
+         LiquidFungibleResource(Decimal("16.772333142245")),
        )
 
 OUTPUTS: 10
@@ -121,7 +121,7 @@ OUTPUTS: 10
 BALANCE CHANGES: 5
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -347.667634537889999992
+   Change: -347.667976087889999992
 ├─ Vault: internal_vault_sim1tqce6jxy9gwd6trwftkdhksyt4gfq348rypqeq00s40k7jk3z5r2ke
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
    Change: 142.999999999999999998
@@ -133,6 +133,6 @@ BALANCE CHANGES: 5
    Change: 149.999999999999999994
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.333817268945
+   Change: 0.333988043945
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/scenario_summary.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/scenario_summary.txt
index b605d67b9d..96e8b894e7 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/scenario_summary.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/royalties/scenario_summary.txt
@@ -2,8 +2,8 @@ Name: royalties
 
 == SUMMARY HASHES ==
 These Cuttlefish hashes are permitted to change only until the scenario is deployed to a permanent network, else it can cause divergence.
-State changes: 621767f0d2edb87e (allowed to change if not deployed to any network)
-Events       : 999331c952a301fa (allowed to change if not deployed to any network)
+State changes: 94ae626632ea8b51 (allowed to change if not deployed to any network)
+Events       : 791dbf4c22739aac (allowed to change if not deployed to any network)
 
 == INTERESTING ADDRESSES ==
 - royalty_package_address: package_sim1p4qz8edl2w0t5mzwt6zcq0nfnc0ax9rkfawnmsg0s974hxcsggr29z
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/001--faucet-top-up.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/001--faucet-top-up.txt
index 99bbd521aa..2de95db61d 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/001--faucet-top-up.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/001--faucet-top-up.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.57187005924,    100.0%
-- Execution Cost (XRD)                                                     ,                0.3324622,     58.1%
+Total Cost (XRD)                                                           ,            0.57223410924,    100.0%
+- Execution Cost (XRD)                                                     ,               0.33282625,     58.2%
 - Finalization Cost (XRD)                                                  ,                0.0612615,     10.7%
-- Storage Cost (XRD)                                                       ,            0.17814635924,     31.2%
+- Storage Cost (XRD)                                                       ,            0.17814635924,     31.1%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  6649244,    100.0%
+Execution Cost Breakdown                                                   ,                  6656525,    100.0%
 - AfterInvoke                                                              ,                      654,      0.0%
 - AllocateNodeId                                                           ,                     2425,      0.0%
 - BeforeInvoke                                                             ,                     2816,      0.0%
@@ -21,7 +21,7 @@ Execution Cost Breakdown                                                   ,
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   173556,      2.6%
 - OpenSubstate::GlobalGenericComponent                                     ,                    47373,      0.7%
 - OpenSubstate::GlobalNonFungibleResourceManager                           ,                    42686,      0.6%
-- OpenSubstate::GlobalPackage                                              ,                  3181935,     47.9%
+- OpenSubstate::GlobalPackage                                              ,                  3181935,     47.8%
 - OpenSubstate::GlobalPreallocatedSecp256k1Account                         ,                   487127,      7.3%
 - OpenSubstate::InternalFungibleVault                                      ,                   106652,      1.6%
 - OpenSubstate::InternalGenericComponent                                   ,                    55774,      0.8%
@@ -45,8 +45,8 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::put_FungibleVault                                         ,                    24554,      0.4%
 - RunNativeCode::take_FungibleVault                                        ,                    42457,      0.6%
 - RunNativeCode::try_deposit_or_abort                                      ,                    97988,      1.5%
-- RunWasmCode::Faucet_free                                                 ,                    34815,      0.5%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.4%
+- RunWasmCode::Faucet_free                                                 ,                    39243,      0.6%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.4%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      371,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/002--transfer--try_deposit_or_abort.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/002--transfer--try_deposit_or_abort.txt
index 797ab6ea51..dc622cb2ab 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/002--transfer--try_deposit_or_abort.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/002--transfer--try_deposit_or_abort.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.52864231178,    100.0%
-- Execution Cost (XRD)                                                     ,                0.2720081,     51.5%
+Total Cost (XRD)                                                           ,            0.52878496178,    100.0%
+- Execution Cost (XRD)                                                     ,               0.27215075,     51.5%
 - Finalization Cost (XRD)                                                  ,               0.06151245,     11.6%
 - Storage Cost (XRD)                                                       ,            0.19512176178,     36.9%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  5440162,    100.0%
+Execution Cost Breakdown                                                   ,                  5443015,    100.0%
 - AfterInvoke                                                              ,                      686,      0.0%
 - AllocateNodeId                                                           ,                     2425,      0.0%
 - BeforeInvoke                                                             ,                     2964,      0.1%
@@ -20,7 +20,7 @@ Execution Cost Breakdown                                                   ,
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   175335,      3.2%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      0.8%
 - OpenSubstate::GlobalNonFungibleResourceManager                           ,                    42686,      0.8%
-- OpenSubstate::GlobalPackage                                              ,                  2494754,     45.9%
+- OpenSubstate::GlobalPackage                                              ,                  2494754,     45.8%
 - OpenSubstate::GlobalPreallocatedSecp256k1Account                         ,                   772151,     14.2%
 - OpenSubstate::InternalFungibleVault                                      ,                   181670,      3.3%
 - OpenSubstate::InternalGenericComponent                                   ,                    66591,      1.2%
@@ -43,7 +43,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::take_FungibleVault                                        ,                    42457,      0.8%
 - RunNativeCode::try_deposit_or_abort                                      ,                    97988,      1.8%
 - RunNativeCode::withdraw                                                  ,                    57851,      1.1%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.5%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.5%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      371,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/003--transfer--try_deposit_or_refund.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/003--transfer--try_deposit_or_refund.txt
index 24a2b2cb95..96a80affd1 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/003--transfer--try_deposit_or_refund.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/003--transfer--try_deposit_or_refund.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.33535054196,    100.0%
-- Execution Cost (XRD)                                                     ,                0.2213986,     66.0%
+Total Cost (XRD)                                                           ,            0.33549319196,    100.0%
+- Execution Cost (XRD)                                                     ,               0.22154125,     66.0%
 - Finalization Cost (XRD)                                                  ,                0.0212548,      6.3%
 - Storage Cost (XRD)                                                       ,            0.09269714196,     27.6%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  4427972,    100.0%
+Execution Cost Breakdown                                                   ,                  4430825,    100.0%
 - AfterInvoke                                                              ,                      490,      0.0%
 - AllocateNodeId                                                           ,                     1649,      0.0%
 - BeforeInvoke                                                             ,                     1844,      0.0%
@@ -37,7 +37,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::take_FungibleVault                                        ,                    42457,      1.0%
 - RunNativeCode::try_deposit_or_refund                                     ,                    88114,      2.0%
 - RunNativeCode::withdraw                                                  ,                    57851,      1.3%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.6%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.6%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    21240,      0.5%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/004--transfer--try_deposit_batch_or_abort.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/004--transfer--try_deposit_batch_or_abort.txt
index ac967e97f4..c2480c013f 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/004--transfer--try_deposit_batch_or_abort.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/004--transfer--try_deposit_batch_or_abort.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.32569284845,    100.0%
-- Execution Cost (XRD)                                                     ,               0.21717685,     66.7%
+Total Cost (XRD)                                                           ,            0.32583549845,    100.0%
+- Execution Cost (XRD)                                                     ,                0.2173195,     66.7%
 - Finalization Cost (XRD)                                                  ,                0.0212548,      6.5%
 - Storage Cost (XRD)                                                       ,            0.08726119845,     26.8%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  4343537,    100.0%
+Execution Cost Breakdown                                                   ,                  4346390,    100.0%
 - AfterInvoke                                                              ,                      440,      0.0%
 - AllocateNodeId                                                           ,                     1552,      0.0%
 - BeforeInvoke                                                             ,                     1662,      0.0%
@@ -37,7 +37,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::take_FungibleVault                                        ,                    42457,      1.0%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   121257,      2.8%
 - RunNativeCode::withdraw                                                  ,                    57851,      1.3%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.6%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.6%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    18960,      0.4%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/005--transfer--try_deposit_batch_or_refund.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/005--transfer--try_deposit_batch_or_refund.txt
index 91982e6b87..0a1dd7d9e5 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/005--transfer--try_deposit_batch_or_refund.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/005--transfer--try_deposit_batch_or_refund.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.32860431588,    100.0%
-- Execution Cost (XRD)                                                     ,               0.21999295,     66.9%
+Total Cost (XRD)                                                           ,            0.32874696588,    100.0%
+- Execution Cost (XRD)                                                     ,                0.2201356,     67.0%
 - Finalization Cost (XRD)                                                  ,                0.0212548,      6.5%
 - Storage Cost (XRD)                                                       ,            0.08735656588,     26.6%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  4399859,    100.0%
+Execution Cost Breakdown                                                   ,                  4402712,    100.0%
 - AfterInvoke                                                              ,                      442,      0.0%
 - AllocateNodeId                                                           ,                     1552,      0.0%
 - BeforeInvoke                                                             ,                     1664,      0.0%
@@ -16,9 +16,9 @@ Execution Cost Breakdown                                                   ,
 - GetOwnedNodes                                                            ,                     1000,      0.0%
 - LockFee                                                                  ,                      500,      0.0%
 - MarkSubstateAsTransient                                                  ,                       55,      0.0%
-- OpenSubstate::GlobalFungibleResourceManager                              ,                   169405,      3.9%
+- OpenSubstate::GlobalFungibleResourceManager                              ,                   169405,      3.8%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      1.0%
-- OpenSubstate::GlobalPackage                                              ,                  1860098,     42.3%
+- OpenSubstate::GlobalPackage                                              ,                  1860098,     42.2%
 - OpenSubstate::GlobalPreallocatedSecp256k1Account                         ,                   570968,     13.0%
 - OpenSubstate::InternalFungibleVault                                      ,                   260079,      5.9%
 - OpenSubstate::InternalGenericComponent                                   ,                    53048,      1.2%
@@ -37,7 +37,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::take_FungibleVault                                        ,                    42457,      1.0%
 - RunNativeCode::try_deposit_batch_or_refund                               ,                    97532,      2.2%
 - RunNativeCode::withdraw                                                  ,                    57851,      1.3%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.6%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.6%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    19000,      0.4%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/006--self-transfer--deposit_batch.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/006--self-transfer--deposit_batch.txt
index 9d83dedec5..5e0200d896 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/006--self-transfer--deposit_batch.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/006--self-transfer--deposit_batch.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.30051241957,    100.0%
-- Execution Cost (XRD)                                                     ,               0.19852275,     66.1%
+Total Cost (XRD)                                                           ,            0.30065506957,    100.0%
+- Execution Cost (XRD)                                                     ,                0.1986654,     66.1%
 - Finalization Cost (XRD)                                                  ,               0.01625435,      5.4%
 - Storage Cost (XRD)                                                       ,            0.08573531957,     28.5%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  3970455,    100.0%
+Execution Cost Breakdown                                                   ,                  3973308,    100.0%
 - AfterInvoke                                                              ,                      440,      0.0%
 - AllocateNodeId                                                           ,                     1552,      0.0%
 - BeforeInvoke                                                             ,                     1630,      0.0%
@@ -16,12 +16,12 @@ Execution Cost Breakdown                                                   ,
 - GetOwnedNodes                                                            ,                     1000,      0.0%
 - LockFee                                                                  ,                      500,      0.0%
 - MarkSubstateAsTransient                                                  ,                       55,      0.0%
-- OpenSubstate::GlobalFungibleResourceManager                              ,                   168812,      4.3%
+- OpenSubstate::GlobalFungibleResourceManager                              ,                   168812,      4.2%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      1.1%
 - OpenSubstate::GlobalPackage                                              ,                  1780095,     44.8%
 - OpenSubstate::GlobalPreallocatedSecp256k1Account                         ,                   290024,      7.3%
 - OpenSubstate::InternalFungibleVault                                      ,                   180065,      4.5%
-- OpenSubstate::InternalGenericComponent                                   ,                    53605,      1.4%
+- OpenSubstate::InternalGenericComponent                                   ,                    53605,      1.3%
 - OpenSubstate::InternalKeyValueStore                                      ,                    40536,      1.0%
 - PinNode                                                                  ,                      192,      0.0%
 - PrepareWasmCode                                                          ,                   353866,      8.9%
@@ -37,7 +37,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::put_FungibleVault                                         ,                    24554,      0.6%
 - RunNativeCode::take_FungibleVault                                        ,                    42457,      1.1%
 - RunNativeCode::withdraw                                                  ,                    57851,      1.5%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.6%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.7%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
 - ValidateTxPayload                                                        ,                    18320,      0.5%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/007--multi-transfer--deposit_batch.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/007--multi-transfer--deposit_batch.txt
index 0cd7ad744e..758cd32c41 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/007--multi-transfer--deposit_batch.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/costings/007--multi-transfer--deposit_batch.txt
@@ -1,10 +1,10 @@
-Total Cost (XRD)                                                           ,            0.62406191304,    100.0%
-- Execution Cost (XRD)                                                     ,               0.31545795,     50.5%
+Total Cost (XRD)                                                           ,            0.62420456304,    100.0%
+- Execution Cost (XRD)                                                     ,                0.3156006,     50.6%
 - Finalization Cost (XRD)                                                  ,                0.0675151,     10.8%
 - Storage Cost (XRD)                                                       ,            0.24108886304,     38.6%
 - Tipping Cost (XRD)                                                       ,                        0,      0.0%
 - Royalty Cost (XRD)                                                       ,                        0,      0.0%
-Execution Cost Breakdown                                                   ,                  6309159,    100.0%
+Execution Cost Breakdown                                                   ,                  6312012,    100.0%
 - AfterInvoke                                                              ,                     1008,      0.0%
 - AllocateNodeId                                                           ,                     3298,      0.1%
 - BeforeInvoke                                                             ,                     3926,      0.1%
@@ -20,7 +20,7 @@ Execution Cost Breakdown                                                   ,
 - OpenSubstate::GlobalFungibleResourceManager                              ,                   182274,      2.9%
 - OpenSubstate::GlobalGenericComponent                                     ,                    43690,      0.7%
 - OpenSubstate::GlobalNonFungibleResourceManager                           ,                    42686,      0.7%
-- OpenSubstate::GlobalPackage                                              ,                  2508568,     39.8%
+- OpenSubstate::GlobalPackage                                              ,                  2508568,     39.7%
 - OpenSubstate::GlobalPreallocatedEd25519Account                           ,                   487127,      7.7%
 - OpenSubstate::GlobalPreallocatedSecp256k1Account                         ,                   575968,      9.1%
 - OpenSubstate::InternalFungibleVault                                      ,                   271533,      4.3%
@@ -44,7 +44,7 @@ Execution Cost Breakdown                                                   ,
 - RunNativeCode::take_FungibleVault                                        ,                    84914,      1.3%
 - RunNativeCode::try_deposit_batch_or_abort                                ,                   242514,      3.8%
 - RunNativeCode::withdraw                                                  ,                   115702,      1.8%
-- RunWasmCode::Faucet_lock_fee                                             ,                    24589,      0.4%
+- RunWasmCode::Faucet_lock_fee                                             ,                    27442,      0.4%
 - SetCallFrameData                                                         ,                      606,      0.0%
 - SetSubstate                                                              ,                      371,      0.0%
 - SwitchStack                                                              ,                     1000,      0.0%
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/001--faucet-top-up.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/001--faucet-top-up.txt
index cb3b06d0ac..2dab1de899 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/001--faucet-top-up.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/001--faucet-top-up.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.57187005924 XRD
-├─ Network execution: 0.3324622 XRD, 6649244 execution cost units
+TRANSACTION COST: 0.57223410924 XRD
+├─ Network execution: 0.33282625 XRD, 6656525 execution cost units
 ├─ Network finalization: 0.0612615 XRD, 1225230 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.17814635924 XRD
@@ -33,15 +33,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.57187005924"),
+     amount: Decimal("0.57223410924"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.28593502962"),
+     amount: Decimal("0.28611705462"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.28593502962"),
+     amount: Decimal("0.28611705462"),
    }
 
 STATE UPDATES: 8 entities
@@ -51,7 +51,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.14296751481"),
+             0u8 => Decimal("0.14305852731"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -84,7 +84,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999989999.42812994076")),
+         LiquidFungibleResource(Decimal("99999999999989999.42776589076")),
        )
 ├─ internal_keyvaluestore_sim1krn7clzr3qmq2zhwr77mdenksxswf00yeh8tn3vyzesg4kr3p54gv8 across 1 partitions
   └─ Partition(64): 1 change
@@ -222,7 +222,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.28593502962")),
+         LiquidFungibleResource(Decimal("0.28611705462")),
        )
 
 OUTPUTS: 4
@@ -234,13 +234,13 @@ OUTPUTS: 4
 BALANCE CHANGES: 3
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -10000.57187005924
+   Change: -10000.57223410924
 ├─ Vault: internal_vault_sim1tqsmp4sts684nukw686ze0gkagrdaz558pfq64v2x45qevqapak305
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
    Change: 10000
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.28593502962
+   Change: 0.28611705462
 
 NEW ENTITIES: 1
 └─ Component: account_sim16996e320lnez82q6430eunaz9l3n5fnwk6eh9avrmtmj22e7jmhemw
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/002--transfer--try_deposit_or_abort.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/002--transfer--try_deposit_or_abort.txt
index 4c616c93a8..85c040d7c6 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/002--transfer--try_deposit_or_abort.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/002--transfer--try_deposit_or_abort.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.52864231178 XRD
-├─ Network execution: 0.2720081 XRD, 5440162 execution cost units
+TRANSACTION COST: 0.52878496178 XRD
+├─ Network execution: 0.27215075 XRD, 5443015 execution cost units
 ├─ Network finalization: 0.06151245 XRD, 1230249 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.19512176178 XRD
@@ -38,15 +38,15 @@ EVENTS: 9
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.52864231178"),
+     amount: Decimal("0.52878496178"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.26432115589"),
+     amount: Decimal("0.26439248089"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.26432115589"),
+     amount: Decimal("0.26439248089"),
    }
 
 STATE UPDATES: 8 entities
@@ -56,7 +56,7 @@ STATE UPDATES: 8 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.275128092755"),
+             0u8 => Decimal("0.275254767755"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -89,7 +89,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999989998.89948762898")),
+         LiquidFungibleResource(Decimal("99999999999989998.89898092898")),
        )
 ├─ internal_vault_sim1tqsmp4sts684nukw686ze0gkagrdaz558pfq64v2x45qevqapak305 across 1 partitions
   └─ Partition(64): 1 change
@@ -229,7 +229,7 @@ STATE UPDATES: 8 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.55025618551")),
+         LiquidFungibleResource(Decimal("0.55050953551")),
        )
 
 OUTPUTS: 4
@@ -241,7 +241,7 @@ OUTPUTS: 4
 BALANCE CHANGES: 4
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.52864231178
+   Change: -0.52878496178
 ├─ Vault: internal_vault_sim1tqsmp4sts684nukw686ze0gkagrdaz558pfq64v2x45qevqapak305
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
    Change: -1
@@ -250,7 +250,7 @@ BALANCE CHANGES: 4
    Change: 1
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.26432115589
+   Change: 0.26439248089
 
 NEW ENTITIES: 1
 └─ Component: account_sim168qgdkgfqxpnswu38wy6fy5v0q0um52zd0umuely5t9xrf88t3unc0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/003--transfer--try_deposit_or_refund.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/003--transfer--try_deposit_or_refund.txt
index 74df1127ad..84284c4d7b 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/003--transfer--try_deposit_or_refund.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/003--transfer--try_deposit_or_refund.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.33535054196 XRD
-├─ Network execution: 0.2213986 XRD, 4427972 execution cost units
+TRANSACTION COST: 0.33549319196 XRD
+├─ Network execution: 0.22154125 XRD, 4430825 execution cost units
 ├─ Network finalization: 0.0212548 XRD, 425096 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.09269714196 XRD
@@ -34,15 +34,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.33535054196"),
+     amount: Decimal("0.33549319196"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.16767527098"),
+     amount: Decimal("0.16774659598"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.16767527098"),
+     amount: Decimal("0.16774659598"),
    }
 
 STATE UPDATES: 7 entities
@@ -52,7 +52,7 @@ STATE UPDATES: 7 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.358965728245"),
+             0u8 => Decimal("0.359128065745"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -85,7 +85,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999989998.56413708702")),
+         LiquidFungibleResource(Decimal("99999999999989998.56348773702")),
        )
 ├─ internal_vault_sim1tqsmp4sts684nukw686ze0gkagrdaz558pfq64v2x45qevqapak305 across 1 partitions
   └─ Partition(64): 1 change
@@ -103,7 +103,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.71793145649")),
+         LiquidFungibleResource(Decimal("0.71825613149")),
        )
 
 OUTPUTS: 4
@@ -115,7 +115,7 @@ OUTPUTS: 4
 BALANCE CHANGES: 4
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.33535054196
+   Change: -0.33549319196
 ├─ Vault: internal_vault_sim1tqsmp4sts684nukw686ze0gkagrdaz558pfq64v2x45qevqapak305
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
    Change: -1
@@ -124,6 +124,6 @@ BALANCE CHANGES: 4
    Change: 1
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.16767527098
+   Change: 0.16774659598
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/004--transfer--try_deposit_batch_or_abort.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/004--transfer--try_deposit_batch_or_abort.txt
index 7f6642f0f2..7a9b6a26d7 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/004--transfer--try_deposit_batch_or_abort.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/004--transfer--try_deposit_batch_or_abort.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.32569284845 XRD
-├─ Network execution: 0.21717685 XRD, 4343537 execution cost units
+TRANSACTION COST: 0.32583549845 XRD
+├─ Network execution: 0.2173195 XRD, 4346390 execution cost units
 ├─ Network finalization: 0.0212548 XRD, 425096 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.08726119845 XRD
@@ -34,15 +34,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.32569284845"),
+     amount: Decimal("0.32583549845"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.162846424225"),
+     amount: Decimal("0.162917749225"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.162846424225"),
+     amount: Decimal("0.162917749225"),
    }
 
 STATE UPDATES: 7 entities
@@ -52,7 +52,7 @@ STATE UPDATES: 7 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.4403889403575"),
+             0u8 => Decimal("0.4405869403575"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -85,7 +85,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999989998.23844423857")),
+         LiquidFungibleResource(Decimal("99999999999989998.23765223857")),
        )
 ├─ internal_vault_sim1tqsmp4sts684nukw686ze0gkagrdaz558pfq64v2x45qevqapak305 across 1 partitions
   └─ Partition(64): 1 change
@@ -103,7 +103,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("0.880777880715")),
+         LiquidFungibleResource(Decimal("0.881173880715")),
        )
 
 OUTPUTS: 3
@@ -114,7 +114,7 @@ OUTPUTS: 3
 BALANCE CHANGES: 4
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.32569284845
+   Change: -0.32583549845
 ├─ Vault: internal_vault_sim1tqsmp4sts684nukw686ze0gkagrdaz558pfq64v2x45qevqapak305
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
    Change: -1
@@ -123,6 +123,6 @@ BALANCE CHANGES: 4
    Change: 1
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.162846424225
+   Change: 0.162917749225
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/005--transfer--try_deposit_batch_or_refund.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/005--transfer--try_deposit_batch_or_refund.txt
index 98f75770b8..e07350f3a4 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/005--transfer--try_deposit_batch_or_refund.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/005--transfer--try_deposit_batch_or_refund.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.32860431588 XRD
-├─ Network execution: 0.21999295 XRD, 4399859 execution cost units
+TRANSACTION COST: 0.32874696588 XRD
+├─ Network execution: 0.2201356 XRD, 4402712 execution cost units
 ├─ Network finalization: 0.0212548 XRD, 425096 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.08735656588 XRD
@@ -34,15 +34,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.32860431588"),
+     amount: Decimal("0.32874696588"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.16430215794"),
+     amount: Decimal("0.16437348294"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.16430215794"),
+     amount: Decimal("0.16437348294"),
    }
 
 STATE UPDATES: 7 entities
@@ -52,7 +52,7 @@ STATE UPDATES: 7 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.5225400193275"),
+             0u8 => Decimal("0.5227736818275"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -85,7 +85,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999989997.90983992269")),
+         LiquidFungibleResource(Decimal("99999999999989997.90890527269")),
        )
 ├─ internal_vault_sim1tqsmp4sts684nukw686ze0gkagrdaz558pfq64v2x45qevqapak305 across 1 partitions
   └─ Partition(64): 1 change
@@ -103,7 +103,7 @@ STATE UPDATES: 7 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("1.045080038655")),
+         LiquidFungibleResource(Decimal("1.045547363655")),
        )
 
 OUTPUTS: 3
@@ -114,7 +114,7 @@ OUTPUTS: 3
 BALANCE CHANGES: 4
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.32860431588
+   Change: -0.32874696588
 ├─ Vault: internal_vault_sim1tqsmp4sts684nukw686ze0gkagrdaz558pfq64v2x45qevqapak305
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
    Change: -1
@@ -123,6 +123,6 @@ BALANCE CHANGES: 4
    Change: 1
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.16430215794
+   Change: 0.16437348294
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/006--self-transfer--deposit_batch.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/006--self-transfer--deposit_batch.txt
index 299b4e9864..89abe27990 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/006--self-transfer--deposit_batch.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/006--self-transfer--deposit_batch.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.30051241957 XRD
-├─ Network execution: 0.19852275 XRD, 3970455 execution cost units
+TRANSACTION COST: 0.30065506957 XRD
+├─ Network execution: 0.1986654 XRD, 3973308 execution cost units
 ├─ Network finalization: 0.01625435 XRD, 325087 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.08573531957 XRD
@@ -34,15 +34,15 @@ EVENTS: 8
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.30051241957"),
+     amount: Decimal("0.30065506957"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.150256209785"),
+     amount: Decimal("0.150327534785"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.150256209785"),
+     amount: Decimal("0.150327534785"),
    }
 
 STATE UPDATES: 6 entities
@@ -52,7 +52,7 @@ STATE UPDATES: 6 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.59766812422"),
+             0u8 => Decimal("0.59793744922"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -85,7 +85,7 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999989997.60932750312")),
+         LiquidFungibleResource(Decimal("99999999999989997.60825020312")),
        )
 ├─ internal_vault_sim1tqsmp4sts684nukw686ze0gkagrdaz558pfq64v2x45qevqapak305 across 1 partitions
   └─ Partition(64): 1 change
@@ -97,7 +97,7 @@ STATE UPDATES: 6 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("1.19533624844")),
+         LiquidFungibleResource(Decimal("1.19587489844")),
        )
 
 OUTPUTS: 3
@@ -108,9 +108,9 @@ OUTPUTS: 3
 BALANCE CHANGES: 2
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.30051241957
+   Change: -0.30065506957
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.150256209785
+   Change: 0.150327534785
 
 NEW ENTITIES: 0
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/007--multi-transfer--deposit_batch.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/007--multi-transfer--deposit_batch.txt
index f8e4c98693..43a5874630 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/007--multi-transfer--deposit_batch.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/receipts/007--multi-transfer--deposit_batch.txt
@@ -1,7 +1,7 @@
 TRANSACTION STATUS: COMMITTED SUCCESS
 
-TRANSACTION COST: 0.62406191304 XRD
-├─ Network execution: 0.31545795 XRD, 6309159 execution cost units
+TRANSACTION COST: 0.62420456304 XRD
+├─ Network execution: 0.3156006 XRD, 6312012 execution cost units
 ├─ Network finalization: 0.0675151 XRD, 1350302 finalization cost units
 ├─ Tip: 0 XRD
 ├─ Network Storage: 0.24108886304 XRD
@@ -56,15 +56,15 @@ EVENTS: 13
    )
 ├─ Emitter: Method { node: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u, module_id: Main }
    Event: PayFeeEvent {
-     amount: Decimal("0.62406191304"),
+     amount: Decimal("0.62420456304"),
    }
 ├─ Emitter: Method { node: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel, module_id: Main }
    Event: DepositEvent {
-     amount: Decimal("0.31203095652"),
+     amount: Decimal("0.31210228152"),
    }
 └─ Emitter: Method { node: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3, module_id: Main }
    Event: BurnFungibleResourceEvent {
-     amount: Decimal("0.31203095652"),
+     amount: Decimal("0.31210228152"),
    }
 
 STATE UPDATES: 9 entities
@@ -74,7 +74,7 @@ STATE UPDATES: 9 entities
        Value: UNLOCKED ConsensusManagerValidatorRewardsFieldPayload::V1(
          ValidatorRewardsSubstate {
            proposer_rewards: {
-             0u8 => Decimal("0.75368360248"),
+             0u8 => Decimal("0.75398858998"),
            },
            rewards_vault: Vault(Own("internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel")),
          },
@@ -107,7 +107,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("99999999999989996.98526559008")),
+         LiquidFungibleResource(Decimal("99999999999989996.98404564008")),
        )
 ├─ internal_vault_sim1tqsmp4sts684nukw686ze0gkagrdaz558pfq64v2x45qevqapak305 across 1 partitions
   └─ Partition(64): 1 change
@@ -253,7 +253,7 @@ STATE UPDATES: 9 entities
   └─ Partition(64): 1 change
     └─ Set: Field(0)
        Value: UNLOCKED FungibleVaultBalanceFieldPayload::V1(
-         LiquidFungibleResource(Decimal("1.50736720496")),
+         LiquidFungibleResource(Decimal("1.50797717996")),
        )
 
 OUTPUTS: 5
@@ -266,7 +266,7 @@ OUTPUTS: 5
 BALANCE CHANGES: 5
 ├─ Vault: internal_vault_sim1tz9uaalv8g3ahmwep2trlyj2m3zn7rstm9pwessa3k56me2fcduq2u
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: -0.62406191304
+   Change: -0.62420456304
 ├─ Vault: internal_vault_sim1tqsmp4sts684nukw686ze0gkagrdaz558pfq64v2x45qevqapak305
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
    Change: -2
@@ -278,7 +278,7 @@ BALANCE CHANGES: 5
    Change: 1
 └─ Vault: internal_vault_sim1tpsesv77qvw782kknjks9g3x2msg8cc8ldshk28pkf6m6lkhun3sel
    ResAddr: resource_sim1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxakj8n3
-   Change: 0.31203095652
+   Change: 0.31210228152
 
 NEW ENTITIES: 1
 └─ Component: account_sim128cqk4tgnu2trlvmpf242a0lsq4062a2c45hhymr3tly0ps3w57yav
\ No newline at end of file
diff --git a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/scenario_summary.txt b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/scenario_summary.txt
index 5ea6153b38..2b92727480 100644
--- a/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/scenario_summary.txt
+++ b/radix-transaction-scenarios/generated-examples/cuttlefish/transfer_xrd/scenario_summary.txt
@@ -2,8 +2,8 @@ Name: transfer_xrd
 
 == SUMMARY HASHES ==
 These Cuttlefish hashes are permitted to change only until the scenario is deployed to a permanent network, else it can cause divergence.
-State changes: 3d5f65532f622546 (allowed to change if not deployed to any network)
-Events       : 104a56ffc7984255 (allowed to change if not deployed to any network)
+State changes: 292bce34e940f21f (allowed to change if not deployed to any network)
+Events       : 52c05ed9a287955f (allowed to change if not deployed to any network)
 
 == INTERESTING ADDRESSES ==
 - from_account: account_sim16996e320lnez82q6430eunaz9l3n5fnwk6eh9avrmtmj22e7jmhemw