Merge pull request #544 from shapeshift/wallet-connect

WalletConnect
shapeshift · Jul 13, 2022 · 748a913 · 748a913 · vercel · Jul 13, 2022
2 parents f9c2ef5 + e3a9f78
commit 748a913
Show file tree

Hide file tree

Showing 36 changed files with 1,473 additions and 78 deletions.
diff --git a/examples/sandbox/index.html b/examples/sandbox/index.html
@@ -119,6 +119,7 @@ <h4>Select</h4>
       <button id="xdefi">Pair XDEFI</button>
       <button id="keplr">Pair Keplr</button>
       <button id="tallyHo">Pair Tally Ho</button>
+      <button id="walletConnect">Pair WalletConnect</button>
 
       <select id="keyring" style="height: 100px" size="4"></select>
     </div>

diff --git a/examples/sandbox/index.ts b/examples/sandbox/index.ts
@@ -12,6 +12,8 @@ import * as native from "@shapeshiftoss/hdwallet-native";
 import * as portis from "@shapeshiftoss/hdwallet-portis";
 import * as tallyHo from "@shapeshiftoss/hdwallet-tallyho";
 import * as trezorConnect from "@shapeshiftoss/hdwallet-trezor-connect";
+import { WalletConnectProviderConfig } from "@shapeshiftoss/hdwallet-walletconnect";
+import * as walletConnect from "@shapeshiftoss/hdwallet-walletconnect";
 import * as xdefi from "@shapeshiftoss/hdwallet-xdefi";
 import $ from "jquery";
 import Web3 from "web3";
@@ -45,6 +47,11 @@ const keyring = new core.Keyring();
 
 const portisAppId = "ff763d3d-9e34-45a1-81d1-caa39b9c64f9";
 const mnemonic = "alcohol woman abuse must during monitor noble actual mixed trade anger aisle";
