btc-wallet 0.5.26-beta → 0.5.28-beta

package/README.md

@@ -43,6 +43,7 @@ setupWalletSelectorModal(selector, {
 
 // 3. Wrap your app with BtcWalletSelectorContextProvider
 import { BtcWalletSelectorContextProvider } from 'btc-wallet';
+import '@near-wallet-selector/modal-ui/styles.css';
 
 function App() {
   return (

package/dist/core/btcWalletSelectorContext.d.ts

@@ -1,5 +1,4 @@
 import React from 'react';
-import 'ref-modal-ui/styles.css';
 export declare function BtcWalletSelectorContextProvider({ children, }: {
     children: React.ReactNode;
     autoConnect?: boolean;

package/dist/index.js

@@ -24,18 +24,6 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -1742,17 +1730,6 @@ var copy_default = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My
 
 // src/utils/ethereumUtils.ts
 var import_util2 = require("@ethereumjs/util");
-var import_bitcore_lib = __toESM(require("bitcore-lib"), 1);
-var pubKeyToEVMAddress = (pubKey) => {
-  const address = (0, import_util2.toChecksumAddress)((0, import_util2.bytesToHex)((0, import_util2.publicToAddress)((0, import_util2.toBytes)(`0x${pubKey}`), true)));
-  return address;
-};
-var convertSignature = (signature) => {
-  const sig = import_bitcore_lib.default.crypto.Signature.fromCompact(Buffer.from(signature, "base64"));
-  const v = BigInt(sig.i + 27);
-  const evmSig = (0, import_util2.toRpcSig)(v, sig.r.toBuffer(), sig.s.toBuffer());
-  return evmSig;
-};
 function caculateNativeFee(userOp) {
   return (BigInt(userOp.callGasLimit) + BigInt(userOp.verificationGasLimit) + BigInt(userOp.preVerificationGas)) * BigInt(userOp.maxFeePerGas);
 }
@@ -2288,7 +2265,6 @@ var SignModal = ({
 var signModal_default = SignModal;
 
 // src/evmSigner/index.ts
-var import_util3 = require("@ethereumjs/util");
 var import_chains3 = require("@particle-network/chains");
 var import_events4 = require("events");
 var import_viem4 = require("viem");
@@ -2331,61 +2307,13 @@ var AASignerProvider = class {
   }
   request(arg) {
     return __async(this, null, function* () {
-      var _a, _b;
       if (arg.method === "eth_sendTransaction" || arg.method === "wallet_addEthereumChain" || arg.method === "wallet_watchAsset" || arg.method === "eth_sign") {
-        throw new import_viem4.UnsupportedProviderMethodError(new Error("The Provider does not support the requested method."));
-      }
-      if (arg.method === "eth_accounts" || arg.method === "eth_requestAccounts") {
-        const pubKey = yield this.getPublicKey();
-        const address = pubKeyToEVMAddress(pubKey);
-        return [address];
-      } else if (arg.method === "eth_chainId") {
-        return `0x${this.chainId.toString(16)}`;
-      } else if (arg.method === "personal_sign" /* personalSign */) {
-        let message = (_a = arg.params) == null ? void 0 : _a[0];
-        console.log("personal_sign message:", message);
-        if (message.length !== 66) {
-          const hash = (0, import_viem4.hashMessage)({ raw: message });
-          console.log("personal_sign hash:", hash);
-          message = hash;
-        }
-        const result = yield this.personalSign(message || "");
-        const convertResult = convertSignature(result);
-        if (!convertResult) {
-          throw new Error("sign error");
-        }
-        console.log(`personal_sign result(${convertResult.length}): `, convertResult);
-        return convertResult;
-      } else if (arg.method === "eth_signTypedData" || arg.method === "eth_signTypedData_v4") {
-        const typedData = (_b = arg.params) == null ? void 0 : _b[1];
-        console.log("signTypedData typedData", typedData);
-        const hash = (0, import_viem4.hashTypedData)(typeof typedData === "string" ? JSON.parse(typedData) : typedData);
-        console.log("signTypedData hash", hash);
-        const result = yield this.personalSign(hash || "");
-        const convertResult = convertSignature(result);
-        if (!convertResult) {
-          throw new Error("sign error");
-        }
-        console.log(`eth_signTypedData result(${convertResult.length}): `, convertResult);
-        return convertResult;
-      } else if (arg.method === "wallet_switchEthereumChain") {
-        if (arg.params && arg.params instanceof Array && arg.params[0] && arg.params[0].chainId) {
-          const chainId = Number(arg.params[0].chainId);
-          if (this.supportChainIds.includes(this.chainId)) {
-            this.chainId = chainId;
-            localStorage.setItem("connect-evm-chain-id", this.chainId.toString());
-            this.publicClient = this.getPublicClient();
-            setTimeout(() => this.events.emit("chainChanged", (0, import_util3.intToHex)(this.chainId)), 0);
-            return Promise.resolve(null);
-          }
-          throw new import_viem4.SwitchChainError(new Error(`The chain: ${chainId} is not supported`));
-        } else {
-          throw new import_viem4.InvalidParamsRpcError(new Error("Invalid Params"));
-        }
-      } else {
-        const result = yield this.publicClient.request(arg);
-        return result;
+        throw new import_viem4.UnsupportedProviderMethodError(
+          new Error("The Provider does not support the requested method.")
+        );
       }
+      const result = yield this.publicClient.request(arg);
+      return result;
     });
   }
   removeListener(event, listener) {
@@ -2760,7 +2688,6 @@ function ComfirmBox({ onClose, status = 1, fromChain = {
 }
 
 // src/core/btcWalletSelectorContext.tsx
-var import_styles = require("ref-modal-ui/styles.css");
 var import_jsx_runtime12 = require("react/jsx-runtime");
 var WalletSelectorContext = import_react11.default.createContext(null);
 function BtcWalletSelectorContextProvider({
@@ -4257,13 +4184,13 @@ function getWithdrawTransaction(_0) {
     const config = getWalletConfig(env);
     const _btcAddress = btcAddress || getBtcProvider().account;
     const _csna = csna || (yield getCsnaAccountId(env));
-    const _a = yield calculateWithdraw({
+    const { inputs, outputs, isError, errorMsg, fromAmount, gasFee } = yield calculateWithdraw({
       amount,
       feeRate,
       csna: _csna,
       btcAddress: _btcAddress,
       env
-    }), { inputs, outputs, isError, errorMsg } = _a, rest = __objRest(_a, ["inputs", "outputs", "isError", "errorMsg"]);
+    });
     if (isError || !inputs || !outputs) {
       throw new Error(errorMsg);
     }
@@ -4271,7 +4198,7 @@ function getWithdrawTransaction(_0) {
     console.log("outputs:", JSON.stringify(outputs));
     console.log("inputs - outputs = gas");
     console.log(
-      `(${inputs.map((item) => item.value).join(" + ")}) - (${outputs.map((item) => item.value).join(" + ")}) = ${rest.gasFee}`
+      `(${inputs.map((item) => item.value).join(" + ")}) - (${outputs.map((item) => item.value).join(" + ")}) = ${gasFee}`
     );
     const network = yield getNetwork();
     const btcNetwork = network === "mainnet" ? import_bitcoinjs_lib.default.networks.bitcoin : import_bitcoinjs_lib.default.networks.testnet;
@@ -4324,7 +4251,7 @@ function getWithdrawTransaction(_0) {
             methodName: "ft_transfer_call",
             args: {
               receiver_id: config.bridgeContractId,
-              amount: amount.toString(),
+              amount: fromAmount,
               msg: JSON.stringify(msg)
             },
             gas: "300000000000000",
@@ -4970,7 +4897,7 @@ function getGroup(state) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.26-beta";
+  return "0.5.28-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();