@gardenfi/react-hooks 0.0.1-beta.97 → 0.0.1-beta.99

package/dist/index2.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("react"),x=require("wagmi"),z=require("./index4.cjs"),A=require("./index3.cjs"),u=require("@gardenfi/core"),n=require("@catalogfi/utils"),G=require("@gardenfi/orderbook"),v=require("@catalogfi/wallets"),q=require("@gardenfi/utils"),K=require("./index5.cjs"),R=a.createContext({isExecuting:!1}),Q=({children:b,config:r})=>{const[c,S]=a.useState(),[l,U]=a.useState(),[s,N]=a.useState(),[O,y]=a.useState(),_=a.useMemo(()=>!!(c&&l&&s&&O),[c,l,s,O]),h=a.useMemo(()=>new u.Quote(r.quoteUrl),[r.quoteUrl]),B=a.useMemo(()=>{const e=r.network===v.BitcoinNetwork.Mainnet?"mainnet":r.network===v.BitcoinNetwork.Testnet?"testnet":void 0;return r.blockNumberFetcherUrl&&e?new u.BlockNumberFetcher(r.blockNumberFetcherUrl,e):void 0},[r.blockNumberFetcherUrl,r.network]),P=a.useMemo(()=>new v.BitcoinProvider(r.network,r.bitcoinRPCUrl),[r.network,r.bitcoinRPCUrl]),{data:i}=x.useWalletClient(),{initializeSecretManager:M}=z.useSecretManager(S),{orderbook:m}=A.useOrderbook(r.orderBookUrl,s,y,B),f=async()=>{if(!i||!s)return n.Err("WalletClient or auth not initialized");const e=await M();if(e.error)return n.Err(e.error);const o=v.BitcoinWallet.fromPrivateKey(e.val.getMasterPrivKey(),P),t=new u.Garden({orderbookURl:r.orderBookUrl,secretManager:e.val,quote:h,auth:s,wallets:{evmWallet:i,btcWallet:o},blockNumberFetcher:B});return U(t),n.Ok(t)},g=async e=>{if(!m||!i||!s)return n.Err("Orderbook or walletClient or auth not initialized");let o=l;if(!c||!o){const C=await f();if(C.error)return n.Err(C.error);o=C.val}const t=await o.swap(e);if(t.error)return n.Err(t.error);if(G.isBitcoin(t.val.source_swap.chain))return n.Ok(t.val);const d=await u.switchOrAddNetwork(e.fromAsset.chain,i);if(d.error)return n.Err("Failed to switch network: "+d.error);const p=d.val.walletClient,w=await new u.EvmRelay(t.val,r.orderBookUrl,s).init(p);if(w.error)return n.Err(w.error);const k={...t.val,source_swap:{...t.val.source_swap,initiate_tx_hash:w.val}};return n.Ok(k)},F=async e=>{if(!i||!s)return n.Err("Orderbook or walletClient or auth not initialized");let o=l;if(!c||!o){const k=await f();if(k.error)return n.Err(k.error);o=k.val}if(G.isBitcoin(e.source_swap.chain))return n.Err("Not an EVM order: sourceSwap.chain is Bitcoin");const t=await u.switchOrAddNetwork(e.source_swap.chain,i);if(t.error)return n.Err("Failed to switch network: "+t.error);const d=t.val.walletClient,E=await new u.EvmRelay(e,r.orderBookUrl,s).init(d);if(E.error)return n.Err(E.error);const w={...e,source_swap:{...e.source_swap,initiate_tx_hash:E.val}};return n.Ok(w)},W=async({fromAsset:e,toAsset:o,amount:t,isExactOut:d=!1})=>await h.getQuote(K.constructOrderpair(e,o),t,d);return a.useEffect(()=>{if(!i)return;const e=new q.Siwe(new q.Url(r.orderBookUrl),i,{store:r.store});N(e)},[i]),a.useEffect(()=>{if(!c||!i||!m||!s)return;const e=v.BitcoinWallet.fromPrivateKey(c.getMasterPrivKey(),P),o=new u.Garden({orderbookURl:r.orderBookUrl,secretManager:c,quote:h,auth:s,wallets:{evmWallet:i,btcWallet:e},blockNumberFetcher:B});U(o)},[c,i,m,s]),a.useEffect(()=>{if(!l)return;const e=l.execute(),o=t=>y(t);return l.on("onPendingOrdersChanged",o),()=>{(async()=>(await e)())(),l.off("onPendingOrdersChanged",o)}},[l]),a.createElement(R.Provider,{value:{orderBookUrl:r.orderBookUrl,initializeSecretManager:M,orderBook:m,swap:g,pendingOrders:O,getQuote:W,secretManager:c,garden:l,isExecuting:_,evmInitiate:F,quote:h}},b)},$=()=>{const b=a.useContext(R);if(!b)throw new Error("useGarden must be used within a GardenProvider");return b};exports.GardenContext=R;exports.GardenProvider=Q;exports.useGarden=$;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("react"),x=require("wagmi"),z=require("./index4.cjs"),A=require("./index3.cjs"),d=require("@gardenfi/core"),n=require("@catalogfi/utils"),G=require("@gardenfi/orderbook"),v=require("@catalogfi/wallets"),q=require("@gardenfi/utils"),K=require("./index5.cjs"),R=a.createContext({isExecuting:!1}),Q=({children:b,config:r})=>{const[c,S]=a.useState(),[l,U]=a.useState(),[i,g]=a.useState(),[C,y]=a.useState(),N=a.useMemo(()=>!!(c&&l&&i&&C),[c,l,i,C]),h=a.useMemo(()=>new d.Quote(r.quoteUrl),[r.quoteUrl]),O=a.useMemo(()=>{const e=r.network===v.BitcoinNetwork.Mainnet?"mainnet":r.network===v.BitcoinNetwork.Testnet?"testnet":void 0;return r.blockNumberFetcherUrl&&e?new d.BlockNumberFetcher(r.blockNumberFetcherUrl,e):void 0},[r.blockNumberFetcherUrl,r.network]),P=a.useMemo(()=>new v.BitcoinProvider(r.network,r.bitcoinRPCUrl),[r.network,r.bitcoinRPCUrl]),{data:s}=x.useWalletClient(),{initializeSecretManager:M}=z.useSecretManager(S),{orderbook:m}=A.useOrderbook(r.orderBookUrl,i,y,O),f=async()=>{if(!s||!i)return n.Err("WalletClient or auth not initialized");const e=await M();if(e.error)return n.Err(e.error);const o=v.BitcoinWallet.fromPrivateKey(e.val.getMasterPrivKey(),P),t=new d.Garden({orderbookURl:r.orderBookUrl,secretManager:e.val,quote:h,auth:i,wallets:{evmWallet:s,btcWallet:o},blockNumberFetcher:O});return U(t),n.Ok(t)},W=async e=>{if(!m||!s||!i)return n.Err("Orderbook or walletClient or auth not initialized");let o=l;if(!c||!o){const B=await f();if(B.error)return n.Err(B.error);o=B.val}const t=await o.swap(e);if(t.error)return n.Err(t.error);if(G.isBitcoin(t.val.source_swap.chain))return n.Ok(t.val);const u=await d.switchOrAddNetwork(e.fromAsset.chain,s);if(u.error)return n.Err("Failed to switch network: "+u.error);const p=u.val.walletClient,w=await new d.EvmRelay(t.val,r.orderBookUrl,i).init(p);if(w.error)return n.Err(w.error);const k={...t.val,source_swap:{...t.val.source_swap,initiate_tx_hash:w.val}};return n.Ok(k)},_=async e=>{if(console.log("walletClient inside evmInitiate :",s),!s||!i)return n.Err("Orderbook or walletClient or auth not initialized");if(G.isBitcoin(e.source_swap.chain))return n.Err("Not an EVM order: sourceSwap.chain is Bitcoin");let o=l;if(!c||!o){const k=await f();if(k.error)return n.Err(k.error);o=k.val}const t=await d.switchOrAddNetwork(e.source_swap.chain,s);if(t.error)return n.Err("Failed to switch network: "+t.error);const u=t.val.walletClient;console.log("newWalletClient :",u);const E=await new d.EvmRelay(e,r.orderBookUrl,i).init(u);if(E.error)return n.Err(E.error);const w={...e,source_swap:{...e.source_swap,initiate_tx_hash:E.val}};return n.Ok(w)},F=async({fromAsset:e,toAsset:o,amount:t,isExactOut:u=!1})=>await h.getQuote(K.constructOrderpair(e,o),t,u);return a.useEffect(()=>{if(!s)return;const e=new q.Siwe(new q.Url(r.orderBookUrl),s,{store:r.store});g(e)},[s]),a.useEffect(()=>{if(!c||!s||!m||!i)return;const e=v.BitcoinWallet.fromPrivateKey(c.getMasterPrivKey(),P),o=new d.Garden({orderbookURl:r.orderBookUrl,secretManager:c,quote:h,auth:i,wallets:{evmWallet:s,btcWallet:e},blockNumberFetcher:O});U(o)},[c,s,m,i]),a.useEffect(()=>{if(!l)return;const e=l.execute(),o=t=>y(t);return l.on("onPendingOrdersChanged",o),()=>{(async()=>(await e)())(),l.off("onPendingOrdersChanged",o)}},[l]),a.createElement(R.Provider,{value:{orderBookUrl:r.orderBookUrl,initializeSecretManager:M,orderBook:m,swap:W,pendingOrders:C,getQuote:F,secretManager:c,garden:l,isExecuting:N,evmInitiate:_,quote:h}},b)},$=()=>{const b=a.useContext(R);if(!b)throw new Error("useGarden must be used within a GardenProvider");return b};exports.GardenContext=R;exports.GardenProvider=Q;exports.useGarden=$;

