btc-wallet 0.0.7 → 0.0.9

package/dist/utils/index.d.ts

@@ -9,3 +9,4 @@ export declare function copyToClipboard(text: string): Promise<unknown>;
 export declare const defaultTokenIcon = "https://static.particle.network/token-list/defaultToken/default.png";
 export declare const ipfsToSrc: (ipfs: string) => string;
 export declare const checkBTCVersion: (accountContracts: AAOptions["accountContracts"], accountContractKey: string, version: string) => boolean;
+export declare const delay: (ms: number) => Promise<unknown>;

package/dist/utils/initWalletButton.d.ts

@@ -1,6 +1,8 @@
-import { Wallet } from '@near-wallet-selector/core';
-export declare function setupWalletButton(network: string, wallet: Wallet, originalWallet: {
+import type { Wallet } from '@near-wallet-selector/core';
+interface OriginalWallet {
     account: string | null;
     getPublicKey: () => Promise<string>;
-}): void;
+}
+export declare function setupWalletButton(network: string, wallet: Wallet, originalWallet: OriginalWallet): void;
 export declare function removeWalletButton(): void;
+export {};

package/esm/index.js

@@ -1078,6 +1078,7 @@ var checkBTCVersion = (accountContracts, accountContractKey, version) => {
   }
   return accountContracts[accountContractKey].some((item) => item.version === version);
 };
+var delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
 // src/utils/ethereumUtils.ts
 import { bytesToHex, publicToAddress, toBytes, toChecksumAddress, toRpcSig } from "@ethereumjs/util";
@@ -2316,8 +2317,10 @@ import { sha256 } from "js-sha256";
 
 // src/utils/initWalletButton.ts
 function setupWalletButton(network, wallet, originalWallet) {
-  if (document.getElementById("satoshi-wallet-button"))
+  if (document.getElementById("satoshi-wallet-button")) {
+    sendInitializeData(wallet, originalWallet);
     return;
+  }
   const iframe = createIframe({
     iframeUrl: network === "testnet" ? "https://wallet-dev.satoshibridge.top" : "https://wallet.satoshibridge.top",
     iframeStyle: { width: "400px", height: "650px" }
@@ -2384,33 +2387,45 @@ function createIframe({
   document.body.appendChild(iframe);
   return iframe;
 }
-function setupButtonClickHandler(button, iframe, wallet, originalWallet) {
+function sendInitializeData(wallet, originalWallet) {
   return __async(this, null, function* () {
-    var _a;
+    var _a, _b;
+    yield delay(1e3);
     const accountId = (_a = yield wallet == null ? void 0 : wallet.getAccounts()) == null ? void 0 : _a[0].accountId;
     const originalAccountId = originalWallet.account;
     const originalPublicKey = yield originalWallet.getPublicKey();
+    const iframe = document.getElementById("satoshi-wallet-iframe");
+    if ((iframe == null ? void 0 : iframe.contentWindow) && ((_b = iframe.contentDocument) == null ? void 0 : _b.readyState) === "complete") {
+      iframe.contentWindow.postMessage({
+        action: "initializeData",
+        success: true,
+        data: {
+          accountId,
+          originalAccountId,
+          originalPublicKey
+        }
+      });
+    }
+  });
+}
+function setupButtonClickHandler(button, iframe, wallet, originalWallet) {
+  return __async(this, null, function* () {
+    iframe.onload = () => sendInitializeData(wallet, originalWallet);
     const iframeSrc = new URL(iframe.src);
     iframeSrc.searchParams.set("origin", window.location.origin);
-    if (accountId)
-      iframeSrc.searchParams.set("accountId", accountId);
-    if (originalAccountId)
-      iframeSrc.searchParams.set("originalAccountId", originalAccountId);
-    if (originalPublicKey)
-      iframeSrc.searchParams.set("originalPublicKey", originalPublicKey);
     iframe.src = iframeSrc.toString();
     window.addEventListener("message", (event) => __async(this, null, function* () {
-      var _a2, _b;
+      var _a, _b;
       if (event.origin !== iframeSrc.origin)
         return;
-      const { action, requestId, params } = event.data;
+      const { action, requestId, data } = event.data;
       if (action === "signAndSendTransaction") {
         try {
-          const result = yield wallet.signAndSendTransaction(params);
-          (_a2 = event.source) == null ? void 0 : _a2.postMessage(
+          const result = yield wallet.signAndSendTransaction(data);
+          (_a = event.source) == null ? void 0 : _a.postMessage(
             {
               requestId,
-              result,
+              data,
               success: true
             },
             { targetOrigin: event.origin }
@@ -2516,11 +2531,8 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
         const accountId = state.getAccount();
         initWalletButton(options.network.networkId, accountId, wallet);
         context.on("updatePublicKey", (btcPublicKey) => __async(void 0, null, function* () {
-          const { nearTempAddress, nearTempPublicKey } = yield getNearAccountByBtcPublicKey(btcPublicKey);
-          removeWalletButton();
-          setTimeout(() => {
-            initWalletButton(options.network.networkId, nearTempAddress, wallet);
-          }, 1e3);
+          const { nearTempAddress } = yield getNearAccountByBtcPublicKey(btcPublicKey);
+          initWalletButton(options.network.networkId, nearTempAddress, wallet);
           emitter.emit("accountsChanged", {
             accounts: [
               {
@@ -2535,7 +2547,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
           });
         }));
         if ("autoConnect" in metadata && metadata.autoConnect && localStorage.getItem("near-wallet-selector:selectedWalletId") === '"btc-wallet"') {
-          btcContext.autoConnect();
+          yield btcContext.autoConnect();
         }
         clearInterval(inter);
       }
@@ -2588,6 +2600,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       const btcAccount = yield btcContext.login();
       const btcPublicKey = yield btcContext.getPublicKey();
       const { nearTempAddress, nearTempPublicKey } = yield getNearAccountByBtcPublicKey(btcPublicKey);
+      initWalletButton(options.network.networkId, accountId, wallet);
       return [
         {
           accountId: nearTempAddress,
@@ -2771,17 +2784,20 @@ function toHex(originalString) {
   return hexString;
 }
 function initWalletButton(network, accountId, wallet) {
-  const checkAndSetupWalletButton = () => {
-    if (accountId && window.btcContext.account) {
-      setupWalletButton(network, wallet, window.btcContext);
-    } else {
-      removeWalletButton();
-      setTimeout(() => {
+  return __async(this, null, function* () {
+    yield delay(2e3);
+    const checkAndSetupWalletButton = () => {
+      if (accountId && window.btcContext.account) {
+        setupWalletButton(network, wallet, window.btcContext);
+      } else {
+        removeWalletButton();
+      }
+      !window.btcContext.account && setTimeout(() => {
         checkAndSetupWalletButton();
-      }, 5e3);
-    }
-  };
-  checkAndSetupWalletButton();
+      }, 1e4);
+    };
+    checkAndSetupWalletButton();
+  });
 }
 var rcpUrls = {
   mainnet: [
@@ -2796,9 +2812,6 @@ var rcpUrls = {
     "https://near-testnet.drpc.org"
   ]
 };
-function delay(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
 function pollTransactionStatuses(network, hashes) {
   return __async(this, null, function* () {
     const provider = new providers.FailoverRpcProvider(
@@ -2831,7 +2844,7 @@ function pollTransactionStatuses(network, hashes) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.0.7";
+  return "0.0.9";
 };
 if (typeof window !== "undefined") {
   window.__PARTICLE_BTC_CONNECT_VERSION = getVersion();