@gardenfi/orderbook 0.2.0-beta.0 → 0.2.0-beta.10

package/dist/index.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("./index2.cjs"),t=require("./index3.cjs"),s=require("./index4.cjs"),e=require("./index5.cjs");exports.Orderbook=r.Orderbook;exports.Chains=t.Chains;exports.isBitcoin=t.isBitcoin;exports.isEVM=t.isEVM;exports.isMainnet=t.isMainnet;exports.OrdersProvider=s.OrdersProvider;exports.ArbitrumLocalnet=e.ArbitrumLocalnet;exports.EthereumLocalnet=e.EthereumLocalnet;exports.WBTCArbitrumLocalnetAsset=e.WBTCArbitrumLocalnetAsset;exports.WBTCEthereumLocalnetAsset=e.WBTCEthereumLocalnetAsset;exports.bitcoinRegtestAsset=e.bitcoinRegtestAsset;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("./index2.cjs"),e=require("./index3.cjs"),s=require("./index4.cjs"),t=require("./index5.cjs");exports.Orderbook=r.Orderbook;exports.BlockchainType=e.BlockchainType;exports.Chains=e.Chains;exports.getBlockchainType=e.getBlockchainType;exports.isBitcoin=e.isBitcoin;exports.isEVM=e.isEVM;exports.isMainnet=e.isMainnet;exports.OrdersProvider=s.OrdersProvider;exports.ArbitrumLocalnet=t.ArbitrumLocalnet;exports.EthereumLocalnet=t.EthereumLocalnet;exports.SupportedAssets=t.SupportedAssets;exports.WBTCArbitrumLocalnetAsset=t.WBTCArbitrumLocalnetAsset;exports.WBTCEthereumLocalnetAsset=t.WBTCEthereumLocalnetAsset;exports.bitcoinRegtestAsset=t.bitcoinRegtestAsset;

package/dist/index.js

@@ -1,17 +1,20 @@
-import { Orderbook as t } from "./index2.js";
-import { Chains as i, isBitcoin as s, isEVM as n, isMainnet as m } from "./index3.js";
-import { OrdersProvider as c } from "./index4.js";
-import { ArbitrumLocalnet as b, EthereumLocalnet as f, WBTCArbitrumLocalnetAsset as l, WBTCEthereumLocalnetAsset as p, bitcoinRegtestAsset as u } from "./index5.js";
+import { Orderbook as r } from "./index2.js";
+import { BlockchainType as s, Chains as i, getBlockchainType as n, isBitcoin as c, isEVM as a, isMainnet as m } from "./index3.js";
+import { OrdersProvider as l } from "./index4.js";
+import { ArbitrumLocalnet as h, EthereumLocalnet as u, SupportedAssets as B, WBTCArbitrumLocalnetAsset as b, WBTCEthereumLocalnetAsset as d, bitcoinRegtestAsset as f } from "./index5.js";
 export {
-  b as ArbitrumLocalnet,
+  h as ArbitrumLocalnet,
+  s as BlockchainType,
   i as Chains,
-  f as EthereumLocalnet,
-  t as Orderbook,
-  c as OrdersProvider,
-  l as WBTCArbitrumLocalnetAsset,
-  p as WBTCEthereumLocalnetAsset,
-  u as bitcoinRegtestAsset,
-  s as isBitcoin,
-  n as isEVM,
+  u as EthereumLocalnet,
+  r as Orderbook,
+  l as OrdersProvider,
+  B as SupportedAssets,
+  b as WBTCArbitrumLocalnetAsset,
+  d as WBTCEthereumLocalnetAsset,
+  f as bitcoinRegtestAsset,
+  n as getBlockchainType,
+  c as isBitcoin,
+  a as isEVM,
   m as isMainnet
 };

