feat: gridplus cleanup

.gitignore

@@ -37,7 +37,6 @@
 !/integration/src/
 !/integration/src/**
 !/integration/tsconfig.json
-!/integration/yarn.lock
 !/jest.config.js
 !/lerna.json
 !/package.json

examples/sandbox/index.html

@@ -115,6 +115,7 @@ <h4>Select</h4>
       <button id="ledgerwebhid">Pair Ledger (webHID)</button>
       <button id="portis">Pair Portis</button>
       <button id="native">Pair Native</button>
+      <button id="gridplus">Pair GridPlus</button>
       <button id="metaMask">Pair MetaMask</button>
       <button id="phantom">Pair Phantom</button>
       <button id="vultisig">Pair Vultisig</button>
@@ -450,6 +451,40 @@ <h3>Mnemoic Required</h3>
       </div>
     </div>
 
+    <div id="#deviceIdModal" class="modal" aria-hidden="true">
+      <div class="modal-dialog">
+        <div class="modal-header">
+          <h3>Device ID Required</h3>
+          <p>Enter your device id</p>
+        </div>
+        <div class="modal-body">
+          <form>
+            <input id="#deviceIdInput" type="text" />
+          </form>
+        </div>
+        <div class="modal-footer">
+          <button class="button button-outline" onclick="deviceIdEntered()">Pair</button>
+        </div>
+      </div>
+    </div>
+
+    <div id="#pairingCodeModal" class="modal" aria-hidden="true">
+      <div class="modal-dialog">
+        <div class="modal-header">
+          <h3>Pairing Code Required</h3>
+          <p>Enter your pairing code</p>
+        </div>
+        <div class="modal-body">
+          <form>
+            <input id="#pairingCodeInput" type="text" />
+          </form>
+        </div>
+        <div class="modal-footer">
+          <button class="button button-outline" onclick="pairingCodeEntered()">Pair</button>
+        </div>
+      </div>
+    </div>
+
     <script src="https://unpkg.com/[email protected]/dist/debug.js"></script>
     <script type="module" src="./index.ts"></script>
   </body>

examples/sandbox/index.ts

@@ -3,6 +3,7 @@ import * as coinbase from "@shapeshiftoss/hdwallet-coinbase";
 import { CoinbaseProviderConfig } from "@shapeshiftoss/hdwallet-coinbase";
 import * as core from "@shapeshiftoss/hdwallet-core";
 import { BTCSignTxInput, BTCSignTxOutput, EosTx, Thorchain } from "@shapeshiftoss/hdwallet-core";
+import * as gridplus from "@shapeshiftoss/hdwallet-gridplus";
 import * as keepkey from "@shapeshiftoss/hdwallet-keepkey";
 import * as keepkeyTcp from "@shapeshiftoss/hdwallet-keepkey-tcp";
 import * as keepkeyWebUSB from "@shapeshiftoss/hdwallet-keepkey-webusb";
@@ -133,6 +134,7 @@ const walletConnectAdapter = walletConnect.WalletConnectAdapter.useKeyring(keyri
 const walletConnectV2Adapter = walletConnectv2.WalletConnectV2Adapter.useKeyring(keyring, walletConnectV2Options);
 const keplrAdapter = keplr.KeplrAdapter.useKeyring(keyring);
 const nativeAdapter = native.NativeAdapter.useKeyring(keyring);
+const gridplusAdapter = gridplus.GridPlusAdapter.useKeyring(keyring);
 const trezorAdapter = trezorConnect.TrezorAdapter.useKeyring(keyring, {
   debug: false,
   manifest: {
@@ -158,6 +160,7 @@ const $ledgerwebusb = $("#ledgerwebusb");
 const $ledgerwebhid = $("#ledgerwebhid");
 const $portis = $("#portis");
 const $native = $("#native");
+const $gridplus = $("#gridplus");
 const $metaMask = $("#metaMask");
 const $phantom = $("#phantom");
 const $vultisig = $("#vultisig");
@@ -230,6 +233,34 @@ $native.on("click", async (e) => {
   $("#keyring select").val(await wallet.getDeviceID());
 });
 
+$gridplus.on("click", async (e) => {
+  e.preventDefault();
+
+  let deviceId = "";
+
+  document.getElementById("#deviceIdModal").className = "modal opened";
+  window["deviceIdEntered"] = async function () {
+    const input = document.getElementById("#deviceIdInput") as HTMLInputElement;
+    deviceId = input.value;
+    document.getElementById("#deviceIdModal").className = "modal";
+    wallet = await gridplusAdapter.connectDevice(deviceId);
+    if (wallet) {
+      window["wallet"] = wallet;
+      $("#keyring select").val(await wallet.getDeviceID());
+    } else {
+      document.getElementById("#pairingCodeModal").className = "modal opened";
+    }
+  };
+
+  window["pairingCodeEntered"] = async function () {
+    const input = document.getElementById("#pairingCodeInput") as HTMLInputElement;
+    document.getElementById("#pairingCodeModal").className = "modal";
+    wallet = await gridplusAdapter.pairDevice(input.value);
+    window["wallet"] = wallet;
+    $("#keyring select").val(await wallet.getDeviceID());
+  };
+});
+
 $metaMask.on("click", async (e) => {
   e.preventDefault();
   wallet = await metaMaskAdapter.pairDevice();

examples/sandbox/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/hdwallet-sandbox",
-  "version": "1.62.10",
+  "version": "1.62.11",
   "license": "MIT",
   "private": true,
   "browserslist": "> 0.5%, last 2 versions, not dead",
@@ -12,24 +12,24 @@
   "dependencies": {
     "@esm2cjs/p-queue": "^7.3.0",
     "@metamask/eth-sig-util": "^7.0.0",
-    "@shapeshiftoss/hdwallet-coinbase": "1.62.10",
-    "@shapeshiftoss/hdwallet-core": "1.62.10",
-    "@shapeshiftoss/hdwallet-keepkey": "1.62.10",
-    "@shapeshiftoss/hdwallet-keepkey-tcp": "1.62.10",
-    "@shapeshiftoss/hdwallet-keepkey-webusb": "1.62.10",
-    "@shapeshiftoss/hdwallet-keplr": "1.62.10",
-    "@shapeshiftoss/hdwallet-ledger": "1.62.10",
-    "@shapeshiftoss/hdwallet-ledger-webhid": "1.62.10",
-    "@shapeshiftoss/hdwallet-ledger-webusb": "1.62.10",
-    "@shapeshiftoss/hdwallet-metamask-multichain": "1.62.10",
-    "@shapeshiftoss/hdwallet-native": "1.62.10",
-    "@shapeshiftoss/hdwallet-phantom": "1.62.10",
-    "@shapeshiftoss/hdwallet-portis": "1.62.10",
-    "@shapeshiftoss/hdwallet-trezor": "1.62.10",
-    "@shapeshiftoss/hdwallet-trezor-connect": "1.62.10",
-    "@shapeshiftoss/hdwallet-vultisig": "1.62.10",
-    "@shapeshiftoss/hdwallet-walletconnect": "1.62.10",
-    "@shapeshiftoss/hdwallet-walletconnectv2": "1.62.10",
+    "@shapeshiftoss/hdwallet-coinbase": "1.62.11",
+    "@shapeshiftoss/hdwallet-core": "1.62.11",
+    "@shapeshiftoss/hdwallet-keepkey": "1.62.11",
+    "@shapeshiftoss/hdwallet-keepkey-tcp": "1.62.11",
+    "@shapeshiftoss/hdwallet-keepkey-webusb": "1.62.11",
+    "@shapeshiftoss/hdwallet-keplr": "1.62.11",
+    "@shapeshiftoss/hdwallet-ledger": "1.62.11",
+    "@shapeshiftoss/hdwallet-ledger-webhid": "1.62.11",
+    "@shapeshiftoss/hdwallet-ledger-webusb": "1.62.11",
+    "@shapeshiftoss/hdwallet-metamask-multichain": "1.62.11",
+    "@shapeshiftoss/hdwallet-native": "1.62.11",
+    "@shapeshiftoss/hdwallet-phantom": "1.62.11",
+    "@shapeshiftoss/hdwallet-portis": "1.62.11",
+    "@shapeshiftoss/hdwallet-trezor": "1.62.11",
+    "@shapeshiftoss/hdwallet-trezor-connect": "1.62.11",
+    "@shapeshiftoss/hdwallet-vultisig": "1.62.11",
+    "@shapeshiftoss/hdwallet-walletconnect": "1.62.11",
+    "@shapeshiftoss/hdwallet-walletconnectv2": "1.62.11",
     "bip32": "^2.0.4",
     "eip-712": "^1.0.0",
     "jquery": "^3.7.1",

integration/package.json

@@ -1,26 +1,26 @@
 {
   "name": "@shapeshiftoss/integration",
-  "version": "1.62.10",
+  "version": "1.62.11",
   "main": "index.js",
   "license": "MIT",
   "private": true,
   "scripts": {
-    "clean": "rm -rf dist node_modules .cache tsconfig.tsbuildinfo",
+    "clean": "rm -rf dist node_modules .cache",
     "test": "yarn jest --verbose",
     "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies"
   },
   "dependencies": {
     "@bitcoinerlab/secp256k1": "^1.1.1",
-    "@shapeshiftoss/hdwallet-core": "1.62.10",
-    "@shapeshiftoss/hdwallet-keepkey": "1.62.10",
-    "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.62.10",
-    "@shapeshiftoss/hdwallet-keepkey-tcp": "1.62.10",
-    "@shapeshiftoss/hdwallet-ledger": "1.62.10",
-    "@shapeshiftoss/hdwallet-metamask-multichain": "1.62.10",
-    "@shapeshiftoss/hdwallet-native": "1.62.10",
-    "@shapeshiftoss/hdwallet-portis": "1.62.10",
-    "@shapeshiftoss/hdwallet-trezor": "1.62.10",
-    "@shapeshiftoss/hdwallet-vultisig": "1.62.10",
+    "@shapeshiftoss/hdwallet-core": "1.62.11",
+    "@shapeshiftoss/hdwallet-keepkey": "1.62.11",
+    "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.62.11",
+    "@shapeshiftoss/hdwallet-keepkey-tcp": "1.62.11",
+    "@shapeshiftoss/hdwallet-ledger": "1.62.11",
+    "@shapeshiftoss/hdwallet-metamask-multichain": "1.62.11",
+    "@shapeshiftoss/hdwallet-native": "1.62.11",
+    "@shapeshiftoss/hdwallet-portis": "1.62.11",
+    "@shapeshiftoss/hdwallet-trezor": "1.62.11",
+    "@shapeshiftoss/hdwallet-vultisig": "1.62.11",
     "fast-json-stable-stringify": "^2.1.0",
     "msw": "^0.27.1",
     "whatwg-fetch": "^3.6.2"

integration/tsconfig.json

@@ -3,7 +3,7 @@
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "dist",
-    "resolveJsonModule": true
+    "tsBuildInfoFile": "./dist/tsconfig.tsbuildinfo"
   },
   "include": ["./src/**/*.[ts|json]"],
   "exclude": ["node_modules", "dist", "**/*.test.ts"]