Merge branch 'development' into mp_sort_completed_transactions

tari-project · Jan 10, 2025 · 2e50d9e · 2e50d9e
2 parents 0f07f57 + 16fb40c
commit 2e50d9e
Show file tree

Hide file tree

Showing 49 changed files with 387 additions and 194 deletions.
diff --git a/.github/workflows/build_ledger_wallet.yml b/.github/workflows/build_ledger_wallet.yml
@@ -15,6 +15,7 @@ name: Build minotari_ledger_wallet
 env:
   TS_FILENAME: "minotari_ledger_wallet"
   SHARUN: "shasum --algorithm 256"
+  DOCKER_IMAGE: "ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:3.43.0 "
 
 concurrency:
   # https://docs.github.com/en/actions/examples/using-concurrency-expressions-and-a-test-matrix
@@ -59,7 +60,7 @@ jobs:
           docker run --rm \
             -v ".:/app" \
             -w "/app/applications/minotari_ledger_wallet/wallet" \
-            ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder \
+            ${{env.DOCKER_IMAGE}} \
             cargo ledger build ${{ matrix.ledger_target }}
 
       - name: env Setup

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/applications/minotari_app_grpc/Cargo.toml b/applications/minotari_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 = "1.9.1-pre.2"
+version = "1.9.2-pre.0"
 edition = "2021"
 
 [dependencies]
@@ -32,7 +32,7 @@ tonic = { version = "0.12.3", features = ["tls"] }
 zeroize = "1"
 
 [build-dependencies]
-tari_features = { path = "../../common/tari_features", version = "1.9.1-pre.2" }
+tari_features = { path = "../../common/tari_features", version = "1.9.2-pre.0" }
 tonic-build = "0.12.3"
 
 [package.metadata.cargo-machete]

diff --git a/applications/minotari_app_utilities/Cargo.toml b/applications/minotari_app_utilities/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "minotari_app_utilities"
-version = "1.9.1-pre.2"
+version = "1.9.2-pre.0"
 authors = ["The Tari Development Community"]
 edition = "2018"
 license = "BSD-3-Clause"
@@ -30,7 +30,7 @@ tari_common = { path = "../../common", features = [
     "build",
     "static-application-info",
 ] }
-tari_features = { path = "../../common/tari_features", version = "1.9.1-pre.2" }
+tari_features = { path = "../../common/tari_features", version = "1.9.2-pre.0" }
 
 [features]
 miner_input = ["minotari_app_grpc"]
diff --git a/applications/minotari_console_wallet/Cargo.toml b/applications/minotari_console_wallet/Cargo.toml
@@ -1,14 +1,14 @@
 [package]
 name = "minotari_console_wallet"
-version = "1.9.1-pre.2"
+version = "1.9.2-pre.0"
 authors = ["The Tari Development Community"]
 edition = "2018"
 license = "BSD-3-Clause"
 
 [dependencies]
 minotari_app_grpc = { path = "../minotari_app_grpc" }
 minotari_app_utilities = { path = "../minotari_app_utilities" }
-minotari_ledger_wallet_comms = { path = "../../applications/minotari_ledger_wallet/comms", version = "1.9.1-pre.2", optional = true }
+minotari_ledger_wallet_comms = { path = "../../applications/minotari_ledger_wallet/comms", version = "1.9.2-pre.0", optional = true }
 tari_common = { path = "../../common" }
 tari_common_types = { path = "../../base_layer/common_types" }
 tari_comms = { path = "../../comms/core" }
@@ -84,7 +84,7 @@ default-features = false
 features = ["crossterm"]
 
 [build-dependencies]
-tari_features = { path = "../../common/tari_features", version = "1.9.1-pre.2" }
+tari_features = { path = "../../common/tari_features", version = "1.9.2-pre.0" }
 
 [features]
 default = ["libtor", "ledger"]

diff --git a/applications/minotari_ledger_wallet/common/Cargo.toml b/applications/minotari_ledger_wallet/common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "minotari_ledger_wallet_common"
-version = "1.9.1-pre.2"
+version = "1.9.2-pre.0"
 authors = ["The Tari Development Community"]
 license = "BSD-3-Clause"
 edition = "2021"

diff --git a/applications/minotari_ledger_wallet/comms/Cargo.toml b/applications/minotari_ledger_wallet/comms/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "minotari_ledger_wallet_comms"
-version = "1.9.1-pre.2"
+version = "1.9.2-pre.0"
 authors = ["The Tari Development Community"]
 license = "BSD-3-Clause"
 edition = "2021"