@hinkal/common 0.2.15 → 0.2.17

package/functions/private-wallet/emporium.swap.helpers.d.ts

@@ -1,5 +1,7 @@
+import { ethers } from 'ethers';
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
 import { ExternalActionId } from '../../types/external-action.types';
 export declare const createSwapToEmporiumOpForUniswap: (routerAddress: string, inputTokenAddress: string, positiveAmountInput: bigint, outputTokenAddress: string, recipient: string, data: string, invokeWallet?: boolean) => string;
 export declare const createSwapToEmporiumOpFromData: (hinkal: IHinkal, externalActionId: ExternalActionId, routerAddress: string, data: string, walletAddress: string, value?: bigint, invokeWallet?: boolean) => string;
-export declare const createSwapToEmporiumOps: (hinkal: IHinkal, externalActionId: ExternalActionId, routerAddress: string, data: string, inputTokenAddress: string, inputAmount: bigint, outputTokenAddress: string, outputAmount: bigint, walletAddress: string, invokeWallet?: boolean) => string[];
+export declare const nullifyUsdtApprovalIfNeeded: (hinkal: IHinkal, ops: string[], tokenContract: ethers.Contract, walletAddress: string, spenderAddress: string, invokeWallet: boolean) => Promise<void>;
+export declare const createSwapToEmporiumOps: (hinkal: IHinkal, externalActionId: ExternalActionId, routerAddress: string, data: string, inputTokenAddress: string, inputAmount: bigint, outputAmount: bigint | undefined, outputTokenAddress: string | undefined, isTheSameChainSwap: boolean, walletAddress: string, relay: string, invokeWallet?: boolean) => Promise<string[]>;

package/functions/private-wallet/emporium.swap.helpers.mjs

