Merge branch 'st-nextnet-release' into nextnet

# Conflicts: # Cargo.lock # applications/tari_app_grpc/Cargo.toml # applications/tari_app_utilities/Cargo.toml # applications/tari_base_node/Cargo.toml # applications/tari_console_wallet/Cargo.toml # applications/tari_merge_mining_proxy/Cargo.toml # applications/tari_miner/Cargo.toml # base_layer/common_types/Cargo.toml # base_layer/core/Cargo.toml # base_layer/key_manager/Cargo.toml # base_layer/mmr/Cargo.toml # base_layer/p2p/Cargo.toml # base_layer/service_framework/Cargo.toml # base_layer/tari_mining_helper_ffi/Cargo.toml # base_layer/wallet/Cargo.toml # base_layer/wallet_ffi/Cargo.toml # common/Cargo.toml # common_sqlite/Cargo.toml # comms/core/Cargo.toml # comms/dht/Cargo.toml # comms/rpc_macros/Cargo.toml # infrastructure/derive/Cargo.toml # infrastructure/shutdown/Cargo.toml # infrastructure/storage/Cargo.toml # infrastructure/test_utils/Cargo.toml
tari-project · Mar 9, 2023 · 686e829 · 686e829
2 parents 5af3e3b + 16ae38f
commit 686e829
Show file tree

Hide file tree

Showing 32 changed files with 97 additions and 78 deletions.
diff --git a/.github/workflows/base_node_binaries.yml b/.github/workflows/base_node_binaries.yml
@@ -4,7 +4,7 @@ name: Build Matrix of Binaries
 'on':
   push:
     tags:
-      - "v[0-9]+.[0-9]+.[0-9]+(-[a-z]+.[0-9]+)?"
+      - 'v[0-9]+.[0-9]+.[0-9]*'
     branches:
       - build-*
   schedule:

diff --git a/.github/workflows/build_libwallets.yml b/.github/workflows/build_libwallets.yml
@@ -4,7 +4,7 @@ name: Build libwallets
 'on':
   push:
     tags:
-      - "v[0-9]+.[0-9]+.[0-9]+"
+      - 'v[0-9]+.[0-9]+.[0-9]*'
     branches:
       - "build-libwallet-*"
   schedule:

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.48.0-rc.0"
+version = "v0.48.0-rc.1"
 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.48.0-rc.0"
+version = "v0.48.0-rc.1"
 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.48.0-rc.0"
+version = "v0.48.0-rc.1"
 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.48.0-rc.0"
+version = "v0.48.0-rc.1"
 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.48.0-rc.0"
+version = "v0.48.0-rc.1"
 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.48.0-rc.0"
+version = "v0.48.0-rc.1"
 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.48.0-rc.0"
+version = "v0.48.0-rc.1"
 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.48.0-rc.0"
+version = "v0.48.0-rc.1"
 edition = "2018"
 
 [features]
@@ -44,7 +44,7 @@ chacha20poly1305 = "0.10.1"
 chrono = { version = "0.4.19", default-features = false, features = ["serde"] }
 criterion = { version = "0.4.0", optional = true  }
 croaring = { version = "0.5.2", optional = true }
-decimal-rs = "0.1.20"
+decimal-rs = "0.1.42"
 derivative = "2.2.0"
 digest = "0.9.0"
 fs2 = "0.4.0"

diff --git a/base_layer/core/src/transactions/tari_amount.rs b/base_layer/core/src/transactions/tari_amount.rs
@@ -69,7 +69,14 @@ pub enum MicroTariError {
     #[error("Failed to parse value: {0}")]
     ParseError(String),
     #[error("Failed to convert value: {0}")]
-    ConversionError(#[from] DecimalConvertError),
+    ConversionError(DecimalConvertError),
+}
+
+// DecimalConvertError does not implement Error
+impl From<DecimalConvertError> for MicroTariError {
+    fn from(err: DecimalConvertError) -> Self {
+        MicroTariError::ConversionError(err)
+    }
 }
 /// A convenience constant that makes it easier to define Tari amounts.
 /// ```edition2018

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.48.0-rc.0"
+version = "v0.48.0-rc.1"
 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.48.0-rc.0"
+version = "v0.48.0-rc.1"
 edition = "2018"
 
 [features]

diff --git a/base_layer/mmr/src/lib.rs b/base_layer/mmr/src/lib.rs
@@ -152,8 +152,12 @@ pub mod pruned_hashset;
 // Commonly used exports
 /// A vector-based backend for [MerkleMountainRange]
 pub use backend::{ArrayLike, ArrayLikeExt};
-pub use balanced_binary_merkle_proof::{BalancedBinaryMerkleProof, MergedBalancedBinaryMerkleProof};
-pub use balanced_binary_merkle_tree::BalancedBinaryMerkleTree;
+pub use balanced_binary_merkle_proof::{
+    BalancedBinaryMerkleProof,
+    MergedBalancedBinaryMerkleProof,
+    MergedBalancedBinaryMerkleProofError,
+};
+pub use balanced_binary_merkle_tree::{BalancedBinaryMerkleTree, BalancedBinaryMerkleTreeError};
 /// MemBackendVec is a shareable, memory only, vector that can be be used with MmrCache to store checkpoints.
 pub use mem_backend_vec::MemBackendVec;
 /// An immutable, append-only Merkle Mountain range (MMR) data structure

diff --git a/base_layer/p2p/Cargo.toml b/base_layer/p2p/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tari_p2p"
-version = "0.48.0-rc.0"
+version = "v0.48.0-rc.1"
 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.48.0-rc.0"
+version = "v0.48.0-rc.1"
 authors = ["The Tari Development Community"]
 description = "The Tari communication stack service framework"
 repository = "https://github.com/tari-project/tari"