+const walletConnectOptions: WalletConnectProviderConfig = {
+  rpc: {
+    1: "https://mainnet.infura.io/v3/d734c7eebcdf400185d7eb67322a7e57",
+  },
+};
 
 const testPublicWalletXpubs = [
   "xpub661MyMwAqRbcFLgDU7wpcEVubSF7NkswwmXBUkDiGUW6uopeUMys4AqKXNgpfZKRTLnpKQgffd6a2c3J8JxLkF1AQN17Pm9QYHEqEfo1Rsx", // all seed root key
@@ -67,12 +74,10 @@ const kkemuAdapter = keepkeyTcp.TCPKeepKeyAdapter.useKeyring(keyring);
 const portisAdapter = portis.PortisAdapter.useKeyring(keyring, { portisAppId });
 const metaMaskAdapter = metaMask.MetaMaskAdapter.useKeyring(keyring);
 const tallyHoAdapter = tallyHo.TallyHoAdapter.useKeyring(keyring);
+const walletConnectAdapter = walletConnect.WalletConnectAdapter.useKeyring(keyring, walletConnectOptions);
 const xdefiAdapter = xdefi.XDEFIAdapter.useKeyring(keyring);
 const keplrAdapter = keplr.KeplrAdapter.useKeyring(keyring);
-const nativeAdapter = native.NativeAdapter.useKeyring(keyring, {
-  mnemonic,
-  deviceId: "native-wallet-test",
-});
+const nativeAdapter = native.NativeAdapter.useKeyring(keyring);
 const trezorAdapter = trezorConnect.TrezorAdapter.useKeyring(keyring, {
   debug: false,
   manifest: {
@@ -100,6 +105,7 @@ const $portis = $("#portis");
 const $native = $("#native");
 const $metaMask = $("#metaMask");
 const $tallyHo = $("#tallyHo");
+const $walletConnect = $("#walletConnect");
 const $xdefi = $("#xdefi");
 const $keplr = $("#keplr");
 const $keyring = $("#keyring");
@@ -214,9 +220,22 @@ $tallyHo.on("click", async (e) => {
   }
 });
 
+$walletConnect.on("click", async (e) => {
+  e.preventDefault();
+  try {
+    wallet = await walletConnectAdapter.pairDevice();
+    window["wallet"] = wallet;
+    let deviceID = "nothing";
+    deviceID = await wallet.getDeviceID();
+    $("#keyring select").val(deviceID);
+  } catch (error) {
+    console.error(error);
+  }
+});
+
 $xdefi.on("click", async (e) => {
   e.preventDefault();
-  wallet = await xdefiAdapter.pairDevice("testid");
+  wallet = await xdefiAdapter.pairDevice();
   window["wallet"] = wallet;
   let deviceID = "nothing";
   try {
@@ -314,6 +333,12 @@ async function deviceConnected(deviceId) {
     console.error("Could not initialize TallyHoAdapter", e);
   }
 
+  try {
+    await walletConnectAdapter.initialize();
+  } catch (e) {
+    console.error("Could not initialize WalletConnectAdapter", e);
+  }
+
   for (const deviceID of Object.keys(keyring.wallets)) {
     await deviceConnected(deviceID);
   }
@@ -676,7 +701,6 @@ $binanceTx.on("click", async (e) => {
   if (core.supportsBinance(wallet)) {
     const res = await wallet.binanceSignTx({
       addressNList: core.bip32ToAddressNList(`m/44'/714'/0'/0/0`),
-      chain_id: "Binance-Chain-Nile",
       account_number: "24250",
       sequence: 31,
       tx: bnbTxJson,

diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hdwallet-sandbox",
-  "version": "1.25.0",
+  "version": "1.26.0",
   "license": "MIT",
   "private": true,
   "browserslist": "> 0.5%, last 2 versions, not dead",
@@ -10,18 +10,18 @@
     "clean": "rm -rf public .parcel-cache"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-core": "1.25.0",
-    "@shapeshiftoss/hdwallet-keepkey-tcp": "1.25.0",
-    "@shapeshiftoss/hdwallet-keepkey-webusb": "1.25.0",
-    "@shapeshiftoss/hdwallet-ledger": "1.25.0",
-    "@shapeshiftoss/hdwallet-ledger-webhid": "1.25.0",
-    "@shapeshiftoss/hdwallet-ledger-webusb": "1.25.0",
-    "@shapeshiftoss/hdwallet-metamask": "1.25.0",
-    "@shapeshiftoss/hdwallet-native": "1.25.0",
-    "@shapeshiftoss/hdwallet-portis": "1.25.0",
-    "@shapeshiftoss/hdwallet-trezor": "1.25.0",
-    "@shapeshiftoss/hdwallet-trezor-connect": "1.25.0",
-    "@shapeshiftoss/hdwallet-xdefi": "1.25.0",
+    "@shapeshiftoss/hdwallet-core": "1.26.0",
+    "@shapeshiftoss/hdwallet-keepkey-tcp": "1.26.0",
+    "@shapeshiftoss/hdwallet-keepkey-webusb": "1.26.0",
+    "@shapeshiftoss/hdwallet-ledger": "1.26.0",
+    "@shapeshiftoss/hdwallet-ledger-webhid": "1.26.0",
+    "@shapeshiftoss/hdwallet-ledger-webusb": "1.26.0",
+    "@shapeshiftoss/hdwallet-metamask": "1.26.0",
+    "@shapeshiftoss/hdwallet-native": "1.26.0",
+    "@shapeshiftoss/hdwallet-portis": "1.26.0",
+    "@shapeshiftoss/hdwallet-trezor": "1.26.0",
+    "@shapeshiftoss/hdwallet-trezor-connect": "1.26.0",
+    "@shapeshiftoss/hdwallet-xdefi": "1.26.0",
     "bip32": "^2.0.4",
     "jquery": "^3.4.1",
     "json": "^9.0.6",

diff --git a/integration/package.json b/integration/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@shapeshiftoss/integration",
-  "version": "1.25.0",
+  "version": "1.26.0",
   "main": "index.js",
   "license": "MIT",
   "private": true,
@@ -10,15 +10,15 @@
     "dev": "lerna run test --scope integration --parallel --include-filtered-dependencies"
   },
   "dependencies": {
-    "@shapeshiftoss/hdwallet-core": "1.25.0",
-    "@shapeshiftoss/hdwallet-keepkey": "1.25.0",
-    "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.25.0",
-    "@shapeshiftoss/hdwallet-keepkey-tcp": "1.25.0",
-    "@shapeshiftoss/hdwallet-ledger": "1.25.0",
-    "@shapeshiftoss/hdwallet-native": "1.25.0",
-    "@shapeshiftoss/hdwallet-portis": "1.25.0",
-    "@shapeshiftoss/hdwallet-trezor": "1.25.0",
-    "@shapeshiftoss/hdwallet-xdefi": "1.25.0",
+    "@shapeshiftoss/hdwallet-core": "1.26.0",
+    "@shapeshiftoss/hdwallet-keepkey": "1.26.0",
+    "@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.26.0",
+    "@shapeshiftoss/hdwallet-keepkey-tcp": "1.26.0",
+    "@shapeshiftoss/hdwallet-ledger": "1.26.0",
+    "@shapeshiftoss/hdwallet-native": "1.26.0",
+    "@shapeshiftoss/hdwallet-portis": "1.26.0",
+    "@shapeshiftoss/hdwallet-trezor": "1.26.0",
+    "@shapeshiftoss/hdwallet-xdefi": "1.26.0",
     "@types/jest": "^26.0.23",
     "fast-json-stable-stringify": "^2.1.0",
     "jest": "^26.6.3",

diff --git a/integration/src/integration.ts b/integration/src/integration.ts
@@ -6,6 +6,7 @@ import * as native from "@shapeshiftoss/hdwallet-native";
 import * as portis from "@shapeshiftoss/hdwallet-portis";
 import * as tallyHo from "@shapeshiftoss/hdwallet-tallyho";
 import * as trezor from "@shapeshiftoss/hdwallet-trezor";
+import * as walletconnect from "@shapeshiftoss/hdwallet-walletconnect";
 import * as xdefi from "@shapeshiftoss/hdwallet-xdefi";
 
 import { binanceTests } from "./binance";
@@ -56,6 +57,7 @@ export function integration(suite: WalletSuite): void {
             (native.isNative(wallet) ? 1 : 0) +
             (metamask.isMetaMask(wallet) ? 1 : 0) +
             (tallyHo.isTallyHo(wallet) ? 1 : 0) +
+            (walletconnect.isWalletConnect(wallet) ? 1 : 0) +
             (xdefi.isXDEFI(wallet) ? 1 : 0)
         ).toEqual(1);
       });