@gardenfi/react-hooks 0.0.1-beta.102 → 0.0.1-beta.104

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

package/dist/index2.js

@@ -1,44 +1,44 @@
-import S, { createContext as T, useState as b, useMemo as m, useEffect as R } from "react";
+import g, { createContext as T, useState as b, useMemo as m, useEffect as B } 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 E } 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: v,
+  children: h,
   config: r
 }) => {
-  const [l, z] = b(), [s, B] = b(), [n, K] = b(), [f, P] = b(), q = m(
+  const [l, z] = b(), [s, P] = b(), [n, A] = b(), [f, y] = b(), K = m(
     () => !!(l && s && n && f),
     [l, s, n, f]
   ), u = m(() => new H(r.quoteUrl), [r.quoteUrl]), U = m(() => {
-    const e = r.network === W.Mainnet ? "mainnet" : r.network === W.Testnet ? "testnet" : void 0;
+    const e = r.network === x.Mainnet ? "mainnet" : r.network === x.Testnet ? "testnet" : void 0;
     return r.blockNumberFetcherUrl && e ? new J(
       r.blockNumberFetcherUrl,
       e
     ) : void 0;
-  }, [r.blockNumberFetcherUrl, r.network]), y = m(
+  }, [r.blockNumberFetcherUrl, r.network]), O = m(
     () => new L(r.network, r.bitcoinRPCUrl),
     [r.network, r.bitcoinRPCUrl]
-  ), { data: a } = V(), { initializeSecretManager: O } = j(z), { orderbook: h } = D(
+  ), { data: a } = V(), { initializeSecretManager: M } = j(z), { orderbook: v } = D(
     r.orderBookUrl,
     n,
-    P,
+    y,
     U
-  ), M = async () => {
+  ), _ = async () => {
     if (!a || !n)
       return i("WalletClient or auth not initialized");
-    const e = await O();
+    const e = await M();
     if (e.error) return i(e.error);
     const o = E.fromPrivateKey(
       e.val.getMasterPrivKey(),
-      y
+      O
     ), t = new F({
       orderbookURl: r.orderBookUrl,
       secretManager: e.val,
@@ -50,26 +50,28 @@ const g = T({
       },
       blockNumberFetcher: U
     });
-    return B(t), p(t);
-  }, A = async (e) => {
-    if (!h || !a || !n)
+    return P(t), p(t);
+  }, q = async (e) => {
+    if (!v || !a || !n)
       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 R = await _();
+      if (R.error) return i(R.error);
+      o = R.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
     );
     if (c.error)
       return i("Failed to switch network: " + c.error);
-    const _ = c.val.walletClient, d = await new N(t.val, r.orderBookUrl, n).init(_);
+    const C = c.val.walletClient;
+    console.log("new Wallet client after switch", C);
+    const d = await new N(t.val, r.orderBookUrl, n).init(C);
     if (d.error) return i(d.error);
     const w = {
       ...t.val,
@@ -82,11 +84,11 @@ const g = T({
   }, Q = async (e) => {
     if (!a || !n)
       return i("Orderbook or walletClient or auth not initialized");
-    if (x(e.source_swap.chain))
+    if (W(e.source_swap.chain))
       return i("Not an EVM order: sourceSwap.chain is Bitcoin");
     let o = s;
     if (!l || !o) {
-      const w = await M();
+      const w = await _();
       if (w.error) return i(w.error);
       o = w.val;
     }
@@ -114,17 +116,17 @@ const g = T({
     ),
     [u]
   );
-  return R(() => {
+  return B(() => {
     if (!a) return;
     const e = new X(new Y(r.orderBookUrl), a, {
       store: r.store
     });
-    K(e);
-  }, [a]), R(() => {
-    if (!l || !a || !h || !n) return;
+    A(e);
+  }, [a]), B(() => {
+    if (!l || !a || !v || !n) return;
     const e = E.fromPrivateKey(
       l.getMasterPrivKey(),
-      y
+      O
     ), o = new F({
       orderbookURl: r.orderBookUrl,
       secretManager: l,
@@ -136,40 +138,40 @@ const g = T({
       },
       blockNumberFetcher: U
     });
-    B(o);
-  }, [l, a, h, n]), R(() => {
+    P(o);
+  }, [l, a, v, n]), B(() => {
     if (!s) return;
-    const e = s.execute(), o = (t) => P(t);
+    const e = s.execute(), o = (t) => y(t);
     return s.on("onPendingOrdersChanged", o), () => {
       (async () => (await e)())(), s.off("onPendingOrdersChanged", o);
     };
-  }, [s]), /* @__PURE__ */ S.createElement(
-    g.Provider,
+  }, [s]), /* @__PURE__ */ g.createElement(
+    S.Provider,
     {
       value: {
         orderBookUrl: r.orderBookUrl,
-        initializeSecretManager: O,
-        orderBook: h,
-        swap: A,
+        initializeSecretManager: M,
+        orderBook: v,
+        swapAndInitiate: q,
         pendingOrders: f,
         getQuote: I,
         secretManager: l,
         garden: s,
-        isExecuting: q,
+        isExecuting: K,
         evmInitiate: Q,
         quote: u
       }
     },
-    v
+    h
   );
 }, ue = () => {
-  const v = S.useContext(g);
-  if (!v)
+  const h = g.useContext(S);
+  if (!h)
     throw new Error("useGarden must be used within a GardenProvider");
-  return v;
+  return h;
 };
 export {
-  g as GardenContext,
+  S as GardenContext,
   ce as GardenProvider,
   ue as useGarden
 };

package/dist/src/lib/context/gardenProvider.types.d.ts

@@ -21,7 +21,7 @@ export type GardenContextType = {
      * @params {SwapParams} - The parameters for creating the order.
      * @returns {AsyncResult<string, string>} - create order ID.
      */
-    swap?: (params: SwapParams) => AsyncResult<MatchedOrder, string>;
+    swapAndInitiate?: (params: SwapParams) => AsyncResult<MatchedOrder, string>;
     /**
      * Get all the pending orders of the user. This will return all the orders that are yet to be initiated, redeemed, or refunded.
      * It will not return orders that have expired (deadline expiry).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gardenfi/react-hooks",
-  "version": "0.0.1-beta.102",
+  "version": "0.0.1-beta.104",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -29,7 +29,7 @@
     "@catalogfi/utils": "^0.1.6",
     "@catalogfi/wallets": "^0.2.51",
     "@gardenfi/core": "^0.2.0-beta.81",
-    "@gardenfi/orderbook": "^0.2.0-beta.20",
+    "@gardenfi/orderbook": "^0.2.0-beta.24",
     "@gardenfi/utils": "^0.0.1-beta.18",
     "react": "^18.3.1",
     "viem": "^2.21.15",