Skip to content
Draft
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.28",
"version": "1.62.29-bebop-solana-msg.5",
"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.28",
"@shapeshiftoss/hdwallet-core": "1.62.28",
"@shapeshiftoss/hdwallet-keepkey": "1.62.28",
"@shapeshiftoss/hdwallet-keepkey-tcp": "1.62.28",
"@shapeshiftoss/hdwallet-keepkey-webusb": "1.62.28",
"@shapeshiftoss/hdwallet-keplr": "1.62.28",
"@shapeshiftoss/hdwallet-ledger": "1.62.28",
"@shapeshiftoss/hdwallet-ledger-webhid": "1.62.28",
"@shapeshiftoss/hdwallet-ledger-webusb": "1.62.28",
"@shapeshiftoss/hdwallet-metamask-multichain": "1.62.28",
"@shapeshiftoss/hdwallet-native": "1.62.28",
"@shapeshiftoss/hdwallet-phantom": "1.62.28",
"@shapeshiftoss/hdwallet-portis": "1.62.28",
"@shapeshiftoss/hdwallet-trezor": "1.62.28",
"@shapeshiftoss/hdwallet-trezor-connect": "1.62.28",
"@shapeshiftoss/hdwallet-vultisig": "1.62.28",
"@shapeshiftoss/hdwallet-walletconnect": "1.62.28",
"@shapeshiftoss/hdwallet-walletconnectv2": "1.62.28",
"@shapeshiftoss/hdwallet-coinbase": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-core": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-keepkey": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-keepkey-tcp": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-keepkey-webusb": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-keplr": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-ledger": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-ledger-webhid": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-ledger-webusb": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-metamask-multichain": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-native": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-phantom": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-portis": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-trezor": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-trezor-connect": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-vultisig": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-walletconnect": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-walletconnectv2": "^1.62.29-bebop-solana-msg.5",
"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.28",
"version": "1.62.29-bebop-solana-msg.5",
"main": "index.js",
"license": "MIT",
"private": true,
Expand All @@ -12,16 +12,16 @@
"dependencies": {
"@bitcoinerlab/secp256k1": "^1.1.1",
"@bitgo/utxo-lib": "^11.18.0",
"@shapeshiftoss/hdwallet-core": "1.62.28",
"@shapeshiftoss/hdwallet-keepkey": "1.62.28",
"@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.62.28",
"@shapeshiftoss/hdwallet-keepkey-tcp": "1.62.28",
"@shapeshiftoss/hdwallet-ledger": "1.62.28",
"@shapeshiftoss/hdwallet-metamask-multichain": "1.62.28",
"@shapeshiftoss/hdwallet-native": "1.62.28",
"@shapeshiftoss/hdwallet-portis": "1.62.28",
"@shapeshiftoss/hdwallet-trezor": "1.62.28",
"@shapeshiftoss/hdwallet-vultisig": "1.62.28",
"@shapeshiftoss/hdwallet-core": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-keepkey": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-keepkey-tcp": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-ledger": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-metamask-multichain": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-native": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-portis": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-trezor": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-vultisig": "^1.62.29-bebop-solana-msg.5",
"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.28",
"version": "1.62.29-bebop-solana-msg.5",
"npmClient": "yarn",
"useWorkspaces": true,
"command": {
"publish": {
"message": "chore(release): publish %v"
}
},
"ignoreChanges": ["**/__fixtures__/**", "**/__tests__/**", "**/*.md", "**/.env"]
"ignoreChanges": [
"**/__fixtures__/**",
"**/__tests__/**",
"**/*.md",
"**/.env"
]
}
17 changes: 17 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,23 @@
"p-queue": "^6.6.2"
},
"dependencies": {
"@shapeshiftoss/hdwallet-coinbase": "1.62.29-bebop-solana-msg.1",
"@shapeshiftoss/hdwallet-core": "1.62.29-bebop-solana-msg.1",
"@shapeshiftoss/hdwallet-gridplus": "1.62.29-bebop-solana-msg.1",
"@shapeshiftoss/hdwallet-keepkey": "1.62.29-bebop-solana-msg.1",
"@shapeshiftoss/hdwallet-keplr": "1.62.29-bebop-solana-msg.1",
"@shapeshiftoss/hdwallet-ledger": "1.62.29-bebop-solana-msg.1",
"@shapeshiftoss/hdwallet-ledger-webhid": "1.62.29-bebop-solana-msg.1",
"@shapeshiftoss/hdwallet-ledger-webusb": "1.62.29-bebop-solana-msg.1",
"@shapeshiftoss/hdwallet-metamask-multichain": "1.62.29-bebop-solana-msg.1",
"@shapeshiftoss/hdwallet-native": "1.62.29-bebop-solana-msg.1",
"@shapeshiftoss/hdwallet-phantom": "1.62.29-bebop-solana-msg.1",
"@shapeshiftoss/hdwallet-portis": "1.62.29-bebop-solana-msg.1",
"@shapeshiftoss/hdwallet-trezor": "1.62.29-bebop-solana-msg.1",
"@shapeshiftoss/hdwallet-trezor-connect": "1.62.29-bebop-solana-msg.1",
"@shapeshiftoss/hdwallet-vultisig": "1.62.29-bebop-solana-msg.1",
"@shapeshiftoss/hdwallet-walletconnect": "1.62.29-bebop-solana-msg.1",
"@shapeshiftoss/hdwallet-walletconnectv2": "1.62.29-bebop-solana-msg.1",
"@types/jest": "^26.0.23",
"@types/node": "^22.13.14",
"patch-package": "^6.2.2",
Expand Down
7 changes: 4 additions & 3 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.28",
"version": "1.62.29-bebop-solana-msg.5",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -15,11 +15,12 @@
},
"dependencies": {
"@coinbase/wallet-sdk": "^3.6.6",
"@shapeshiftoss/hdwallet-core": "1.62.28",
"@shapeshiftoss/hdwallet-core": "^1.62.29-bebop-solana-msg.5",
"eth-rpc-errors": "^4.0.3",
"lodash": "^4.17.21"
},
"devDependencies": {
"@types/lodash": "^4.14.168"
}
},
"gitHead": "a49a78029023f7cbe4865a7592196f9952fb8f78"
}
5 changes: 3 additions & 2 deletions 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.28",
"version": "1.62.29-bebop-solana-msg.5",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand Down Expand Up @@ -28,5 +28,6 @@
"devDependencies": {
"@types/google-protobuf": "^3.15.1",
"@types/lodash": "^4.14.168"
}
},
"gitHead": "a49a78029023f7cbe4865a7592196f9952fb8f78"
}
7 changes: 7 additions & 0 deletions packages/hdwallet-core/src/solana.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,20 @@ export interface SolanaWalletInfo extends HDWalletInfo {
solanaNextAccountPath(msg: SolanaAccountPath): SolanaAccountPath | undefined;
}

