@gardenfi/wallet-connectors 2.0.10 → 2.0.11-beta.2

package/dist/index4.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("@catalogfi/utils"),p={testnet:{Mempool:"https://mempool.space/testnet4"},mainnet:{Mempool:"https://mempool.space",Blockstream:"https://blockstream.info"}},u=async(n,m)=>{const t=p[m];if(!t)return o.Err("Invalid network");const r="Blockstream"in t?`${t.Blockstream}/api/address/${n}`:null,a=`${t.Mempool}/api/address/${n}`;try{const s=r?[r,a]:[a],e=await o.Fetcher.getWithFallback(s,{retryCount:3,retryDelay:1e3}),c=e.chain_stats.funded_txo_sum-e.chain_stats.spent_txo_sum,l=e.mempool_stats.funded_txo_sum-e.mempool_stats.spent_txo_sum,i=c+l;return o.Ok({confirmed:c,unconfirmed:l,total:i})}catch(s){return o.Err("Error while fetching balance",s)}};exports.getBalance=u;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("@catalogfi/utils"),p={testnet:{Mempool:"https://mempool.space/testnet4"},mainnet:{Mempool:"https://mempool.space",Blockstream:"https://blockstream.info"},localnet:{Mempool:"http://localhost:30000"}},u=async(n,m)=>{const t=p[m];if(!t)return o.Err("Invalid network");const r="Blockstream"in t?`${t.Blockstream}/api/address/${n}`:null,a=`${t.Mempool}/api/address/${n}`;try{const s=r?[r,a]:[a],e=await o.Fetcher.getWithFallback(s,{retryCount:3,retryDelay:1e3}),l=e.chain_stats.funded_txo_sum-e.chain_stats.spent_txo_sum,c=e.mempool_stats.funded_txo_sum-e.mempool_stats.spent_txo_sum,i=l+c;return o.Ok({confirmed:l,unconfirmed:c,total:i})}catch(s){return o.Err("Error while fetching balance",s)}};exports.getBalance=u;

package/dist/index4.js

