btc-wallet 0.5.6-beta → 0.5.7-beta

package/dist/connector/xverse.d.ts

@@ -1,5 +1,9 @@
 import EventEmitter from 'events';
+import type { Address } from 'sats-connect';
 import { BaseConnector, type WalletMetadata } from './base';
+interface XverseAddress extends Address {
+    walletType: 'software' | 'ledger';
+}
 export declare class XverseConnector extends BaseConnector {
     #private;
     constructor();
@@ -10,14 +14,17 @@ export declare class XverseConnector extends BaseConnector {
         txid: string;
     }>;
     requestAccounts(): Promise<string[]>;
+    getAddresses(): Promise<XverseAddress[]>;
+    getCurrentAddress(): Promise<XverseAddress>;
     getAccounts(): Promise<string[]>;
     getPublicKey(): Promise<string>;
     signMessage(signStr: string): Promise<string>;
     on(event: string, handler: (data?: unknown) => void): EventEmitter<[never]>;
     removeListener(event: string, handler: (data?: unknown) => void): EventEmitter<[never]>;
-    getProvider(): import("sats-connect").BitcoinProvider | undefined;
+    getProvider(): import("sats-connect").BitcoinProvider;
     getNetwork(): Promise<'livenet' | 'testnet'>;
     switchNetwork(): Promise<void>;
     sendBitcoin(toAddress: string, satoshis: number): Promise<string>;
     disconnect(): void;
 }
+export {};

package/dist/index.js