package/dist/index2.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("@catalogfi/utils"),c=require("./index6.cjs"),h=require("./index7.cjs"),u=require("@gardenfi/utils"),f=require("./index4.cjs"),O=require("./index3.cjs");class A extends f.OrdersProvider{constructor(r){var s;const t=new u.Url("/relayer",r.url??h.MAINNET_ORDERBOOK_API);super(t),this.Url=t,this.walletClient=r.walletClient,this.auth=new u.Siwe(this.Url,r.walletClient,{...r.opts,store:((s=r.opts)==null?void 0:s.store)||new u.MemoryStorage})}static async init(r){return await new u.Siwe(new u.Url("/relayer",r.url??h.MAINNET_ORDERBOOK_API),r.walletClient,r.opts).getToken(),new A(r)}async createOrder(r){const{sendAmount:t,secretHash:s,receiveAmount:n,fromAsset:i,toAsset:a,receiveAddress:o,sendAddress:_,minDestinationConfirmations:w=0,timelock:p,btcInputAddress:m}=r,E=this.validateConfig(r);if(E.error)return e.Err(E.error);const l=await this.auth.getToken();if(l.error)return e.Err(l.error);const S={additional_data:{bitcoin_optional_recipient:m??""}},I={nonce:r.nonce,source_amount:t,destination_amount:n,source_asset:i.atomicSwapAddress,destination_asset:a.atomicSwapAddress,secret_hash:e.trim0x(s),source_chain:i.chain,destination_chain:a.chain,initiator_source_address:_,initiator_destination_address:o,min_destination_confirmations:w,timelock:p,...S,fee:"1"};try{const d=await e.Fetcher.post(this.Url.endpoint("create-order"),{body:JSON.stringify(I),headers:{Authorization:u.Authorization(l.val),"Content-Type":"application/json"}});return d.error?e.Err(d.error):d.result?e.Ok(d.result):e.Err("CreateOrder: Unexpected error, result is undefined")}catch(d){return e.Err("CreateOrder:",String(d))}}async fetchOrders(r,t=!1,s){var i;const n=(i=this.walletClient.account)==null?void 0:i.address;return n?r?await super.getMatchedOrders(n,t,s):await super.getUnMatchedOrders(n,s):e.Err("Wallet client does not have an account")}async subscribeToOrders(r,t,s,n,i){var o;const a=(o=this.walletClient.account)==null?void 0:o.address;return a?await super.subscribeOrders(a,r,t,s,n,i):()=>{}}async getUserOrdersCount(){var t;const r=(t=this.walletClient.account)==null?void 0:t.address;return r?super.getOrdersCount(r):e.Err("Wallet client does not have an account")}validateConfig(r){const{sendAmount:t,receiveAmount:s,toAsset:n,fromAsset:i}=r;if(n.atomicSwapAddress.toLowerCase()===i.atomicSwapAddress.toLowerCase()&&n.chain===i.chain)return e.Err(c.OrderbookErrors.SAME_ASSET);if(!O.isBitcoin(n.chain)&&!n.atomicSwapAddress||!O.isBitcoin(i.chain)&&!i.atomicSwapAddress)return e.Err(c.OrderbookErrors.INVALID_AS_ADDRESS);if(!n.tokenAddress||!i.tokenAddress)return e.Err(c.OrderbookErrors.INVALID_TOKEN);const a=BigInt(t),o=BigInt(s);return t==null||a<=0n||t.includes(".")?e.Err(c.OrderbookErrors.INVALID_SEND_AMOUNT):s==null||o<=0n||s.includes(".")?e.Err(c.OrderbookErrors.INVALID_RECEIVE_AMOUNT):a<o?e.Err(c.OrderbookErrors.RECEIVE_AMOUNT_GREATER):e.Ok(e.Void)}}exports.Orderbook=A;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("@catalogfi/utils"),d=require("./index6.cjs"),l=require("@gardenfi/utils"),o=require("./index4.cjs");class i extends o.OrdersProvider{constructor(r){const e=new l.Url("/relayer",r.url??d.MAINNET_ORDERBOOK_API);super(e),this.Url=e,this.walletClient=r.walletClient,this.auth=r.auth}static async init(r){return await r.auth.getToken(),new i(r)}async createOrder(r){const e=await this.auth.getToken();if(e.error)return s.Err(e.error);try{const t=await s.Fetcher.post(this.Url.endpoint("create-order"),{body:JSON.stringify(r),headers:{Authorization:l.Authorization(e.val),"Content-Type":"application/json"}});return t.error?s.Err(t.error):t.result?s.Ok(t.result):s.Err("CreateOrder: Unexpected error, result is undefined")}catch(t){return s.Err("CreateOrder:",String(t))}}async fetchOrders(r,e=!1,t){var n;const a=(n=this.walletClient.account)==null?void 0:n.address;return a?r?await super.getMatchedOrders(a,e,t):await super.getUnMatchedOrders(a,t):s.Err("Wallet client does not have an account")}async subscribeToOrders(r,e,t,a,n){var c;const u=(c=this.walletClient.account)==null?void 0:c.address;return u?await super.subscribeOrders(u,r,e,t,a,n):()=>{}}async getUserOrdersCount(){var e;const r=(e=this.walletClient.account)==null?void 0:e.address;return r?super.getOrdersCount(r):s.Err("Wallet client does not have an account")}}exports.Orderbook=i;

package/dist/index2.js

