@hinkal/common 0.2.13 → 0.2.14

package/data-structures/Hinkal/hinkalProxySwap.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const C=require("../../constants/addresses.constants.cjs"),w=require("../../functions/pre-transaction/getFeeStructure.cjs"),E=require("../../functions/private-wallet/emporium.swap.helpers.cjs"),h=require("../../functions/private-wallet/smartContractWalletCalculator.cjs"),y=require("../../functions/utils/convertEmporiumOpToCallInfo.cjs"),q=require("../../types/ethereum-network.types.cjs"),v=require("../../types/external-action.types.cjs"),_=async(t,e,n,c,u,r,o,l,p=!1)=>{if(!r)throw Error("hinkalActionReceive: wallet nonce should be provided");if(!o)throw new Error("Fee token is required in hinkalActionReceive");const a=t.getCurrentChainId(),i=await h.calculateSmartContractWalletAddressFromNonce(a,t.userKeys,r),s=E.createSwapToEmporiumOps(t,c,C.SWAP_ROUTER_ADDRESSES[c][a],u,e[0],n[0],e[1],n[1],i,!0),m=t.getContractWithFetcher(q.ContractType.HinkalContract),S=l??await w.getFeeStructure(a,o,e,v.ExternalActionId.Emporium,void 0,s.map(d=>y.convertEmporiumOpToCallInfo(d,i,m.address)));return t.actionPrivateWallet([],[],[],s,r,o,S,p)};exports.hinkalProxySwap=_;

package/data-structures/Hinkal/hinkalProxySwap.d.ts

@@ -0,0 +1,5 @@
+import { ExternalActionId } from '../../types/external-action.types';
+import { FeeStructure } from '../../types/hinkal.types';
+import { RelayerTransaction } from '../../types/relayer.types';
+import { IHinkal } from './IHinkal';
+export declare const hinkalProxySwap: (hinkal: IHinkal, erc20Addresses: string[], deltaAmounts: bigint[], externalActionId: ExternalActionId, data: string, walletNonce: bigint, feeToken?: string, feeStructureOverride?: FeeStructure, onlyGasEstimate?: boolean) => Promise<RelayerTransaction | bigint>;

package/data-structures/Hinkal/hinkalProxySwap.mjs

@@ -0,0 +1,36 @@
+import { SWAP_ROUTER_ADDRESSES as S } from "../../constants/addresses.constants.mjs";
+import { getFeeStructure as d } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { createSwapToEmporiumOps as C } from "../../functions/private-wallet/emporium.swap.helpers.mjs";
+import { calculateSmartContractWalletAddressFromNonce as w } from "../../functions/private-wallet/smartContractWalletCalculator.mjs";
+import { convertEmporiumOpToCallInfo as h } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
+import { ContractType as v } from "../../types/ethereum-network.types.mjs";
+import { ExternalActionId as R } from "../../types/external-action.types.mjs";
+const P = async (r, t, a, m, p, o, e, s, u = !1) => {
+  if (!o)
+    throw Error("hinkalActionReceive: wallet nonce should be provided");
+  if (!e)
+    throw new Error("Fee token is required in hinkalActionReceive");
+  const i = r.getCurrentChainId(), c = await w(i, r.userKeys, o), n = C(
+    r,
+    m,
+    S[m][i],
+    p,
+    t[0],
+    a[0],
+    t[1],
+    a[1],
+    c,
+    !0
+  ), f = r.getContractWithFetcher(v.HinkalContract), l = s ?? await d(
+    i,
+    e,
+    t,
+    R.Emporium,
+    void 0,
+    n.map((E) => h(E, c, f.address))
+  );
+  return r.actionPrivateWallet([], [], [], n, o, e, l, u);
+};
+export {
+  P as hinkalProxySwap
+};

package/data-structures/Hinkal/hinkalSignSubAccount.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("ethers"),d=require("../../functions/snarkjs/generateZkProofSelf.cjs");require("../../constants/vite.constants.cjs");const g=require("../../functions/private-wallet/smartContractWalletCalculator.cjs"),y=async(e,r,t,i,n)=>{const{userKeys:o}=e,a=o.getShieldedPrivateKey();i&&(await g.isProxyDeployed(e,t)||await e.deploySubAccount(t,n));const u={dataHash:BigInt(r),shieldedPrivateKey:a,hinkalWalletNonce:t},s="EmporiumSignatureCalculator",{zkCallData:c}=await d.generateZkProofSelf("v1x1",e.getCurrentChainId(),s,u);return l.ethers.utils.defaultAbiCoder.encode(["uint256[2]","uint256[2][2]","uint256[2]","uint256[2]"],c)};exports.hinkalSignSubAccount=y;

package/data-structures/Hinkal/hinkalSignSubAccount.d.ts

@@ -0,0 +1,3 @@
+import { type IHinkal } from './IHinkal';
+export declare const checkValidityOfSignature: (hinkal: IHinkal, walletSalt: string, dataHash: string, signature: string) => Promise<boolean>;
+export declare const hinkalSignSubAccount: (hinkal: IHinkal, dataHash: string, walletNonce: bigint, shouldBeProxyDeployed?: boolean, feeToken?: string) => Promise<string>;

