diff --git a/Cargo.lock b/Cargo.lock
index 454e7f25f..3a4d83746 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "Inflector"
diff --git a/applications/tari_dan_app_utilities/src/transaction_executor.rs b/applications/tari_dan_app_utilities/src/transaction_executor.rs
index f634ea63d..b3e257e7b 100644
--- a/applications/tari_dan_app_utilities/src/transaction_executor.rs
+++ b/applications/tari_dan_app_utilities/src/transaction_executor.rs
@@ -4,7 +4,6 @@
 use std::sync::Arc;
 
 use log::*;
-use tari_common::configuration::Network;
 use tari_common_types::types::PublicKey;
 use tari_crypto::tari_utilities::ByteArray;
 use tari_dan_common_types::{
@@ -18,7 +17,7 @@ use tari_dan_engine::{
     runtime::{AuthParams, RuntimeModule},
     state_store::{memory::ReadOnlyMemoryStateStore, StateStoreError},
     template::LoadedTemplate,
-    transaction::{TransactionError, TransactionProcessor},
+    transaction::{TransactionError, TransactionProcessor, TransactionProcessorConfig},
 };
 use tari_dan_storage::consensus_models::VersionedSubstateIdLockIntent;
 use tari_engine_types::{commit_result::ExecuteResult, substate::Substate, virtual_substate::VirtualSubstates};
@@ -89,15 +88,15 @@ impl ExecutionOutput {
 pub struct TariDanTransactionProcessor<TTemplateProvider> {
     template_provider: Arc<TTemplateProvider>,
     fee_table: FeeTable,
-    network: Network,
+    config: TransactionProcessorConfig,
 }
 
 impl<TTemplateProvider> TariDanTransactionProcessor<TTemplateProvider> {
-    pub fn new(network: Network, template_provider: TTemplateProvider, fee_table: FeeTable) -> Self {
+    pub fn new(config: TransactionProcessorConfig, template_provider: TTemplateProvider, fee_table: FeeTable) -> Self {
         Self {
             template_provider: Arc::new(template_provider),
             fee_table,
-            network,
+            config,
         }
     }
 }
@@ -128,12 +127,12 @@ where TTemplateProvider: TemplateProvider<Template = LoadedTemplate>
         let modules: Vec<Arc<dyn RuntimeModule>> = vec![Arc::new(FeeModule::new(initial_cost, self.fee_table.clone()))];
 
         let processor = TransactionProcessor::new(
+            self.config.clone(),
             self.template_provider.clone(),
             state_store,
             auth_params,
             virtual_substates,
             modules,
-            self.network,
         );
         let result = processor.execute(transaction.clone())?;
 
diff --git a/applications/tari_indexer/src/dry_run/processor.rs b/applications/tari_indexer/src/dry_run/processor.rs
index b15d8fc7e..354e64dee 100644
--- a/applications/tari_indexer/src/dry_run/processor.rs
+++ b/applications/tari_indexer/src/dry_run/processor.rs
@@ -23,13 +23,12 @@
 use std::{collections::HashMap, sync::Arc};
 
 use log::info;
-use tari_common::configuration::Network;
 use tari_dan_app_utilities::{
     template_manager::implementation::TemplateManager,
     transaction_executor::{TariDanTransactionProcessor, TransactionExecutor as _},
 };
 use tari_dan_common_types::{Epoch, PeerAddress, SubstateAddress, SubstateRequirement};
-use tari_dan_engine::{fees::FeeTable, state_store::new_memory_store};
+use tari_dan_engine::{fees::FeeTable, state_store::new_memory_store, transaction::TransactionProcessorConfig};
 use tari_engine_types::{
     commit_result::ExecuteResult,
     instruction::Instruction,
@@ -56,6 +55,7 @@ use crate::dry_run::error::DryRunTransactionProcessorError;
 const LOG_TARGET: &str = "tari::indexer::dry_run_transaction_processor";
 
 pub struct DryRunTransactionProcessor<TSubstateCache> {
+    config: TransactionProcessorConfig,
     epoch_manager: EpochManagerHandle<PeerAddress>,
     client_provider: TariValidatorNodeRpcClientFactory,
     transaction_autofiller:
@@ -63,30 +63,29 @@ pub struct DryRunTransactionProcessor<TSubstateCache> {
     template_manager: TemplateManager<PeerAddress>,
     substate_scanner:
         Arc<SubstateScanner<EpochManagerHandle<PeerAddress>, TariValidatorNodeRpcClientFactory, TSubstateCache>>,
-    network: Network,
 }
 
 impl<TSubstateCache> DryRunTransactionProcessor<TSubstateCache>
 where TSubstateCache: SubstateCache + 'static
 {
     pub fn new(
+        config: TransactionProcessorConfig,
         epoch_manager: EpochManagerHandle<PeerAddress>,
         client_provider: TariValidatorNodeRpcClientFactory,
         substate_scanner: Arc<
             SubstateScanner<EpochManagerHandle<PeerAddress>, TariValidatorNodeRpcClientFactory, TSubstateCache>,
         >,
         template_manager: TemplateManager<PeerAddress>,
-        network: Network,
     ) -> Self {
         let transaction_autofiller = TransactionAutofiller::new(substate_scanner.clone());
 
         Self {
+            config,
             epoch_manager,
             client_provider,
             transaction_autofiller,
             template_manager,
             substate_scanner,
-            network,
         }
     }
 
@@ -139,7 +138,7 @@ where TSubstateCache: SubstateCache + 'static
             FeeTable::zero_rated()
         };
 
-        TariDanTransactionProcessor::new(self.network, self.template_manager.clone(), fee_table)
+        TariDanTransactionProcessor::new(self.config.clone(), self.template_manager.clone(), fee_table)
     }
 
     fn transaction_includes_fees(transaction: &Transaction) -> bool {
diff --git a/applications/tari_indexer/src/lib.rs b/applications/tari_indexer/src/lib.rs
index eb6c36cb5..62abaaed0 100644
--- a/applications/tari_indexer/src/lib.rs
+++ b/applications/tari_indexer/src/lib.rs
@@ -53,6 +53,7 @@ use tari_common::{
 };
 use tari_consensus::consensus_constants::ConsensusConstants;
 use tari_dan_app_utilities::{keypair::setup_keypair_prompt, substate_file_cache::SubstateFileCache};
+use tari_dan_engine::transaction::TransactionProcessorConfig;
 use tari_dan_storage::global::DbFactory;
 use tari_dan_storage_sqlite::SqliteDbFactory;
 use tari_epoch_manager::{EpochManagerEvent, EpochManagerReader};
@@ -86,13 +87,14 @@ pub async fn run_indexer(config: ApplicationConfig, mut shutdown_signal: Shutdow
         .get_or_create_global_db()
         .map_err(|e| ExitError::new(ExitCode::DatabaseError, e))?;
 
+    let consensus_constants = ConsensusConstants::from(config.network);
     let base_node_client = create_base_layer_clients(&config).await?;
     let services: Services = spawn_services(
         &config,
         shutdown_signal.clone(),
         keypair.clone(),
         global_db,
-        ConsensusConstants::devnet(), // TODO: change this eventually
+        consensus_constants.clone(),
     )
     .await?;
 
@@ -120,11 +122,14 @@ pub async fn run_indexer(config: ApplicationConfig, mut shutdown_signal: Shutdow
 
     // dry run
     let dry_run_transaction_processor = DryRunTransactionProcessor::new(
+        TransactionProcessorConfig::builder()
+            .with_network(config.network)
+            .with_template_binary_max_size_bytes(consensus_constants.template_binary_max_size_bytes)
+            .build(),
         services.epoch_manager.clone(),
         services.validator_node_client_factory.clone(),
         dan_layer_scanner.clone(),
         services.template_manager.clone(),
-        config.network,
     );
 
     // Run the JSON-RPC API
diff --git a/applications/tari_validator_node/src/bootstrap.rs b/applications/tari_validator_node/src/bootstrap.rs
index d10ad7400..6c0af34bf 100644
--- a/applications/tari_validator_node/src/bootstrap.rs
+++ b/applications/tari_validator_node/src/bootstrap.rs
@@ -59,7 +59,7 @@ use tari_dan_common_types::{
     ShardGroup,
     VersionedSubstateId,
 };
-use tari_dan_engine::fees::FeeTable;
+use tari_dan_engine::{fees::FeeTable, transaction::TransactionProcessorConfig};
 use tari_dan_p2p::TariMessagingSpec;
 use tari_dan_storage::{
     consensus_models::{Block, BlockId, SubstateRecord},
@@ -289,7 +289,14 @@ pub async fn spawn_services(
     );
 
     // Consensus
-    let payload_processor = TariDanTransactionProcessor::new(config.network, template_manager.clone(), fee_table);
+    let payload_processor = TariDanTransactionProcessor::new(
+        TransactionProcessorConfig::builder()
+            .with_network(config.network)
+            .with_template_binary_max_size_bytes(consensus_constants.template_binary_max_size_bytes)
+            .build(),
+        template_manager.clone(),
+        fee_table,
+    );
     let transaction_executor = TariDanBlockTransactionExecutor::new(
         payload_processor.clone(),
         consensus::create_transaction_validator(template_manager.clone()).boxed(),
diff --git a/bindings/dist/index.d.ts b/bindings/dist/index.d.ts
index 4ca5f8260..2de55da51 100644
--- a/bindings/dist/index.d.ts
+++ b/bindings/dist/index.d.ts
@@ -2,25 +2,25 @@ export * from "./types/AbortReason";
 export * from "./types/AccessRule";
 export * from "./types/Account";
 export * from "./types/Amount";
-export * from "./types/ArgDef";
 export * from "./types/Arg";
+export * from "./types/ArgDef";
 export * from "./types/AuthHook";
-export * from "./types/BlockHeader";
 export * from "./types/Block";
+export * from "./types/BlockHeader";
 export * from "./types/BucketId";
 export * from "./types/Claims";
 export * from "./types/Command";
+export * from "./types/Committee";
 export * from "./types/CommitteeInfo";
 export * from "./types/CommitteeShardInfo";
-export * from "./types/Committee";
 export * from "./types/ComponentAccessRules";
 export * from "./types/ComponentAddress";
 export * from "./types/ComponentBody";
 export * from "./types/ComponentHeader";
 export * from "./types/ComponentKey";
 export * from "./types/ConfidentialClaim";
-export * from "./types/ConfidentialOutputStatement";
 export * from "./types/ConfidentialOutput";
+export * from "./types/ConfidentialOutputStatement";
 export * from "./types/ConfidentialStatement";
 export * from "./types/ConfidentialTransferInputSelection";
 export * from "./types/ConfidentialWithdrawProof";
@@ -32,12 +32,12 @@ export * from "./types/Era";
 export * from "./types/Event";
 export * from "./types/EvictNodeAtom";
 export * from "./types/Evidence";
-export * from "./types/ExecutedTransaction";
 export * from "./types/ExecuteResult";
+export * from "./types/ExecutedTransaction";
 export * from "./types/ExtraData";
 export * from "./types/FeeBreakdown";
-export * from "./types/FeeClaimAddress";
 export * from "./types/FeeClaim";
+export * from "./types/FeeClaimAddress";
 export * from "./types/FeeCostBreakdown";
 export * from "./types/FeeReceipt";
 export * from "./types/FeeSource";
@@ -46,10 +46,10 @@ export * from "./types/ForeignProposalAtom";
 export * from "./types/FunctionDef";
 export * from "./types/IndexedValue";
 export * from "./types/IndexedWellKnownTypes";
-export * from "./types/InstructionResult";
 export * from "./types/Instruction";
-export * from "./types/JrpcPermissions";
+export * from "./types/InstructionResult";
 export * from "./types/JrpcPermission";
+export * from "./types/JrpcPermissions";
 export * from "./types/LeaderFee";
 export * from "./types/LockFlag";
 export * from "./types/LogEntry";
@@ -58,14 +58,14 @@ export * from "./types/Metadata";
 export * from "./types/MintConfidentialOutputAtom";
 export * from "./types/NetworkCommitteeInfo";
 export * from "./types/NodeHeight";
-export * from "./types/NonFungibleAddressContents";
+export * from "./types/NonFungible";
 export * from "./types/NonFungibleAddress";
+export * from "./types/NonFungibleAddressContents";
 export * from "./types/NonFungibleContainer";
 export * from "./types/NonFungibleId";
-export * from "./types/NonFungibleIndexAddress";
 export * from "./types/NonFungibleIndex";
+export * from "./types/NonFungibleIndexAddress";
 export * from "./types/NonFungibleToken";
-export * from "./types/NonFungible";
 export * from "./types/NumPreshards";
 export * from "./types/Ordering";
 export * from "./types/OwnerRule";
@@ -75,50 +75,50 @@ export * from "./types/QuorumCertificate";
 export * from "./types/QuorumDecision";
 export * from "./types/RejectReason";
 export * from "./types/RequireRule";
+export * from "./types/Resource";
 export * from "./types/ResourceAccessRules";
 export * from "./types/ResourceAddress";
 export * from "./types/ResourceContainer";
-export * from "./types/Resource";
 export * from "./types/ResourceType";
 export * from "./types/RestrictedAccessRule";
 export * from "./types/ResumeNodeAtom";
 export * from "./types/RuleRequirement";
+export * from "./types/Shard";
 export * from "./types/ShardEvidence";
-export * from "./types/ShardGroupEvidence";
 export * from "./types/ShardGroup";
-export * from "./types/Shard";
+export * from "./types/ShardGroupEvidence";
+export * from "./types/Substate";
 export * from "./types/SubstateAddress";
 export * from "./types/SubstateDestroyed";
 export * from "./types/SubstateDiff";
 export * from "./types/SubstateId";
 export * from "./types/SubstateLockType";
 export * from "./types/SubstateRecord";
-export * from "./types/SubstateRequirementLockIntent";
 export * from "./types/SubstateRequirement";
-export * from "./types/Substate";
+export * from "./types/SubstateRequirementLockIntent";
 export * from "./types/SubstateType";
 export * from "./types/SubstateValue";
 export * from "./types/SuspendNodeAtom";
 export * from "./types/TemplateDef";
 export * from "./types/TemplateDefV1";
+export * from "./types/Transaction";
 export * from "./types/TransactionAtom";
 export * from "./types/TransactionPoolRecord";
 export * from "./types/TransactionPoolStage";
-export * from "./types/TransactionReceiptAddress";
 export * from "./types/TransactionReceipt";
+export * from "./types/TransactionReceiptAddress";
 export * from "./types/TransactionResult";
 export * from "./types/TransactionSignature";
 export * from "./types/TransactionStatus";
-export * from "./types/Transaction";
 export * from "./types/Type";
-export * from "./types/UnclaimedConfidentialOutputAddress";
 export * from "./types/UnclaimedConfidentialOutput";
+export * from "./types/UnclaimedConfidentialOutputAddress";
 export * from "./types/UnsignedTransaction";
 export * from "./types/ValidatorSignature";
-export * from "./types/VaultId";
 export * from "./types/Vault";
-export * from "./types/VersionedSubstateIdLockIntent";
+export * from "./types/VaultId";
 export * from "./types/VersionedSubstateId";
+export * from "./types/VersionedSubstateIdLockIntent";
 export * from "./types/ViewableBalanceProof";
 export * from "./base-node-client";
 export * from "./tari-indexer-client";
diff --git a/bindings/dist/index.js b/bindings/dist/index.js
index 4dfb6fe4b..373efe48a 100644
--- a/bindings/dist/index.js
+++ b/bindings/dist/index.js
@@ -4,25 +4,25 @@ export * from "./types/AbortReason";
 export * from "./types/AccessRule";
 export * from "./types/Account";
 export * from "./types/Amount";
-export * from "./types/ArgDef";
 export * from "./types/Arg";
+export * from "./types/ArgDef";
 export * from "./types/AuthHook";
-export * from "./types/BlockHeader";
 export * from "./types/Block";
+export * from "./types/BlockHeader";
 export * from "./types/BucketId";
 export * from "./types/Claims";
 export * from "./types/Command";
+export * from "./types/Committee";
 export * from "./types/CommitteeInfo";
 export * from "./types/CommitteeShardInfo";
-export * from "./types/Committee";
 export * from "./types/ComponentAccessRules";
 export * from "./types/ComponentAddress";
 export * from "./types/ComponentBody";
 export * from "./types/ComponentHeader";
 export * from "./types/ComponentKey";
 export * from "./types/ConfidentialClaim";
-export * from "./types/ConfidentialOutputStatement";
 export * from "./types/ConfidentialOutput";
+export * from "./types/ConfidentialOutputStatement";
 export * from "./types/ConfidentialStatement";
 export * from "./types/ConfidentialTransferInputSelection";
 export * from "./types/ConfidentialWithdrawProof";
@@ -34,12 +34,12 @@ export * from "./types/Era";
 export * from "./types/Event";
 export * from "./types/EvictNodeAtom";
 export * from "./types/Evidence";
-export * from "./types/ExecutedTransaction";
 export * from "./types/ExecuteResult";
+export * from "./types/ExecutedTransaction";
 export * from "./types/ExtraData";
 export * from "./types/FeeBreakdown";
-export * from "./types/FeeClaimAddress";
 export * from "./types/FeeClaim";
+export * from "./types/FeeClaimAddress";
 export * from "./types/FeeCostBreakdown";
 export * from "./types/FeeReceipt";
 export * from "./types/FeeSource";
@@ -48,10 +48,10 @@ export * from "./types/ForeignProposalAtom";
 export * from "./types/FunctionDef";
 export * from "./types/IndexedValue";
 export * from "./types/IndexedWellKnownTypes";
-export * from "./types/InstructionResult";
 export * from "./types/Instruction";
-export * from "./types/JrpcPermissions";
+export * from "./types/InstructionResult";
 export * from "./types/JrpcPermission";
+export * from "./types/JrpcPermissions";
 export * from "./types/LeaderFee";
 export * from "./types/LockFlag";
 export * from "./types/LogEntry";
@@ -60,14 +60,14 @@ export * from "./types/Metadata";
 export * from "./types/MintConfidentialOutputAtom";
 export * from "./types/NetworkCommitteeInfo";
 export * from "./types/NodeHeight";
-export * from "./types/NonFungibleAddressContents";
+export * from "./types/NonFungible";
 export * from "./types/NonFungibleAddress";
+export * from "./types/NonFungibleAddressContents";
 export * from "./types/NonFungibleContainer";
 export * from "./types/NonFungibleId";
-export * from "./types/NonFungibleIndexAddress";
 export * from "./types/NonFungibleIndex";
+export * from "./types/NonFungibleIndexAddress";
 export * from "./types/NonFungibleToken";
-export * from "./types/NonFungible";
 export * from "./types/NumPreshards";
 export * from "./types/Ordering";
 export * from "./types/OwnerRule";
@@ -77,50 +77,50 @@ export * from "./types/QuorumCertificate";
 export * from "./types/QuorumDecision";
 export * from "./types/RejectReason";
 export * from "./types/RequireRule";
+export * from "./types/Resource";
 export * from "./types/ResourceAccessRules";
 export * from "./types/ResourceAddress";
 export * from "./types/ResourceContainer";
-export * from "./types/Resource";
 export * from "./types/ResourceType";
 export * from "./types/RestrictedAccessRule";
 export * from "./types/ResumeNodeAtom";
 export * from "./types/RuleRequirement";
+export * from "./types/Shard";
 export * from "./types/ShardEvidence";
-export * from "./types/ShardGroupEvidence";
 export * from "./types/ShardGroup";
-export * from "./types/Shard";
+export * from "./types/ShardGroupEvidence";
+export * from "./types/Substate";
 export * from "./types/SubstateAddress";
 export * from "./types/SubstateDestroyed";
 export * from "./types/SubstateDiff";
 export * from "./types/SubstateId";
 export * from "./types/SubstateLockType";
 export * from "./types/SubstateRecord";
-export * from "./types/SubstateRequirementLockIntent";
 export * from "./types/SubstateRequirement";
-export * from "./types/Substate";
+export * from "./types/SubstateRequirementLockIntent";
 export * from "./types/SubstateType";
 export * from "./types/SubstateValue";
 export * from "./types/SuspendNodeAtom";
 export * from "./types/TemplateDef";
 export * from "./types/TemplateDefV1";
+export * from "./types/Transaction";
 export * from "./types/TransactionAtom";
 export * from "./types/TransactionPoolRecord";
 export * from "./types/TransactionPoolStage";
-export * from "./types/TransactionReceiptAddress";
 export * from "./types/TransactionReceipt";
+export * from "./types/TransactionReceiptAddress";
 export * from "./types/TransactionResult";
 export * from "./types/TransactionSignature";
 export * from "./types/TransactionStatus";
-export * from "./types/Transaction";
 export * from "./types/Type";
-export * from "./types/UnclaimedConfidentialOutputAddress";
 export * from "./types/UnclaimedConfidentialOutput";
+export * from "./types/UnclaimedConfidentialOutputAddress";
 export * from "./types/UnsignedTransaction";
 export * from "./types/ValidatorSignature";
-export * from "./types/VaultId";
 export * from "./types/Vault";
-export * from "./types/VersionedSubstateIdLockIntent";
+export * from "./types/VaultId";
 export * from "./types/VersionedSubstateId";
+export * from "./types/VersionedSubstateIdLockIntent";
 export * from "./types/ViewableBalanceProof";
 export * from "./base-node-client";
 export * from "./tari-indexer-client";
diff --git a/bindings/dist/tari-indexer-client.d.ts b/bindings/dist/tari-indexer-client.d.ts
index 2bc290afb..03fbfd537 100644
--- a/bindings/dist/tari-indexer-client.d.ts
+++ b/bindings/dist/tari-indexer-client.d.ts
@@ -1,34 +1,34 @@
-export * from "./types/tari-indexer-client/IndexerSubmitTransactionResponse";
+export * from "./types/tari-indexer-client/IndexerGetEpochManagerStatsResponse";
+export * from "./types/tari-indexer-client/IndexerAddPeerRequest";
+export * from "./types/tari-indexer-client/NonFungibleSubstate";
+export * from "./types/tari-indexer-client/GetNonFungibleCountResponse";
+export * from "./types/tari-indexer-client/ListSubstatesRequest";
+export * from "./types/tari-indexer-client/IndexerGetIdentityResponse";
 export * from "./types/tari-indexer-client/GetTemplateDefinitionRequest";
-export * from "./types/tari-indexer-client/ListSubstatesResponse";
-export * from "./types/tari-indexer-client/IndexerAddPeerResponse";
-export * from "./types/tari-indexer-client/InspectSubstateRequest";
-export * from "./types/tari-indexer-client/ListSubstateItem";
+export * from "./types/tari-indexer-client/IndexerGetSubstateRequest";
+export * from "./types/tari-indexer-client/GetTemplateDefinitionResponse";
+export * from "./types/tari-indexer-client/ListTemplatesRequest";
 export * from "./types/tari-indexer-client/IndexerGetAllVnsResponse";
-export * from "./types/tari-indexer-client/ListSubstatesRequest";
-export * from "./types/tari-indexer-client/GetRelatedTransactionsResponse";
-export * from "./types/tari-indexer-client/IndexerTransactionFinalizedResult";
+export * from "./types/tari-indexer-client/GetNonFungiblesRequest";
 export * from "./types/tari-indexer-client/IndexerGetSubstateResponse";
+export * from "./types/tari-indexer-client/IndexerSubmitTransactionRequest";
+export * from "./types/tari-indexer-client/IndexerConnection";
+export * from "./types/tari-indexer-client/InspectSubstateResponse";
 export * from "./types/tari-indexer-client/IndexerGetAllVnsRequest";
+export * from "./types/tari-indexer-client/InspectSubstateRequest";
 export * from "./types/tari-indexer-client/IndexerGetCommsStatsResponse";
-export * from "./types/tari-indexer-client/IndexerConnection";
-export * from "./types/tari-indexer-client/GetNonFungiblesRequest";
-export * from "./types/tari-indexer-client/IndexerAddPeerRequest";
-export * from "./types/tari-indexer-client/GetRelatedTransactionsRequest";
-export * from "./types/tari-indexer-client/GetNonFungiblesResponse";
-export * from "./types/tari-indexer-client/GetTemplateDefinitionResponse";
+export * from "./types/tari-indexer-client/GetNonFungibleCountRequest";
+export * from "./types/tari-indexer-client/GetRelatedTransactionsResponse";
+export * from "./types/tari-indexer-client/IndexerAddPeerResponse";
 export * from "./types/tari-indexer-client/IndexerGetConnectionsResponse";
-export * from "./types/tari-indexer-client/IndexerSubmitTransactionRequest";
+export * from "./types/tari-indexer-client/GetNonFungiblesResponse";
+export * from "./types/tari-indexer-client/GetRelatedTransactionsRequest";
+export * from "./types/tari-indexer-client/IndexerGetTransactionResultResponse";
 export * from "./types/tari-indexer-client/ListTemplatesResponse";
-export * from "./types/tari-indexer-client/InspectSubstateResponse";
+export * from "./types/tari-indexer-client/IndexerGetTransactionResultRequest";
+export * from "./types/tari-indexer-client/ListSubstatesResponse";
+export * from "./types/tari-indexer-client/IndexerTransactionFinalizedResult";
 export * from "./types/tari-indexer-client/GetNonFungibleCollectionsResponse";
-export * from "./types/tari-indexer-client/IndexerGetSubstateRequest";
-export * from "./types/tari-indexer-client/IndexerGetEpochManagerStatsResponse";
-export * from "./types/tari-indexer-client/NonFungibleSubstate";
-export * from "./types/tari-indexer-client/GetNonFungibleCountResponse";
-export * from "./types/tari-indexer-client/ListTemplatesRequest";
-export * from "./types/tari-indexer-client/IndexerGetTransactionResultResponse";
+export * from "./types/tari-indexer-client/IndexerSubmitTransactionResponse";
 export * from "./types/tari-indexer-client/IndexerConnectionDirection";
-export * from "./types/tari-indexer-client/IndexerGetIdentityResponse";
-export * from "./types/tari-indexer-client/IndexerGetTransactionResultRequest";
-export * from "./types/tari-indexer-client/GetNonFungibleCountRequest";
+export * from "./types/tari-indexer-client/ListSubstateItem";
diff --git a/bindings/dist/tari-indexer-client.js b/bindings/dist/tari-indexer-client.js
index d6c53a6f9..633c07b9e 100644
--- a/bindings/dist/tari-indexer-client.js
+++ b/bindings/dist/tari-indexer-client.js
@@ -1,36 +1,36 @@
 //   Copyright 2023 The Tari Project
 //   SPDX-License-Identifier: BSD-3-Clause
-export * from "./types/tari-indexer-client/IndexerSubmitTransactionResponse";
+export * from "./types/tari-indexer-client/IndexerGetEpochManagerStatsResponse";
+export * from "./types/tari-indexer-client/IndexerAddPeerRequest";
+export * from "./types/tari-indexer-client/NonFungibleSubstate";
+export * from "./types/tari-indexer-client/GetNonFungibleCountResponse";
+export * from "./types/tari-indexer-client/ListSubstatesRequest";
+export * from "./types/tari-indexer-client/IndexerGetIdentityResponse";
 export * from "./types/tari-indexer-client/GetTemplateDefinitionRequest";
-export * from "./types/tari-indexer-client/ListSubstatesResponse";
-export * from "./types/tari-indexer-client/IndexerAddPeerResponse";
-export * from "./types/tari-indexer-client/InspectSubstateRequest";
-export * from "./types/tari-indexer-client/ListSubstateItem";
+export * from "./types/tari-indexer-client/IndexerGetSubstateRequest";
+export * from "./types/tari-indexer-client/GetTemplateDefinitionResponse";
+export * from "./types/tari-indexer-client/ListTemplatesRequest";
 export * from "./types/tari-indexer-client/IndexerGetAllVnsResponse";
-export * from "./types/tari-indexer-client/ListSubstatesRequest";
-export * from "./types/tari-indexer-client/GetRelatedTransactionsResponse";
-export * from "./types/tari-indexer-client/IndexerTransactionFinalizedResult";
+export * from "./types/tari-indexer-client/GetNonFungiblesRequest";
 export * from "./types/tari-indexer-client/IndexerGetSubstateResponse";
+export * from "./types/tari-indexer-client/IndexerSubmitTransactionRequest";
+export * from "./types/tari-indexer-client/IndexerConnection";
+export * from "./types/tari-indexer-client/InspectSubstateResponse";
 export * from "./types/tari-indexer-client/IndexerGetAllVnsRequest";
+export * from "./types/tari-indexer-client/InspectSubstateRequest";
 export * from "./types/tari-indexer-client/IndexerGetCommsStatsResponse";
-export * from "./types/tari-indexer-client/IndexerConnection";
-export * from "./types/tari-indexer-client/GetNonFungiblesRequest";
-export * from "./types/tari-indexer-client/IndexerAddPeerRequest";
-export * from "./types/tari-indexer-client/GetRelatedTransactionsRequest";
-export * from "./types/tari-indexer-client/GetNonFungiblesResponse";
-export * from "./types/tari-indexer-client/GetTemplateDefinitionResponse";
+export * from "./types/tari-indexer-client/GetNonFungibleCountRequest";
+export * from "./types/tari-indexer-client/GetRelatedTransactionsResponse";
+export * from "./types/tari-indexer-client/IndexerAddPeerResponse";
 export * from "./types/tari-indexer-client/IndexerGetConnectionsResponse";
-export * from "./types/tari-indexer-client/IndexerSubmitTransactionRequest";
+export * from "./types/tari-indexer-client/GetNonFungiblesResponse";
+export * from "./types/tari-indexer-client/GetRelatedTransactionsRequest";
+export * from "./types/tari-indexer-client/IndexerGetTransactionResultResponse";
 export * from "./types/tari-indexer-client/ListTemplatesResponse";
-export * from "./types/tari-indexer-client/InspectSubstateResponse";
+export * from "./types/tari-indexer-client/IndexerGetTransactionResultRequest";
+export * from "./types/tari-indexer-client/ListSubstatesResponse";
+export * from "./types/tari-indexer-client/IndexerTransactionFinalizedResult";
 export * from "./types/tari-indexer-client/GetNonFungibleCollectionsResponse";
-export * from "./types/tari-indexer-client/IndexerGetSubstateRequest";
-export * from "./types/tari-indexer-client/IndexerGetEpochManagerStatsResponse";
-export * from "./types/tari-indexer-client/NonFungibleSubstate";
-export * from "./types/tari-indexer-client/GetNonFungibleCountResponse";
-export * from "./types/tari-indexer-client/ListTemplatesRequest";
-export * from "./types/tari-indexer-client/IndexerGetTransactionResultResponse";
+export * from "./types/tari-indexer-client/IndexerSubmitTransactionResponse";
 export * from "./types/tari-indexer-client/IndexerConnectionDirection";
-export * from "./types/tari-indexer-client/IndexerGetIdentityResponse";
-export * from "./types/tari-indexer-client/IndexerGetTransactionResultRequest";
-export * from "./types/tari-indexer-client/GetNonFungibleCountRequest";
+export * from "./types/tari-indexer-client/ListSubstateItem";
diff --git a/bindings/dist/types/Instruction.d.ts b/bindings/dist/types/Instruction.d.ts
index ab648b3cc..3ba1996d0 100644
--- a/bindings/dist/types/Instruction.d.ts
+++ b/bindings/dist/types/Instruction.d.ts
@@ -49,4 +49,8 @@ export type Instruction = {
         resource_address: ResourceAddress;
         min_amount: Amount;
     };
+} | {
+    PublishTemplate: {
+        binary: Array<number>;
+    };
 };
diff --git a/bindings/dist/types/PublishedTemplate.d.ts b/bindings/dist/types/PublishedTemplate.d.ts
new file mode 100644
index 000000000..9fe2dcf83
--- /dev/null
+++ b/bindings/dist/types/PublishedTemplate.d.ts
@@ -0,0 +1,3 @@
+export interface PublishedTemplate {
+    template: Array<number>;
+}
diff --git a/bindings/dist/types/PublishedTemplate.js b/bindings/dist/types/PublishedTemplate.js
new file mode 100644
index 000000000..e5b481d1e
--- /dev/null
+++ b/bindings/dist/types/PublishedTemplate.js
@@ -0,0 +1,2 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+export {};
diff --git a/bindings/dist/types/PublishedTemplateAddress.d.ts b/bindings/dist/types/PublishedTemplateAddress.d.ts
new file mode 100644
index 000000000..86e243621
--- /dev/null
+++ b/bindings/dist/types/PublishedTemplateAddress.d.ts
@@ -0,0 +1 @@
+export type PublishedTemplateAddress = string;
diff --git a/bindings/dist/types/PublishedTemplateAddress.js b/bindings/dist/types/PublishedTemplateAddress.js
new file mode 100644
index 000000000..e5b481d1e
--- /dev/null
+++ b/bindings/dist/types/PublishedTemplateAddress.js
@@ -0,0 +1,2 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+export {};
diff --git a/bindings/dist/types/wallet-daemon-client/TransactionSubmitRequest.d.ts b/bindings/dist/types/wallet-daemon-client/TransactionSubmitRequest.d.ts
index 178068063..550584945 100644
--- a/bindings/dist/types/wallet-daemon-client/TransactionSubmitRequest.d.ts
+++ b/bindings/dist/types/wallet-daemon-client/TransactionSubmitRequest.d.ts
@@ -5,5 +5,6 @@ export interface TransactionSubmitRequest {
     signing_key_index: number | null;
     autofill_inputs: Array<SubstateRequirement>;
     detect_inputs: boolean;
+    detect_inputs_use_unversioned: boolean;
     proof_ids: Array<number>;
 }
diff --git a/bindings/dist/validator-node-client.d.ts b/bindings/dist/validator-node-client.d.ts
index 46ef6ce68..cfd875605 100644
--- a/bindings/dist/validator-node-client.d.ts
+++ b/bindings/dist/validator-node-client.d.ts
@@ -1,56 +1,56 @@
+export * from "./types/validator-node-client/GetCommitteeRequest";
+export * from "./types/validator-node-client/GetRecentTransactionsResponse";
+export * from "./types/validator-node-client/GetRecentTransactionsRequest";
+export * from "./types/validator-node-client/GetTemplatesRequest";
+export * from "./types/validator-node-client/GetBlocksCountResponse";
+export * from "./types/validator-node-client/VNAddPeerRequest";
+export * from "./types/validator-node-client/GetCommitteeResponse";
 export * from "./types/validator-node-client/VNSubmitTransactionRequest";
+export * from "./types/validator-node-client/VNConnectionDirection";
+export * from "./types/validator-node-client/VNAddPeerResponse";
+export * from "./types/validator-node-client/GetSubstatesByTransactionResponse";
+export * from "./types/validator-node-client/VNCommitteeShardInfo";
+export * from "./types/validator-node-client/VNFunctionDef";
+export * from "./types/validator-node-client/VNGetValidatorFeesResponse";
+export * from "./types/validator-node-client/VNGetAllVnsResponse";
+export * from "./types/validator-node-client/TemplateAbi";
+export * from "./types/validator-node-client/GetMempoolStatsResponse";
 export * from "./types/validator-node-client/TemplateMetadata";
-export * from "./types/validator-node-client/GetFilteredBlocksCountRequest";
+export * from "./types/validator-node-client/GetBlockResponse";
+export * from "./types/validator-node-client/VNLogLevel";
+export * from "./types/validator-node-client/VNGetAllVnsRequest";
 export * from "./types/validator-node-client/VNLogEntry";
 export * from "./types/validator-node-client/GetShardKeyRequest";
-export * from "./types/validator-node-client/VNGetTransactionResultResponse";
+export * from "./types/validator-node-client/GetBlockRequest";
 export * from "./types/validator-node-client/VNSubmitTransactionResponse";
+export * from "./types/validator-node-client/DryRunTransactionFinalizeResult";
+export * from "./types/validator-node-client/GetTransactionResponse";
+export * from "./types/validator-node-client/GetStateResponse";
+export * from "./types/validator-node-client/VNGetSubstateRequest";
+export * from "./types/validator-node-client/VNGetSubstateResponse";
+export * from "./types/validator-node-client/ListBlocksResponse";
+export * from "./types/validator-node-client/SubstateStatus";
+export * from "./types/validator-node-client/ValidatorNode";
+export * from "./types/validator-node-client/GetFilteredBlocksCountRequest";
+export * from "./types/validator-node-client/ListBlocksRequest";
+export * from "./types/validator-node-client/GetEpochManagerStatsResponse";
 export * from "./types/validator-node-client/GetTxPoolResponse";
+export * from "./types/validator-node-client/VNConnection";
 export * from "./types/validator-node-client/GetTemplateResponse";
-export * from "./types/validator-node-client/GetBlocksCountResponse";
-export * from "./types/validator-node-client/VNGetValidatorFeesRequest";
-export * from "./types/validator-node-client/GetSubstatesByTransactionResponse";
-export * from "./types/validator-node-client/VNConnectionDirection";
-export * from "./types/validator-node-client/VNAddPeerRequest";
-export * from "./types/validator-node-client/GetTemplatesResponse";
-export * from "./types/validator-node-client/GetTransactionRequest";
+export * from "./types/validator-node-client/ValidatorFee";
+export * from "./types/validator-node-client/VNGetConnectionsResponse";
+export * from "./types/validator-node-client/VNGetCommsStatsResponse";
+export * from "./types/validator-node-client/GetTemplateRequest";
 export * from "./types/validator-node-client/GetStateRequest";
-export * from "./types/validator-node-client/VNGetIdentityResponse";
-export * from "./types/validator-node-client/VNFunctionDef";
 export * from "./types/validator-node-client/GetBlocksRequest";
-export * from "./types/validator-node-client/GetTemplateRequest";
+export * from "./types/validator-node-client/VNGetTransactionResultRequest";
+export * from "./types/validator-node-client/GetTransactionRequest";
+export * from "./types/validator-node-client/GetTemplatesResponse";
+export * from "./types/validator-node-client/VNGetTransactionResultResponse";
+export * from "./types/validator-node-client/VNArgDef";
 export * from "./types/validator-node-client/GetShardKeyResponse";
-export * from "./types/validator-node-client/GetSubstatesByTransactionRequest";
-export * from "./types/validator-node-client/VNGetCommsStatsResponse";
-export * from "./types/validator-node-client/GetTransactionResponse";
-export * from "./types/validator-node-client/GetCommitteeResponse";
-export * from "./types/validator-node-client/VNGetAllVnsRequest";
-export * from "./types/validator-node-client/GetCommitteeRequest";
-export * from "./types/validator-node-client/DryRunTransactionFinalizeResult";
-export * from "./types/validator-node-client/VNGetValidatorFeesResponse";
-export * from "./types/validator-node-client/GetStateResponse";
-export * from "./types/validator-node-client/SubstateStatus";
 export * from "./types/validator-node-client/GetBlocksResponse";
-export * from "./types/validator-node-client/ListBlocksResponse";
-export * from "./types/validator-node-client/GetBlockRequest";
-export * from "./types/validator-node-client/VNGetTransactionResultRequest";
-export * from "./types/validator-node-client/GetRecentTransactionsRequest";
-export * from "./types/validator-node-client/ValidatorFee";
-export * from "./types/validator-node-client/VNLogLevel";
-export * from "./types/validator-node-client/GetRecentTransactionsResponse";
-export * from "./types/validator-node-client/VNAddPeerResponse";
-export * from "./types/validator-node-client/VNConnection";
-export * from "./types/validator-node-client/ValidatorNode";
-export * from "./types/validator-node-client/VNGetConnectionsResponse";
-export * from "./types/validator-node-client/ListBlocksRequest";
+export * from "./types/validator-node-client/VNGetIdentityResponse";
+export * from "./types/validator-node-client/GetSubstatesByTransactionRequest";
 export * from "./types/validator-node-client/GetNetworkCommitteeResponse";
-export * from "./types/validator-node-client/VNGetSubstateRequest";
-export * from "./types/validator-node-client/GetMempoolStatsResponse";
-export * from "./types/validator-node-client/TemplateAbi";
-export * from "./types/validator-node-client/GetTemplatesRequest";
-export * from "./types/validator-node-client/VNGetSubstateResponse";
-export * from "./types/validator-node-client/VNGetAllVnsResponse";
-export * from "./types/validator-node-client/VNArgDef";
-export * from "./types/validator-node-client/GetEpochManagerStatsResponse";
-export * from "./types/validator-node-client/GetBlockResponse";
-export * from "./types/validator-node-client/VNCommitteeShardInfo";
+export * from "./types/validator-node-client/VNGetValidatorFeesRequest";
diff --git a/bindings/dist/validator-node-client.js b/bindings/dist/validator-node-client.js
index 89eb92b00..477e5dd45 100644
--- a/bindings/dist/validator-node-client.js
+++ b/bindings/dist/validator-node-client.js
@@ -1,58 +1,58 @@
 //   Copyright 2023 The Tari Project
 //   SPDX-License-Identifier: BSD-3-Clause
+export * from "./types/validator-node-client/GetCommitteeRequest";
+export * from "./types/validator-node-client/GetRecentTransactionsResponse";
+export * from "./types/validator-node-client/GetRecentTransactionsRequest";
+export * from "./types/validator-node-client/GetTemplatesRequest";
+export * from "./types/validator-node-client/GetBlocksCountResponse";
+export * from "./types/validator-node-client/VNAddPeerRequest";
+export * from "./types/validator-node-client/GetCommitteeResponse";
 export * from "./types/validator-node-client/VNSubmitTransactionRequest";
+export * from "./types/validator-node-client/VNConnectionDirection";
+export * from "./types/validator-node-client/VNAddPeerResponse";
+export * from "./types/validator-node-client/GetSubstatesByTransactionResponse";
+export * from "./types/validator-node-client/VNCommitteeShardInfo";
+export * from "./types/validator-node-client/VNFunctionDef";
+export * from "./types/validator-node-client/VNGetValidatorFeesResponse";
+export * from "./types/validator-node-client/VNGetAllVnsResponse";
+export * from "./types/validator-node-client/TemplateAbi";
+export * from "./types/validator-node-client/GetMempoolStatsResponse";
 export * from "./types/validator-node-client/TemplateMetadata";
-export * from "./types/validator-node-client/GetFilteredBlocksCountRequest";
+export * from "./types/validator-node-client/GetBlockResponse";
+export * from "./types/validator-node-client/VNLogLevel";
+export * from "./types/validator-node-client/VNGetAllVnsRequest";
 export * from "./types/validator-node-client/VNLogEntry";
 export * from "./types/validator-node-client/GetShardKeyRequest";
-export * from "./types/validator-node-client/VNGetTransactionResultResponse";
+export * from "./types/validator-node-client/GetBlockRequest";
 export * from "./types/validator-node-client/VNSubmitTransactionResponse";
+export * from "./types/validator-node-client/DryRunTransactionFinalizeResult";
+export * from "./types/validator-node-client/GetTransactionResponse";
+export * from "./types/validator-node-client/GetStateResponse";
+export * from "./types/validator-node-client/VNGetSubstateRequest";
+export * from "./types/validator-node-client/VNGetSubstateResponse";
+export * from "./types/validator-node-client/ListBlocksResponse";
+export * from "./types/validator-node-client/SubstateStatus";
+export * from "./types/validator-node-client/ValidatorNode";
+export * from "./types/validator-node-client/GetFilteredBlocksCountRequest";
+export * from "./types/validator-node-client/ListBlocksRequest";
+export * from "./types/validator-node-client/GetEpochManagerStatsResponse";
 export * from "./types/validator-node-client/GetTxPoolResponse";
+export * from "./types/validator-node-client/VNConnection";
 export * from "./types/validator-node-client/GetTemplateResponse";
-export * from "./types/validator-node-client/GetBlocksCountResponse";
-export * from "./types/validator-node-client/VNGetValidatorFeesRequest";
-export * from "./types/validator-node-client/GetSubstatesByTransactionResponse";
-export * from "./types/validator-node-client/VNConnectionDirection";
-export * from "./types/validator-node-client/VNAddPeerRequest";
-export * from "./types/validator-node-client/GetTemplatesResponse";
-export * from "./types/validator-node-client/GetTransactionRequest";
+export * from "./types/validator-node-client/ValidatorFee";
+export * from "./types/validator-node-client/VNGetConnectionsResponse";
+export * from "./types/validator-node-client/VNGetCommsStatsResponse";
+export * from "./types/validator-node-client/GetTemplateRequest";
 export * from "./types/validator-node-client/GetStateRequest";
-export * from "./types/validator-node-client/VNGetIdentityResponse";
-export * from "./types/validator-node-client/VNFunctionDef";
 export * from "./types/validator-node-client/GetBlocksRequest";
-export * from "./types/validator-node-client/GetTemplateRequest";
+export * from "./types/validator-node-client/VNGetTransactionResultRequest";
+export * from "./types/validator-node-client/GetTransactionRequest";
+export * from "./types/validator-node-client/GetTemplatesResponse";
+export * from "./types/validator-node-client/VNGetTransactionResultResponse";
+export * from "./types/validator-node-client/VNArgDef";
 export * from "./types/validator-node-client/GetShardKeyResponse";
-export * from "./types/validator-node-client/GetSubstatesByTransactionRequest";
-export * from "./types/validator-node-client/VNGetCommsStatsResponse";
-export * from "./types/validator-node-client/GetTransactionResponse";
-export * from "./types/validator-node-client/GetCommitteeResponse";
-export * from "./types/validator-node-client/VNGetAllVnsRequest";
-export * from "./types/validator-node-client/GetCommitteeRequest";
-export * from "./types/validator-node-client/DryRunTransactionFinalizeResult";
-export * from "./types/validator-node-client/VNGetValidatorFeesResponse";
-export * from "./types/validator-node-client/GetStateResponse";
-export * from "./types/validator-node-client/SubstateStatus";
 export * from "./types/validator-node-client/GetBlocksResponse";
-export * from "./types/validator-node-client/ListBlocksResponse";
-export * from "./types/validator-node-client/GetBlockRequest";
-export * from "./types/validator-node-client/VNGetTransactionResultRequest";
-export * from "./types/validator-node-client/GetRecentTransactionsRequest";
-export * from "./types/validator-node-client/ValidatorFee";
-export * from "./types/validator-node-client/VNLogLevel";
-export * from "./types/validator-node-client/GetRecentTransactionsResponse";
-export * from "./types/validator-node-client/VNAddPeerResponse";
-export * from "./types/validator-node-client/VNConnection";
-export * from "./types/validator-node-client/ValidatorNode";
-export * from "./types/validator-node-client/VNGetConnectionsResponse";
-export * from "./types/validator-node-client/ListBlocksRequest";
+export * from "./types/validator-node-client/VNGetIdentityResponse";
+export * from "./types/validator-node-client/GetSubstatesByTransactionRequest";
 export * from "./types/validator-node-client/GetNetworkCommitteeResponse";
-export * from "./types/validator-node-client/VNGetSubstateRequest";
-export * from "./types/validator-node-client/GetMempoolStatsResponse";
-export * from "./types/validator-node-client/TemplateAbi";
-export * from "./types/validator-node-client/GetTemplatesRequest";
-export * from "./types/validator-node-client/VNGetSubstateResponse";
-export * from "./types/validator-node-client/VNGetAllVnsResponse";
-export * from "./types/validator-node-client/VNArgDef";
-export * from "./types/validator-node-client/GetEpochManagerStatsResponse";
-export * from "./types/validator-node-client/GetBlockResponse";
-export * from "./types/validator-node-client/VNCommitteeShardInfo";
+export * from "./types/validator-node-client/VNGetValidatorFeesRequest";
diff --git a/bindings/dist/wallet-daemon-client.d.ts b/bindings/dist/wallet-daemon-client.d.ts
index 72464d0b9..800a672e4 100644
--- a/bindings/dist/wallet-daemon-client.d.ts
+++ b/bindings/dist/wallet-daemon-client.d.ts
@@ -1,89 +1,89 @@
-export * from "./types/wallet-daemon-client/WalletSubstateRecord";
-export * from "./types/wallet-daemon-client/ProofsFinalizeResponse";
-export * from "./types/wallet-daemon-client/CallInstructionRequest";
-export * from "./types/wallet-daemon-client/AuthLoginAcceptResponse";
-export * from "./types/wallet-daemon-client/AccountsListRequest";
-export * from "./types/wallet-daemon-client/AuthGetAllJwtResponse";
-export * from "./types/wallet-daemon-client/AuthLoginResponse";
-export * from "./types/wallet-daemon-client/GetValidatorFeesRequest";
-export * from "./types/wallet-daemon-client/AccountGetDefaultRequest";
-export * from "./types/wallet-daemon-client/AuthGetAllJwtRequest";
-export * from "./types/wallet-daemon-client/KeyBranch";
-export * from "./types/wallet-daemon-client/AccountGetResponse";
-export * from "./types/wallet-daemon-client/SettingsSetRequest";
-export * from "./types/wallet-daemon-client/GetValidatorFeesResponse";
-export * from "./types/wallet-daemon-client/TransactionGetAllRequest";
+export * from "./types/wallet-daemon-client/AccountsListResponse";
 export * from "./types/wallet-daemon-client/RevealFundsRequest";
-export * from "./types/wallet-daemon-client/AuthLoginDenyResponse";
-export * from "./types/wallet-daemon-client/AuthLoginDenyRequest";
-export * from "./types/wallet-daemon-client/TransactionSubmitResponse";
-export * from "./types/wallet-daemon-client/ProofsGenerateResponse";
-export * from "./types/wallet-daemon-client/ClaimValidatorFeesRequest";
-export * from "./types/wallet-daemon-client/AuthLoginRequest";
+export * from "./types/wallet-daemon-client/ClaimBurnResponse";
+export * from "./types/wallet-daemon-client/KeysSetActiveRequest";
+export * from "./types/wallet-daemon-client/WalletSubstateRecord";
+export * from "./types/wallet-daemon-client/AccountsGetBalancesResponse";
+export * from "./types/wallet-daemon-client/SubstatesGetResponse";
 export * from "./types/wallet-daemon-client/ListAccountNftRequest";
+export * from "./types/wallet-daemon-client/RevealFundsResponse";
+export * from "./types/wallet-daemon-client/AccountSetDefaultRequest";
+export * from "./types/wallet-daemon-client/GetAccountNftRequest";
+export * from "./types/wallet-daemon-client/TransactionGetAllResponse";
 export * from "./types/wallet-daemon-client/TransactionGetRequest";
-export * from "./types/wallet-daemon-client/AuthRevokeTokenResponse";
-export * from "./types/wallet-daemon-client/ProofsFinalizeRequest";
-export * from "./types/wallet-daemon-client/AccountsTransferRequest";
-export * from "./types/wallet-daemon-client/SettingsSetResponse";
-export * from "./types/wallet-daemon-client/KeysListRequest";
+export * from "./types/wallet-daemon-client/KeyBranch";
+export * from "./types/wallet-daemon-client/AuthLoginAcceptRequest";
+export * from "./types/wallet-daemon-client/AccountSetDefaultResponse";
+export * from "./types/wallet-daemon-client/SubstatesListResponse";
+export * from "./types/wallet-daemon-client/AccountGetDefaultRequest";
+export * from "./types/wallet-daemon-client/KeysListResponse";
+export * from "./types/wallet-daemon-client/ProofsGenerateResponse";
+export * from "./types/wallet-daemon-client/TransactionGetAllRequest";
 export * from "./types/wallet-daemon-client/AccountsTransferResponse";
-export * from "./types/wallet-daemon-client/TransactionGetResultResponse";
+export * from "./types/wallet-daemon-client/AuthLoginResponse";
 export * from "./types/wallet-daemon-client/ClaimBurnRequest";
-export * from "./types/wallet-daemon-client/KeysListResponse";
+export * from "./types/wallet-daemon-client/BalanceEntry";
+export * from "./types/wallet-daemon-client/KeysListRequest";
 export * from "./types/wallet-daemon-client/SubstatesGetRequest";
-export * from "./types/wallet-daemon-client/TransactionSubmitRequest";
-export * from "./types/wallet-daemon-client/AccountsGetBalancesResponse";
-export * from "./types/wallet-daemon-client/TransactionGetAllResponse";
-export * from "./types/wallet-daemon-client/AccountsCreateFreeTestCoinsResponse";
-export * from "./types/wallet-daemon-client/ConfidentialTransferResponse";
-export * from "./types/wallet-daemon-client/TransactionGetResponse";
-export * from "./types/wallet-daemon-client/SubstatesGetResponse";
-export * from "./types/wallet-daemon-client/GetAccountNftRequest";
+export * from "./types/wallet-daemon-client/ProofsFinalizeResponse";
 export * from "./types/wallet-daemon-client/AuthRevokeTokenRequest";
-export * from "./types/wallet-daemon-client/ProofsGenerateRequest";
-export * from "./types/wallet-daemon-client/RevealFundsResponse";
-export * from "./types/wallet-daemon-client/AccountsInvokeResponse";
-export * from "./types/wallet-daemon-client/AccountsListResponse";
+export * from "./types/wallet-daemon-client/TransactionWaitResultRequest";
+export * from "./types/wallet-daemon-client/TransactionSubmitResponse";
+export * from "./types/wallet-daemon-client/AccountsCreateRequest";
+export * from "./types/wallet-daemon-client/CallInstructionRequest";
+export * from "./types/wallet-daemon-client/WebRtcStartRequest";
 export * from "./types/wallet-daemon-client/WebRtcStartResponse";
-export * from "./types/wallet-daemon-client/TransactionGetResultRequest";
+export * from "./types/wallet-daemon-client/TransactionSubmitDryRunRequest";
+export * from "./types/wallet-daemon-client/MintAccountNftResponse";
 export * from "./types/wallet-daemon-client/ProofsCancelResponse";
-export * from "./types/wallet-daemon-client/AccountsCreateRequest";
-export * from "./types/wallet-daemon-client/MintAccountNftRequest";
-export * from "./types/wallet-daemon-client/TransactionClaimBurnResponse";
-export * from "./types/wallet-daemon-client/TransactionWaitResultRequest";
-export * from "./types/wallet-daemon-client/ClaimValidatorFeesResponse";
+export * from "./types/wallet-daemon-client/AccountGetResponse";
+export * from "./types/wallet-daemon-client/ClaimValidatorFeesRequest";
+export * from "./types/wallet-daemon-client/AuthRevokeTokenResponse";
+export * from "./types/wallet-daemon-client/AccountsInvokeRequest";
+export * from "./types/wallet-daemon-client/WebRtcStart";
+export * from "./types/wallet-daemon-client/TransactionWaitResultResponse";
+export * from "./types/wallet-daemon-client/GetValidatorFeesRequest";
 export * from "./types/wallet-daemon-client/ConfidentialCreateOutputProofRequest";
-export * from "./types/wallet-daemon-client/KeysCreateRequest";
+export * from "./types/wallet-daemon-client/KeysCreateResponse";
+export * from "./types/wallet-daemon-client/AuthLoginDenyRequest";
+export * from "./types/wallet-daemon-client/ProofsFinalizeRequest";
+export * from "./types/wallet-daemon-client/ProofsCancelRequest";
 export * from "./types/wallet-daemon-client/SettingsGetResponse";
+export * from "./types/wallet-daemon-client/ConfidentialViewVaultBalanceRequest";
+export * from "./types/wallet-daemon-client/GetValidatorFeesResponse";
+export * from "./types/wallet-daemon-client/TransactionGetResponse";
+export * from "./types/wallet-daemon-client/TransactionSubmitRequest";
+export * from "./types/wallet-daemon-client/ListAccountNftResponse";
+export * from "./types/wallet-daemon-client/AccountsInvokeResponse";
+export * from "./types/wallet-daemon-client/AccountsListRequest";
+export * from "./types/wallet-daemon-client/AuthLoginAcceptResponse";
 export * from "./types/wallet-daemon-client/TransactionSubmitDryRunResponse";
-export * from "./types/wallet-daemon-client/ClaimBurnResponse";
-export * from "./types/wallet-daemon-client/WebRtcStartRequest";
-export * from "./types/wallet-daemon-client/ConfidentialViewVaultBalanceResponse";
-export * from "./types/wallet-daemon-client/WebRtcStart";
-export * from "./types/wallet-daemon-client/AccountSetDefaultRequest";
 export * from "./types/wallet-daemon-client/ConfidentialCreateOutputProofResponse";
+export * from "./types/wallet-daemon-client/TemplatesGetRequest";
+export * from "./types/wallet-daemon-client/ConfidentialViewVaultBalanceResponse";
+export * from "./types/wallet-daemon-client/SettingsSetRequest";
+export * from "./types/wallet-daemon-client/MintAccountNftRequest";
+export * from "./types/wallet-daemon-client/TransactionClaimBurnResponse";
+export * from "./types/wallet-daemon-client/AuthGetAllJwtRequest";
+export * from "./types/wallet-daemon-client/ClaimValidatorFeesResponse";
+export * from "./types/wallet-daemon-client/ConfidentialTransferResponse";
 export * from "./types/wallet-daemon-client/TemplatesGetResponse";
-export * from "./types/wallet-daemon-client/ListAccountNftResponse";
-export * from "./types/wallet-daemon-client/AccountsGetBalancesRequest";
-export * from "./types/wallet-daemon-client/MintAccountNftResponse";
+export * from "./types/wallet-daemon-client/AccountsTransferRequest";
+export * from "./types/wallet-daemon-client/AuthLoginRequest";
+export * from "./types/wallet-daemon-client/AuthGetAllJwtResponse";
 export * from "./types/wallet-daemon-client/AccountsCreateFreeTestCoinsRequest";
-export * from "./types/wallet-daemon-client/KeysCreateResponse";
+export * from "./types/wallet-daemon-client/ConfidentialTransferRequest";
+export * from "./types/wallet-daemon-client/SettingsSetResponse";
+export * from "./types/wallet-daemon-client/AccountsCreateFreeTestCoinsResponse";
+export * from "./types/wallet-daemon-client/AccountGetRequest";
+export * from "./types/wallet-daemon-client/KeysCreateRequest";
+export * from "./types/wallet-daemon-client/ProofsGenerateRequest";
+export * from "./types/wallet-daemon-client/TransactionGetResultResponse";
+export * from "./types/wallet-daemon-client/KeysSetActiveResponse";
+export * from "./types/wallet-daemon-client/AuthLoginDenyResponse";
+export * from "./types/wallet-daemon-client/TransactionGetResultRequest";
+export * from "./types/wallet-daemon-client/AccountsCreateResponse";
+export * from "./types/wallet-daemon-client/AccountsGetBalancesRequest";
 export * from "./types/wallet-daemon-client/AccountInfo";
 export * from "./types/wallet-daemon-client/SubstatesListRequest";
-export * from "./types/wallet-daemon-client/BalanceEntry";
-export * from "./types/wallet-daemon-client/TemplatesGetRequest";
-export * from "./types/wallet-daemon-client/AccountsInvokeRequest";
-export * from "./types/wallet-daemon-client/ProofsCancelRequest";
-export * from "./types/wallet-daemon-client/AccountSetDefaultResponse";
-export * from "./types/wallet-daemon-client/SubstatesListResponse";
-export * from "./types/wallet-daemon-client/KeysSetActiveResponse";
 export * from "./types/wallet-daemon-client/ComponentAddressOrName";
-export * from "./types/wallet-daemon-client/AuthLoginAcceptRequest";
-export * from "./types/wallet-daemon-client/TransactionSubmitDryRunRequest";
-export * from "./types/wallet-daemon-client/KeysSetActiveRequest";
-export * from "./types/wallet-daemon-client/ConfidentialViewVaultBalanceRequest";
-export * from "./types/wallet-daemon-client/ConfidentialTransferRequest";
-export * from "./types/wallet-daemon-client/AccountsCreateResponse";
-export * from "./types/wallet-daemon-client/TransactionWaitResultResponse";
-export * from "./types/wallet-daemon-client/AccountGetRequest";
diff --git a/bindings/dist/wallet-daemon-client.js b/bindings/dist/wallet-daemon-client.js
index 389f4730a..e579fd71b 100644
--- a/bindings/dist/wallet-daemon-client.js
+++ b/bindings/dist/wallet-daemon-client.js
@@ -1,91 +1,91 @@
 //   Copyright 2023 The Tari Project
 //   SPDX-License-Identifier: BSD-3-Clause
-export * from "./types/wallet-daemon-client/WalletSubstateRecord";
-export * from "./types/wallet-daemon-client/ProofsFinalizeResponse";
-export * from "./types/wallet-daemon-client/CallInstructionRequest";
-export * from "./types/wallet-daemon-client/AuthLoginAcceptResponse";
-export * from "./types/wallet-daemon-client/AccountsListRequest";
-export * from "./types/wallet-daemon-client/AuthGetAllJwtResponse";
-export * from "./types/wallet-daemon-client/AuthLoginResponse";
-export * from "./types/wallet-daemon-client/GetValidatorFeesRequest";
-export * from "./types/wallet-daemon-client/AccountGetDefaultRequest";
-export * from "./types/wallet-daemon-client/AuthGetAllJwtRequest";
-export * from "./types/wallet-daemon-client/KeyBranch";
-export * from "./types/wallet-daemon-client/AccountGetResponse";
-export * from "./types/wallet-daemon-client/SettingsSetRequest";
-export * from "./types/wallet-daemon-client/GetValidatorFeesResponse";
-export * from "./types/wallet-daemon-client/TransactionGetAllRequest";
+export * from "./types/wallet-daemon-client/AccountsListResponse";
 export * from "./types/wallet-daemon-client/RevealFundsRequest";
-export * from "./types/wallet-daemon-client/AuthLoginDenyResponse";
-export * from "./types/wallet-daemon-client/AuthLoginDenyRequest";
-export * from "./types/wallet-daemon-client/TransactionSubmitResponse";
-export * from "./types/wallet-daemon-client/ProofsGenerateResponse";
-export * from "./types/wallet-daemon-client/ClaimValidatorFeesRequest";
-export * from "./types/wallet-daemon-client/AuthLoginRequest";
+export * from "./types/wallet-daemon-client/ClaimBurnResponse";
+export * from "./types/wallet-daemon-client/KeysSetActiveRequest";
+export * from "./types/wallet-daemon-client/WalletSubstateRecord";
+export * from "./types/wallet-daemon-client/AccountsGetBalancesResponse";
+export * from "./types/wallet-daemon-client/SubstatesGetResponse";
 export * from "./types/wallet-daemon-client/ListAccountNftRequest";
+export * from "./types/wallet-daemon-client/RevealFundsResponse";
+export * from "./types/wallet-daemon-client/AccountSetDefaultRequest";
+export * from "./types/wallet-daemon-client/GetAccountNftRequest";
+export * from "./types/wallet-daemon-client/TransactionGetAllResponse";
 export * from "./types/wallet-daemon-client/TransactionGetRequest";
-export * from "./types/wallet-daemon-client/AuthRevokeTokenResponse";
-export * from "./types/wallet-daemon-client/ProofsFinalizeRequest";
-export * from "./types/wallet-daemon-client/AccountsTransferRequest";
-export * from "./types/wallet-daemon-client/SettingsSetResponse";
-export * from "./types/wallet-daemon-client/KeysListRequest";
+export * from "./types/wallet-daemon-client/KeyBranch";
+export * from "./types/wallet-daemon-client/AuthLoginAcceptRequest";
+export * from "./types/wallet-daemon-client/AccountSetDefaultResponse";
+export * from "./types/wallet-daemon-client/SubstatesListResponse";
+export * from "./types/wallet-daemon-client/AccountGetDefaultRequest";
+export * from "./types/wallet-daemon-client/KeysListResponse";
+export * from "./types/wallet-daemon-client/ProofsGenerateResponse";
+export * from "./types/wallet-daemon-client/TransactionGetAllRequest";
 export * from "./types/wallet-daemon-client/AccountsTransferResponse";
-export * from "./types/wallet-daemon-client/TransactionGetResultResponse";
+export * from "./types/wallet-daemon-client/AuthLoginResponse";
 export * from "./types/wallet-daemon-client/ClaimBurnRequest";
-export * from "./types/wallet-daemon-client/KeysListResponse";
+export * from "./types/wallet-daemon-client/BalanceEntry";
+export * from "./types/wallet-daemon-client/KeysListRequest";
 export * from "./types/wallet-daemon-client/SubstatesGetRequest";
-export * from "./types/wallet-daemon-client/TransactionSubmitRequest";
-export * from "./types/wallet-daemon-client/AccountsGetBalancesResponse";
-export * from "./types/wallet-daemon-client/TransactionGetAllResponse";
-export * from "./types/wallet-daemon-client/AccountsCreateFreeTestCoinsResponse";
-export * from "./types/wallet-daemon-client/ConfidentialTransferResponse";
-export * from "./types/wallet-daemon-client/TransactionGetResponse";
-export * from "./types/wallet-daemon-client/SubstatesGetResponse";
-export * from "./types/wallet-daemon-client/GetAccountNftRequest";
+export * from "./types/wallet-daemon-client/ProofsFinalizeResponse";
 export * from "./types/wallet-daemon-client/AuthRevokeTokenRequest";
-export * from "./types/wallet-daemon-client/ProofsGenerateRequest";
-export * from "./types/wallet-daemon-client/RevealFundsResponse";
-export * from "./types/wallet-daemon-client/AccountsInvokeResponse";
-export * from "./types/wallet-daemon-client/AccountsListResponse";
+export * from "./types/wallet-daemon-client/TransactionWaitResultRequest";
+export * from "./types/wallet-daemon-client/TransactionSubmitResponse";
+export * from "./types/wallet-daemon-client/AccountsCreateRequest";
+export * from "./types/wallet-daemon-client/CallInstructionRequest";
+export * from "./types/wallet-daemon-client/WebRtcStartRequest";
 export * from "./types/wallet-daemon-client/WebRtcStartResponse";
-export * from "./types/wallet-daemon-client/TransactionGetResultRequest";
+export * from "./types/wallet-daemon-client/TransactionSubmitDryRunRequest";
+export * from "./types/wallet-daemon-client/MintAccountNftResponse";
 export * from "./types/wallet-daemon-client/ProofsCancelResponse";
-export * from "./types/wallet-daemon-client/AccountsCreateRequest";
-export * from "./types/wallet-daemon-client/MintAccountNftRequest";
-export * from "./types/wallet-daemon-client/TransactionClaimBurnResponse";
-export * from "./types/wallet-daemon-client/TransactionWaitResultRequest";
-export * from "./types/wallet-daemon-client/ClaimValidatorFeesResponse";
+export * from "./types/wallet-daemon-client/AccountGetResponse";
+export * from "./types/wallet-daemon-client/ClaimValidatorFeesRequest";
+export * from "./types/wallet-daemon-client/AuthRevokeTokenResponse";
+export * from "./types/wallet-daemon-client/AccountsInvokeRequest";
+export * from "./types/wallet-daemon-client/WebRtcStart";
+export * from "./types/wallet-daemon-client/TransactionWaitResultResponse";
+export * from "./types/wallet-daemon-client/GetValidatorFeesRequest";
 export * from "./types/wallet-daemon-client/ConfidentialCreateOutputProofRequest";
-export * from "./types/wallet-daemon-client/KeysCreateRequest";
+export * from "./types/wallet-daemon-client/KeysCreateResponse";
+export * from "./types/wallet-daemon-client/AuthLoginDenyRequest";
+export * from "./types/wallet-daemon-client/ProofsFinalizeRequest";
+export * from "./types/wallet-daemon-client/ProofsCancelRequest";
 export * from "./types/wallet-daemon-client/SettingsGetResponse";
+export * from "./types/wallet-daemon-client/ConfidentialViewVaultBalanceRequest";
+export * from "./types/wallet-daemon-client/GetValidatorFeesResponse";
+export * from "./types/wallet-daemon-client/TransactionGetResponse";
+export * from "./types/wallet-daemon-client/TransactionSubmitRequest";
+export * from "./types/wallet-daemon-client/ListAccountNftResponse";
+export * from "./types/wallet-daemon-client/AccountsInvokeResponse";
+export * from "./types/wallet-daemon-client/AccountsListRequest";
+export * from "./types/wallet-daemon-client/AuthLoginAcceptResponse";
 export * from "./types/wallet-daemon-client/TransactionSubmitDryRunResponse";
-export * from "./types/wallet-daemon-client/ClaimBurnResponse";
-export * from "./types/wallet-daemon-client/WebRtcStartRequest";
-export * from "./types/wallet-daemon-client/ConfidentialViewVaultBalanceResponse";
-export * from "./types/wallet-daemon-client/WebRtcStart";
-export * from "./types/wallet-daemon-client/AccountSetDefaultRequest";
 export * from "./types/wallet-daemon-client/ConfidentialCreateOutputProofResponse";
+export * from "./types/wallet-daemon-client/TemplatesGetRequest";
+export * from "./types/wallet-daemon-client/ConfidentialViewVaultBalanceResponse";
+export * from "./types/wallet-daemon-client/SettingsSetRequest";
+export * from "./types/wallet-daemon-client/MintAccountNftRequest";
+export * from "./types/wallet-daemon-client/TransactionClaimBurnResponse";
+export * from "./types/wallet-daemon-client/AuthGetAllJwtRequest";
+export * from "./types/wallet-daemon-client/ClaimValidatorFeesResponse";
+export * from "./types/wallet-daemon-client/ConfidentialTransferResponse";
 export * from "./types/wallet-daemon-client/TemplatesGetResponse";
-export * from "./types/wallet-daemon-client/ListAccountNftResponse";
-export * from "./types/wallet-daemon-client/AccountsGetBalancesRequest";
-export * from "./types/wallet-daemon-client/MintAccountNftResponse";
+export * from "./types/wallet-daemon-client/AccountsTransferRequest";
+export * from "./types/wallet-daemon-client/AuthLoginRequest";
+export * from "./types/wallet-daemon-client/AuthGetAllJwtResponse";
 export * from "./types/wallet-daemon-client/AccountsCreateFreeTestCoinsRequest";
-export * from "./types/wallet-daemon-client/KeysCreateResponse";
+export * from "./types/wallet-daemon-client/ConfidentialTransferRequest";
+export * from "./types/wallet-daemon-client/SettingsSetResponse";
+export * from "./types/wallet-daemon-client/AccountsCreateFreeTestCoinsResponse";
+export * from "./types/wallet-daemon-client/AccountGetRequest";
+export * from "./types/wallet-daemon-client/KeysCreateRequest";
+export * from "./types/wallet-daemon-client/ProofsGenerateRequest";
+export * from "./types/wallet-daemon-client/TransactionGetResultResponse";
+export * from "./types/wallet-daemon-client/KeysSetActiveResponse";
+export * from "./types/wallet-daemon-client/AuthLoginDenyResponse";
+export * from "./types/wallet-daemon-client/TransactionGetResultRequest";
+export * from "./types/wallet-daemon-client/AccountsCreateResponse";
+export * from "./types/wallet-daemon-client/AccountsGetBalancesRequest";
 export * from "./types/wallet-daemon-client/AccountInfo";
 export * from "./types/wallet-daemon-client/SubstatesListRequest";
-export * from "./types/wallet-daemon-client/BalanceEntry";
-export * from "./types/wallet-daemon-client/TemplatesGetRequest";
-export * from "./types/wallet-daemon-client/AccountsInvokeRequest";
-export * from "./types/wallet-daemon-client/ProofsCancelRequest";
-export * from "./types/wallet-daemon-client/AccountSetDefaultResponse";
-export * from "./types/wallet-daemon-client/SubstatesListResponse";
-export * from "./types/wallet-daemon-client/KeysSetActiveResponse";
 export * from "./types/wallet-daemon-client/ComponentAddressOrName";
-export * from "./types/wallet-daemon-client/AuthLoginAcceptRequest";
-export * from "./types/wallet-daemon-client/TransactionSubmitDryRunRequest";
-export * from "./types/wallet-daemon-client/KeysSetActiveRequest";
-export * from "./types/wallet-daemon-client/ConfidentialViewVaultBalanceRequest";
-export * from "./types/wallet-daemon-client/ConfidentialTransferRequest";
-export * from "./types/wallet-daemon-client/AccountsCreateResponse";
-export * from "./types/wallet-daemon-client/TransactionWaitResultResponse";
-export * from "./types/wallet-daemon-client/AccountGetRequest";
diff --git a/bindings/src/index.ts b/bindings/src/index.ts
index d3345a466..ffca6215d 100644
--- a/bindings/src/index.ts
+++ b/bindings/src/index.ts
@@ -5,25 +5,25 @@ export * from "./types/AbortReason";
 export * from "./types/AccessRule";
 export * from "./types/Account";
 export * from "./types/Amount";
-export * from "./types/ArgDef";
 export * from "./types/Arg";
+export * from "./types/ArgDef";
 export * from "./types/AuthHook";
-export * from "./types/BlockHeader";
 export * from "./types/Block";
+export * from "./types/BlockHeader";
 export * from "./types/BucketId";
 export * from "./types/Claims";
 export * from "./types/Command";
+export * from "./types/Committee";
 export * from "./types/CommitteeInfo";
 export * from "./types/CommitteeShardInfo";
-export * from "./types/Committee";
 export * from "./types/ComponentAccessRules";
 export * from "./types/ComponentAddress";
 export * from "./types/ComponentBody";
 export * from "./types/ComponentHeader";
 export * from "./types/ComponentKey";
 export * from "./types/ConfidentialClaim";
-export * from "./types/ConfidentialOutputStatement";
 export * from "./types/ConfidentialOutput";
+export * from "./types/ConfidentialOutputStatement";
 export * from "./types/ConfidentialStatement";
 export * from "./types/ConfidentialTransferInputSelection";
 export * from "./types/ConfidentialWithdrawProof";
@@ -35,12 +35,12 @@ export * from "./types/Era";
 export * from "./types/Event";
 export * from "./types/EvictNodeAtom";
 export * from "./types/Evidence";
-export * from "./types/ExecutedTransaction";
 export * from "./types/ExecuteResult";
+export * from "./types/ExecutedTransaction";
 export * from "./types/ExtraData";
 export * from "./types/FeeBreakdown";
-export * from "./types/FeeClaimAddress";
 export * from "./types/FeeClaim";
+export * from "./types/FeeClaimAddress";
 export * from "./types/FeeCostBreakdown";
 export * from "./types/FeeReceipt";
 export * from "./types/FeeSource";
@@ -49,10 +49,10 @@ export * from "./types/ForeignProposalAtom";
 export * from "./types/FunctionDef";
 export * from "./types/IndexedValue";
 export * from "./types/IndexedWellKnownTypes";
-export * from "./types/InstructionResult";
 export * from "./types/Instruction";
-export * from "./types/JrpcPermissions";
+export * from "./types/InstructionResult";
 export * from "./types/JrpcPermission";
+export * from "./types/JrpcPermissions";
 export * from "./types/LeaderFee";
 export * from "./types/LockFlag";
 export * from "./types/LogEntry";
@@ -61,14 +61,14 @@ export * from "./types/Metadata";
 export * from "./types/MintConfidentialOutputAtom";
 export * from "./types/NetworkCommitteeInfo";
 export * from "./types/NodeHeight";
-export * from "./types/NonFungibleAddressContents";
+export * from "./types/NonFungible";
 export * from "./types/NonFungibleAddress";
+export * from "./types/NonFungibleAddressContents";
 export * from "./types/NonFungibleContainer";
 export * from "./types/NonFungibleId";
-export * from "./types/NonFungibleIndexAddress";
 export * from "./types/NonFungibleIndex";
+export * from "./types/NonFungibleIndexAddress";
 export * from "./types/NonFungibleToken";
-export * from "./types/NonFungible";
 export * from "./types/NumPreshards";
 export * from "./types/Ordering";
 export * from "./types/OwnerRule";
@@ -78,50 +78,50 @@ export * from "./types/QuorumCertificate";
 export * from "./types/QuorumDecision";
 export * from "./types/RejectReason";
 export * from "./types/RequireRule";
+export * from "./types/Resource";
 export * from "./types/ResourceAccessRules";
 export * from "./types/ResourceAddress";
 export * from "./types/ResourceContainer";
-export * from "./types/Resource";
 export * from "./types/ResourceType";
 export * from "./types/RestrictedAccessRule";
 export * from "./types/ResumeNodeAtom";
 export * from "./types/RuleRequirement";
+export * from "./types/Shard";
 export * from "./types/ShardEvidence";
-export * from "./types/ShardGroupEvidence";
 export * from "./types/ShardGroup";
-export * from "./types/Shard";
+export * from "./types/ShardGroupEvidence";
+export * from "./types/Substate";
 export * from "./types/SubstateAddress";
 export * from "./types/SubstateDestroyed";
 export * from "./types/SubstateDiff";
 export * from "./types/SubstateId";
 export * from "./types/SubstateLockType";
 export * from "./types/SubstateRecord";
-export * from "./types/SubstateRequirementLockIntent";
 export * from "./types/SubstateRequirement";
-export * from "./types/Substate";
+export * from "./types/SubstateRequirementLockIntent";
 export * from "./types/SubstateType";
 export * from "./types/SubstateValue";
 export * from "./types/SuspendNodeAtom";
 export * from "./types/TemplateDef";
 export * from "./types/TemplateDefV1";
+export * from "./types/Transaction";
 export * from "./types/TransactionAtom";
 export * from "./types/TransactionPoolRecord";
 export * from "./types/TransactionPoolStage";
-export * from "./types/TransactionReceiptAddress";
 export * from "./types/TransactionReceipt";
+export * from "./types/TransactionReceiptAddress";
 export * from "./types/TransactionResult";
 export * from "./types/TransactionSignature";
 export * from "./types/TransactionStatus";
-export * from "./types/Transaction";
 export * from "./types/Type";
-export * from "./types/UnclaimedConfidentialOutputAddress";
 export * from "./types/UnclaimedConfidentialOutput";
+export * from "./types/UnclaimedConfidentialOutputAddress";
 export * from "./types/UnsignedTransaction";
 export * from "./types/ValidatorSignature";
-export * from "./types/VaultId";
 export * from "./types/Vault";
-export * from "./types/VersionedSubstateIdLockIntent";
+export * from "./types/VaultId";
 export * from "./types/VersionedSubstateId";
+export * from "./types/VersionedSubstateIdLockIntent";
 export * from "./types/ViewableBalanceProof";
 export * from "./base-node-client";
 export * from "./tari-indexer-client";
diff --git a/bindings/src/tari-indexer-client.ts b/bindings/src/tari-indexer-client.ts
index 9d60c9416..e9782093f 100644
--- a/bindings/src/tari-indexer-client.ts
+++ b/bindings/src/tari-indexer-client.ts
@@ -1,37 +1,37 @@
 //   Copyright 2023 The Tari Project
 //   SPDX-License-Identifier: BSD-3-Clause
 
-export * from "./types/tari-indexer-client/IndexerSubmitTransactionResponse";
+export * from "./types/tari-indexer-client/IndexerGetEpochManagerStatsResponse";
+export * from "./types/tari-indexer-client/IndexerAddPeerRequest";
+export * from "./types/tari-indexer-client/NonFungibleSubstate";
+export * from "./types/tari-indexer-client/GetNonFungibleCountResponse";
+export * from "./types/tari-indexer-client/ListSubstatesRequest";
+export * from "./types/tari-indexer-client/IndexerGetIdentityResponse";
 export * from "./types/tari-indexer-client/GetTemplateDefinitionRequest";
-export * from "./types/tari-indexer-client/ListSubstatesResponse";
-export * from "./types/tari-indexer-client/IndexerAddPeerResponse";
-export * from "./types/tari-indexer-client/InspectSubstateRequest";
-export * from "./types/tari-indexer-client/ListSubstateItem";
+export * from "./types/tari-indexer-client/IndexerGetSubstateRequest";
+export * from "./types/tari-indexer-client/GetTemplateDefinitionResponse";
+export * from "./types/tari-indexer-client/ListTemplatesRequest";
 export * from "./types/tari-indexer-client/IndexerGetAllVnsResponse";
-export * from "./types/tari-indexer-client/ListSubstatesRequest";
-export * from "./types/tari-indexer-client/GetRelatedTransactionsResponse";
-export * from "./types/tari-indexer-client/IndexerTransactionFinalizedResult";
+export * from "./types/tari-indexer-client/GetNonFungiblesRequest";
 export * from "./types/tari-indexer-client/IndexerGetSubstateResponse";
+export * from "./types/tari-indexer-client/IndexerSubmitTransactionRequest";
+export * from "./types/tari-indexer-client/IndexerConnection";
+export * from "./types/tari-indexer-client/InspectSubstateResponse";
 export * from "./types/tari-indexer-client/IndexerGetAllVnsRequest";
+export * from "./types/tari-indexer-client/InspectSubstateRequest";
 export * from "./types/tari-indexer-client/IndexerGetCommsStatsResponse";
-export * from "./types/tari-indexer-client/IndexerConnection";
-export * from "./types/tari-indexer-client/GetNonFungiblesRequest";
-export * from "./types/tari-indexer-client/IndexerAddPeerRequest";
-export * from "./types/tari-indexer-client/GetRelatedTransactionsRequest";
-export * from "./types/tari-indexer-client/GetNonFungiblesResponse";
-export * from "./types/tari-indexer-client/GetTemplateDefinitionResponse";
+export * from "./types/tari-indexer-client/GetNonFungibleCountRequest";
+export * from "./types/tari-indexer-client/GetRelatedTransactionsResponse";
+export * from "./types/tari-indexer-client/IndexerAddPeerResponse";
 export * from "./types/tari-indexer-client/IndexerGetConnectionsResponse";
-export * from "./types/tari-indexer-client/IndexerSubmitTransactionRequest";
+export * from "./types/tari-indexer-client/GetNonFungiblesResponse";
+export * from "./types/tari-indexer-client/GetRelatedTransactionsRequest";
+export * from "./types/tari-indexer-client/IndexerGetTransactionResultResponse";
 export * from "./types/tari-indexer-client/ListTemplatesResponse";
-export * from "./types/tari-indexer-client/InspectSubstateResponse";
+export * from "./types/tari-indexer-client/IndexerGetTransactionResultRequest";
+export * from "./types/tari-indexer-client/ListSubstatesResponse";
+export * from "./types/tari-indexer-client/IndexerTransactionFinalizedResult";
 export * from "./types/tari-indexer-client/GetNonFungibleCollectionsResponse";
-export * from "./types/tari-indexer-client/IndexerGetSubstateRequest";
-export * from "./types/tari-indexer-client/IndexerGetEpochManagerStatsResponse";
-export * from "./types/tari-indexer-client/NonFungibleSubstate";
-export * from "./types/tari-indexer-client/GetNonFungibleCountResponse";
-export * from "./types/tari-indexer-client/ListTemplatesRequest";
-export * from "./types/tari-indexer-client/IndexerGetTransactionResultResponse";
+export * from "./types/tari-indexer-client/IndexerSubmitTransactionResponse";
 export * from "./types/tari-indexer-client/IndexerConnectionDirection";
-export * from "./types/tari-indexer-client/IndexerGetIdentityResponse";
-export * from "./types/tari-indexer-client/IndexerGetTransactionResultRequest";
-export * from "./types/tari-indexer-client/GetNonFungibleCountRequest";
+export * from "./types/tari-indexer-client/ListSubstateItem";
diff --git a/bindings/src/types/Instruction.ts b/bindings/src/types/Instruction.ts
index 4a1a0fd75..143e9e7f9 100644
--- a/bindings/src/types/Instruction.ts
+++ b/bindings/src/types/Instruction.ts
@@ -24,4 +24,5 @@ export type Instruction =
   | { ClaimBurn: { claim: ConfidentialClaim } }
   | { ClaimValidatorFees: { epoch: number; validator_public_key: string } }
   | "DropAllProofsInWorkspace"
-  | { AssertBucketContains: { key: Array<number>; resource_address: ResourceAddress; min_amount: Amount } };
+  | { AssertBucketContains: { key: Array<number>; resource_address: ResourceAddress; min_amount: Amount } }
+  | { PublishTemplate: { binary: Array<number> } };
diff --git a/bindings/src/types/wallet-daemon-client/TransactionSubmitRequest.ts b/bindings/src/types/wallet-daemon-client/TransactionSubmitRequest.ts
index 24f718330..1d2b12162 100644
--- a/bindings/src/types/wallet-daemon-client/TransactionSubmitRequest.ts
+++ b/bindings/src/types/wallet-daemon-client/TransactionSubmitRequest.ts
@@ -7,5 +7,6 @@ export interface TransactionSubmitRequest {
   signing_key_index: number | null;
   autofill_inputs: Array<SubstateRequirement>;
   detect_inputs: boolean;
+  detect_inputs_use_unversioned: boolean;
   proof_ids: Array<number>;
 }
diff --git a/bindings/src/validator-node-client.ts b/bindings/src/validator-node-client.ts
index 37a2d665c..989140390 100644
--- a/bindings/src/validator-node-client.ts
+++ b/bindings/src/validator-node-client.ts
@@ -1,59 +1,59 @@
 //   Copyright 2023 The Tari Project
 //   SPDX-License-Identifier: BSD-3-Clause
 
+export * from "./types/validator-node-client/GetCommitteeRequest";
+export * from "./types/validator-node-client/GetRecentTransactionsResponse";
+export * from "./types/validator-node-client/GetRecentTransactionsRequest";
+export * from "./types/validator-node-client/GetTemplatesRequest";
+export * from "./types/validator-node-client/GetBlocksCountResponse";
+export * from "./types/validator-node-client/VNAddPeerRequest";
+export * from "./types/validator-node-client/GetCommitteeResponse";
 export * from "./types/validator-node-client/VNSubmitTransactionRequest";
+export * from "./types/validator-node-client/VNConnectionDirection";
+export * from "./types/validator-node-client/VNAddPeerResponse";
+export * from "./types/validator-node-client/GetSubstatesByTransactionResponse";
+export * from "./types/validator-node-client/VNCommitteeShardInfo";
+export * from "./types/validator-node-client/VNFunctionDef";
+export * from "./types/validator-node-client/VNGetValidatorFeesResponse";
+export * from "./types/validator-node-client/VNGetAllVnsResponse";
+export * from "./types/validator-node-client/TemplateAbi";
+export * from "./types/validator-node-client/GetMempoolStatsResponse";
 export * from "./types/validator-node-client/TemplateMetadata";
-export * from "./types/validator-node-client/GetFilteredBlocksCountRequest";
+export * from "./types/validator-node-client/GetBlockResponse";
+export * from "./types/validator-node-client/VNLogLevel";
+export * from "./types/validator-node-client/VNGetAllVnsRequest";
 export * from "./types/validator-node-client/VNLogEntry";
 export * from "./types/validator-node-client/GetShardKeyRequest";
-export * from "./types/validator-node-client/VNGetTransactionResultResponse";
+export * from "./types/validator-node-client/GetBlockRequest";
 export * from "./types/validator-node-client/VNSubmitTransactionResponse";
+export * from "./types/validator-node-client/DryRunTransactionFinalizeResult";
+export * from "./types/validator-node-client/GetTransactionResponse";
+export * from "./types/validator-node-client/GetStateResponse";
+export * from "./types/validator-node-client/VNGetSubstateRequest";
+export * from "./types/validator-node-client/VNGetSubstateResponse";
+export * from "./types/validator-node-client/ListBlocksResponse";
+export * from "./types/validator-node-client/SubstateStatus";
+export * from "./types/validator-node-client/ValidatorNode";
+export * from "./types/validator-node-client/GetFilteredBlocksCountRequest";
+export * from "./types/validator-node-client/ListBlocksRequest";
+export * from "./types/validator-node-client/GetEpochManagerStatsResponse";
 export * from "./types/validator-node-client/GetTxPoolResponse";
+export * from "./types/validator-node-client/VNConnection";
 export * from "./types/validator-node-client/GetTemplateResponse";
-export * from "./types/validator-node-client/GetBlocksCountResponse";
-export * from "./types/validator-node-client/VNGetValidatorFeesRequest";
-export * from "./types/validator-node-client/GetSubstatesByTransactionResponse";
-export * from "./types/validator-node-client/VNConnectionDirection";
-export * from "./types/validator-node-client/VNAddPeerRequest";
-export * from "./types/validator-node-client/GetTemplatesResponse";
-export * from "./types/validator-node-client/GetTransactionRequest";
+export * from "./types/validator-node-client/ValidatorFee";
+export * from "./types/validator-node-client/VNGetConnectionsResponse";
+export * from "./types/validator-node-client/VNGetCommsStatsResponse";
+export * from "./types/validator-node-client/GetTemplateRequest";
 export * from "./types/validator-node-client/GetStateRequest";
-export * from "./types/validator-node-client/VNGetIdentityResponse";
-export * from "./types/validator-node-client/VNFunctionDef";
 export * from "./types/validator-node-client/GetBlocksRequest";
-export * from "./types/validator-node-client/GetTemplateRequest";
+export * from "./types/validator-node-client/VNGetTransactionResultRequest";
+export * from "./types/validator-node-client/GetTransactionRequest";
+export * from "./types/validator-node-client/GetTemplatesResponse";
+export * from "./types/validator-node-client/VNGetTransactionResultResponse";
+export * from "./types/validator-node-client/VNArgDef";
 export * from "./types/validator-node-client/GetShardKeyResponse";
-export * from "./types/validator-node-client/GetSubstatesByTransactionRequest";
-export * from "./types/validator-node-client/VNGetCommsStatsResponse";
-export * from "./types/validator-node-client/GetTransactionResponse";
-export * from "./types/validator-node-client/GetCommitteeResponse";
-export * from "./types/validator-node-client/VNGetAllVnsRequest";
-export * from "./types/validator-node-client/GetCommitteeRequest";
-export * from "./types/validator-node-client/DryRunTransactionFinalizeResult";
-export * from "./types/validator-node-client/VNGetValidatorFeesResponse";
-export * from "./types/validator-node-client/GetStateResponse";
-export * from "./types/validator-node-client/SubstateStatus";
 export * from "./types/validator-node-client/GetBlocksResponse";
-export * from "./types/validator-node-client/ListBlocksResponse";
-export * from "./types/validator-node-client/GetBlockRequest";
-export * from "./types/validator-node-client/VNGetTransactionResultRequest";
-export * from "./types/validator-node-client/GetRecentTransactionsRequest";
-export * from "./types/validator-node-client/ValidatorFee";
-export * from "./types/validator-node-client/VNLogLevel";
-export * from "./types/validator-node-client/GetRecentTransactionsResponse";
-export * from "./types/validator-node-client/VNAddPeerResponse";
-export * from "./types/validator-node-client/VNConnection";
-export * from "./types/validator-node-client/ValidatorNode";
-export * from "./types/validator-node-client/VNGetConnectionsResponse";
-export * from "./types/validator-node-client/ListBlocksRequest";
+export * from "./types/validator-node-client/VNGetIdentityResponse";
+export * from "./types/validator-node-client/GetSubstatesByTransactionRequest";
 export * from "./types/validator-node-client/GetNetworkCommitteeResponse";
-export * from "./types/validator-node-client/VNGetSubstateRequest";
-export * from "./types/validator-node-client/GetMempoolStatsResponse";
-export * from "./types/validator-node-client/TemplateAbi";
-export * from "./types/validator-node-client/GetTemplatesRequest";
-export * from "./types/validator-node-client/VNGetSubstateResponse";
-export * from "./types/validator-node-client/VNGetAllVnsResponse";
-export * from "./types/validator-node-client/VNArgDef";
-export * from "./types/validator-node-client/GetEpochManagerStatsResponse";
-export * from "./types/validator-node-client/GetBlockResponse";
-export * from "./types/validator-node-client/VNCommitteeShardInfo";
+export * from "./types/validator-node-client/VNGetValidatorFeesRequest";
diff --git a/bindings/src/wallet-daemon-client.ts b/bindings/src/wallet-daemon-client.ts
index 7c10e0ad2..9fe3e1c56 100644
--- a/bindings/src/wallet-daemon-client.ts
+++ b/bindings/src/wallet-daemon-client.ts
@@ -1,92 +1,92 @@
 //   Copyright 2023 The Tari Project
 //   SPDX-License-Identifier: BSD-3-Clause
 
-export * from "./types/wallet-daemon-client/WalletSubstateRecord";
-export * from "./types/wallet-daemon-client/ProofsFinalizeResponse";
-export * from "./types/wallet-daemon-client/CallInstructionRequest";
-export * from "./types/wallet-daemon-client/AuthLoginAcceptResponse";
-export * from "./types/wallet-daemon-client/AccountsListRequest";
-export * from "./types/wallet-daemon-client/AuthGetAllJwtResponse";
-export * from "./types/wallet-daemon-client/AuthLoginResponse";
-export * from "./types/wallet-daemon-client/GetValidatorFeesRequest";
-export * from "./types/wallet-daemon-client/AccountGetDefaultRequest";
-export * from "./types/wallet-daemon-client/AuthGetAllJwtRequest";
-export * from "./types/wallet-daemon-client/KeyBranch";
-export * from "./types/wallet-daemon-client/AccountGetResponse";
-export * from "./types/wallet-daemon-client/SettingsSetRequest";
-export * from "./types/wallet-daemon-client/GetValidatorFeesResponse";
-export * from "./types/wallet-daemon-client/TransactionGetAllRequest";
+export * from "./types/wallet-daemon-client/AccountsListResponse";
 export * from "./types/wallet-daemon-client/RevealFundsRequest";
-export * from "./types/wallet-daemon-client/AuthLoginDenyResponse";
-export * from "./types/wallet-daemon-client/AuthLoginDenyRequest";
-export * from "./types/wallet-daemon-client/TransactionSubmitResponse";
-export * from "./types/wallet-daemon-client/ProofsGenerateResponse";
-export * from "./types/wallet-daemon-client/ClaimValidatorFeesRequest";
-export * from "./types/wallet-daemon-client/AuthLoginRequest";
+export * from "./types/wallet-daemon-client/ClaimBurnResponse";
+export * from "./types/wallet-daemon-client/KeysSetActiveRequest";
+export * from "./types/wallet-daemon-client/WalletSubstateRecord";
+export * from "./types/wallet-daemon-client/AccountsGetBalancesResponse";
+export * from "./types/wallet-daemon-client/SubstatesGetResponse";
 export * from "./types/wallet-daemon-client/ListAccountNftRequest";
+export * from "./types/wallet-daemon-client/RevealFundsResponse";
+export * from "./types/wallet-daemon-client/AccountSetDefaultRequest";
+export * from "./types/wallet-daemon-client/GetAccountNftRequest";
+export * from "./types/wallet-daemon-client/TransactionGetAllResponse";
 export * from "./types/wallet-daemon-client/TransactionGetRequest";
-export * from "./types/wallet-daemon-client/AuthRevokeTokenResponse";
-export * from "./types/wallet-daemon-client/ProofsFinalizeRequest";
-export * from "./types/wallet-daemon-client/AccountsTransferRequest";
-export * from "./types/wallet-daemon-client/SettingsSetResponse";
-export * from "./types/wallet-daemon-client/KeysListRequest";
+export * from "./types/wallet-daemon-client/KeyBranch";
+export * from "./types/wallet-daemon-client/AuthLoginAcceptRequest";
+export * from "./types/wallet-daemon-client/AccountSetDefaultResponse";
+export * from "./types/wallet-daemon-client/SubstatesListResponse";
+export * from "./types/wallet-daemon-client/AccountGetDefaultRequest";
+export * from "./types/wallet-daemon-client/KeysListResponse";
+export * from "./types/wallet-daemon-client/ProofsGenerateResponse";
+export * from "./types/wallet-daemon-client/TransactionGetAllRequest";
 export * from "./types/wallet-daemon-client/AccountsTransferResponse";
-export * from "./types/wallet-daemon-client/TransactionGetResultResponse";
+export * from "./types/wallet-daemon-client/AuthLoginResponse";
 export * from "./types/wallet-daemon-client/ClaimBurnRequest";
-export * from "./types/wallet-daemon-client/KeysListResponse";
+export * from "./types/wallet-daemon-client/BalanceEntry";
+export * from "./types/wallet-daemon-client/KeysListRequest";
 export * from "./types/wallet-daemon-client/SubstatesGetRequest";
-export * from "./types/wallet-daemon-client/TransactionSubmitRequest";
-export * from "./types/wallet-daemon-client/AccountsGetBalancesResponse";
-export * from "./types/wallet-daemon-client/TransactionGetAllResponse";
-export * from "./types/wallet-daemon-client/AccountsCreateFreeTestCoinsResponse";
-export * from "./types/wallet-daemon-client/ConfidentialTransferResponse";
-export * from "./types/wallet-daemon-client/TransactionGetResponse";
-export * from "./types/wallet-daemon-client/SubstatesGetResponse";
-export * from "./types/wallet-daemon-client/GetAccountNftRequest";
+export * from "./types/wallet-daemon-client/ProofsFinalizeResponse";
 export * from "./types/wallet-daemon-client/AuthRevokeTokenRequest";
-export * from "./types/wallet-daemon-client/ProofsGenerateRequest";
-export * from "./types/wallet-daemon-client/RevealFundsResponse";
-export * from "./types/wallet-daemon-client/AccountsInvokeResponse";
-export * from "./types/wallet-daemon-client/AccountsListResponse";
+export * from "./types/wallet-daemon-client/TransactionWaitResultRequest";
+export * from "./types/wallet-daemon-client/TransactionSubmitResponse";
+export * from "./types/wallet-daemon-client/AccountsCreateRequest";
+export * from "./types/wallet-daemon-client/CallInstructionRequest";
+export * from "./types/wallet-daemon-client/WebRtcStartRequest";
 export * from "./types/wallet-daemon-client/WebRtcStartResponse";
-export * from "./types/wallet-daemon-client/TransactionGetResultRequest";
+export * from "./types/wallet-daemon-client/TransactionSubmitDryRunRequest";
+export * from "./types/wallet-daemon-client/MintAccountNftResponse";
 export * from "./types/wallet-daemon-client/ProofsCancelResponse";
-export * from "./types/wallet-daemon-client/AccountsCreateRequest";
-export * from "./types/wallet-daemon-client/MintAccountNftRequest";
-export * from "./types/wallet-daemon-client/TransactionClaimBurnResponse";
-export * from "./types/wallet-daemon-client/TransactionWaitResultRequest";
-export * from "./types/wallet-daemon-client/ClaimValidatorFeesResponse";
+export * from "./types/wallet-daemon-client/AccountGetResponse";
+export * from "./types/wallet-daemon-client/ClaimValidatorFeesRequest";
+export * from "./types/wallet-daemon-client/AuthRevokeTokenResponse";
+export * from "./types/wallet-daemon-client/AccountsInvokeRequest";
+export * from "./types/wallet-daemon-client/WebRtcStart";
+export * from "./types/wallet-daemon-client/TransactionWaitResultResponse";
+export * from "./types/wallet-daemon-client/GetValidatorFeesRequest";
 export * from "./types/wallet-daemon-client/ConfidentialCreateOutputProofRequest";
-export * from "./types/wallet-daemon-client/KeysCreateRequest";
+export * from "./types/wallet-daemon-client/KeysCreateResponse";
+export * from "./types/wallet-daemon-client/AuthLoginDenyRequest";
+export * from "./types/wallet-daemon-client/ProofsFinalizeRequest";
+export * from "./types/wallet-daemon-client/ProofsCancelRequest";
 export * from "./types/wallet-daemon-client/SettingsGetResponse";
+export * from "./types/wallet-daemon-client/ConfidentialViewVaultBalanceRequest";
+export * from "./types/wallet-daemon-client/GetValidatorFeesResponse";
+export * from "./types/wallet-daemon-client/TransactionGetResponse";
+export * from "./types/wallet-daemon-client/TransactionSubmitRequest";
+export * from "./types/wallet-daemon-client/ListAccountNftResponse";
+export * from "./types/wallet-daemon-client/AccountsInvokeResponse";
+export * from "./types/wallet-daemon-client/AccountsListRequest";
+export * from "./types/wallet-daemon-client/AuthLoginAcceptResponse";
 export * from "./types/wallet-daemon-client/TransactionSubmitDryRunResponse";
-export * from "./types/wallet-daemon-client/ClaimBurnResponse";
-export * from "./types/wallet-daemon-client/WebRtcStartRequest";
-export * from "./types/wallet-daemon-client/ConfidentialViewVaultBalanceResponse";
-export * from "./types/wallet-daemon-client/WebRtcStart";
-export * from "./types/wallet-daemon-client/AccountSetDefaultRequest";
 export * from "./types/wallet-daemon-client/ConfidentialCreateOutputProofResponse";
+export * from "./types/wallet-daemon-client/TemplatesGetRequest";
+export * from "./types/wallet-daemon-client/ConfidentialViewVaultBalanceResponse";
+export * from "./types/wallet-daemon-client/SettingsSetRequest";
+export * from "./types/wallet-daemon-client/MintAccountNftRequest";
+export * from "./types/wallet-daemon-client/TransactionClaimBurnResponse";
+export * from "./types/wallet-daemon-client/AuthGetAllJwtRequest";
+export * from "./types/wallet-daemon-client/ClaimValidatorFeesResponse";
+export * from "./types/wallet-daemon-client/ConfidentialTransferResponse";
 export * from "./types/wallet-daemon-client/TemplatesGetResponse";
-export * from "./types/wallet-daemon-client/ListAccountNftResponse";
-export * from "./types/wallet-daemon-client/AccountsGetBalancesRequest";
-export * from "./types/wallet-daemon-client/MintAccountNftResponse";
+export * from "./types/wallet-daemon-client/AccountsTransferRequest";
+export * from "./types/wallet-daemon-client/AuthLoginRequest";
+export * from "./types/wallet-daemon-client/AuthGetAllJwtResponse";
 export * from "./types/wallet-daemon-client/AccountsCreateFreeTestCoinsRequest";
-export * from "./types/wallet-daemon-client/KeysCreateResponse";
+export * from "./types/wallet-daemon-client/ConfidentialTransferRequest";
+export * from "./types/wallet-daemon-client/SettingsSetResponse";
+export * from "./types/wallet-daemon-client/AccountsCreateFreeTestCoinsResponse";
+export * from "./types/wallet-daemon-client/AccountGetRequest";
+export * from "./types/wallet-daemon-client/KeysCreateRequest";
+export * from "./types/wallet-daemon-client/ProofsGenerateRequest";
+export * from "./types/wallet-daemon-client/TransactionGetResultResponse";
+export * from "./types/wallet-daemon-client/KeysSetActiveResponse";
+export * from "./types/wallet-daemon-client/AuthLoginDenyResponse";
+export * from "./types/wallet-daemon-client/TransactionGetResultRequest";
+export * from "./types/wallet-daemon-client/AccountsCreateResponse";
+export * from "./types/wallet-daemon-client/AccountsGetBalancesRequest";
 export * from "./types/wallet-daemon-client/AccountInfo";
 export * from "./types/wallet-daemon-client/SubstatesListRequest";
-export * from "./types/wallet-daemon-client/BalanceEntry";
-export * from "./types/wallet-daemon-client/TemplatesGetRequest";
-export * from "./types/wallet-daemon-client/AccountsInvokeRequest";
-export * from "./types/wallet-daemon-client/ProofsCancelRequest";
-export * from "./types/wallet-daemon-client/AccountSetDefaultResponse";
-export * from "./types/wallet-daemon-client/SubstatesListResponse";
-export * from "./types/wallet-daemon-client/KeysSetActiveResponse";
 export * from "./types/wallet-daemon-client/ComponentAddressOrName";
-export * from "./types/wallet-daemon-client/AuthLoginAcceptRequest";
-export * from "./types/wallet-daemon-client/TransactionSubmitDryRunRequest";
-export * from "./types/wallet-daemon-client/KeysSetActiveRequest";
-export * from "./types/wallet-daemon-client/ConfidentialViewVaultBalanceRequest";
-export * from "./types/wallet-daemon-client/ConfidentialTransferRequest";
-export * from "./types/wallet-daemon-client/AccountsCreateResponse";
-export * from "./types/wallet-daemon-client/TransactionWaitResultResponse";
-export * from "./types/wallet-daemon-client/AccountGetRequest";
diff --git a/dan_layer/consensus/src/consensus_constants.rs b/dan_layer/consensus/src/consensus_constants.rs
index 4eb090db7..2bba87c46 100644
--- a/dan_layer/consensus/src/consensus_constants.rs
+++ b/dan_layer/consensus/src/consensus_constants.rs
@@ -46,6 +46,8 @@ pub struct ConsensusConstants {
     /// The value that fees are divided by to determine the amount of fees to burn. 0 means no fees are burned.
     pub fee_exhaust_divisor: u64,
     pub epochs_per_era: Epoch,
+    /// Maximum size in bytes for a template WASM binary.
+    pub template_binary_max_size_bytes: usize,
 }
 
 impl ConsensusConstants {
@@ -63,6 +65,7 @@ impl ConsensusConstants {
             max_block_size: 500,
             fee_exhaust_divisor: 20, // 5%
             epochs_per_era: Epoch(10),
+            template_binary_max_size_bytes: 1000 * 1000 * 5, // 5 MB
         }
     }
 }
diff --git a/dan_layer/consensus_tests/src/support/harness.rs b/dan_layer/consensus_tests/src/support/harness.rs
index d1107f2af..48d60919c 100644
--- a/dan_layer/consensus_tests/src/support/harness.rs
+++ b/dan_layer/consensus_tests/src/support/harness.rs
@@ -538,6 +538,7 @@ impl TestBuilder {
                     max_block_size: 500,
                     fee_exhaust_divisor: 20,
                     epochs_per_era: Epoch(10),
+                    template_binary_max_size_bytes: 1000 * 1000 * 5,
                 },
             },
         }
@@ -616,7 +617,7 @@ impl TestBuilder {
                 }
                 true
             })
-            .map(|(address, shard_group, shard_addr, _, _,  _)| {
+            .map(|(address, shard_group, shard_addr, _, _, _)| {
                 let sql_address = sql_address.replace("{}", &address.0);
                 let (sk, pk) = helpers::derive_keypair_from_address(&address);
 
diff --git a/dan_layer/engine/src/transaction/error.rs b/dan_layer/engine/src/transaction/error.rs
index 357885078..c4f03d5fd 100644
--- a/dan_layer/engine/src/transaction/error.rs
+++ b/dan_layer/engine/src/transaction/error.rs
@@ -23,7 +23,7 @@
 use tari_engine_types::indexed_value::IndexedValueError;
 use tari_template_lib::models::TemplateAddress;
 
-use crate::{runtime::RuntimeError, wasm::WasmExecutionError};
+use crate::{runtime::RuntimeError, template::TemplateLoaderError, wasm::WasmExecutionError};
 
 #[derive(Debug, thiserror::Error)]
 pub enum TransactionError {
@@ -45,4 +45,8 @@ pub enum TransactionError {
     FunctionNotFound { name: String },
     #[error("Invariant error: {details}")]
     InvariantError { details: String },
+    #[error("Load template error: {0}")]
+    LoadTemplate(#[from] TemplateLoaderError),
+    #[error("WASM binary too big! {0} bytes are greater than allowed maximum {1} bytes.")]
+    WasmBinaryTooBig(usize, usize),
 }
diff --git a/dan_layer/engine/src/transaction/mod.rs b/dan_layer/engine/src/transaction/mod.rs
index 20da36c0d..b51b23e3f 100644
--- a/dan_layer/engine/src/transaction/mod.rs
+++ b/dan_layer/engine/src/transaction/mod.rs
@@ -24,4 +24,9 @@ mod error;
 pub use error::TransactionError;
 
 mod processor;
-pub use processor::{TransactionProcessor, MAX_CALL_DEPTH};
+pub use processor::{
+    TransactionProcessor,
+    TransactionProcessorConfig,
+    TransactionProcessorConfigBuilder,
+    MAX_CALL_DEPTH,
+};
diff --git a/dan_layer/engine/src/transaction/processor.rs b/dan_layer/engine/src/transaction/processor.rs
index 3ee9931d4..33050e68f 100644
--- a/dan_layer/engine/src/transaction/processor.rs
+++ b/dan_layer/engine/src/transaction/processor.rs
@@ -42,7 +42,7 @@ use tari_template_builtin::ACCOUNT_TEMPLATE_ADDRESS;
 use tari_template_lib::{
     arg,
     args,
-    args::{Arg, WorkspaceAction},
+    args::{Arg, LogLevel, WorkspaceAction},
     auth::OwnerRule,
     crypto::RistrettoPublicKeyBytes,
     invoke_args,
@@ -66,38 +66,80 @@ use crate::{
     template::LoadedTemplate,
     traits::Invokable,
     transaction::TransactionError,
-    wasm::WasmProcess,
+    wasm::{WasmModule, WasmProcess},
 };
 
 const LOG_TARGET: &str = "tari::dan::engine::instruction_processor";
 pub const MAX_CALL_DEPTH: usize = 10;
 const ACCOUNT_CONSTRUCTOR_FUNCTION: &str = "create";
 
+#[derive(Clone, Debug)]
+pub struct TransactionProcessorConfig {
+    pub network: Network,
+    pub template_binary_max_size_bytes: usize,
+}
+
+impl TransactionProcessorConfig {
+    pub fn builder() -> TransactionProcessorConfigBuilder {
+        TransactionProcessorConfigBuilder::default()
+    }
+}
+
+impl Default for TransactionProcessorConfig {
+    fn default() -> Self {
+        Self {
+            network: Default::default(),
+            template_binary_max_size_bytes: 1000 * 1000 * 5, // 5MB
+        }
+    }
+}
+
+#[derive(Default)]
+pub struct TransactionProcessorConfigBuilder {
+    config: TransactionProcessorConfig,
+}
+
+impl TransactionProcessorConfigBuilder {
+    pub fn with_network(&mut self, network: Network) -> &mut Self {
+        self.config.network = network;
+        self
+    }
+
+    pub fn with_template_binary_max_size_bytes(&mut self, max_size: usize) -> &mut Self {
+        self.config.template_binary_max_size_bytes = max_size;
+        self
+    }
+
+    pub fn build(&self) -> TransactionProcessorConfig {
+        self.config.clone()
+    }
+}
+
 pub struct TransactionProcessor<TTemplateProvider> {
+    config: TransactionProcessorConfig,
     template_provider: Arc<TTemplateProvider>,
     state_db: ReadOnlyMemoryStateStore,
     auth_params: AuthParams,
     virtual_substates: VirtualSubstates,
     modules: Vec<Arc<dyn RuntimeModule>>,
-    network: Network,
 }
 
 impl<TTemplateProvider: TemplateProvider<Template = LoadedTemplate> + 'static> TransactionProcessor<TTemplateProvider> {
     pub fn new(
+        config: TransactionProcessorConfig,
         template_provider: Arc<TTemplateProvider>,
         state_db: ReadOnlyMemoryStateStore,
         auth_params: AuthParams,
         virtual_substates: VirtualSubstates,
         modules: Vec<Arc<dyn RuntimeModule>>,
-        network: Network,
     ) -> Self {
         Self {
+            config,
             template_provider,
             state_db,
             auth_params,
             virtual_substates,
             modules,
-            network,
         }
     }
 
@@ -105,12 +147,12 @@ impl<TTemplateProvider: TemplateProvider<Template = LoadedTemplate> + 'static> T
         let timer = Instant::now();
         let entity_id_provider = EntityIdProvider::new(transaction.hash(), 1000);
         let Self {
+            config,
             template_provider,
             state_db,
             auth_params,
             virtual_substates,
             modules,
-            network,
         } = self;
 
         let initial_auth_scope = AuthorizationScope::new(auth_params.initial_ownership_proofs);
@@ -141,7 +183,7 @@ impl<TTemplateProvider: TemplateProvider<Template = LoadedTemplate> + 'static> T
             entity_id_provider,
             modules,
             MAX_CALL_DEPTH,
-            network,
+            config.network,
         )?;
 
         let runtime = Runtime::new(Arc::new(runtime_interface));
@@ -149,7 +191,7 @@ impl<TTemplateProvider: TemplateProvider<Template = LoadedTemplate> + 'static> T
 
         let (fee_instructions, instructions) = transaction.into_instructions();
 
-        let fee_exec_results = Self::process_instructions(&template_provider, &runtime, fee_instructions);
+        let fee_exec_results = Self::process_instructions(&config, &template_provider, &runtime, fee_instructions);
 
         let fee_exec_result = match fee_exec_results {
             Ok(execution_results) => {
@@ -177,7 +219,7 @@ impl<TTemplateProvider: TemplateProvider<Template = LoadedTemplate> + 'static> T
             },
         };
 
-        let instruction_result = Self::process_instructions(&*template_provider, &runtime, instructions);
+        let instruction_result = Self::process_instructions(&config, &*template_provider, &runtime, instructions);
 
         match instruction_result {
             Ok(execution_results) => {
@@ -217,13 +259,14 @@ impl<TTemplateProvider: TemplateProvider<Template = LoadedTemplate> + 'static> T
     }
 
     fn process_instructions(
+        config: &TransactionProcessorConfig,
         template_provider: &TTemplateProvider,
         runtime: &Runtime,
         instructions: Vec<Instruction>,
     ) -> Result<Vec<InstructionResult>, TransactionError> {
         let result: Result<_, _> = instructions
             .into_iter()
-            .map(|instruction| Self::process_instruction(template_provider, runtime, instruction))
+            .map(|instruction| Self::process_instruction(config, template_provider, runtime, instruction))
             .collect();
 
         // check that the finalized state is valid
@@ -235,6 +278,7 @@ impl<TTemplateProvider: TemplateProvider<Template = LoadedTemplate> + 'static> T
     }
 
     fn process_instruction(
+        config: &TransactionProcessorConfig,
         template_provider: &TTemplateProvider,
         runtime: &Runtime,
         instruction: Instruction,
@@ -303,6 +347,7 @@ impl<TTemplateProvider: TemplateProvider<Template = LoadedTemplate> + 'static> T
                 )?;
                 Ok(InstructionResult::empty())
             },
+            Instruction::PublishTemplate { binary } => Self::publish_template(config, runtime, binary),
         }
     }
 
@@ -320,6 +365,28 @@ impl<TTemplateProvider: TemplateProvider<Template = LoadedTemplate> + 'static> T
         Ok(())
     }
 
+    /// Load, validate template binary and adds to the cache of TemplateProvider.
+    pub fn publish_template(
+        config: &TransactionProcessorConfig,
+        runtime: &Runtime,
+        binary: Vec<u8>,
+    ) -> Result<InstructionResult, TransactionError> {
+        if binary.len() > config.template_binary_max_size_bytes {
+            return Err(TransactionError::WasmBinaryTooBig(
+                binary.len(),
+                config.template_binary_max_size_bytes,
+            ));
+        }
+        let template = WasmModule::load_template_from_code(binary.as_slice())?;
+        // TODO: delete debug log when implemented
+        runtime.interface().emit_log(
+            LogLevel::Debug,
+            format!("Template name: \"{}\"", template.template_name()),
+        )?;
+        // TODO: implement
+        Ok(InstructionResult::empty())
+    }
+
     pub fn create_account(
         template_provider: &TTemplateProvider,
         runtime: &Runtime,
diff --git a/dan_layer/engine_types/src/instruction.rs b/dan_layer/engine_types/src/instruction.rs
index d65b5c021..1af7ebc6c 100644
--- a/dan_layer/engine_types/src/instruction.rs
+++ b/dan_layer/engine_types/src/instruction.rs
@@ -68,6 +68,9 @@ pub enum Instruction {
         resource_address: ResourceAddress,
         min_amount: Amount,
     },
+    PublishTemplate {
+        binary: Vec<u8>,
+    },
 }
 
 impl Display for Instruction {
@@ -149,6 +152,9 @@ impl Display for Instruction {
                     key, resource_address, min_amount
                 )
             },
+            Instruction::PublishTemplate { .. } => {
+                write!(f, "PublishTemplate")
+            },
         }
     }
 }
diff --git a/dan_layer/p2p/proto/transaction.proto b/dan_layer/p2p/proto/transaction.proto
index 27d94d3ac..a72cd2b77 100644
--- a/dan_layer/p2p/proto/transaction.proto
+++ b/dan_layer/p2p/proto/transaction.proto
@@ -42,6 +42,7 @@ message Instruction {
     DROP_ALL_PROOFS_IN_WORKSPACE = 6;
     CREATE_ACCOUNT = 7;
     ASSERT_BUCKET_CONTAINS = 8;
+    PUBLISH_TEMPLATE = 9;
   }
   InstructionType instruction_type = 1;
 
@@ -79,6 +80,9 @@ message Instruction {
   // AssertBucketContains
   bytes resource_address = 21;
   int64 min_amount = 22;
+
+  // PublishTemplate
+  bytes template_binary = 23;
 }
 
 
diff --git a/dan_layer/p2p/src/conversions/transaction.rs b/dan_layer/p2p/src/conversions/transaction.rs
index 8ab4ad76e..5b2b53126 100644
--- a/dan_layer/p2p/src/conversions/transaction.rs
+++ b/dan_layer/p2p/src/conversions/transaction.rs
@@ -87,11 +87,13 @@ impl TryFrom<proto::transaction::Transaction> for Transaction {
             .into_iter()
             .map(TryInto::try_into)
             .collect::<Result<_, _>>()?;
+
         let filled_inputs = request
             .filled_inputs
             .into_iter()
             .map(TryInto::try_into)
             .collect::<Result<_, _>>()?;
+
         let transaction = Transaction::new(
             request
                 .transaction
@@ -130,16 +132,19 @@ impl TryFrom<proto::transaction::UnsignedTransaction> for UnsignedTransaction {
             .into_iter()
             .map(TryInto::try_into)
             .collect::<Result<Vec<_>, _>>()?;
+
         let fee_instructions = request
             .fee_instructions
             .into_iter()
             .map(TryInto::try_into)
             .collect::<Result<Vec<_>, _>>()?;
+
         let inputs = request
             .inputs
             .into_iter()
             .map(TryInto::try_into)
             .collect::<Result<_, _>>()?;
+
         let min_epoch = request.min_epoch.map(|epoch| Epoch(epoch.epoch));
         let max_epoch = request.max_epoch.map(|epoch| Epoch(epoch.epoch));
         Ok(Self {
@@ -187,6 +192,7 @@ impl TryFrom<proto::transaction::Instruction> for Instruction {
             .collect::<Result<_, _>>()?;
         let instruction_type =
             InstructionType::try_from(request.instruction_type).map_err(|e| anyhow!("invalid instruction_type {e}"))?;
+
         let instruction = match instruction_type {
             InstructionType::CreateAccount => Instruction::CreateAccount {
                 public_key_address: PublicKey::from_canonical_bytes(&request.create_account_public_key)
@@ -253,6 +259,9 @@ impl TryFrom<proto::transaction::Instruction> for Instruction {
                     min_amount: Amount::new(request.min_amount),
                 }
             },
+            InstructionType::PublishTemplate => Instruction::PublishTemplate {
+                binary: request.template_binary,
+            },
         };
 
         Ok(instruction)
@@ -334,6 +343,10 @@ impl From<Instruction> for proto::transaction::Instruction {
                 result.resource_address = resource_address.as_bytes().to_vec();
                 result.min_amount = min_amount.0
             },
+            Instruction::PublishTemplate { binary } => {
+                result.instruction_type = InstructionType::PublishTemplate as i32;
+                result.template_binary = binary;
+            },
         }
         result
     }
diff --git a/dan_layer/template_test_tooling/src/template_test.rs b/dan_layer/template_test_tooling/src/template_test.rs
index c2731be6f..c4bc4fe37 100644
--- a/dan_layer/template_test_tooling/src/template_test.rs
+++ b/dan_layer/template_test_tooling/src/template_test.rs
@@ -24,7 +24,7 @@ use tari_dan_engine::{
     runtime::{AuthParams, RuntimeModule},
     state_store::{memory::MemoryStateStore, new_memory_store, StateWriter},
     template::LoadedTemplate,
-    transaction::{TransactionError, TransactionProcessor},
+    transaction::{TransactionError, TransactionProcessor, TransactionProcessorConfig},
     wasm::LoadedWasmTemplate,
 };
 use tari_engine_types::{
@@ -474,12 +474,14 @@ impl TemplateTest {
             initial_ownership_proofs: proofs,
         };
         let processor = TransactionProcessor::new(
+            TransactionProcessorConfig::builder()
+                .with_network(Network::LocalNet)
+                .build(),
             self.package.clone(),
             self.state_store.clone().into_read_only(),
             auth_params,
             self.virtual_substates.clone(),
             modules,
-            Network::LocalNet,
         );
 
         {
diff --git a/dan_layer/transaction/src/builder.rs b/dan_layer/transaction/src/builder.rs
index 76b0f3d62..b28cd12a8 100644
--- a/dan_layer/transaction/src/builder.rs
+++ b/dan_layer/transaction/src/builder.rs
@@ -134,6 +134,13 @@ impl TransactionBuilder {
         })
     }
 
+    /// Publishing a WASM template.
+    pub fn publish_template<T: AsRef<[u8]>>(self, binary: T) -> Self {
+        self.add_instruction(Instruction::PublishTemplate {
+            binary: binary.as_ref().to_vec(),
+        })
+    }
+
     pub fn claim_burn(self, claim: ConfidentialClaim) -> Self {
         self.add_instruction(Instruction::ClaimBurn { claim: Box::new(claim) })
     }