@shapeshiftoss/hdwallet-gridplus 1.62.10-alpha.2 → 1.62.10

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC9E,cAAc,aAAa,CAAC"}

package/dist/index.js

@@ -20,4 +20,5 @@ var gridplus_1 = require("./gridplus");
 Object.defineProperty(exports, "GridPlusHDWallet", { enumerable: true, get: function () { return gridplus_1.GridPlusHDWallet; } });
 Object.defineProperty(exports, "GridPlusWalletInfo", { enumerable: true, get: function () { return gridplus_1.GridPlusWalletInfo; } });
 Object.defineProperty(exports, "isGridPlus", { enumerable: true, get: function () { return gridplus_1.isGridPlus; } });
+__exportStar(require("./transport"), exports);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,uCAA8E;AAArE,4GAAA,gBAAgB,OAAA;AAAE,8GAAA,kBAAkB,OAAA;AAAE,sGAAA,UAAU,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,uCAA8E;AAArE,4GAAA,gBAAgB,OAAA;AAAE,8GAAA,kBAAkB,OAAA;AAAE,sGAAA,UAAU,OAAA;AACzD,8CAA4B"}

package/dist/transport.d.ts

@@ -0,0 +1,28 @@
+import * as core from "@shapeshiftoss/hdwallet-core";
+import { Client } from "gridplus-sdk";
+export type GridPlusTransportConfig = {
+    deviceId: string;
+    password?: string;
+};
+export declare class GridPlusTransport extends core.Transport {
+    deviceId?: string;
+    password?: string;
+    connected: boolean;
+    private client?;
+    private sessionId?;
+    constructor(config: GridPlusTransportConfig);
+    getDeviceID(): Promise<string>;
+    connect(): Promise<void>;
+    connectGridPlus(deviceId: string, password?: string): Promise<void>;
+    disconnect(): Promise<void>;
+    isConnected(): boolean;
+    setup(deviceId: string, password?: string, existingSessionId?: string): Promise<{
+        isPaired: boolean;
+        sessionId: string;
+    }>;
+    pair(pairingCode: string): Promise<boolean>;
+    getClient(): Client | undefined;
+    getSessionId(): string | undefined;
+    call(): Promise<any>;
+}
+//# sourceMappingURL=transport.d.ts.map

package/dist/transport.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../src/transport.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,8BAA8B,CAAC;AAErD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAEtC,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,qBAAa,iBAAkB,SAAQ,IAAI,CAAC,SAAS;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,OAAO,CAAS;IAClC,OAAO,CAAC,MAAM,CAAC,CAAS;IAIxB,OAAO,CAAC,SAAS,CAAC,CAAS;gBAEf,MAAM,EAAE,uBAAuB;IAMpC,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAIxB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAYxB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMnE,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAMjC,WAAW,IAAI,OAAO;IAIhB,KAAK,CAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,EACjB,iBAAiB,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC;QAAE,QAAQ,EAAE,OAAO,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAgDvC,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAUjD,SAAS,IAAI,MAAM,GAAG,SAAS;IAI/B,YAAY,IAAI,MAAM,GAAG,SAAS;IAI5B,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC;CAGlC"}

package/dist/transport.js

@@ -0,0 +1,148 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GridPlusTransport = void 0;
+const core = __importStar(require("@shapeshiftoss/hdwallet-core"));
+const crypto_1 = require("crypto");
+const gridplus_sdk_1 = require("gridplus-sdk");
+class GridPlusTransport extends core.Transport {
+    constructor(config) {
+        super(new core.Keyring());
+        this.connected = false;
+        this.deviceId = config.deviceId;
+        this.password = config.password;
+    }
+    getDeviceID() {
+        return Promise.resolve(this.deviceId || "");
+    }
+    connect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.deviceId) {
+                throw new Error("Device ID is required to connect to GridPlus");
+            }
+            const { isPaired } = yield this.setup(this.deviceId, this.password);
+            if (!isPaired) {
+                throw new Error("Device is not paired");
+            }
+        });
+    }
+    connectGridPlus(deviceId, password) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.deviceId = deviceId;
+            this.password = password || "shapeshift-default";
+            yield this.connect();
+        });
+    }
+    disconnect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.connected = false;
+            this.deviceId = undefined;
+            this.password = undefined;
+        });
+    }
+    isConnected() {
+        return this.connected;
+    }
+    setup(deviceId, password, existingSessionId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.deviceId = deviceId;
+            this.password = password || "shapeshift-default";
+            // Use existing sessionId if provided, otherwise generate new one
+            if (existingSessionId) {
+                this.sessionId = existingSessionId;
+            }
+            else if (!this.sessionId) {
+                this.sessionId = (0, crypto_1.randomBytes)(32).toString("hex");
+            }
+            // Create Client instance directly (Frame pattern) - no localStorage!
+            // This ensures we always get fresh activeWallets from device
+            if (!this.client) {
+                this.client = new gridplus_sdk_1.Client({
+                    name: "ShapeShift",
+                    baseUrl: "https://signing.gridpl.us",
+                    privKey: Buffer.from(this.sessionId, "hex"),
+                    retryCount: 3,
+                    timeout: 60000,
+                    skipRetryOnWrongWallet: true,
+                });
+                try {
+                    // Connect to device - returns true if paired, false if needs pairing
+                    const isPaired = yield this.client.connect(deviceId);
+                    this.connected = true;
+                    return { isPaired, sessionId: this.sessionId };
+                }
+                catch (error) {
+                    // Handle "Device Locked" error - treat as unpaired
+                    const errorMessage = error instanceof Error ? error.message : String(error);
+                    if (errorMessage.toLowerCase().includes("device locked")) {
+                        this.connected = true;
+                        return { isPaired: false, sessionId: this.sessionId };
+                    }
+                    throw error;
+                }
+            }
+            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();
+                const isPaired = yield this.client.connect(deviceId);
+                this.connected = true;
+                return { isPaired, sessionId: this.sessionId };
+            }
+        });
+    }
+    pair(pairingCode) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.client) {
+                throw new Error("Client not initialized. Call setup() first.");
+            }
+            const result = yield this.client.pair(pairingCode);
+            this.connected = !!result;
+            return !!result;
+        });
+    }
+    getClient() {
+        return this.client;
+    }
+    getSessionId() {
+        return this.sessionId;
+    }
+    call() {
+        return __awaiter(this, void 0, void 0, function* () {
+            throw new Error("GridPlus transport call not implemented");
+        });
+    }
+}
+exports.GridPlusTransport = GridPlusTransport;
+//# sourceMappingURL=transport.js.map

