Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Added Ledger support to the CLI client.
([\#2118](https://github.com/anoma/namada/pull/2118))
108 changes: 108 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ index-set = {git = "https://github.com/heliaxdev/index-set", tag = "v0.8.0", fea
itertools = "0.10.0"
k256 = { version = "0.13.0", default-features = false, features = ["ecdsa", "pkcs8", "precomputed-tables", "serde", "std"]}
lazy_static = "1.4.0"
ledger-namada-rs = { git = "https://github.com/heliaxdev/ledger-namada", branch = "murisi/fix-rs-0.24.0" }
ledger-transport-hid = "0.10.0"
libc = "0.2.97"
libloading = "0.7.2"
# branch = "murisi/namada-integration"
Expand Down
6 changes: 4 additions & 2 deletions apps/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ abciplus = [


[dependencies]
namada = {path = "../shared", features = ["ferveo-tpke", "masp-tx-gen", "multicore", "http-client"]}
namada_sdk = {path = "../sdk", default-features = false, features = ["wasm-runtime", "masp-tx-gen"]}
namada = {path = "../shared", features = ["ferveo-tpke", "multicore", "http-client"]}
namada_sdk = {path = "../sdk", default-features = false, features = ["wasm-runtime"]}
namada_test_utils = {path = "../test_utils", optional = true}
ark-serialize.workspace = true
ark-std.workspace = true
Expand Down Expand Up @@ -100,6 +100,8 @@ flate2.workspace = true
futures.workspace = true
itertools.workspace = true
lazy_static.workspace= true
ledger-namada-rs.workspace = true
ledger-transport-hid.workspace = true
libc.workspace = true
libloading.workspace = true
masp_primitives = { workspace = true, features = ["transparent-inputs"] }
Expand Down
5 changes: 3 additions & 2 deletions apps/src/bin/namada-wallet/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ use color_eyre::eyre::Result;
use namada_apps::cli;
use namada_apps::cli::api::{CliApi, CliIo};

pub fn main() -> Result<()> {
#[tokio::main]
pub async fn main() -> Result<()> {
color_eyre::install()?;
let (cmd, ctx) = cli::namada_wallet_cli()?;
// run the CLI
CliApi::handle_wallet_command(cmd, ctx, &CliIo)
CliApi::handle_wallet_command(cmd, ctx, &CliIo).await
}
6 changes: 4 additions & 2 deletions apps/src/lib/bench_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -704,15 +704,17 @@ impl Default for BenchShieldedCtx {
let mut chain_ctx = ctx.take_chain_or_exit();

// Generate spending key for Albert and Bertha
chain_ctx.wallet.gen_spending_key(
chain_ctx.wallet.gen_store_spending_key(
ALBERT_SPENDING_KEY.to_string(),
None,
true,
&mut OsRng,
);
chain_ctx.wallet.gen_spending_key(
chain_ctx.wallet.gen_store_spending_key(
BERTHA_SPENDING_KEY.to_string(),
None,
true,
&mut OsRng,
);
crate::wallet::save(&chain_ctx.wallet).unwrap();

Expand Down
Loading