From 04736215707f7172ecd9f25843345106233c7135 Mon Sep 17 00:00:00 2001 From: Juan Leni Date: Fri, 30 Nov 2018 15:23:55 +0100 Subject: [PATCH] Merge PR #2870: Upgrading ledger-cosmos-go dependency * Upgrading dependencies * Update dependency --- Gopkg.lock | 20 ++++++++++++++------ Gopkg.toml | 8 ++++---- crypto/ledger.go | 4 ++-- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index cd0efad9e..acb086482 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -2,12 +2,20 @@ [[projects]] - branch = "master" digest = "1:7736fc6da04620727f8f3aa2ced8d77be8e074a302820937aa5993848c769b27" name = "github.com/ZondaX/hid-go" packages = ["."] pruneopts = "UT" revision = "48b08affede2cea076a3cf13b2e3f72ed262b743" + version = "v0.4.0" + +[[projects]] + digest = "1:1ba351898f7efc68c7c9ff3145b920e478f716b077fdaaf06b967c5d883fa988" + name = "github.com/ZondaX/ledger-go" + packages = ["."] + pruneopts = "UT" + revision = "c3225ab10c2f53397d4aa419a588466493572b22" + version = "v0.4.0" [[projects]] branch = "master" @@ -513,12 +521,12 @@ revision = "v0.27.0-dev1" [[projects]] - digest = "1:7886f86064faff6f8d08a3eb0e8c773648ff5a2e27730831e2bfbf07467f6666" - name = "github.com/zondax/ledger-goclient" + digest = "1:a7485b2a69f996923f9d3406a9a853fd8eb31818515e985a830d71f88f6a925b" + name = "github.com/zondax/ledger-cosmos-go" packages = ["."] pruneopts = "UT" - revision = "58598458c11bc0ad1c1b8dac3dc3e11eaf270b79" - version = "v0.1.0" + revision = "d4aed6d929a703bb555a2d79fe9c470afe61f648" + version = "v0.9.2" [[projects]] digest = "1:6f6dc6060c4e9ba73cf28aa88f12a69a030d3d19d518ef8e931879eaa099628d" @@ -702,7 +710,7 @@ "github.com/tendermint/tendermint/types", "github.com/tendermint/tendermint/types/time", "github.com/tendermint/tendermint/version", - "github.com/zondax/ledger-goclient", + "github.com/zondax/ledger-cosmos-go", "golang.org/x/crypto/bcrypt", ] solver-name = "gps-cdcl" diff --git a/Gopkg.toml b/Gopkg.toml index 43fe589ef..1593e7298 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -38,6 +38,10 @@ name = "github.com/tendermint/tendermint" revision = "v0.27.0-dev1" +[[constraint]] + name = "github.com/zondax/ledger-cosmos-go" + version = "=v0.9.2" + ## deps without releases: [[override]] @@ -49,10 +53,6 @@ name = "github.com/cosmos/go-bip39" revision = "52158e4697b87de16ed390e1bdaf813e581008fa" -[[constraint]] - name = "github.com/zondax/ledger-goclient" - version = "=v0.1.0" - ## transitive deps, with releases: [[override]] diff --git a/crypto/ledger.go b/crypto/ledger.go index b9aa65b56..36b5646b8 100644 --- a/crypto/ledger.go +++ b/crypto/ledger.go @@ -3,7 +3,7 @@ package crypto import ( - ledger "github.com/zondax/ledger-goclient" + ledger "github.com/zondax/ledger-cosmos-go" ) // If ledger support (build tag) has been enabled, which implies a CGO dependency, @@ -11,7 +11,7 @@ import ( // device at runtime or returning an error. func init() { discoverLedger = func() (LedgerSECP256K1, error) { - device, err := ledger.FindLedger() + device, err := ledger.FindLedgerCosmosUserApp() if err != nil { return nil, err }