@hinkal/common 0.2.12 → 0.2.14

package/data-structures/Hinkal/hinkalActionStake.mjs

@@ -1,4 +1,4 @@
-import { ownerPublicKey as v, zeroAddress as B } from "../../constants/protocol.constants.mjs";
+import { ownerPublicKey as W, zeroAddress as B } from "../../constants/protocol.constants.mjs";
 import { encryptStake as T, createStakeCommitment as O, encodeHStakeMetadata as h } from "../../functions/staking/index.mjs";
 import { getERC20Token as b, getHToken as z } from "../../functions/utils/erc20tokenFunctions.mjs";
 import { randomBigInt as j } from "../../functions/web3/etherFunctions.mjs";
@@ -9,14 +9,16 @@ import { Utxo as u } from "../utxo/Utxo.mjs";
 import "../../types/circom-data.types.mjs";
 import { ContractType as k } from "../../types/ethereum-network.types.mjs";
 import { ExternalActionId as q } from "../../types/external-action.types.mjs";
+import "../../constants/vite.constants.mjs";
 import "../../types/transactions.types.mjs";
 import "../../types/curve.types.mjs";
 import { HinkalStakeMode as y } from "../../types/hinkal.stake.types.mjs";
+import "../../types/activities.types.mjs";
 import "ethers";
 import { UserKeys as G } from "../crypto-keys/keys.mjs";
 import "libsodium-wrappers";
 import { transactCallDirect as w } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
-const pt = async (t, g, e, a, s) => {
+const ut = async (t, g, e, a, s) => {
   const A = await t.getEthereumAddress(), c = b(g[0], t.getCurrentChainId());
   if (!c)
     throw Error("Deposit Action: No Token Found");
@@ -51,20 +53,21 @@ const pt = async (t, g, e, a, s) => {
     amount: 0n,
     isUnstakeOutput: n
   }));
