Skip to content
This repository has been archived by the owner on Jun 3, 2020. It is now read-only.

Commit

Permalink
Merge pull request #225 from ZondaX/feat/ledger
Browse files Browse the repository at this point in the history
Feat/ledger
  • Loading branch information
liamsi committed Mar 15, 2019
2 parents 4a387f9 + 1cae4aa commit 7905fdb
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 18 deletions.
19 changes: 4 additions & 15 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ failure_derive = "0.1"
hkdf = "0.7"
hmac = "0.7"
lazy_static = "1"
ledger-tendermint = { version = "0.4.0", optional = true }
prost-amino = "0.4.0"
prost-amino-derive = "0.4.0"
rand_os = "0.1"
Expand All @@ -39,7 +40,6 @@ signal-hook = "0.1.7"
signatory = { version = "0.11.1", features = ["ed25519", "ecdsa"] }
signatory-dalek = "0.11"
signatory-secp256k1 = "0.11"
signatory-ledger-tm = { version = "0.11", optional = true }
subtle = "2"
subtle-encoding = { version = "0.3", features = ["bech32-preview"] }
tendermint = { version = "0.5.0-alpha1", path = "tendermint-rs" }
Expand All @@ -55,7 +55,7 @@ rand = "0.6" # TODO: switch to the getrandom crate
[features]
default = []
softsign = []
ledgertm = ["signatory-ledger-tm"]
ledgertm = ["ledger-tendermint"]
yubihsm-mock = ["yubihsm/mockhsm"]

# Enable integer overflow checks in release builds for security reasons
Expand Down
2 changes: 1 addition & 1 deletion src/keyring/ed25519/ledgertm.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ use crate::{
error::{KmsError, KmsErrorKind::*},
keyring::{ed25519::Signer, KeyRing, SigningProvider},
};
use ledger_tendermint::signer::Ed25519LedgerTmAppSigner;
use signatory::PublicKeyed;
use signatory_ledger_tm::{self, Ed25519LedgerTmAppSigner};
use tendermint::TendermintKey;

/// Create Ledger Tendermint signer object from the given configuration
Expand Down

0 comments on commit 7905fdb

Please sign in to comment.