certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge PR #2870: Upgrading ledger-cosmos-go dependency 

* Upgrading dependencies
* Update dependency
This commit is contained in:
Juan Leni 2018-11-30 15:23:55 +01:00 committed by Christopher Goes
parent 98caf44e35
commit 0473621570
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Gopkg.lock generated
View File

@ -2,12 +2,20 @@
[[projects]] [[projects]]
branch = "master"
digest = "1:7736fc6da04620727f8f3aa2ced8d77be8e074a302820937aa5993848c769b27" digest = "1:7736fc6da04620727f8f3aa2ced8d77be8e074a302820937aa5993848c769b27"
name = "github.com/ZondaX/hid-go" name = "github.com/ZondaX/hid-go"
packages = ["."] packages = ["."]
pruneopts = "UT" pruneopts = "UT"
revision = "48b08affede2cea076a3cf13b2e3f72ed262b743" 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]] [[projects]]
branch = "master" branch = "master"
@ -513,12 +521,12 @@
revision = "v0.27.0-dev1" revision = "v0.27.0-dev1"
[[projects]] [[projects]]
digest = "1:7886f86064faff6f8d08a3eb0e8c773648ff5a2e27730831e2bfbf07467f6666" digest = "1:a7485b2a69f996923f9d3406a9a853fd8eb31818515e985a830d71f88f6a925b"
name = "github.com/zondax/ledger-goclient" name = "github.com/zondax/ledger-cosmos-go"
packages = ["."] packages = ["."]
pruneopts = "UT" pruneopts = "UT"
revision = "58598458c11bc0ad1c1b8dac3dc3e11eaf270b79" revision = "d4aed6d929a703bb555a2d79fe9c470afe61f648"
version = "v0.1.0" version = "v0.9.2"
[[projects]] [[projects]]
digest = "1:6f6dc6060c4e9ba73cf28aa88f12a69a030d3d19d518ef8e931879eaa099628d" digest = "1:6f6dc6060c4e9ba73cf28aa88f12a69a030d3d19d518ef8e931879eaa099628d"
@ -702,7 +710,7 @@
"github.com/tendermint/tendermint/types", "github.com/tendermint/tendermint/types",
"github.com/tendermint/tendermint/types/time", "github.com/tendermint/tendermint/types/time",
"github.com/tendermint/tendermint/version", "github.com/tendermint/tendermint/version",
"github.com/zondax/ledger-goclient", "github.com/zondax/ledger-cosmos-go",
"golang.org/x/crypto/bcrypt", "golang.org/x/crypto/bcrypt",
] ]
solver-name = "gps-cdcl" solver-name = "gps-cdcl"

8
Gopkg.toml
View File

@ -38,6 +38,10 @@
name = "github.com/tendermint/tendermint" name = "github.com/tendermint/tendermint"
revision = "v0.27.0-dev1" revision = "v0.27.0-dev1"
[[constraint]]
name = "github.com/zondax/ledger-cosmos-go"
version = "=v0.9.2"
## deps without releases: ## deps without releases:
[[override]] [[override]]
@ -49,10 +53,6 @@
name = "github.com/cosmos/go-bip39" name = "github.com/cosmos/go-bip39"
revision = "52158e4697b87de16ed390e1bdaf813e581008fa" revision = "52158e4697b87de16ed390e1bdaf813e581008fa"
[[constraint]]
name = "github.com/zondax/ledger-goclient"
version = "=v0.1.0"
## transitive deps, with releases: ## transitive deps, with releases:
[[override]] [[override]]

4
crypto/ledger.go
View File

@ -3,7 +3,7 @@
package crypto package crypto
import ( 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, // 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. // device at runtime or returning an error.
func init() { func init() {
discoverLedger = func() (LedgerSECP256K1, error) { discoverLedger = func() (LedgerSECP256K1, error) {
device, err := ledger.FindLedger() device, err := ledger.FindLedgerCosmosUserApp()
if err != nil { if err != nil {
return nil, err return nil, err
} }