@shapeshiftoss/hdwallet-gridplus 1.62.8 → 1.62.10-alpha.1

package/dist/utils.d.ts

@@ -1,19 +1,3 @@
-import * as core from "@shapeshiftoss/hdwallet-core";
-import { UtxoAccountType } from "./constants";
 export declare const getCompressedPubkey: (pubkey: string | Buffer) => Buffer;
 export declare const createBech32Address: (pubkey: string | Buffer, prefix: string) => string;
-/**
- * Convert xpub version bytes for different coins (e.g., xpub → dgub for Dogecoin)
- * GridPlus returns Bitcoin-format xpubs, but some coins like Dogecoin need different prefixes
- */
-export declare function convertXpubVersion(xpub: string, accountType: UtxoAccountType | undefined, coin: string): string;
-export declare function scriptTypeToAccountType(scriptType: core.BTCInputScriptType | undefined): UtxoAccountType | undefined;
-/**
- * Derive a UTXO address from a compressed public key
- * @param pubkeyHex - Compressed public key as hex string (33 bytes, starting with 02 or 03)
- * @param coin - Coin name (Bitcoin, Dogecoin, Litecoin, etc.)
- * @param scriptType - Script type (p2pkh, p2wpkh, p2sh-p2wpkh)
- * @returns The derived address
- */
-export declare function deriveAddressFromPubkey(pubkeyHex: string, coin: string, scriptType?: core.BTCInputScriptType): string;
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,IAAI,MAAM,8BAA8B,CAAC;AAKrD,OAAO,EAA8D,eAAe,EAAE,MAAM,aAAa,CAAC;AAE1G,eAAO,MAAM,mBAAmB,WAAY,MAAM,GAAG,MAAM,KAAG,MAW7D,CAAC;AAEF,eAAO,MAAM,mBAAmB,WAAY,MAAM,GAAG,MAAM,UAAU,MAAM,KAAG,MAO7E,CAAC;AAEF;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,eAAe,GAAG,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAc/G;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,IAAI,CAAC,kBAAkB,GAAG,SAAS,GAAG,eAAe,GAAG,SAAS,CAWpH;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,EACZ,UAAU,GAAE,IAAI,CAAC,kBAAyD,GACzE,MAAM,CAiDR"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,mBAAmB,WAAY,MAAM,GAAG,MAAM,KAAG,MAW7D,CAAC;AAEF,eAAO,MAAM,mBAAmB,WAAY,MAAM,GAAG,MAAM,UAAU,MAAM,KAAG,MAO7E,CAAC"}

package/dist/utils.js

@@ -27,19 +27,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createBech32Address = exports.getCompressedPubkey = void 0;
-exports.convertXpubVersion = convertXpubVersion;
-exports.scriptTypeToAccountType = scriptTypeToAccountType;
-exports.deriveAddressFromPubkey = deriveAddressFromPubkey;
 const secp256k1_1 = require("@bitcoinerlab/secp256k1");
-const core = __importStar(require("@shapeshiftoss/hdwallet-core"));
 const bech32 = __importStar(require("bech32"));
-const bs58check_1 = require("bs58check");
+const bs58 = __importStar(require("bs58check"));
 const crypto_js_1 = __importDefault(require("crypto-js"));