export interface SolanaSignMessage {
addressNList: BIP32Path;
message: Uint8Array;
}

export interface SolanaWallet extends SolanaWalletInfo, HDWallet {
readonly _supportsSolana: boolean;

solanaGetAddress(msg: SolanaGetAddress): Promise<string | null>;
solanaGetAddresses?(msgs: SolanaGetAddress[]): Promise<string[]>;
solanaSignTx(msg: SolanaSignTx): Promise<SolanaSignedTx | null>;
solanaSendTx?(msg: SolanaSignTx): Promise<SolanaTxSignature | null>;
solanaSignMessage?(msg: SolanaSignMessage): Promise<string | null>;
solanaSignRawTransaction?(serializedTx: string): Promise<string | null>;
}

export function solanaDescribePath(path: BIP32Path): PathDescription {
Expand Down
7 changes: 4 additions & 3 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.28",
"version": "1.62.29-bebop-solana-msg.5",
"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.28",
"@shapeshiftoss/hdwallet-core": "^1.62.29-bebop-solana-msg.5",
"bech32": "^1.1.4",
"bs58": "^5.0.0",
"bs58check": "^4.0.0",
Expand All @@ -35,5 +35,6 @@
"nohoist": [
"@ethereumjs/common",
"@ethereumjs/tx"
]
],
"gitHead": "a49a78029023f7cbe4865a7592196f9952fb8f78"
}
9 changes: 5 additions & 4 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.28",
"version": "1.62.29-bebop-solana-msg.5",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,7 +14,8 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.62.28",
"@shapeshiftoss/hdwallet-keepkey": "1.62.28"
}
"@shapeshiftoss/hdwallet-core": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-keepkey": "^1.62.29-bebop-solana-msg.5"
},
"gitHead": "a49a78029023f7cbe4865a7592196f9952fb8f78"
}
7 changes: 4 additions & 3 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.28",
"version": "1.62.29-bebop-solana-msg.5",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,7 +14,7 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-keepkey": "1.62.28",
"@shapeshiftoss/hdwallet-keepkey": "^1.62.29-bebop-solana-msg.5",
"uuid": "^8.3.2"
},
"peerDependencies": {
Expand All @@ -23,5 +23,6 @@
"devDependencies": {
"@types/uuid": "^8.3.0",
"electron": "^12.0.9"
}
},
"gitHead": "a49a78029023f7cbe4865a7592196f9952fb8f78"
}
7 changes: 4 additions & 3 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.28",
"version": "1.62.29-bebop-solana-msg.5",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,12 +14,13 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-keepkey": "1.62.28"
"@shapeshiftoss/hdwallet-keepkey": "^1.62.29-bebop-solana-msg.5"
},
"peerDependencies": {
"node-hid": "^2.1.1"
},
"devDependencies": {
"@types/node-hid": "^1.3.1"
}
},
"gitHead": "a49a78029023f7cbe4865a7592196f9952fb8f78"
}
9 changes: 5 additions & 4 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.28",
"version": "1.62.29-bebop-solana-msg.5",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,13 +14,14 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.62.28",
"@shapeshiftoss/hdwallet-keepkey": "1.62.28"
"@shapeshiftoss/hdwallet-core": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-keepkey": "^1.62.29-bebop-solana-msg.5"
},
"peerDependencies": {
"usb": "^2.3.1"
},
"devDependencies": {
"usb": "^2.3.1"
}
},
"gitHead": "a49a78029023f7cbe4865a7592196f9952fb8f78"
}
9 changes: 5 additions & 4 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.28",
"version": "1.62.29-bebop-solana-msg.5",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,8 +14,9 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.62.28",
"@shapeshiftoss/hdwallet-keepkey": "1.62.28",
"@shapeshiftoss/hdwallet-core": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-keepkey": "^1.62.29-bebop-solana-msg.5",
"axios": "^0.21.1"
}
},
"gitHead": "a49a78029023f7cbe4865a7592196f9952fb8f78"
}
9 changes: 5 additions & 4 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.28",
"version": "1.62.29-bebop-solana-msg.5",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,10 +14,11 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.62.28",
"@shapeshiftoss/hdwallet-keepkey": "1.62.28"
"@shapeshiftoss/hdwallet-core": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/hdwallet-keepkey": "^1.62.29-bebop-solana-msg.5"
},
"devDependencies": {
"@types/w3c-web-usb": "^1.0.4"
}
},
"gitHead": "a49a78029023f7cbe4865a7592196f9952fb8f78"
}
7 changes: 4 additions & 3 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.28",
"version": "1.62.29-bebop-solana-msg.5",
"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.2",
"@shapeshiftoss/hdwallet-core": "1.62.28",
"@shapeshiftoss/hdwallet-core": "^1.62.29-bebop-solana-msg.5",
"@shapeshiftoss/proto-tx-builder": "0.10.0",
"bignumber.js": "^9.0.1",
"bnb-javascript-sdk-nobroadcast": "2.16.15",
Expand All @@ -46,5 +46,6 @@
"@types/lodash": "^4.14.168",
"@types/semver": "^6.2.2",
"typedoc": "^0.20.36"
}
},
"gitHead": "a49a78029023f7cbe4865a7592196f9952fb8f78"
}
Loading