package/dist/transport.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"transport.js","sourceRoot":"","sources":["../src/transport.ts"],"names":[],"mappings":"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"}

package/dist/utils.d.ts

@@ -1,3 +1,19 @@
+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":"AAKA,eAAO,MAAM,mBAAmB,WAAY,MAAM,GAAG,MAAM,KAAG,MAW7D,CAAC;AAEF,eAAO,MAAM,mBAAmB,WAAY,MAAM,GAAG,MAAM,UAAU,MAAM,KAAG,MAO7E,CAAC"}
+{"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"}

package/dist/utils.js

@@ -27,14 +27,19 @@ 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 bs58 = __importStar(require("bs58check"));
+const bs58check_1 = 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 bs58.decode(pubkey).subarray(45, 78);
+        return (0, bs58check_1.decode)(pubkey).subarray(45, 78);
     // Already compressed public key (33 bytes)
     if (pubkey.length === 33)
         return pubkey;
@@ -53,4 +58,84 @@ 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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-gridplus",
-  "version": "1.62.10-alpha.2",
+  "version": "1.62.10",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -11,16 +11,15 @@
   "scripts": {
     "build": "tsc --build",
     "build:docs": "typedoc --out docs --target es6 --theme minimal --mode file src",
-    "clean": "rm -rf dist node_modules",
-    "prepublishOnly": "rm -rf dist && yarn build"
+    "clean": "rm -rf dist tsconfig.tsbuildinfo",
+    "prepublishOnly": "yarn clean && 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.10-alpha.2",
+    "@shapeshiftoss/hdwallet-core": "1.62.3",
     "bech32": "^1.1.4",
     "bs58": "^5.0.0",
     "crypto-js": "^4.2.0",
@@ -35,5 +34,5 @@
     "@ethereumjs/common",
     "@ethereumjs/tx"
   ],
-  "gitHead": "1939f8fa5ec5b2a4e3053ecf9fa88b64efc6f88e"
+  "gitHead": "667187bae132b3463443d55dc8df58217699f988"
 }

package/src/adapter.ts

@@ -1,16 +1,11 @@
 import * as core from "@shapeshiftoss/hdwallet-core";
-import { createHash } from "crypto";
-import { Client } from "gridplus-sdk";
 
 import { GridPlusHDWallet } from "./gridplus";
-
-const name = "ShapeShift";
-const baseUrl = "https://signing.gridpl.us";
+import { GridPlusTransport } from "./transport";
 
 export class GridPlusAdapter {
   keyring: core.Keyring;
-
-  private client?: Client;
+  private activeTransports: Map<string, GridPlusTransport> = new Map();
 
   constructor(keyring: core.Keyring) {
     this.keyring = keyring;
@@ -20,32 +15,95 @@ export class GridPlusAdapter {
     return new GridPlusAdapter(keyring);
   }
 
-  public async connectDevice(deviceId: string, password = ""): Promise<GridPlusHDWallet | undefined> {
-    const privKey = createHash("sha256")
-      .update(deviceId + password + name)
-      .digest();
-
-    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();
+  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.");
     }
 
-    const isPaired = await this.client.connect(deviceId);
-    if (isPaired) return new GridPlusHDWallet(this.client);
+    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);
+
+      return wallet;
+    } catch (error) {
+      throw new Error(`GridPlus pairing failed: ${error instanceof Error ? error.message : "Unknown error"}`);
+    }
   }
 
-  public async pairDevice(pairingCode: string): Promise<GridPlusHDWallet> {
-    if (!this.client) throw new Error("No client connected. Call connectDevice first.");
+  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;
+    }
 
-    const success = await this.client.pair(pairingCode);
-    if (!success) throw new Error("Failed to pair.");
+    const { isPaired } = await this.connectDevice(deviceId, password, existingSessionId);
 
-    const wallet = new GridPlusHDWallet(this.client);
-    this.keyring.add(wallet, this.client.getDeviceId());
+    if (!isPaired) {
+      if (pairingCode) {
+        return await this.pairConnectedDevice(deviceId, pairingCode);
+      } else {
+        throw new Error("PAIRING_REQUIRED");
+      }
+    }
 
+    // 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));
+  }
 }