@@ -1,104 +1,62 @@
-import { Err as r, trim0x as y, Fetcher as D, Ok as A, Void as T } from "@catalogfi/utils";
-import { OrderbookErrors as c } from "./index6.js";
-import { MAINNET_ORDERBOOK_API as h } from "./index7.js";
-import { Url as m, Siwe as p, MemoryStorage as U, Authorization as v } from "@gardenfi/utils";
-import { OrdersProvider as C } from "./index4.js";
-import { isBitcoin as _ } from "./index3.js";
-class w extends C {
+import { Err as s, Fetcher as o, Ok as l } from "@catalogfi/utils";
+import { MAINNET_ORDERBOOK_API as d } from "./index6.js";
+import { Url as h, Authorization as O } from "@gardenfi/utils";
+import { OrdersProvider as p } from "./index4.js";
+class c extends p {
   /**
    * Creates an instance of Orderbook. Does not login to the orderbook.
    * @constructor
    * @param {OrderbookConfig} orderbookConfig - The configuration object for the orderbook.
    */
-  constructor(t) {
-    var s;
-    const e = new m(
+  constructor(r) {
+    const e = new h(
       "/relayer",
-      t.url ?? h
+      r.url ?? d
     );
-    super(e), this.Url = e, this.walletClient = t.walletClient, this.auth = new p(this.Url, t.walletClient, {
-      ...t.opts,
-      store: ((s = t.opts) == null ? void 0 : s.store) || new U()
-    });
+    super(e), this.Url = e, this.walletClient = r.walletClient, this.auth = r.auth;
   }
   /**
    * Initializes the orderbook as well as logs in the orderbook (fetches the auth token).
    * @param {OrderbookConfig} orderbookConfig - The configuration object for the orderbook.
    */
-  static async init(t) {
-    return await new p(
-      new m("/relayer", t.url ?? h),
-      t.walletClient,
-      t.opts
-    ).getToken(), new w(t);
+  static async init(r) {
+    return await r.auth.getToken(), new c(r);
   }
   /**
    * Creates an order
    * @param {CreateOrderConfig} createOrderConfig - The configuration for the creating the order.
    * @returns {string} The create order ID.
    */
-  async createOrder(t) {
-    const {
-      sendAmount: e,
-      secretHash: s,
-      receiveAmount: n,
-      fromAsset: i,
-      toAsset: a,
-      receiveAddress: o,
-      sendAddress: f,
-      minDestinationConfirmations: O = 0,
-      timelock: S,
-      btcInputAddress: E
-    } = t, l = this.validateConfig(t);
-    if (l.error) return r(l.error);
-    const u = await this.auth.getToken();
-    if (u.error) return r(u.error);
-    const I = {
-      additional_data: { bitcoin_optional_recipient: E ?? "" }
-    }, N = {
-      nonce: t.nonce,
-      source_amount: e,
-      destination_amount: n,
-      source_asset: i.atomicSwapAddress,
-      destination_asset: a.atomicSwapAddress,
-      secret_hash: y(s),
-      source_chain: i.chain,
-      destination_chain: a.chain,
-      initiator_source_address: f,
-      initiator_destination_address: o,
-      min_destination_confirmations: O,
-      timelock: S,
-      ...I,
-      //signature:''
-      fee: "1"
-    };
+  async createOrder(r) {
+    const e = await this.auth.getToken();
+    if (e.error) return s(e.error);
     try {
-      const d = await D.post(
+      const t = await o.post(
         this.Url.endpoint("create-order"),
         {
-          body: JSON.stringify(N),
+          body: JSON.stringify(r),
           headers: {
-            Authorization: v(u.val),
+            Authorization: O(e.val),
             "Content-Type": "application/json"
           }
         }
       );
-      return d.error ? r(d.error) : d.result ? A(d.result) : r("CreateOrder: Unexpected error, result is undefined");
-    } catch (d) {
-      return r("CreateOrder:", String(d));
+      return t.error ? s(t.error) : t.result ? l(t.result) : s("CreateOrder: Unexpected error, result is undefined");
+    } catch (t) {
+      return s("CreateOrder:", String(t));
     }
   }
-  async fetchOrders(t, e = !1, s) {
-    var i;
-    const n = (i = this.walletClient.account) == null ? void 0 : i.address;
-    return n ? t ? await super.getMatchedOrders(
-      n,
+  async fetchOrders(r, e = !1, t) {
+    var n;
+    const a = (n = this.walletClient.account) == null ? void 0 : n.address;
+    return a ? r ? await super.getMatchedOrders(
+      a,
       e,
-      s
+      t
     ) : await super.getUnMatchedOrders(
-      n,
-      s
-    ) : r("Wallet client does not have an account");
+      a,
+      t
+    ) : s("Wallet client does not have an account");
   }
   /**
    * Wrapper for the subscribeOrders method in the OrdersProvider class to abstract the address parameter.
@@ -108,38 +66,25 @@ class w extends C {
    * @param paginationConfig - The configuration for the pagination
    * @returns {() => void} A function to unsubscribe from the order updates
    */
-  async subscribeToOrders(t, e, s, n, i) {
-    var o;
-    const a = (o = this.walletClient.account) == null ? void 0 : o.address;
-    return a ? await super.subscribeOrders(
-      a,
-      t,
+  async subscribeToOrders(r, e, t, a, n) {
+    var u;
+    const i = (u = this.walletClient.account) == null ? void 0 : u.address;
+    return i ? await super.subscribeOrders(
+      i,
+      r,
       e,
-      s,
-      n,
-      i
+      t,
+      a,
+      n
     ) : () => {
     };
   }
   async getUserOrdersCount() {
     var e;
-    const t = (e = this.walletClient.account) == null ? void 0 : e.address;
-    return t ? super.getOrdersCount(t) : r("Wallet client does not have an account");
-  }
-  validateConfig(t) {
-    const { sendAmount: e, receiveAmount: s, toAsset: n, fromAsset: i } = t;
-    if (n.atomicSwapAddress.toLowerCase() === i.atomicSwapAddress.toLowerCase() && n.chain === i.chain)
-      return r(c.SAME_ASSET);
-    if (!_(n.chain) && !n.atomicSwapAddress)
-      return r(c.INVALID_AS_ADDRESS);
-    if (!_(i.chain) && !i.atomicSwapAddress)
-      return r(c.INVALID_AS_ADDRESS);
-    if (!n.tokenAddress || !i.tokenAddress)
-      return r(c.INVALID_TOKEN);
-    const a = BigInt(e), o = BigInt(s);
-    return e == null || a <= 0n || e.includes(".") ? r(c.INVALID_SEND_AMOUNT) : s == null || o <= 0n || s.includes(".") ? r(c.INVALID_RECEIVE_AMOUNT) : a < o ? r(c.RECEIVE_AMOUNT_GREATER) : A(T);
+    const r = (e = this.walletClient.account) == null ? void 0 : e.address;
+    return r ? super.getOrdersCount(r) : s("Wallet client does not have an account");
   }
 }
 export {
-  w as Orderbook
+  c as Orderbook
 };

package/dist/index3.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t={bitcoin:"bitcoin",bitcoin_testnet:"bitcoin_testnet",bitcoin_regtest:"bitcoin_regtest",ethereum:"ethereum",ethereum_arbitrum:"ethereum_arbitrum",ethereum_sepolia:"ethereum_sepolia",arbitrum_localnet:"arbitrum_localnet",ethereum_localnet:"ethereum_localnet"},r=e=>!(e===t.ethereum_sepolia||e===t.bitcoin_testnet||e===t.bitcoin_regtest||e===t.arbitrum_localnet||e===t.ethereum_localnet),i=e=>e===t.bitcoin||e===t.bitcoin_testnet||e===t.bitcoin_regtest,o=e=>e===t.ethereum||e===t.ethereum_arbitrum||e===t.ethereum_sepolia||e===t.ethereum_localnet||e===t.arbitrum_localnet;exports.Chains=t;exports.isBitcoin=i;exports.isEVM=o;exports.isMainnet=r;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});var r=(e=>(e.Bitcoin="Bitcoin",e.EVM="EVM",e))(r||{});const t={bitcoin:"bitcoin",bitcoin_testnet:"bitcoin_testnet",bitcoin_regtest:"bitcoin_regtest",ethereum:"ethereum",ethereum_arbitrum:"ethereum_arbitrum",ethereum_sepolia:"ethereum_sepolia",arbitrum_localnet:"arbitrum_localnet",arbitrum_sepolia:"arbitrum_sepolia",ethereum_localnet:"ethereum_localnet"},n=e=>!(e===t.ethereum_sepolia||e===t.bitcoin_testnet||e===t.bitcoin_regtest||e===t.arbitrum_localnet||e===t.ethereum_localnet||e===t.arbitrum_sepolia),i=e=>e===t.bitcoin||e===t.bitcoin_testnet||e===t.bitcoin_regtest,o=e=>e===t.ethereum||e===t.ethereum_arbitrum||e===t.ethereum_sepolia||e===t.ethereum_localnet||e===t.arbitrum_localnet||e===t.arbitrum_sepolia,u=e=>{if(i(e))return"Bitcoin";if(o(e))return"EVM";throw new Error("Invalid or unsupported chain")};exports.BlockchainType=r;exports.Chains=t;exports.getBlockchainType=u;exports.isBitcoin=i;exports.isEVM=o;exports.isMainnet=n;

package/dist/index3.js

@@ -1,3 +1,4 @@
+var r = /* @__PURE__ */ ((e) => (e.Bitcoin = "Bitcoin", e.EVM = "EVM", e))(r || {});
 const t = {
   bitcoin: "bitcoin",
   bitcoin_testnet: "bitcoin_testnet",
@@ -6,11 +7,18 @@ const t = {
   ethereum_arbitrum: "ethereum_arbitrum",
   ethereum_sepolia: "ethereum_sepolia",
   arbitrum_localnet: "arbitrum_localnet",
+  arbitrum_sepolia: "arbitrum_sepolia",
   ethereum_localnet: "ethereum_localnet"
-}, r = (e) => !(e === t.ethereum_sepolia || e === t.bitcoin_testnet || e === t.bitcoin_regtest || e === t.arbitrum_localnet || e === t.ethereum_localnet), i = (e) => e === t.bitcoin || e === t.bitcoin_testnet || e === t.bitcoin_regtest, o = (e) => e === t.ethereum || e === t.ethereum_arbitrum || e === t.ethereum_sepolia || e === t.ethereum_localnet || e === t.arbitrum_localnet;
+}, u = (e) => !(e === t.ethereum_sepolia || e === t.bitcoin_testnet || e === t.bitcoin_regtest || e === t.arbitrum_localnet || e === t.ethereum_localnet || e === t.arbitrum_sepolia), i = (e) => e === t.bitcoin || e === t.bitcoin_testnet || e === t.bitcoin_regtest, o = (e) => e === t.ethereum || e === t.ethereum_arbitrum || e === t.ethereum_sepolia || e === t.ethereum_localnet || e === t.arbitrum_localnet || e === t.arbitrum_sepolia, n = (e) => {
+  if (i(e)) return "Bitcoin";
+  if (o(e)) return "EVM";
+  throw new Error("Invalid or unsupported chain");
+};
 export {
+  r as BlockchainType,
   t as Chains,
+  n as getBlockchainType,
   i as isBitcoin,
   o as isEVM,
-  r as isMainnet
+  u as isMainnet
 };

package/dist/index4.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("@catalogfi/utils"),l=require("@gardenfi/utils"),d=require("./index8.cjs");class O{constructor(s){this.url=new l.Url("/orders",s)}async getOrder(s,c){const t=c?`/id/matched/${s}`:`/id/unmatched/${s}`,n=this.url.endpoint(t);try{const e=await r.Fetcher.get(n);return e.error?r.Err(e.error):e.result?r.Ok(e.result):r.Err("GetOrder: Unexpected error, result is undefined")}catch(e){return r.Err("GetOrder:",String(e))}}async getMatchedOrders(s,c,t){const n=d.ConstructUrl(this.url,`/user/matched/${s}`,{...t,pending:c});try{const e=await r.Fetcher.get(n);return e.error?r.Err(e.error):e.result?r.Ok(e.result):r.Err("GetMatchedOrders: Unexpected error, result is undefined")}catch(e){return r.Err("GetMatchedOrders:",String(e))}}async getUnMatchedOrders(s,c){const t=d.ConstructUrl(this.url,`/user/unmatched/${s}`,c);try{const n=await r.Fetcher.get(t);return n.error?r.Err(n.error):n.result?r.Ok(n.result):r.Err("GetUnMatchedOrders: Unexpected error, result is undefined")}catch(n){return r.Err("GetUnMatchedOrders:",String(n))}}async getOrders(s,c){const t=s?"/matched":"/unmatched",n=d.ConstructUrl(this.url,t,c);try{const e=await r.Fetcher.get(n);return e.error?r.Err(e.error):e.result?r.Ok(e.result):r.Err("GetAllOrders: Unexpected error, result is undefined")}catch(e){return r.Err("GetAllOrders:",String(e))}}async subscribeOrders(s,c,t,n,e=!1,i){let o=!1;const a=async()=>{if(!o){o=!0;try{const u=c?await this.getMatchedOrders(s,e,i):await this.getUnMatchedOrders(s,i);u.ok?await n(u.val):console.error("Error fetching orders:",u.error)}catch(u){console.error("Error fetching orders:",u)}finally{o=!1}}};await a();const h=setInterval(a,t);return()=>{clearInterval(h)}}async getOrdersCount(s){const c=this.url.endpoint(`/user/count/${s}`);try{const t=await r.Fetcher.get(c);return t.error?r.Err(t.error):t.status===l.ApiStatus.Ok&&t.result!==void 0?r.Ok(t.result):r.Err("GetOrdersCount: Unexpected error, result is undefined")}catch(t){return r.Err("GetOrdersCount:",String(t))}}}exports.OrdersProvider=O;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("@catalogfi/utils"),l=require("@gardenfi/utils"),d=require("./index7.cjs");class O{constructor(s){this.url=new l.Url("/orders",s)}async getOrder(s,c){const t=c?`/id/matched/${s}`:`/id/unmatched/${s}`,n=this.url.endpoint(t);try{const e=await r.Fetcher.get(n);return e.error?r.Err(e.error):e.result?r.Ok(e.result):r.Err("GetOrder: Unexpected error, result is undefined")}catch(e){return r.Err("GetOrder:",String(e))}}async getMatchedOrders(s,c,t){const n=d.ConstructUrl(this.url,`/user/matched/${s}`,{...t,pending:c});try{const e=await r.Fetcher.get(n);return e.error?r.Err(e.error):e.result?r.Ok(e.result):r.Err("GetMatchedOrders: Unexpected error, result is undefined")}catch(e){return r.Err("GetMatchedOrders:",String(e))}}async getUnMatchedOrders(s,c){const t=d.ConstructUrl(this.url,`/user/unmatched/${s}`,c);try{const n=await r.Fetcher.get(t);return n.error?r.Err(n.error):n.result?r.Ok(n.result):r.Err("GetUnMatchedOrders: Unexpected error, result is undefined")}catch(n){return r.Err("GetUnMatchedOrders:",String(n))}}async getOrders(s,c){const t=s?"/matched":"/unmatched",n=d.ConstructUrl(this.url,t,c);try{const e=await r.Fetcher.get(n);return e.error?r.Err(e.error):e.result?r.Ok(e.result):r.Err("GetAllOrders: Unexpected error, result is undefined")}catch(e){return r.Err("GetAllOrders:",String(e))}}async subscribeOrders(s,c,t,n,e=!1,i){let o=!1;const a=async()=>{if(!o){o=!0;try{const u=c?await this.getMatchedOrders(s,e,i):await this.getUnMatchedOrders(s,i);u.ok?await n(u.val):console.error("Error fetching orders:",u.error)}catch(u){console.error("Error fetching orders:",u)}finally{o=!1}}};await a();const h=setInterval(a,t);return()=>{clearInterval(h)}}async getOrdersCount(s){const c=this.url.endpoint(`/user/count/${s}`);try{const t=await r.Fetcher.get(c);return t.error?r.Err(t.error):t.status===l.ApiStatus.Ok&&t.result!==void 0?r.Ok(t.result):r.Err("GetOrdersCount: Unexpected error, result is undefined")}catch(t){return r.Err("GetOrdersCount:",String(t))}}}exports.OrdersProvider=O;

package/dist/index4.js

@@ -1,6 +1,6 @@
 import { Fetcher as u, Err as s, Ok as d } from "@catalogfi/utils";
 import { Url as f, ApiStatus as g } from "@gardenfi/utils";
-import { ConstructUrl as i } from "./index8.js";
+import { ConstructUrl as i } from "./index7.js";
 class w {
   constructor(t) {
     this.url = new f("/orders", t);

package/dist/index5.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index3.cjs"),t={id:31338,name:"Arbitrum Localnet",nativeCurrency:{name:"Ethereum",symbol:"ETH",decimals:18},rpcUrls:{default:{http:["http://localhost:8546/"]}},testnet:!0},s={id:31337,name:"Ethereum Localnet",nativeCurrency:{name:"Ethereum",symbol:"ETH",decimals:18},rpcUrls:{default:{http:["http://localhost:8545/"]}},testnet:!0},a={name:"Bitcoin Regtest",decimals:8,symbol:"BTC",chain:e.Chains.bitcoin_regtest,atomicSwapAddress:"primary",tokenAddress:"primary",isToken:!0},r={name:"WBTC Arbitrum Localnet",decimals:8,symbol:"WBTC",chain:e.Chains.arbitrum_localnet,atomicSwapAddress:"0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9",tokenAddress:"0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512",isToken:!0},n={name:"WBTC Ethereum Localnet",decimals:8,symbol:"WBTC",chain:e.Chains.ethereum_localnet,atomicSwapAddress:"0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512",tokenAddress:"0x5FbDB2315678afecb367f032d93F642f64180aa3",isToken:!0};exports.ArbitrumLocalnet=t;exports.EthereumLocalnet=s;exports.WBTCArbitrumLocalnetAsset=r;exports.WBTCEthereumLocalnetAsset=n;exports.bitcoinRegtestAsset=a;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index3.cjs"),a={id:31338,name:"Arbitrum Localnet",nativeCurrency:{name:"Ethereum",symbol:"ETH",decimals:18},rpcUrls:{default:{http:["http://localhost:8546/"]}},testnet:!0},n={id:31337,name:"Ethereum Localnet",nativeCurrency:{name:"Ethereum",symbol:"ETH",decimals:18},rpcUrls:{default:{http:["http://localhost:8545/"]}},testnet:!0},r={name:"Bitcoin Regtest",decimals:8,symbol:"BTC",chain:e.Chains.bitcoin_regtest,atomicSwapAddress:"primary",tokenAddress:"primary"},t={name:"WBTC Arbitrum Localnet",decimals:8,symbol:"WBTC",chain:e.Chains.arbitrum_localnet,atomicSwapAddress:"0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9",tokenAddress:"0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512"},s={name:"WBTC Ethereum Localnet",decimals:8,symbol:"WBTC",chain:e.Chains.ethereum_localnet,atomicSwapAddress:"0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512",tokenAddress:"0x5FbDB2315678afecb367f032d93F642f64180aa3"},c={localnet:{[e.Chains.arbitrum_localnet]:t,[e.Chains.ethereum_localnet]:s},testnet:{[e.Chains.bitcoin_testnet]:{name:"BTC",decimals:8,symbol:"BTC",chain:e.Chains.bitcoin_testnet,tokenAddress:"primary",atomicSwapAddress:"primary"},[e.Chains.ethereum_sepolia]:{name:"WBTC",decimals:8,symbol:"WBTC",chain:e.Chains.ethereum_sepolia,tokenAddress:"0x00ab86f54F436CfE15253845F139955ae0C00bAf",atomicSwapAddress:"0x1cd0bBd55fD66B4C5F7dfE434eFD009C09e628d1"},[e.Chains.arbitrum_sepolia]:{name:"WBTC",decimals:8,symbol:"WBTC",chain:e.Chains.ethereum_sepolia,tokenAddress:"0x4D68da063577F98C55166c7AF6955cF58a97b20A",atomicSwapAddress:"0x3C6a17b8cD92976D1D91E491c93c98cd81998265"}},mainnet:{}};exports.ArbitrumLocalnet=a;exports.EthereumLocalnet=n;exports.SupportedAssets=c;exports.WBTCArbitrumLocalnetAsset=t;exports.WBTCEthereumLocalnetAsset=s;exports.bitcoinRegtestAsset=r;

package/dist/index5.js

@@ -1,5 +1,5 @@
 import { Chains as e } from "./index3.js";
-const a = {
+const c = {
   id: 31338,
   name: "Arbitrum Localnet",
   nativeCurrency: {
@@ -13,7 +13,7 @@ const a = {
     }
   },
   testnet: !0
-}, s = {
+}, r = {
   id: 31337,
   name: "Ethereum Localnet",
   nativeCurrency: {
@@ -27,35 +27,65 @@ const a = {
     }
   },
   testnet: !0
-}, r = {
+}, n = {
   name: "Bitcoin Regtest",
   decimals: 8,
   symbol: "BTC",
   chain: e.bitcoin_regtest,
   atomicSwapAddress: "primary",
-  tokenAddress: "primary",
-  isToken: !0
-}, n = {
+  tokenAddress: "primary"
+}, t = {
   name: "WBTC Arbitrum Localnet",
   decimals: 8,
   symbol: "WBTC",
   chain: e.arbitrum_localnet,
   atomicSwapAddress: "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9",
-  tokenAddress: "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512",
-  isToken: !0
-}, c = {
+  tokenAddress: "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512"
+}, a = {
   name: "WBTC Ethereum Localnet",
   decimals: 8,
   symbol: "WBTC",
   chain: e.ethereum_localnet,
   atomicSwapAddress: "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512",
-  tokenAddress: "0x5FbDB2315678afecb367f032d93F642f64180aa3",
-  isToken: !0
+  tokenAddress: "0x5FbDB2315678afecb367f032d93F642f64180aa3"
+}, m = {
+  localnet: {
+    [e.arbitrum_localnet]: t,
+    [e.ethereum_localnet]: a
+  },
+  testnet: {
+    [e.bitcoin_testnet]: {
+      name: "BTC",
+      decimals: 8,
+      symbol: "BTC",
+      chain: e.bitcoin_testnet,
+      tokenAddress: "primary",
+      atomicSwapAddress: "primary"
+    },
+    [e.ethereum_sepolia]: {
+      name: "WBTC",
+      decimals: 8,
+      symbol: "WBTC",
+      chain: e.ethereum_sepolia,
+      tokenAddress: "0x00ab86f54F436CfE15253845F139955ae0C00bAf",
+      atomicSwapAddress: "0x1cd0bBd55fD66B4C5F7dfE434eFD009C09e628d1"
+    },
+    [e.arbitrum_sepolia]: {
+      name: "WBTC",
+      decimals: 8,
+      symbol: "WBTC",
+      chain: e.ethereum_sepolia,
+      tokenAddress: "0x4D68da063577F98C55166c7AF6955cF58a97b20A",
+      atomicSwapAddress: "0x3C6a17b8cD92976D1D91E491c93c98cd81998265"
+    }
+  },
+  mainnet: {}
 };
 export {
-  a as ArbitrumLocalnet,
-  s as EthereumLocalnet,
-  n as WBTCArbitrumLocalnetAsset,
-  c as WBTCEthereumLocalnetAsset,
-  r as bitcoinRegtestAsset
+  c as ArbitrumLocalnet,
+  r as EthereumLocalnet,
+  m as SupportedAssets,
+  t as WBTCArbitrumLocalnetAsset,
+  a as WBTCEthereumLocalnetAsset,
+  n as bitcoinRegtestAsset
 };

package/dist/index6.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e={INVALID_SEND_AMOUNT:"invalid send amount",INVALID_RECEIVE_AMOUNT:"invalid receive amount",UNSUPPORTED_CHAIN:"unsupported chain",SAME_ASSET:"cannot create orderpair with the same assets",INVALID_AS_ADDRESS:"invalid atomic swap address",INVALID_TOKEN:"invalid token address",INVALID_AMOUNTS:"invalid amounts",RECEIVE_AMOUNT_GREATER:"receive amount is greater than send amount"};exports.OrderbookErrors=e;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e="https://api.garden.finance";exports.MAINNET_ORDERBOOK_API=e;

package/dist/index6.js

@@ -1,13 +1,4 @@
-const a = {
-  INVALID_SEND_AMOUNT: "invalid send amount",
-  INVALID_RECEIVE_AMOUNT: "invalid receive amount",
-  UNSUPPORTED_CHAIN: "unsupported chain",
-  SAME_ASSET: "cannot create orderpair with the same assets",
-  INVALID_AS_ADDRESS: "invalid atomic swap address",
-  INVALID_TOKEN: "invalid token address",
-  INVALID_AMOUNTS: "invalid amounts",
-  RECEIVE_AMOUNT_GREATER: "receive amount is greater than send amount"
-};
+const n = "https://api.garden.finance";
 export {
-  a as OrderbookErrors
+  n as MAINNET_ORDERBOOK_API
 };

package/dist/index7.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e="https://api.garden.finance";exports.MAINNET_ORDERBOOK_API=e;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=(n,o,t)=>{const r=n.endpoint(o);return t&&Object.entries(t).forEach(([c,e])=>{e!==void 0&&r.searchParams.append(c,e.toString())}),r};exports.ConstructUrl=i;

package/dist/index7.js

@@ -1,4 +1,9 @@
-const n = "https://api.garden.finance";
+const i = (o, e, t) => {
+  const r = o.endpoint(e);
+  return t && Object.entries(t).forEach(([c, n]) => {
+    n !== void 0 && r.searchParams.append(c, n.toString());
+  }), r;
+};
 export {
-  n as MAINNET_ORDERBOOK_API
+  i as ConstructUrl
 };

package/dist/src/index.d.ts

@@ -1,7 +1,7 @@
 export { Orderbook } from './lib/orderbook/orderbook';
 export type * from './lib/orderbook/orderbook.types';
 export type { Chain, EvmChain, Asset } from './lib/asset';
-export { Chains, isMainnet, isBitcoin, isEVM } from './lib/asset';
+export { Chains, BlockchainType, isMainnet, isBitcoin, isEVM, getBlockchainType, } from './lib/asset';
 export { OrdersProvider } from './lib/orders/ordersProvider';
 export type { IOrderProvider } from './lib/orders/orders.types';
-export { WBTCArbitrumLocalnetAsset, WBTCEthereumLocalnetAsset, ArbitrumLocalnet, EthereumLocalnet, bitcoinRegtestAsset, } from './lib/constants';
+export { WBTCArbitrumLocalnetAsset, WBTCEthereumLocalnetAsset, ArbitrumLocalnet, EthereumLocalnet, bitcoinRegtestAsset, SupportedAssets, } from './lib/constants';

package/dist/src/lib/asset.d.ts

@@ -8,9 +8,12 @@ export type AssetCommon = {
 };
 export type AssetToken = AssetCommon & {
     tokenAddress: string;
-    isToken: true;
 };
 export type Asset = AssetToken;
+export declare enum BlockchainType {
+    Bitcoin = "Bitcoin",
+    EVM = "EVM"
+}
 export declare enum NetworkType {
     mainnet = "mainnet",
     testnet = "testnet",
@@ -34,10 +37,12 @@ export declare const Chains: {
     readonly ethereum_arbitrum: "ethereum_arbitrum";
     readonly ethereum_sepolia: "ethereum_sepolia";
     readonly arbitrum_localnet: "arbitrum_localnet";
+    readonly arbitrum_sepolia: "arbitrum_sepolia";
     readonly ethereum_localnet: "ethereum_localnet";
 };
 export type Chain = keyof typeof Chains;
 export type EvmChain = keyof Omit<typeof Chains, 'bitcoin' | 'bitcoin_testnet' | 'bitcoin_regtest'>;
 export declare const isMainnet: (chain: Chain) => chain is "bitcoin" | "ethereum" | "ethereum_arbitrum";
 export declare const isBitcoin: (chain: Chain) => chain is "bitcoin" | "bitcoin_testnet" | "bitcoin_regtest";
-export declare const isEVM: (chain: Chain) => chain is "ethereum" | "ethereum_arbitrum" | "ethereum_sepolia" | "arbitrum_localnet" | "ethereum_localnet";
+export declare const isEVM: (chain: Chain) => chain is "ethereum" | "ethereum_arbitrum" | "ethereum_sepolia" | "arbitrum_localnet" | "arbitrum_sepolia" | "ethereum_localnet";
+export declare const getBlockchainType: (chain: Chain) => BlockchainType;

package/dist/src/lib/constants.d.ts

@@ -6,3 +6,10 @@ export declare const EthereumLocalnet: Chain;
 export declare const bitcoinRegtestAsset: Asset;
 export declare const WBTCArbitrumLocalnetAsset: Asset;
 export declare const WBTCEthereumLocalnetAsset: Asset;
+type SupportedAssets = {
+    [chain: string]: {
+        [asset: string]: Asset;
+    };
+};
+export declare const SupportedAssets: SupportedAssets;
+export {};

package/dist/src/lib/orderbook/orderbook.d.ts

@@ -1,5 +1,5 @@
 import { AsyncResult } from '@catalogfi/utils';
-import { CreateOrder, CreateOrderConfig, IOrderbook, MatchedOrder, OrderbookConfig, PaginatedData, PaginationConfig } from './orderbook.types';
+import { CreateOrder, CreateOrderRequestWithAdditionalData, IOrderbook, MatchedOrder, OrderbookConfig, PaginatedData, PaginationConfig } from './orderbook.types';
 import { OrdersProvider } from '../orders/ordersProvider';
 
 /**
@@ -28,7 +28,7 @@ export declare class Orderbook extends OrdersProvider implements IOrderbook {
      * @param {CreateOrderConfig} createOrderConfig - The configuration for the creating the order.
      * @returns {string} The create order ID.
      */
-    createOrder(createOrderConfig: CreateOrderConfig): AsyncResult<string, string>;
+    createOrder(order: CreateOrderRequestWithAdditionalData): AsyncResult<string, string>;
     fetchOrders<T extends boolean>(matched: T, pending?: boolean, paginationConfig?: PaginationConfig): AsyncResult<PaginatedData<T extends true ? MatchedOrder : CreateOrder>, string>;
     /**
      * Wrapper for the subscribeOrders method in the OrdersProvider class to abstract the address parameter.
@@ -40,5 +40,4 @@ export declare class Orderbook extends OrdersProvider implements IOrderbook {
      */
     subscribeToOrders<T extends boolean>(matched: T, interval: number, cb: (orders: PaginatedData<T extends true ? MatchedOrder : CreateOrder>) => Promise<void>, pending?: boolean, paginationConfig?: PaginationConfig): Promise<() => void>;
     getUserOrdersCount(): AsyncResult<number, string>;
-    private validateConfig;
 }

package/dist/src/lib/orderbook/orderbook.types.d.ts

@@ -1,6 +1,6 @@
 import { WalletClient } from 'viem';
 import { AsyncResult } from '@catalogfi/utils';
-import { APIResponse, IStore } from '@gardenfi/utils';
+import { APIResponse, IAuth, IStore } from '@gardenfi/utils';
 import { Asset, Chain } from '../asset';
 import { IOrderProvider } from '../orders/orders.types';
 
@@ -78,7 +78,7 @@ export type OrderbookOpts = {
 export interface OrderbookConfig {
     url?: string;
     walletClient: WalletClient;
-    opts?: OrderbookOpts;
+    auth: IAuth;
 }
 /**
  * Configuration for the orders you want to receive
@@ -99,7 +99,7 @@ export interface IOrderbook extends IOrderProvider {
      * @param {CreateOrderConfig} orderConfig - The configuration for the creating the order.
      * @returns {number} The create order ID.
      */
-    createOrder(orderConfig: CreateOrderConfig): AsyncResult<string, string>;
+    createOrder(order: CreateOrderRequestWithAdditionalData): AsyncResult<string, string>;
     /**
      * Wrapper for the getOrder method in the OrdersProvider class to abstract the address parameter.
      * @param matched - Whether to get matched or unmatched orders
@@ -132,6 +132,25 @@ export type Orders = {
     unmatched: PaginatedData<CreateOrder[]>;
     matched: PaginatedData<MatchedOrder[]>;
 };
+export type AdditionalData = {
+    additional_data: {
+        strategy_id: string;
+        sig: string;
+        input_token_price: number;
+        output_token_price: number;
+        deadline: string;
+        bitcoin_optional_recipient?: string;
+        [key: string]: any;
+    };
+};
+export type AdditionalDataWithStrategyId = {
+    additional_data: {
+        strategy_id: string;
+        bitcoin_optional_recipient?: string;
+        [key: string]: any;
+    };
+};
+export type CreateOrderReqWithStrategyId = CreateOrderRequest & AdditionalDataWithStrategyId;
 export type CreateOrderRequest = {
     source_chain: string;
     destination_chain: string;
@@ -146,11 +165,9 @@ export type CreateOrderRequest = {
     min_destination_confirmations: number;
     timelock: number;
     secret_hash: string;
-    additional_data?: {
-        bitcoin_optional_recipient: string;
-    };
 };
-export type CreateOrder = CreateOrderRequest & {
+export type CreateOrderRequestWithAdditionalData = CreateOrderRequest & AdditionalData;
+export type CreateOrder = CreateOrderRequestWithAdditionalData & {
     created_at: string;
     updated_at: string;
     deleted_at: string | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gardenfi/orderbook",
-  "version": "0.2.0-beta.0",
+  "version": "0.2.0-beta.10",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -27,8 +27,7 @@
   },
   "dependencies": {
     "@catalogfi/utils": "^0.1.6",
-    "@catalogfi/wallets": "0.2.43",
-    "@gardenfi/utils": "workspace:^",
+    "@gardenfi/utils": "^0.0.1-beta.17",
     "bufferutil": "^4.0.8",
     "siwe": "^2.1.4",
     "utf-8-validate": "^6.0.3",
@@ -44,4 +43,4 @@
     "vitest": "^1.6.0"
   },
   "sideEffects": false
-}
+}

package/dist/index8.cjs

@@ -1 +0,0 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=(n,o,t)=>{const r=n.endpoint(o);return t&&Object.entries(t).forEach(([c,e])=>{e!==void 0&&r.searchParams.append(c,e.toString())}),r};exports.ConstructUrl=i;

package/dist/index8.js

@@ -1,9 +0,0 @@
-const i = (o, e, t) => {
-  const r = o.endpoint(e);
-  return t && Object.entries(t).forEach(([c, n]) => {
-    n !== void 0 && r.searchParams.append(c, n.toString());
-  }), r;
-};
-export {
-  i as ConstructUrl
-};