h_test_1 0.0.4 → 0.0.5

package/data-structures/Hinkal/hinkalSwap.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const F=require("../../error-handling/error-codes.constants.cjs"),L=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),M=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),H=require("../../functions/web3/events/getShieldedBalance.cjs"),K=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),N=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),W=require("../../functions/pre-transaction/getFeeStructure.cjs"),B=require("../../functions/pre-transaction/merge-with-fee-structure.cjs"),b=require("../../types/external-action.types.cjs"),k=require("../../types/hinkal.types.cjs"),G=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),O=require("../../types/ethereum-network.types.cjs"),V=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),Z=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),$=require("../../functions/pre-transaction/getExternalSwapAddress.cjs"),j=require("../../functions/utils/time.utils.cjs"),z=require("../../constants/protocol.constants.cjs");require("../../types/circom-data.types.cjs");require("../../types/activities.types.cjs");require("../../constants/server.constants.cjs");require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../http/HttpClient.cjs");require("axios");require("ethers");require("../../constants/token-data/index.cjs");require("../../API/getServerURL.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../functions/utils/mutexes.utils.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("../crypto-keys/keys.cjs");const Y=require("../../functions/pre-transaction/constructAdminData.cjs");require("@solana/spl-token");const J=async(e,c,t,i,x,T,S,m,u=!1,w=!1)=>{const s=c.map(r=>r.erc20TokenAddress),d=await e.getEthereumAddress(),g=S??await W.getFeeStructure(e.getCurrentChainId(),T,s,b.ExternalActionId.Transact,void 0,z.HINKAL_SWAP_VARIABLE_RATE);B.mergeWithFeeStructure(e.getCurrentChainId(),s,t,g);const f=$.getExternalSwapAddress(e,i),o={externalActionId:i,externalAddress:f,externalActionMetadata:x},a=[...await H.addPaddingToUtxos(e,s,t)],v=`swapperM${t.length.toString()}x${a[0].length}x1`,D=[!1,!0,!1].slice(0,t.length),q=[],n=k.defaultHinkalLogicArgs(t.length,e.userKeys),R=j.getCurrentTimeInSeconds().toString();for(let r=0;r<s.length;r+=1){const{outputUtxos:U}=L.outputUtxoProcessing(e.userKeys,a[r],t[r],R,void 0,!1);q.push(U);const{useApprovalUtxoData:y}=G.outputApprovalDataProcessing(e,a[r],t[r]);y&&(n.useApprovalUtxoData[r]=y,n.doPreTxApproval=!0)}const l=await e.getRandomRelay(!u);if(!l)throw Error(F.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:P,kycRequired:h,hasAccessToken:E}=await V.shouldPatchAccessTokenMerkleTree(e,s,t),I=await Z.getSignatureDataForTransact(e.getCurrentChainId(),d,e.userKeys,h,E),{zkCallData:p,circomData:A,dimData:C}=await M.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,a,q,e.userKeys,v,o.externalActionId,o.externalAddress,o.externalActionMetadata,e.generateProofRemotely,l,e.getCurrentChainId(),D,void 0,void 0,P,n,void 0,g,e.getContractWithFetcher(O.ContractType.HinkalHelperContract),I);if(u)return await K.estimateGasRelayer(e,p,C,A);const _=Y.constructAdminData(m,e.getCurrentChainId(),s,t,d,c);return await N.transactCallRelayer(e.getCurrentChainId(),p,C,A,w,void 0,void 0,_)};exports.hinkalSwap=J;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const F=require("../../error-handling/error-codes.constants.cjs"),L=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),M=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),H=require("../../functions/web3/events/getShieldedBalance.cjs"),K=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),N=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),W=require("../../functions/pre-transaction/getFeeStructure.cjs"),B=require("../../functions/pre-transaction/merge-with-fee-structure.cjs"),b=require("../../types/external-action.types.cjs"),G=require("../../types/hinkal.types.cjs"),O=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),V=require("../../types/ethereum-network.types.cjs"),Z=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),$=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),j=require("../../functions/pre-transaction/getExternalSwapAddress.cjs"),z=require("../../functions/utils/time.utils.cjs"),Y=require("../../constants/protocol.constants.cjs");require("../../types/circom-data.types.cjs");require("../../types/activities.types.cjs");require("../../constants/server.constants.cjs");require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../http/HttpClient.cjs");require("axios");require("ethers");require("../../constants/token-data/index.cjs");require("../../API/getServerURL.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../functions/utils/mutexes.utils.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("../crypto-keys/keys.cjs");const J=require("../../functions/pre-transaction/constructAdminData.cjs");require("@solana/spl-token");const Q=async(e,c,t,i,A,C,k,x,l=!1,y=!1)=>{console.log("hinkalSwap 1");const o=c.map(r=>r.erc20TokenAddress);console.log("hinkalSwap 2");const u=await e.getEthereumAddress();console.log("hinkalSwap 3");const g=k??await W.getFeeStructure(e.getCurrentChainId(),C,o,b.ExternalActionId.Transact,void 0,Y.HINKAL_SWAP_VARIABLE_RATE);B.mergeWithFeeStructure(e.getCurrentChainId(),o,t,g),console.log("hinkalSwap 4");const T=j.getExternalSwapAddress(e,i),s={externalActionId:i,externalAddress:T,externalActionMetadata:A};console.log("hinkalSwap 5");const a=[...await H.addPaddingToUtxos(e,o,t)],m=`swapperM${t.length.toString()}x${a[0].length}x1`;console.log("hinkalSwap 6");const f=[!1,!0,!1].slice(0,t.length),p=[];console.log("hinkalSwap 7");const n=G.defaultHinkalLogicArgs(t.length,e.userKeys);console.log("hinkalSwap 8");const v=z.getCurrentTimeInSeconds().toString();for(let r=0;r<o.length;r+=1){console.log("hinkalSwap 9",{i:r});const{outputUtxos:U}=L.outputUtxoProcessing(e.userKeys,a[r],t[r],v,void 0,!1);console.log("hinkalSwap 10",{i:r}),p.push(U);const{useApprovalUtxoData:h}=O.outputApprovalDataProcessing(e,a[r],t[r]);console.log("hinkalSwap 11",{i:r}),h&&(n.useApprovalUtxoData[r]=h,n.doPreTxApproval=!0),console.log("hinkalSwap 12",{i:r})}console.log("hinkalSwap 13");const d=await e.getRandomRelay(!l);if(!d)throw Error(F.transactionErrorCodes.RELAYER_NOT_AVAILABLE);console.log("hinkalSwap 14");const{patchAccessTokenMerkleTree:D,kycRequired:P,hasAccessToken:R}=await Z.shouldPatchAccessTokenMerkleTree(e,o,t);console.log("hinkalSwap 15");const E=await $.getSignatureDataForTransact(e.getCurrentChainId(),u,e.userKeys,P,R);console.log("hinkalSwap 16");const{zkCallData:q,circomData:S,dimData:w}=await M.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,a,p,e.userKeys,m,s.externalActionId,s.externalAddress,s.externalActionMetadata,e.generateProofRemotely,d,e.getCurrentChainId(),f,void 0,void 0,D,n,void 0,g,e.getContractWithFetcher(V.ContractType.HinkalHelperContract),E);if(console.log("hinkalSwap 17"),l)return await K.estimateGasRelayer(e,q,w,S);console.log("hinkalSwap 18");const I=J.constructAdminData(x,e.getCurrentChainId(),o,t,u,c);console.log("hinkalSwap 19");const _=await N.transactCallRelayer(e.getCurrentChainId(),q,w,S,y,void 0,void 0,I);return console.log("hinkalSwap 20"),_};exports.hinkalSwap=Q;