-  const K = [!1], d = j(30), H = G.getEncryptionKeyPair(t.userKeys.getShieldedPrivateKey()), I = T(d, s, v), P = T(d, s, H.publicKey), D = n ? 0n : O(
+  const K = [!1], d = j(30), H = G.getEncryptionKeyPair(t.userKeys.getShieldedPrivateKey()), I = T(d, s, W), P = T(d, s, H.publicKey), v = n ? 0n : O(
     !0,
     s,
     d,
     U,
     e[0],
     BigInt(p[0][0].timeStamp)
-  ), F = h(
+  ), D = h(
     m ? 0 : 1,
-    D,
+    v,
     A,
     I,
     P
   ), C = t.getContractWithSigner(k.HinkalWrapper2), f = t.getContractWithSigner(k.HinkalStakeExternalAction), { zkCallData: S, dimData: l, circomData: x } = await N(
+    "v1x0",
     t.merkleTreeHinkal,
     t.merkleTreeAccessToken,
     r,
@@ -73,7 +76,7 @@ const pt = async (t, g, e, a, s) => {
     "swapperME1x2x1",
     q.HinkalStake,
     f.address,
-    F,
+    D,
     t.generateProofRemotely,
     B,
     t.getCurrentChainId(),
@@ -91,10 +94,10 @@ const pt = async (t, g, e, a, s) => {
     const o = z(c, t.getCurrentChainId());
     if (!o)
       throw new Error("hToken not found");
-    const W = (await t.getContractWithFetcher(k.HToken, o.erc20TokenAddress).previewWithdraw(-e[0])).toBigInt();
+    const F = (await t.getContractWithFetcher(k.HToken, o.erc20TokenAddress).previewWithdraw(-e[0])).toBigInt();
     return w(
       t,
-      W,
+      F,
       o,
       S,
       x,
@@ -115,5 +118,5 @@ const pt = async (t, g, e, a, s) => {
   );
 };
 export {
-  pt as hinkalActionStake
+  ut as hinkalActionStake
 };

package/data-structures/Hinkal/hinkalActionVolatile.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const f=require("../../constants/protocol.constants.cjs"),P=require("../../functions/utils/erc20tokenFunctions.cjs"),_=require("../../functions/pre-transaction/getFlatFees.cjs"),U=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),H=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),N=require("../../functions/web3/events/getShieldedBalance.cjs"),V=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),W=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),b=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),E=require("../volatile-helper/VolatileHelper.cjs"),n=require("../../types/hinkal.types.cjs"),q=require("../../types/ethereum-network.types.cjs"),M=require("../../types/external-action.types.cjs"),z=require("../../error-handling/error-codes.constants.cjs"),G=async(t,a,e,D,R)=>{const{action:r,isRelayerOff:i,recipientAddress:T,baseExternalActionId:I,baseExternalActionMetadata:S}=D,p=P.getERC20Token(a[0],t.getCurrentChainId());if(!p)throw Error("Deposit Action: No Token Found");const A=[...e],m=[...a];let x=[],y=e.map(()=>0n);({erc20Addresses:a,amountChanges:e,onChainCreation:x}=await E.VolatileHelper.processVolatileData(t.getCurrentChainId(),r,a,e));const c=await E.VolatileHelper.getVolatileExternalData(t,r,A,T,I,S);if(!c)throw Error("No External Action Data");(r===n.VolatileAction.Withdraw&&!i||r===n.VolatileAction.Swap)&&({flatFees:y}=await _.getFlatFees(t.getCurrentChainId(),m,M.ExternalActionId.Volatile,A,r),r===n.VolatileAction.Swap&&(e[1]=0n));const d=[...await N.addPaddingToUtxos(t,a,e)],F=`swapperM${e.length.toString()}x${d[0].length}x1`,w=[];for(let o=0;o<a.length;o+=1){const{outputUtxos:g}=U.outputUtxoProcessing(t.userKeys,d[o],e[o]);w.push(g)}const C=r===n.VolatileAction.Deposit||i?f.zeroAddress:await t.getRandomRelay();if(!i&&!C)throw Error(z.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{zkCallData:s,circomData:l,dimData:u}=await H.constructZkProof(t.merkleTreeHinkal,t.merkleTreeAccessToken,d,w,t.userKeys,F,c.externalActionId,c.externalAddress,c.externalActionMetadata,t.generateProofRemotely,i?f.zeroAddress:C,t.getCurrentChainId(),x,y);if(r===n.VolatileAction.Deposit){const o=t.getContractWithSigner(q.ContractType.VolatileVault),g=t.getContractWithSigner(q.ContractType.HinkalWrapper);return await V.transactCallDirect(t,A[0],p,s,l,u,o,g)}return r===n.VolatileAction.Withdraw&&i?await V.transactCallDirect(t,e[0],p,s,l,u):R?await b.estimateGasRelayer(t,s,u,l):await W.transactCallRelayer(t.getCurrentChainId(),s,u,l)};exports.hinkalActionVolatile=G;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const f=require("../../constants/protocol.constants.cjs"),_=require("../../functions/utils/erc20tokenFunctions.cjs"),U=require("../../functions/pre-transaction/getFlatFees.cjs"),v=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),H=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),N=require("../../functions/web3/events/getShieldedBalance.cjs"),V=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),W=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),b=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),E=require("../volatile-helper/VolatileHelper.cjs"),n=require("../../types/hinkal.types.cjs"),q=require("../../types/ethereum-network.types.cjs"),M=require("../../types/external-action.types.cjs"),z=require("../../error-handling/error-codes.constants.cjs"),G=async(t,a,e,T,D)=>{const{action:r,isRelayerOff:i,recipientAddress:R,baseExternalActionId:I,baseExternalActionMetadata:S}=T,p=_.getERC20Token(a[0],t.getCurrentChainId());if(!p)throw Error("Deposit Action: No Token Found");const m=await t.checkAccessToken(),A=[...e],F=[...a];let g=[],y=e.map(()=>0n);({erc20Addresses:a,amountChanges:e,onChainCreation:g}=await E.VolatileHelper.processVolatileData(t.getCurrentChainId(),r,a,e));const c=await E.VolatileHelper.getVolatileExternalData(t,r,A,R,I,S);if(!c)throw Error("No External Action Data");(r===n.VolatileAction.Withdraw&&!i||r===n.VolatileAction.Swap)&&({flatFees:y}=await U.getFlatFees(t.getCurrentChainId(),F,M.ExternalActionId.Volatile,A,r),r===n.VolatileAction.Swap&&(e[1]=0n));const d=[...await N.addPaddingToUtxos(t,a,e)],P=`swapperM${e.length.toString()}x${d[0].length}x1`,w=[];for(let o=0;o<a.length;o+=1){const{outputUtxos:x}=v.outputUtxoProcessing(t.userKeys,d[o],e[o]);w.push(x)}const C=r===n.VolatileAction.Deposit||i?f.zeroAddress:await t.getRandomRelay();if(!i&&!C)throw Error(z.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{zkCallData:s,circomData:l,dimData:u}=await H.constructZkProof("v1x1",t.merkleTreeHinkal,t.merkleTreeAccessToken,d,w,t.userKeys,P,c.externalActionId,c.externalAddress,c.externalActionMetadata,t.generateProofRemotely,i?f.zeroAddress:C,t.getCurrentChainId(),g,y,void 0,void 0,m);if(r===n.VolatileAction.Deposit){const o=t.getContractWithSigner(q.ContractType.VolatileVault),x=t.getContractWithSigner(q.ContractType.HinkalWrapper);return await V.transactCallDirect(t,A[0],p,s,l,u,o,x)}return r===n.VolatileAction.Withdraw&&i?await V.transactCallDirect(t,e[0],p,s,l,u):D?await b.estimateGasRelayer(t,s,u,l):await W.transactCallRelayer(t.getCurrentChainId(),s,u,l)};exports.hinkalActionVolatile=G;

package/data-structures/Hinkal/hinkalActionVolatile.mjs

@@ -9,24 +9,24 @@ import { transactCallRelayer as M } from "../../functions/web3/functionCalls/tra
 import { estimateGasRelayer as b } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
 import { VolatileHelper as C } from "../volatile-helper/VolatileHelper.mjs";
 import { VolatileAction as i } from "../../types/hinkal.types.mjs";
-import { ContractType as D } from "../../types/ethereum-network.types.mjs";
+import { ContractType as T } from "../../types/ethereum-network.types.mjs";
 import { ExternalActionId as z } from "../../types/external-action.types.mjs";
 import { transactionErrorCodes as K } from "../../error-handling/error-codes.constants.mjs";
-const rt = async (t, a, r, R, T) => {
-  const { action: o, isRelayerOff: n, recipientAddress: I, baseExternalActionId: V, baseExternalActionMetadata: S } = R, m = F(a[0], t.getCurrentChainId());
+const rt = async (t, a, o, D, R) => {
+  const { action: r, isRelayerOff: n, recipientAddress: I, baseExternalActionId: V, baseExternalActionMetadata: S } = D, m = F(a[0], t.getCurrentChainId());
   if (!m)
     throw Error("Deposit Action: No Token Found");
-  const f = [...r], U = [...a];
-  let w = [], A = r.map(() => 0n);
-  ({ erc20Addresses: a, amountChanges: r, onChainCreation: w } = await C.processVolatileData(
+  const U = await t.checkAccessToken(), f = [...o], W = [...a];
+  let A = [], w = o.map(() => 0n);
+  ({ erc20Addresses: a, amountChanges: o, onChainCreation: A } = await C.processVolatileData(
     t.getCurrentChainId(),
-    o,
+    r,
     a,
-    r
+    o
   ));
   const c = await C.getVolatileExternalData(
     t,
-    o,
+    r,
     f,
     I,
     V,
@@ -34,39 +34,43 @@ const rt = async (t, a, r, R, T) => {
   );
   if (!c)
     throw Error("No External Action Data");
-  (o === i.Withdraw && !n || o === i.Swap) && ({ flatFees: A } = await N(
+  (r === i.Withdraw && !n || r === i.Swap) && ({ flatFees: w } = await N(
     t.getCurrentChainId(),
-    U,
+    W,
     z.Volatile,
     f,
-    o
-  ), o === i.Swap && (r[1] = 0n));
-  const x = [...await L(t, a, r)], W = `swapperM${r.length.toString()}x${x[0].length}x1`, g = [];
+    r
+  ), r === i.Swap && (o[1] = 0n));
+  const x = [...await L(t, a, o)], v = `swapperM${o.length.toString()}x${x[0].length}x1`, g = [];
   for (let e = 0; e < a.length; e += 1) {
-    const { outputUtxos: d } = P(t.userKeys, x[e], r[e]);
+    const { outputUtxos: d } = P(t.userKeys, x[e], o[e]);
     g.push(d);
   }
-  const u = o === i.Deposit || n ? E : await t.getRandomRelay();
+  const u = r === i.Deposit || n ? E : await t.getRandomRelay();
   if (!n && !u)
     throw Error(K.RELAYER_NOT_AVAILABLE);
   const { zkCallData: s, circomData: p, dimData: l } = await H(
+    "v1x1",
     t.merkleTreeHinkal,
     t.merkleTreeAccessToken,
     x,
     g,
     t.userKeys,
-    W,
+    v,
     c.externalActionId,
     c.externalAddress,
     c.externalActionMetadata,
     t.generateProofRemotely,
     n ? E : u,
     t.getCurrentChainId(),
+    A,
     w,
-    A
+    void 0,
+    void 0,
+    U
   );
-  if (o === i.Deposit) {
-    const e = t.getContractWithSigner(D.VolatileVault), d = t.getContractWithSigner(D.HinkalWrapper);
+  if (r === i.Deposit) {
+    const e = t.getContractWithSigner(T.VolatileVault), d = t.getContractWithSigner(T.HinkalWrapper);
     return await y(
       t,
       f[0],
@@ -78,7 +82,7 @@ const rt = async (t, a, r, R, T) => {
       d
     );
   }
-  return o === i.Withdraw && n ? await y(t, r[0], m, s, p, l) : T ? await b(t, s, l, p) : await M(t.getCurrentChainId(), s, l, p);
+  return r === i.Withdraw && n ? await y(t, o[0], m, s, p, l) : R ? await b(t, s, l, p) : await M(t.getCurrentChainId(), s, l, p);
 };
 export {
   rt as hinkalActionVolatile

package/data-structures/Hinkal/hinkalApprove.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const M=require("../../error-handling/error-codes.constants.cjs"),k=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),L=require("../../functions/web3/events/getShieldedBalance.cjs"),N=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),W=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),h=require("../../types/external-action.types.cjs"),K=require("../../externalABIs/index.cjs"),D=require("ethers"),T=require("../../types/hinkal.types.cjs"),V=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),f=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),b=require("../../functions/pre-transaction/getFeeStructure.cjs"),B=require("../../functions/pre-transaction/merge-with-fee-structure.cjs"),q=require("../../types/ethereum-network.types.cjs"),G=require("../../constants/conversion.constants.cjs"),z=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),X=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),Z=async(t,r,s,n,E,P=!1)=>{const c=D.ethers.utils.getAddress(n),i=new D.ethers.Contract(r[0],K.ERC20ABI),U=t.userKeys.getInHinkalAddress(c),g=t.getMyApprovalAmountForInteraction(n,r[0]),A=g-s;if(A>=0n)throw Error("Unreachable State: you already have approval");const a=[A],R=t.getContractWithFetcher(q.ContractType.HinkalContract),d=await b.getFeeStructure(t.getCurrentChainId(),E,r,h.ExternalActionId.Wallet,void 0,[0n,1n].map(e=>({to:i.address,from:R.address,value:0n,calldata:i.interface.encodeFunctionData("approve",[n,e])})));B.mergeWithFeeStructure(t.getCurrentChainId(),r,a,d);const o=[...await L.addPaddingToUtxos(t,r,a)],w=`swapperMHA${a.length.toString()}x${o[0].length}x1`,I=a.map(()=>!1),C=[],u={doPreTxApproval:!0,hinkalLogicAction:T.HinkalLogicAction.APPROVE,executeApprovalChanges:r.map(()=>0n),inHinkalAddress:U,useApprovalUtxoData:[]},{patchAccessTokenMerkleTree:S,kycRequired:F,hasAccessToken:_}=await z.shouldPatchAccessTokenMerkleTree(t,r,a),H=await X.getSignatureDataForTransact(t.getCurrentChainId(),await t.getEthereumAddress(),t.userKeys,F,_);for(let e=0;e<r.length;e+=1){const{outputUtxos:O}=V.outputUtxoProcessing(t.userKeys,o[e],a[e],void 0,void 0,!1);if(C.push(O),e===0){const{useApprovalUtxoData:p}=f.outputApprovalDataProcessingForHinkalApprove(t,o[e],n,s,a[e]);u.useApprovalUtxoData.push(p)}else{const{useApprovalUtxoData:p}=f.outputApprovalDataProcessing(t,o[e],a[e]);u.useApprovalUtxoData.push(p??T.defaultUseApprovalUTXOData(G.APPROVED_UTXO_CONVERSION_COUNT,0n))}}const x=await t.getRandomRelay();if(!x)throw Error(M.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const l={externalActionId:h.ExternalActionId.Wallet,externalAddress:c,externalActionMetadata:i.interface.encodeFunctionData("approve",[c,s-g])},{zkCallData:v,circomData:y,dimData:m}=await k.constructZkProof("v1x1",t.merkleTreeHinkal,t.merkleTreeAccessToken,o,C,t.userKeys,w,l.externalActionId,l.externalAddress,l.externalActionMetadata,t.generateProofRemotely,x,t.getCurrentChainId(),I,void 0,void 0,void 0,S,u,void 0,d,t.getContractWithFetcher(q.ContractType.HinkalHelperContract),H);return P?await N.estimateGasRelayer(t,v,m,y):await W.transactCallRelayer(t.getCurrentChainId(),v,m,y)};exports.hinkalApprove=Z;

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

@@ -0,0 +1,2 @@
+import { IHinkal } from './IHinkal';
+export declare const hinkalApprove: (hinkal: IHinkal, erc20Addresses: string[], approvalAmount: bigint, approvedTo: string, feeToken?: string, onlyGasEstimate?: boolean) => Promise<bigint | import('../../index.ts').RelayerTransaction>;

package/data-structures/Hinkal/hinkalApprove.mjs

@@ -0,0 +1,120 @@
+import { transactionErrorCodes as L } from "../../error-handling/error-codes.constants.mjs";
+import { constructZkProof as M } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { addPaddingToUtxos as N } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { estimateGasRelayer as W } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
+import { transactCallRelayer as _ } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ExternalActionId as D } from "../../types/external-action.types.mjs";
+import { ERC20ABI as K } from "../../externalABIs/index.mjs";
+import { ethers as y } from "ethers";
+import { HinkalLogicAction as V, defaultUseApprovalUTXOData as z } from "../../types/hinkal.types.mjs";
+import { outputUtxoProcessing as B } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { outputApprovalDataProcessingForHinkalApprove as X, outputApprovalDataProcessing as $ } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
+import { getFeeStructure as b } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { mergeWithFeeStructure as k } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+import { ContractType as E } from "../../types/ethereum-network.types.mjs";
+import { APPROVED_UTXO_CONVERSION_COUNT as q } from "../../constants/conversion.constants.mjs";
+import { shouldPatchAccessTokenMerkleTree as G } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import { getSignatureDataForTransact as Y } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
+const gt = async (t, e, s, n, U, T = !1) => {
+  const i = y.utils.getAddress(n), c = new y.Contract(e[0], K), w = t.userKeys.getInHinkalAddress(i), l = t.getMyApprovalAmountForInteraction(n, e[0]), A = l - s;
+  if (A >= 0n)
+    throw Error("Unreachable State: you already have approval");
+  const r = [A], I = t.getContractWithFetcher(E.HinkalContract), g = await b(
+    t.getCurrentChainId(),
+    U,
+    e,
+    D.Wallet,
+    void 0,
+    // we don't need exact amounts, just need to result in the same amount of gas
+    [0n, 1n].map((o) => ({
+      to: c.address,
+      from: I.address,
+      value: 0n,
+      calldata: c.interface.encodeFunctionData("approve", [n, o])
+    }))
+  );
+  k(t.getCurrentChainId(), e, r, g);
+  const a = [...await N(t, e, r)], R = `swapperMHA${r.length.toString()}x${a[0].length}x1`, P = r.map(() => !1), d = [], p = {
+    doPreTxApproval: !0,
+    hinkalLogicAction: V.APPROVE,
+    executeApprovalChanges: e.map(() => 0n),
+    // this should not matter
+    inHinkalAddress: w,
+    // as well
+    useApprovalUtxoData: []
+  }, { patchAccessTokenMerkleTree: h, kycRequired: F, hasAccessToken: H } = await G(
+    t,
+    e,
+    r
+  ), O = await Y(
+    t.getCurrentChainId(),
+    await t.getEthereumAddress(),
+    t.userKeys,
+    F,
+    H
+  );
+  for (let o = 0; o < e.length; o += 1) {
+    const { outputUtxos: S } = B(
+      t.userKeys,
+      a[o],
+      r[o],
+      void 0,
+      void 0,
+      !1
+    );
+    if (d.push(S), o === 0) {
+      const { useApprovalUtxoData: m } = X(
+        t,
+        a[o],
+        n,
+        s,
+        r[o]
+      );
+      p.useApprovalUtxoData.push(m);
+    } else {
+      const { useApprovalUtxoData: m } = $(t, a[o], r[o]);
+      p.useApprovalUtxoData.push(
+        m ?? z(q, 0n)
+      );
+    }
+  }
+  const f = await t.getRandomRelay();
+  if (!f)
+    throw Error(L.RELAYER_NOT_AVAILABLE);
+  const u = {
+    externalActionId: D.Wallet,
+    externalAddress: i,
+    externalActionMetadata: c.interface.encodeFunctionData("approve", [
+      i,
+      s - l
+    ])
+  }, { zkCallData: C, circomData: x, dimData: v } = await M(
+    "v1x1",
+    t.merkleTreeHinkal,
+    t.merkleTreeAccessToken,
+    a,
+    d,
+    t.userKeys,
+    R,
+    u.externalActionId,
+    u.externalAddress,
+    u.externalActionMetadata,
+    t.generateProofRemotely,
+    f,
+    t.getCurrentChainId(),
+    P,
+    void 0,
+    void 0,
+    void 0,
+    h,
+    p,
+    void 0,
+    g,
+    t.getContractWithFetcher(E.HinkalHelperContract),
+    O
+  );
+  return T ? await W(t, C, v, x) : await _(t.getCurrentChainId(), C, v, x);
+};
+export {
+  gt as hinkalApprove
+};

package/data-structures/Hinkal/hinkalCheckTokenRegistry.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("../../constants/chains.constants.cjs"),a=require("ethers"),i=async(r,e,t)=>await r.checkTokenRegistry(e,t),o=r=>{const e=n.networkRegistry[r].contractData,t=new a.ethers.providers.JsonRpcProvider(n.networkRegistry[r].fetchRpcUrl);if(!e.hinkalHelperAddress||!e.hinkalHelperABI)throw Error("hinkal helpercontract data not found");return new a.ethers.Contract(e.hinkalHelperAddress,e.hinkalHelperABI,t)};exports.createHinkalHelperFromData=o;exports.hinkalCheckTokenRegistry=i;

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

@@ -0,0 +1,3 @@
+import { ethers } from 'ethers';
+export declare const hinkalCheckTokenRegistry: (hinkalHelper: ethers.Contract, erc20Addresses: string[], amountChanges: bigint[]) => Promise<boolean>;
+export declare const createHinkalHelperFromData: (chainId: number) => ethers.Contract;

package/data-structures/Hinkal/hinkalCheckTokenRegistry.mjs

@@ -0,0 +1,12 @@
+import { networkRegistry as n } from "../../constants/chains.constants.mjs";
+import { ethers as o } from "ethers";
+const l = async (e, r, t) => await e.checkTokenRegistry(r, t), s = (e) => {
+  const r = n[e].contractData, t = new o.providers.JsonRpcProvider(n[e].fetchRpcUrl);
+  if (!r.hinkalHelperAddress || !r.hinkalHelperABI)
+    throw Error("hinkal helpercontract data not found");
+  return new o.Contract(r.hinkalHelperAddress, r.hinkalHelperABI, t);
+};
+export {
+  s as createHinkalHelperFromData,
+  l as hinkalCheckTokenRegistry
+};

package/data-structures/Hinkal/hinkalDeploySubAccount.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("../../constants/protocol.constants.cjs"),s=require("../../types/ethereum-network.types.cjs"),i=require("../../error-handling/logger.cjs"),u=async(t,o,a)=>{const e=await t.actionPrivateWallet([],[],[],[],o,a);if(i.Logger.log({creationTransaction:e}),!e)throw Error("SubAccount creation failed");const c=t.getContractWithFetcher(s.ContractType.HinkalWalletFactory),n=t.userKeys.getWalletSalt(o),r=await c.getWallet(n);if(!r||r===l.zeroAddress)throw Error("smart wallet corresponding to the subAccount not found");return e};exports.hinkalDeploySubAccount=u;

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

@@ -0,0 +1,3 @@
+import { IHinkal } from './IHinkal';
+import { RelayerTransaction } from '../../types/relayer.types';
+export declare const hinkalDeploySubAccount: (hinkal: IHinkal, walletNonce: bigint, feeToken?: string) => Promise<RelayerTransaction>;

package/data-structures/Hinkal/hinkalDeploySubAccount.mjs

@@ -0,0 +1,15 @@
+import { zeroAddress as l } from "../../constants/protocol.constants.mjs";
+import { ContractType as i } from "../../types/ethereum-network.types.mjs";
+import { Logger as s } from "../../error-handling/logger.mjs";
+const g = async (t, r, e) => {
+  const o = await t.actionPrivateWallet([], [], [], [], r, e);
+  if (s.log({ creationTransaction: o }), !o)
+    throw Error("SubAccount creation failed");
+  const c = t.getContractWithFetcher(i.HinkalWalletFactory), n = t.userKeys.getWalletSalt(r), a = await c.getWallet(n);
+  if (!a || a === l)
+    throw Error("smart wallet corresponding to the subAccount not found");
+  return o;
+};
+export {
+  g as hinkalDeploySubAccount
+};

package/data-structures/Hinkal/hinkalDeposit.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const h=require("../../constants/protocol.constants.cjs"),P=require("../../functions/utils/erc20tokenFunctions.cjs"),S=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),q=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),M=require("../../functions/web3/events/getShieldedBalance.cjs"),U=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),C=require("../utxo/Utxo.cjs"),R=require("../../error-handling/error-codes.constants.cjs");require("../../types/circom-data.types.cjs");const z=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");const k=async t=>{const o=await t.checkAccessToken(),e=o?void 0:t.getContractWithSigner(z.ContractType.CrossChainAccessTokenManagerContract);return{externalActionData:{externalActionId:0n,externalAddress:o?await t.getEthereumAddress():e?.address||"",externalActionMetadata:"0x00"},contractTransaction:e,contractToApprove:e,hasAccessToken:o}},F=async(t,o,e)=>{const s=P.getERC20Token(o[0],t.getCurrentChainId());if(!s)throw Error("Deposit Action: No Token Found");const{externalActionData:a,contractTransaction:n,contractToApprove:c,hasAccessToken:d}=await k(t),A=e[0],i=[...await M.addPaddingToUtxos(t,o,e)],p=`swapperM${e.length.toString()}x${i[0].length}x1`,u=[];for(let r=0;r<o.length;r+=1){const{outputUtxos:y}=S.outputUtxoProcessing(t.userKeys,i[r],e[r]);u.push(y)}const{zkCallData:g,circomData:l,dimData:T}=await q.constructZkProof(t.merkleTreeHinkal,t.merkleTreeAccessToken,i,u,t.userKeys,p,a.externalActionId,a.externalAddress,a.externalActionMetadata,t.generateProofRemotely,h.zeroAddress,t.getCurrentChainId(),void 0,void 0,void 0,void 0,d);return await U.transactCallDirect(t,A,s,g,l,T,c,n,d)},N=async(t,o,e,s)=>{const[a,n,c]=s.split(","),d=!a||!n||!c,A=n?.substring(0,2)!=="0x"||c?.substring(0,2)!=="0x",i=c?.length!==66||n?.length>66||n?.length<64,p=s?.includes('"');if(d||A||i||p)throw Error(R.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const u=[BigInt(a)],g=[n],l=o.map(x=>[new C.Utxo({amount:0n,erc20TokenAddress:x,shieldedPrivateKey:t.userKeys.getShieldedPrivateKey()}),new C.Utxo({amount:0n,erc20TokenAddress:x,shieldedPrivateKey:t.userKeys.getShieldedPrivateKey()})]),T=`swapperM${e.length.toString()}x${l[0].length}x1`,w=o.map((x,m)=>[new C.Utxo({amount:e[m],erc20TokenAddress:x,randomization:u[m],stealthAddress:g[m],encryptionKey:c})]),{externalActionData:r,contractTransaction:y,contractToApprove:f,hasAccessToken:v}=await k(t),{zkCallData:E,circomData:I,dimData:K}=await q.constructZkProof(t.merkleTreeHinkal,t.merkleTreeAccessToken,l,w,t.userKeys,T,r.externalActionId,r.externalAddress,r.externalActionMetadata,t.generateProofRemotely,h.zeroAddress,t.getCurrentChainId(),void 0,void 0,void 0,void 0,v),D=P.getERC20Token(o[0],t.getCurrentChainId());if(!D)throw Error("Withdraw Action: No Token Found");return await U.transactCallDirect(t,e[0],D,E,I,K,f,y,v)};exports.hinkalDeposit=F;exports.hinkalDepositForOther=N;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const D=require("../../constants/protocol.constants.cjs"),U=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),w=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),K=require("../../functions/web3/events/getShieldedBalance.cjs"),P=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),g=require("../utxo/Utxo.cjs"),h=require("../../error-handling/error-codes.constants.cjs");require("../../types/circom-data.types.cjs");const q=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 k=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),I=require("../../functions/utils/addresses.cjs"),S=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),C=async(e,a,t)=>{const{patchAccessTokenMerkleTree:o,kycRequired:r,hasAccessToken:l}=await S.shouldPatchAccessTokenMerkleTree(e,a,t),n=void 0,A=await e.getEthereumAddress(),i=await k.getSignatureDataForTransact(e.getCurrentChainId(),A,e.userKeys,r,l),c={externalActionId:0n,externalAddress:await e.getEthereumAddress(),externalActionMetadata:"0x00"};return{signatureData:i,externalActionData:c,contractTransaction:n,contractToApprove:n,patchAccessTokenMerkleTree:o}},f=async(e,a,t)=>{const o=a.map(s=>s.erc20TokenAddress),{externalActionData:r,contractTransaction:l,contractToApprove:n,patchAccessTokenMerkleTree:A,signatureData:i}=await C(e,o,t),c=[...await K.addPaddingToUtxos(e,o,t)],p=`swapperM${t.length.toString()}x${c[0].length}x1`,d=[];for(let s=0;s<o.length;s+=1){const{outputUtxos:v}=U.outputUtxoProcessing(e.userKeys,c[s],t[s]);d.push(v)}const{zkCallData:x,circomData:T,dimData:y}=await w.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,c,d,e.userKeys,p,r.externalActionId,r.externalAddress,r.externalActionMetadata,e.generateProofRemotely,D.zeroAddress,e.getCurrentChainId(),void 0,void 0,void 0,void 0,A,void 0,void 0,void 0,e.getContractWithFetcher(q.ContractType.HinkalHelperContract),i);return await P.transactCallDirect(e,t,a,x,T,y,n,l)},E=async(e,a,t,o)=>{const r=a.map(u=>u.erc20TokenAddress),[l,n,A]=o.split(",");if(!I.isValidPrivateAddress(o))throw Error(h.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const i=r.map(u=>[new g.Utxo({amount:0n,erc20TokenAddress:u,shieldedPrivateKey:e.userKeys.getShieldedPrivateKey()}),new g.Utxo({amount:0n,erc20TokenAddress:u,shieldedPrivateKey:e.userKeys.getShieldedPrivateKey()})]),c=`swapperM${t.length.toString()}x${i[0].length}x1`,p=r.map((u,M)=>[new g.Utxo({amount:t[M],erc20TokenAddress:u,randomization:BigInt(l),stealthAddress:n,encryptionKey:A})]),{externalActionData:d,contractTransaction:x,contractToApprove:T,patchAccessTokenMerkleTree:y}=await C(e,r,t),{zkCallData:m,circomData:s,dimData:v}=await w.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,i,p,e.userKeys,c,d.externalActionId,d.externalAddress,d.externalActionMetadata,e.generateProofRemotely,D.zeroAddress,e.getCurrentChainId(),void 0,void 0,void 0,void 0,y,void 0,void 0,void 0,e.getContractWithFetcher(q.ContractType.HinkalHelperContract));return await P.transactCallDirect(e,t,a,m,s,v,T,x)};exports.hinkalDeposit=f;exports.hinkalDepositForOther=E;

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