@@ -1,25 +1,28 @@
-import { Err as l, Fetcher as p, Ok as u } from "@catalogfi/utils";
-const h = {
+import { Err as l, Fetcher as i, Ok as h } from "@catalogfi/utils";
+const u = {
   testnet: {
     Mempool: "https://mempool.space/testnet4"
   },
   mainnet: {
     Mempool: "https://mempool.space",
     Blockstream: "https://blockstream.info"
+  },
+  localnet: {
+    Mempool: "http://localhost:30000"
   }
 }, d = async (s, m) => {
-  const t = h[m];
+  const t = u[m];
   if (!t) return l("Invalid network");
-  const n = "Blockstream" in t ? `${t.Blockstream}/api/address/${s}` : null, r = `${t.Mempool}/api/address/${s}`;
+  const n = "Blockstream" in t ? `${t.Blockstream}/api/address/${s}` : null, a = `${t.Mempool}/api/address/${s}`;
   try {
-    const e = n ? [n, r] : [r], o = await p.getWithFallback(e, {
+    const e = n ? [n, a] : [a], o = await i.getWithFallback(e, {
       retryCount: 3,
       retryDelay: 1e3
-    }), a = o.chain_stats.funded_txo_sum - o.chain_stats.spent_txo_sum, c = o.mempool_stats.funded_txo_sum - o.mempool_stats.spent_txo_sum, i = a + c;
-    return u({
-      confirmed: a,
+    }), r = o.chain_stats.funded_txo_sum - o.chain_stats.spent_txo_sum, c = o.mempool_stats.funded_txo_sum - o.mempool_stats.spent_txo_sum, p = r + c;
+    return h({
+      confirmed: r,
       unconfirmed: c,
-      total: i
+      total: p
     });
   } catch (e) {
     return l("Error while fetching balance", e);

package/dist/index7.cjs

@@ -1 +1 @@
-"use strict";var f=r=>{throw TypeError(r)};var g=(r,t,e)=>t.has(r)||f("Cannot "+e);var i=(r,t,e)=>(g(r,t,"read from private field"),e?e.call(r):t.get(r)),w=(r,t,e)=>t.has(r)?f("Cannot add the same private member more than once"):t instanceof WeakSet?t.add(r):t.set(r,e),P=(r,t,e,n)=>(g(r,t,"write to private field"),n?n.call(r,e):t.set(r,e),e);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("@catalogfi/utils"),y=require("bitcoinjs-lib"),A=require("tiny-secp256k1"),c=require("@gardenfi/utils"),a=require("./index3.cjs"),u=require("@catalogfi/wallets");function p(r){const t=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(r){for(const e in r)if(e!=="default"){const n=Object.getOwnPropertyDescriptor(r,e);Object.defineProperty(t,e,n.get?n:{enumerable:!0,get:()=>r[e]})}}return t.default=r,Object.freeze(t)}const d=p(y),x=p(A);y.initEccLib(x);var o;class O{constructor(t){w(this,o);this.address="",this.id=a.WALLET_CONFIG.Phantom.id,this.name=a.WALLET_CONFIG.Phantom.name,this.icon=a.WALLET_CONFIG.Phantom.icon,this.disconnect=()=>(this.address="",Promise.resolve(s.Ok("Disconnected Phantom wallet"))),P(this,o,t)}async connect(t){if(t||(t=c.Network.MAINNET),t===c.Network.TESTNET)return s.Err("Phantom wallet does not support testnet");try{const e=await i(this,o).requestAccounts();for(const n of e)n.purpose==="payment"&&(this.address=n.address);return this.address===""?s.Err("Could not connect to Phantom bitcoin payment account"):s.Ok({address:this.address,provider:this,network:t,id:a.WALLET_CONFIG.Phantom.id})}catch(e){return s.Err("Error while connecting to Phantom wallet: "+e)}}async requestAccounts(){return await s.executeWithTryCatch(async()=>{const t=await i(this,o).requestAccounts();return t.length>0&&(this.address=t[0].address),t.map(e=>e.address)},"Error while requesting accounts from Phantom wallet")}async getAccounts(){return this.requestAccounts()}async getNetwork(){return s.Ok(c.Network.MAINNET)}async switchNetwork(){return s.Err("Phantom wallet does not support testnet")}async getBalance(){return await s.executeWithTryCatch(async()=>await i(this,o).getBalance(),"Error while getting balance from Phantom wallet")}async sendBitcoin(t,e){return await s.executeWithTryCatch(async()=>{const n=d.networks.bitcoin,h=new u.BitcoinProvider(u.BitcoinNetwork.Mainnet);try{const{txHex:l,utxoCount:b}=await u.BitcoinWallet.generateUnsignedPSBT(h,n,this.address,t,e),T=await i(this,o).signPSBT(this.fromHexString(l),{inputsToSign:[{address:this.address,signingIndexes:Array.from({length:b},(q,N)=>N),sigHash:d.Transaction.SIGHASH_ALL}]}),m=d.Psbt.fromBuffer(Buffer.from(T)).extractTransaction(),E=m.getId();return await h.broadcast(m.toHex()),E}catch{throw new Error("Failed to send bitcoin")}},"Error while sending bitcoin from Phantom wallet")}fromHexString(t){return Uint8Array.from(t.match(/.{1,2}/g).map(e=>parseInt(e,16)))}on(t,e){i(this,o).on(t,e)}off(t,e){i(this,o).off(t,e)}}o=new WeakMap;exports.PhantomProvider=O;
+"use strict";var f=r=>{throw TypeError(r)};var w=(r,t,e)=>t.has(r)||f("Cannot "+e);var i=(r,t,e)=>(w(r,t,"read from private field"),e?e.call(r):t.get(r)),g=(r,t,e)=>t.has(r)?f("Cannot add the same private member more than once"):t instanceof WeakSet?t.add(r):t.set(r,e),P=(r,t,e,n)=>(w(r,t,"write to private field"),n?n.call(r,e):t.set(r,e),e);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("@catalogfi/utils"),y=require("bitcoinjs-lib"),A=require("tiny-secp256k1"),a=require("@gardenfi/utils"),c=require("./index3.cjs"),u=require("@catalogfi/wallets"),x=require("./index4.cjs");function p(r){const t=Object.create(null,{[Symbol.toStringTag]:{value:"Module"}});if(r){for(const e in r)if(e!=="default"){const n=Object.getOwnPropertyDescriptor(r,e);Object.defineProperty(t,e,n.get?n:{enumerable:!0,get:()=>r[e]})}}return t.default=r,Object.freeze(t)}const d=p(y),O=p(A);y.initEccLib(O);var o;class q{constructor(t){g(this,o);this.address="",this.id=c.WALLET_CONFIG.Phantom.id,this.name=c.WALLET_CONFIG.Phantom.name,this.icon=c.WALLET_CONFIG.Phantom.icon,this.disconnect=()=>(this.address="",Promise.resolve(s.Ok("Disconnected Phantom wallet"))),P(this,o,t)}async connect(t){if(t||(t=a.Network.MAINNET),t===a.Network.TESTNET)return s.Err("Phantom wallet does not support testnet");try{const e=await i(this,o).requestAccounts();for(const n of e)n.purpose==="payment"&&(this.address=n.address);return this.address===""?s.Err("Could not connect to Phantom bitcoin payment account"):s.Ok({address:this.address,provider:this,network:t,id:c.WALLET_CONFIG.Phantom.id})}catch(e){return s.Err("Error while connecting to Phantom wallet: "+e)}}async requestAccounts(){return await s.executeWithTryCatch(async()=>{const t=await i(this,o).requestAccounts();return t.length>0&&(this.address=t[0].address),t.map(e=>e.address)},"Error while requesting accounts from Phantom wallet")}async getAccounts(){return this.requestAccounts()}async getNetwork(){return s.Ok(a.Network.MAINNET)}async switchNetwork(){return s.Err("Phantom wallet does not support testnet")}async getBalance(){return await s.executeWithTryCatch(async()=>{const t=await x.getBalance(this.address,a.Network.MAINNET);if(t.ok&&t.val)return t.val;throw new Error(t.error)},"Error while getting balance from Phantom wallet")}async sendBitcoin(t,e){return await s.executeWithTryCatch(async()=>{const n=d.networks.bitcoin,h=new u.BitcoinProvider(u.BitcoinNetwork.Mainnet);try{const{txHex:l,utxoCount:b}=await u.BitcoinWallet.generateUnsignedPSBT(h,n,this.address,t,e),E=await i(this,o).signPSBT(this.fromHexString(l),{inputsToSign:[{address:this.address,signingIndexes:Array.from({length:b},(S,N)=>N),sigHash:d.Transaction.SIGHASH_ALL}]}),m=d.Psbt.fromBuffer(Buffer.from(E)).extractTransaction(),T=m.getId();return await h.broadcast(m.toHex()),T}catch{throw new Error("Failed to send bitcoin")}},"Error while sending bitcoin from Phantom wallet")}fromHexString(t){return Uint8Array.from(t.match(/.{1,2}/g).map(e=>parseInt(e,16)))}on(t,e){i(this,o).on(t,e)}off(t,e){i(this,o).off(t,e)}}o=new WeakMap;exports.PhantomProvider=q;

package/dist/index7.js

@@ -2,41 +2,42 @@ var w = (n) => {
   throw TypeError(n);
 };
 var g = (n, t, r) => t.has(n) || w("Cannot " + r);
-var o = (n, t, r) => (g(n, t, "read from private field"), r ? r.call(n) : t.get(n)), p = (n, t, r) => t.has(n) ? w("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(n) : t.set(n, r), P = (n, t, r, s) => (g(n, t, "write to private field"), s ? s.call(n, r) : t.set(n, r), r);
-import { Ok as c, Err as i, executeWithTryCatch as d } from "@catalogfi/utils";
-import * as h from "bitcoinjs-lib";
-import { initEccLib as E } from "bitcoinjs-lib";
-import * as T from "tiny-secp256k1";
-import { Network as m } from "@gardenfi/utils";
-import { WALLET_CONFIG as a } from "./index3.js";
-import { BitcoinProvider as B, BitcoinNetwork as N, BitcoinWallet as I } from "@catalogfi/wallets";
-E(T);
-var e;
-class W {
+var s = (n, t, r) => (g(n, t, "read from private field"), r ? r.call(n) : t.get(n)), p = (n, t, r) => t.has(n) ? w("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(n) : t.set(n, r), P = (n, t, r, e) => (g(n, t, "write to private field"), e ? e.call(n, r) : t.set(n, r), r);
+import { Ok as d, Err as i, executeWithTryCatch as h } from "@catalogfi/utils";
+import * as m from "bitcoinjs-lib";
+import { initEccLib as T } from "bitcoinjs-lib";
+import * as x from "tiny-secp256k1";
+import { Network as a } from "@gardenfi/utils";
+import { WALLET_CONFIG as c } from "./index3.js";
+import { BitcoinProvider as N, BitcoinNetwork as B, BitcoinWallet as I } from "@catalogfi/wallets";
+import { getBalance as v } from "./index4.js";
+T(x);
+var o;
+class F {
   constructor(t) {
-    p(this, e);
-    this.address = "", this.id = a.Phantom.id, this.name = a.Phantom.name, this.icon = a.Phantom.icon, this.disconnect = () => (this.address = "", Promise.resolve(c("Disconnected Phantom wallet"))), P(this, e, t);
+    p(this, o);
+    this.address = "", this.id = c.Phantom.id, this.name = c.Phantom.name, this.icon = c.Phantom.icon, this.disconnect = () => (this.address = "", Promise.resolve(d("Disconnected Phantom wallet"))), P(this, o, t);
   }
   async connect(t) {
-    if (t || (t = m.MAINNET), t === m.TESTNET)
+    if (t || (t = a.MAINNET), t === a.TESTNET)
       return i("Phantom wallet does not support testnet");
     try {
-      const r = await o(this, e).requestAccounts();
-      for (const s of r)
-        s.purpose === "payment" && (this.address = s.address);
-      return this.address === "" ? i("Could not connect to Phantom bitcoin payment account") : c({
+      const r = await s(this, o).requestAccounts();
+      for (const e of r)
+        e.purpose === "payment" && (this.address = e.address);
+      return this.address === "" ? i("Could not connect to Phantom bitcoin payment account") : d({
         address: this.address,
         provider: this,
         network: t,
-        id: a.Phantom.id
+        id: c.Phantom.id
       });
     } catch (r) {
       return i("Error while connecting to Phantom wallet: " + r);
     }
   }
   async requestAccounts() {
-    return await d(async () => {
-      const t = await o(this, e).requestAccounts();
+    return await h(async () => {
+      const t = await s(this, o).requestAccounts();
       return t.length > 0 && (this.address = t[0].address), t.map((r) => r.address);
     }, "Error while requesting accounts from Phantom wallet");
   }
@@ -45,39 +46,44 @@ class W {
   }
   // bitcoin testnet is not supported in Phantom wallet
   async getNetwork() {
-    return c(m.MAINNET);
+    return d(a.MAINNET);
   }
   async switchNetwork() {
     return i("Phantom wallet does not support testnet");
   }
   async getBalance() {
-    return await d(async () => await o(this, e).getBalance(), "Error while getting balance from Phantom wallet");
+    return await h(async () => {
+      const t = await v(this.address, a.MAINNET);
+      if (t.ok && t.val)
+        return t.val;
+      throw new Error(t.error);
+    }, "Error while getting balance from Phantom wallet");
   }
   async sendBitcoin(t, r) {
-    return await d(async () => {
-      const s = h.networks.bitcoin, u = new B(N.Mainnet);
+    return await h(async () => {
+      const e = m.networks.bitcoin, u = new N(B.Mainnet);
       try {
         const { txHex: f, utxoCount: y } = await I.generateUnsignedPSBT(
           u,
-          s,
+          e,
           this.address,
           t,
           r
-        ), b = await o(this, e).signPSBT(
+        ), E = await s(this, o).signPSBT(
           this.fromHexString(f),
           {
             inputsToSign: [
               {
                 address: this.address,
                 signingIndexes: Array.from({ length: y }, (H, A) => A),
-                sigHash: h.Transaction.SIGHASH_ALL
+                sigHash: m.Transaction.SIGHASH_ALL
               }
             ]
           }
-        ), l = h.Psbt.fromBuffer(
-          Buffer.from(b)
-        ).extractTransaction(), x = l.getId();
-        return await u.broadcast(l.toHex()), x;
+        ), l = m.Psbt.fromBuffer(
+          Buffer.from(E)
+        ).extractTransaction(), b = l.getId();
+        return await u.broadcast(l.toHex()), b;
       } catch {
         throw new Error("Failed to send bitcoin");
       }
@@ -89,13 +95,13 @@ class W {
     );
   }
   on(t, r) {
-    o(this, e).on(t, r);
+    s(this, o).on(t, r);
   }
   off(t, r) {
-    o(this, e).off(t, r);
+    s(this, o).off(t, r);
   }
 }
-e = new WeakMap();
+o = new WeakMap();
 export {
-  W as PhantomProvider
+  F as PhantomProvider
 };

package/dist/src/bitcoin/providers/keplr/provider.d.ts

@@ -13,7 +13,7 @@ export declare class KeplrProvider implements IInjectedBitcoinProvider {
     connect(network?: Network): AsyncResult<Connect, string>;
     requestAccounts(): Promise<import('@catalogfi/utils').Result<string[], string>>;
     getAccounts(): Promise<import('@catalogfi/utils').Result<string[], string>>;
-    getNetwork(): Promise<import('@catalogfi/utils').Result<Network, string>>;
+    getNetwork(): Promise<import('@catalogfi/utils').Result<Network.MAINNET | Network.TESTNET, string>>;
     switchNetwork(): AsyncResult<Network, string>;
     getBalance(): Promise<import('@catalogfi/utils').Result<{
         confirmed: number;

package/dist/src/bitcoin/providers/unisat/provider.d.ts

@@ -13,7 +13,7 @@ export declare class UnisatProvider implements IInjectedBitcoinProvider {
     connect(network?: Network): AsyncResult<Connect, string>;
     requestAccounts(): Promise<import('@catalogfi/utils').Result<string[], string>>;
     getAccounts(): Promise<import('@catalogfi/utils').Result<string[], string>>;
-    getNetwork(): Promise<import('@catalogfi/utils').Result<Network, string>>;
+    getNetwork(): Promise<import('@catalogfi/utils').Result<Network.MAINNET | Network.TESTNET, string>>;
     switchNetwork(): AsyncResult<Network, string>;
     getBalance(): Promise<import('@catalogfi/utils').Result<{
         confirmed: number;

package/dist/src/bitcoin/providers/xverse/provider.d.ts

@@ -15,7 +15,7 @@ export declare class XverseProvider implements IInjectedBitcoinProvider {
     requestAccounts: () => AsyncResult<string[], string>;
     getAccounts: () => AsyncResult<string[], string>;
     sendBitcoin: (toAddress: string, satoshis: number) => AsyncResult<string, string>;
-    getNetwork(): Promise<import('@catalogfi/utils').Result<Network, string>>;
+    getNetwork(): Promise<import('@catalogfi/utils').Result<Network.MAINNET | Network.TESTNET, string>>;
     switchNetwork(): AsyncResult<Network, string>;
     /**
      * not available in XVerse wallet

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gardenfi/wallet-connectors",
-  "version": "2.0.10",
+  "version": "2.0.11-beta.2",
   "type": "module",
   "scripts": {
     "build": "vite build",
@@ -38,7 +38,7 @@
   "dependencies": {
     "@catalogfi/utils": "^0.1.11",
     "@catalogfi/wallets": "^0.2.54",
-    "@gardenfi/utils": "2.1.3",
+    "@gardenfi/utils": "2.1.3-beta.22",
     "axios": "^1.7.9",
     "bitcoinjs-lib": "^6.1.7",
     "react": "^18.3.1",