Skip to content

Commit

Permalink
feat: bump to latest Ledger package
Browse files Browse the repository at this point in the history
  • Loading branch information
jurevans committed Jan 7, 2025
1 parent 7e986f2 commit fa92da2
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 35 deletions.
4 changes: 2 additions & 2 deletions apps/extension/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
"@cosmjs/encoding": "^0.29.0",
"@dao-xyz/borsh": "^5.1.5",
"@ledgerhq/hw-transport": "^6.31.4",
"@ledgerhq/hw-transport-webhid": "^6.29.4",
"@ledgerhq/hw-transport-webhid": "^6.30.0",
"@ledgerhq/hw-transport-webusb": "^6.29.4",
"@zondax/ledger-namada": "^1.0.0",
"@zondax/ledger-namada": "^2.0.0",
"bignumber.js": "^9.1.1",
"buffer": "^6.0.3",
"dompurify": "^3.0.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
"@cosmjs/encoding": "^0.29.0",
"@dao-xyz/borsh": "^5.1.5",
"@ledgerhq/hw-transport": "^6.31.4",
"@ledgerhq/hw-transport-webhid": "^6.29.4",
"@ledgerhq/hw-transport-webhid": "^6.30.0",
"@ledgerhq/hw-transport-webusb": "^6.29.4",
"@zondax/ledger-namada": "^1.0.0",
"@zondax/ledger-namada": "^2.0.0",
"bignumber.js": "^9.1.1",
"buffer": "^6.0.3",
"slip44": "^3.0.18"
Expand Down
15 changes: 7 additions & 8 deletions packages/sdk/src/ledger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ const { coinType } = chains.namada.bip44;
export type LedgerAddressAndPublicKey = { address: string; publicKey: string };
export type LedgerShieldedKeys = {
viewingKey: {
viewKey?: string;
ivk?: string;
ovk?: string;
xfvk?: string;
};
proofGenerationKey: {
ak?: string;
Expand Down Expand Up @@ -159,8 +157,11 @@ export class Ledger {
promptUser = true
): Promise<LedgerShieldedKeys> {
try {
const { viewKey, ivk, ovk }: ResponseViewKey =
await this.namadaApp.retrieveKeys(path, NamadaKeys.ViewKey, promptUser);
const { xfvk }: ResponseViewKey = await this.namadaApp.retrieveKeys(
path,
NamadaKeys.ViewKey,
promptUser
);

const { ak, nsk }: ResponseProofGenKey =
await this.namadaApp.retrieveKeys(
Expand All @@ -171,9 +172,7 @@ export class Ledger {

return {
viewingKey: {
viewKey: viewKey?.toString(),
ivk: ivk?.toString(),
ovk: ovk?.toString(),
xfvk: xfvk?.toString(),
},
proofGenerationKey: {
ak: ak?.toString(),
Expand Down
46 changes: 23 additions & 23 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3221,27 +3221,27 @@ __metadata:
languageName: node
linkType: hard

"@ledgerhq/devices@npm:^8.4.2":
version: 8.4.2
resolution: "@ledgerhq/devices@npm:8.4.2"
"@ledgerhq/devices@npm:8.4.4, @ledgerhq/devices@npm:^8.4.4":
version: 8.4.4
resolution: "@ledgerhq/devices@npm:8.4.4"
dependencies:
"@ledgerhq/errors": "npm:^6.18.0"
"@ledgerhq/errors": "npm:^6.19.1"
"@ledgerhq/logs": "npm:^6.12.0"
rxjs: "npm:^7.8.1"
semver: "npm:^7.3.5"
checksum: b7149c6302d23928fd2d3622d9018af10a56f6960732de0d72e881d19b75b0036f6248ca0845cfe9dfeda32ecb52c352423e79e109c7decf8437948fed7843cd
checksum: ea4c3dada124c5c0aad59837e1c399bf2f41f8b4da5c996aaf73bbf8719082598808947c505dc728266ff83fc5fea71170d3f0d18a9b5d59e6e2737ae8a38f39
languageName: node
linkType: hard

"@ledgerhq/devices@npm:^8.4.4":
version: 8.4.4
resolution: "@ledgerhq/devices@npm:8.4.4"
"@ledgerhq/devices@npm:^8.4.2":
version: 8.4.2
resolution: "@ledgerhq/devices@npm:8.4.2"
dependencies:
"@ledgerhq/errors": "npm:^6.19.1"
"@ledgerhq/errors": "npm:^6.18.0"
"@ledgerhq/logs": "npm:^6.12.0"
rxjs: "npm:^7.8.1"
semver: "npm:^7.3.5"
checksum: ea4c3dada124c5c0aad59837e1c399bf2f41f8b4da5c996aaf73bbf8719082598808947c505dc728266ff83fc5fea71170d3f0d18a9b5d59e6e2737ae8a38f39
checksum: b7149c6302d23928fd2d3622d9018af10a56f6960732de0d72e881d19b75b0036f6248ca0845cfe9dfeda32ecb52c352423e79e109c7decf8437948fed7843cd
languageName: node
linkType: hard

Expand All @@ -3259,15 +3259,15 @@ __metadata:
languageName: node
linkType: hard

"@ledgerhq/hw-transport-webhid@npm:^6.29.4":
version: 6.29.4
resolution: "@ledgerhq/hw-transport-webhid@npm:6.29.4"
"@ledgerhq/hw-transport-webhid@npm:^6.30.0":
version: 6.30.0
resolution: "@ledgerhq/hw-transport-webhid@npm:6.30.0"
dependencies:
"@ledgerhq/devices": "npm:^8.4.4"
"@ledgerhq/devices": "npm:8.4.4"
"@ledgerhq/errors": "npm:^6.19.1"
"@ledgerhq/hw-transport": "npm:^6.31.4"
"@ledgerhq/logs": "npm:^6.12.0"
checksum: 85db88aa9c9ca4911645b9421e1a1ce828c48c32b03b7ed15caed8f8e24749dc31007540ec4f0088603d1a315274dbc06d30e4cb71c86b57160b721a664fc8dd
checksum: 1cb6ddb50127d6cb73d80259e10da687a2b7aa87ebbac8cc3e770ac5b95a3ef0001bdaf77109da0eb62509cb8668a9642858b59cb0ff355c1adb0fe2114c532c
languageName: node
linkType: hard

Expand Down Expand Up @@ -3473,7 +3473,7 @@ __metadata:
"@cosmjs/encoding": "npm:^0.29.0"
"@dao-xyz/borsh": "npm:^5.1.5"
"@ledgerhq/hw-transport": "npm:^6.31.4"
"@ledgerhq/hw-transport-webhid": "npm:^6.29.4"
"@ledgerhq/hw-transport-webhid": "npm:^6.30.0"
"@ledgerhq/hw-transport-webusb": "npm:^6.29.4"
"@svgr/webpack": "npm:^6.3.1"
"@types/chrome": "npm:^0.0.237"
Expand All @@ -3487,7 +3487,7 @@ __metadata:
"@types/w3c-web-usb": "npm:^1.0.10"
"@types/webextension-polyfill": "npm:^0.10.6"
"@types/zxcvbn": "npm:^4.4.1"
"@zondax/ledger-namada": "npm:^1.0.0"
"@zondax/ledger-namada": "npm:^2.0.0"
bignumber.js: "npm:^9.1.1"
buffer: "npm:^6.0.3"
copy-webpack-plugin: "npm:^11.0.0"
Expand Down Expand Up @@ -3754,12 +3754,12 @@ __metadata:
"@cosmjs/encoding": "npm:^0.29.0"
"@dao-xyz/borsh": "npm:^5.1.5"
"@ledgerhq/hw-transport": "npm:^6.31.4"
"@ledgerhq/hw-transport-webhid": "npm:^6.29.4"
"@ledgerhq/hw-transport-webhid": "npm:^6.30.0"
"@ledgerhq/hw-transport-webusb": "npm:^6.29.4"
"@release-it/conventional-changelog": "npm:^8.0.1"
"@types/jest": "npm:^29.5.12"
"@types/node": "npm:^20.11.4"
"@zondax/ledger-namada": "npm:^1.0.0"
"@zondax/ledger-namada": "npm:^2.0.0"
babel-jest: "npm:^29.0.3"
bignumber.js: "npm:^9.1.1"
buffer: "npm:^6.0.3"
Expand Down Expand Up @@ -6074,12 +6074,12 @@ __metadata:
languageName: node
linkType: hard

"@zondax/ledger-namada@npm:^1.0.0":
version: 1.0.0
resolution: "@zondax/ledger-namada@npm:1.0.0"
"@zondax/ledger-namada@npm:^2.0.0":
version: 2.0.0
resolution: "@zondax/ledger-namada@npm:2.0.0"
dependencies:
"@ledgerhq/hw-transport": "npm:^6.30.6"
checksum: f7490964ccd41f9a63f2bc8d89ea9f01e7d6a58be796db0b454a3f1455dcc8dc8dd578a8642aa0f0799c93f838e8e3afd69f59f7e9947816b9471338c2b9dd63
checksum: 1fa2a9a537bc42df01444332529a606ed77f608a2cc1dbb029915ed854ff447976930a4338c2d68d50d98869828cd76b1a4f4b5c2c989fd84af7b66d55dc51fc
languageName: node
linkType: hard

Expand Down

0 comments on commit fa92da2

Please sign in to comment.