-const constants_1 = require("./constants");
 const getCompressedPubkey = (pubkey) => {
     // Extended public key (xpub/ypub/zpub)
     if (typeof pubkey === "string")
-        return (0, bs58check_1.decode)(pubkey).subarray(45, 78);
+        return bs58.decode(pubkey).subarray(45, 78);
     // Already compressed public key (33 bytes)
     if (pubkey.length === 33)
         return pubkey;
@@ -58,84 +53,4 @@ const createBech32Address = (pubkey, prefix) => {
     return bech32.encode(prefix, words);
 };
 exports.createBech32Address = createBech32Address;
-/**
- * Convert xpub version bytes for different coins (e.g., xpub → dgub for Dogecoin)
- * GridPlus returns Bitcoin-format xpubs, but some coins like Dogecoin need different prefixes
- */
-function convertXpubVersion(xpub, accountType, coin) {
-    if (!accountType)
-        return xpub;
-    if (!constants_1.convertVersions.includes(xpub.substring(0, 4))) {
-        return xpub;
-    }
-    const payload = (0, bs58check_1.decode)(xpub);
-    const version = payload.slice(0, 4);
-    const desiredVersion = (0, constants_1.accountTypeToVersion)(coin, accountType);
-    if (version.compare(desiredVersion) !== 0) {
-        const key = payload.slice(4);
-        return (0, bs58check_1.encode)(Buffer.concat([desiredVersion, key]));
-    }
-    return xpub;
-}
-function scriptTypeToAccountType(scriptType) {
-    switch (scriptType) {
-        case core.BTCInputScriptType.SpendAddress:
-            return constants_1.UtxoAccountType.P2pkh;
-        case core.BTCInputScriptType.SpendWitness:
-            return constants_1.UtxoAccountType.SegwitNative;
-        case core.BTCInputScriptType.SpendP2SHWitness:
-            return constants_1.UtxoAccountType.SegwitP2sh;
-        default:
-            return undefined;
-    }
-}
-/**
- * Derive a UTXO address from a compressed public key
- * @param pubkeyHex - Compressed public key as hex string (33 bytes, starting with 02 or 03)
- * @param coin - Coin name (Bitcoin, Dogecoin, Litecoin, etc.)
- * @param scriptType - Script type (p2pkh, p2wpkh, p2sh-p2wpkh)
- * @returns The derived address
- */
-function deriveAddressFromPubkey(pubkeyHex, coin, scriptType = core.BTCInputScriptType.SpendAddress) {
-    const network = constants_1.UTXO_NETWORK_PARAMS[coin] || constants_1.UTXO_NETWORK_PARAMS.Bitcoin;
-    const pubkeyBuffer = Buffer.from(pubkeyHex, "hex");
-    if (pubkeyBuffer.length !== 33) {
-        throw new Error(`Invalid compressed public key length: ${pubkeyBuffer.length} bytes`);
-    }
-    // Hash160 = RIPEMD160(SHA256(pubkey))
-    const sha256Hash = crypto_js_1.default.SHA256(crypto_js_1.default.enc.Hex.parse(pubkeyHex));
-    const hash160 = crypto_js_1.default.RIPEMD160(sha256Hash).toString();
-    const hash160Buffer = Buffer.from(hash160, "hex");
-    switch (scriptType) {
-        case core.BTCInputScriptType.SpendAddress: {
-            // P2PKH: <pubKeyHash version byte> + hash160 + checksum
-            const payload = Buffer.concat([Buffer.from([network.pubKeyHash]), hash160Buffer]);
-            return (0, bs58check_1.encode)(payload);
-        }
-        case core.BTCInputScriptType.SpendWitness: {
-            // P2WPKH (bech32): witness version 0 + hash160
-            if (!network.bech32) {
-                throw new Error(`Bech32 not supported for ${coin}`);
-            }
-            const words = bech32.toWords(hash160Buffer);
-            words.unshift(0); // witness version 0
-            return bech32.encode(network.bech32, words);
-        }
-        case core.BTCInputScriptType.SpendP2SHWitness: {
-            // P2SH-P2WPKH: scriptHash of witness program
-            // Witness program: OP_0 (0x00) + length (0x14) + hash160
-            const witnessProgram = Buffer.concat([Buffer.from([0x00, 0x14]), hash160Buffer]);
-            // Hash160 of witness program
-            const wpHex = witnessProgram.toString("hex");
-            const wpSha256 = crypto_js_1.default.SHA256(crypto_js_1.default.enc.Hex.parse(wpHex));
-            const wpHash160 = crypto_js_1.default.RIPEMD160(wpSha256).toString();
-            const wpHash160Buffer = Buffer.from(wpHash160, "hex");
-            // Encode with scriptHash version byte
-            const payload = Buffer.concat([Buffer.from([network.scriptHash]), wpHash160Buffer]);
-            return (0, bs58check_1.encode)(payload);
-        }
-        default:
-            throw new Error(`Unsupported script type: ${scriptType}`);
-    }
-}
 //# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uDAAwD;AACxD,+CAAiC;AACjC,gDAAkC;AAClC,0DAAiC;AAE1B,MAAM,mBAAmB,GAAG,CAAC,MAAuB,EAAU,EAAE;IACrE,uCAAuC;IACvC,IAAI,OAAO,MAAM,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IAE5E,2CAA2C;IAC3C,IAAI,MAAM,CAAC,MAAM,KAAK,EAAE;QAAE,OAAO,MAAM,CAAC;IAExC,qCAAqC;IACrC,IAAI,MAAM,CAAC,MAAM,KAAK,EAAE;QAAE,OAAO,MAAM,CAAC,IAAI,CAAC,IAAA,yBAAa,EAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;IAE1E,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;AACxC,CAAC,CAAC;AAXW,QAAA,mBAAmB,uBAW9B;AAEK,MAAM,mBAAmB,GAAG,CAAC,MAAuB,EAAE,MAAc,EAAU,EAAE;IACrF,MAAM,SAAS,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC5F,MAAM,OAAO,GAAG,mBAAQ,CAAC,MAAM,CAAC,mBAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;IACnE,MAAM,IAAI,GAAG,mBAAQ,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;IACpD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACzC,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACtC,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACtC,CAAC,CAAC;AAPW,QAAA,mBAAmB,uBAO9B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-gridplus",
-  "version": "1.62.8",
+  "version": "1.62.10-alpha.1",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -11,15 +11,16 @@
   "scripts": {
     "build": "tsc --build",
     "build:docs": "typedoc --out docs --target es6 --theme minimal --mode file src",
-    "clean": "rm -rf dist tsconfig.tsbuildinfo",
-    "prepublishOnly": "yarn clean && yarn build"
+    "clean": "rm -rf dist node_modules",
+    "prepublishOnly": "rm -rf dist && yarn build"
   },
   "dependencies": {
     "@bitcoinerlab/secp256k1": "^1.1.1",
     "@ethereumjs/common": "4.4.0",
+    "@ethereumjs/rlp": "5.0.2",
     "@ethereumjs/tx": "5.4.0",
     "@metamask/eth-sig-util": "^7.0.0",
-    "@shapeshiftoss/hdwallet-core": "1.62.3",
+    "@shapeshiftoss/hdwallet-core": "1.62.10-alpha.1",
     "bech32": "^1.1.4",
     "bs58": "^5.0.0",
     "crypto-js": "^4.2.0",
@@ -34,5 +35,5 @@
     "@ethereumjs/common",
     "@ethereumjs/tx"
   ],
-  "gitHead": "73a5990e596dcfe45ee9e7853669d48353537721"
+  "gitHead": "86c4f311d027cbd873538328071c83e37620dba1"
 }

