Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: solana native support #702

Merged
merged 29 commits into from
Jan 27, 2025
Merged

feat: solana native support #702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
9dbcc45
wip: solana native support
gomesalexandre Dec 18, 2024
b15b110
fix: shit
gomesalexandre Dec 18, 2024
5823787
fix: shit
gomesalexandre Dec 18, 2024
6707876
fix: toBase58
gomesalexandre Dec 18, 2024
2009e84
feat: revert back toString()
gomesalexandre Dec 18, 2024
2c1e92b
Revert "feat: revert back toString()"
gomesalexandre Dec 18, 2024
a061c43
feat: last try
gomesalexandre Dec 18, 2024
c551b91
fix: for real last try ffs
gomesalexandre Dec 19, 2024
d8d6c78
feat: last last try I swear fml
gomesalexandre Dec 19, 2024
2aaeea6
fix: ok sleeping it off was a good idea, she works
gomesalexandre Dec 19, 2024
96835d3
fix: sign use 0x02-stripped pubkey
gomesalexandre Dec 19, 2024
a59c5a1
feat: I have no idea what I am doing
gomesalexandre Dec 20, 2024
029ce81
fix: versions
gomesalexandre Dec 20, 2024
e900ec4
fix: still no idea what I'm doing btw
gomesalexandre Dec 20, 2024
61faceb
fix: segments
gomesalexandre Dec 20, 2024
dc162a9
feat: make it work (highly doubt it but hey)
gomesalexandre Dec 20, 2024
62434a3
fix: try and fix initialize
gomesalexandre Dec 20, 2024
2996b2c
fix: fml
gomesalexandre Dec 20, 2024
d60beb2
fix: maybe?
gomesalexandre Dec 23, 2024
acfc891
fix: maybe??
gomesalexandre Dec 23, 2024
c3f3a3b
fix: maybe???
gomesalexandre Dec 23, 2024
b07f3bd
fix: maybe????
gomesalexandre Dec 23, 2024
a3f0af4
fix: maybe?????
gomesalexandre Dec 23, 2024
5f7eb93
feat: rage quit
gomesalexandre Dec 23, 2024
af9080c
ed25519 support and solana implementation for native wallet
kaladinlight Jan 24, 2025
4b4592d
Merge branch 'master' into feat_solana_native
kaladinlight Jan 24, 2025
186d4c8
chore(release): publish 1.58.2-alpha.0
kaladinlight Jan 24, 2025
421f775
require ed25519 master key and force hardened path native wallet
kaladinlight Jan 27, 2025
080963b
chore(release): publish 1.59.0
kaladinlight Jan 27, 2025
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
36 changes: 18 additions & 18 deletions examples/sandbox/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-sandbox",
"version": "1.58.1",
"version": "1.59.0",
"license": "MIT",
"private": true,
"browserslist": "> 0.5%, last 2 versions, not dead",
Expand All @@ -12,23 +12,23 @@
"dependencies": {
"@esm2cjs/p-queue": "^7.3.0",
"@metamask/eth-sig-util": "^7.0.0",
"@shapeshiftoss/hdwallet-coinbase": "1.58.1",
"@shapeshiftoss/hdwallet-core": "1.58.1",
"@shapeshiftoss/hdwallet-keepkey": "1.58.1",
"@shapeshiftoss/hdwallet-keepkey-tcp": "1.58.1",
"@shapeshiftoss/hdwallet-keepkey-webusb": "1.58.1",
"@shapeshiftoss/hdwallet-keplr": "1.58.1",
"@shapeshiftoss/hdwallet-ledger": "1.58.1",
"@shapeshiftoss/hdwallet-ledger-webhid": "1.58.1",
"@shapeshiftoss/hdwallet-ledger-webusb": "1.58.1",
"@shapeshiftoss/hdwallet-metamask-multichain": "1.58.1",
"@shapeshiftoss/hdwallet-native": "1.58.1",
"@shapeshiftoss/hdwallet-phantom": "1.58.1",
"@shapeshiftoss/hdwallet-portis": "1.58.1",
"@shapeshiftoss/hdwallet-trezor": "1.58.1",
"@shapeshiftoss/hdwallet-trezor-connect": "1.58.1",
"@shapeshiftoss/hdwallet-walletconnect": "1.58.1",
"@shapeshiftoss/hdwallet-walletconnectv2": "1.58.1",
"@shapeshiftoss/hdwallet-coinbase": "1.59.0",
"@shapeshiftoss/hdwallet-core": "1.59.0",
"@shapeshiftoss/hdwallet-keepkey": "1.59.0",
"@shapeshiftoss/hdwallet-keepkey-tcp": "1.59.0",
"@shapeshiftoss/hdwallet-keepkey-webusb": "1.59.0",
"@shapeshiftoss/hdwallet-keplr": "1.59.0",
"@shapeshiftoss/hdwallet-ledger": "1.59.0",
"@shapeshiftoss/hdwallet-ledger-webhid": "1.59.0",
"@shapeshiftoss/hdwallet-ledger-webusb": "1.59.0",
"@shapeshiftoss/hdwallet-metamask-multichain": "1.59.0",
"@shapeshiftoss/hdwallet-native": "1.59.0",
"@shapeshiftoss/hdwallet-phantom": "1.59.0",
"@shapeshiftoss/hdwallet-portis": "1.59.0",
"@shapeshiftoss/hdwallet-trezor": "1.59.0",
"@shapeshiftoss/hdwallet-trezor-connect": "1.59.0",
"@shapeshiftoss/hdwallet-walletconnect": "1.59.0",
"@shapeshiftoss/hdwallet-walletconnectv2": "1.59.0",
"bip32": "^2.0.4",
"eip-712": "^1.0.0",
"jquery": "^3.7.1",
Expand Down
20 changes: 10 additions & 10 deletions integration/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/integration",
"version": "1.58.1",
"version": "1.59.0",
"main": "index.js",
"license": "MIT",
"private": true,
Expand All @@ -11,15 +11,15 @@
},
"dependencies": {
"@bitcoinerlab/secp256k1": "^1.1.1",
"@shapeshiftoss/hdwallet-core": "1.58.1",
"@shapeshiftoss/hdwallet-keepkey": "1.58.1",
"@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.58.1",
"@shapeshiftoss/hdwallet-keepkey-tcp": "1.58.1",
"@shapeshiftoss/hdwallet-ledger": "1.58.1",
"@shapeshiftoss/hdwallet-metamask-multichain": "1.58.1",
"@shapeshiftoss/hdwallet-native": "1.58.1",
"@shapeshiftoss/hdwallet-portis": "1.58.1",
"@shapeshiftoss/hdwallet-trezor": "1.58.1",
"@shapeshiftoss/hdwallet-core": "1.59.0",
"@shapeshiftoss/hdwallet-keepkey": "1.59.0",
"@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.59.0",
"@shapeshiftoss/hdwallet-keepkey-tcp": "1.59.0",
"@shapeshiftoss/hdwallet-ledger": "1.59.0",
"@shapeshiftoss/hdwallet-metamask-multichain": "1.59.0",
"@shapeshiftoss/hdwallet-native": "1.59.0",
"@shapeshiftoss/hdwallet-portis": "1.59.0",
"@shapeshiftoss/hdwallet-trezor": "1.59.0",
"fast-json-stable-stringify": "^2.1.0",
"msw": "^0.27.1",
"whatwg-fetch": "^3.6.2"
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"lerna": "5.2.0",
"version": "1.58.1",
"version": "1.59.0",
"npmClient": "yarn",
"useWorkspaces": true,
"command": {
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-coinbase/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-coinbase",
"version": "1.58.1",
"version": "1.59.0",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -15,7 +15,7 @@
},
"dependencies": {
"@coinbase/wallet-sdk": "^3.6.6",
"@shapeshiftoss/hdwallet-core": "1.58.1",
"@shapeshiftoss/hdwallet-core": "1.59.0",
"eth-rpc-errors": "^4.0.3",
"lodash": "^4.17.21"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/hdwallet-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-core",
"version": "1.58.1",
"version": "1.59.0",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand Down
5 changes: 5 additions & 0 deletions packages/hdwallet-core/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,11 @@ export function addressNListToBIP32(address: number[]): string {
return `m/${address.map((num) => (num >= HARDENED ? `${num - HARDENED}'` : num)).join("/")}`;
}

// force hardened bip32 path for ed25519 derivation
export function addressNListToHardenedBIP32(address: number[]): string {
return `m/${address.map((num) => (num >= HARDENED ? `${num - HARDENED}'` : `${num}'`)).join("/")}`;
}

export function takeFirstOfManyEvents(
eventEmitter: eventemitter2.EventEmitter2,
events: string[]
Expand Down
2 changes: 1 addition & 1 deletion packages/hdwallet-core/src/wallet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export interface GetPublicKey {
addressNList: BIP32Path;
showDisplay?: boolean;
scriptType?: BTCInputScriptType; // Defaults to BTCInputScriptType.SpendAddress
curve: string;
curve: "secp256k1" | "ed25519";
coin: Coin;
}

Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-keepkey-chromeusb/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-chromeusb",
"version": "1.58.1",
"version": "1.59.0",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,7 +14,7 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.58.1",
"@shapeshiftoss/hdwallet-keepkey": "1.58.1"
"@shapeshiftoss/hdwallet-core": "1.59.0",
"@shapeshiftoss/hdwallet-keepkey": "1.59.0"
}
}
4 changes: 2 additions & 2 deletions packages/hdwallet-keepkey-electron/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-electron",
"version": "1.58.1",
"version": "1.59.0",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,7 +14,7 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-keepkey": "1.58.1",
"@shapeshiftoss/hdwallet-keepkey": "1.59.0",
"uuid": "^8.3.2"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-keepkey-nodehid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-nodehid",
"version": "1.58.1",
"version": "1.59.0",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,7 +14,7 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-keepkey": "1.58.1"
"@shapeshiftoss/hdwallet-keepkey": "1.59.0"
},
"peerDependencies": {
"node-hid": "^2.1.1"
Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-keepkey-nodewebusb/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-nodewebusb",
"version": "1.58.1",
"version": "1.59.0",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,8 +14,8 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.58.1",
"@shapeshiftoss/hdwallet-keepkey": "1.58.1"
"@shapeshiftoss/hdwallet-core": "1.59.0",
"@shapeshiftoss/hdwallet-keepkey": "1.59.0"
},
"peerDependencies": {
"usb": "^2.3.1"
Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-keepkey-tcp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-tcp",
"version": "1.58.1",
"version": "1.59.0",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,8 +14,8 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.58.1",
"@shapeshiftoss/hdwallet-keepkey": "1.58.1",
"@shapeshiftoss/hdwallet-core": "1.59.0",
"@shapeshiftoss/hdwallet-keepkey": "1.59.0",
"axios": "^0.21.1"
}
}
6 changes: 3 additions & 3 deletions packages/hdwallet-keepkey-webusb/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-webusb",
"version": "1.58.1",
"version": "1.59.0",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,8 +14,8 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.58.1",
"@shapeshiftoss/hdwallet-keepkey": "1.58.1"
"@shapeshiftoss/hdwallet-core": "1.59.0",
"@shapeshiftoss/hdwallet-keepkey": "1.59.0"
},
"devDependencies": {
"@types/w3c-web-usb": "^1.0.4"
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-keepkey/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey",
"version": "1.58.1",
"version": "1.59.0",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -21,7 +21,7 @@
"@keepkey/device-protocol": "^7.12.2",
"@metamask/eth-sig-util": "^7.0.0",
"@shapeshiftoss/bitcoinjs-lib": "7.0.0-shapeshift.0",
"@shapeshiftoss/hdwallet-core": "1.58.1",
"@shapeshiftoss/hdwallet-core": "1.59.0",
"@shapeshiftoss/proto-tx-builder": "^0.8.0",
"bignumber.js": "^9.0.1",
"bnb-javascript-sdk-nobroadcast": "^2.16.14",
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-keplr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keplr",
"version": "1.58.1",
"version": "1.59.0",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -15,7 +15,7 @@
},
"dependencies": {
"@shapeshiftoss/caip": "8.15.0",
"@shapeshiftoss/hdwallet-core": "1.58.1",
"@shapeshiftoss/hdwallet-core": "1.59.0",
"@shapeshiftoss/proto-tx-builder": "^0.8.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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-ledger-webhid",
"version": "1.58.1",
"version": "1.59.0",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -19,8 +19,8 @@
"@ledgerhq/hw-transport": "^6.31.2",
"@ledgerhq/hw-transport-webhid": "^6.29.2",
"@ledgerhq/live-common": "^21.8.2",
"@shapeshiftoss/hdwallet-core": "1.58.1",
"@shapeshiftoss/hdwallet-ledger": "1.58.1",
"@shapeshiftoss/hdwallet-core": "1.59.0",
"@shapeshiftoss/hdwallet-ledger": "1.59.0",
"@types/w3c-web-hid": "^1.0.2"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-ledger-webusb/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-ledger-webusb",
"version": "1.58.1",
"version": "1.59.0",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -21,8 +21,8 @@
"@ledgerhq/hw-transport-webusb": "^6.29.2",
"@ledgerhq/live-common": "^21.8.2",
"@ledgerhq/logs": "^6.10.1",
"@shapeshiftoss/hdwallet-core": "1.58.1",
"@shapeshiftoss/hdwallet-ledger": "1.58.1",
"@shapeshiftoss/hdwallet-core": "1.59.0",
"@shapeshiftoss/hdwallet-ledger": "1.59.0",
"@types/w3c-web-usb": "^1.0.4",
"p-queue": "^7.4.1"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-ledger/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-ledger",
"version": "1.58.1",
"version": "1.59.0",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -19,7 +19,7 @@
"@ethereumjs/tx": "^3.3.0",
"@ledgerhq/hw-app-cosmos": "^6.29.1",
"@shapeshiftoss/bitcoinjs-lib": "7.0.0-shapeshift.0",
"@shapeshiftoss/hdwallet-core": "1.58.1",
"@shapeshiftoss/hdwallet-core": "1.59.0",
"@solana/web3.js": "1.95.8",
"base64-js": "^1.5.1",
"bchaddrjs": "^0.4.4",
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-metamask-multichain/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-metamask-multichain",
"version": "1.58.1",
"version": "1.59.0",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -17,7 +17,7 @@
"@metamask/detect-provider": "^1.2.0",
"@metamask/onboarding": "^1.0.1",
"@shapeshiftoss/common-api": "^9.3.0",
"@shapeshiftoss/hdwallet-core": "1.58.1",
"@shapeshiftoss/hdwallet-core": "1.59.0",
"@shapeshiftoss/metamask-snaps-adapter": "^1.0.12",
"@shapeshiftoss/metamask-snaps-types": "^1.0.12",
"eth-rpc-errors": "^4.0.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-native-vault/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-native-vault",
"version": "1.58.1",
"version": "1.59.0",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -15,7 +15,7 @@
},
"dependencies": {
"@bitcoinerlab/secp256k1": "^1.1.1",
"@shapeshiftoss/hdwallet-native": "1.58.1",
"@shapeshiftoss/hdwallet-native": "1.59.0",
"bip39": "^3.0.4",
"hash-wasm": "^4.11.0",
"idb-keyval": "^6.0.3",
Expand Down
Loading