Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions examples/sandbox/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-sandbox",
"version": "1.62.18",
"version": "1.62.19",
"license": "MIT",
"private": true,
"browserslist": "> 0.5%, last 2 versions, not dead",
Expand All @@ -12,24 +12,24 @@
"dependencies": {
"@esm2cjs/p-queue": "^7.3.0",
"@metamask/eth-sig-util": "^7.0.0",
"@shapeshiftoss/hdwallet-coinbase": "1.62.18",
"@shapeshiftoss/hdwallet-core": "1.62.18",
"@shapeshiftoss/hdwallet-keepkey": "1.62.18",
"@shapeshiftoss/hdwallet-keepkey-tcp": "1.62.18",
"@shapeshiftoss/hdwallet-keepkey-webusb": "1.62.18",
"@shapeshiftoss/hdwallet-keplr": "1.62.18",
"@shapeshiftoss/hdwallet-ledger": "1.62.18",
"@shapeshiftoss/hdwallet-ledger-webhid": "1.62.18",
"@shapeshiftoss/hdwallet-ledger-webusb": "1.62.18",
"@shapeshiftoss/hdwallet-metamask-multichain": "1.62.18",
"@shapeshiftoss/hdwallet-native": "1.62.18",
"@shapeshiftoss/hdwallet-phantom": "1.62.18",
"@shapeshiftoss/hdwallet-portis": "1.62.18",
"@shapeshiftoss/hdwallet-trezor": "1.62.18",
"@shapeshiftoss/hdwallet-trezor-connect": "1.62.18",
"@shapeshiftoss/hdwallet-vultisig": "1.62.18",
"@shapeshiftoss/hdwallet-walletconnect": "1.62.18",
"@shapeshiftoss/hdwallet-walletconnectv2": "1.62.18",
"@shapeshiftoss/hdwallet-coinbase": "^1.62.19",
"@shapeshiftoss/hdwallet-core": "^1.62.19",
"@shapeshiftoss/hdwallet-keepkey": "^1.62.19",
"@shapeshiftoss/hdwallet-keepkey-tcp": "^1.62.19",
"@shapeshiftoss/hdwallet-keepkey-webusb": "^1.62.19",
"@shapeshiftoss/hdwallet-keplr": "^1.62.19",
"@shapeshiftoss/hdwallet-ledger": "^1.62.19",
"@shapeshiftoss/hdwallet-ledger-webhid": "^1.62.19",
"@shapeshiftoss/hdwallet-ledger-webusb": "^1.62.19",
"@shapeshiftoss/hdwallet-metamask-multichain": "^1.62.19",
"@shapeshiftoss/hdwallet-native": "^1.62.19",
"@shapeshiftoss/hdwallet-phantom": "^1.62.19",
"@shapeshiftoss/hdwallet-portis": "^1.62.19",
"@shapeshiftoss/hdwallet-trezor": "^1.62.19",
"@shapeshiftoss/hdwallet-trezor-connect": "^1.62.19",
"@shapeshiftoss/hdwallet-vultisig": "^1.62.19",
"@shapeshiftoss/hdwallet-walletconnect": "^1.62.19",
"@shapeshiftoss/hdwallet-walletconnectv2": "^1.62.19",
"bip32": "^2.0.4",
"eip-712": "^1.0.0",
"jquery": "^3.7.1",
Expand Down
22 changes: 11 additions & 11 deletions integration/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/integration",
"version": "1.62.18",
"version": "1.62.19",
"main": "index.js",
"license": "MIT",
"private": true,
Expand All @@ -11,16 +11,16 @@
},
"dependencies": {
"@bitcoinerlab/secp256k1": "^1.1.1",
"@shapeshiftoss/hdwallet-core": "1.62.18",
"@shapeshiftoss/hdwallet-keepkey": "1.62.18",
"@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.62.18",
"@shapeshiftoss/hdwallet-keepkey-tcp": "1.62.18",
"@shapeshiftoss/hdwallet-ledger": "1.62.18",
"@shapeshiftoss/hdwallet-metamask-multichain": "1.62.18",
"@shapeshiftoss/hdwallet-native": "1.62.18",
"@shapeshiftoss/hdwallet-portis": "1.62.18",
"@shapeshiftoss/hdwallet-trezor": "1.62.18",
"@shapeshiftoss/hdwallet-vultisig": "1.62.18",
"@shapeshiftoss/hdwallet-core": "^1.62.19",
"@shapeshiftoss/hdwallet-keepkey": "^1.62.19",
"@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.62.19",
"@shapeshiftoss/hdwallet-keepkey-tcp": "^1.62.19",
"@shapeshiftoss/hdwallet-ledger": "^1.62.19",
"@shapeshiftoss/hdwallet-metamask-multichain": "^1.62.19",
"@shapeshiftoss/hdwallet-native": "^1.62.19",
"@shapeshiftoss/hdwallet-portis": "^1.62.19",
"@shapeshiftoss/hdwallet-trezor": "^1.62.19",
"@shapeshiftoss/hdwallet-vultisig": "^1.62.19",
"fast-json-stable-stringify": "^2.1.0",
"msw": "^0.27.1",
"whatwg-fetch": "^3.6.2"
Expand Down
9 changes: 7 additions & 2 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
{
"lerna": "5.2.0",
"version": "1.62.18",
"version": "1.62.19",
"npmClient": "yarn",
"useWorkspaces": true,
"command": {
"publish": {
"message": "chore(release): publish %v"
}
},
"ignoreChanges": ["**/__fixtures__/**", "**/__tests__/**", "**/*.md", "**/.env"]
"ignoreChanges": [
"**/__fixtures__/**",
"**/__tests__/**",
"**/*.md",
"**/.env"
]
}
4 changes: 2 additions & 2 deletions packages/hdwallet-coinbase/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-coinbase",
"version": "1.62.18",
"version": "1.62.19",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -15,7 +15,7 @@
},
"dependencies": {
"@coinbase/wallet-sdk": "^3.6.6",
"@shapeshiftoss/hdwallet-core": "1.62.18",
"@shapeshiftoss/hdwallet-core": "^1.62.19",
"eth-rpc-errors": "^4.0.3",
"lodash": "^4.17.21"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/hdwallet-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-core",
"version": "1.62.18",
"version": "1.62.19",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-gridplus/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-gridplus",
"version": "1.62.18",
"version": "1.62.19",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -20,7 +20,7 @@
"@ethereumjs/rlp": "5.0.2",
"@ethereumjs/tx": "5.4.0",
"@metamask/eth-sig-util": "^7.0.0",
"@shapeshiftoss/hdwallet-core": "1.62.18",
"@shapeshiftoss/hdwallet-core": "^1.62.19",
"bech32": "^1.1.4",
"bs58": "^5.0.0",
"crypto-js": "^4.2.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-keepkey-chromeusb/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-chromeusb",
"version": "1.62.18",
"version": "1.62.19",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,7 +14,7 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.62.18",
"@shapeshiftoss/hdwallet-keepkey": "1.62.18"
"@shapeshiftoss/hdwallet-core": "^1.62.19",
"@shapeshiftoss/hdwallet-keepkey": "^1.62.19"
}
}
4 changes: 2 additions & 2 deletions packages/hdwallet-keepkey-electron/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-electron",
"version": "1.62.18",
"version": "1.62.19",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,7 +14,7 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-keepkey": "1.62.18",
"@shapeshiftoss/hdwallet-keepkey": "^1.62.19",
"uuid": "^8.3.2"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-keepkey-nodehid/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-nodehid",
"version": "1.62.18",
"version": "1.62.19",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,7 +14,7 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-keepkey": "1.62.18"
"@shapeshiftoss/hdwallet-keepkey": "^1.62.19"
},
"peerDependencies": {
"node-hid": "^2.1.1"
Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-keepkey-nodewebusb/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-nodewebusb",
"version": "1.62.18",
"version": "1.62.19",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,8 +14,8 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.62.18",
"@shapeshiftoss/hdwallet-keepkey": "1.62.18"
"@shapeshiftoss/hdwallet-core": "^1.62.19",
"@shapeshiftoss/hdwallet-keepkey": "^1.62.19"
},
"peerDependencies": {
"usb": "^2.3.1"
Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-keepkey-tcp/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-tcp",
"version": "1.62.18",
"version": "1.62.19",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,8 +14,8 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.62.18",
"@shapeshiftoss/hdwallet-keepkey": "1.62.18",
"@shapeshiftoss/hdwallet-core": "^1.62.19",
"@shapeshiftoss/hdwallet-keepkey": "^1.62.19",
"axios": "^0.21.1"
}
}
6 changes: 3 additions & 3 deletions packages/hdwallet-keepkey-webusb/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-webusb",
"version": "1.62.18",
"version": "1.62.19",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,8 +14,8 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.62.18",
"@shapeshiftoss/hdwallet-keepkey": "1.62.18"
"@shapeshiftoss/hdwallet-core": "^1.62.19",
"@shapeshiftoss/hdwallet-keepkey": "^1.62.19"
},
"devDependencies": {
"@types/w3c-web-usb": "^1.0.4"
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-keepkey/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey",
"version": "1.62.18",
"version": "1.62.19",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -21,7 +21,7 @@
"@keepkey/device-protocol": "7.13.4",
"@metamask/eth-sig-util": "^7.0.0",
"@shapeshiftoss/bitcoinjs-lib": "7.0.0-shapeshift.0",
"@shapeshiftoss/hdwallet-core": "1.62.18",
"@shapeshiftoss/hdwallet-core": "^1.62.19",
"@shapeshiftoss/proto-tx-builder": "0.10.0",
"bignumber.js": "^9.0.1",
"bnb-javascript-sdk-nobroadcast": "2.16.15",
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-keplr/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keplr",
"version": "1.62.18",
"version": "1.62.19",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -17,7 +17,7 @@
"@cosmjs/amino": "^0.28.13",
"@cosmjs/stargate": "^0.28.13",
"@shapeshiftoss/caip": "8.15.0",
"@shapeshiftoss/hdwallet-core": "1.62.18",
"@shapeshiftoss/hdwallet-core": "^1.62.19",
"@shapeshiftoss/proto-tx-builder": "0.10.0",
"@shapeshiftoss/types": "3.1.3",
"base64-js": "^1.5.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-ledger-webhid/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-ledger-webhid",
"version": "1.62.18",
"version": "1.62.19",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -18,8 +18,8 @@
"@ledgerhq/hw-app-eth": "^6.45.13",
"@ledgerhq/hw-transport": "6.31.8",
"@ledgerhq/hw-transport-webhid": "^6.30.4",
"@shapeshiftoss/hdwallet-core": "1.62.18",
"@shapeshiftoss/hdwallet-ledger": "1.62.18",
"@shapeshiftoss/hdwallet-core": "^1.62.19",
"@shapeshiftoss/hdwallet-ledger": "^1.62.19",
"@types/w3c-web-hid": "^1.0.2"
}
}
23 changes: 23 additions & 0 deletions packages/hdwallet-ledger-webhid/src/transport.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import Btc from "@ledgerhq/hw-app-btc";
import Cosmos from "@ledgerhq/hw-app-cosmos";
import Eth from "@ledgerhq/hw-app-eth";
import Solana from "@ledgerhq/hw-app-solana";
import Trx from "@ledgerhq/hw-app-trx";
import Transport from "@ledgerhq/hw-transport";
import TransportWebHID from "@ledgerhq/hw-transport-webhid";
import * as core from "@shapeshiftoss/hdwallet-core";
Expand Down Expand Up @@ -67,6 +70,26 @@ export function translateCoinAndMethod<T extends LedgerTransportCoinType, U exte
const methodInstance = eth[method as LedgerTransportMethodName<"Eth">].bind(eth);
return methodInstance as LedgerTransportMethod<T, U>;
}
case "Thorchain": {
const thorchain = new ledger.Thorchain(transport as Transport);
const methodInstance = thorchain[method as LedgerTransportMethodName<"Thorchain">].bind(thorchain);
return methodInstance as LedgerTransportMethod<T, U>;
}
case "Cosmos": {
const cosmos = new Cosmos(transport as Transport);
const methodInstance = cosmos[method as LedgerTransportMethodName<"Cosmos">].bind(cosmos);
return methodInstance as LedgerTransportMethod<T, U>;
}
case "Solana": {
const solana = new Solana(transport as Transport);
const methodInstance = solana[method as LedgerTransportMethodName<"Solana">].bind(solana);
return methodInstance as LedgerTransportMethod<T, U>;
}
Comment thread
NeOMakinG marked this conversation as resolved.
case "Tron": {
const trx = new Trx(transport as Transport);
const methodInstance = trx[method as LedgerTransportMethodName<"Tron">].bind(trx);
return methodInstance as LedgerTransportMethod<T, U>;
}
case null: {
switch (method) {
case "decorateAppAPIMethods": {
Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-ledger-webusb/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-ledger-webusb",
"version": "1.62.18",
"version": "1.62.19",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -20,8 +20,8 @@
"@ledgerhq/hw-app-solana": "^7.5.1",
"@ledgerhq/hw-transport": "6.31.8",
"@ledgerhq/hw-transport-webusb": "6.29.8",
"@shapeshiftoss/hdwallet-core": "1.62.18",
"@shapeshiftoss/hdwallet-ledger": "1.62.18",
"@shapeshiftoss/hdwallet-core": "^1.62.19",
"@shapeshiftoss/hdwallet-ledger": "^1.62.19",
"@types/w3c-web-usb": "^1.0.4",
"p-queue": "^7.4.1"
},
Expand Down
6 changes: 6 additions & 0 deletions packages/hdwallet-ledger-webusb/src/transport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import Btc from "@ledgerhq/hw-app-btc";
import Cosmos from "@ledgerhq/hw-app-cosmos";
import Eth from "@ledgerhq/hw-app-eth";
import Solana from "@ledgerhq/hw-app-solana";
import Trx from "@ledgerhq/hw-app-trx";
import Transport from "@ledgerhq/hw-transport";
import TransportWebUSB from "@ledgerhq/hw-transport-webusb";
import * as core from "@shapeshiftoss/hdwallet-core";
Expand Down Expand Up @@ -104,6 +105,11 @@ export async function translateCoinAndMethod<T extends LedgerTransportCoinType,
const methodInstance = solana[method as LedgerTransportMethodName<"Solana">].bind(solana);
return methodInstance as LedgerTransportMethod<T, U>;
}
case "Tron": {
const trx = new Trx(transport as Transport);
const methodInstance = trx[method as LedgerTransportMethodName<"Tron">].bind(trx);
return methodInstance as LedgerTransportMethod<T, U>;
}
case null: {
switch (method) {
case "decorateAppAPIMethods": {
Expand Down
Loading