chore(release): nextnet hotfix, remove wallet panic (#5339)

Description --- Removes a potential panic in the wallet Releases a new hotfix version How Has This Been Tested? --- Manual and unit tests
tari-project · Apr 19, 2023 · 600dd49 · 600dd49
1 parent 12503cc
commit 600dd49
Show file tree

Hide file tree

Showing 30 changed files with 60 additions and 56 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/applications/tari_app_grpc/Cargo.toml b/applications/tari_app_grpc/Cargo.toml
@@ -4,7 +4,7 @@ authors = ["The Tari Development Community"]
 description = "This crate is to provide a single source for all cross application grpc files and conversions to and from tari::core"
 repository = "https://github.com/tari-project/tari"
 license = "BSD-3-Clause"
-version = "0.49.0-rc.1"
+version = "0.49.0-rc.2"
 edition = "2018"
 
 [dependencies]

diff --git a/applications/tari_app_utilities/Cargo.toml b/applications/tari_app_utilities/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tari_app_utilities"
-version = "0.49.0-rc.1"
+version = "0.49.0-rc.2"
 authors = ["The Tari Development Community"]
 edition = "2018"
 license = "BSD-3-Clause"

diff --git a/applications/tari_base_node/Cargo.toml b/applications/tari_base_node/Cargo.toml
@@ -4,7 +4,7 @@ authors = ["The Tari Development Community"]
 description = "The tari full base node implementation"
 repository = "https://github.com/tari-project/tari"
 license = "BSD-3-Clause"
-version = "0.49.0-rc.1"
+version = "0.49.0-rc.2"
 edition = "2018"
 
 [dependencies]

diff --git a/applications/tari_console_wallet/Cargo.toml b/applications/tari_console_wallet/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tari_console_wallet"
-version = "0.49.0-rc.1"
+version = "0.49.0-rc.2"
 authors = ["The Tari Development Community"]
 edition = "2018"
 license = "BSD-3-Clause"

diff --git a/applications/tari_merge_mining_proxy/Cargo.toml b/applications/tari_merge_mining_proxy/Cargo.toml
@@ -4,7 +4,7 @@ authors = ["The Tari Development Community"]
 description = "The Tari merge mining proxy for xmrig"
 repository = "https://github.com/tari-project/tari"
 license = "BSD-3-Clause"
-version = "0.49.0-rc.1"
+version = "0.49.0-rc.2"
 edition = "2018"
 
 [features]

diff --git a/applications/tari_miner/Cargo.toml b/applications/tari_miner/Cargo.toml
@@ -4,7 +4,7 @@ authors = ["The Tari Development Community"]
 description = "The tari miner implementation"
 repository = "https://github.com/tari-project/tari"
 license = "BSD-3-Clause"
-version = "0.49.0-rc.1"
+version = "0.49.0-rc.2"
 edition = "2018"
 
 [dependencies]

diff --git a/base_layer/common_types/Cargo.toml b/base_layer/common_types/Cargo.toml
@@ -3,7 +3,7 @@ name = "tari_common_types"
 authors = ["The Tari Development Community"]
 description = "Tari cryptocurrency common types"
 license = "BSD-3-Clause"
-version = "0.49.0-rc.1"
+version = "0.49.0-rc.2"
 edition = "2018"
 
 [dependencies]

diff --git a/base_layer/contacts/Cargo.toml b/base_layer/contacts/Cargo.toml
@@ -3,7 +3,7 @@ name = "tari_contacts"
 authors = ["The Tari Development Community"]
 description = "Tari contacts library"
 license = "BSD-3-Clause"
-version = "0.49.0-rc.1"
+version = "0.49.0-rc.2"
 edition = "2018"
 
 [dependencies]

diff --git a/base_layer/core/Cargo.toml b/base_layer/core/Cargo.toml
@@ -6,7 +6,7 @@ repository = "https://github.com/tari-project/tari"
 homepage = "https://tari.com"
 readme = "README.md"
 license = "BSD-3-Clause"
-version = "0.49.0-rc.1"
+version = "0.49.0-rc.2"
 edition = "2018"
 
 [features]

diff --git a/base_layer/key_manager/Cargo.toml b/base_layer/key_manager/Cargo.toml
@@ -4,7 +4,7 @@ authors = ["The Tari Development Community"]
 description = "Tari cryptocurrency wallet key management"
 repository = "https://github.com/tari-project/tari"
 license = "BSD-3-Clause"
-version = "0.49.0-rc.1"
+version = "0.49.0-rc.2"
 edition = "2021"
 
 [lib]

diff --git a/base_layer/mmr/Cargo.toml b/base_layer/mmr/Cargo.toml
@@ -4,7 +4,7 @@ authors = ["The Tari Development Community"]
 description = "A Merkle Mountain Range implementation"
 repository = "https://github.com/tari-project/tari"
 license = "BSD-3-Clause"
-version = "0.49.0-rc.1"
+version = "0.49.0-rc.2"
 edition = "2018"
 
 [features]

diff --git a/base_layer/p2p/Cargo.toml b/base_layer/p2p/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tari_p2p"
-version = "0.49.0-rc.1"
+version = "0.49.0-rc.2"
 authors = ["The Tari Development community"]
 description = "Tari base layer-specific peer-to-peer communication features"
 repository = "https://github.com/tari-project/tari"

diff --git a/base_layer/service_framework/Cargo.toml b/base_layer/service_framework/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tari_service_framework"
-version = "0.49.0-rc.1"
+version = "0.49.0-rc.2"
 authors = ["The Tari Development Community"]
 description = "The Tari communication stack service framework"
 repository = "https://github.com/tari-project/tari"

diff --git a/base_layer/tari_mining_helper_ffi/Cargo.toml b/base_layer/tari_mining_helper_ffi/Cargo.toml
@@ -3,7 +3,7 @@ name = "tari_mining_helper_ffi"
 authors = ["The Tari Development Community"]
 description = "Tari cryptocurrency miningcore C FFI bindings"
 license = "BSD-3-Clause"
-version = "0.49.0-rc.1"
+version = "0.49.0-rc.2"
 edition = "2018"
 
 [dependencies]

diff --git a/base_layer/wallet/Cargo.toml b/base_layer/wallet/Cargo.toml
@@ -3,7 +3,7 @@ name = "tari_wallet"
 authors = ["The Tari Development Community"]
 description = "Tari cryptocurrency wallet library"
 license = "BSD-3-Clause"
-version = "0.49.0-rc.1"
+version = "0.49.0-rc.2"
 edition = "2018"
 
 [dependencies]

diff --git a/base_layer/wallet/src/utxo_scanner_service/utxo_scanner_task.rs b/base_layer/wallet/src/utxo_scanner_service/utxo_scanner_task.rs
@@ -459,7 +459,6 @@ where
         let mut utxo_next_await_profiling = Vec::new();
         let mut scan_for_outputs_profiling = Vec::new();
         let mut prev_scanned_block: Option<ScannedBlock> = None;
-        let mut prev_output = None;
         while let Some(response) = {
             let start = Instant::now();
             let utxo_stream_next = utxo_stream.next().await;
@@ -481,7 +480,6 @@ where
                 .into_iter()
                 .map(|utxo| TransactionOutput::try_from(utxo).map_err(UtxoScannerError::ConversionError))
                 .collect::<Result<Vec<_>, _>>()?;
-            let first_output = Some(outputs[0].clone());
             total_scanned += outputs.len();
 
             let start = Instant::now();
@@ -493,7 +491,7 @@ where
                 .await?;
             let block_hash = current_header_hash.try_into()?;
             if let Some(scanned_block) = prev_scanned_block {
-                if block_hash == scanned_block.header_hash && first_output == prev_output {
+                if block_hash == scanned_block.header_hash {
                     count += scanned_block.num_outputs.unwrap_or(0);
                     amount += scanned_block.amount.unwrap_or_else(|| 0.into())
                 } else {
@@ -518,7 +516,6 @@ where
                     total_amount += amount;
                 }
             }
-            prev_output = first_output;
             prev_scanned_block = Some(ScannedBlock {
                 header_hash: block_hash,
                 height: current_height,

diff --git a/base_layer/wallet_ffi/Cargo.toml b/base_layer/wallet_ffi/Cargo.toml
@@ -3,7 +3,7 @@ name = "tari_wallet_ffi"
 authors = ["The Tari Development Community"]
 description = "Tari cryptocurrency wallet C FFI bindings"
 license = "BSD-3-Clause"
-version = "0.49.0-rc.1"
+version = "0.49.0-rc.2"
 edition = "2018"
 
 [dependencies]