@@ -1,3 +1,4 @@
 import { IHinkal } from './IHinkal';
-export declare const hinkalDeposit: (hinkal: IHinkal, erc20Addresses: string[], amountChanges: bigint[]) => Promise<any>;
-export declare const hinkalDepositForOther: (hinkal: IHinkal, erc20Addresses: string[], amountChanges: bigint[], recipinetInfo: string) => Promise<any>;
+import { ERC20Token } from '../../types';
+export declare const hinkalDeposit: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[]) => Promise<any>;
+export declare const hinkalDepositForOther: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], recipinetInfo: string) => Promise<any>;

package/data-structures/Hinkal/hinkalDeposit.mjs

@@ -1,110 +1,135 @@
-import { zeroAddress as D } from "../../constants/protocol.constants.mjs";
-import { getERC20Token as P } from "../../functions/utils/erc20tokenFunctions.mjs";
-import { outputUtxoProcessing as z } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { constructZkProof as h } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { addPaddingToUtxos as N } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { transactCallDirect as I } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
-import { Utxo as w } from "../utxo/Utxo.mjs";
-import { transactionErrorCodes as S } from "../../error-handling/error-codes.constants.mjs";
+import { zeroAddress as w } from "../../constants/protocol.constants.mjs";
+import { outputUtxoProcessing as M } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { constructZkProof as f } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { addPaddingToUtxos as I } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { transactCallDirect as D } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
+import { Utxo as y } from "../utxo/Utxo.mjs";
+import { transactionErrorCodes as U } from "../../error-handling/error-codes.constants.mjs";
 import "../../types/circom-data.types.mjs";