package/data-structures/Hinkal/hinkalSignSubAccount.mjs

@@ -0,0 +1,20 @@
+import { ethers as d } from "ethers";
+import { generateZkProofSelf as p } from "../../functions/snarkjs/generateZkProofSelf.mjs";
+import "../../constants/vite.constants.mjs";
+import { isProxyDeployed as l } from "../../functions/private-wallet/smartContractWalletCalculator.mjs";
+const h = async (t, i, e, o, r) => {
+  const { userKeys: n } = t, a = n.getShieldedPrivateKey();
+  o && (await l(t, e) || await t.deploySubAccount(e, r));
+  const s = {
+    dataHash: BigInt(i),
+    shieldedPrivateKey: a,
+    hinkalWalletNonce: e
+  }, u = "EmporiumSignatureCalculator", { zkCallData: c } = await p("v1x1", t.getCurrentChainId(), u, s);
+  return d.utils.defaultAbiCoder.encode(
+    ["uint256[2]", "uint256[2][2]", "uint256[2]", "uint256[2]"],
+    c
+  );
+};
+export {
+  h as hinkalSignSubAccount
+};

package/data-structures/Hinkal/hinkalSwap.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const q=require("../../constants/chains.constants.cjs"),I=require("../../error-handling/error-codes.constants.cjs"),m=require("../../functions/pre-transaction/getFlatFees.cjs"),U=require("../../functions/pre-transaction/processAmountChanges.cjs"),b=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),P=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),S=require("../../functions/web3/events/getShieldedBalance.cjs"),T=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),h=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),c=require("../../types/external-action.types.cjs"),D=(e,s)=>{const{contractData:t}=q.networkRegistry[e.getCurrentChainId()];let r;switch(s){case c.ExternalActionId.Uniswap:r=t?.uniswapExternalActionAddress;break;case c.ExternalActionId.Odos:r=t?.odosExternalActionInstanceAddress;break;case c.ExternalActionId.OneInch:r=t?.oneInchExternalActionInstanceAddress;break;default:r=t?.uniswapExternalActionAddress;break}if(!r)throw new Error("No external Address set during swap");return r},F=async(e,s,t,r,p,g=!1,w=!1)=>{const{flatFees:i,feeUnit:y}=await m.getFlatFees(e.getCurrentChainId(),s,r,t);t=U.processAmountChanges({erc20Addresses:s,amountChanges:t,flatFees:i,feeUnit:y,externalActionId:r});const E=D(e,r),n={externalActionId:r,externalAddress:E,externalActionMetadata:p},o=[...await S.addPaddingToUtxos(e,s,t)],f=`swapperM${t.length.toString()}x${o[0].length}x1`,C=[!1,!0],l=[];for(let a=0;a<s.length;a+=1){const{outputUtxos:R}=b.outputUtxoProcessing(e.userKeys,o[a],t[a]);l.push(R)}const u=await e.getRandomRelay();if(!u)throw Error(I.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{zkCallData:d,circomData:A,dimData:x}=await P.constructZkProof(e.merkleTreeHinkal,e.merkleTreeAccessToken,o,l,e.userKeys,f,n.externalActionId,n.externalAddress,n.externalActionMetadata,u,e.getCurrentChainId(),C,i);return g?await T.estimateGasRelayer(e,d,x,A):await h.transactCallRelayer(e.getCurrentChainId(),d,x,A,w)};exports.hinkalSwap=F;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const E=require("../../error-handling/error-codes.constants.cjs"),m=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),U=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),F=require("../../functions/web3/events/getShieldedBalance.cjs"),I=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),M=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),_=require("../../functions/pre-transaction/getFeeStructure.cjs"),L=require("../../functions/pre-transaction/merge-with-fee-structure.cjs"),H=require("../../types/external-action.types.cjs"),K=require("../../types/hinkal.types.cjs"),k=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),G=require("../../types/ethereum-network.types.cjs"),N=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),W=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),b=require("../../functions/pre-transaction/getExternalSwapAddress.cjs"),B=async(e,a,t,c,x,C,T,A=!1,q=!1)=>{const i=T??await _.getFeeStructure(e.getCurrentChainId(),C,a,H.ExternalActionId.Transact);L.mergeWithFeeStructure(e.getCurrentChainId(),a,t,i);const w=b.getExternalSwapAddress(e,c),s={externalActionId:c,externalAddress:w,externalActionMetadata:x},o=[...await F.addPaddingToUtxos(e,a,t)],f=`swapperM${t.length.toString()}x${o[0].length}x1`,S=[!1,!0,!1].slice(0,t.length),u=[],n=K.defaultHinkalLogicArgs(t.length,e.userKeys);for(let r=0;r<a.length;r+=1){const{outputUtxos:D}=m.outputUtxoProcessing(e.userKeys,o[r],t[r],void 0,void 0,!1);u.push(D);const{useApprovalUtxoData:y}=k.outputApprovalDataProcessing(e,o[r],t[r]);y&&(n.useApprovalUtxoData[r]=y,n.doPreTxApproval=!0)}const g=await e.getRandomRelay();if(!g)throw Error(E.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:v,kycRequired:P,hasAccessToken:R}=await N.shouldPatchAccessTokenMerkleTree(e,a,t),h=await W.getSignatureDataForTransact(e.getCurrentChainId(),await e.getEthereumAddress(),e.userKeys,P,R),{zkCallData:l,circomData:p,dimData:d}=await U.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,o,u,e.userKeys,f,s.externalActionId,s.externalAddress,s.externalActionMetadata,e.generateProofRemotely,g,e.getCurrentChainId(),S,void 0,void 0,void 0,v,n,void 0,i,e.getContractWithFetcher(G.ContractType.HinkalHelperContract),h);return A?await I.estimateGasRelayer(e,l,d,p):await M.transactCallRelayer(e.getCurrentChainId(),l,d,p,q)};exports.hinkalSwap=B;