package/dist/index2.js

@@ -1,24 +1,24 @@
-import S, { createContext as T, useState as k, useMemo as b, useEffect as R } from "react";
+import E, { createContext as T, useState as k, useMemo as b, useEffect as R } from "react";
 import { useWalletClient as V } from "wagmi";
 import { useSecretManager as j } from "./index4.js";
 import { useOrderbook as D } from "./index3.js";
 import { Quote as H, BlockNumberFetcher as J, Garden as F, switchOrAddNetwork as G, EvmRelay as N } from "@gardenfi/core";
 import { Err as i, Ok as p } from "@catalogfi/utils";
-import { isBitcoin as x } from "@gardenfi/orderbook";
-import { BitcoinNetwork as W, BitcoinProvider as L, BitcoinWallet as E } from "@catalogfi/wallets";
+import { isBitcoin as W } from "@gardenfi/orderbook";
+import { BitcoinNetwork as x, BitcoinProvider as L, BitcoinWallet as g } from "@catalogfi/wallets";
 import { Siwe as X, Url as Y } from "@gardenfi/utils";
 import { constructOrderpair as Z } from "./index5.js";
-const g = T({
+const S = T({
   isExecuting: !1
 }), ce = ({
   children: w,
   config: r
 }) => {
-  const [l, z] = k(), [s, B] = k(), [n, K] = k(), [f, P] = k(), q = b(
-    () => !!(l && s && n && f),
-    [l, s, n, f]
-  ), m = b(() => new H(r.quoteUrl), [r.quoteUrl]), U = b(() => {
-    const e = r.network === W.Mainnet ? "mainnet" : r.network === W.Testnet ? "testnet" : void 0;
+  const [l, z] = k(), [s, B] = k(), [a, K] = k(), [f, P] = k(), q = b(
+    () => !!(l && s && a && f),
+    [l, s, a, f]
+  ), m = b(() => new H(r.quoteUrl), [r.quoteUrl]), C = b(() => {
+    const e = r.network === x.Mainnet ? "mainnet" : r.network === x.Testnet ? "testnet" : void 0;
     return r.blockNumberFetcherUrl && e ? new J(
       r.blockNumberFetcherUrl,
       e
@@ -26,50 +26,50 @@ const g = T({
   }, [r.blockNumberFetcherUrl, r.network]), y = b(
     () => new L(r.network, r.bitcoinRPCUrl),
     [r.network, r.bitcoinRPCUrl]
-  ), { data: a } = V(), { initializeSecretManager: O } = j(z), { orderbook: v } = D(
+  ), { data: n } = V(), { initializeSecretManager: O } = j(z), { orderbook: v } = D(
     r.orderBookUrl,
-    n,
+    a,
     P,
-    U
+    C
   ), M = async () => {
-    if (!a || !n)
+    if (!n || !a)
       return i("WalletClient or auth not initialized");
     const e = await O();
     if (e.error) return i(e.error);
-    const o = E.fromPrivateKey(
+    const o = g.fromPrivateKey(
       e.val.getMasterPrivKey(),
       y
     ), t = new F({
       orderbookURl: r.orderBookUrl,
       secretManager: e.val,
       quote: m,
-      auth: n,
+      auth: a,
       wallets: {
-        evmWallet: a,
+        evmWallet: n,
         btcWallet: o
       },
-      blockNumberFetcher: U
+      blockNumberFetcher: C
     });
     return B(t), p(t);
   }, A = async (e) => {
-    if (!v || !a || !n)
+    if (!v || !n || !a)
       return i("Orderbook or walletClient or auth not initialized");
     let o = s;
     if (!l || !o) {
-      const C = await M();
-      if (C.error) return i(C.error);
-      o = C.val;
+      const U = await M();
+      if (U.error) return i(U.error);
+      o = U.val;
     }
     const t = await o.swap(e);
     if (t.error) return i(t.error);
-    if (x(t.val.source_swap.chain)) return p(t.val);
+    if (W(t.val.source_swap.chain)) return p(t.val);
     const c = await G(
       e.fromAsset.chain,
-      a
+      n
     );
     if (c.error)
       return i("Failed to switch network: " + c.error);
-    const _ = c.val.walletClient, u = await new N(t.val, r.orderBookUrl, n).init(_);
+    const _ = c.val.walletClient, u = await new N(t.val, r.orderBookUrl, a).init(_);
     if (u.error) return i(u.error);
     const d = {
       ...t.val,
@@ -80,23 +80,25 @@ const g = T({
     };
     return p(d);
   }, Q = async (e) => {
-    if (!a || !n)
+    if (console.log("walletClient inside evmInitiate :", n), !n || !a)
       return i("Orderbook or walletClient or auth not initialized");
+    if (W(e.source_swap.chain))
+      return i("Not an EVM order: sourceSwap.chain is Bitcoin");
     let o = s;
     if (!l || !o) {
       const d = await M();
       if (d.error) return i(d.error);
       o = d.val;
     }
-    if (x(e.source_swap.chain))
-      return i("Not an EVM order: sourceSwap.chain is Bitcoin");
     const t = await G(
       e.source_swap.chain,
-      a
+      n
     );
     if (t.error)
       return i("Failed to switch network: " + t.error);
-    const c = t.val.walletClient, h = await new N(e, r.orderBookUrl, n).init(c);
+    const c = t.val.walletClient;
+    console.log("newWalletClient :", c);
+    const h = await new N(e, r.orderBookUrl, a).init(c);
     if (h.error) return i(h.error);
     const u = {
       ...e,
@@ -117,36 +119,36 @@ const g = T({
     c
   );
   return R(() => {
-    if (!a) return;
-    const e = new X(new Y(r.orderBookUrl), a, {
+    if (!n) return;
+    const e = new X(new Y(r.orderBookUrl), n, {
       store: r.store
     });
     K(e);
-  }, [a]), R(() => {
-    if (!l || !a || !v || !n) return;
-    const e = E.fromPrivateKey(
+  }, [n]), R(() => {
+    if (!l || !n || !v || !a) return;
+    const e = g.fromPrivateKey(
       l.getMasterPrivKey(),
       y
     ), o = new F({
       orderbookURl: r.orderBookUrl,
       secretManager: l,
       quote: m,
-      auth: n,
+      auth: a,
       wallets: {
-        evmWallet: a,
+        evmWallet: n,
         btcWallet: e
       },
-      blockNumberFetcher: U
+      blockNumberFetcher: C
     });
     B(o);
-  }, [l, a, v, n]), R(() => {
+  }, [l, n, v, a]), R(() => {
     if (!s) return;
     const e = s.execute(), o = (t) => P(t);
     return s.on("onPendingOrdersChanged", o), () => {
       (async () => (await e)())(), s.off("onPendingOrdersChanged", o);
     };
-  }, [s]), /* @__PURE__ */ S.createElement(
-    g.Provider,
+  }, [s]), /* @__PURE__ */ E.createElement(
+    S.Provider,
     {
       value: {
         orderBookUrl: r.orderBookUrl,
@@ -165,13 +167,13 @@ const g = T({
     w
   );
 }, ue = () => {
-  const w = S.useContext(g);
+  const w = E.useContext(S);
   if (!w)
     throw new Error("useGarden must be used within a GardenProvider");
   return w;
 };
 export {
-  g as GardenContext,
+  S as GardenContext,
   ce as GardenProvider,
   ue as useGarden
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gardenfi/react-hooks",
-  "version": "0.0.1-beta.97",
+  "version": "0.0.1-beta.99",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -28,7 +28,7 @@
   "dependencies": {
     "@catalogfi/utils": "^0.1.6",
     "@catalogfi/wallets": "^0.2.51",
-    "@gardenfi/core": "^0.2.0-beta.77",
+    "@gardenfi/core": "^0.2.0-beta.78",
     "@gardenfi/orderbook": "^0.2.0-beta.19",
     "@gardenfi/utils": "^0.0.1-beta.18",
     "react": "^18.3.1",