@gardenfi/wallet-connectors 2.0.9 → 2.0.10-beta.1

package/dist/index2.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("react"),x=require("./index5.cjs"),i=require("@catalogfi/utils"),T=require("./index6.cjs"),y=require("./index7.cjs"),B=require("./index8.cjs"),q=require("./index9.cjs"),P=require("@gardenfi/utils"),b=o.createContext(void 0),S=({children:a,network:n,store:v})=>{const[r,w]=o.useState(),[f,s]=o.useState(),[C,d]=o.useState(!1),[l,N]=o.useState({}),k=o.useMemo(()=>!!r&&!!f,[r,f]),m=async e=>{d(!0);const t=await e.connect(n);return t.error?(d(!1),i.Err(t.error)):t.val.network!==n?(d(!1),i.Err("Network mismatch")):(w(t.val.provider),s(t.val.address),v.setItem("bitcoinWallet",JSON.stringify(t.val)),d(!1),i.Ok(i.Void))},W=()=>r?(r.disconnect(),w(void 0),s(void 0),v.removeItem("bitcoinWallet"),i.Ok(i.Void)):i.Err("No provider to disconnect"),h=o.useCallback(async()=>{if(!r)return;const e=await r.getAccounts();if(e.error){console.error("Error getting accounts:",e.error);return}s(e.val[0]);const t=await r.getNetwork();if(t.error){console.error("Error getting network:",t.error);return}},[r]),c=e=>{N(t=>({...t,[e.id]:e}))},E=async()=>{if(window.okxwallet&&window.okxwallet.bitcoin&&window.okxwallet.bitcoinTestnet){const e=new x.OKXProvider(n===P.Network.MAINNET?window.okxwallet.bitcoin:window.okxwallet.bitcoinTestnet,n);c(e)}if(n===P.Network.MAINNET&&window.phantom&&window.phantom.bitcoin){const e=new y.PhantomProvider(window.phantom.bitcoin);c(e)}if(window.unisat){const e=new T.UnisatProvider(window.unisat,n);c(e)}if(window.XverseProviders&&window.XverseProviders.BitcoinProvider){const e=new B.XverseProvider(window.XverseProviders.BitcoinProvider);c(e)}if(n===P.Network.MAINNET&&window.keplr&&window.keplr.bitcoin){const e=new q.KeplrProvider(window.keplr.bitcoin);c(e)}},A=async()=>{const e=v.getItem("bitcoinWallet");if(e){const t=JSON.parse(e),u=l[t.id];if(u){const p=await u.getAccounts();if(p.error||!p.val[0])return;const g=await u.getNetwork();if(g.error||g.val!==n)return;w(u),s(p.val[0])}}};return o.useEffect(()=>{E()},[]),o.useEffect(()=>{l&&A()},[l]),o.useEffect(()=>{if(!r)return;const e=async t=>{t.length!==0&&s(t[0])};return r.on("accountsChanged",e),()=>{r.off("accountsChanged",e)}},[r]),o.createElement(b.Provider,{value:{availableWallets:l,connect:m,provider:r,account:f,network:n,isConnecting:C,updateAccount:h,disconnect:W,isConnected:k}},a)},I=()=>{const a=o.useContext(b);if(!a)throw new Error("useBitcoinWallet must be used within BTCWalletProvider");return a};exports.BTCWalletProvider=S;exports.useBitcoinWallet=I;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("react"),A=require("./index5.cjs"),x=require("./index6.cjs"),T=require("./index7.cjs"),y=require("./index8.cjs"),B=require("./index9.cjs"),n=require("@gardenfi/utils"),g=o.createContext(void 0),S=({children:a,network:i,store:v})=>{const[r,w]=o.useState(),[f,s]=o.useState(),[k,d]=o.useState(!1),[l,b]=o.useState({}),C=o.useMemo(()=>!!r&&!!f,[r,f]),N=async e=>{d(!0);const t=await e.connect(i);return t.ok?t.val.network!==i?(d(!1),n.Err("Network mismatch")):(w(t.val.provider),s(t.val.address),v.setItem("bitcoinWallet",JSON.stringify(t.val)),d(!1),n.Ok(n.Void)):(d(!1),n.Err(t.error))},m=()=>r?(r.disconnect(),w(void 0),s(void 0),v.removeItem("bitcoinWallet"),n.Ok(n.Void)):n.Err("No provider to disconnect"),W=o.useCallback(async()=>{if(!r)return;const e=await r.getAccounts();if(!e.ok){console.error("Error getting accounts:",e.error);return}s(e.val[0]);const t=await r.getNetwork();if(t.error){console.error("Error getting network:",t.error);return}},[r]),c=e=>{b(t=>({...t,[e.id]:e}))},h=async()=>{if(window.okxwallet&&window.okxwallet.bitcoin&&window.okxwallet.bitcoinTestnet){const e=new A.OKXProvider(i===n.Network.MAINNET?window.okxwallet.bitcoin:window.okxwallet.bitcoinTestnet,i);c(e)}if(i===n.Network.MAINNET&&window.phantom&&window.phantom.bitcoin){const e=new T.PhantomProvider(window.phantom.bitcoin);c(e)}if(window.unisat){const e=new x.UnisatProvider(window.unisat,i);c(e)}if(window.XverseProviders&&window.XverseProviders.BitcoinProvider){const e=new y.XverseProvider(window.XverseProviders.BitcoinProvider);c(e)}if(i===n.Network.MAINNET&&window.keplr&&window.keplr.bitcoin){const e=new B.KeplrProvider(window.keplr.bitcoin);c(e)}},E=async()=>{const e=v.getItem("bitcoinWallet");if(e){const t=JSON.parse(e),u=l[t.id];if(u){const p=await u.getAccounts();if(!p.ok||!p.val[0])return;const P=await u.getNetwork();if(P.error||P.val!==i)return;w(u),s(p.val[0])}}};return o.useEffect(()=>{h()},[]),o.useEffect(()=>{l&&E()},[l]),o.useEffect(()=>{if(!r)return;const e=async t=>{t.length!==0&&s(t[0])};return r.on("accountsChanged",e),()=>{r.off("accountsChanged",e)}},[r]),o.createElement(g.Provider,{value:{availableWallets:l,connect:N,provider:r,account:f,network:i,isConnecting:k,updateAccount:W,disconnect:m,isConnected:C}},a)},q=()=>{const a=o.useContext(g);if(!a)throw new Error("useBitcoinWallet must be used within BTCWalletProvider");return a};exports.BTCWalletProvider=S;exports.useBitcoinWallet=q;

package/dist/index2.js

@@ -1,29 +1,28 @@
 import B, { useState as l, useMemo as I, useCallback as X, useEffect as m, createContext as M, useContext as O } from "react";
 import { OKXProvider as S } from "./index5.js";
-import { Err as p, Ok as b, Void as C } from "@catalogfi/utils";
 import { UnisatProvider as J } from "./index6.js";
 import { PhantomProvider as K } from "./index7.js";
 import { XverseProvider as L } from "./index8.js";
 import { KeplrProvider as z } from "./index9.js";
