Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added hardware wallet support to the CLI. #2158

Merged
merged 1 commit into from
Nov 11, 2023
Merged
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))
2 changes: 2 additions & 0 deletions .changelog/unreleased/improvements/2046-ibc-token-addr.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Replace strings with a specialized IBC token hash type in addresses
([\#2046](https://github.com/anoma/namada/pull/2046))
3 changes: 3 additions & 0 deletions .changelog/unreleased/improvements/2060-new-addresses.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Switch to a more compact representation in Namada's transparent
addresses, and change all bech32m HRPs to their mainnet equivalent
([\#2060](https://github.com/anoma/namada/pull/2060))
138 changes: 134 additions & 4 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", rev = "7e861c440de0fdabaf51e30d97f5c8736be348f3" }
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