fix unncessary heap allocations in engine

tari-project · Dec 12, 2024 · 890188f · 890188f
1 parent 221ca6c
commit 890188f
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 31 deletions.
diff --git a/dan_layer/engine/src/runtime/impl.rs b/dan_layer/engine/src/runtime/impl.rs
@@ -2345,9 +2345,9 @@ impl<TTemplateProvider: TemplateProvider<Template = LoadedTemplate>> RuntimeInte
         Ok(InvokeResult::encode(&address)?)
     }
 
-    fn publish_template(&self, template: &[u8]) -> Result<(), RuntimeError> {
+    fn publish_template(&self, template: Vec<u8>) -> Result<(), RuntimeError> {
         self.tracker.write_with(|state| {
-            let binary_hash = template_hasher32().chain(template).result();
+            let binary_hash = template_hasher32().chain(&template).result();
             let template_address = PublishedTemplateAddress::from_hash(
                 hasher32(EngineHashDomainLabel::TemplateAddress)
                     .chain(&self.transaction_signer_public_key)
@@ -2356,9 +2356,7 @@ impl<TTemplateProvider: TemplateProvider<Template = LoadedTemplate>> RuntimeInte
             );
             state.new_substate(
                 template_address,
-                SubstateValue::Template(PublishedTemplate {
-                    binary: template.to_vec(),
-                }),
+                SubstateValue::Template(PublishedTemplate { binary: template }),
             )?;
             let scope_mut = state.current_call_scope_mut()?;
             scope_mut.move_node_to_owned(&template_address.into())?;

diff --git a/dan_layer/engine/src/runtime/mod.rs b/dan_layer/engine/src/runtime/mod.rs
@@ -181,7 +181,7 @@ pub trait RuntimeInterface: Send + Sync {
     fn push_call_frame(&self, frame: PushCallFrame) -> Result<(), RuntimeError>;
     fn pop_call_frame(&self) -> Result<(), RuntimeError>;
 
-    fn publish_template(&self, template: &[u8]) -> Result<(), RuntimeError>;
+    fn publish_template(&self, template: Vec<u8>) -> Result<(), RuntimeError>;
 }
 
 #[derive(Clone)]

diff --git a/dan_layer/engine/src/transaction/processor.rs b/dan_layer/engine/src/transaction/processor.rs
@@ -382,7 +382,7 @@ impl<TTemplateProvider: TemplateProvider<Template = LoadedTemplate> + 'static> T
         WasmModule::load_template_from_code(binary.as_slice())?;
 
         // creating new substate
-        runtime.interface().publish_template(binary.as_slice())?;
+        runtime.interface().publish_template(binary)?;
 
         Ok(InstructionResult::empty())
     }

diff --git a/dan_layer/engine/src/wasm/module.rs b/dan_layer/engine/src/wasm/module.rs
@@ -87,6 +87,10 @@ impl WasmModule {
         &self.code
     }
 
+    pub fn into_code(self) -> Vec<u8> {
+        self.code
+    }
+
     fn create_engine() -> Engine {
         const MEMORY_PAGE_LIMIT: Pages = Pages(32); // 2MiB = 32 * 65,536
         let base = BaseTunables::for_target(&Target::default());

diff --git a/dan_layer/engine/tests/publish_template.rs b/dan_layer/engine/tests/publish_template.rs
@@ -1,6 +1,8 @@
 // Copyright 2024 The Tari Project
 // SPDX-License-Identifier: BSD-3-Clause
 
+use std::iter;
+
 use rand::random;
 use tari_dan_engine::wasm::compile::compile_template;
 use tari_engine_types::{
@@ -29,7 +31,7 @@ fn publish_template_success() {
     let result = test.execute_expect_success(
         Transaction::builder()
             .fee_transaction_pay_from_component(account_address, Amount(200_000))
-            .publish_template(template.code())
+            .publish_template(template.code().to_vec())
             .sign(&account_key)
             .build(),
         vec![owner_proof],
@@ -62,7 +64,7 @@ fn publish_template_invalid_binary() {
     let result = test.execute_expect_failure(
         Transaction::builder()
             .fee_transaction_pay_from_component(account_address, Amount(200_000))
-            .publish_template([1, 2, 3])
+            .publish_template(vec![1, 2, 3])
             .sign(&account_key)
             .build(),
         vec![owner_proof],
@@ -103,10 +105,6 @@ fn publish_template_too_big_binary() {
     }
 }
 
-fn generate_random_binary(size_in_bytes: u64) -> Vec<u8> {
-    let mut result = vec![];
-    for _ in 1..=size_in_bytes {
-        result.push(random::<u8>());
-    }
-    result
+fn generate_random_binary(size_in_bytes: usize) -> Vec<u8> {
+    iter::repeat_with(random).take(size_in_bytes).collect()
 }
diff --git a/dan_layer/template_test_tooling/templates/faucet/Cargo.lock b/dan_layer/template_test_tooling/templates/faucet/Cargo.lock
diff --git a/dan_layer/transaction/src/builder.rs b/dan_layer/transaction/src/builder.rs
@@ -135,10 +135,8 @@ 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 publish_template(self, binary: Vec<u8>) -> Self {
+        self.add_instruction(Instruction::PublishTemplate { binary })
     }
 
     pub fn claim_burn(self, claim: ConfidentialClaim) -> Self {