Merge branch 'development' into build_dockers_test1

tari-project · May 2, 2024 · 59e4000 · 59e4000
2 parents 1db7c15 + 4ae0774
commit 59e4000
Show file tree

Hide file tree

Showing 108 changed files with 1,793 additions and 1,395 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -159,7 +159,7 @@ chacha20poly1305 = "0.10.1"
 chrono = "0.4.24"
 config = "0.14.0"
 convert_case = "0.6.0"
-cucumber = "0.18.0"
+cucumber = "0.21.0"
 d3ne = { git = "https://github.com/stringhandler/d3ne-rs.git", tag = "v0.8.0-pre.3" }
 dashmap = "5.5.0"
 diesel = { version = "2", default-features = false }
@@ -179,7 +179,7 @@ httpmock = "0.6.8"
 humantime = "2.1.0"
 humantime-serde = "1.1.1"
 include_dir = "0.7.2"
-indexmap = "2.1.0"
+indexmap = "2.2.6"
 indoc = "1.0.6"
 itertools = "0.11.0"
 lazy_static = "1.4.0"

diff --git a/applications/tari_dan_app_utilities/Cargo.toml b/applications/tari_dan_app_utilities/Cargo.toml
@@ -26,7 +26,7 @@ tari_transaction = { workspace = true }
 tari_validator_node_client = { workspace = true }
 tari_bor = { workspace = true, default-features = true }
 tari_indexer_lib = { workspace = true }
-tari_networking = { workspace = true}
+tari_networking = { workspace = true }
 tari_validator_node_rpc = { workspace = true }
 
 anyhow = { workspace = true }
@@ -49,11 +49,11 @@ serde = { workspace = true, features = ["default", "derive"] }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = [
-  "default",
-  "macros",
-  "time",
-  "sync",
-  "rt-multi-thread",
-]}
+    "default",
+    "macros",
+    "time",
+    "sync",
+    "rt-multi-thread",
+] }
 tokio-stream = { workspace = true, features = ["sync"] }
 config = { workspace = true }
diff --git a/applications/tari_dan_app_utilities/src/transaction_executor.rs b/applications/tari_dan_app_utilities/src/transaction_executor.rs
@@ -76,7 +76,7 @@ where TTemplateProvider: TemplateProvider<Template = LoadedTemplate>
 
         let processor = TransactionProcessor::new(
             self.template_provider.clone(),
-            state_store,
+            state_store.clone(),
             auth_params,
             virtual_substates,
             modules,

diff --git a/applications/tari_dan_wallet_daemon/src/handlers/accounts.rs b/applications/tari_dan_wallet_daemon/src/handlers/accounts.rs
@@ -106,11 +106,6 @@ pub async fn handle_create(
         .locate_dependent_substates(&[default_account.address.clone()])
         .await?;
 
-    // We aren't mutating the resources
-    let (input_refs, inputs) = inputs
-        .into_iter()
-        .partition::<Vec<_>, _>(|s| s.substate_id.is_resource());
-
     let signing_key_index = req.key_id.unwrap_or(default_account.key_index);
     let signing_key = key_manager_api.derive_key(key_manager::TRANSACTION_BRANCH, signing_key_index)?;
 
@@ -129,11 +124,6 @@ pub async fn handle_create(
     let transaction = Transaction::builder()
         .fee_transaction_pay_from_component(default_account.address.as_component_address().unwrap(), max_fee)
         .create_account(owner_pk.clone())
-        .with_input_refs(
-            input_refs
-                .iter()
-                .map(|s| SubstateRequirement::new(s.substate_id.clone(), Some(s.version))),
-        )
         .with_inputs(
             inputs
                 .iter()
@@ -954,7 +944,7 @@ pub async fn handle_transfer(
     let transaction = Transaction::builder()
         .with_fee_instructions(fee_instructions)
         .with_instructions(instructions)
-        .with_input_refs(vec![resource_substate_address])
+        .with_inputs(vec![resource_substate_address])
         .sign(&account_secret_key.key)
         .build();