@hinkal/common 0.2.18 → 0.2.19

package/functions/pre-transaction/getFlatFees.mjs

@@ -3,63 +3,55 @@ import { INTERACTION as e } from "../../types/hinkal.types.mjs";
 import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
 import { getERC20Token as s } from "../utils/erc20tokenFunctions.mjs";
-import { processGasEstimates as N } from "./process-gas-estimates.mjs";
-import { getInteractionFromAction as b } from "./interaction-to-action.mjs";
-const R = async (a, n, f, k, l, T = []) => {
+import { processGasEstimates as b } from "./process-gas-estimates.mjs";
+import { getInteractionFromAction as l } from "./interaction-to-action.mjs";
+const F = async (r, i, f, m, E, I = []) => {
   let t;
-  const c = b(f);
+  const c = l(f);
   if (c === e.NONE)
     throw Error("No interaction was choosen");
-  let i;
+  let n;
   switch (c) {
     case e.WITHDRAW:
-      t = s(n[0], a);
+      t = s(i[0], r);
       break;
     case e.SWAP:
-      t = s(n[1], a);
-      break;
-    case e.STAKING:
-    case e.UNSTAKING:
-      t = s(n[1], a);
+      t = s(i[1], r);
       break;
     case e.CLAIMING:
-      t = s(n[1], a);
+      t = s(i[1], r);
       break;
     case e.EMPORIUM:
-      i = k.findIndex((p) => p > 0n), t = s(n[i], a);
+      n = m.findIndex((T) => T > 0n), t = s(i[n], r);
       break;
   }
-  let o, m;
-  const I = k.length;
-  t && ({ priceOfTransactionInToken: o, priceOfTransactionInUSD: m } = await N(
-    a,
+  let o, k;
+  const p = m.length;
+  t && ({ priceOfTransactionInToken: o, priceOfTransactionInUSD: k } = await b(
+    r,
     t,
     f,
-    I,
+    p,
     void 0,
-    T
+    I
   ));
-  const r = new Array(I).fill(0n);
+  const a = new Array(p).fill(0n);
   switch (c) {
     case e.WITHDRAW:
-      r[0] = o || 0n;
+      a[0] = o || 0n;
       break;
     case e.SWAP:
-      r[1] = o || 0n;
-      break;
-    case e.STAKING:
-    case e.UNSTAKING:
-      r[1] = o || 0n, r[0] = o || 0n;
+      a[1] = o || 0n;
       break;
     case e.CLAIMING:
-      r[1] = o || 0n;
+      a[1] = o || 0n;
       break;
     case e.EMPORIUM:
-      i !== void 0 && i !== -1 && (r[i] = o || 0n);
+      n !== void 0 && n !== -1 && (a[n] = o || 0n);
       break;
   }
-  return { flatFees: r, priceOfTransactionInToken: o, feeUnit: t, priceOfTransactionInUSD: m };
+  return { flatFees: a, priceOfTransactionInToken: o, feeUnit: t, priceOfTransactionInUSD: k };
 };
 export {
-  R as getFlatFees
+  F as getFlatFees
 };

package/functions/pre-transaction/getVolatileTransferAmount.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../error-handling/error-codes.constants.cjs");require("ethers");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");require("../../constants/server.constants.cjs");require("../../API/getServerURL.cjs");require("../../data-structures/http/HttpClient.cjs");require("axios");require("../../constants/chains.constants.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/vite.constants.cjs");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("../utils/mutexes.utils.cjs");require("@coral-xyz/anchor");const a=require("../../error-handling/logger.cjs");require("@solana/web3.js");require("../../data-structures/crypto-keys/keys.cjs");const c=require("../../API/is-tx-stateless.cjs"),f=require("../../data-structures/token-price-fetcher/TokenChecker.cjs"),d=async(s,q,n,o)=>{try{const r=q.map((e,t)=>{const i=n[t];return e&&f.TokenChecker.isPotentiallyVolatile(e)?{tokenAddress:e.erc20TokenAddress,amount:i.toString(),...o!==void 0?{targetAddress:o}:{},originalIndex:t}:null}).filter(e=>e!==null);if(r.length===0)return n;const l=await c.simulateVolatileTokenTransfer(s,r);return n.map((e,t)=>{const i=r.findIndex(u=>u.originalIndex===t);if(i!==-1&&l[i].success){const u=l[i].balanceDifference;return u?BigInt(u):e}return e})}catch(r){return a.Logger.error("Volatile transfer simulation failed:",r),n}};exports.modifyVolatileTokenAmountChanges=d;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../error-handling/error-codes.constants.cjs");require("ethers");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");require("../../constants/vite.constants.cjs");const c=require("../../error-handling/logger.cjs"),f=require("../../API/is-tx-stateless.cjs"),d=require("../../data-structures/token-price-fetcher/TokenChecker.cjs"),g=async(u,a,t,l)=>{try{const r=a.map((e,i)=>{const n=t[i];return e&&d.TokenChecker.isPotentiallyVolatile(e)?{tokenAddress:e.erc20TokenAddress,amount:n.toString(),...l!==void 0?{targetAddress:l}:{},originalIndex:i}:null}).filter(e=>e!==null);if(r.length===0)return t;const s=await f.simulateVolatileTokenTransfer(u,r);return t.map((e,i)=>{const n=r.findIndex(o=>o.originalIndex===i);if(n!==-1&&s[n].success){const o=s[n].balanceDifference;return o?BigInt(o):e}return e})}catch(r){return c.Logger.error("Volatile transfer simulation failed:",r),t}};exports.modifyVolatileTokenAmountChanges=g;

package/functions/pre-transaction/getVolatileTransferAmount.mjs

@@ -3,51 +3,36 @@ import "ethers";
 import "../../types/circom-data.types.mjs";
 import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
-import "../../constants/server.constants.mjs";
-import "../../API/getServerURL.mjs";
-import "../../data-structures/http/HttpClient.mjs";
-import "axios";
-import "../../constants/chains.constants.mjs";
-import "circomlibjs-hinkal-fork";
-import "libsodium-wrappers";
-import "process";
-import "buffer";
 import "../../constants/vite.constants.mjs";
-import "../../constants/save-depths.mjs";
-import "../../constants/reorg-depths.constants.mjs";
-import "../utils/mutexes.utils.mjs";
-import "@coral-xyz/anchor";
-import { Logger as a } from "../../error-handling/logger.mjs";
-import "@solana/web3.js";
-import "../../data-structures/crypto-keys/keys.mjs";
-import { simulateVolatileTokenTransfer as c } from "../../API/is-tx-stateless.mjs";
-import { TokenChecker as u } from "../../data-structures/token-price-fetcher/TokenChecker.mjs";
-const E = async (l, s, i, m) => {
+import { Logger as c } from "../../error-handling/logger.mjs";
+import { simulateVolatileTokenTransfer as u } from "../../API/is-tx-stateless.mjs";
+import { TokenChecker as f } from "../../data-structures/token-price-fetcher/TokenChecker.mjs";
+const V = async (m, a, t, l) => {
   try {
-    const t = s.map((r, e) => {
-      const o = i[e];
-      return r && u.isPotentiallyVolatile(r) ? {
+    const e = a.map((r, o) => {
+      const n = t[o];
+      return r && f.isPotentiallyVolatile(r) ? {
         tokenAddress: r.erc20TokenAddress,
-        amount: o.toString(),
-        ...m !== void 0 ? { targetAddress: m } : {},
-        originalIndex: e
+        amount: n.toString(),
+        ...l !== void 0 ? { targetAddress: l } : {},
+        originalIndex: o
       } : null;
     }).filter((r) => r !== null);
-    if (t.length === 0)
-      return i;
-    const p = await c(l, t);
-    return i.map((r, e) => {
-      const o = t.findIndex((n) => n.originalIndex === e);
-      if (o !== -1 && p[o].success) {
-        const n = p[o].balanceDifference;
-        return n ? BigInt(n) : r;
+    if (e.length === 0)
+      return t;
+    const s = await u(m, e);
+    return t.map((r, o) => {
+      const n = e.findIndex((i) => i.originalIndex === o);
+      if (n !== -1 && s[n].success) {
+        const i = s[n].balanceDifference;
+        return i ? BigInt(i) : r;
       }
       return r;
     });
-  } catch (t) {
-    return a.error("Volatile transfer simulation failed:", t), i;
+  } catch (e) {
+    return c.error("Volatile transfer simulation failed:", e), t;
   }
 };
 export {
-  E as modifyVolatileTokenAmountChanges
+  V as modifyVolatileTokenAmountChanges
 };

package/functions/pre-transaction/merge-with-fee-structure-emporium.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const m=require("../web3/getPublicAddressBalance.cjs"),l=require("./merge-with-fee-structure.cjs"),g=require("../private-wallet/emporium.helpers.cjs"),p=require("../../constants/protocol.constants.cjs"),F=require("../../types/ethereum-network.types.cjs"),T=require("../utils/amounts.utils.cjs"),d=async(r,n,i,c,u,e,o)=>{let t=0n;const a=o<0n?o:0n,s=await m.getPublicAddressBalance(r,e.feeToken,n)+a;s<0?t=e.flatFee:t=T.maxBigInt(e.flatFee-s,0n),t!==0n&&(l.mergeWithFeeStructure(r.getCurrentChainId(),c,u,{...e,flatFee:t}),i.push(g.createTransferToEmporiumOp(e.feeToken===p.zeroAddress?void 0:r.getContractWithFetcher(F.ContractType.ERC20Contract,e.feeToken),n,t,!1)))};exports.mergeWithFeeStructureEmporium=d;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("../web3/getPublicAddressBalance.cjs"),p=require("./merge-with-fee-structure.cjs"),g=require("../private-wallet/emporium.helpers.cjs"),F=require("../../constants/protocol.constants.cjs"),T=require("../../types/ethereum-network.types.cjs"),f=require("../utils/amounts.utils.cjs"),h=async(o,r,n,c,u,a,e,s)=>{let t=0n;const m=s<0n?s:0n,i=await l.getPublicAddressBalance(o,r,e.feeToken,n)+m;i<0?t=e.flatFee:t=f.maxBigInt(e.flatFee-i,0n),t!==0n&&(p.mergeWithFeeStructure(r,u,a,{...e,flatFee:t}),c.push(g.createTransferToEmporiumOp(e.feeToken===F.zeroAddress?void 0:o.getContractWithFetcher(r,T.ContractType.ERC20Contract,e.feeToken),n,t,!1)))};exports.mergeWithFeeStructureEmporium=h;

package/functions/pre-transaction/merge-with-fee-structure-emporium.d.ts

@@ -1,3 +1,3 @@
 import { FeeStructure } from '../../types/hinkal.types';
 import { type IHinkal } from '../../data-structures/Hinkal/IHinkal';
-export declare const mergeWithFeeStructureEmporium: (hinkal: IHinkal, walletAddress: string, emporiumOps: string[], erc20Addresses: string[], amountChanges: bigint[], feeStructure: FeeStructure, feeTokenChange: bigint) => Promise<void>;
+export declare const mergeWithFeeStructureEmporium: (hinkal: IHinkal, chainId: number, walletAddress: string, emporiumOps: string[], erc20Addresses: string[], amountChanges: bigint[], feeStructure: FeeStructure, feeTokenChange: bigint) => Promise<void>;

package/functions/pre-transaction/merge-with-fee-structure-emporium.mjs

@@ -1,24 +1,24 @@
-import { getPublicAddressBalance as s } from "../web3/getPublicAddressBalance.mjs";
-import { mergeWithFeeStructure as c } from "./merge-with-fee-structure.mjs";
-import { createTransferToEmporiumOp as T } from "../private-wallet/emporium.helpers.mjs";
-import { zeroAddress as F } from "../../constants/protocol.constants.mjs";
-import { ContractType as g } from "../../types/ethereum-network.types.mjs";
+import { getPublicAddressBalance as T } from "../web3/getPublicAddressBalance.mjs";
+import { mergeWithFeeStructure as F } from "./merge-with-fee-structure.mjs";
+import { createTransferToEmporiumOp as c } from "../private-wallet/emporium.helpers.mjs";
+import { zeroAddress as g } from "../../constants/protocol.constants.mjs";
+import { ContractType as l } from "../../types/ethereum-network.types.mjs";
 import { maxBigInt as C } from "../utils/amounts.utils.mjs";
-const u = async (t, r, i, a, f, e, n) => {
-  let o = 0n;
-  const p = n < 0n ? n : 0n, m = await s(t, e.feeToken, r) + p;
-  m < 0 ? o = e.flatFee : o = C(e.flatFee - m, 0n), o !== 0n && (c(t.getCurrentChainId(), a, f, {
-    ...e,
-    flatFee: o
-  }), i.push(
-    T(
-      e.feeToken === F ? void 0 : t.getContractWithFetcher(g.ERC20Contract, e.feeToken),
-      r,
-      o,
+const x = async (r, t, n, a, f, p, o, m) => {
+  let e = 0n;
+  const s = m < 0n ? m : 0n, i = await T(r, t, o.feeToken, n) + s;
+  i < 0 ? e = o.flatFee : e = C(o.flatFee - i, 0n), e !== 0n && (F(t, f, p, {
+    ...o,
+    flatFee: e
+  }), a.push(
+    c(
+      o.feeToken === g ? void 0 : r.getContractWithFetcher(t, l.ERC20Contract, o.feeToken),
+      n,
+      e,
       !1
     )
   ));
 };
 export {
-  u as mergeWithFeeStructureEmporium
+  x as mergeWithFeeStructureEmporium
 };

package/functions/pre-transaction/outputApprovalDataProcessing.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const U=require("../../error-handling/error-codes.constants.cjs"),p=require("../../constants/conversion.constants.cjs"),_=require("../../types/hinkal.types.cjs"),D=require("../utils/processUseApprovalUtxoData.cjs"),T=require("../utils/amounts.utils.cjs"),f=require("../utils/caseInsensitive.utils.cjs"),m=(i,d,s,O,A)=>{if(A&&A>0)throw new Error(U.transactionErrorCodes.INSUFFICIENT_FUNDS);const l=T.countTotalAmountInUtxos(d),{erc20TokenAddress:N}=d[0],c=i.getApprovedUtxosForToken(N).filter(n=>!f.caseInsensitiveEqual(n.interactionAddress,O)),r=_.defaultUseApprovalUTXOData(p.APPROVED_UTXO_CONVERSION_COUNT,0n);if(s<0n&&l+s<0n){let n=-(l+s);for(let t=0;t<Math.min(c.length,p.APPROVED_UTXO_CONVERSION_COUNT)&&n!==0n;t+=1){const a=c[t],u=a.amount>=n?-n:-a.amount;n+=u,r.approvalChanges[t]=u,r.externalApprovalAddresses[t]=a.interactionAddress,r.conversionInHinkalAddress[t]=a.inHinkalAddress}if(n!==0n)throw new Error(U.transactionErrorCodes.INSUFFICIENT_FUNDS)}return{useApprovalUtxoData:D.isUseApprovalDataEmpty(r)?void 0:r}},k=(i,d,s,O,A,l)=>{if(l&&l>0)throw new Error(U.transactionErrorCodes.INSUFFICIENT_FUNDS);const N=T.countTotalAmountInUtxos(d),{erc20TokenAddress:c}=d[0],r=_.defaultUseApprovalUTXOData(p.APPROVED_UTXO_CONVERSION_COUNT,0n),n=i.userKeys.getInHinkalAddress(s),t=i.getApprovedUtxosForToken(c).sort((e,o)=>e.inHinkalAddress===n?-1:o.inHinkalAddress===n?1:e.amount===o.amount?0:e.amount<o.amount?-1:1),a=t[0]?.inHinkalAddress===n,u=a?t[0].amount:0n,C=O-u;r.approvalChanges[0]=C,r.externalApprovalAddresses[0]=s,r.conversionInHinkalAddress[0]=i.userKeys.getInHinkalAddress(s);const E=a?1:0,v=E===0?1:0;let I=A;for(let e=E;e<Math.min(p.APPROVED_UTXO_CONVERSION_COUNT,t.length)&&!(e+v>=p.APPROVED_UTXO_CONVERSION_COUNT);e+=1){const o=t[e];I+=o.amount,r.approvalChanges[e+v]=-o.amount,r.externalApprovalAddresses[e+v]=o.interactionAddress,r.conversionInHinkalAddress[e+v]=o.inHinkalAddress}if(N+I<0n)throw new Error(U.transactionErrorCodes.INSUFFICIENT_FUNDS);return{useApprovalUtxoData:r,deltaAmountOverride:I}};exports.outputApprovalDataProcessing=m;exports.outputApprovalDataProcessingForHinkalApprove=k;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("../../error-handling/error-codes.constants.cjs"),u=require("../../constants/conversion.constants.cjs"),_=require("../../types/hinkal.types.cjs"),E=require("../utils/processUseApprovalUtxoData.cjs"),N=require("../utils/amounts.utils.cjs"),O=require("../utils/caseInsensitive.utils.cjs"),D=(d,A,n,s,v,a)=>{if(a&&a>0)throw new Error(l.transactionErrorCodes.INSUFFICIENT_FUNDS);const i=N.countTotalAmountInUtxos(n),{erc20TokenAddress:U}=n[0],c=d.getApprovedUtxosForToken(U,A).filter(t=>!O.caseInsensitiveEqual(t.interactionAddress,v)),o=_.defaultUseApprovalUTXOData(u.APPROVED_UTXO_CONVERSION_COUNT,0n);if(s<0n&&i+s<0n){let t=-(i+s);for(let e=0;e<Math.min(c.length,u.APPROVED_UTXO_CONVERSION_COUNT)&&t!==0n;e+=1){const r=c[e],p=r.amount>=t?-t:-r.amount;t+=p,o.approvalChanges[e]=p,o.externalApprovalAddresses[e]=r.interactionAddress,o.conversionInHinkalAddress[e]=r.inHinkalAddress}if(t!==0n)throw new Error(l.transactionErrorCodes.INSUFFICIENT_FUNDS)}return{useApprovalUtxoData:E.isUseApprovalDataEmpty(o)?void 0:o}};exports.outputApprovalDataProcessing=D;

package/functions/pre-transaction/outputApprovalDataProcessing.d.ts

@@ -1,17 +1,9 @@
 import { Utxo } from '../../data-structures/utxo/Utxo';
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
-export declare const outputApprovalDataProcessing: (hinkal: IHinkal, inputUtxos: Utxo[], amountChange: bigint, interactionToIgnore?: string, tokenId?: number) => {
+export declare const outputApprovalDataProcessing: (hinkal: IHinkal, chainId: number, inputUtxos: Utxo[], amountChange: bigint, interactionToIgnore?: string, tokenId?: number) => {
     useApprovalUtxoData: {
         approvalChanges: bigint[];
         externalApprovalAddresses: string[];
         conversionInHinkalAddress: bigint[];
     } | undefined;
 };
-export declare const outputApprovalDataProcessingForHinkalApprove: (hinkal: IHinkal, inputUtxos: Utxo[], approvedTo: string, approvalAmount: bigint, deltaAmount: bigint, tokenId?: number) => {
-    useApprovalUtxoData: {
-        approvalChanges: bigint[];
-        externalApprovalAddresses: string[];
-        conversionInHinkalAddress: bigint[];
-    };
-    deltaAmountOverride: bigint;
-};

package/functions/pre-transaction/outputApprovalDataProcessing.mjs

@@ -1,39 +1,24 @@
-import { transactionErrorCodes as v } from "../../error-handling/error-codes.constants.mjs";
-import { APPROVED_UTXO_CONVERSION_COUNT as l } from "../../constants/conversion.constants.mjs";
-import { defaultUseApprovalUTXOData as F } from "../../types/hinkal.types.mjs";
-import { isUseApprovalDataEmpty as D } from "../utils/processUseApprovalUtxoData.mjs";
-import { countTotalAmountInUtxos as N } from "../utils/amounts.utils.mjs";
-import { caseInsensitiveEqual as E } from "../utils/caseInsensitive.utils.mjs";
-const S = (i, d, s, f, A) => {
-  if (A && A > 0)
-    throw new Error(v.INSUFFICIENT_FUNDS);
-  const p = N(d), { erc20TokenAddress: U } = d[0], c = i.getApprovedUtxosForToken(U).filter((n) => !E(n.interactionAddress, f)), r = F(l, 0n);
-  if (s < 0n && p + s < 0n) {
-    let n = -(p + s);
-    for (let o = 0; o < Math.min(c.length, l) && n !== 0n; o += 1) {
-      const a = c[o], u = a.amount >= n ? -n : -a.amount;
-      n += u, r.approvalChanges[o] = u, r.externalApprovalAddresses[o] = a.interactionAddress, r.conversionInHinkalAddress[o] = a.inHinkalAddress;
+import { transactionErrorCodes as A } from "../../error-handling/error-codes.constants.mjs";
+import { APPROVED_UTXO_CONVERSION_COUNT as d } from "../../constants/conversion.constants.mjs";
+import { defaultUseApprovalUTXOData as f } from "../../types/hinkal.types.mjs";
+import { isUseApprovalDataEmpty as u } from "../utils/processUseApprovalUtxoData.mjs";
+import { countTotalAmountInUtxos as E } from "../utils/amounts.utils.mjs";
+import { caseInsensitiveEqual as I } from "../utils/caseInsensitive.utils.mjs";
+const w = (m, c, s, n, v, a) => {
+  if (a && a > 0)
+    throw new Error(A.INSUFFICIENT_FUNDS);
+  const p = E(s), { erc20TokenAddress: U } = s[0], i = m.getApprovedUtxosForToken(U, c).filter((o) => !I(o.interactionAddress, v)), t = f(d, 0n);
+  if (n < 0n && p + n < 0n) {
+    let o = -(p + n);
+    for (let r = 0; r < Math.min(i.length, d) && o !== 0n; r += 1) {
+      const e = i[r], l = e.amount >= o ? -o : -e.amount;
+      o += l, t.approvalChanges[r] = l, t.externalApprovalAddresses[r] = e.interactionAddress, t.conversionInHinkalAddress[r] = e.inHinkalAddress;
     }
-    if (n !== 0n)
-      throw new Error(v.INSUFFICIENT_FUNDS);
+    if (o !== 0n)
+      throw new Error(A.INSUFFICIENT_FUNDS);
   }
-  return { useApprovalUtxoData: D(r) ? void 0 : r };
-}, O = (i, d, s, f, A, p) => {
-  if (p && p > 0)
-    throw new Error(v.INSUFFICIENT_FUNDS);
-  const U = N(d), { erc20TokenAddress: c } = d[0], r = F(l, 0n), n = i.userKeys.getInHinkalAddress(s), o = i.getApprovedUtxosForToken(c).sort((t, e) => t.inHinkalAddress === n ? -1 : e.inHinkalAddress === n ? 1 : t.amount === e.amount ? 0 : t.amount < e.amount ? -1 : 1), a = o[0]?.inHinkalAddress === n, u = a ? o[0].amount : 0n, x = f - u;
-  r.approvalChanges[0] = x, r.externalApprovalAddresses[0] = s, r.conversionInHinkalAddress[0] = i.userKeys.getInHinkalAddress(s);
-  const k = a ? 1 : 0, m = k === 0 ? 1 : 0;
-  let I = A;
-  for (let t = k; t < Math.min(l, o.length) && !(t + m >= l); t += 1) {
-    const e = o[t];
-    I += e.amount, r.approvalChanges[t + m] = -e.amount, r.externalApprovalAddresses[t + m] = e.interactionAddress, r.conversionInHinkalAddress[t + m] = e.inHinkalAddress;
-  }
-  if (U + I < 0n)
-    throw new Error(v.INSUFFICIENT_FUNDS);
-  return { useApprovalUtxoData: r, deltaAmountOverride: I };
+  return { useApprovalUtxoData: u(t) ? void 0 : t };
 };
 export {
-  S as outputApprovalDataProcessing,
-  O as outputApprovalDataProcessingForHinkalApprove
+  w as outputApprovalDataProcessing
 };

package/functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=async(e,t,o)=>{const c=await e.checkTokenRegistry(t,o),s=await e.checkAccessToken();return{patchAccessTokenMerkleTree:c&&!s,hasAccessToken:s,kycRequired:c}};exports.shouldPatchAccessTokenMerkleTree=r;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const k=async(e,c,o,r)=>{const s=await e.checkTokenRegistry(c,o,r),t=await e.checkAccessToken(c);return{patchAccessTokenMerkleTree:s&&!t,hasAccessToken:t,kycRequired:s}};exports.shouldPatchAccessTokenMerkleTree=k;

package/functions/pre-transaction/shouldPatchAccessTokenMerkleTree.d.ts

@@ -1,5 +1,5 @@
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
-export declare const shouldPatchAccessTokenMerkleTree: (hinkal: IHinkal, erc20Addresses: string[], amountChanges: bigint[]) => Promise<{
+export declare const shouldPatchAccessTokenMerkleTree: (hinkal: IHinkal, chainId: number, erc20Addresses: string[], amountChanges: bigint[]) => Promise<{
     patchAccessTokenMerkleTree: boolean;
     hasAccessToken: boolean;
     kycRequired: boolean;

package/functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs

@@ -1,7 +1,7 @@
-const k = async (e, o, t) => {
-  const c = await e.checkTokenRegistry(o, t), s = await e.checkAccessToken();
-  return { patchAccessTokenMerkleTree: c && !s, hasAccessToken: s, kycRequired: c };
+const r = async (e, c, t, k) => {
+  const s = await e.checkTokenRegistry(c, t, k), o = await e.checkAccessToken(c);
+  return { patchAccessTokenMerkleTree: s && !o, hasAccessToken: o, kycRequired: s };
 };
 export {
-  k as shouldPatchAccessTokenMerkleTree
+  r as shouldPatchAccessTokenMerkleTree
 };

package/functions/pre-transaction/solana-public-signals.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const g=(a,m)=>{const e=m.tokenNumber,c=m.nullifierAmount,h=m.outputAmount;let t=0;const y=Uint8Array.from(a[t]);t+=1;const A=Uint8Array.from(a[t]);t+=1;const u=Uint8Array.from(a[t]);t+=1;const S=Uint8Array.from(a[t]);t+=1;const x=Uint8Array.from(a[t]);t+=1;const s=[];for(let o=0;o<e;o+=1)s.push(Uint8Array.from(a[t])),t+=1;const i=[];for(let o=0;o<e;o+=1)i.push(Uint8Array.from(a[t])),t+=1;const d=[];for(let o=0;o<e;o+=1){const n=[];for(let r=0;r<c;r+=1)n.push(Uint8Array.from(a[t])),t+=1;d.push(n)}const U=Uint8Array.from(a[t]);t+=1;const z=Uint8Array.from(a[t]);t+=1;const f=[];for(let o=0;o<e;o+=1)f.push(Uint8Array.from(a[t])),t+=1;const l=[];for(let o=0;o<e;o+=1){const n=[];for(let r=0;r<h;r+=1)n.push(Uint8Array.from(a[t])),t+=1;l.push(n)}const R=Uint8Array.from(a[t]);return t+=1,{extraRandomizedStealthAddress:[...y],extraRandomizedStealthAddressSigns:[...A],extraRandomizedStealthAddressH0Ay:[...u],extraRandomizedStealthAddressH1Ay:[...S],rootHash:[...x],mintAccountPart1:s.map(o=>[...o]),mintAccountPart2:i.map(o=>[...o]),inNullifiers:d.map(o=>o.map(n=>[...n])),outTimestamp:[...U],extraRandomization:[...z],amountChanges:f.map(o=>[...o]),outCommitments:l.map(o=>o.map(n=>[...n])),calldataHash:[...R]}};exports.convertSolanaPublicSignals=g;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const C=(a,m)=>{const e=m.tokenNumber,l=m.nullifierAmount,A=m.outputAmount;let t=0;const h=Uint8Array.from(a[t]);t+=1;const y=Uint8Array.from(a[t]);t+=1;const S=Uint8Array.from(a[t]);t+=1;const u=Uint8Array.from(a[t]);t+=1;const x=Uint8Array.from(a[t]);t+=1;const U=Uint8Array.from(a[t]);t+=1;const s=[];for(let o=0;o<e;o+=1)s.push(Uint8Array.from(a[t])),t+=1;const d=[];for(let o=0;o<e;o+=1)d.push(Uint8Array.from(a[t])),t+=1;const i=[];for(let o=0;o<e;o+=1){const n=[];for(let r=0;r<l;r+=1)n.push(Uint8Array.from(a[t])),t+=1;i.push(n)}const z=Uint8Array.from(a[t]);t+=1;const R=Uint8Array.from(a[t]);t+=1;const c=[];for(let o=0;o<e;o+=1)c.push(Uint8Array.from(a[t])),t+=1;const f=[];for(let o=0;o<e;o+=1){const n=[];for(let r=0;r<A;r+=1)n.push(Uint8Array.from(a[t])),t+=1;f.push(n)}const g=Uint8Array.from(a[t]);return t+=1,{swapperAccountAdditionalSeed:[...h],extraRandomizedStealthAddress:[...y],extraRandomizedStealthAddressSigns:[...S],extraRandomizedStealthAddressH0Ay:[...u],extraRandomizedStealthAddressH1Ay:[...x],rootHash:[...U],mintAccountPart1:s.map(o=>[...o]),mintAccountPart2:d.map(o=>[...o]),inNullifiers:i.map(o=>o.map(n=>[...n])),outTimestamp:[...z],extraRandomization:[...R],amountChanges:c.map(o=>[...o]),outCommitments:f.map(o=>o.map(n=>[...n])),calldataHash:[...g]}};exports.convertSolanaPublicSignals=C;

package/functions/pre-transaction/solana-public-signals.d.ts

@@ -3,6 +3,7 @@ export declare const convertSolanaPublicSignals: (publicInputsArr: number[][], d
     nullifierAmount: number;
     outputAmount: number;
 }) => {
+    swapperAccountAdditionalSeed: number[];
     extraRandomizedStealthAddress: number[];
     extraRandomizedStealthAddressSigns: number[];
     extraRandomizedStealthAddressH0Ay: number[];

package/functions/pre-transaction/solana-public-signals.mjs

@@ -1,60 +1,63 @@
-const C = (a, m) => {
-  const e = m.tokenNumber, c = m.nullifierAmount, l = m.outputAmount;
+const H = (a, m) => {
+  const e = m.tokenNumber, A = m.nullifierAmount, h = m.outputAmount;
   let t = 0;
-  const A = Uint8Array.from(a[t]);
+  const l = Uint8Array.from(a[t]);
   t += 1;
   const y = Uint8Array.from(a[t]);
   t += 1;
   const x = Uint8Array.from(a[t]);
   t += 1;
-  const u = Uint8Array.from(a[t]);
+  const S = Uint8Array.from(a[t]);
   t += 1;
   const U = Uint8Array.from(a[t]);
   t += 1;
-  const s = [];
-  for (let o = 0; o < e; o += 1)
-    s.push(Uint8Array.from(a[t])), t += 1;
+  const u = Uint8Array.from(a[t]);
+  t += 1;
   const d = [];
   for (let o = 0; o < e; o += 1)
     d.push(Uint8Array.from(a[t])), t += 1;
+  const s = [];
+  for (let o = 0; o < e; o += 1)
+    s.push(Uint8Array.from(a[t])), t += 1;
   const i = [];
   for (let o = 0; o < e; o += 1) {
     const n = [];
-    for (let r = 0; r < c; r += 1)
+    for (let r = 0; r < A; r += 1)
       n.push(Uint8Array.from(a[t])), t += 1;
     i.push(n);
   }
-  const S = Uint8Array.from(a[t]);
-  t += 1;
   const z = Uint8Array.from(a[t]);
   t += 1;
+  const R = Uint8Array.from(a[t]);
+  t += 1;
   const f = [];
   for (let o = 0; o < e; o += 1)
     f.push(Uint8Array.from(a[t])), t += 1;
-  const h = [];
+  const c = [];
   for (let o = 0; o < e; o += 1) {
     const n = [];
-    for (let r = 0; r < l; r += 1)
+    for (let r = 0; r < h; r += 1)
       n.push(Uint8Array.from(a[t])), t += 1;
-    h.push(n);
+    c.push(n);
   }
-  const R = Uint8Array.from(a[t]);
+  const C = Uint8Array.from(a[t]);
   return t += 1, {
-    extraRandomizedStealthAddress: [...A],
-    extraRandomizedStealthAddressSigns: [...y],
-    extraRandomizedStealthAddressH0Ay: [...x],
-    extraRandomizedStealthAddressH1Ay: [...u],
-    rootHash: [...U],
-    mintAccountPart1: s.map((o) => [...o]),
-    mintAccountPart2: d.map((o) => [...o]),
+    swapperAccountAdditionalSeed: [...l],
+    extraRandomizedStealthAddress: [...y],
+    extraRandomizedStealthAddressSigns: [...x],
+    extraRandomizedStealthAddressH0Ay: [...S],
+    extraRandomizedStealthAddressH1Ay: [...U],
+    rootHash: [...u],
+    mintAccountPart1: d.map((o) => [...o]),
+    mintAccountPart2: s.map((o) => [...o]),
     inNullifiers: i.map((o) => o.map((n) => [...n])),
-    outTimestamp: [...S],
-    extraRandomization: [...z],
+    outTimestamp: [...z],
+    extraRandomization: [...R],
     amountChanges: f.map((o) => [...o]),
-    outCommitments: h.map((o) => o.map((n) => [...n])),
-    calldataHash: [...R]
+    outCommitments: c.map((o) => o.map((n) => [...n])),
+    calldataHash: [...C]
   };
 };
 export {
-  C as convertSolanaPublicSignals
+  H as convertSolanaPublicSignals
 };

package/functions/pre-transaction/solana.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const f=require("@coral-xyz/anchor"),n=require("@solana/web3.js"),u=e=>{const t=[];let c=e;for(;c>0n;)t.unshift(Number(c%256n)),c/=256n;for(;t.length<32;)t.unshift(0);return t},i=e=>({extraRandomization:u(e.extraRandomization),stealthAddress:u(e.stealthAddress),h0:u(e.H0),h1:u(e.H1)}),l=(e,t,c)=>{const o=u(e),r=[Buffer.from("hinkal_nullifier"),t.toBuffer(),Buffer.from(o)],[s]=n.PublicKey.findProgramAddressSync(r,c);return s},a=(e,t)=>{const c=[Buffer.from("hinkal"),t.toBuffer()],[o]=n.PublicKey.findProgramAddressSync(c,e);return o},d=(e,t)=>{const c=[Buffer.from("hinkal_merkle"),t.toBuffer()],[o]=n.PublicKey.findProgramAddressSync(c,e);return o},y=(e,t)=>{const c=[Buffer.from("hinkal_merkle_access_token"),t.toBuffer()],[o]=n.PublicKey.findProgramAddressSync(c,e);return o},A=(e,t)=>{const c=[Buffer.from("hinkal_access_token"),t.toBuffer()],[o]=n.PublicKey.findProgramAddressSync(c,e);return o},P=(e,t)=>{const c=[Buffer.from("hinkal_swapper"),t.toBuffer()],[o]=n.PublicKey.findProgramAddressSync(c,e);return o},g=(e,t)=>{const c=[Buffer.from("hinkal_vault"),t.toBuffer()],[o]=n.PublicKey.findProgramAddressSync(c,e);return o},b=(e,t,c)=>{const o=u(e),r=[Buffer.from("hinkal_access_keys"),c.toBuffer(),Buffer.from(o)],[s]=n.PublicKey.findProgramAddressSync(r,t);return s},B=(e,t,c,o)=>{const r=[Buffer.from("hinkal_proof_part1"),t.toBuffer(),c.toBuffer(),new f.BN(o.toString()).toBuffer("be",4)],[s]=n.PublicKey.findProgramAddressSync(r,e);return s},K=(e,t,c,o)=>{const r=[Buffer.from("hinkal_proof_part2"),t.toBuffer(),c.toBuffer(),new f.BN(o.toString()).toBuffer("be",4)],[s]=n.PublicKey.findProgramAddressSync(r,e);return s},m=(e,t,c,o)=>{const r=[Buffer.from("hinkal_encrypted_outputs"),t.toBuffer(),c.toBuffer(),new f.BN(o.toString()).toBuffer("be",4)],[s]=n.PublicKey.findProgramAddressSync(r,e);return s},k=(e,t,c)=>{const o=[Buffer.from("hinkal_token_limit"),t.toBuffer(),c.toBuffer()],[r]=n.PublicKey.findProgramAddressSync(o,e);return r},S=(e,t,c,o)=>{const r=[Buffer.from("hinkal_instructions"),t.toBuffer(),c.toBuffer(),new f.BN(o.toString()).toBuffer("be",4)],[s]=n.PublicKey.findProgramAddressSync(r,e);return s};exports.buildAnchorStealthAddressStructure=i;exports.encodeToByte32Array=u;exports.getAccessTokenAccountPublicKey=b;exports.getAccessTokenMerkleAccountPublicKey=y;exports.getAccessTokenStorageAccountPublicKey=A;exports.getEncryptedOutputsAccountPublicKey=m;exports.getInstructionsAccountPublicKey=S;exports.getMerkleAccountPublicKey=d;exports.getNullifierAccount=l;exports.getProofAccountPart1PublicKey=B;exports.getProofAccountPart2PublicKey=K;exports.getStorageAccountPublicKey=a;exports.getStorageVaultPublicKey=g;exports.getSwapperAccountPublicKey=P;exports.getTokenLimitStorageAccountPublicKey=k;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const f=require("@coral-xyz/anchor"),n=require("@solana/web3.js"),l=require("../../crypto/poseidon.cjs"),u=e=>{const t=[];let c=e;for(;c>0n;)t.unshift(Number(c%256n)),c/=256n;for(;t.length<32;)t.unshift(0);return t},a=e=>({extraRandomization:u(e.extraRandomization),stealthAddress:u(e.stealthAddress),h0:u(e.H0),h1:u(e.H1)}),d=(e,t,c)=>{const o=u(e),r=[Buffer.from("hinkal_nullifier"),t.toBuffer(),Buffer.from(o)],[s]=n.PublicKey.findProgramAddressSync(r,c);return s},y=(e,t)=>{const c=[Buffer.from("hinkal"),t.toBuffer()],[o]=n.PublicKey.findProgramAddressSync(c,e);return o},A=(e,t)=>{const c=[Buffer.from("hinkal_merkle"),t.toBuffer()],[o]=n.PublicKey.findProgramAddressSync(c,e);return o},P=(e,t)=>{const c=[Buffer.from("hinkal_merkle_access_token"),t.toBuffer()],[o]=n.PublicKey.findProgramAddressSync(c,e);return o},g=(e,t)=>{const c=[Buffer.from("hinkal_access_token"),t.toBuffer()],[o]=n.PublicKey.findProgramAddressSync(c,e);return o},i=(e,t,c)=>{const o=[Buffer.from("hinkal_swapper"),t.toBytes(),new f.BN(c.toString()).toBuffer("be",32)],[r]=n.PublicKey.findProgramAddressSync(o,e);return r},b=(e,t,c)=>{const o=l.poseidonFunction(c);return i(e,t,o)},B=(e,t)=>{const c=[Buffer.from("hinkal_vault"),t.toBuffer()],[o]=n.PublicKey.findProgramAddressSync(c,e);return o},K=(e,t,c)=>{const o=u(e),r=[Buffer.from("hinkal_access_keys"),c.toBuffer(),Buffer.from(o)],[s]=n.PublicKey.findProgramAddressSync(r,t);return s},m=(e,t,c,o)=>{const r=[Buffer.from("hinkal_proof_part1"),t.toBuffer(),c.toBuffer(),new f.BN(o.toString()).toBuffer("be",4)],[s]=n.PublicKey.findProgramAddressSync(r,e);return s},S=(e,t,c,o)=>{const r=[Buffer.from("hinkal_proof_part2"),t.toBuffer(),c.toBuffer(),new f.BN(o.toString()).toBuffer("be",4)],[s]=n.PublicKey.findProgramAddressSync(r,e);return s},k=(e,t,c,o)=>{const r=[Buffer.from("hinkal_encrypted_outputs"),t.toBuffer(),c.toBuffer(),new f.BN(o.toString()).toBuffer("be",4)],[s]=n.PublicKey.findProgramAddressSync(r,e);return s},p=(e,t,c)=>{const o=[Buffer.from("hinkal_token_limit"),t.toBuffer(),c.toBuffer()],[r]=n.PublicKey.findProgramAddressSync(o,e);return r},h=(e,t,c,o)=>{const r=[Buffer.from("hinkal_instructions"),t.toBuffer(),c.toBuffer(),new f.BN(o.toString()).toBuffer("be",4)],[s]=n.PublicKey.findProgramAddressSync(r,e);return s};exports.buildAnchorStealthAddressStructure=a;exports.encodeToByte32Array=u;exports.getAccessTokenAccountPublicKey=K;exports.getAccessTokenMerkleAccountPublicKey=P;exports.getAccessTokenStorageAccountPublicKey=g;exports.getEncryptedOutputsAccountPublicKey=k;exports.getInstructionsAccountPublicKey=h;exports.getMerkleAccountPublicKey=A;exports.getNullifierAccount=d;exports.getProofAccountPart1PublicKey=m;exports.getProofAccountPart2PublicKey=S;exports.getStorageAccountPublicKey=y;exports.getStorageVaultPublicKey=B;exports.getSwapperAccountPublicKey=i;exports.getSwapperAccountPublicKeyFromSalt=b;exports.getTokenLimitStorageAccountPublicKey=p;

package/functions/pre-transaction/solana.d.ts

@@ -7,7 +7,8 @@ export declare const getStorageAccountPublicKey: (programId: PublicKey, original
 export declare const getMerkleAccountPublicKey: (programId: PublicKey, originalDeployer: PublicKey) => PublicKey;
 export declare const getAccessTokenMerkleAccountPublicKey: (programId: PublicKey, originalDeployer: PublicKey) => PublicKey;
 export declare const getAccessTokenStorageAccountPublicKey: (programId: PublicKey, originalDeployer: PublicKey) => PublicKey;
-export declare const getSwapperAccountPublicKey: (programId: PublicKey, originalDeployer: PublicKey) => PublicKey;
+export declare const getSwapperAccountPublicKey: (programId: PublicKey, originalDeployer: PublicKey, swapperAccountAdditionalSeed: bigint) => PublicKey;
+export declare const getSwapperAccountPublicKeyFromSalt: (programId: PublicKey, originalDeployer: PublicKey, swapperAccountSalt: bigint) => PublicKey;
 export declare const getStorageVaultPublicKey: (programId: PublicKey, originalDeployer: PublicKey) => PublicKey;
 export declare const getAccessTokenAccountPublicKey: (accessKey: bigint, programId: PublicKey, originalDeployer: PublicKey) => PublicKey;
 export declare const getProofAccountPart1PublicKey: (programId: PublicKey, originalDeployer: PublicKey, signer: PublicKey, id: bigint) => PublicKey;