Skip to content

Commit

Permalink
Merge branch 'master' into stellarNetworkAgnostic
Browse files Browse the repository at this point in the history
  • Loading branch information
Akuukis authored Jul 12, 2018
2 parents a76439c + bcb8698 commit 90b62f3
Show file tree
Hide file tree
Showing 26 changed files with 267 additions and 136 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import AppBtc from "@ledgerhq/hw-app-btc";
const getBtcAddress = async () => {
const transport = await Transport.create();
const btc = new AppBtc(transport);
const result = await btc.getWalletPublicKey("44'/0'/0'/0");
const result = await btc.getWalletPublicKey("44'/0'/0'/0/0");
return result.bitcoinAddress;
};
getBtcAddress().then(a => console.log(a));
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
"packages/*"
],
"version": "4.16.0",
"version": "4.19.1",
"npmClient": "yarn",
"useWorkspaces": true
}
8 changes: 4 additions & 4 deletions packages/example-browser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"build": "cross-env NODE_ENV=production parcel build index.html --no-minify --public-url /"
},
"dependencies": {
"@ledgerhq/hw-app-btc": "^4.15.0",
"@ledgerhq/hw-app-eth": "^4.15.0",
"@ledgerhq/hw-transport-u2f": "^4.15.0",
"@ledgerhq/hw-app-btc": "^4.19.0",
"@ledgerhq/hw-app-eth": "^4.19.0",
"@ledgerhq/hw-transport-u2f": "^4.19.0",
"react": "^16.2.0",
"react-dom": "^16.2.0"
},
Expand All @@ -19,5 +19,5 @@
"parcel-bundler": "^1.6.2"
},
"private": true,
"version": "4.15.0"
"version": "4.19.0"
}
8 changes: 4 additions & 4 deletions packages/example-node/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"private": true,
"name": "@ledgerhq/example-node",
"version": "4.16.0",
"version": "4.19.1",
"main": "index.js",
"license": "Apache-2.0",
"dependencies": {
"@ledgerhq/hw-app-btc": "^4.15.0",
"@ledgerhq/hw-app-eth": "^4.15.0",
"@ledgerhq/hw-transport-node-hid": "^4.16.0"
"@ledgerhq/hw-app-btc": "^4.19.0",
"@ledgerhq/hw-app-eth": "^4.19.0",
"@ledgerhq/hw-transport-node-hid": "^4.19.1"
},
"devDependencies": {
"flow-bin": "^0.68.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/hw-app-ada/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ledgerhq/hw-app-ada",
"version": "4.16.0",
"version": "4.19.1",
"description": "Ledger Hardware Wallet Cardano ADA API",
"main": "lib/Ada.js",
"repository": "git+ssh://[email protected]/LedgerHQ/ledgerjs.git",
Expand All @@ -17,11 +17,11 @@
"author": "HiddenField Ltd <[email protected]>",
"license": "Apache-2.0",
"dependencies": {
"@ledgerhq/hw-transport": "^4.15.0",
"@ledgerhq/hw-transport": "^4.19.0",
"node-int64": "^0.4.0"
},
"devDependencies": {
"@ledgerhq/hw-transport-node-hid": "^4.16.0",
"@ledgerhq/hw-transport-node-hid": "^4.19.1",
"chai": "^4.1.2",
"chalk": "^2.3.1",
"flow-bin": "^0.68.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/hw-app-btc/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ledgerhq/hw-app-btc",
"version": "4.15.0",
"version": "4.19.0",
"description": "Ledger Hardware Wallet Bitcoin Application API",
"keywords": [
"Ledger",
Expand All @@ -25,7 +25,7 @@
"main": "lib/Btc.js",
"license": "Apache-2.0",
"dependencies": {
"@ledgerhq/hw-transport": "^4.15.0",
"@ledgerhq/hw-transport": "^4.19.0",
"create-hash": "^1.1.3"
},
"devDependencies": {
Expand Down
Loading

0 comments on commit 90b62f3

Please sign in to comment.