-import { Network as P } from "@gardenfi/utils";
-const N = M(void 0), G = ({
+import { Network as p, Err as P, Ok as b, Void as k } from "@gardenfi/utils";
+const C = M(void 0), F = ({
   children: c,
   network: r,
   store: w
 }) => {
-  const [o, v] = l(), [u, n] = l(), [h, s] = l(!1), [a, k] = l(
+  const [o, v] = l(), [u, n] = l(), [N, s] = l(!1), [a, h] = l(
     {}
-  ), x = I(
-    () => !!o && !!u,
-    [o, u]
-  ), A = async (e) => {
+  ), x = I(() => !!o && !!u, [
+    o,
+    u
+  ]), A = async (e) => {
     s(!0);
     const t = await e.connect(r);
-    return t.error ? (s(!1), p(t.error)) : t.val.network !== r ? (s(!1), p("Network mismatch")) : (v(t.val.provider), n(t.val.address), w.setItem("bitcoinWallet", JSON.stringify(t.val)), s(!1), b(C));
-  }, W = () => o ? (o.disconnect(), v(void 0), n(void 0), w.removeItem("bitcoinWallet"), b(C)) : p("No provider to disconnect"), E = X(async () => {
+    return t.ok ? t.val.network !== r ? (s(!1), P("Network mismatch")) : (v(t.val.provider), n(t.val.address), w.setItem("bitcoinWallet", JSON.stringify(t.val)), s(!1), b(k)) : (s(!1), P(t.error));
+  }, W = () => o ? (o.disconnect(), v(void 0), n(void 0), w.removeItem("bitcoinWallet"), b(k)) : P("No provider to disconnect"), E = X(async () => {
     if (!o) return;
     const e = await o.getAccounts();
-    if (e.error) {
+    if (!e.ok) {
       console.error("Error getting accounts:", e.error);
       return;
     }
@@ -34,16 +33,16 @@ const N = M(void 0), G = ({
       return;
     }
   }, [o]), i = (e) => {
-    k((t) => ({
+    h((t) => ({
       ...t,
       [e.id]: e
     }));
   }, T = async () => {
     if (window.okxwallet && window.okxwallet.bitcoin && window.okxwallet.bitcoinTestnet) {
-      const e = new S(r === P.MAINNET ? window.okxwallet.bitcoin : window.okxwallet.bitcoinTestnet, r);
+      const e = new S(r === p.MAINNET ? window.okxwallet.bitcoin : window.okxwallet.bitcoinTestnet, r);
       i(e);
     }
-    if (r === P.MAINNET && window.phantom && window.phantom.bitcoin) {
+    if (r === p.MAINNET && window.phantom && window.phantom.bitcoin) {
       const e = new K(window.phantom.bitcoin);
       i(e);
     }
@@ -57,7 +56,7 @@ const N = M(void 0), G = ({
       );
       i(e);
     }
-    if (r === P.MAINNET && window.keplr && window.keplr.bitcoin) {
+    if (r === p.MAINNET && window.keplr && window.keplr.bitcoin) {
       const e = new z(window.keplr.bitcoin);
       i(e);
     }
@@ -67,7 +66,7 @@ const N = M(void 0), G = ({
       const t = JSON.parse(e), d = a[t.id];
       if (d) {
         const f = await d.getAccounts();
-        if (f.error || !f.val[0]) return;
+        if (!f.ok || !f.val[0]) return;
         const g = await d.getNetwork();
         if (g.error || g.val !== r) return;
         v(d), n(f.val[0]);
@@ -87,7 +86,7 @@ const N = M(void 0), G = ({
       o.off("accountsChanged", e);
     };
   }, [o]), /* @__PURE__ */ B.createElement(
-    N.Provider,
+    C.Provider,
     {
       value: {
         availableWallets: a,
@@ -95,7 +94,7 @@ const N = M(void 0), G = ({
         provider: o,
         account: u,
         network: r,
-        isConnecting: h,
+        isConnecting: N,
         updateAccount: E,
         disconnect: W,
         isConnected: x
@@ -103,13 +102,13 @@ const N = M(void 0), G = ({
     },
     c
   );
-}, H = () => {
-  const c = O(N);
+}, G = () => {
+  const c = O(C);
   if (!c)
     throw new Error("useBitcoinWallet must be used within BTCWalletProvider");
   return c;
 };
 export {
-  G as BTCWalletProvider,
-  H as useBitcoinWallet
+  F as BTCWalletProvider,
+  G as useBitcoinWallet
 };

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("@gardenfi/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;

package/dist/index4.js

@@ -1,4 +1,4 @@
-import { Err as l, Fetcher as p, Ok as u } from "@catalogfi/utils";
+import { Err as l, Fetcher as p, Ok as u } from "@gardenfi/utils";
 const h = {
   testnet: {
     Mempool: "https://mempool.space/testnet4"

package/dist/index5.cjs

@@ -1 +1 @@
-"use strict";var d=r=>{throw TypeError(r)};var w=(r,t,e)=>t.has(r)||d("Cannot "+e);var i=(r,t,e)=>(w(r,t,"read from private field"),e?e.call(r):t.get(r)),u=(r,t,e)=>t.has(r)?d("Cannot add the same private member more than once"):t instanceof WeakSet?t.add(r):t.set(r,e),a=(r,t,e,l)=>(w(r,t,"write to private field"),l?l.call(r,e):t.set(r,e),e);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("@catalogfi/utils"),o=require("@gardenfi/utils"),h=require("./index3.cjs");var s,c;class O{constructor(t,e){u(this,s);u(this,c);this.address="",this.id=h.WALLET_CONFIG.OKX.id,this.name=h.WALLET_CONFIG.OKX.name,this.icon=h.WALLET_CONFIG.OKX.icon,this.disconnect=()=>(this.address="",i(this,s).disconnect(),Promise.resolve(n.Ok("Disconnected OKX wallet"))),a(this,s,t),a(this,c,e)}async connect(){try{const t=await i(this,s).connect();return!t||!t.address?n.Err("Failed to connect to OKX wallet"):(this.address=t.address,n.Ok({address:this.address,provider:this,network:i(this,c),id:h.WALLET_CONFIG.OKX.id}))}catch(t){return n.Err("Error while connecting to the OKX wallet",t)}}async getPublicKey(){return await n.executeWithTryCatch(async()=>await i(this,s).getPublicKey(),"Error while getting public key from OKX wallet")}async requestAccounts(){const t=await this.connect();return t.error?n.Err(t.error):n.Ok([t.val.address])}async getAccounts(){return i(this,c)===o.Network.TESTNET?await this.requestAccounts():await n.executeWithTryCatch(async()=>await i(this,s).getAccounts(),"Error while getting accounts from OKX wallet")}async getNetwork(){return n.Ok(i(this,c))}async switchNetwork(){a(this,c,i(this,c)===o.Network.MAINNET?o.Network.TESTNET:o.Network.MAINNET);const t=await this.connect();return t.error?n.Err(`Failed to connect to ${i(this,c)}: ${t.error}`):n.Ok(i(this,c))}async getBalance(){return await n.executeWithTryCatch(async()=>await i(this,s).getBalance(),"Error while getting balance from OKX wallet")}async sendBitcoin(t,e){return await n.executeWithTryCatch(async()=>await i(this,s).sendBitcoin(t,e),"Error while sending bitcoin from OKX wallet")}on(t,e){i(this,s).on(t,e)}off(t,e){i(this,s).off(t,e)}}s=new WeakMap,c=new WeakMap;exports.OKXProvider=O;
+"use strict";var l=i=>{throw TypeError(i)};var d=(i,t,e)=>t.has(i)||l("Cannot "+e);var n=(i,t,e)=>(d(i,t,"read from private field"),e?e.call(i):t.get(i)),h=(i,t,e)=>t.has(i)?l("Cannot add the same private member more than once"):t instanceof WeakSet?t.add(i):t.set(i,e),a=(i,t,e,u)=>(d(i,t,"write to private field"),u?u.call(i,e):t.set(i,e),e);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("@gardenfi/utils"),o=require("./index3.cjs");var s,c;class w{constructor(t,e){h(this,s);h(this,c);this.address="",this.id=o.WALLET_CONFIG.OKX.id,this.name=o.WALLET_CONFIG.OKX.name,this.icon=o.WALLET_CONFIG.OKX.icon,this.disconnect=()=>(this.address="",n(this,s).disconnect(),Promise.resolve(r.Ok("Disconnected OKX wallet"))),a(this,s,t),a(this,c,e)}async connect(){try{const t=await n(this,s).connect();return!t||!t.address?r.Err("Failed to connect to OKX wallet"):(this.address=t.address,r.Ok({address:this.address,provider:this,network:n(this,c),id:o.WALLET_CONFIG.OKX.id}))}catch(t){return r.Err("Error while connecting to the OKX wallet",t)}}async getPublicKey(){return await r.executeWithTryCatch(async()=>await n(this,s).getPublicKey(),"Error while getting public key from OKX wallet")}async requestAccounts(){const t=await this.connect();return t.ok?r.Ok([t.val.address]):r.Err(t.error)}async getAccounts(){return n(this,c)===r.Network.TESTNET?await this.requestAccounts():await r.executeWithTryCatch(async()=>await n(this,s).getAccounts(),"Error while getting accounts from OKX wallet")}async getNetwork(){return r.Ok(n(this,c))}async switchNetwork(){a(this,c,n(this,c)===r.Network.MAINNET?r.Network.TESTNET:r.Network.MAINNET);const t=await this.connect();return t.error?r.Err(`Failed to connect to ${n(this,c)}: ${t.error}`):r.Ok(n(this,c))}async getBalance(){return await r.executeWithTryCatch(async()=>await n(this,s).getBalance(),"Error while getting balance from OKX wallet")}async sendBitcoin(t,e){return await r.executeWithTryCatch(async()=>await n(this,s).sendBitcoin(t,e),"Error while sending bitcoin from OKX wallet")}on(t,e){n(this,s).on(t,e)}off(t,e){n(this,s).off(t,e)}}s=new WeakMap,c=new WeakMap;exports.OKXProvider=w;

package/dist/index5.js

@@ -1,29 +1,28 @@
 var y = (e) => {
   throw TypeError(e);
 };
-var f = (e, t, r) => t.has(e) || y("Cannot " + r);
-var n = (e, t, r) => (f(e, t, "read from private field"), r ? r.call(e) : t.get(e)), d = (e, t, r) => t.has(e) ? y("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(e) : t.set(e, r), o = (e, t, r, w) => (f(e, t, "write to private field"), w ? w.call(e, r) : t.set(e, r), r);
-import { Ok as c, Err as a, executeWithTryCatch as h } from "@catalogfi/utils";
-import { Network as l } from "@gardenfi/utils";
+var g = (e, t, r) => t.has(e) || y("Cannot " + r);
+var n = (e, t, r) => (g(e, t, "read from private field"), r ? r.call(e) : t.get(e)), d = (e, t, r) => t.has(e) ? y("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(e) : t.set(e, r), a = (e, t, r, w) => (g(e, t, "write to private field"), w ? w.call(e, r) : t.set(e, r), r);
+import { Ok as c, Err as o, executeWithTryCatch as h, Network as l } from "@gardenfi/utils";
 import { WALLET_CONFIG as u } from "./index3.js";
 var i, s;
 class E {
   constructor(t, r) {
     d(this, i);
     d(this, s);
-    this.address = "", this.id = u.OKX.id, this.name = u.OKX.name, this.icon = u.OKX.icon, this.disconnect = () => (this.address = "", n(this, i).disconnect(), Promise.resolve(c("Disconnected OKX wallet"))), o(this, i, t), o(this, s, r);
+    this.address = "", this.id = u.OKX.id, this.name = u.OKX.name, this.icon = u.OKX.icon, this.disconnect = () => (this.address = "", n(this, i).disconnect(), Promise.resolve(c("Disconnected OKX wallet"))), a(this, i, t), a(this, s, r);
   }
   async connect() {
     try {
       const t = await n(this, i).connect();
-      return !t || !t.address ? a("Failed to connect to OKX wallet") : (this.address = t.address, c({
+      return !t || !t.address ? o("Failed to connect to OKX wallet") : (this.address = t.address, c({
         address: this.address,
         provider: this,
         network: n(this, s),
         id: u.OKX.id
       }));
     } catch (t) {
-      return a("Error while connecting to the OKX wallet", t);
+      return o("Error while connecting to the OKX wallet", t);
     }
   }
   async getPublicKey() {
@@ -31,7 +30,7 @@ class E {
   }
   async requestAccounts() {
     const t = await this.connect();
-    return t.error ? a(t.error) : c([t.val.address]);
+    return t.ok ? c([t.val.address]) : o(t.error);
   }
   async getAccounts() {
     return n(this, s) === l.TESTNET ? await this.requestAccounts() : await h(async () => await n(this, i).getAccounts(), "Error while getting accounts from OKX wallet");
@@ -40,9 +39,9 @@ class E {
     return c(n(this, s));
   }
   async switchNetwork() {
-    o(this, s, n(this, s) === l.MAINNET ? l.TESTNET : l.MAINNET);
+    a(this, s, n(this, s) === l.MAINNET ? l.TESTNET : l.MAINNET);
     const t = await this.connect();
-    return t.error ? a(
+    return t.error ? o(
       `Failed to connect to ${n(this, s)}: ${t.error}`
     ) : c(n(this, s));
   }

package/dist/index6.cjs

@@ -1 +1 @@
-"use strict";var T=e=>{throw TypeError(e)};var d=(e,t,r)=>t.has(e)||T("Cannot "+r);var i=(e,t,r)=>(d(e,t,"read from private field"),r?r.call(e):t.get(e)),E=(e,t,r)=>t.has(e)?T("Cannot add the same private member more than once"):t instanceof WeakSet?t.add(e):t.set(e,r),l=(e,t,r,o)=>(d(e,t,"write to private field"),o?o.call(e,r):t.set(e,r),r);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("./index10.cjs"),s=require("@catalogfi/utils"),u=require("@gardenfi/utils"),w=require("./index3.cjs");var n,c;class g{constructor(t,r){E(this,n);E(this,c);this.address="",this.id=w.WALLET_CONFIG.Unisat.id,this.name=w.WALLET_CONFIG.Unisat.name,this.icon=w.WALLET_CONFIG.Unisat.icon,this.disconnect=()=>(this.address="",Promise.resolve(s.Ok("Disconnected unisat wallet"))),l(this,n,t),l(this,c,r)}async connect(t){try{t||(t=i(this,c));const r=await this.getNetwork(),o=await i(this,n).getChain();if(r.error)return s.Err("Could not get network",r.error);if(r.val!==t||o.enum===a.UnisatChainEnum.BITCOIN_TESTNET){const N=await this.switchNetwork();if(N.error)return s.Err("Failed to switch network",N.error)}const h=await i(this,n).requestAccounts();return h.length>0&&(this.address=h[0]),s.Ok({address:this.address,provider:this,network:t,id:w.WALLET_CONFIG.Unisat.id})}catch(r){return s.Err("Error while connecting to the Unisat wallet",r)}}async requestAccounts(){return await s.executeWithTryCatch(async()=>await i(this,n).requestAccounts(),"Error while requesting accounts from the Unisat wallet")}async getAccounts(){return await s.executeWithTryCatch(async()=>await i(this,n).getAccounts(),"Error while getting accounts from the Unisat wallet")}async getNetwork(){return await s.executeWithTryCatch(async()=>{const t=await i(this,n).getNetwork();if(t===a.UnisatNetworkEnum.LIVENET)return u.Network.MAINNET;if(t===a.UnisatNetworkEnum.TESTNET)return u.Network.TESTNET;throw new Error("Invalid or unsupported network"+t)},"Error while getting network from Unisat wallet")}async switchNetwork(){try{const t=await this.getNetwork(),r=await i(this,n).getChain();if(t.error)return s.Err("Failed to get current network");const o=t.val===u.Network.MAINNET||i(this,c)===u.Network.TESTNET&&r.enum===a.UnisatChainEnum.BITCOIN_TESTNET?a.UnisatChainEnum.BITCOIN_TESTNET4:a.UnisatChainEnum.BITCOIN_MAINNET;await i(this,n).switchChain(o);const h=await this.getNetwork();return h.error?s.Err("Failed to verify network switch"):s.Ok(h.val)}catch(t){return s.Err("Error while switching network in Unisat:",t)}}async getBalance(){return await s.executeWithTryCatch(async()=>await i(this,n).getBalance(),"Error while getting balance from Unisat wallet")}async sendBitcoin(t,r){return await s.executeWithTryCatch(async()=>await i(this,n).sendBitcoin(t,r),"Error while sending bitcoin from Unisat wallet")}on(t,r){i(this,n).on(t,r)}off(t,r){i(this,n).removeListener(t,r)}}n=new WeakMap,c=new WeakMap;exports.UnisatProvider=g;
+"use strict";var N=n=>{throw TypeError(n)};var T=(n,t,r)=>t.has(n)||N("Cannot "+r);var s=(n,t,r)=>(T(n,t,"read from private field"),r?r.call(n):t.get(n)),w=(n,t,r)=>t.has(n)?N("Cannot add the same private member more than once"):t instanceof WeakSet?t.add(n):t.set(n,r),E=(n,t,r,o)=>(T(n,t,"write to private field"),o?o.call(n,r):t.set(n,r),r);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("./index10.cjs"),e=require("@gardenfi/utils"),u=require("./index3.cjs");var i,c;class d{constructor(t,r){w(this,i);w(this,c);this.address="",this.id=u.WALLET_CONFIG.Unisat.id,this.name=u.WALLET_CONFIG.Unisat.name,this.icon=u.WALLET_CONFIG.Unisat.icon,this.disconnect=()=>(this.address="",Promise.resolve(e.Ok("Disconnected unisat wallet"))),E(this,i,t),E(this,c,r)}async connect(t){try{t||(t=s(this,c));const r=await this.getNetwork(),o=await s(this,i).getChain();if(r.error)return e.Err("Could not get network",r.error);if(r.val!==t||o.enum===a.UnisatChainEnum.BITCOIN_TESTNET){const l=await this.switchNetwork();if(l.error)return e.Err("Failed to switch network",l.error)}const h=await s(this,i).requestAccounts();return h.length>0&&(this.address=h[0]),e.Ok({address:this.address,provider:this,network:t,id:u.WALLET_CONFIG.Unisat.id})}catch(r){return e.Err("Error while connecting to the Unisat wallet",r)}}async requestAccounts(){return await e.executeWithTryCatch(async()=>await s(this,i).requestAccounts(),"Error while requesting accounts from the Unisat wallet")}async getAccounts(){return await e.executeWithTryCatch(async()=>await s(this,i).getAccounts(),"Error while getting accounts from the Unisat wallet")}async getNetwork(){return await e.executeWithTryCatch(async()=>{const t=await s(this,i).getNetwork();if(t===a.UnisatNetworkEnum.LIVENET)return e.Network.MAINNET;if(t===a.UnisatNetworkEnum.TESTNET)return e.Network.TESTNET;throw new Error("Invalid or unsupported network"+t)},"Error while getting network from Unisat wallet")}async switchNetwork(){try{const t=await this.getNetwork(),r=await s(this,i).getChain();if(t.error)return e.Err("Failed to get current network");const o=t.val===e.Network.MAINNET||s(this,c)===e.Network.TESTNET&&r.enum===a.UnisatChainEnum.BITCOIN_TESTNET?a.UnisatChainEnum.BITCOIN_TESTNET4:a.UnisatChainEnum.BITCOIN_MAINNET;await s(this,i).switchChain(o);const h=await this.getNetwork();return h.ok?e.Ok(h.val):e.Err("Failed to verify network switch")}catch(t){return e.Err("Error while switching network in Unisat:",t)}}async getBalance(){return await e.executeWithTryCatch(async()=>await s(this,i).getBalance(),"Error while getting balance from Unisat wallet")}async sendBitcoin(t,r){return await e.executeWithTryCatch(async()=>await s(this,i).sendBitcoin(t,r),"Error while sending bitcoin from Unisat wallet")}on(t,r){s(this,i).on(t,r)}off(t,r){s(this,i).removeListener(t,r)}}i=new WeakMap,c=new WeakMap;exports.UnisatProvider=d;

package/dist/index6.js

@@ -1,23 +1,22 @@
 var g = (e) => {
   throw TypeError(e);
 };
-var f = (e, t, r) => t.has(e) || g("Cannot " + r);
-var n = (e, t, r) => (f(e, t, "read from private field"), r ? r.call(e) : t.get(e)), N = (e, t, r) => t.has(e) ? g("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(e) : t.set(e, r), T = (e, t, r, s) => (f(e, t, "write to private field"), s ? s.call(e, r) : t.set(e, r), r);
-import { UnisatChainEnum as w, UnisatNetworkEnum as m } from "./index10.js";
-import { Ok as E, Err as a, executeWithTryCatch as h } from "@catalogfi/utils";
-import { Network as u } from "@gardenfi/utils";
+var k = (e, t, r) => t.has(e) || g("Cannot " + r);
+var i = (e, t, r) => (k(e, t, "read from private field"), r ? r.call(e) : t.get(e)), N = (e, t, r) => t.has(e) ? g("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(e) : t.set(e, r), T = (e, t, r, s) => (k(e, t, "write to private field"), s ? s.call(e, r) : t.set(e, r), r);
+import { UnisatChainEnum as w, UnisatNetworkEnum as f } from "./index10.js";
+import { Ok as E, Err as a, executeWithTryCatch as h, Network as u } from "@gardenfi/utils";
 import { WALLET_CONFIG as l } from "./index3.js";
-var i, o;
-class p {
+var n, o;
+class U {
   constructor(t, r) {
-    N(this, i);
+    N(this, n);
     N(this, o);
-    this.address = "", this.id = l.Unisat.id, this.name = l.Unisat.name, this.icon = l.Unisat.icon, this.disconnect = () => (this.address = "", Promise.resolve(E("Disconnected unisat wallet"))), T(this, i, t), T(this, o, r);
+    this.address = "", this.id = l.Unisat.id, this.name = l.Unisat.name, this.icon = l.Unisat.icon, this.disconnect = () => (this.address = "", Promise.resolve(E("Disconnected unisat wallet"))), T(this, n, t), T(this, o, r);
   }
   async connect(t) {
     try {
-      t || (t = n(this, o));
-      const r = await this.getNetwork(), s = await n(this, i).getChain();
+      t || (t = i(this, o));
+      const r = await this.getNetwork(), s = await i(this, n).getChain();
       if (r.error)
         return a("Could not get network", r.error);
       if (r.val !== t || s.enum === w.BITCOIN_TESTNET) {
@@ -25,7 +24,7 @@ class p {
         if (d.error)
           return a("Failed to switch network", d.error);
       }
-      const c = await n(this, i).requestAccounts();
+      const c = await i(this, n).requestAccounts();
       return c.length > 0 && (this.address = c[0]), E({
         address: this.address,
         provider: this,
@@ -38,49 +37,49 @@ class p {
   }
   // requests accounts from the wallet, if not connected, it will connect first
   async requestAccounts() {
-    return await h(async () => await n(this, i).requestAccounts(), "Error while requesting accounts from the Unisat wallet");
+    return await h(async () => await i(this, n).requestAccounts(), "Error while requesting accounts from the Unisat wallet");
   }
   //silently gets accounts if already connected
   async getAccounts() {
-    return await h(async () => await n(this, i).getAccounts(), "Error while getting accounts from the Unisat wallet");
+    return await h(async () => await i(this, n).getAccounts(), "Error while getting accounts from the Unisat wallet");
   }
   async getNetwork() {
     return await h(async () => {
-      const t = await n(this, i).getNetwork();
-      if (t === m.LIVENET)
+      const t = await i(this, n).getNetwork();
+      if (t === f.LIVENET)
         return u.MAINNET;
-      if (t === m.TESTNET)
+      if (t === f.TESTNET)
         return u.TESTNET;
       throw new Error("Invalid or unsupported network" + t);
     }, "Error while getting network from Unisat wallet");
   }
   async switchNetwork() {
     try {
-      const t = await this.getNetwork(), r = await n(this, i).getChain();
+      const t = await this.getNetwork(), r = await i(this, n).getChain();
       if (t.error)
         return a("Failed to get current network");
-      const s = t.val === u.MAINNET ? w.BITCOIN_TESTNET4 : n(this, o) === u.TESTNET && r.enum === w.BITCOIN_TESTNET ? w.BITCOIN_TESTNET4 : w.BITCOIN_MAINNET;
-      await n(this, i).switchChain(s);
+      const s = t.val === u.MAINNET ? w.BITCOIN_TESTNET4 : i(this, o) === u.TESTNET && r.enum === w.BITCOIN_TESTNET ? w.BITCOIN_TESTNET4 : w.BITCOIN_MAINNET;
+      await i(this, n).switchChain(s);
       const c = await this.getNetwork();
-      return c.error ? a("Failed to verify network switch") : E(c.val);
+      return c.ok ? E(c.val) : a("Failed to verify network switch");
     } catch (t) {
       return a("Error while switching network in Unisat:", t);
     }
   }
   async getBalance() {
-    return await h(async () => await n(this, i).getBalance(), "Error while getting balance from Unisat wallet");
+    return await h(async () => await i(this, n).getBalance(), "Error while getting balance from Unisat wallet");
   }
   async sendBitcoin(t, r) {
-    return await h(async () => await n(this, i).sendBitcoin(t, r), "Error while sending bitcoin from Unisat wallet");
+    return await h(async () => await i(this, n).sendBitcoin(t, r), "Error while sending bitcoin from Unisat wallet");
   }
   on(t, r) {
-    n(this, i).on(t, r);
+    i(this, n).on(t, r);
   }
   off(t, r) {
-    n(this, i).removeListener(t, r);
+    i(this, n).removeListener(t, r);
   }
 }
-i = new WeakMap(), o = new WeakMap();
+n = new WeakMap(), o = new WeakMap();
 export {
-  p as UnisatProvider
+  U as UnisatProvider
 };

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

package/dist/index7.js

@@ -2,29 +2,28 @@ 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";
+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 * as c from "bitcoinjs-lib";
 import { initEccLib as E } from "bitcoinjs-lib";
 import * as T from "tiny-secp256k1";
-import { Network as m } from "@gardenfi/utils";
+import { Ok as d, Network as h, Err as i, executeWithTryCatch 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";
+import { BitcoinProvider as B, BitcoinNetwork as N, BitcoinWallet as I } from "@gardenfi/core";
 E(T);
 var e;
-class W {
+class M {
   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, e);
+    this.address = "", this.id = a.Phantom.id, this.name = a.Phantom.name, this.icon = a.Phantom.icon, this.disconnect = () => (this.address = "", Promise.resolve(d("Disconnected Phantom wallet"))), p(this, e, t);
   }
   async connect(t) {
-    if (t || (t = m.MAINNET), t === m.TESTNET)
+    if (t || (t = h.MAINNET), t === h.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({
+      return this.address === "" ? i("Could not connect to Phantom bitcoin payment account") : d({
         address: this.address,
         provider: this,
         network: t,
@@ -35,7 +34,7 @@ class W {
     }
   }
   async requestAccounts() {
-    return await d(async () => {
+    return await m(async () => {
       const t = await o(this, e).requestAccounts();
       return t.length > 0 && (this.address = t[0].address), t.map((r) => r.address);
     }, "Error while requesting accounts from Phantom wallet");
@@ -45,17 +44,17 @@ class W {
   }
   // bitcoin testnet is not supported in Phantom wallet
   async getNetwork() {
-    return c(m.MAINNET);
+    return d(h.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 m(async () => await o(this, e).getBalance(), "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 m(async () => {
+      const s = c.networks.bitcoin, u = new B(N.Mainnet);
       try {
         const { txHex: f, utxoCount: y } = await I.generateUnsignedPSBT(
           u,
@@ -70,11 +69,11 @@ class W {
               {
                 address: this.address,
                 signingIndexes: Array.from({ length: y }, (H, A) => A),
-                sigHash: h.Transaction.SIGHASH_ALL
+                sigHash: c.Transaction.SIGHASH_ALL
               }
             ]
           }
-        ), l = h.Psbt.fromBuffer(
+        ), l = c.Psbt.fromBuffer(
           Buffer.from(b)
         ).extractTransaction(), x = l.getId();
         return await u.broadcast(l.toHex()), x;
@@ -97,5 +96,5 @@ class W {
 }
 e = new WeakMap();
 export {
-  W as PhantomProvider
+  M as PhantomProvider
 };

package/dist/index8.cjs

@@ -1 +1 @@
-"use strict";var d=s=>{throw TypeError(s)};var N=(s,e,t)=>e.has(s)||d("Cannot "+t);var o=(s,e,t)=>(N(s,e,"read from private field"),t?t.call(s):e.get(s)),y=(s,e,t)=>e.has(s)?d("Cannot add the same private member more than once"):e instanceof WeakSet?e.add(s):e.set(s,t),k=(s,e,t,r)=>(N(s,e,"write to private field"),r?r.call(s,t):e.set(s,t),t);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const w=require("./index3.cjs"),u=require("./index11.cjs"),i=require("@catalogfi/utils"),h=require("@gardenfi/utils");var n;class v{constructor(e){y(this,n);this.address="",this.id=w.WALLET_CONFIG.Xverse.id,this.name=w.WALLET_CONFIG.Xverse.name,this.icon=w.WALLET_CONFIG.Xverse.icon,this.connect=async t=>{try{t||(t=h.Network.MAINNET),await o(this,n).request("wallet_connect",null);const r=await this.getNetwork();if(r.error)return i.Err("Could not get network",r.error);if(r.val!==t){const c=await this.switchNetwork();if(c.error)return i.Err("Failed to switch network",c.error)}const a=await this.getAccounts();return a.val.length>0&&(this.address=a.val[0]),i.Ok({address:this.address,provider:this,network:t,id:w.WALLET_CONFIG.Xverse.id})}catch(r){return i.Err("Error while connecting to the XVerse wallet",r)}},this.getBalance=async()=>await i.executeWithTryCatch(async()=>(await o(this,n).request("getBalance",{})).result,"Error while getting balance from XVerse wallet"),this.requestAccounts=async()=>await i.executeWithTryCatch(async()=>(await o(this,n).request("getAccounts",{purposes:["payment"],message:"I want to connect"})).result.map(r=>r.address)),this.getAccounts=async()=>await i.executeWithTryCatch(async()=>(await o(this,n).request("getAddresses",{purposes:["payment"]})).result.addresses.map(r=>r.address)),this.sendBitcoin=async(t,r)=>await i.executeWithTryCatch(async()=>{var l;const a=await o(this,n).request("sendTransfer",{recipients:[{address:t,amount:r}]}),c=(l=a.result)==null?void 0:l.txid;if(c)return i.Ok(c);throw new Error(a.error)},"Error while sending bitcoin from Xverse wallet"),this.on=()=>{},this.off=()=>{},this.disconnect=()=>(this.address="",Promise.resolve(i.Ok("Disconnected"))),k(this,n,e)}async getNetwork(){return await i.executeWithTryCatch(async()=>{const e=await o(this,n).request("wallet_getNetwork",null);if(e.result.bitcoin.name===u.XverseBitcoinNetworkType.Mainnet)return h.Network.MAINNET;if(e.result.bitcoin.name===u.XverseBitcoinNetworkType.Testnet4)return h.Network.TESTNET;throw new Error(e.result)},"Error while getting network from Xverse wallet")}async switchNetwork(){try{const e=await this.getNetwork();if(e.error)return i.Err("Failed to get current network");const t=e.val===h.Network.MAINNET?u.XverseBitcoinNetworkType.Testnet4:u.XverseBitcoinNetworkType.Mainnet;await o(this,n).request("wallet_changeNetwork",{name:t});const r=await this.getNetwork();return r.error?i.Err("Failed to verify network switch"):i.Ok(r.val)}catch(e){return i.Err("Error while switching network in Xverse:",e)}}}n=new WeakMap;exports.XverseProvider=v;
+"use strict";var l=n=>{throw TypeError(n)};var d=(n,e,t)=>e.has(n)||l("Cannot "+t);var o=(n,e,t)=>(d(n,e,"read from private field"),t?t.call(n):e.get(n)),N=(n,e,t)=>e.has(n)?l("Cannot add the same private member more than once"):e instanceof WeakSet?e.add(n):e.set(n,t),k=(n,e,t,s)=>(d(n,e,"write to private field"),s?s.call(n,t):e.set(n,t),t);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const w=require("./index3.cjs"),u=require("./index11.cjs"),r=require("@gardenfi/utils");var i;class y{constructor(e){N(this,i);this.address="",this.id=w.WALLET_CONFIG.Xverse.id,this.name=w.WALLET_CONFIG.Xverse.name,this.icon=w.WALLET_CONFIG.Xverse.icon,this.connect=async t=>{try{t||(t=r.Network.MAINNET),await o(this,i).request("wallet_connect",null);const s=await this.getNetwork();if(s.error)return r.Err("Could not get network",s.error);if(s.val!==t){const c=await this.switchNetwork();if(c.error)return r.Err("Failed to switch network",c.error)}const a=await this.getAccounts();return a.ok&&a.val.length>0&&(this.address=a.val[0]),r.Ok({address:this.address,provider:this,network:t,id:w.WALLET_CONFIG.Xverse.id})}catch(s){return r.Err("Error while connecting to the XVerse wallet",s)}},this.getBalance=async()=>await r.executeWithTryCatch(async()=>(await o(this,i).request("getBalance",{})).result,"Error while getting balance from XVerse wallet"),this.requestAccounts=async()=>await r.executeWithTryCatch(async()=>(await o(this,i).request("getAccounts",{purposes:["payment"],message:"I want to connect"})).result.map(s=>s.address)),this.getAccounts=async()=>await r.executeWithTryCatch(async()=>(await o(this,i).request("getAddresses",{purposes:["payment"]})).result.addresses.map(s=>s.address)),this.sendBitcoin=async(t,s)=>await r.executeWithTryCatch(async()=>{var h;const a=await o(this,i).request("sendTransfer",{recipients:[{address:t,amount:s}]}),c=(h=a.result)==null?void 0:h.txid;if(c)return r.Ok(c);throw new Error(a.error)},"Error while sending bitcoin from Xverse wallet"),this.on=()=>{},this.off=()=>{},this.disconnect=()=>(this.address="",Promise.resolve(r.Ok("Disconnected"))),k(this,i,e)}async getNetwork(){return await r.executeWithTryCatch(async()=>{const e=await o(this,i).request("wallet_getNetwork",null);if(e.result.bitcoin.name===u.XverseBitcoinNetworkType.Mainnet)return r.Network.MAINNET;if(e.result.bitcoin.name===u.XverseBitcoinNetworkType.Testnet4)return r.Network.TESTNET;throw new Error(e.result)},"Error while getting network from Xverse wallet")}async switchNetwork(){try{const e=await this.getNetwork();if(e.error)return r.Err("Failed to get current network");const t=e.val===r.Network.MAINNET?u.XverseBitcoinNetworkType.Testnet4:u.XverseBitcoinNetworkType.Mainnet;await o(this,i).request("wallet_changeNetwork",{name:t});const s=await this.getNetwork();return s.ok?r.Ok(s.val):r.Err("Failed to verify network switch")}catch(e){return r.Err("Error while switching network in Xverse:",e)}}}i=new WeakMap;exports.XverseProvider=y;

package/dist/index8.js

@@ -1,36 +1,35 @@
-var m = (s) => {
+var N = (s) => {
   throw TypeError(s);
 };
-var N = (s, e, t) => e.has(s) || m("Cannot " + t);
-var i = (s, e, t) => (N(s, e, "read from private field"), t ? t.call(s) : e.get(s)), f = (s, e, t) => e.has(s) ? m("Cannot add the same private member more than once") : e instanceof WeakSet ? e.add(s) : e.set(s, t), v = (s, e, t, r) => (N(s, e, "write to private field"), r ? r.call(s, t) : e.set(s, t), t);
+var k = (s, e, t) => e.has(s) || N("Cannot " + t);
+var i = (s, e, t) => (k(s, e, "read from private field"), t ? t.call(s) : e.get(s)), m = (s, e, t) => e.has(s) ? N("Cannot add the same private member more than once") : e instanceof WeakSet ? e.add(s) : e.set(s, t), f = (s, e, t, r) => (k(s, e, "write to private field"), r ? r.call(s, t) : e.set(s, t), t);
 import { WALLET_CONFIG as u } from "./index3.js";
 import { XverseBitcoinNetworkType as h } from "./index11.js";
-import { Err as o, Ok as l, executeWithTryCatch as w } from "@catalogfi/utils";
-import { Network as d } from "@gardenfi/utils";
+import { Network as l, Err as a, Ok as d, executeWithTryCatch as w } from "@gardenfi/utils";
 var n;
-class X {
+class T {
   constructor(e) {
-    f(this, n);
+    m(this, n);
     this.address = "", this.id = u.Xverse.id, this.name = u.Xverse.name, this.icon = u.Xverse.icon, this.connect = async (t) => {
       try {
-        t || (t = d.MAINNET), await i(this, n).request("wallet_connect", null);
+        t || (t = l.MAINNET), await i(this, n).request("wallet_connect", null);
         const r = await this.getNetwork();
         if (r.error)
-          return o("Could not get network", r.error);
+          return a("Could not get network", r.error);
         if (r.val !== t) {
           const c = await this.switchNetwork();
           if (c.error)
-            return o("Failed to switch network", c.error);
+            return a("Failed to switch network", c.error);
         }
-        const a = await this.getAccounts();
-        return a.val.length > 0 && (this.address = a.val[0]), l({
+        const o = await this.getAccounts();
+        return o.ok && o.val.length > 0 && (this.address = o.val[0]), d({
           address: this.address,
           provider: this,
           network: t,
           id: u.Xverse.id
         });
       } catch (r) {
-        return o("Error while connecting to the XVerse wallet", r);
+        return a("Error while connecting to the XVerse wallet", r);
       }
     }, this.getBalance = async () => await w(async () => (await i(this, n).request("getBalance", {})).result, "Error while getting balance from XVerse wallet"), this.requestAccounts = async () => await w(async () => (await i(this, n).request("getAccounts", {
       purposes: ["payment"],
@@ -39,15 +38,15 @@ class X {
       purposes: ["payment"]
     })).result.addresses.map((r) => r.address)), this.sendBitcoin = async (t, r) => await w(async () => {
       var g;
-      const a = await i(this, n).request("sendTransfer", {
+      const o = await i(this, n).request("sendTransfer", {
         recipients: [{ address: t, amount: r }]
-      }), c = (g = a.result) == null ? void 0 : g.txid;
+      }), c = (g = o.result) == null ? void 0 : g.txid;
       if (c)
-        return l(c);
-      throw new Error(a.error);
+        return d(c);
+      throw new Error(o.error);
     }, "Error while sending bitcoin from Xverse wallet"), this.on = () => {
     }, this.off = () => {
-    }, this.disconnect = () => (this.address = "", Promise.resolve(l("Disconnected"))), v(this, n, e);
+    }, this.disconnect = () => (this.address = "", Promise.resolve(d("Disconnected"))), f(this, n, e);
   }
   async getNetwork() {
     return await w(async () => {
@@ -56,9 +55,9 @@ class X {
         null
       );
       if (e.result.bitcoin.name === h.Mainnet)
-        return d.MAINNET;
+        return l.MAINNET;
       if (e.result.bitcoin.name === h.Testnet4)
-        return d.TESTNET;
+        return l.TESTNET;
       throw new Error(e.result);
     }, "Error while getting network from Xverse wallet");
   }
@@ -66,19 +65,19 @@ class X {
     try {
       const e = await this.getNetwork();
       if (e.error)
-        return o("Failed to get current network");
-      const t = e.val === d.MAINNET ? h.Testnet4 : h.Mainnet;
+        return a("Failed to get current network");
+      const t = e.val === l.MAINNET ? h.Testnet4 : h.Mainnet;
       await i(this, n).request("wallet_changeNetwork", {
         name: t
       });
       const r = await this.getNetwork();
-      return r.error ? o("Failed to verify network switch") : l(r.val);
+      return r.ok ? d(r.val) : a("Failed to verify network switch");
     } catch (e) {
-      return o("Error while switching network in Xverse:", e);
+      return a("Error while switching network in Xverse:", e);
     }
   }
 }
 n = new WeakMap();
 export {
-  X as XverseProvider
+  T as XverseProvider
 };

package/dist/index9.cjs

@@ -1 +1 @@
-"use strict";var l=r=>{throw TypeError(r)};var u=(r,e,t)=>e.has(r)||l("Cannot "+t);var i=(r,e,t)=>(u(r,e,"read from private field"),t?t.call(r):e.get(r)),h=(r,e,t)=>e.has(r)?l("Cannot add the same private member more than once"):e instanceof WeakSet?e.add(r):e.set(r,t),w=(r,e,t,o)=>(u(r,e,"write to private field"),o?o.call(r,t):e.set(r,t),t);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const p=require("./index12.cjs"),a=require("./index3.cjs"),s=require("@catalogfi/utils"),c=require("@gardenfi/utils");var n;class d{constructor(e){h(this,n);this.address="",this.id=a.WALLET_CONFIG.Keplr.id,this.name=a.WALLET_CONFIG.Keplr.name,this.icon=a.WALLET_CONFIG.Keplr.icon,w(this,n,e)}async connect(e){if(e||(e=c.Network.MAINNET),e===c.Network.TESTNET)return s.Err("Keplr wallet does not support testnet4");try{const t=await i(this,n).requestAccounts();return t.length>0&&(this.address=t[0]),s.Ok({address:this.address,provider:this,network:e,id:a.WALLET_CONFIG.Keplr.id})}catch(t){return s.Err("Error while connecting to the Keplr wallet",t)}}async requestAccounts(){return await s.executeWithTryCatch(async()=>await i(this,n).requestAccounts(),"Error while requesting accounts from the Keplr wallet")}async getAccounts(){return await s.executeWithTryCatch(async()=>await i(this,n).getAccounts(),"Error while getting accounts from the Keplr wallet")}async getNetwork(){return await s.executeWithTryCatch(async()=>{const e=await i(this,n).getChain();if(e.enum===p.KeplrBitcoinChainType.MAINNET)return c.Network.MAINNET;if(e.enum===p.KeplrBitcoinChainType.TESTNET)return c.Network.TESTNET;throw new Error("Invalid or unsupported network"+e.enum)},"Error while getting network from the Keplr wallet")}async switchNetwork(){return s.Err("Keplr wallet does not support testnet4")}async getBalance(){return await s.executeWithTryCatch(async()=>await i(this,n).getBalance(),"Error while getting balance from Keplr wallet")}async sendBitcoin(e,t){return await s.executeWithTryCatch(async()=>await i(this,n).sendBitcoin(e,t),"Error while sending bitcoin from Keplr wallet")}on(e,t){i(this,n).on(e,t)}off(e,t){i(this,n).off(e,t)}async disconnect(){return await i(this,n).disconnect(),this.address="",s.Ok("Disconnected Keplr wallet")}}n=new WeakMap;exports.KeplrProvider=d;
+"use strict";var o=r=>{throw TypeError(r)};var l=(r,e,t)=>e.has(r)||o("Cannot "+t);var s=(r,e,t)=>(l(r,e,"read from private field"),t?t.call(r):e.get(r)),u=(r,e,t)=>e.has(r)?o("Cannot add the same private member more than once"):e instanceof WeakSet?e.add(r):e.set(r,t),h=(r,e,t,c)=>(l(r,e,"write to private field"),c?c.call(r,t):e.set(r,t),t);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const w=require("./index12.cjs"),a=require("./index3.cjs"),n=require("@gardenfi/utils");var i;class p{constructor(e){u(this,i);this.address="",this.id=a.WALLET_CONFIG.Keplr.id,this.name=a.WALLET_CONFIG.Keplr.name,this.icon=a.WALLET_CONFIG.Keplr.icon,h(this,i,e)}async connect(e){if(e||(e=n.Network.MAINNET),e===n.Network.TESTNET)return n.Err("Keplr wallet does not support testnet4");try{const t=await s(this,i).requestAccounts();return t.length>0&&(this.address=t[0]),n.Ok({address:this.address,provider:this,network:e,id:a.WALLET_CONFIG.Keplr.id})}catch(t){return n.Err("Error while connecting to the Keplr wallet",t)}}async requestAccounts(){return await n.executeWithTryCatch(async()=>await s(this,i).requestAccounts(),"Error while requesting accounts from the Keplr wallet")}async getAccounts(){return await n.executeWithTryCatch(async()=>await s(this,i).getAccounts(),"Error while getting accounts from the Keplr wallet")}async getNetwork(){return await n.executeWithTryCatch(async()=>{const e=await s(this,i).getChain();if(e.enum===w.KeplrBitcoinChainType.MAINNET)return n.Network.MAINNET;if(e.enum===w.KeplrBitcoinChainType.TESTNET)return n.Network.TESTNET;throw new Error("Invalid or unsupported network"+e.enum)},"Error while getting network from the Keplr wallet")}async switchNetwork(){return n.Err("Keplr wallet does not support testnet4")}async getBalance(){return await n.executeWithTryCatch(async()=>await s(this,i).getBalance(),"Error while getting balance from Keplr wallet")}async sendBitcoin(e,t){return await n.executeWithTryCatch(async()=>await s(this,i).sendBitcoin(e,t),"Error while sending bitcoin from Keplr wallet")}on(e,t){s(this,i).on(e,t)}off(e,t){s(this,i).off(e,t)}async disconnect(){return await s(this,i).disconnect(),this.address="",n.Ok("Disconnected Keplr wallet")}}i=new WeakMap;exports.KeplrProvider=p;

package/dist/index9.js

@@ -5,10 +5,9 @@ var h = (r, t, e) => t.has(r) || u("Cannot " + e);
 var s = (r, t, e) => (h(r, t, "read from private field"), e ? e.call(r) : t.get(r)), w = (r, t, e) => t.has(r) ? u("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(r) : t.set(r, e), p = (r, t, e, l) => (h(r, t, "write to private field"), l ? l.call(r, e) : t.set(r, e), e);
 import { KeplrBitcoinChainType as d } from "./index12.js";
 import { WALLET_CONFIG as a } from "./index3.js";
-import { Err as c, Ok as f, executeWithTryCatch as i } from "@catalogfi/utils";
-import { Network as o } from "@gardenfi/utils";
+import { Network as o, Err as c, Ok as E, executeWithTryCatch as i } from "@gardenfi/utils";
 var n;
-class T {
+class K {
   constructor(t) {
     w(this, n);
     this.address = "", this.id = a.Keplr.id, this.name = a.Keplr.name, this.icon = a.Keplr.icon, p(this, n, t);
@@ -18,7 +17,7 @@ class T {
       return c("Keplr wallet does not support testnet4");
     try {
       const e = await s(this, n).requestAccounts();
-      return e.length > 0 && (this.address = e[0]), f({
+      return e.length > 0 && (this.address = e[0]), E({
         address: this.address,
         provider: this,
         network: t,
@@ -60,10 +59,10 @@ class T {
     s(this, n).off(t, e);
   }
   async disconnect() {
-    return await s(this, n).disconnect(), this.address = "", f("Disconnected Keplr wallet");
+    return await s(this, n).disconnect(), this.address = "", E("Disconnected Keplr wallet");
   }
 }
 n = new WeakMap();
 export {
-  T as KeplrProvider
+  K as KeplrProvider
 };

package/dist/src/bitcoin/bitcoin.types.d.ts

@@ -1,5 +1,4 @@
-import { AsyncResult } from '@catalogfi/utils';
-import { Network } from '@gardenfi/utils';
+import { AsyncResult, Network } from '@gardenfi/utils';
 import { WALLET_CONFIG } from './constants';
 
 export type Balance = {

package/dist/src/bitcoin/btcWalletsProvider.types.d.ts

@@ -1,6 +1,5 @@
-import { AsyncResult, Result } from '@catalogfi/utils';
 import { IInjectedBitcoinProvider } from './bitcoin.types';
-import { IStore, Network } from '@gardenfi/utils';
+import { AsyncResult, IStore, Network, Result } from '@gardenfi/utils';
 
 export type AvailableWallets = {
     [key: string]: IInjectedBitcoinProvider;

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

@@ -1,7 +1,6 @@
-import { Connect, IInjectedBitcoinProvider } from 'src/bitcoin/bitcoin.types';
+import { Connect, IInjectedBitcoinProvider } from '../../bitcoin.types';
 import { KeplrBitcoinProvider } from './keplr.types';
-import { AsyncResult } from '@catalogfi/utils';
-import { Network } from '@gardenfi/utils';
+import { AsyncResult, Network, Ok } from '@gardenfi/utils';
 
 export declare class KeplrProvider implements IInjectedBitcoinProvider {
     #private;
@@ -11,17 +10,17 @@ export declare class KeplrProvider implements IInjectedBitcoinProvider {
     icon: "https://garden-finance.imgix.net/wallets/keplr.svg";
     constructor(provider: KeplrBitcoinProvider);
     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>>;
+    requestAccounts(): Promise<import('@gardenfi/utils').Result<string[], string>>;
+    getAccounts(): Promise<import('@gardenfi/utils').Result<string[], string>>;
+    getNetwork(): Promise<import('@gardenfi/utils').Result<Network, string>>;
     switchNetwork(): AsyncResult<Network, string>;
-    getBalance(): Promise<import('@catalogfi/utils').Result<{
+    getBalance(): Promise<import('@gardenfi/utils').Result<{
         confirmed: number;
         unconfirmed: number;
         total: number;
     }, string>>;
-    sendBitcoin(toAddress: string, satoshis: number): Promise<import('@catalogfi/utils').Result<string, string>>;
+    sendBitcoin(toAddress: string, satoshis: number): Promise<import('@gardenfi/utils').Result<string, string>>;
     on(event: string, callback: (data: any) => void): void;
     off(event: string, callback: (data: any) => void): void;
-    disconnect(): Promise<import('@catalogfi/utils').Result<string, never>>;
+    disconnect(): Promise<Ok<string>>;
 }

package/dist/src/bitcoin/providers/okx/okx.types.d.ts

@@ -1,4 +1,4 @@
-import { SelectedAccount } from 'src/bitcoin/bitcoin.types';
+import { SelectedAccount } from '../../bitcoin.types';
 import { Network } from '@gardenfi/utils';
 
 export interface OKXBitcoinProvider {

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

@@ -1,7 +1,6 @@
-import { AsyncResult } from '@catalogfi/utils';
 import { Connect, IInjectedBitcoinProvider } from '../../bitcoin.types';
 import { OKXBitcoinProvider } from './okx.types';
-import { Network } from '@gardenfi/utils';
+import { AsyncResult, Network } from '@gardenfi/utils';
 
 export declare class OKXProvider implements IInjectedBitcoinProvider {
     #private;

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

@@ -1,7 +1,6 @@
 import { Connect, IInjectedBitcoinProvider } from '../../bitcoin.types';
 import { PhantomBitcoinProvider } from './phantom.types';
-import { AsyncResult } from '@catalogfi/utils';
-import { Network } from '@gardenfi/utils';
+import { AsyncResult, Network, Ok } from '@gardenfi/utils';
 
 export declare class PhantomProvider implements IInjectedBitcoinProvider {
     #private;
@@ -11,9 +10,9 @@ export declare class PhantomProvider implements IInjectedBitcoinProvider {
     icon: "https://garden-finance.imgix.net/wallets/phantom.svg";
     constructor(phantomProvider: PhantomBitcoinProvider);
     connect(network?: Network): AsyncResult<Connect, string>;
-    requestAccounts(): Promise<import('@catalogfi/utils').Result<string[], string>>;
+    requestAccounts(): Promise<import('@gardenfi/utils').Result<string[], string>>;
     getAccounts(): AsyncResult<string[], string>;
-    getNetwork(): Promise<import('@catalogfi/utils').Result<Network, never>>;
+    getNetwork(): Promise<Ok<Network>>;
     switchNetwork(): AsyncResult<Network, string>;
     getBalance(): AsyncResult<{
         confirmed: number;

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

@@ -1,7 +1,6 @@
 import { UnisatBitcoinProvider } from './unisat.types';
-import { AsyncResult } from '@catalogfi/utils';
 import { Connect, IInjectedBitcoinProvider } from '../../bitcoin.types';
-import { Network } from '@gardenfi/utils';
+import { AsyncResult, Network } from '@gardenfi/utils';
 
 export declare class UnisatProvider implements IInjectedBitcoinProvider {
     #private;
@@ -11,16 +10,16 @@ export declare class UnisatProvider implements IInjectedBitcoinProvider {
     icon: "https://garden-finance.imgix.net/wallets/unisat.svg";
     constructor(unisatProvider: UnisatBitcoinProvider, network: Network);
     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>>;
+    requestAccounts(): Promise<import('@gardenfi/utils').Result<string[], string>>;
+    getAccounts(): Promise<import('@gardenfi/utils').Result<string[], string>>;
+    getNetwork(): Promise<import('@gardenfi/utils').Result<Network, string>>;
     switchNetwork(): AsyncResult<Network, string>;
-    getBalance(): Promise<import('@catalogfi/utils').Result<{
+    getBalance(): Promise<import('@gardenfi/utils').Result<{
         confirmed: number;
         unconfirmed: number;
         total: number;
     }, string>>;
-    sendBitcoin(toAddress: string, satoshis: number): Promise<import('@catalogfi/utils').Result<string, string>>;
+    sendBitcoin(toAddress: string, satoshis: number): Promise<import('@gardenfi/utils').Result<string, string>>;
     on(event: string, callback: (data: any) => void): void;
     off(event: string, callback: (data: any) => void): void;
     disconnect: () => AsyncResult<string, string>;

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

@@ -1,7 +1,6 @@
-import { AsyncResult } from '@catalogfi/utils';
 import { Connect, IInjectedBitcoinProvider } from '../../bitcoin.types';
 import { XdefiBitcoinProvider } from './xdefi.types';
-import { Network } from '@gardenfi/utils';
+import { AsyncResult, Err, Network, Ok } from '@gardenfi/utils';
 
 export declare class XdefiProvider implements IInjectedBitcoinProvider {
     #private;
@@ -11,13 +10,13 @@ export declare class XdefiProvider implements IInjectedBitcoinProvider {
     icon: "https://garden-finance.s3.ap-south-2.amazonaws.com/wallets/xdefi.svg";
     constructor(xdefiProvider: XdefiBitcoinProvider);
     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, never>>;
+    requestAccounts(): Promise<import('@gardenfi/utils').Result<string[], string>>;
+    getAccounts(): Promise<import('@gardenfi/utils').Result<string[], string>>;
+    getNetwork(): Promise<Ok<Network>>;
     switchNetwork(): AsyncResult<Network, string>;
-    getPublicKey(): Promise<import('@catalogfi/utils').Result<never, string>>;
-    getBalance(): Promise<import('@catalogfi/utils').Result<never, string> | import('@catalogfi/utils').Result<import('../../bitcoin.types').Balance, never>>;
-    sendBitcoin: (toAddress: string, satoshis: number) => Promise<import('@catalogfi/utils').Result<string, never> | import('@catalogfi/utils').Result<never, any>>;
+    getPublicKey(): Promise<Err<string>>;
+    getBalance(): Promise<Err<string> | Ok<import('../../bitcoin.types').Balance>>;
+    sendBitcoin: (toAddress: string, satoshis: number) => Promise<Ok<string> | Err<any>>;
     on: (event: string, callback: (data: any) => void) => void;
     off: (event: string, callback: (data: any) => void) => void;
     disconnect: () => AsyncResult<string, string>;

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

@@ -1,7 +1,6 @@
 import { Balance, Connect, IInjectedBitcoinProvider } from '../../bitcoin.types';
 import { XVerseBitcoinProvider } from './xverse.types';
-import { AsyncResult } from '@catalogfi/utils';
-import { Network } from '@gardenfi/utils';
+import { AsyncResult, Network } from '@gardenfi/utils';
 
 export declare class XverseProvider implements IInjectedBitcoinProvider {
     #private;
@@ -11,11 +10,11 @@ export declare class XverseProvider implements IInjectedBitcoinProvider {
     icon: "https://cdn.prod.website-files.com/624b08d53d7ac60ccfc11d8d/64637a04ad4e523a3e07675c_32x32.png";
     constructor(provider: XVerseBitcoinProvider);
     connect: (network?: Network) => AsyncResult<Connect, string>;
-    getBalance: () => Promise<import('@catalogfi/utils').Result<Balance, string>>;
+    getBalance: () => Promise<import('@gardenfi/utils').Result<Balance, string>>;
     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('@gardenfi/utils').Result<Network, string>>;
     switchNetwork(): AsyncResult<Network, string>;
     /**
      * not available in XVerse wallet

package/dist/src/bitcoin/utils.d.ts

@@ -1,5 +1,4 @@
-import { AsyncResult } from '@catalogfi/utils';
 import { Balance } from './bitcoin.types';
-import { Network } from '@gardenfi/utils';
+import { AsyncResult, Network } from '@gardenfi/utils';
 
 export declare const getBalance: (address: string, network: Network) => AsyncResult<Balance, string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gardenfi/wallet-connectors",
-  "version": "2.0.9",
+  "version": "2.0.10-beta.1",
   "type": "module",
   "scripts": {
     "build": "vite build",
@@ -36,9 +36,8 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@catalogfi/utils": "^0.1.11",
-    "@catalogfi/wallets": "^0.2.54",
-    "@gardenfi/utils": "2.1.3",
+    "@gardenfi/core": "2.1.13-beta.1",
+    "@gardenfi/utils": "2.1.3-beta.19",
     "axios": "^1.7.9",
     "bitcoinjs-lib": "^6.1.7",
     "react": "^18.3.1",