package/src/adapter.ts

@@ -1,11 +1,16 @@
 import * as core from "@shapeshiftoss/hdwallet-core";
+import { createHash } from "crypto";
+import { Client } from "gridplus-sdk";
 
 import { GridPlusHDWallet } from "./gridplus";
-import { GridPlusTransport } from "./transport";
+
+const name = "ShapeShift";
+const baseUrl = "https://signing.gridpl.us";
 
 export class GridPlusAdapter {
   keyring: core.Keyring;
-  private activeTransports: Map<string, GridPlusTransport> = new Map();
+
+  private client?: Client;
 
   constructor(keyring: core.Keyring) {
     this.keyring = keyring;
@@ -17,93 +22,37 @@ export class GridPlusAdapter {
 
   public async connectDevice(
     deviceId: string,
-    password?: string,
-    existingSessionId?: string
-  ): Promise<{ transport: GridPlusTransport; isPaired: boolean; sessionId: string }> {
-    const transport = (() => {
-      const existing = this.activeTransports.get(deviceId);
-      if (existing) return existing;
-
-      const newTransport = new GridPlusTransport({
-        deviceId,
-        password: password || "shapeshift-default",
-      });
-      this.activeTransports.set(deviceId, newTransport);
-      return newTransport;
-    })();
-
-    const { isPaired, sessionId } = await transport.setup(deviceId, password, existingSessionId);
-    return { transport, isPaired, sessionId };
-  }
-
-  public async pairConnectedDevice(deviceId: string, pairingCode: string): Promise<GridPlusHDWallet> {
-    const transport = this.activeTransports.get(deviceId);
-    if (!transport) {
-      throw new Error("Device not connected. Call connectDevice first.");
+    password = ""
+  ): Promise<{ wallet?: GridPlusHDWallet; sessionId: string }> {
+    const privKey = createHash("sha256")
+      .update(deviceId + password + name)
+      .digest();
+
+    const sessionId = privKey.toString("hex");
+
+    if (!this.client) {
+      this.client = new Client({ name, baseUrl, privKey, deviceId });
+    } else {
+      // Client already exists, reset active wallets to clear stale state before reconnecting
+      // This is critical when switching between SafeCards - ensures fresh wallet state from device
+      this.client.resetActiveWallets();
     }
 
-    try {
-      const pairingSuccess = await transport.pair(pairingCode);
-
-      if (!pairingSuccess) {
-        throw new Error("Pairing failed. Please check the 8-character code displayed on your Lattice device.");
-      }
-
-      const wallet = new GridPlusHDWallet(transport);
-      wallet.setActiveWalletId(deviceId);
-      await wallet.initialize();
-      this.keyring.add(wallet, deviceId);
-      this.activeTransports.delete(deviceId);
+    const isPaired = await this.client.connect(deviceId);
+    if (isPaired) return { wallet: new GridPlusHDWallet(this.client), sessionId };
 
-      return wallet;
-    } catch (error) {
-      throw new Error(`GridPlus pairing failed: ${error instanceof Error ? error.message : "Unknown error"}`);
-    }
+    return { sessionId: privKey.toString("hex") };
   }
 
-  public async pairDevice(
-    deviceId: string,
-    password?: string,
-    pairingCode?: string,
-    existingSessionId?: string
-  ): Promise<GridPlusHDWallet> {
-    const existingWallet = this.keyring.get<GridPlusHDWallet>(deviceId);
-    if (existingWallet) {
-      // Reset Client activeWallets state and fetch fresh UIDs from currently inserted SafeCard
-      await existingWallet.transport.setup(deviceId, password, existingSessionId);
-      // Ensure the wallet has the correct active walletId set
-      existingWallet.setActiveWalletId(deviceId);
-      // Reinitialize to clear cached addresses when reconnecting (e.g., SafeCard swap)
-      await existingWallet.initialize();
-      return existingWallet;
-    }
+  public async pairDevice(pairingCode: string): Promise<GridPlusHDWallet> {
+    if (!this.client) throw new Error("No client connected. Call connectDevice first.");
 
-    const { isPaired } = await this.connectDevice(deviceId, password, existingSessionId);
+    const success = await this.client.pair(pairingCode);
+    if (!success) throw new Error("Failed to pair.");
 
-    if (!isPaired) {
-      if (pairingCode) {
-        return await this.pairConnectedDevice(deviceId, pairingCode);
-      } else {
-        throw new Error("PAIRING_REQUIRED");
-      }
-    }
+    const wallet = new GridPlusHDWallet(this.client);
+    this.keyring.add(wallet, this.client.getDeviceId());
 
-    // Already paired - create wallet directly
-    const transport = this.activeTransports.get(deviceId)!;
-    const wallet = new GridPlusHDWallet(transport);
-    wallet.setActiveWalletId(deviceId);
-    await wallet.initialize();
-    this.keyring.add(wallet, deviceId);
-    this.activeTransports.delete(deviceId);
     return wallet;
   }
-
-  public async initialize(deviceId: string, password?: string): Promise<number> {
-    await this.pairDevice(deviceId, password);
-    return Object.keys(this.keyring.wallets).length;
-  }
-
-  public get(deviceId: string): GridPlusHDWallet {
-    return core.mustBeDefined(this.keyring.get<GridPlusHDWallet>(deviceId));
-  }
 }