package/data-structures/Hinkal/hinkalSwap.mjs

@@ -37,92 +37,115 @@ import "@solana/web3.js";
 import "../crypto-keys/keys.mjs";
 import { constructAdminData as J } from "../../functions/pre-transaction/constructAdminData.mjs";
 import "@solana/spl-token";
-const Nt = async (t, m, e, p, l, T, y, w, c = !1, v = !1) => {
-  const o = m.map((r) => r.erc20TokenAddress), n = await t.getEthereumAddress(), d = y ?? await B(
-    t.getCurrentChainId(),
-    T,
-    o,
+const No = async (o, s, r, p, h, A, C, x, c = !1, T = !1) => {
+  console.log("hinkalSwap 1");
+  const e = s.map((t) => t.erc20TokenAddress);
+  console.log("hinkalSwap 2");
+  const l = await o.getEthereumAddress();
+  console.log("hinkalSwap 3");
+  const m = C ?? await B(
+    o.getCurrentChainId(),
+    A,
+    e,
     $.Transact,
     void 0,
     G
   );
-  V(t.getCurrentChainId(), o, e, d);
-  const R = b(t, p), s = {
+  V(o.getCurrentChainId(), e, r, m), console.log("hinkalSwap 4");
+  const k = b(o, p), i = {
     externalActionId: p,
-    externalAddress: R,
-    externalActionMetadata: l
-  }, a = [...await F(t, o, e)], D = `swapperM${e.length.toString()}x${a[0].length}x1`, E = [!1, !0, !1].slice(0, e.length), u = [], i = q(e.length, t.userKeys), I = j().toString();
-  for (let r = 0; r < o.length; r += 1) {
+    externalAddress: k,
+    externalActionMetadata: h
+  };
+  console.log("hinkalSwap 5");
+  const a = [...await F(o, e, r)], y = `swapperM${r.length.toString()}x${a[0].length}x1`;
+  console.log("hinkalSwap 6");
+  const v = [!1, !0, !1].slice(0, r.length), g = [];
+  console.log("hinkalSwap 7");
+  const n = q(r.length, o.userKeys);
+  console.log("hinkalSwap 8");
+  const D = j().toString();
+  for (let t = 0; t < e.length; t += 1) {
+    console.log("hinkalSwap 9", { i: t });
     const { outputUtxos: H } = M(
-      t.userKeys,
-      a[r],
-      e[r],
-      I,
+      o.userKeys,
+      a[t],
+      r[t],
+      D,
       void 0,
       !1
     );
-    u.push(H);
-    const { useApprovalUtxoData: x } = z(t, a[r], e[r]);
-    x && (i.useApprovalUtxoData[r] = x, i.doPreTxApproval = !0);
+    console.log("hinkalSwap 10", { i: t }), g.push(H);
+    const { useApprovalUtxoData: S } = z(o, a[t], r[t]);
+    console.log("hinkalSwap 11", { i: t }), S && (n.useApprovalUtxoData[t] = S, n.doPreTxApproval = !0), console.log("hinkalSwap 12", { i: t });
   }
-  const g = await t.getRandomRelay(!c);
-  if (!g)
+  console.log("hinkalSwap 13");
+  const d = await o.getRandomRelay(!c);
+  if (!d)
     throw Error(K.RELAYER_NOT_AVAILABLE);
-  const { patchAccessTokenMerkleTree: S, kycRequired: P, hasAccessToken: L } = await Y(
-    t,
+  console.log("hinkalSwap 14");
+  const { patchAccessTokenMerkleTree: E, kycRequired: I, hasAccessToken: R } = await Y(
     o,
-    e
-  ), U = await Z(
-    t.getCurrentChainId(),
-    n,
-    t.userKeys,
-    P,
-    L
-  ), { zkCallData: f, circomData: A, dimData: C } = await _(
+    e,
+    r
+  );
+  console.log("hinkalSwap 15");
+  const P = await Z(
+    o.getCurrentChainId(),
+    l,
+    o.userKeys,
+    I,
+    R
+  );
+  console.log("hinkalSwap 16");
+  const { zkCallData: u, circomData: w, dimData: f } = await _(
     "v1x1",
-    t.merkleTreeHinkal,
-    t.merkleTreeAccessToken,
+    o.merkleTreeHinkal,
+    o.merkleTreeAccessToken,
     a,
-    u,
-    t.userKeys,
-    D,
-    s.externalActionId,
-    s.externalAddress,
-    s.externalActionMetadata,
-    t.generateProofRemotely,
     g,
-    t.getCurrentChainId(),
-    E,
+    o.userKeys,
+    y,
+    i.externalActionId,
+    i.externalAddress,
+    i.externalActionMetadata,
+    o.generateProofRemotely,
+    d,
+    o.getCurrentChainId(),
+    v,
     void 0,
     void 0,
-    S,
-    i,
+    E,
+    n,
     void 0,
-    d,
-    t.getContractWithFetcher(O.HinkalHelperContract),
-    U
+    m,
+    o.getContractWithFetcher(O.HinkalHelperContract),
+    P
   );
-  if (c)
-    return await N(t, f, C, A);
-  const h = J(
-    w,
-    t.getCurrentChainId(),
-    o,
+  if (console.log("hinkalSwap 17"), c)
+    return await N(o, u, f, w);
+  console.log("hinkalSwap 18");
+  const L = J(
+    x,
+    o.getCurrentChainId(),
     e,
-    n,
-    m
+    r,
+    l,
+    s
   );
-  return await W(
-    t.getCurrentChainId(),
+  console.log("hinkalSwap 19");
+  const U = await W(
+    o.getCurrentChainId(),
+    u,
     f,
-    C,
-    A,
-    v,
+    w,
+    T,
     void 0,
     void 0,
-    h
+    L
   );
+  return console.log("hinkalSwap 20"), U;
 };
 export {
-  Nt as hinkalSwap
+  No as hinkalSwap
 };

package/data-structures/crypto-keys/encryptDecryptUtxo.mjs

@@ -7,6 +7,7 @@ const K = (e) => {
   const r = [
     Buffer.from(o.toBeHex(e.amount)),
     Buffer.from(e.erc20TokenAddress),
+    // if it is zeroAddress toBeHex will return 0x00
     Buffer.from(o.toBeHex(e.randomization)),
     Buffer.from(e.getStealthAddress()),
     Buffer.from(o.toBeHex(BigInt(e.timeStamp))),

package/functions/web3/events/getInputUtxoAndBalance.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const R=require("../../../data-structures/utxo/Utxo.cjs"),C=require("../../utils/upToDateState.cjs"),O=require("../../utils/cacheFunctions.cjs"),K=require("../../utils/caseInsensitive.utils.cjs"),b=require("../../utils/encodeTokenWithId.cjs"),M=require("./getInputUtxosEnclave.cjs"),F=require("../../../error-handling/logger.cjs"),H=require("../../utils/solanaMint.utils.cjs"),_=require("../../../constants/chains.constants.cjs"),j=require("../../utils/addresses.cjs"),G=require("../../../API/scheduled-transactions-calls.cjs"),q=async(t,o,e,n,c,r,u,a,s)=>{s+=1;const l=r.slice(s),{lastOutput:f,additionalEncryptedOutputs:y}=await t.utxoUtils.batchProcess(l,a,o,e),i=[...u,...y];return await C.checkChainOrAddressNotUpdated(t,e,n),O.setHinkalCache({lastOutput:f,encryptedOutputs:i},t,e,c),await t.utxoUtils.buildBatchProcess(i,o,e)},S=async(t,o,e,n)=>{const{utxos:c,encryptedOutputs:r,lastOutput:u}=await M.getInputUtxosEnclave(t,e,o);return O.setHinkalCache({encryptedOutputs:r,lastOutput:u},t,e,n),c},N=async(t,o,e,n,c,r,u,a,s)=>{try{return await S(t,o,e,c)}catch{return q(t,o,e,n,c,r,u,a,s)}},D=t=>{if(Array.isArray(t))return t;if(t!==void 0)return[t]},J=async(t,o,e)=>await t.utxoUtils.batchFilterUtxosWithNullifier(o,e),W=(t,o,e,n,c,r,u)=>{for(t.sort((a,s)=>a.amount<=s.amount?1:-1),console.log("sorted utxos");t.length<o||t.length>o&&t.length<6;)if(console.log("before pushing"),console.log("aaa",c,u,n,r),t.push(new R.Utxo({amount:0n,erc20TokenAddress:c,mintAddress:u,shieldedPrivateKey:n,tokenId:r,enableLogs:!0})),console.log("after pushing"),e)for(;t.length>6;)t.splice(t.length-1);console.log("completed sorting utxos")},E=async({hinkal:t,chainId:o=void 0,passedShieldedPublicKey:e=void 0,ethAddress:n=void 0,resetCacheBefore:c=!1,allowRemoteDecryption:r=!1,useBlockedUtxos:u=!1})=>{if(!t.getCurrentChainId||!t.getSelectedNetwork())return F.Logger.log("returning empty balance"),{inputUtxos:[]};const a=n??await t.getEthereumAddress(),s=o??t.getCurrentChainId(),l=e??t.userKeys.getShieldedPublicKey(),{encryptedOutputs:f,nullifiers:y,userKeys:i}=t,g=Array.from(f);console.log("getInputUtxoAndBalance 1",{encryptedOutputs:f}),c&&O.resetCache(t,s,l);let{encryptedOutputs:h,lastOutput:x}=O.getHinkalCache(t,s,l);console.log("getInputUtxoAndBalance 2"),await C.checkChainOrAddressNotUpdated(t,s,a),console.log("getInputUtxoAndBalance 3");const p=x!=="",d=g.findIndex(k=>k.value===x);console.log("getInputUtxoAndBalance 4");const I=d>-1,T=!p&&d===-1;console.log("getInputUtxoAndBalance 5");const w=t.areMerkleTreeUpdatesDisabled();console.log("getInputUtxoAndBalance 6");const v=!w&&(I||!r&&T),B=!w&&r&&T,A=!v&&!B;let U=[];v?U=await q(t,i,s,a,l,g,h,x,d):B?U=await N(t,i,s,a,l,g,h,x,d):A&&(U=await t.utxoUtils.buildBatchProcess(h,i,s)),console.log("getInputUtxoAndBalance 7",{allUtxos:U}),await C.checkChainOrAddressNotUpdated(t,s,a);const m=await J(t,U,y);console.log("getInputUtxoAndBalance 8",{inputUtxos:m});const P=u?m:m.filter(k=>!k.isBlocked);return console.log("getInputUtxoAndBalance 9",{filteredInputUtxos:P}),console.trace(),{inputUtxos:P}},L=async({hinkal:t,chainId:o=void 0,passedShieldedPublicKey:e=void 0,ethAddress:n=void 0,resetCacheBefore:c=!1,allowRemoteDecryption:r=!1})=>{const u=o??t.getCurrentChainId(),a=n??await t.getEthereumAddress(),s=j.hashEthereumAddress(a),{inputUtxos:l}=await E({hinkal:t,chainId:u,passedShieldedPublicKey:e,ethAddress:a,resetCacheBefore:c,allowRemoteDecryption:r,useBlockedUtxos:!0});if(!l.length)return{inputUtxos:[]};const f=l.map(g=>g.getNullifier()),{indexes:y}=await G.getScheduledTransactionsNullifierIndexes(u,{hashedEthereumAddress:s,nullifiers:f});return{inputUtxos:y.map(g=>l[g]).filter(g=>!!g)}},z=async({hinkal:t,tokenWithId:o,minInput:e=2,sliceIfMore6:n=!0,chainId:c=void 0,passedShieldedPrivateKey:r=void 0,passedShieldedPublicKey:u=void 0,ethAddress:a=void 0,resetCacheBefore:s=!1,ensuredTokensWithId:l,useBlockedUtxos:f=!1})=>{const y=r??t.userKeys.getShieldedPrivateKey(),i=c??t.getCurrentChainId();console.log("getInputUtxoAndBalancePerToken 1");const{inputUtxos:g}=f?await L({hinkal:t,chainId:c,ethAddress:a,passedShieldedPrivateKey:r,resetCacheBefore:s}):await E({hinkal:t,tokenWithId:o,minInput:e,sliceIfMore6:n,chainId:c,passedShieldedPrivateKey:r,passedShieldedPublicKey:u,ethAddress:a,resetCacheBefore:s});console.log("getInputUtxoAndBalancePerToken 2");const h=D(o),x=new Map;console.log("getInputUtxoAndBalancePerToken 3"),g.forEach(p=>{const d=p.getTokenAddress(i);if(h&&!h.some(w=>K.caseInsensitiveEqual(w.erc20TokenAddress,d)&&w.tokenId===p.tokenId))return;const I=b.encodeTokenWithId(i,{erc20TokenAddress:d,tokenId:p.tokenId}),T=x.get(I)??[];x.set(I,[...T,p])}),console.log("getInputUtxoAndBalancePerToken 4"),l?.forEach(p=>{const d=b.encodeTokenWithId(i,{erc20TokenAddress:p.erc20TokenAddress,tokenId:p.tokenId});x.set(d,x.get(d)??[])}),console.log("getInputUtxoAndBalancePerToken 5");for(const[p,d]of x){const I=p.split("-")[0],T=Number(p.split("-")[1]),w=_.isSolanaLike(i),v=w?I:void 0,B=w?H.formatMintAddress(I).compressedAddress.toLowerCase():I.toLowerCase(),A=U=>U===null?"null":typeof U!="object"?typeof U:U.constructor.name;console.log("types",JSON.stringify({value:A(d),minInput:A(e),sliceIfMore6:A(n),shieldedPrivateKey:A(y),modifiedErc20TokenAddress:A(B),tokenId:A(T),mintAddress:A(v)})),console.log("started padding"),W(d,e,n,y,B,T,v),console.log("done padding")}return console.log("getInputUtxoAndBalancePerToken 6"),x};exports.attemptGetInputUtxosRemotely=N;exports.getInputUtxoAndBalance=E;exports.getInputUtxoAndBalanceOfStuckUtxos=L;exports.getInputUtxoAndBalancePerToken=z;exports.getInputUtxosRemotely=S;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const R=require("../../../data-structures/utxo/Utxo.cjs"),k=require("../../utils/upToDateState.cjs"),O=require("../../utils/cacheFunctions.cjs"),K=require("../../utils/caseInsensitive.utils.cjs"),P=require("../../utils/encodeTokenWithId.cjs"),M=require("./getInputUtxosEnclave.cjs"),F=require("../../../error-handling/logger.cjs"),H=require("../../utils/solanaMint.utils.cjs"),_=require("../../../constants/chains.constants.cjs"),j=require("../../utils/addresses.cjs"),G=require("../../../API/scheduled-transactions-calls.cjs"),b=async(t,o,e,n,c,r,u,a,s)=>{s+=1;const l=r.slice(s),{lastOutput:w,additionalEncryptedOutputs:f}=await t.utxoUtils.batchProcess(l,a,o,e),i=[...u,...f];return await k.checkChainOrAddressNotUpdated(t,e,n),O.setHinkalCache({lastOutput:w,encryptedOutputs:i},t,e,c),await t.utxoUtils.buildBatchProcess(i,o,e)},q=async(t,o,e,n)=>{const{utxos:c,encryptedOutputs:r,lastOutput:u}=await M.getInputUtxosEnclave(t,e,o);return O.setHinkalCache({encryptedOutputs:r,lastOutput:u},t,e,n),c},S=async(t,o,e,n,c,r,u,a,s)=>{try{return await q(t,o,e,c)}catch{return b(t,o,e,n,c,r,u,a,s)}},D=t=>{if(Array.isArray(t))return t;if(t!==void 0)return[t]},J=async(t,o,e)=>await t.utxoUtils.batchFilterUtxosWithNullifier(o,e),W=(t,o,e,n,c,r,u)=>{for(t.sort((a,s)=>a.amount<=s.amount?1:-1),console.log("sorted utxos");t.length<o||t.length>o&&t.length<6;)if(console.log("before pushing"),console.log("aaa",c,u,n,r),t.push(new R.Utxo({amount:0n,erc20TokenAddress:c,mintAddress:u,shieldedPrivateKey:n,tokenId:r,enableLogs:!0})),console.log("after pushing"),e)for(;t.length>6;)t.splice(t.length-1);console.log("completed sorting utxos")},C=async({hinkal:t,chainId:o=void 0,passedShieldedPublicKey:e=void 0,ethAddress:n=void 0,resetCacheBefore:c=!1,allowRemoteDecryption:r=!1,useBlockedUtxos:u=!1})=>{if(!t.getCurrentChainId||!t.getSelectedNetwork())return F.Logger.log("returning empty balance"),{inputUtxos:[]};const a=n??await t.getEthereumAddress(),s=o??t.getCurrentChainId(),l=e??t.userKeys.getShieldedPublicKey(),{encryptedOutputs:w,nullifiers:f,userKeys:i}=t,g=Array.from(w);console.log("getInputUtxoAndBalance 1"),c&&O.resetCache(t,s,l);let{encryptedOutputs:h,lastOutput:x}=O.getHinkalCache(t,s,l);console.log("getInputUtxoAndBalance 2"),await k.checkChainOrAddressNotUpdated(t,s,a),console.log("getInputUtxoAndBalance 3");const p=x!=="",d=g.findIndex(m=>m.value===x);console.log("getInputUtxoAndBalance 4");const y=d>-1,T=!p&&d===-1;console.log("getInputUtxoAndBalance 5");const I=t.areMerkleTreeUpdatesDisabled();console.log("getInputUtxoAndBalance 6");const v=!I&&(y||!r&&T),B=!I&&r&&T,U=!v&&!B;let A=[];v?A=await b(t,i,s,a,l,g,h,x,d):B?A=await S(t,i,s,a,l,g,h,x,d):U&&(A=await t.utxoUtils.buildBatchProcess(h,i,s)),console.log("getInputUtxoAndBalance 7"),await k.checkChainOrAddressNotUpdated(t,s,a);const E=await J(t,A,f);console.log("getInputUtxoAndBalance 8");const L=u?E:E.filter(m=>!m.isBlocked);return console.log("getInputUtxoAndBalance 9"),console.trace(),{inputUtxos:L}},N=async({hinkal:t,chainId:o=void 0,passedShieldedPublicKey:e=void 0,ethAddress:n=void 0,resetCacheBefore:c=!1,allowRemoteDecryption:r=!1})=>{const u=o??t.getCurrentChainId(),a=n??await t.getEthereumAddress(),s=j.hashEthereumAddress(a),{inputUtxos:l}=await C({hinkal:t,chainId:u,passedShieldedPublicKey:e,ethAddress:a,resetCacheBefore:c,allowRemoteDecryption:r,useBlockedUtxos:!0});if(!l.length)return{inputUtxos:[]};const w=l.map(g=>g.getNullifier()),{indexes:f}=await G.getScheduledTransactionsNullifierIndexes(u,{hashedEthereumAddress:s,nullifiers:w});return{inputUtxos:f.map(g=>l[g]).filter(g=>!!g)}},z=async({hinkal:t,tokenWithId:o,minInput:e=2,sliceIfMore6:n=!0,chainId:c=void 0,passedShieldedPrivateKey:r=void 0,passedShieldedPublicKey:u=void 0,ethAddress:a=void 0,resetCacheBefore:s=!1,ensuredTokensWithId:l,useBlockedUtxos:w=!1})=>{const f=r??t.userKeys.getShieldedPrivateKey(),i=c??t.getCurrentChainId();console.log("getInputUtxoAndBalancePerToken 1");const{inputUtxos:g}=w?await N({hinkal:t,chainId:c,ethAddress:a,passedShieldedPrivateKey:r,resetCacheBefore:s}):await C({hinkal:t,tokenWithId:o,minInput:e,sliceIfMore6:n,chainId:c,passedShieldedPrivateKey:r,passedShieldedPublicKey:u,ethAddress:a,resetCacheBefore:s});console.log("getInputUtxoAndBalancePerToken 2");const h=D(o),x=new Map;console.log("getInputUtxoAndBalancePerToken 3"),g.forEach(p=>{const d=p.getTokenAddress(i);if(h&&!h.some(I=>K.caseInsensitiveEqual(I.erc20TokenAddress,d)&&I.tokenId===p.tokenId))return;const y=P.encodeTokenWithId(i,{erc20TokenAddress:d,tokenId:p.tokenId}),T=x.get(y)??[];x.set(y,[...T,p])}),console.log("getInputUtxoAndBalancePerToken 4"),l?.forEach(p=>{const d=P.encodeTokenWithId(i,{erc20TokenAddress:p.erc20TokenAddress,tokenId:p.tokenId});x.set(d,x.get(d)??[])}),console.log("getInputUtxoAndBalancePerToken 5");for(const[p,d]of x){const y=p.split("-")[0],T=Number(p.split("-")[1]),I=_.isSolanaLike(i),v=I?y:void 0,B=I?H.formatMintAddress(y).compressedAddress.toLowerCase():y.toLowerCase(),U=A=>A===null?"null":typeof A!="object"?typeof A:A.constructor.name;console.log("types",JSON.stringify({value:U(d),minInput:U(e),sliceIfMore6:U(n),shieldedPrivateKey:U(f),modifiedErc20TokenAddress:U(B),tokenId:U(T),mintAddress:U(v)})),console.log("started padding"),W(d,e,n,f,B,T,v),console.log("done padding")}return console.log("getInputUtxoAndBalancePerToken 6"),x};exports.attemptGetInputUtxosRemotely=S;exports.getInputUtxoAndBalance=C;exports.getInputUtxoAndBalanceOfStuckUtxos=N;exports.getInputUtxoAndBalancePerToken=z;exports.getInputUtxosRemotely=q;

package/functions/web3/events/getInputUtxoAndBalance.mjs

@@ -1,25 +1,25 @@
 import { Utxo as S } from "../../../data-structures/utxo/Utxo.mjs";
-import { checkChainOrAddressNotUpdated as E } from "../../utils/upToDateState.mjs";
-import { setHinkalCache as b, resetCache as L, getHinkalCache as K } from "../../utils/cacheFunctions.mjs";
+import { checkChainOrAddressNotUpdated as h } from "../../utils/upToDateState.mjs";
+import { setHinkalCache as C, resetCache as L, getHinkalCache as K } from "../../utils/cacheFunctions.mjs";
 import { caseInsensitiveEqual as R } from "../../utils/caseInsensitive.utils.mjs";
-import { encodeTokenWithId as C } from "../../utils/encodeTokenWithId.mjs";
+import { encodeTokenWithId as P } from "../../utils/encodeTokenWithId.mjs";
 import { getInputUtxosEnclave as F } from "./getInputUtxosEnclave.mjs";
 import { Logger as H } from "../../../error-handling/logger.mjs";
 import { formatMintAddress as M } from "../../utils/solanaMint.utils.mjs";
 import { isSolanaLike as j } from "../../../constants/chains.constants.mjs";
 import { hashEthereumAddress as q } from "../../utils/addresses.mjs";
 import { getScheduledTransactionsNullifierIndexes as G } from "../../../API/scheduled-transactions-calls.mjs";
-const k = async (t, o, e, n, r, c, l, a, s) => {
+const b = async (t, o, e, n, r, c, l, a, s) => {
   s += 1;
-  const u = c.slice(s), { lastOutput: A, additionalEncryptedOutputs: m } = await t.utxoUtils.batchProcess(
+  const u = c.slice(s), { lastOutput: I, additionalEncryptedOutputs: A } = await t.utxoUtils.batchProcess(
     u,
     a,
     o,
     e
-  ), i = [...l, ...m];
-  return await E(t, e, n), b(
+  ), i = [...l, ...A];
+  return await h(t, e, n), C(
     {
-      lastOutput: A,
+      lastOutput: I,
       encryptedOutputs: i
     },
     t,
@@ -32,7 +32,7 @@ const k = async (t, o, e, n, r, c, l, a, s) => {
     encryptedOutputs: c,
     lastOutput: l
   } = await F(t, e, o);
-  return b(
+  return C(
     {
       encryptedOutputs: c,
       lastOutput: l
@@ -45,7 +45,7 @@ const k = async (t, o, e, n, r, c, l, a, s) => {
   try {
     return await J(t, o, e, r);
   } catch {
-    return k(
+    return b(
       t,
       o,
       e,
@@ -70,7 +70,7 @@ const k = async (t, o, e, n, r, c, l, a, s) => {
       for (; t.length > 6; )
         t.splice(t.length - 1);
   console.log("completed sorting utxos");
-}, N = async ({
+}, k = async ({
   hinkal: t,
   chainId: o = void 0,
   passedShieldedPublicKey: e = void 0,
@@ -81,23 +81,23 @@ const k = async (t, o, e, n, r, c, l, a, s) => {
 }) => {
   if (!t.getCurrentChainId || !t.getSelectedNetwork())
     return H.log("returning empty balance"), { inputUtxos: [] };
-  const a = n ?? await t.getEthereumAddress(), s = o ?? t.getCurrentChainId(), u = e ?? t.userKeys.getShieldedPublicKey(), { encryptedOutputs: A, nullifiers: m, userKeys: i } = t, p = Array.from(A);
-  console.log("getInputUtxoAndBalance 1", { encryptedOutputs: A }), r && L(t, s, u);
+  const a = n ?? await t.getEthereumAddress(), s = o ?? t.getCurrentChainId(), u = e ?? t.userKeys.getShieldedPublicKey(), { encryptedOutputs: I, nullifiers: A, userKeys: i } = t, p = Array.from(I);
+  console.log("getInputUtxoAndBalance 1"), r && L(t, s, u);
   let { encryptedOutputs: v, lastOutput: f } = K(
     t,
     s,
     u
   );
-  console.log("getInputUtxoAndBalance 2"), await E(t, s, a), console.log("getInputUtxoAndBalance 3");
-  const g = f !== "", d = p.findIndex((h) => h.value === f);
+  console.log("getInputUtxoAndBalance 2"), await h(t, s, a), console.log("getInputUtxoAndBalance 3");
+  const g = f !== "", d = p.findIndex((O) => O.value === f);
   console.log("getInputUtxoAndBalance 4");
-  const y = d > -1, w = !g && d === -1;
+  const m = d > -1, w = !g && d === -1;
   console.log("getInputUtxoAndBalance 5");
-  const I = t.areMerkleTreeUpdatesDisabled();
+  const y = t.areMerkleTreeUpdatesDisabled();
   console.log("getInputUtxoAndBalance 6");
-  const B = !I && (y || !c && w), T = !I && c && w, U = !B && !T;
-  let x = [];
-  B ? x = await k(
+  const B = !y && (m || !c && w), T = !y && c && w, x = !B && !T;
+  let U = [];
+  B ? U = await b(
     t,
     i,
     s,
@@ -107,7 +107,7 @@ const k = async (t, o, e, n, r, c, l, a, s) => {
     v,
     f,
     d
-  ) : T ? x = await z(
+  ) : T ? U = await z(
     t,
     i,
     s,
@@ -117,11 +117,11 @@ const k = async (t, o, e, n, r, c, l, a, s) => {
     v,
     f,
     d
-  ) : U && (x = await t.utxoUtils.buildBatchProcess(v, i, s)), console.log("getInputUtxoAndBalance 7", { allUtxos: x }), await E(t, s, a);
-  const O = await Q(t, x, m);
-  console.log("getInputUtxoAndBalance 8", { inputUtxos: O });
-  const P = l ? O : O.filter((h) => !h.isBlocked);
-  return console.log("getInputUtxoAndBalance 9", { filteredInputUtxos: P }), console.trace(), { inputUtxos: P };
+  ) : x && (U = await t.utxoUtils.buildBatchProcess(v, i, s)), console.log("getInputUtxoAndBalance 7"), await h(t, s, a);
+  const E = await Q(t, U, A);
+  console.log("getInputUtxoAndBalance 8");
+  const N = l ? E : E.filter((O) => !O.isBlocked);
+  return console.log("getInputUtxoAndBalance 9"), console.trace(), { inputUtxos: N };
 }, X = async ({
   hinkal: t,
   chainId: o = void 0,
@@ -130,7 +130,7 @@ const k = async (t, o, e, n, r, c, l, a, s) => {
   resetCacheBefore: r = !1,
   allowRemoteDecryption: c = !1
 }) => {
-  const l = o ?? t.getCurrentChainId(), a = n ?? await t.getEthereumAddress(), s = q(a), { inputUtxos: u } = await N({
+  const l = o ?? t.getCurrentChainId(), a = n ?? await t.getEthereumAddress(), s = q(a), { inputUtxos: u } = await k({
     hinkal: t,
     chainId: l,
     passedShieldedPublicKey: e,
@@ -141,11 +141,11 @@ const k = async (t, o, e, n, r, c, l, a, s) => {
   });
   if (!u.length)
     return { inputUtxos: [] };
-  const A = u.map((p) => p.getNullifier()), { indexes: m } = await G(l, {
+  const I = u.map((p) => p.getNullifier()), { indexes: A } = await G(l, {
     hashedEthereumAddress: s,
-    nullifiers: A
+    nullifiers: I
   });
-  return { inputUtxos: m.map((p) => u[p]).filter((p) => !!p) };
+  return { inputUtxos: A.map((p) => u[p]).filter((p) => !!p) };
 }, ct = async ({
   hinkal: t,
   tokenWithId: o,
@@ -157,17 +157,17 @@ const k = async (t, o, e, n, r, c, l, a, s) => {
   ethAddress: a = void 0,
   resetCacheBefore: s = !1,
   ensuredTokensWithId: u,
-  useBlockedUtxos: A = !1
+  useBlockedUtxos: I = !1
 }) => {
-  const m = c ?? t.userKeys.getShieldedPrivateKey(), i = r ?? t.getCurrentChainId();
+  const A = c ?? t.userKeys.getShieldedPrivateKey(), i = r ?? t.getCurrentChainId();
   console.log("getInputUtxoAndBalancePerToken 1");
-  const { inputUtxos: p } = A ? await X({
+  const { inputUtxos: p } = I ? await X({
     hinkal: t,
     chainId: r,
     ethAddress: a,
     passedShieldedPrivateKey: c,
     resetCacheBefore: s
-  }) : await N({
+  }) : await k({
     hinkal: t,
     tokenWithId: o,
     minInput: e,
@@ -183,38 +183,38 @@ const k = async (t, o, e, n, r, c, l, a, s) => {
   console.log("getInputUtxoAndBalancePerToken 3"), p.forEach((g) => {
     const d = g.getTokenAddress(i);
     if (v && !v.some(
-      (I) => R(I.erc20TokenAddress, d) && I.tokenId === g.tokenId
+      (y) => R(y.erc20TokenAddress, d) && y.tokenId === g.tokenId
     ))
       return;
-    const y = C(i, { erc20TokenAddress: d, tokenId: g.tokenId }), w = f.get(y) ?? [];
-    f.set(y, [...w, g]);
+    const m = P(i, { erc20TokenAddress: d, tokenId: g.tokenId }), w = f.get(m) ?? [];
+    f.set(m, [...w, g]);
   }), console.log("getInputUtxoAndBalancePerToken 4"), u?.forEach((g) => {
-    const d = C(i, {
+    const d = P(i, {
       erc20TokenAddress: g.erc20TokenAddress,
       tokenId: g.tokenId
     });
     f.set(d, f.get(d) ?? []);
   }), console.log("getInputUtxoAndBalancePerToken 5");
   for (const [g, d] of f) {
-    const y = g.split("-")[0], w = Number(g.split("-")[1]), I = j(i), B = I ? y : void 0, T = I ? M(y).compressedAddress.toLowerCase() : y.toLowerCase(), U = (x) => x === null ? "null" : typeof x != "object" ? typeof x : x.constructor.name;
+    const m = g.split("-")[0], w = Number(g.split("-")[1]), y = j(i), B = y ? m : void 0, T = y ? M(m).compressedAddress.toLowerCase() : m.toLowerCase(), x = (U) => U === null ? "null" : typeof U != "object" ? typeof U : U.constructor.name;
     console.log(
       "types",
       JSON.stringify({
-        value: U(d),
-        minInput: U(e),
-        sliceIfMore6: U(n),
-        shieldedPrivateKey: U(m),
-        modifiedErc20TokenAddress: U(T),
-        tokenId: U(w),
-        mintAddress: U(B)
+        value: x(d),
+        minInput: x(e),
+        sliceIfMore6: x(n),
+        shieldedPrivateKey: x(A),
+        modifiedErc20TokenAddress: x(T),
+        tokenId: x(w),
+        mintAddress: x(B)
       })
-    ), console.log("started padding"), V(d, e, n, m, T, w, B), console.log("done padding");
+    ), console.log("started padding"), V(d, e, n, A, T, w, B), console.log("done padding");
   }
   return console.log("getInputUtxoAndBalancePerToken 6"), f;
 };
 export {
   z as attemptGetInputUtxosRemotely,
-  N as getInputUtxoAndBalance,
+  k as getInputUtxoAndBalance,
   X as getInputUtxoAndBalanceOfStuckUtxos,
   ct as getInputUtxoAndBalancePerToken,
   J as getInputUtxosRemotely

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "h_test_1",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "homepage": "hinkal.io",
   "author": {
     "name": "Hinkal Protocol"