package/data-structures/Hinkal/hinkalSwap.d.ts

@@ -1,3 +1,4 @@
 import { ExternalActionId } from '../../types/external-action.types';
 import { IHinkal } from './IHinkal';
-export declare const hinkalSwap: (hinkal: IHinkal, erc20Addresses: string[], amountChanges: bigint[], externalActionId: ExternalActionId, data: string, onlyGasEstimate?: boolean, withPrivateMempool?: boolean) => Promise<bigint | import('../../index.ts').RelayerTransaction>;
+import { FeeStructure } from '../../types/hinkal.types';
+export declare const hinkalSwap: (hinkal: IHinkal, erc20Addresses: string[], deltaAmounts: bigint[], externalActionId: ExternalActionId, data: string, feeToken?: string, feeStructureOverride?: FeeStructure, onlyGasEstimate?: boolean, withPrivateMempool?: boolean) => Promise<bigint | import('../../index.ts').RelayerTransaction>;

package/data-structures/Hinkal/hinkalSwap.mjs

@@ -1,76 +1,85 @@
-import { networkRegistry as R } from "../../constants/chains.constants.mjs";
-import { transactionErrorCodes as I } from "../../error-handling/error-codes.constants.mjs";
-import { getFlatFees as U } from "../../functions/pre-transaction/getFlatFees.mjs";
-import { processAmountChanges as D } from "../../functions/pre-transaction/processAmountChanges.mjs";
-import { outputUtxoProcessing as T } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { constructZkProof as b } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { addPaddingToUtxos as F } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { estimateGasRelayer as L } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
-import { transactCallRelayer as M } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { ExternalActionId as i } from "../../types/external-action.types.mjs";
-const N = (t, a) => {
-  const { contractData: e } = R[t.getCurrentChainId()];
-  let r;
-  switch (a) {
-    case i.Uniswap:
-      r = e?.uniswapExternalActionAddress;
-      break;
-    case i.Odos:
-      r = e?.odosExternalActionInstanceAddress;
-      break;
-    case i.OneInch:
-      r = e?.oneInchExternalActionInstanceAddress;
-      break;
-    default:
-      r = e?.uniswapExternalActionAddress;
-      break;
+import { transactionErrorCodes as S } from "../../error-handling/error-codes.constants.mjs";
+import { outputUtxoProcessing as U } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { constructZkProof as L } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { addPaddingToUtxos as M } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { estimateGasRelayer as h } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
+import { transactCallRelayer as F } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { getFeeStructure as H } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { mergeWithFeeStructure as K } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+import { ExternalActionId as N } from "../../types/external-action.types.mjs";
+import { defaultHinkalLogicArgs as W } from "../../types/hinkal.types.mjs";
+import { outputApprovalDataProcessing as _ } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
+import { ContractType as $ } from "../../types/ethereum-network.types.mjs";
+import { shouldPatchAccessTokenMerkleTree as q } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import { getSignatureDataForTransact as z } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
+import { getExternalSwapAddress as B } from "../../functions/pre-transaction/getExternalSwapAddress.mjs";
+const st = async (t, o, r, n, x, d, C, y = !1, T = !1) => {
+  const c = C ?? await H(t.getCurrentChainId(), d, o, N.Transact);
+  K(t.getCurrentChainId(), o, r, c);
+  const w = B(t, n), s = {
+    externalActionId: n,
+    externalAddress: w,
+    externalActionMetadata: x
+  }, a = [...await M(t, o, r)], A = `swapperM${r.length.toString()}x${a[0].length}x1`, v = [!1, !0, !1].slice(0, r.length), p = [], i = W(r.length, t.userKeys);
+  for (let e = 0; e < o.length; e += 1) {
+    const { outputUtxos: P } = U(
+      t.userKeys,
+      a[e],
+      r[e],
+      void 0,
+      void 0,
+      !1
+    );
+    p.push(P);
+    const { useApprovalUtxoData: l } = _(t, a[e], r[e]);
+    l && (i.useApprovalUtxoData[e] = l, i.doPreTxApproval = !0);
   }
-  if (!r)
-    throw new Error("No external Address set during swap");
-  return r;
-}, H = async (t, a, e, r, u, A = !1, x = !1) => {
-  const { flatFees: c, feeUnit: w } = await U(
+  const m = await t.getRandomRelay();
+  if (!m)
+    throw Error(S.RELAYER_NOT_AVAILABLE);
+  const { patchAccessTokenMerkleTree: E, kycRequired: R, hasAccessToken: D } = await q(
+    t,
+    o,
+    r
+  ), I = await z(
     t.getCurrentChainId(),
-    a,
-    r,
-    e
-  );
-  e = D({ erc20Addresses: a, amountChanges: e, flatFees: c, feeUnit: w, externalActionId: r });
-  const E = N(t, r), s = {
-    externalActionId: r,
-    externalAddress: E,
-    externalActionMetadata: u
-  }, n = [...await F(t, a, e)], g = `swapperM${e.length.toString()}x${n[0].length}x1`, y = [!1, !0], d = [];
-  for (let o = 0; o < a.length; o += 1) {
-    const { outputUtxos: C } = T(t.userKeys, n[o], e[o]);
-    d.push(C);
-  }
-  const l = await t.getRandomRelay();
-  if (!l)
-    throw Error(I.RELAYER_NOT_AVAILABLE);
-  const { zkCallData: p, circomData: m, dimData: f } = await b(
+    await t.getEthereumAddress(),
+    t.userKeys,
+    R,
+    D
+  ), { zkCallData: u, circomData: g, dimData: f } = await L(
+    "v1x1",
     t.merkleTreeHinkal,
     t.merkleTreeAccessToken,
-    n,
-    d,
+    a,
+    p,
     t.userKeys,
-    g,
+    A,
     s.externalActionId,
     s.externalAddress,
     s.externalActionMetadata,
-    l,
+    t.generateProofRemotely,
+    m,
     t.getCurrentChainId(),
-    y,
-    c
+    v,
+    void 0,
+    void 0,
+    void 0,
+    E,
+    i,
+    void 0,
+    c,
+    t.getContractWithFetcher($.HinkalHelperContract),
+    I
   );
-  return A ? await L(t, p, f, m) : await M(
+  return y ? await h(t, u, f, g) : await F(
     t.getCurrentChainId(),
-    p,
+    u,
     f,
-    m,
-    x
+    g,
+    T
   );
 };
 export {
-  H as hinkalSwap
+  st as hinkalSwap
 };

package/data-structures/Hinkal/hinkalWithdraw.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const T=require("../../constants/protocol.constants.cjs"),I=require("../../error-handling/error-codes.constants.cjs"),f=require("../../functions/utils/erc20tokenFunctions.cjs"),m=require("../../functions/pre-transaction/getFlatFees.cjs"),F=require("../../functions/pre-transaction/processAmountChanges.cjs"),D=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),U=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),P=require("../../functions/web3/events/getShieldedBalance.cjs"),R=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),_=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),h=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),g=require("../../types/external-action.types.cjs"),M=async(t,o,e,C,n,p=!1)=>{const{flatFees:d,feeUnit:w}=await m.getFlatFees(t.getCurrentChainId(),o,g.ExternalActionId.Transact,e);n||F.processAmountChanges({erc20Addresses:o,amountChanges:e,flatFees:d,feeUnit:w,externalActionId:g.ExternalActionId.Transact});const a=f.getERC20Token(o[0],t.getCurrentChainId());if(!a)throw Error("Deposit Action: No Token Found");const s={externalActionId:0n,externalAddress:C,externalActionMetadata:"0x00"},c=[...await P.addPaddingToUtxos(t,o,e)],q=`swapperM${e.length.toString()}x${c[0].length}x1`,E=[!1],x=[];for(let r=0;r<o.length;r+=1){const{outputUtxos:y}=D.outputUtxoProcessing(t.userKeys,c[r],e[r]);x.push(y)}const A=await t.getRandomRelay();if(!n&&!A)throw Error(I.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{zkCallData:i,circomData:u,dimData:l}=await U.constructZkProof(t.merkleTreeHinkal,t.merkleTreeAccessToken,c,x,t.userKeys,q,s.externalActionId,s.externalAddress,s.externalActionMetadata,n?T.zeroAddress:A,t.getCurrentChainId(),E,d);if(p)return await R.estimateGasRelayer(t,i,l,u);if(n){if(!a)throw Error("Withdraw Action: No Token Found");return await _.transactCallDirect(t,e[0],a,i,u,l)}return await h.transactCallRelayer(t.getCurrentChainId(),i,l,u)};exports.hinkalWithdraw=M;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const f=require("../../constants/protocol.constants.cjs"),m=require("../../error-handling/error-codes.constants.cjs"),F=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),I=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),U=require("../../functions/web3/events/getShieldedBalance.cjs"),M=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),R=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),_=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),k=require("../../types/external-action.types.cjs"),W=require("../../types/hinkal.types.cjs"),L=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),N=require("../../functions/pre-transaction/getFeeStructure.cjs"),H=require("../../functions/pre-transaction/merge-with-fee-structure.cjs");require("../../types/circom-data.types.cjs");const K=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");require("../../types/activities.types.cjs");const G=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),b=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),z=async(e,p,r,C,a,T,w,y=!1)=>{const o=p.map(t=>t.erc20TokenAddress);let c;a||(c=w??await N.getFeeStructure(e.getCurrentChainId(),T,o,k.ExternalActionId.Transact),H.mergeWithFeeStructure(e.getCurrentChainId(),o,r,c));const n=p[0];if(!n)throw Error("Deposit Action: No Token Found");const i={externalActionId:0n,externalAddress:C,externalActionMetadata:"0x00"},s=[...await U.addPaddingToUtxos(e,o,r)],h=`swapperM${r.length.toString()}x${s[0].length}x1`,x=[],u=W.defaultHinkalLogicArgs(r.length,e.userKeys);for(let t=0;t<o.length;t+=1){const{outputUtxos:S}=F.outputUtxoProcessing(e.userKeys,s[t],r[t],void 0,void 0,!1);x.push(S);const{useApprovalUtxoData:q}=L.outputApprovalDataProcessing(e,s[t],r[t]);q&&(u.useApprovalUtxoData[t]=q,u.doPreTxApproval=!0)}const A=await e.getRandomRelay();if(!a&&!A)throw Error(m.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:v,kycRequired:D,hasAccessToken:P}=await b.shouldPatchAccessTokenMerkleTree(e,o,r),E=await G.getSignatureDataForTransact(e.getCurrentChainId(),await e.getEthereumAddress(),e.userKeys,D,P),{zkCallData:d,circomData:g,dimData:l}=await I.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,s,x,e.userKeys,h,i.externalActionId,i.externalAddress,i.externalActionMetadata,e.generateProofRemotely,a?f.zeroAddress:A,e.getCurrentChainId(),void 0,void 0,void 0,void 0,v,u,void 0,c,e.getContractWithFetcher(K.ContractType.HinkalHelperContract),E);if(y)return await M.estimateGasRelayer(e,d,l,g);if(a){if(!n)throw Error("Withdraw Action: No Token Found");return await R.transactCallDirect(e,r[0],n,d,g,l)}return await _.transactCallRelayer(e.getCurrentChainId(),d,l,g)};exports.hinkalWithdraw=z;

