btc-wallet 0.0.6 → 0.0.8

package/dist/utils/initWalletButton.d.ts

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

package/dist/utils/setupBTCWallet.d.ts

@@ -1,5 +1,5 @@
-import type { InjectedWallet, WalletModuleFactory } from "@near-wallet-selector/core";
-import type { useBtcWalletSelector } from "./../components/btcWalletSelectorContext";
+import type { InjectedWallet, WalletModuleFactory } from '@near-wallet-selector/core';
+import type { useBtcWalletSelector } from './../components/btcWalletSelectorContext';
 declare global {
     interface Window {
         btcContext: ReturnType<typeof useBtcWalletSelector>;

package/esm/index.js

@@ -1812,12 +1812,12 @@ var ConnectProvider = ({
     version: ((_c = options.aaOptions.accountContracts[((_b = Object.keys(options.aaOptions.accountContracts)) == null ? void 0 : _b[0]) || "BTC"]) == null ? void 0 : _c[0].version) || "1.0.0"
   });
   const setAccountContract = useCallback7(
-    (config) => {
-      if (!checkBTCVersion(options.aaOptions.accountContracts, config.name, config.version)) {
+    (config2) => {
+      if (!checkBTCVersion(options.aaOptions.accountContracts, config2.name, config2.version)) {
         throw new Error("Invalid Account Contract");
       }
-      localStorage.setItem(SAContractKey, JSON.stringify(config));
-      _setAccountContract(config);
+      localStorage.setItem(SAContractKey, JSON.stringify(config2));
+      _setAccountContract(config2);
     },
     [options.aaOptions.accountContracts, _setAccountContract]
   );
@@ -1976,9 +1976,9 @@ var ConnectProvider = ({
     setConnectorId(void 0);
   }, [connector]);
   useEffect5(() => {
-    const config = JSON.parse(localStorage.getItem(SAContractKey) || "{}");
-    if (config.name && config.version && checkBTCVersion(options.aaOptions.accountContracts, config.name, config.version)) {
-      _setAccountContract(config);
+    const config2 = JSON.parse(localStorage.getItem(SAContractKey) || "{}");
+    if (config2.name && config2.version && checkBTCVersion(options.aaOptions.accountContracts, config2.name, config2.version)) {
+      _setAccountContract(config2);
     }
   }, [options.aaOptions.accountContracts, _setAccountContract]);
   useEffect5(() => {
@@ -2307,13 +2307,9 @@ function sleep(time) {
 
 // src/utils/setupBTCWallet.ts
 import { providers, transactions } from "near-api-js";
-import {
-  actionCreators
-} from "@near-js/transactions";
+import { actionCreators } from "@near-js/transactions";
 import { PublicKey } from "near-api-js/lib/utils/key_pair";
-import {
-  encodeTransaction
-} from "near-api-js/lib/transaction";
+import { encodeTransaction } from "near-api-js/lib/transaction";
 import { baseDecode } from "@near-js/utils";
 import bs58 from "bs58";
 import { sha256 } from "js-sha256";
@@ -2441,10 +2437,19 @@ function removeWalletButton() {
 }
 
 // src/utils/setupBTCWallet.ts
-var { signedDelegate, transfer, functionCall } = actionCreators;
-var base_url = "https://api.dev.satoshibridge.top/v1";
-var token = "nbtc1-nsp.testnet";
-var contractId = "dev1-nsp.testnet";
+var { transfer, functionCall } = actionCreators;
+var config = {
+  testnet: {
+    base_url: "https://api.testnet.satoshibridge.top/v1",
+    token: "nbtc2-nsp.testnet",
+    contractId: "dev2-nsp.testnet"
+  },
+  mainnet: {
+    base_url: "https://api.mainnet.satoshibridge.top/v1",
+    token: "",
+    contractId: ""
+  }
+};
 var state = {
   saveAccount(account) {
     window.localStorage.setItem("btc-wallet-account", account);
@@ -2511,14 +2516,9 @@ 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();
+          const { nearTempAddress } = yield getNearAccountByBtcPublicKey(btcPublicKey);
           setTimeout(() => {
-            initWalletButton(
-              options.network.networkId,
-              nearTempAddress,
-              wallet
-            );
+            initWalletButton(options.network.networkId, nearTempAddress, wallet);
           }, 1e3);
           emitter.emit("accountsChanged", {
             accounts: [
@@ -2534,20 +2534,17 @@ 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);
       }
     }), 500);
   }
   function viewMethod(_02) {
-    return __async(this, arguments, function* ({
-      method,
-      args = {}
-    }) {
+    return __async(this, arguments, function* ({ method, args = {} }) {
       const res = yield provider.query({
         request_type: "call_function",
-        account_id: contractId,
+        account_id: config[options.network.networkId].contractId,
         method_name: method,
         args_base64: Buffer.from(JSON.stringify(args)).toString("base64"),
         finality: "optimistic"
@@ -2575,7 +2572,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
     });
   }
   function signIn(_02) {
-    return __async(this, arguments, function* ({ contractId: contractId2, methodNames }) {
+    return __async(this, arguments, function* ({ contractId, methodNames }) {
       const accountId = state.getAccount();
       const publicKey = state.getPublicKey();
       const btcContext = window.btcContext;
@@ -2649,11 +2646,11 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
         nonce: BigInt(rawAccessKey.nonce || 0)
       });
       const publicKeyFormat = PublicKey.from(publicKey);
-      const nearNonceApi = yield getNearNonceFromApi(accountId);
+      const nearNonceApi = yield getNearNonceFromApi(options.network.networkId, accountId);
       const newTransactions = params.transactions.map((transaction, index) => {
         let nearNonceNumber = accessKey.nonce + BigInt(1);
         if (nearNonceApi) {
-          nearNonceNumber = Number(nearNonceApi.result_data) > nearNonceNumber ? BigInt(Number(nearNonceApi.result_data)) : nearNonceNumber;
+          nearNonceNumber = BigInt(nearNonceApi.result_data) > nearNonceNumber ? BigInt(nearNonceApi.result_data) : nearNonceNumber;
         }
         const newActions = transaction.actions.map((action) => {
           switch (action.type) {
@@ -2677,8 +2674,10 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
           baseDecode(header.hash)
         );
         const txBytes = encodeTransaction(_transaction);
-        const txHex = Array.from(txBytes, (byte) => ("0" + (byte & 255).toString(16)).slice(-2)).join("");
-        ;
+        const txHex = Array.from(
+          txBytes,
+          (byte) => ("0" + (byte & 255).toString(16)).slice(-2)
+        ).join("");
         const hash = bs58.encode(new Uint8Array(sha256.array(txBytes)));
         return { txBytes, txHex, hash };
       });
@@ -2686,29 +2685,26 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
         method: "get_account",
         args: { account_id: accountId }
       });
-      const nonceApi = yield getNonceFromApi(accountId);
-      const nonce = (nonceApi == null ? void 0 : nonceApi.result_data) ? Number(nonceApi == null ? void 0 : nonceApi.result_data) : accountInfo.nonce;
+      const nonceApi = yield getNonceFromApi(options.network.networkId, accountId);
+      const nonce = Number(nonceApi == null ? void 0 : nonceApi.result_data) > Number(accountInfo.nonce) ? String(nonceApi == null ? void 0 : nonceApi.result_data) : String(accountInfo.nonce);
       const intention = {
         chain_id: "397",
         csna: accountId,
         near_transactions: newTransactions.map((t) => t.txHex),
-        gas_token: token,
+        gas_token: config[options.network.networkId].token,
         gas_limit: "3000",
-        nonce: Number(nonce).toString()
+        nonce
       };
       const strIntention = JSON.stringify(intention);
       const signature = yield btcContext.signMessage(strIntention);
-      const result = yield uploadBTCTx({
+      const result = yield uploadBTCTx(options.network.networkId, {
         sig: signature,
         btcPubKey: state.getBtcPublicKey(),
         data: toHex(strIntention)
       });
       if (result.result_code === 0) {
         const hash = newTransactions.map((t) => t.hash);
-        const result2 = yield pollTransactionStatuses(
-          options.network.networkId,
-          hash
-        );
+        const result2 = yield pollTransactionStatuses(options.network.networkId, hash);
         return result2;
       } else {
         return null;
@@ -2717,24 +2713,24 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
   }
   return wallet;
 });
-function getNonceFromApi(accountId) {
-  return fetch(`${base_url}/nonce?csna=${accountId}`, {
+function getNonceFromApi(network, accountId) {
+  return fetch(`${config[network].base_url}/nonce?csna=${accountId}`, {
     method: "GET",
     headers: {
       "Content-Type": "application/json"
     }
   }).then((res) => res.json());
 }
-function getNearNonceFromApi(accountId) {
-  return fetch(`${base_url}/nonceNear?csna=${accountId}`, {
+function getNearNonceFromApi(network, accountId) {
+  return fetch(`${config[network].base_url}/nonceNear?csna=${accountId}`, {
     method: "GET",
     headers: {
       "Content-Type": "application/json"
     }
   }).then((res) => res.json());
 }
-function uploadBTCTx(data) {
-  return fetch(`${base_url}/receiveTransaction`, {
+function uploadBTCTx(network, data) {
+  return fetch(`${config[network].base_url}/receiveTransaction`, {
     method: "POST",
     headers: {
       "Content-Type": "application/json"
@@ -2775,13 +2771,13 @@ function toHex(originalString) {
 }
 function initWalletButton(network, accountId, wallet) {
   const checkAndSetupWalletButton = () => {
-    if (accountId && window.btcContext.account) {
+    if (accountId) {
       setupWalletButton(network, wallet, window.btcContext);
-    } else {
-      removeWalletButton();
-      setTimeout(() => {
+      !window.btcContext.account && setTimeout(() => {
         checkAndSetupWalletButton();
       }, 5e3);
+    } else {
+      removeWalletButton();
     }
   };
   checkAndSetupWalletButton();
@@ -2834,7 +2830,7 @@ function pollTransactionStatuses(network, hashes) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.0.6";
+  return "0.0.8";
 };
 if (typeof window !== "undefined") {
   window.__PARTICLE_BTC_CONNECT_VERSION = getVersion();