@@ -1,92 +1,157 @@
-import { BigNumber as b, ethers as x } from "ethers";
-import { emporiumOp as E, createApproveEmporiumOp as S } from "./emporium.helpers.mjs";
-import { NATIVE_TOKEN_WRAPPER_ADDRESSES as l } from "../../constants/addresses.constants.mjs";
-import { ExternalActionId as h } from "../../types/external-action.types.mjs";
-import { ContractType as R } from "../../types/ethereum-network.types.mjs";
-import { getExternalSwapAddress as F } from "../pre-transaction/getExternalSwapAddress.mjs";
-import { replaceAllInstances as N } from "../utils/string.utils.mjs";
-import { zeroAddress as u } from "../../constants/protocol.constants.mjs";
-const U = (r, a, n, m, t, e, c = !1) => {
-  const p = b.from(e).toBigInt(), s = {
+import { BigNumber as K, ethers as D } from "ethers";
+import { emporiumOp as u, createApproveEmporiumOp as I } from "./emporium.helpers.mjs";
+import { NATIVE_TOKEN_WRAPPER_ADDRESSES as T, WRAPPER_TOKEN_EXCHANGE_ADDRESSES as q, SWAP_FEE_TAKER_ADDRESSES as V } from "../../constants/addresses.constants.mjs";
+import { ExternalActionId as O } from "../../types/external-action.types.mjs";
+import { ContractType as g } from "../../types/ethereum-network.types.mjs";
+import { getExternalSwapAddress as X } from "../pre-transaction/getExternalSwapAddress.mjs";
+import { replaceAllInstances as H } from "../utils/string.utils.mjs";
+import { zeroAddress as w, HINKAL_SWAP_VARIABLE_RATE as P } from "../../constants/protocol.constants.mjs";
+import "../../constants/token-data/index.mjs";
+import { caseInsensitiveEqual as M } from "../utils/caseInsensitive.utils.mjs";
+import { Logger as l } from "../../error-handling/logger.mjs";
+import { getERC20Registry as v } from "../../constants/token-data/ERC20Registry.mjs";
+const z = (t, a, c, e, n, i, o = !1) => {
+  const r = K.from(i).toBigInt(), C = {
     tokenIn: a,
-    tokenOut: m,
-    fee: p,
-    recipient: t,
-    amountIn: n,
+    tokenOut: e,
+    fee: r,
+    recipient: n,
+    amountIn: c,
     amountOutMinimum: 0,
     sqrtPriceLimitX96: 0
-  }, o = [
+  }, m = [
     "function exactInputSingle(tuple(address tokenIn,address tokenOut,uint24 fee,address recipient,uint256 amountIn,uint256 amountOutMinimum,uint160 sqrtPriceLimitX96)) external payable returns (uint256 amountOut)"
-  ], f = new x.Contract(r, o);
-  return E({
-    contract: f,
+  ], h = new D.Contract(t, m);
+  return u({
+    contract: h,
     func: "exactInputSingle",
-    args: [s],
-    invokeWallet: c
+    args: [C],
+    invokeWallet: o
   });
-}, C = (r, a, n, m, t, e, c = !1) => {
-  const p = F(r, a), s = N(m, p.slice(2), t.slice(2));
-  return E({
-    contract: n,
-    callDataString: s,
-    value: e,
-    invokeWallet: c
+}, N = (t, a, c, e, n, i, o = !1) => {
+  const r = X(t, a), C = H(e, r.slice(2), n.slice(2));
+  return u({
+    contract: c,
+    callDataString: C,
+    value: i,
+    invokeWallet: o
   });
-}, z = (r, a, n, m, t, e, c, p, s, o = !1) => {
-  const f = e < 0n ? -1n * e : e, D = p < 0n ? -1n * p : p, i = [], g = l[r.getCurrentChainId()];
-  let I = !1, w;
-  if (a === h.OneInch)
-    return t !== u && i.push(S(r, t, n, f, o)), w = C(
+}, G = (t, a) => {
+  const e = v(a).find((n) => n.symbol === "USDT");
+  return e ? M(t, e.erc20TokenAddress) : !1;
+}, L = async (t, a, c, e, n, i) => {
+  const o = c.address;
+  if (G(o, t.getCurrentChainId()))
+    try {
+      (await c.allowance(e, n)).toBigInt() > 0n && a.push(I(c, n, 0n, i));
+    } catch (r) {
+      l.error("Error in nullifyUsdtApprovalIfNeeded", r);
+    }
+}, U = async (t, a, c, e, n, i, o) => {
+  if (a !== w) {
+    const r = V[t.getCurrentChainId()], C = t.getContractWithFetcher(g.ERC20Contract, a), m = await C.balanceOf(c);
+    await L(
+      t,
+      n,
+      C,
+      c,
       r,
+      i
+    ), n.push(I(C, r, 2n ** 256n - 1n, i));
+    const h = [
+      "function takeSwapFee(address token, uint256 beforeBalance, uint256 variableRate, address relay) external payable"
+    ], f = new D.Contract(r, h), E = e;
+    n.push(
+      u({
+        contract: f,
+        func: "takeSwapFee",
+        args: [a, m, P, E],
+        invokeWallet: i
+      })
+    );
+  } else {
+    const r = e;
+    n.push(
+      u({
+        contract: r,
+        value: o * P / 10000n,
+        invokeWallet: i
+      })
+    );
+  }
+}, rt = async (t, a, c, e, n, i, o, r, C, m, h, f = !1) => {
+  const E = i < 0n ? -1n * i : i, y = t.getCurrentChainId(), p = [], S = T[y];
+  let _ = !1, R;
+  if (a === O.OneInch || a === O.Lifi) {
+    if (n !== w) {
+      const b = t.getContractWithFetcher(g.ERC20Contract, n);
+      p.push(I(b, c, E, f));
+    }
+    let s = 0n;
+    n === w && (s += E), o && r === w && o < 0n && (s += -1n * o);
+    const F = s > 0n ? s : void 0;
+    return R = N(
+      t,
       a,
-      n,
+      c,
+      e,
       m,
-      s,
-      t === u ? f : void 0,
-      o
-    ), i.push(w), i;
-  if (t === u) {
-    const O = r.getContractWithFetcher(R.ERC20Contract, g);
-    i.push(
-      E({
-        contract: O,
+      F,
+      f
+    ), p.push(R), (a === O.OneInch || C && a === O.Lifi) && r && o !== void 0 && await U(t, r, m, h, p, f, o), p;
+  }
+  if (!r || !o)
+    throw Error("There should be output token for UniSwap and Odos");
+  if (n === w) {
+    const s = t.getContractWithFetcher(g.ERC20Contract, S);
+    p.push(
+      u({
+        contract: s,
         func: "deposit",
-        value: f,
-        invokeWallet: o
+        value: E,
+        invokeWallet: f
       })
-    ), t = g;
+    ), n = S;
   }
-  if (c === u && (c = g, I = !0), t !== u && i.push(S(r, t, n, f, o)), a === h.Uniswap ? w = U(
-    n,
-    t,
-    f,
+  let B = 0n;
+  if (r === w && (r = S, _ = !0, B = await t.getContractWithFetcher(g.ERC20Contract, S).balanceOf(m)), n !== w) {
+    const s = t.getContractWithFetcher(g.ERC20Contract, n);
+    await L(t, p, s, m, c, f), p.push(I(s, c, E, f));
+  }
+  if (a === O.Uniswap ? R = z(
     c,
-    s,
-    m,
-    o
-  ) : w = C(
+    n,
+    E,
     r,
+    m,
+    e,
+    f
+  ) : R = N(
+    t,
     a,
-    n,
+    c,
+    e,
     m,
-    s,
     void 0,
-    o
-  ), i.push(w), I) {
-    const O = ["function withdraw(uint256) external"], P = new x.Contract(c, O);
-    i.push(
-      E({
-        contract: P,
-        func: "withdraw",
-        args: [D],
-        invokeWallet: o
+    f
+  ), p.push(R), await U(t, r, m, h, p, f, o), _) {
+    const s = q[y], F = t.getContractWithFetcher(g.ERC20Contract, S);
+    p.push(I(F, s, 2n ** 256n - 1n, f));
+    const b = ["function withdrawBalanceDifference(uint256 beforeBalance) external"], x = new D.Contract(s, b);
+    p.push(
+      u({
+        contract: x,
+        func: "withdrawBalanceDifference",
+        args: [B],
+        invokeWallet: f
       })
-    ), c = u;
+    );
   }
-  return i;
+  return p;
 };
 export {
-  U as createSwapToEmporiumOpForUniswap,
-  C as createSwapToEmporiumOpFromData,
-  z as createSwapToEmporiumOps
+  z as createSwapToEmporiumOpForUniswap,
+  N as createSwapToEmporiumOpFromData,
+  rt as createSwapToEmporiumOps,
+  L as nullifyUsdtApprovalIfNeeded
 };

package/functions/private-wallet/index.d.ts

@@ -1,4 +1,3 @@
 export * from './emporium.helpers';
 export * from './opProducer';
-export * from './smartContractWalletCalculator';
 export * from './emporium.swap.helpers';

package/functions/snarkjs/common.snarkjs.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("ethers"),g=require("../../constants/protocol.constants.cjs"),y=require("../../constants/conversion.constants.cjs"),S=require("../../data-structures/crypto-keys/keys.cjs"),O=require("../../data-structures/crypto-keys/encryptDecryptUtxo.cjs"),V=require("../../types/circom-data.types.cjs"),f=require("../utils/external-action.utils.cjs"),c=require("../../types/hinkal.types.cjs"),E=require("../utils/amounts.utils.cjs"),F=require("./getOriginalSender.cjs"),P=(e,a)=>e.map((s,t)=>s.map(n=>a[t]?"0":n.getNullifier())),T=(e,a,s)=>{let t=[];return e==="v1x0"?t=a.map((n,r)=>n.map(l=>s[r]?"0":l.getCommitment())):t=a.map(n=>n.map(r=>r.amount===0n?"0":r.getCommitment())),t},L=(e,a,s=!1)=>{const t=[];for(let n=0;n<e.length;n+=1){let r=0n,l=0n;for(let i=0;i<e[n].length;i+=1)r+=e[n][i].amount;for(let i=0;i<a[n].length;i+=1)l+=a[n][i].amount;l-r<0?s?t.push(l-r):t.push(g.CIRCOM_P+(l-r)):t.push(l-r)}return t},R=e=>e.useApprovalUtxoData.reduce((a,s)=>[...a,E.calculateBigIntSum(s.approvalChanges)],[]),_=(e,a)=>{const s=R(a),t=a.hinkalLogicAction,n=e.map((r,l)=>t===c.HinkalLogicAction.NONE?r+s[l]>=0n?0n:r+s[l]:r>=0n?0n:r);return t===c.HinkalLogicAction.APPROVE||t===c.HinkalLogicAction.RELEASE_BUFFER?e.forEach((r,l)=>{n[l]=r>0n?-r:r}):t===c.HinkalLogicAction.EXECUTE&&a.executeApprovalChanges.forEach((r,l)=>{n[l]=r+e[l]<0n?r+e[l]:0n}),n},q=(e,a)=>{if(e.length===0)return[];const s=[[""]];for(let t=0;t<e.length;t+=1)t>0&&s.push([""]),e[t].forEach((n,r)=>{s[t][r]=`0x${Buffer.from(O.encryptUtxo(n,a)).toString("hex")}`});return s},x=(e,a)=>{const s=[];for(let n=0;n<e.length;n+=1){s.push([]);for(let r=0;r<e[n].length;r+=1)s[n][r]=a.getSiblingHashesForVerification(BigInt(e[n][r].getCommitment())).map(l=>l.toString())}const t=[];for(let n=0;n<e.length;n+=1){t.push([]);for(let r=0;r<e[n].length;r+=1)t[n][r]=a.getSiblingSides(BigInt(e[n][r].getCommitment())).map(l=>l.toString())}return{inCommitmentSiblings:s,inCommitmentSiblingSides:t}},M=(e,a)=>{const s=a.getSiblingHashesForVerification(BigInt(e.getAccessKey())).map(n=>n.toString()),t=a.getSiblingSides(BigInt(e.getAccessKey())).map(n=>n.toString());return{accessTokenSiblings:s,accessTokenSiblingSides:t}},z=e=>{const a={...e};if(a.amountChanges=e.amountChanges.map(s=>s.toString()),a.calldataHash=e.calldataHash.toString(),a.rootHashAccessToken=e.rootHashAccessToken?.toString(),a.stealthAddressStructure.extraRandomization=e.stealthAddressStructure.extraRandomization.toString(),a.stealthAddressStructure.stealthAddress=e.stealthAddressStructure.stealthAddress.toString(),a.stealthAddressStructure.H0=e.stealthAddressStructure.H0.toString(),a.stealthAddressStructure.H1=e.stealthAddressStructure.H1.toString(),a.rootHashHinkal=e.rootHashHinkal?.toString(),a.externalActionId=e.externalActionId?.toString(),"flatFees"in e){const s=a;return s.flatFees=e.flatFees.map(t=>t.toString()),s}else{const s=a;return s.slippageValues=e.slippageValues.map(t=>t.toString()),s.hinkalLogicArgs.inHinkalAddress=e.hinkalLogicArgs.inHinkalAddress.toString(),s.hinkalLogicArgs.executeApprovalChanges=e.hinkalLogicArgs.executeApprovalChanges.map(t=>t.toString()),s.hinkalLogicArgs.useApprovalUtxoData=e.hinkalLogicArgs.useApprovalUtxoData.map(t=>({approvalChanges:t.approvalChanges.map(n=>n.toString()),externalApprovalAddresses:t.externalApprovalAddresses,conversionInHinkalAddress:t.conversionInHinkalAddress.map(n=>n.toString())})),s.feeStructure.flatFee=e.feeStructure.flatFee.toString(),s.feeStructure.variableRate=e.feeStructure.variableRate.toString(),s}},W=e=>{const a={...e};if(a.amountChanges=e.amountChanges.map(s=>BigInt(s)),a.calldataHash=BigInt(e.calldataHash),a.rootHashAccessToken=BigInt(e.rootHashAccessToken),a.rootHashHinkal=BigInt(e.rootHashHinkal),a.externalActionId=BigInt(e.externalActionId),"flatFees"in e){const s=a;return s.flatFees=e.flatFees.map(t=>BigInt(t)),s}else{const s=a;return s.feeStructure.flatFee=BigInt(e.feeStructure.flatFee),s.feeStructure.variableRate=BigInt(e.feeStructure.variableRate),s.slippageValues=e.slippageValues.map(t=>BigInt(t)),s.hinkalLogicArgs.executeApprovalChanges=e.hinkalLogicArgs.executeApprovalChanges.map(t=>BigInt(t)),s.hinkalLogicArgs.inHinkalAddress=BigInt(e.hinkalLogicArgs.inHinkalAddress),s.hinkalLogicArgs.useApprovalUtxoData=e.hinkalLogicArgs.useApprovalUtxoData.map(t=>({approvalChanges:t.approvalChanges.map(n=>BigInt(n)),externalApprovalAddresses:t.externalApprovalAddresses,conversionInHinkalAddress:t.conversionInHinkalAddress.map(n=>BigInt(n))})),s}},j=(e,a,s,t,n,r,l,i,C,H,k,u,d,b)=>{const h=Object.values(C||V.defaultHookData),m=F.getOriginalSender(t??g.zeroAddress,s);if(e==="v1x0"){const p=o.ethers.utils.defaultAbiCoder.encode(["uint16","address","address","uint256","bytes","tuple(address, address, bytes, bytes)","bytes[][]","uint256[]"],[a,s,t,typeof n=="bigint"?n:f.getExternalActionIdHash(n),r,h,l,i]);return BigInt(o.ethers.utils.keccak256(p))%g.CIRCOM_P}else{const p=o.ethers.utils.defaultAbiCoder.encode(["uint16","address","address","uint256","bytes"],[a,s,t,typeof n=="bigint"?n:f.getExternalActionIdHash(n),r]),A=o.ethers.utils.defaultAbiCoder.encode(["tuple(address, address, bytes, bytes)","bytes[][]","tuple(address, uint256, uint256)","int256[]","bool[]","tuple(uint256, uint256,int256[],bool, tuple(int256[] approvalChanges, address[] externalApprovalAddresses, uint256[] conversionInHinkalAddress)[])","tuple(uint8 v, bytes32 r, bytes32 s, uint256 accessKey, uint256 nonce, address ethereumAddress)","address"],[h,l,[d.feeToken,d.flatFee,d.variableRate],H,k,[u.hinkalLogicAction,u.inHinkalAddress,u.executeApprovalChanges,u.doPreTxApproval,u.useApprovalUtxoData],b,m]),v=BigInt(o.ethers.utils.keccak256(p)),I=BigInt(o.ethers.utils.keccak256(A)),B=o.ethers.utils.defaultAbiCoder.encode(["uint256","uint256"],[v,I]);return BigInt(o.ethers.utils.keccak256(B))%g.CIRCOM_P}},w=e=>e.startsWith("swapperMO")||e.startsWith("swapperME")?2:e.startsWith("swapperMW")?1:(e.startsWith("swapperMHA"),0),N=(e,a,s,t,n,r)=>{if(e.startsWith("swapperMWMin0"))return 5;const l=w(e);return 10+a.length+s.length+t.flat().length+n.length+l+r+y.APPROVED_UTXO_CONVERSION_COUNT*a.length},J=(e,a)=>{const{h0:s,h1:t}=S.UserKeys.getStealthAddressCompressedPoints(e,a),n=BigInt(S.UserKeys.getStealthAddress(e,a));return{extraRandomization:e,H0:s,H1:t,stealthAddress:n}};exports.buildInNullifiers=P;exports.buildOutCommitments=T;exports.calcAccessTokenSiblingsAndSides=M;exports.calcAmountChanges=L;exports.calcCommitmentsSiblingAndSides=x;exports.calcEncryptedOutputs=q;exports.calcPublicSignalCount=N;exports.calcStealthAddressStructure=J;exports.createCallDataHash=j;exports.deserializeCircomData=W;exports.getSlippageValues=_;exports.serializeCircomData=z;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("ethers"),d=require("../../constants/protocol.constants.cjs"),V=require("../../constants/conversion.constants.cjs"),S=require("../../data-structures/crypto-keys/keys.cjs"),E=require("../../data-structures/crypto-keys/encryptDecryptUtxo.cjs"),F=require("../../types/circom-data.types.cjs"),f=require("../utils/external-action.utils.cjs"),u=require("../../types/hinkal.types.cjs"),T=require("../utils/amounts.utils.cjs"),P=require("./getOriginalSender.cjs"),L=(e,a)=>e.map((s,t)=>s.map(n=>a[t]?"0":n.getNullifier())),R=(e,a,s)=>{let t=[];return e==="v1x0"?t=a.map((n,r)=>n.map(l=>s[r]?"0":l.getCommitment())):t=a.map(n=>n.map(r=>r.amount===0n?"0":r.getCommitment())),t},_=(e,a,s=!1)=>{const t=[];for(let n=0;n<e.length;n+=1){let r=0n,l=0n;for(let i=0;i<e[n].length;i+=1)r+=e[n][i].amount;for(let i=0;i<a[n].length;i+=1)l+=a[n][i].amount;l-r<0?s?t.push(l-r):t.push(d.CIRCOM_P+(l-r)):t.push(l-r)}return t},q=e=>e.useApprovalUtxoData.reduce((a,s)=>[...a,T.calculateBigIntSum(s.approvalChanges)],[]),x=(e,a)=>{const s=q(a),t=a.hinkalLogicAction,n=e.map((r,l)=>t===u.HinkalLogicAction.NONE||t===u.HinkalLogicAction.APPROVE?r+s[l]>=0n?0n:r+s[l]:r>=0n?0n:r);return t===u.HinkalLogicAction.RELEASE_BUFFER?e.forEach((r,l)=>{n[l]=r>0n?-r:r}):t===u.HinkalLogicAction.EXECUTE&&a.executeApprovalChanges.forEach((r,l)=>{n[l]=r+e[l]<0n?r+e[l]:0n}),n},M=(e,a)=>{if(e.length===0)return[];const s=[[""]];for(let t=0;t<e.length;t+=1)t>0&&s.push([""]),e[t].forEach((n,r)=>{s[t][r]=`0x${Buffer.from(E.encryptUtxo(n,a)).toString("hex")}`});return s},z=(e,a)=>{const s=[];for(let n=0;n<e.length;n+=1){s.push([]);for(let r=0;r<e[n].length;r+=1)s[n][r]=a.getSiblingHashesForVerification(BigInt(e[n][r].getCommitment())).map(l=>l.toString())}const t=[];for(let n=0;n<e.length;n+=1){t.push([]);for(let r=0;r<e[n].length;r+=1)t[n][r]=a.getSiblingSides(BigInt(e[n][r].getCommitment())).map(l=>l.toString())}return{inCommitmentSiblings:s,inCommitmentSiblingSides:t}},C=(e,a)=>{const s=a.getSiblingHashesForVerification(BigInt(e)).map(n=>n.toString()),t=a.getSiblingSides(BigInt(e)).map(n=>n.toString());return{accessTokenSiblings:s,accessTokenSiblingSides:t}},W=(e,a)=>C(e.getAccessKey(),a),j=e=>{const a={...e};if(a.amountChanges=e.amountChanges.map(s=>s.toString()),a.calldataHash=e.calldataHash.toString(),a.rootHashAccessToken=e.rootHashAccessToken?.toString(),a.stealthAddressStructure.extraRandomization=e.stealthAddressStructure.extraRandomization.toString(),a.stealthAddressStructure.stealthAddress=e.stealthAddressStructure.stealthAddress.toString(),a.stealthAddressStructure.H0=e.stealthAddressStructure.H0.toString(),a.stealthAddressStructure.H1=e.stealthAddressStructure.H1.toString(),a.rootHashHinkal=e.rootHashHinkal?.toString(),a.externalActionId=e.externalActionId?.toString(),"flatFees"in e){const s=a;return s.flatFees=e.flatFees.map(t=>t.toString()),s}else{const s=a;return s.slippageValues=e.slippageValues.map(t=>t.toString()),s.hinkalLogicArgs.inHinkalAddress=e.hinkalLogicArgs.inHinkalAddress.toString(),s.hinkalLogicArgs.executeApprovalChanges=e.hinkalLogicArgs.executeApprovalChanges.map(t=>t.toString()),s.hinkalLogicArgs.useApprovalUtxoData=e.hinkalLogicArgs.useApprovalUtxoData.map(t=>({approvalChanges:t.approvalChanges.map(n=>n.toString()),externalApprovalAddresses:t.externalApprovalAddresses,conversionInHinkalAddress:t.conversionInHinkalAddress.map(n=>n.toString())})),s.feeStructure.flatFee=e.feeStructure.flatFee.toString(),s.feeStructure.variableRate=e.feeStructure.variableRate.toString(),s}},w=e=>{const a={...e};if(a.amountChanges=e.amountChanges.map(s=>BigInt(s)),a.calldataHash=BigInt(e.calldataHash),a.rootHashAccessToken=BigInt(e.rootHashAccessToken),a.rootHashHinkal=BigInt(e.rootHashHinkal),a.externalActionId=BigInt(e.externalActionId),"flatFees"in e){const s=a;return s.flatFees=e.flatFees.map(t=>BigInt(t)),s}else{const s=a;return s.feeStructure.flatFee=BigInt(e.feeStructure.flatFee),s.feeStructure.variableRate=BigInt(e.feeStructure.variableRate),s.slippageValues=e.slippageValues.map(t=>BigInt(t)),s.hinkalLogicArgs.executeApprovalChanges=e.hinkalLogicArgs.executeApprovalChanges.map(t=>BigInt(t)),s.hinkalLogicArgs.inHinkalAddress=BigInt(e.hinkalLogicArgs.inHinkalAddress),s.hinkalLogicArgs.useApprovalUtxoData=e.hinkalLogicArgs.useApprovalUtxoData.map(t=>({approvalChanges:t.approvalChanges.map(n=>BigInt(n)),externalApprovalAddresses:t.externalApprovalAddresses,conversionInHinkalAddress:t.conversionInHinkalAddress.map(n=>BigInt(n))})),s}},K=(e,a,s,t,n,r,l,i,H,k,b,c,g,m,v)=>{const h=Object.values(H||F.defaultHookData),I=v??P.getOriginalSender(t??d.zeroAddress,s);if(e==="v1x0"){const p=o.ethers.utils.defaultAbiCoder.encode(["uint16","address","address","uint256","bytes","tuple(address, address, bytes, bytes)","bytes[][]","uint256[]"],[a,s,t,typeof n=="bigint"?n:f.getExternalActionIdHash(n),r,h,l,i]);return BigInt(o.ethers.utils.keccak256(p))%d.CIRCOM_P}else{const p=o.ethers.utils.defaultAbiCoder.encode(["uint16","address","address","uint256","bytes"],[a,s,t,typeof n=="bigint"?n:f.getExternalActionIdHash(n),r]),A=o.ethers.utils.defaultAbiCoder.encode(["tuple(address, address, bytes, bytes)","bytes[][]","tuple(address, uint256, uint256)","int256[]","bool[]","tuple(uint256, uint256,int256[],bool, tuple(int256[] approvalChanges, address[] externalApprovalAddresses, uint256[] conversionInHinkalAddress)[])","tuple(uint8 v, bytes32 r, bytes32 s, uint256 accessKey, uint256 nonce, address ethereumAddress)","address"],[h,l,[g.feeToken,g.flatFee,g.variableRate],k,b,[c.hinkalLogicAction,c.inHinkalAddress,c.executeApprovalChanges,c.doPreTxApproval,c.useApprovalUtxoData],m,I]),y=BigInt(o.ethers.utils.keccak256(p)),B=BigInt(o.ethers.utils.keccak256(A)),O=o.ethers.utils.defaultAbiCoder.encode(["uint256","uint256"],[y,B]);return BigInt(o.ethers.utils.keccak256(O))%d.CIRCOM_P}},N=e=>e.startsWith("swapperMO")||e.startsWith("swapperME")?2:e.startsWith("swapperMW")?1:(e.startsWith("swapperMHA"),0),J=(e,a,s,t,n,r)=>{if(e.startsWith("swapperMWMin0"))return 4;const l=N(e);return 10+a.length+s.length+t.flat().length+n.flat().length+l+r+V.APPROVED_UTXO_CONVERSION_COUNT*a.length},U=(e,a)=>{const{h0:s,h1:t}=S.UserKeys.getStealthAddressCompressedPoints(e,a),n=BigInt(S.UserKeys.getStealthAddress(e,a));return{extraRandomization:e,H0:s,H1:t,stealthAddress:n}};exports.buildInNullifiers=L;exports.buildOutCommitments=R;exports.calcAccessTokenSiblingAndSidesFromAccessKey=C;exports.calcAccessTokenSiblingsAndSides=W;exports.calcAmountChanges=_;exports.calcCommitmentsSiblingAndSides=z;exports.calcEncryptedOutputs=M;exports.calcPublicSignalCount=J;exports.calcStealthAddressStructure=U;exports.createCallDataHash=K;exports.deserializeCircomData=w;exports.getSlippageValues=x;exports.serializeCircomData=j;

package/functions/snarkjs/common.snarkjs.d.ts

@@ -14,12 +14,16 @@ export declare const calcCommitmentsSiblingAndSides: (inputUtxos: Utxo[][], merk
     inCommitmentSiblings: string[][][];
     inCommitmentSiblingSides: string[][][];
 };
+export declare const calcAccessTokenSiblingAndSidesFromAccessKey: (accessKey: string, merkleTreeAccessToken: MerkleTree<bigint>) => {
+    accessTokenSiblings: string[];
+    accessTokenSiblingSides: string[];
+};
 export declare const calcAccessTokenSiblingsAndSides: (userKeys: UserKeys, merkleTreeAccessToken: MerkleTree<bigint>) => {
     accessTokenSiblings: string[];
     accessTokenSiblingSides: string[];
 };
 export declare const serializeCircomData: (circomData: CircomDataV1 | CircomDataV1x1) => CircomDataBaseJsonV1 | CircomDataBaseJsonV1x1;
 export declare const deserializeCircomData: (circomData: CircomDataBaseJsonV1 | CircomDataBaseJsonV1x1) => CircomDataV1 | CircomDataV1x1;
-export declare const createCallDataHash: (proverVersion: ProverVersion, publicSignalCount: number, relay: string, externalAddress: string | undefined, externalActionId: bigint | ExternalActionId, externalActionMetadata: string, encryptedOutputs: string[][], flatFees: bigint[], hookData: HookDataType | undefined, slippageValues: bigint[], onChainCreation: boolean[], hinkalLogicArgs: HinkalLogicArgs, feeStructure: FeeStructure, signatureData: SignatureData) => bigint;
+export declare const createCallDataHash: (proverVersion: ProverVersion, publicSignalCount: number, relay: string, externalAddress: string | undefined, externalActionId: bigint | ExternalActionId, externalActionMetadata: string, encryptedOutputs: string[][], flatFees: bigint[], hookData: HookDataType | undefined, slippageValues: bigint[], onChainCreation: boolean[], hinkalLogicArgs: HinkalLogicArgs, feeStructure: FeeStructure, signatureData: SignatureData, _originalSender?: string) => bigint;
 export declare const calcPublicSignalCount: (verifierName: string, erc20TokenAddresses: string[], amountChanges: bigint[], inNullifiers: string[][], outCommitments: string[][], tokenIdsPositive: number) => number;
 export declare const calcStealthAddressStructure: (extraRandomization: bigint, privateKey: string) => StealthAddressStructure;

package/functions/snarkjs/common.snarkjs.mjs

@@ -1,69 +1,69 @@
 import { ethers as o } from "ethers";
-import { CIRCOM_P as c, zeroAddress as V } from "../../constants/protocol.constants.mjs";
-import { APPROVED_UTXO_CONVERSION_COUNT as E } from "../../constants/conversion.constants.mjs";
+import { CIRCOM_P as c, zeroAddress as E } from "../../constants/protocol.constants.mjs";
+import { APPROVED_UTXO_CONVERSION_COUNT as F } from "../../constants/conversion.constants.mjs";
 import { UserKeys as S } from "../../data-structures/crypto-keys/keys.mjs";
 import { encryptUtxo as y } from "../../data-structures/crypto-keys/encryptDecryptUtxo.mjs";
-import { defaultHookData as F } from "../../types/circom-data.types.mjs";
+import { defaultHookData as O } from "../../types/circom-data.types.mjs";
 import { getExternalActionIdHash as f } from "../utils/external-action.utils.mjs";
-import { HinkalLogicAction as g } from "../../types/hinkal.types.mjs";
-import { calculateBigIntSum as O } from "../utils/amounts.utils.mjs";
-import { getOriginalSender as T } from "./getOriginalSender.mjs";
-const X = (e, a) => e.map((s, t) => s.map((n) => a[t] ? "0" : n.getNullifier())), U = (e, a, s) => {
+import { HinkalLogicAction as d } from "../../types/hinkal.types.mjs";
+import { calculateBigIntSum as T } from "../utils/amounts.utils.mjs";
+import { getOriginalSender as R } from "./getOriginalSender.mjs";
+const $ = (e, r) => e.map((s, t) => s.map((n) => r[t] ? "0" : n.getNullifier())), q = (e, r, s) => {
   let t = [];
-  return e === "v1x0" ? t = a.map(
-    (n, r) => n.map((l) => s[r] ? "0" : l.getCommitment())
-  ) : t = a.map((n) => n.map((r) => r.amount === 0n ? "0" : r.getCommitment())), t;
-}, $ = (e, a, s = !1) => {
+  return e === "v1x0" ? t = r.map(
+    (n, a) => n.map((l) => s[a] ? "0" : l.getCommitment())
+  ) : t = r.map((n) => n.map((a) => a.amount === 0n ? "0" : a.getCommitment())), t;
+}, G = (e, r, s = !1) => {
   const t = [];
   for (let n = 0; n < e.length; n += 1) {
-    let r = 0n, l = 0n;
+    let a = 0n, l = 0n;
     for (let i = 0; i < e[n].length; i += 1)
-      r += e[n][i].amount;
-    for (let i = 0; i < a[n].length; i += 1)
-      l += a[n][i].amount;
-    l - r < 0 ? s ? t.push(l - r) : t.push(c + (l - r)) : t.push(l - r);
+      a += e[n][i].amount;
+    for (let i = 0; i < r[n].length; i += 1)
+      l += r[n][i].amount;
+    l - a < 0 ? s ? t.push(l - a) : t.push(c + (l - a)) : t.push(l - a);
   }
   return t;
-}, R = (e) => e.useApprovalUtxoData.reduce((a, s) => [...a, O(s.approvalChanges)], []), q = (e, a) => {
-  const s = R(a), t = a.hinkalLogicAction, n = e.map((r, l) => t === g.NONE ? r + s[l] >= 0n ? 0n : r + s[l] : r >= 0n ? 0n : r);
-  return t === g.APPROVE || t === g.RELEASE_BUFFER ? e.forEach((r, l) => {
-    n[l] = r > 0n ? -r : r;
-  }) : t === g.EXECUTE && a.executeApprovalChanges.forEach((r, l) => {
-    n[l] = r + e[l] < 0n ? r + e[l] : 0n;
+}, L = (e) => e.useApprovalUtxoData.reduce((r, s) => [...r, T(s.approvalChanges)], []), Q = (e, r) => {
+  const s = L(r), t = r.hinkalLogicAction, n = e.map((a, l) => t === d.NONE || t === d.APPROVE ? a + s[l] >= 0n ? 0n : a + s[l] : a >= 0n ? 0n : a);
+  return t === d.RELEASE_BUFFER ? e.forEach((a, l) => {
+    n[l] = a > 0n ? -a : a;
+  }) : t === d.EXECUTE && r.executeApprovalChanges.forEach((a, l) => {
+    n[l] = a + e[l] < 0n ? a + e[l] : 0n;
   }), n;
-}, G = (e, a) => {
+}, Y = (e, r) => {
   if (e.length === 0)
     return [];
   const s = [[""]];
   for (let t = 0; t < e.length; t += 1)
-    t > 0 && s.push([""]), e[t].forEach((n, r) => {
-      s[t][r] = `0x${Buffer.from(y(n, a)).toString("hex")}`;
+    t > 0 && s.push([""]), e[t].forEach((n, a) => {
+      s[t][a] = `0x${Buffer.from(y(n, r)).toString("hex")}`;
     });
   return s;
-}, Q = (e, a) => {
+}, Z = (e, r) => {
   const s = [];
   for (let n = 0; n < e.length; n += 1) {
     s.push([]);
-    for (let r = 0; r < e[n].length; r += 1)
-      s[n][r] = a.getSiblingHashesForVerification(BigInt(e[n][r].getCommitment())).map((l) => l.toString());
+    for (let a = 0; a < e[n].length; a += 1)
+      s[n][a] = r.getSiblingHashesForVerification(BigInt(e[n][a].getCommitment())).map((l) => l.toString());
   }
   const t = [];
   for (let n = 0; n < e.length; n += 1) {
     t.push([]);
-    for (let r = 0; r < e[n].length; r += 1)
-      t[n][r] = a.getSiblingSides(BigInt(e[n][r].getCommitment())).map((l) => l.toString());
+    for (let a = 0; a < e[n].length; a += 1)
+      t[n][a] = r.getSiblingSides(BigInt(e[n][a].getCommitment())).map((l) => l.toString());
   }
   return { inCommitmentSiblings: s, inCommitmentSiblingSides: t };
-}, Y = (e, a) => {
-  const s = a.getSiblingHashesForVerification(BigInt(e.getAccessKey())).map((n) => n.toString()), t = a.getSiblingSides(BigInt(e.getAccessKey())).map((n) => n.toString());
+}, P = (e, r) => {
+  const s = r.getSiblingHashesForVerification(BigInt(e)).map((n) => n.toString()), t = r.getSiblingSides(BigInt(e)).map((n) => n.toString());
   return { accessTokenSiblings: s, accessTokenSiblingSides: t };
-}, Z = (e) => {
-  const a = { ...e };
-  if (a.amountChanges = e.amountChanges.map((s) => s.toString()), a.calldataHash = e.calldataHash.toString(), a.rootHashAccessToken = e.rootHashAccessToken?.toString(), a.stealthAddressStructure.extraRandomization = e.stealthAddressStructure.extraRandomization.toString(), a.stealthAddressStructure.stealthAddress = e.stealthAddressStructure.stealthAddress.toString(), a.stealthAddressStructure.H0 = e.stealthAddressStructure.H0.toString(), a.stealthAddressStructure.H1 = e.stealthAddressStructure.H1.toString(), a.rootHashHinkal = e.rootHashHinkal?.toString(), a.externalActionId = e.externalActionId?.toString(), "flatFees" in e) {
-    const s = a;
+}, D = (e, r) => P(e.getAccessKey(), r), ee = (e) => {
+  const r = { ...e };
+  if (r.amountChanges = e.amountChanges.map((s) => s.toString()), r.calldataHash = e.calldataHash.toString(), r.rootHashAccessToken = e.rootHashAccessToken?.toString(), r.stealthAddressStructure.extraRandomization = e.stealthAddressStructure.extraRandomization.toString(), r.stealthAddressStructure.stealthAddress = e.stealthAddressStructure.stealthAddress.toString(), r.stealthAddressStructure.H0 = e.stealthAddressStructure.H0.toString(), r.stealthAddressStructure.H1 = e.stealthAddressStructure.H1.toString(), r.rootHashHinkal = e.rootHashHinkal?.toString(), r.externalActionId = e.externalActionId?.toString(), "flatFees" in e) {
+    const s = r;
     return s.flatFees = e.flatFees.map((t) => t.toString()), s;
   } else {
-    const s = a;
+    const s = r;
     return s.slippageValues = e.slippageValues.map((t) => t.toString()), s.hinkalLogicArgs.inHinkalAddress = e.hinkalLogicArgs.inHinkalAddress.toString(), s.hinkalLogicArgs.executeApprovalChanges = e.hinkalLogicArgs.executeApprovalChanges.map(
       (t) => t.toString()
     ), s.hinkalLogicArgs.useApprovalUtxoData = e.hinkalLogicArgs.useApprovalUtxoData.map(
@@ -74,13 +74,13 @@ const X = (e, a) => e.map((s, t) => s.map((n) => a[t] ? "0" : n.getNullifier()))
       })
     ), s.feeStructure.flatFee = e.feeStructure.flatFee.toString(), s.feeStructure.variableRate = e.feeStructure.variableRate.toString(), s;
   }
-}, D = (e) => {
-  const a = { ...e };
-  if (a.amountChanges = e.amountChanges.map((s) => BigInt(s)), a.calldataHash = BigInt(e.calldataHash), a.rootHashAccessToken = BigInt(e.rootHashAccessToken), a.rootHashHinkal = BigInt(e.rootHashHinkal), a.externalActionId = BigInt(e.externalActionId), "flatFees" in e) {
-    const s = a;
+}, te = (e) => {
+  const r = { ...e };
+  if (r.amountChanges = e.amountChanges.map((s) => BigInt(s)), r.calldataHash = BigInt(e.calldataHash), r.rootHashAccessToken = BigInt(e.rootHashAccessToken), r.rootHashHinkal = BigInt(e.rootHashHinkal), r.externalActionId = BigInt(e.externalActionId), "flatFees" in e) {
+    const s = r;
     return s.flatFees = e.flatFees.map((t) => BigInt(t)), s;
   } else {
-    const s = a;
+    const s = r;
     return s.feeStructure.flatFee = BigInt(e.feeStructure.flatFee), s.feeStructure.variableRate = BigInt(e.feeStructure.variableRate), s.slippageValues = e.slippageValues.map((t) => BigInt(t)), s.hinkalLogicArgs.executeApprovalChanges = e.hinkalLogicArgs.executeApprovalChanges.map((t) => BigInt(t)), s.hinkalLogicArgs.inHinkalAddress = BigInt(e.hinkalLogicArgs.inHinkalAddress), s.hinkalLogicArgs.useApprovalUtxoData = e.hinkalLogicArgs.useApprovalUtxoData.map(
       (t) => ({
         approvalChanges: t.approvalChanges.map((n) => BigInt(n)),
@@ -89,8 +89,8 @@ const X = (e, a) => e.map((s, t) => s.map((n) => a[t] ? "0" : n.getNullifier()))
       })
     ), s;
   }
-}, ee = (e, a, s, t, n, r, l, i, m, H, C, u, d, k) => {
-  const h = Object.values(m || F), v = T(t ?? V, s);
+}, se = (e, r, s, t, n, a, l, i, m, H, C, u, g, k, b) => {
+  const h = Object.values(m || O), v = b ?? R(t ?? E, s);
   if (e === "v1x0") {
     const p = o.utils.defaultAbiCoder.encode(
       [
@@ -104,11 +104,11 @@ const X = (e, a) => e.map((s, t) => s.map((n) => a[t] ? "0" : n.getNullifier()))
         "uint256[]"
       ],
       [
-        a,
+        r,
         s,
         t,
         typeof n == "bigint" ? n : f(n),
-        r,
+        a,
         h,
         l,
         i
@@ -119,11 +119,11 @@ const X = (e, a) => e.map((s, t) => s.map((n) => a[t] ? "0" : n.getNullifier()))
     const p = o.utils.defaultAbiCoder.encode(
       ["uint16", "address", "address", "uint256", "bytes"],
       [
-        a,
+        r,
         s,
         t,
         typeof n == "bigint" ? n : f(n),
-        r
+        a
       ]
     ), A = o.utils.defaultAbiCoder.encode(
       [
@@ -139,7 +139,7 @@ const X = (e, a) => e.map((s, t) => s.map((n) => a[t] ? "0" : n.getNullifier()))
       [
         h,
         l,
-        [d.feeToken, d.flatFee, d.variableRate],
+        [g.feeToken, g.flatFee, g.variableRate],
         H,
         C,
         [
@@ -152,17 +152,17 @@ const X = (e, a) => e.map((s, t) => s.map((n) => a[t] ? "0" : n.getNullifier()))
         k,
         v
       ]
-    ), b = BigInt(o.utils.keccak256(p)), I = BigInt(o.utils.keccak256(A)), B = o.utils.defaultAbiCoder.encode(["uint256", "uint256"], [b, I]);
-    return BigInt(o.utils.keccak256(B)) % c;
+    ), I = BigInt(o.utils.keccak256(p)), B = BigInt(o.utils.keccak256(A)), V = o.utils.defaultAbiCoder.encode(["uint256", "uint256"], [I, B]);
+    return BigInt(o.utils.keccak256(V)) % c;
   }
-}, L = (e) => e.startsWith("swapperMO") || e.startsWith("swapperME") ? 2 : e.startsWith("swapperMW") ? 1 : (e.startsWith("swapperMHA"), 0), te = (e, a, s, t, n, r) => {
+}, x = (e) => e.startsWith("swapperMO") || e.startsWith("swapperME") ? 2 : e.startsWith("swapperMW") ? 1 : (e.startsWith("swapperMHA"), 0), ne = (e, r, s, t, n, a) => {
   if (e.startsWith("swapperMWMin0"))
-    return 5;
-  const l = L(e);
+    return 4;
+  const l = x(e);
   return 10 + // stealthAddressStructure.H1
-  a.length + s.length + t.flat().length + n.length + l + r + E * a.length;
-}, se = (e, a) => {
-  const { h0: s, h1: t } = S.getStealthAddressCompressedPoints(e, a), n = BigInt(S.getStealthAddress(e, a));
+  r.length + s.length + t.flat().length + n.flat().length + l + a + F * r.length;
+}, re = (e, r) => {
+  const { h0: s, h1: t } = S.getStealthAddressCompressedPoints(e, r), n = BigInt(S.getStealthAddress(e, r));
   return {
     extraRandomization: e,
     H0: s,
@@ -171,16 +171,17 @@ const X = (e, a) => e.map((s, t) => s.map((n) => a[t] ? "0" : n.getNullifier()))
   };
 };
 export {
-  X as buildInNullifiers,
-  U as buildOutCommitments,
-  Y as calcAccessTokenSiblingsAndSides,
-  $ as calcAmountChanges,
-  Q as calcCommitmentsSiblingAndSides,
-  G as calcEncryptedOutputs,
-  te as calcPublicSignalCount,
-  se as calcStealthAddressStructure,
-  ee as createCallDataHash,
-  D as deserializeCircomData,
-  q as getSlippageValues,
-  Z as serializeCircomData
+  $ as buildInNullifiers,
+  q as buildOutCommitments,
+  P as calcAccessTokenSiblingAndSidesFromAccessKey,
+  D as calcAccessTokenSiblingsAndSides,
+  G as calcAmountChanges,
+  Z as calcCommitmentsSiblingAndSides,
+  Y as calcEncryptedOutputs,
+  ne as calcPublicSignalCount,
+  re as calcStealthAddressStructure,
+  se as createCallDataHash,
+  te as deserializeCircomData,
+  Q as getSlippageValues,
+  ee as serializeCircomData
 };