@@ -715,16 +715,15 @@ var XverseConnector = class extends BaseConnector {
     this.loadAccounts = (network) => __async(this, null, function* () {
       const { AddressPurpose } = yield import("sats-connect");
       const provider = this.getProvider();
-      if (!provider) {
-        throw new Error(`${this.metadata.name} is not install!`);
-      }
       yield provider.request("wallet_requestPermissions", void 0);
       const { result: walletType } = yield provider.request("wallet_getWalletType", void 0);
       const { result } = yield provider.request("getAddresses", {
         purposes: [AddressPurpose.Payment, AddressPurpose.Ordinals],
         message: "Address for receiving Ordinals and payments"
       });
-      const addresses = result.addresses.map((item) => __spreadProps(__spreadValues({}, item), { walletType }));
+      const addresses = result.addresses.map((item) => __spreadProps(__spreadValues({}, item), {
+        walletType
+      }));
       console.log("\u{1F680} ~ XverseConnector ~ loadAccounts ~ res:", addresses);
       localStorage.setItem("btc-connect-xverse-addresses-" + network, JSON.stringify(addresses));
       return addresses;
@@ -747,78 +746,76 @@ var XverseConnector = class extends BaseConnector {
   }
   requestAccounts() {
     return __async(this, null, function* () {
-      if (isMobile() && !this.getProvider()) {
-        MobileWalletConnect.redirectToWallet(this.metadata.id);
-        return [];
+      if (isMobile()) {
+        try {
+          this.getProvider();
+        } catch (error) {
+          MobileWalletConnect.redirectToWallet(this.metadata.id);
+          return [];
+        }
       }
       const addresses = yield this.loadAccounts(__privateGet(this, _network));
       return addresses.map((item) => item.address);
     });
   }
-  getAccounts() {
+  getAddresses() {
     return __async(this, null, function* () {
-      if (!this.isReady()) {
-        throw new Error(`${this.metadata.name} is not install!`);
-      }
       const data = localStorage.getItem("btc-connect-xverse-addresses-" + __privateGet(this, _network));
       if (data) {
-        const addresses = JSON.parse(data);
-        return addresses.map((item) => item.address);
-      } else {
-        return [];
+        return JSON.parse(data);
       }
+      return [];
     });
   }
-  getPublicKey() {
+  getCurrentAddress() {
     return __async(this, null, function* () {
-      if (!this.isReady()) {
-        throw new Error(`${this.metadata.name} is not install!`);
-      }
-      const data = localStorage.getItem("btc-connect-xverse-addresses-" + __privateGet(this, _network));
-      if (data) {
-        const addresses = JSON.parse(data);
-        return addresses[0].publicKey;
-      } else {
-        return "";
+      const addresses = yield this.getAddresses();
+      const address = addresses == null ? void 0 : addresses[0];
+      if (!address) {
+        throw new Error(`${this.metadata.name} not connected!`);
       }
+      return address;
     });
   }
-  signMessage(signStr) {
+  getAccounts() {
     return __async(this, null, function* () {
       if (!this.isReady()) {
         throw new Error(`${this.metadata.name} is not install!`);
       }
-      const addresses = yield this.getAccounts();
-      if (addresses.length === 0) {
-        throw new Error(`${this.metadata.name} not connected!`);
-      }
-      const { signMessage } = yield import("sats-connect");
-      const sig = yield new Promise((resolve, reject) => {
-        const signMessageOptions = {
-          payload: {
-            network: {
-              type: __privateGet(this, _network)
-            },
-            address: addresses[0],
-            message: signStr
-          },
-          onFinish: (response) => {
-            resolve(response);
-          },
-          onCancel: () => {
-            reject({
-              code: 4001,
-              message: "User rejected the request."
-            });
-          }
-        };
-        signMessage(signMessageOptions).catch((e) => {
-          reject(e);
-        });
+      const addresses = yield this.getAddresses();
+      return addresses.map((item) => item.address);
+    });
+  }
+  getPublicKey() {
+    return __async(this, null, function* () {
+      const address = yield this.getCurrentAddress();
+      return address.publicKey;
+    });
+  }
+  signMessage(signStr) {
+    return __async(this, null, function* () {
+      const address = yield this.getCurrentAddress();
+      const provider = this.getProvider();
+      const { result } = yield provider.request("signMessage", {
+        address: address.address,
+        message: signStr,
+        protocol: "ECDSA"
       });
-      const modifiedSig = Buffer.from(sig, "base64");
-      modifiedSig[0] = 31 + (modifiedSig[0] - 31) % 4;
-      return modifiedSig.toString("base64");
+      const modifiedSig = Buffer.from(result.signature, "base64");
+      console.log("xverse walletType", address.walletType);
+      console.log("xverse raw sig", result.signature, modifiedSig.toString("base64"));
+      if (address.walletType === "ledger") {
+        if (address.addressType === "p2wpkh") {
+          modifiedSig[0] = 31 + (modifiedSig[0] - 39);
+        } else if (address.addressType === "p2sh") {
+          modifiedSig[0] = 31 + (modifiedSig[0] - 35);
+        }
+      } else {
+        modifiedSig[0] = 31 + (modifiedSig[0] - 31) % 4;
+      }
+      const sig = modifiedSig.toString("base64");
+      console.log("xverse modified sig", sig);
+      return sig;
     });
   }
   on(event, handler) {
@@ -828,9 +825,11 @@ var XverseConnector = class extends BaseConnector {
     return __privateGet(this, _event).removeListener(event, handler);
   }
   getProvider() {
-    if (this.isReady()) {
-      return window.BitcoinProvider;
+    const provider = window.BitcoinProvider;
+    if (!provider) {
+      throw new Error(`${this.metadata.name} is not install!`);
     }
+    return provider;
   }
   getNetwork() {
     return __async(this, null, function* () {
@@ -848,9 +847,6 @@ var XverseConnector = class extends BaseConnector {
   sendBitcoin(toAddress, satoshis) {
     return __async(this, null, function* () {
       const provider = this.getProvider();
-      if (!provider) {
-        throw new Error(`${this.metadata.name} is not install!`);
-      }
       const { result } = yield provider.request("sendTransfer", {
         recipients: [{ address: toAddress, amount: satoshis }]
       });
@@ -3411,6 +3407,16 @@ function getCsnaAccountId(env) {
     return csna;
   });
 }
+function checkDepositDisabledAddress() {
+  const data = localStorage.getItem("btc-connect-xverse-addresses-Mainnet");
+  if (!data)
+    return;
+  const addresses = JSON.parse(data);
+  const address = addresses == null ? void 0 : addresses[0];
+  if (address.walletType === "ledger" && (address.addressType !== "p2wpkh" || address.addressType !== "p2sh")) {
+    throw new Error("Ledger is only supported for p2wpkh and p2sh address");
+  }
+}
 function executeBTCDepositAndAction(_0) {
   return __async(this, arguments, function* ({
     action,
@@ -3423,6 +3429,7 @@ function executeBTCDepositAndAction(_0) {
   }) {
     var _a;
     try {
+      checkDepositDisabledAddress();
       const { getPublicKey } = getBtcProvider();
       const config = yield getConfig(env);
       const btcPublicKey = yield getPublicKey();
@@ -4479,7 +4486,7 @@ function setupBTCWallet({
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.6-beta";
+  return "0.5.7-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();