package/data-structures/Hinkal/hinkalWithdraw.d.ts

@@ -1,2 +1,4 @@
 import { IHinkal } from './IHinkal';
-export declare const hinkalWithdraw: (hinkal: IHinkal, erc20Addresses: string[], amountChanges: bigint[], recipientAddress: string, isRelayerOff: boolean, onlyGasEstimate?: boolean) => Promise<bigint | import('../../index.ts').RelayerTransaction | import("ethers").ContractTransaction>;
+import { FeeStructure } from '../../types/hinkal.types';
+import { ERC20Token } from '../../types';
+export declare const hinkalWithdraw: (hinkal: IHinkal, erc20Tokens: ERC20Token[], deltaAmounts: bigint[], recipientAddress: string, isRelayerOff: boolean, feeToken?: string, feeStructureOverride?: FeeStructure, onlyGasEstimate?: boolean) => Promise<any>;

package/data-structures/Hinkal/hinkalWithdraw.mjs

@@ -1,68 +1,95 @@
-import { zeroAddress as T } from "../../constants/protocol.constants.mjs";
-import { transactionErrorCodes as I } from "../../error-handling/error-codes.constants.mjs";
-import { getERC20Token as y } from "../../functions/utils/erc20tokenFunctions.mjs";
-import { getFlatFees as D } from "../../functions/pre-transaction/getFlatFees.mjs";
-import { processAmountChanges as U } from "../../functions/pre-transaction/processAmountChanges.mjs";
+import { zeroAddress as U } from "../../constants/protocol.constants.mjs";
+import { transactionErrorCodes as h } from "../../error-handling/error-codes.constants.mjs";
 import { outputUtxoProcessing as F } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { constructZkProof as N } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { addPaddingToUtxos as R } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { estimateGasRelayer as L } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