-import { ContractType as F } from "../../types/ethereum-network.types.mjs";
+import { ContractType as P } from "../../types/ethereum-network.types.mjs";
+import "../../constants/vite.constants.mjs";
 import "../../types/transactions.types.mjs";
 import "../../types/curve.types.mjs";
-const K = async (t) => {
-  const e = await t.checkAccessToken(), o = e ? void 0 : t.getContractWithSigner(F.CrossChainAccessTokenManagerContract);
-  return { externalActionData: {
+import "../../types/activities.types.mjs";
+import { getSignatureDataForTransact as E } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
+import { isValidPrivateAddress as R } from "../../functions/utils/addresses.mjs";
+import { shouldPatchAccessTokenMerkleTree as H } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+const C = async (t, s, e) => {
+  const { patchAccessTokenMerkleTree: o, kycRequired: r, hasAccessToken: m } = await H(
+    t,
+    s,
+    e
+  ), n = void 0, A = await t.getEthereumAddress(), i = await E(
+    t.getCurrentChainId(),
+    A,
+    t.userKeys,
+    r,
+    m
+  ), c = {
     externalActionId: 0n,
-    externalAddress: e ? await t.getEthereumAddress() : o?.address || "",
+    externalAddress: await t.getEthereumAddress(),
     externalActionMetadata: "0x00"
-  }, contractTransaction: o, contractToApprove: o, hasAccessToken: e };
-}, G = async (t, e, o) => {
-  const a = P(e[0], t.getCurrentChainId());
-  if (!a)
-    throw Error("Deposit Action: No Token Found");
-  const { externalActionData: s, contractTransaction: n, contractToApprove: c, hasAccessToken: d } = await K(t), u = o[0], i = [...await N(t, e, o)], x = `swapperM${o.length.toString()}x${i[0].length}x1`, m = [];
-  for (let r = 0; r < e.length; r += 1) {
-    const { outputUtxos: g } = z(t.userKeys, i[r], o[r]);
-    m.push(g);
+  };
+  return {
+    signatureData: i,
+    externalActionData: c,
+    contractTransaction: n,
+    contractToApprove: n,
+    patchAccessTokenMerkleTree: o
+  };
+}, J = async (t, s, e) => {
+  const o = s.map((a) => a.erc20TokenAddress), { externalActionData: r, contractTransaction: m, contractToApprove: n, patchAccessTokenMerkleTree: A, signatureData: i } = await C(t, o, e), c = [...await I(t, o, e)], x = `swapperM${e.length.toString()}x${c[0].length}x1`, d = [];
+  for (let a = 0; a < o.length; a += 1) {
+    const { outputUtxos: v } = M(t.userKeys, c[a], e[a]);
+    d.push(v);
   }
-  const { zkCallData: l, circomData: p, dimData: T } = await h(
+  const { zkCallData: u, circomData: l, dimData: T } = await f(
+    "v1x1",
     t.merkleTreeHinkal,
     t.merkleTreeAccessToken,
-    i,
-    m,
+    c,
+    d,
     t.userKeys,
     x,
-    s.externalActionId,
-    s.externalAddress,
-    s.externalActionMetadata,
+    r.externalActionId,
+    r.externalAddress,
+    r.externalActionMetadata,
     t.generateProofRemotely,
-    D,
+    w,
     t.getCurrentChainId(),
     void 0,
     void 0,
     void 0,
     void 0,
-    d
+    A,
+    void 0,
+    void 0,
+    void 0,
+    t.getContractWithFetcher(P.HinkalHelperContract),
+    i
   );
-  return await I(
+  return await D(
     t,
+    e,
+    // for volotile tokens: amountChanges != amountOfTokenToApprove
+    s,
     u,
-    a,
     l,
-    p,
     T,
-    c,
     n,
-    d
+    m
   );
-}, J = async (t, e, o, a) => {
-  const [s, n, c] = a.split(","), d = !s || !n || !c, u = n?.substring(0, 2) !== "0x" || c?.substring(0, 2) !== "0x", i = c?.length !== 66 || n?.length > 66 || n?.length < 64, x = a?.includes('"');
-  if (d || u || i || x)
-    throw Error(S.RECIPIENT_FORMAT_INCORRECT);
-  const m = [BigInt(s)], l = [n], p = e.map((A) => [
-    new w({ amount: 0n, erc20TokenAddress: A, shieldedPrivateKey: t.userKeys.getShieldedPrivateKey() }),
-    new w({ amount: 0n, erc20TokenAddress: A, shieldedPrivateKey: t.userKeys.getShieldedPrivateKey() })
-  ]), T = `swapperM${o.length.toString()}x${p[0].length}x1`, v = e.map((A, y) => [
-    new w({
-      amount: o[y],
-      erc20TokenAddress: A,
-      randomization: m[y],
-      stealthAddress: l[y],
-      encryptionKey: c
+}, L = async (t, s, e, o) => {
+  const r = s.map((p) => p.erc20TokenAddress), [m, n, A] = o.split(",");
+  if (!R(o))
+    throw Error(U.RECIPIENT_FORMAT_INCORRECT);
+  const i = r.map((p) => [
+    new y({ amount: 0n, erc20TokenAddress: p, shieldedPrivateKey: t.userKeys.getShieldedPrivateKey() }),
+    new y({ amount: 0n, erc20TokenAddress: p, shieldedPrivateKey: t.userKeys.getShieldedPrivateKey() })
+  ]), c = `swapperM${e.length.toString()}x${i[0].length}x1`, x = r.map((p, K) => [
+    new y({
+      amount: e[K],
+      erc20TokenAddress: p,
+      randomization: BigInt(m),
+      stealthAddress: n,
+      encryptionKey: A
     })
-  ]), { externalActionData: r, contractTransaction: g, contractToApprove: E, hasAccessToken: f } = await K(t), { zkCallData: U, circomData: M, dimData: R } = await h(
+  ]), { externalActionData: d, contractTransaction: u, contractToApprove: l, patchAccessTokenMerkleTree: T } = await C(t, r, e), { zkCallData: g, circomData: a, dimData: v } = await f(
+    "v1x1",
     t.merkleTreeHinkal,
     t.merkleTreeAccessToken,
-    p,
-    v,
+    i,
+    x,
     t.userKeys,
-    T,
-    r.externalActionId,
-    r.externalAddress,
-    r.externalActionMetadata,
+    c,
+    d.externalActionId,
+    d.externalAddress,
+    d.externalActionMetadata,
     t.generateProofRemotely,
-    D,
+    w,
     t.getCurrentChainId(),
     void 0,
     void 0,
     void 0,
     void 0,
-    f
-  ), C = P(e[0], t.getCurrentChainId());
-  if (!C)
-    throw Error("Withdraw Action: No Token Found");
-  return await I(
+    T,
+    void 0,
+    void 0,
+    void 0,
+    t.getContractWithFetcher(P.HinkalHelperContract)
+  );
+  return await D(
     t,
-    o[0],
-    C,
-    U,
-    M,
-    R,
-    E,
+    e,
+    s,
     g,
-    f
+    a,
+    v,
+    l,
+    u
   );
 };
 export {
-  G as hinkalDeposit,
-  J as hinkalDepositForOther
+  J as hinkalDeposit,
+  L as hinkalDepositForOther
 };

package/data-structures/Hinkal/hinkalGetRecipientInfo.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("../../constants/protocol.constants.cjs"),d=require("../utxo/Utxo.cjs");require("ethers");const a=require("../crypto-keys/keys.cjs");require("libsodium-wrappers");const u=e=>{if(!e)throw Error("No hinkal provided");const{userKeys:s}=e,t=s.getShieldedPrivateKey(),r=a.UserKeys.getEncryptionKeyPair(t).publicKey,o=new d.Utxo({amount:0n,erc20TokenAddress:c.zeroAddress,shieldedPrivateKey:t}),{randomization:n}=o,i=o.getStealthAddress();if(!n||!i||!r)throw Error("Cannot get recipient information");return`${n},${i},${r}`};exports.getRecipientInfo=u;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("../../functions/utils/getRecipientInfoFromUserKeys.cjs"),n=(e,o=!1)=>{if(!e)throw Error("No hinkal provided");const{userKeys:t}=e;return o?r.getExtendedRecipientInfoFromUserKeys(t):r.getRecipientInfoFromUserKeys(t)};exports.getRecipientInfo=n;

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

@@ -1,2 +1,2 @@
 import { IHinkal } from './IHinkal';
-export declare const getRecipientInfo: (hinkal: IHinkal) => string;
+export declare const getRecipientInfo: (hinkal: IHinkal, extendedInfo?: boolean) => string;