-import { transactCallDirect as M } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
-import { transactCallRelayer as P } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { ExternalActionId as l } from "../../types/external-action.types.mjs";
-const h = async (t, e, r, u, a, A = !1) => {
-  const { flatFees: x, feeUnit: w } = await D(
-    t.getCurrentChainId(),
-    e,
-    l.Transact,
-    r
-  );
-  a || U({
-    erc20Addresses: e,
-    amountChanges: r,
-    flatFees: x,
-    feeUnit: w,
-    externalActionId: l.Transact
-  });
-  const n = y(e[0], t.getCurrentChainId());
-  if (!n)
+import { constructZkProof as L } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { addPaddingToUtxos as M } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { estimateGasRelayer as R } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
+import { transactCallDirect as S } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
+import { transactCallRelayer as H } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ExternalActionId as K } from "../../types/external-action.types.mjs";
+import { defaultHinkalLogicArgs as N } from "../../types/hinkal.types.mjs";
+import { outputApprovalDataProcessing as W } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
+import { getFeeStructure as z } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { mergeWithFeeStructure as _ } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+import "../../types/circom-data.types.mjs";
+import { ContractType as $ } from "../../types/ethereum-network.types.mjs";
+import "../../types/transactions.types.mjs";
+import "../../types/curve.types.mjs";
+import "../../types/activities.types.mjs";
+import { getSignatureDataForTransact as q } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
+import { shouldPatchAccessTokenMerkleTree as B } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+const pt = async (t, g, e, C, a, w, T, l = !1) => {
+  const o = g.map((r) => r.erc20TokenAddress);
+  let i;
+  a || (i = T ?? await z(t.getCurrentChainId(), w, o, K.Transact), _(t.getCurrentChainId(), o, e, i));
+  const c = g[0];
+  if (!c)
     throw Error("Deposit Action: No Token Found");
-  const i = {
+  const n = {
     externalActionId: 0n,
-    externalAddress: u,
+    externalAddress: C,
     externalActionMetadata: "0x00"
-  }, c = [...await R(t, e, r)], g = `swapperM${r.length.toString()}x${c[0].length}x1`, C = [!1], d = [];
-  for (let o = 0; o < e.length; o += 1) {
-    const { outputUtxos: E } = F(t.userKeys, c[o], r[o]);
-    d.push(E);
+  }, s = [...await M(t, o, e)], v = `swapperM${e.length.toString()}x${s[0].length}x1`, x = [], m = N(e.length, t.userKeys);
+  for (let r = 0; r < o.length; r += 1) {
+    const { outputUtxos: P } = F(
+      t.userKeys,
+      s[r],
+      e[r],
+      void 0,
+      void 0,
+      !1
+    );
+    x.push(P);
+    const { useApprovalUtxoData: A } = W(t, s[r], e[r]);
+    A && (m.useApprovalUtxoData[r] = A, m.doPreTxApproval = !0);
   }
   const f = await t.getRandomRelay();
   if (!a && !f)
-    throw Error(I.RELAYER_NOT_AVAILABLE);
-  const { zkCallData: s, circomData: m, dimData: p } = await N(
+    throw Error(h.RELAYER_NOT_AVAILABLE);
+  const { patchAccessTokenMerkleTree: y, kycRequired: D, hasAccessToken: E } = await B(
+    t,
+    o,
+    e
+  ), I = await q(
+    t.getCurrentChainId(),
+    await t.getEthereumAddress(),
+    t.userKeys,
+    D,
+    E
+  ), { zkCallData: p, circomData: d, dimData: u } = await L(
+    "v1x1",
     t.merkleTreeHinkal,
     t.merkleTreeAccessToken,
-    c,
-    d,
+    s,
+    x,
     t.userKeys,
-    g,
-    i.externalActionId,
-    i.externalAddress,
-    i.externalActionMetadata,
-    a ? T : f,
+    v,
+    n.externalActionId,
+    n.externalAddress,
+    n.externalActionMetadata,
+    t.generateProofRemotely,
+    a ? U : f,
     t.getCurrentChainId(),
-    C,
-    x
+    void 0,
+    void 0,
+    void 0,
+    void 0,
+    y,
+    m,
+    void 0,
+    i,
+    t.getContractWithFetcher($.HinkalHelperContract),
+    I
   );
-  if (A)
-    return await L(t, s, p, m);
+  if (l)
+    return await R(t, p, u, d);
   if (a) {
-    if (!n)
+    if (!c)
       throw Error("Withdraw Action: No Token Found");
-    return await M(t, r[0], n, s, m, p);
+    return await S(t, e[0], c, p, d, u);
   }
-  return await P(t.getCurrentChainId(), s, p, m);
+  return await H(t.getCurrentChainId(), p, u, d);
 };
 export {
-  h as hinkalWithdraw
+  pt as hinkalWithdraw
 };

package/data-structures/Hinkal/index.d.ts

@@ -10,3 +10,4 @@ export * from './hinkalTransfer';
 export * from './hinkalWithdraw';
 export * from './hinkalPrivateWallet';
 export * from './resetMerkleTrees';
+export * from './hinkalProxySwap';

package/data-structures/Hinkal/resetMerkleTrees.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("../../constants/chains.constants.cjs"),n=require("../../functions/web3/events/balanceChangedHandler.cjs");require("../../types/circom-data.types.cjs");const r=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");const s=require("../snapshot/ClientAccessTokenSnapshotService.cjs"),i=require("../snapshot/ClientCommitmentsSnapshotService.cjs"),o=require("../snapshot/ClientNullifierSnapshotService.cjs"),a=async e=>{const{maxPageSize:t}=c.networkRegistry[e.getCurrentChainId()];e.commitmentsSnapshotService?.intervalClear(),e.commitmentsSnapshotService=new i.ClientCommitmentsSnapshotService(e.getContractWithFetcher(r.ContractType.HinkalContract),t),e.nullifierSnapshotService?.intervalClear(),e.nullifierSnapshotService=new o.ClientNullifierSnapshotService(e.getContractWithFetcher(r.ContractType.HinkalContract),t),e.accessTokenSnapshotService?.intervalClear(),e.accessTokenSnapshotService=new s.ClientAccessTokenSnapshotService(e.getContractWithFetcher(r.ContractType.CrossChainAccessTokenContract),t),await Promise.all([e.commitmentsSnapshotService.init(),e.nullifierSnapshotService.init(),e.accessTokenSnapshotService.init()]),e.merkleTreeHinkal=e.commitmentsSnapshotService.merkleTree,e.merkleTreeAccessToken=e.accessTokenSnapshotService.merkleTree,e.nullifiers=e.nullifierSnapshotService.nullifiers,e.encryptedOutputs=e.commitmentsSnapshotService.encryptedOutputs,e.commitmentsSnapshotService.onNewEvent=n.balanceChangedHandler,e.nullifierSnapshotService.onNewEvent=n.balanceChangedHandler};exports.resetMerkleTrees=a;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("../../constants/chains.constants.cjs"),n=require("../../functions/web3/events/balanceChangedHandler.cjs");require("../../types/circom-data.types.cjs");const r=require("../../types/ethereum-network.types.cjs");require("../../constants/vite.constants.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");require("../../types/activities.types.cjs");const c=require("../snapshot/ClientAccessTokenSnapshotService.cjs"),o=require("../snapshot/ClientApprovalsSnapshotService.cjs"),i=require("../snapshot/ClientCommitmentsSnapshotService.cjs"),a=require("../snapshot/ClientNullifierSnapshotService.cjs"),S=async e=>{const{maxPageSize:t}=s.networkRegistry[e.getCurrentChainId()];e.commitmentsSnapshotService?.intervalClear(),e.commitmentsSnapshotService=new i.ClientCommitmentsSnapshotService(e.getContractWithFetcher(r.ContractType.HinkalContract),t),e.nullifierSnapshotService?.intervalClear(),e.nullifierSnapshotService=new a.ClientNullifierSnapshotService(e.getContractWithFetcher(r.ContractType.HinkalContract),t),e.accessTokenSnapshotService?.intervalClear(),e.accessTokenSnapshotService=new c.ClientAccessTokenSnapshotService(e.getContractWithFetcher(r.ContractType.AccessTokenContract),t),e.approvalsSnapshotService?.intervalClear(),e.approvalsSnapshotService=new o.ClientApprovalsSnapshotService(e.getContractWithFetcher(r.ContractType.HinkalContract),t),await Promise.all([e.commitmentsSnapshotService.init(),e.nullifierSnapshotService.init(),e.accessTokenSnapshotService.init(),e.approvalsSnapshotService.init()]),e.merkleTreeHinkal=e.commitmentsSnapshotService.merkleTree,e.merkleTreeAccessToken=e.accessTokenSnapshotService.merkleTree,e.nullifiers=e.nullifierSnapshotService.nullifiers,e.encryptedOutputs=e.commitmentsSnapshotService.encryptedOutputs,e.approvals=e.approvalsSnapshotService.approvals,e.commitmentsSnapshotService.onNewEvent=n.balanceChangedHandler,e.nullifierSnapshotService.onNewEvent=n.balanceChangedHandler};exports.resetMerkleTrees=S;

package/data-structures/Hinkal/resetMerkleTrees.mjs

@@ -1,29 +1,36 @@
-import { networkRegistry as n } from "../../constants/chains.constants.mjs";
+import { networkRegistry as c } from "../../constants/chains.constants.mjs";
 import { balanceChangedHandler as o } from "../../functions/web3/events/balanceChangedHandler.mjs";
 import "../../types/circom-data.types.mjs";
 import { ContractType as r } from "../../types/ethereum-network.types.mjs";
+import "../../constants/vite.constants.mjs";
 import "../../types/transactions.types.mjs";
 import "../../types/curve.types.mjs";
-import { ClientAccessTokenSnapshotService as c } from "../snapshot/ClientAccessTokenSnapshotService.mjs";
+import "../../types/activities.types.mjs";
+import { ClientAccessTokenSnapshotService as s } from "../snapshot/ClientAccessTokenSnapshotService.mjs";
+import { ClientApprovalsSnapshotService as n } from "../snapshot/ClientApprovalsSnapshotService.mjs";
 import { ClientCommitmentsSnapshotService as i } from "../snapshot/ClientCommitmentsSnapshotService.mjs";
-import { ClientNullifierSnapshotService as s } from "../snapshot/ClientNullifierSnapshotService.mjs";
-const T = async (e) => {
-  const { maxPageSize: t } = n[e.getCurrentChainId()];
+import { ClientNullifierSnapshotService as p } from "../snapshot/ClientNullifierSnapshotService.mjs";
+const h = async (e) => {
+  const { maxPageSize: t } = c[e.getCurrentChainId()];
   e.commitmentsSnapshotService?.intervalClear(), e.commitmentsSnapshotService = new i(
     e.getContractWithFetcher(r.HinkalContract),
     t
-  ), e.nullifierSnapshotService?.intervalClear(), e.nullifierSnapshotService = new s(
+  ), e.nullifierSnapshotService?.intervalClear(), e.nullifierSnapshotService = new p(
     e.getContractWithFetcher(r.HinkalContract),
     t
-  ), e.accessTokenSnapshotService?.intervalClear(), e.accessTokenSnapshotService = new c(
-    e.getContractWithFetcher(r.CrossChainAccessTokenContract),
+  ), e.accessTokenSnapshotService?.intervalClear(), e.accessTokenSnapshotService = new s(
+    e.getContractWithFetcher(r.AccessTokenContract),
+    t
+  ), e.approvalsSnapshotService?.intervalClear(), e.approvalsSnapshotService = new n(
+    e.getContractWithFetcher(r.HinkalContract),
     t
   ), await Promise.all([
     e.commitmentsSnapshotService.init(),
     e.nullifierSnapshotService.init(),
-    e.accessTokenSnapshotService.init()
-  ]), e.merkleTreeHinkal = e.commitmentsSnapshotService.merkleTree, e.merkleTreeAccessToken = e.accessTokenSnapshotService.merkleTree, e.nullifiers = e.nullifierSnapshotService.nullifiers, e.encryptedOutputs = e.commitmentsSnapshotService.encryptedOutputs, e.commitmentsSnapshotService.onNewEvent = o, e.nullifierSnapshotService.onNewEvent = o;
+    e.accessTokenSnapshotService.init(),
+    e.approvalsSnapshotService.init()
+  ]), e.merkleTreeHinkal = e.commitmentsSnapshotService.merkleTree, e.merkleTreeAccessToken = e.accessTokenSnapshotService.merkleTree, e.nullifiers = e.nullifierSnapshotService.nullifiers, e.encryptedOutputs = e.commitmentsSnapshotService.encryptedOutputs, e.approvals = e.approvalsSnapshotService.approvals, e.commitmentsSnapshotService.onNewEvent = o, e.nullifierSnapshotService.onNewEvent = o;
 };
 export {
-  T as resetMerkleTrees
+  h as resetMerkleTrees
 };

package/data-structures/IndexedDB/activity-db.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("idb-keyval"),h=require("ethers");require("../../types/circom-data.types.cjs");require("../../constants/vite.constants.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");const y=require("../../types/activities.types.cjs");class S{STORAGE_KEY="tx-activity";generateTxId(){const t=new Date().getTime(),e=Math.random().toString(36).substring(2,15);return`tx_${t}_${e}`}async getTransactionRecord(){return await l.get(this.STORAGE_KEY)||{}}async saveTransactionRecord(t){await l.set(this.STORAGE_KEY,t)}async saveTxRequest(t){const{from:e,to:a,gas:i,gasPrice:s,value:n,chainId:o,status:c,txHash:r,activityType:u,tokensReceive:d,tokensSpend:m,ownerPublicAddress:v,activityIcon:w,dappUrl:p,integrationProvider:x}=t,g=this.generateTxId(),T=await this.getTransactionRecord(),R={id:g,from:e,to:a,gas:i,gasPrice:s,value:n,chainId:o,txHash:r,activityType:u,status:c??y.ActivityStatus.PENDING,timestamp:new Date,tokensReceive:d,tokensSpend:m,ownerPublicAddress:v,activityIcon:w,dappUrl:p,integrationProvider:x};return T[g]=R,console.log({record:T}),await this.saveTransactionRecord(T),g}async getTxRequest(t){return(await this.getTransactionRecord())[t]||null}async getAllTxRequests(t){const e=await this.getTransactionRecord();return Object.values(e).filter(a=>a.chainId===t).sort((a,i)=>new Date(i.timestamp).getTime()-new Date(a.timestamp).getTime())}async updateTxStatusAndHash(t,e,a,i,s,n,o,c){const r=await this.getTxRequest(t);if(!r)throw new Error("Transaction not found");const u=await this.getTransactionRecord(),d={...r,status:e,txHash:a,value:r.value??i,from:r.from??s,to:r.to??n,gas:o,gasPrice:c,timestamp:new Date};return u[t]=d,await this.saveTransactionRecord(u),d}async updateActivity(t,e,a,i,s,n,o,c){try{await this.updateTxStatusAndHash(t,e,a,i,s,n,o,c)}catch(r){console.log("error in updating tx request",r)}}async removePendingTransactions(t){try{const e=await this.getTransactionRecord();delete e[t],await this.saveTransactionRecord(e)}catch(e){console.log("error in deleting tx requests",e)}}async updatePendingTransactions(t,e){try{if(!t.success){await this.updateActivity(e,y.ActivityStatus.FAILED);return}if("tx"in t){const{tx:a}=t;await this.updateActivity(e,y.ActivityStatus.CONFIRMED,a.hash,h.BigNumber.from(a.value??0n).toHexString(),a.from,a.to,h.BigNumber.from(a.gas??0n),h.BigNumber.from(a.gasPrice??0n))}}catch(a){console.log("error in updating pending transactions",a)}}}const A=new S;exports.activityStorage=A;

package/data-structures/IndexedDB/activity-db.d.ts

@@ -0,0 +1,16 @@
+import { Activity, ActivityAddRequest, SandboxResponse } from '../../types';
+declare class ActivityStorage {
+    private readonly STORAGE_KEY;
+    private generateTxId;
+    private getTransactionRecord;
+    private saveTransactionRecord;
+    saveTxRequest(txRequest: ActivityAddRequest): Promise<string>;
+    private getTxRequest;
+    getAllTxRequests(chainId: number): Promise<Activity[]>;
+    private updateTxStatusAndHash;
+    private updateActivity;
+    removePendingTransactions(pendingActivityId: string): Promise<void>;
+    updatePendingTransactions(transactionResponse: SandboxResponse, pendingActivityId: string): Promise<void>;
+}
+export declare const activityStorage: ActivityStorage;
+export {};