@hinkal/common 0.2.27 → 0.2.28

package/functions/web3/functionCalls/approveToken.mjs

@@ -1,60 +1,65 @@
-import { ethers as n } from "ethers";
-import { chainIds as f, getNonLocalhostChainId as x } from "../../../constants/chains.constants.mjs";
-import { permitSignatureValidFor as A } from "../../../constants/protocol.constants.mjs";
+import { ethers as o } from "ethers";
+import { chainIds as T, getNonLocalhostChainId as B } from "../../../constants/chains.constants.mjs";
+import { permitSignatureValidFor as F } from "../../../constants/protocol.constants.mjs";
 import { ApprovalType as d } from "../../../types/token.types.mjs";
-import { ContractType as l } from "../../../types/ethereum-network.types.mjs";
-import { recoverTransactionFromError as b } from "./recoverTransactionFromError.mjs";
-import { getProviderFromContract as F, getSignerFromContract as v } from "../../utils/getSignerFromContract.mjs";
-const B = async (e, a, o) => {
-  const t = v(o);
-  return await o.allowance(await t.getAddress(), a.target) >= e;
-}, P = async (e, a, o, t) => {
-  if (x(e.getCurrentChainId()) !== f.ethMainnet || o.symbol.toLowerCase() !== "usdt" || BigInt(
-    await t.allowance(await v(t).getAddress(), a.target)
+import { ContractType as m } from "../../../types/ethereum-network.types.mjs";
+import { recoverTransactionFromError as P } from "./recoverTransactionFromError.mjs";
+import { getProviderFromContract as E, getSignerFromContract as h } from "../../utils/getSignerFromContract.mjs";
+import { getContractAddress as y } from "../../utils/getContractAddress.mjs";
+const S = async (t, e, a) => {
+  const i = h(a);
+  return await a.allowance(await i.getAddress(), e.target) >= t;
+}, D = async (t, e, a, i, r) => {
+  if (B(e) !== T.ethMainnet || i.symbol.toLowerCase() !== "usdt" || BigInt(
+    await r.allowance(await h(r).getAddress(), a.target)
   ) === 0n)
     return;
-  const c = await t.approve(a.target, 0n);
-  c && "hash" in c && await e.waitForTransaction(c.hash);
-}, V = async (e, a, o, t) => {
-  const i = e.getContractWithSigner(l.ERC20Contract, t.erc20TokenAddress), c = t.approvalType ?? d.Classic;
-  if (c === d.Classic || !e.isPermitterAvailable()) {
-    if (await B(o, a, i))
+  const c = await r.approve(y(a), 0n);
+  c && "hash" in c && await t.waitForTransaction(e, c.hash);
+}, z = async (t, e, a, i, r) => {
+  const p = t.getContractWithSigner(e, m.ERC20Contract, r.erc20TokenAddress), c = r.approvalType ?? d.Classic;
+  if (c === d.Classic || !t.isPermitterAvailable(e)) {
+    if (await S(i, a, p))
       return;
-    await P(e, a, t, i);
-    const C = e.getCurrentChainId() === f.base ? 2 : 1;
+    await D(t, e, a, r, p);
+    const v = e === T.base ? 2 : 1;
     try {
-      const s = await i.approve(
-        a.target,
-        o
+      const s = await p.approve(
+        y(a),
+        i
         // { gasLimit: 10000000 }
       );
-      s && "hash" in s && await e.waitForTransaction(s.hash, C);
+      s && "hash" in s && await t.waitForTransaction(e, s.hash, v);
     } catch (s) {
-      if (!s?.transactionHash || !await b(
-        F(i),
+      if (!s?.transactionHash || !await P(
+        E(p),
         s.transactionHash,
-        C
+        v
       ))
         throw s;
     }
     return;
   }
-  const p = await e.getEthereumAddress(), h = e.getContract(l.PermitterContract), I = await e.getContractWithFetcher(l.ContractWithNonces, t.erc20TokenAddress).nonces(p), m = BigInt(Date.now() + A) / 1000n, r = {
-    owner: p,
-    holder: p,
-    spender: h.target,
-    value: o,
-    nonce: I,
-    deadline: m,
-    expiry: m,
+  const l = await t.getEthereumAddressByChain(e), A = t.getContract(e, m.PermitterContract), x = await t.getContractWithFetcher(
+    e,
+    m.ContractWithNonces,
+    r.erc20TokenAddress
+  ).nonces(l), w = BigInt(Date.now() + F) / 1000n, n = {
+    owner: l,
+    holder: l,
+    spender: y(A),
+    value: i,
+    nonce: x,
+    deadline: w,
+    expiry: w,
     allowed: !0
-  }, { v: y, r: w, s: u } = n.Signature.from(
-    await e.signTypedData(
+  }, { v: u, r: f, s: g } = o.Signature.from(
+    await t.signTypedData(
       {
-        name: await i.name(),
-        chainId: e.getCurrentChainId(),
+        name: await p.name(),
+        chainId: e,
         version: "1",
-        verifyingContract: t.erc20TokenAddress
+        verifyingContract: r.erc20TokenAddress
       },
       {
         Permit: c === d.ERC20Permit ? [
@@ -101,41 +106,41 @@ const B = async (e, a, o) => {
           }
         ]
       },
-      r
+      n
     )
   );
   if (c === d.ERC20Permit) {
-    const g = new n.Interface([
+    const C = new o.Interface([
       "function permit(address owner,address spender,uint256 value,uint256 deadline,uint8 v,bytes32 r,bytes32 s) external"
     ]);
-    return n.getBytesCopy(
-      g.encodeFunctionData("permit", [
-        r.owner,
-        r.spender,
-        r.value,
-        r.deadline,
-        y,
-        n.getBytesCopy(w),
-        n.getBytesCopy(u)
+    return o.getBytesCopy(
+      C.encodeFunctionData("permit", [
+        n.owner,
+        n.spender,
+        n.value,
+        n.deadline,
+        u,
+        o.getBytesCopy(f),
+        o.getBytesCopy(g)
       ])
     ).slice(4);
   }
-  const T = new n.Interface([
+  const b = new o.Interface([
     "function permit(address holder,address spender,uint256 nonce,uint256 expiry,bool allowed,uint8 v,bytes32 r,bytes32 s) external"
   ]);
-  return n.getBytesCopy(
-    T.encodeFunctionData("permit", [
-      r.holder,
-      r.spender,
-      r.nonce,
-      r.expiry,
-      r.allowed,
-      y,
-      n.getBytesCopy(w),
-      n.getBytesCopy(u)
+  return o.getBytesCopy(
+    b.encodeFunctionData("permit", [
+      n.holder,
+      n.spender,
+      n.nonce,
+      n.expiry,
+      n.allowed,
+      u,
+      o.getBytesCopy(f),
+      o.getBytesCopy(g)
     ])
   ).slice(4);
 };
 export {
-  V as approveTokenToHinkal
+  z as approveTokenToHinkal
 };

package/functions/web3/functionCalls/approveTokensToHinkal.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("../../../constants/protocol.constants.cjs"),i=require("./approveToken.cjs"),p=async(t,s,c,o)=>{for(let e=0;e<o.length;e+=1){const n=o[e],r=c[e];n>0n&&r.erc20TokenAddress!==a.zeroAddress&&await i.approveTokenToHinkal(t,s,n,r)}};exports.approveTokensToHinkal=p;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("../../../constants/protocol.constants.cjs"),p=require("./approveToken.cjs"),T=async(t,s,c,a,o)=>{for(let e=0;e<o.length;e+=1){const n=o[e],r=a[e];n>0n&&r.erc20TokenAddress!==i.zeroAddress&&await p.approveTokenToHinkal(t,s,c,n,r)}};exports.approveTokensToHinkal=T;

package/functions/web3/functionCalls/approveTokensToHinkal.d.ts

@@ -1,4 +1,4 @@
 import { ethers } from 'ethers';
 import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
 import { ERC20Token } from '../../../types/token.types';
-export declare const approveTokensToHinkal: (hinkal: IHinkal, contractForApproval: ethers.Contract, tokensToApprove: ERC20Token[], amounts: bigint[]) => Promise<void>;
+export declare const approveTokensToHinkal: (hinkal: IHinkal, chainId: number, contractForApproval: ethers.Contract, tokensToApprove: ERC20Token[], amounts: bigint[]) => Promise<void>;

package/functions/web3/functionCalls/approveTokensToHinkal.mjs

@@ -1,11 +1,11 @@
-import { zeroAddress as i } from "../../../constants/protocol.constants.mjs";
-import { approveTokenToHinkal as p } from "./approveToken.mjs";
-const T = async (t, s, c, r) => {
+import { zeroAddress as p } from "../../../constants/protocol.constants.mjs";
+import { approveTokenToHinkal as a } from "./approveToken.mjs";
+const d = async (t, s, c, i, r) => {
   for (let o = 0; o < r.length; o += 1) {
-    const e = r[o], n = c[o];
-    e > 0n && n.erc20TokenAddress !== i && await p(t, s, e, n);
+    const e = r[o], n = i[o];
+    e > 0n && n.erc20TokenAddress !== p && await a(t, s, c, e, n);
   }
 };
 export {
-  T as approveTokensToHinkal
+  d as approveTokensToHinkal
 };

package/functions/web3/functionCalls/constructBatchCall.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("ethers"),f=require("../../../externalABIs/index.cjs"),v=(e,t)=>new i.ethers.Interface(f.ERC20ABI).encodeFunctionData("approve",[e,t]),g=(e,t,n,r)=>r.encodeFunctionData("transact",[e[0],e[1],e[2],t,n]),h=async(e,t,n,r,u,l,p,o)=>{const s=[];for(let a=0;a<e.length;a+=1){const c=e[a],d=t[a];c!==i.ethers.ZeroAddress&&d>0n&&s.push({to:c,value:"0x0",data:v(n,d)})}const A=await r.getAddress();return s.push({to:A,value:o>0n?`0x${o.toString(16)}`:"0x0",data:g(u,l,p,r.interface)}),s};exports.buildApproveAndTransactCalls=h;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("ethers"),v=require("../../../externalABIs/index.cjs"),A=require("../../utils/getContractAddress.cjs"),f=(e,t)=>new u.ethers.Interface(v.ERC20ABI).encodeFunctionData("approve",[e,t]),C=(e,t,o,n)=>n.encodeFunctionData("transact",[e[0],e[1],e[2],t,o]),g=(e,t,o,n,c)=>c.encodeFunctionData("prooflessDeposit",[e,t,o,n]),h=(e,t,o,n,c,l)=>{const d=[];for(let s=0;s<e.length;s+=1){const a=e[s],r=t[s];a!==u.ethers.ZeroAddress&&r>0n&&d.push({to:a,value:"0x0",data:f(o,r)})}return d.push({to:n,value:l>0n?`0x${l.toString(16)}`:"0x0",data:c}),d},b=(e,t,o,n,c,l,d,s)=>{const a=[];for(let r=0;r<e.length;r+=1){const i=e[r],p=t[r];i!==u.ethers.ZeroAddress&&p>0n&&a.push({to:i,value:"0x0",data:f(o,p)})}return a.push({to:A.getContractAddress(n),value:s>0n?`0x${s.toString(16)}`:"0x0",data:C(c,l,d,n.interface)}),a},x=(e,t,o,n,c,l,d,s,a)=>{const r=g(c,l,d,s,n.interface);return h(e,t,o,A.getContractAddress(n),r,a)};exports.buildApproveAndProoflessDepositCalls=x;exports.buildApproveAndTransactCalls=b;

package/functions/web3/functionCalls/constructBatchCall.d.ts

@@ -1,5 +1,6 @@
 import { ethers } from 'ethers';
-import { CircomDataBaseType, DimDataType } from '../../../types/circom-data.types';
+import { CircomDataType, DimDataType, StealthAddressStructure } from '../../../types/circom-data.types';
 import { NewZkCallDataType } from '../../../types/snark.types';
 import { Call } from '../../../types/eip5792.types';
-export declare const buildApproveAndTransactCalls: (tokenAddresses: string[], amounts: bigint[], spenderAddress: string, contractForTransaction: ethers.Contract, zkCallData: NewZkCallDataType, dimData: DimDataType, circomData: CircomDataBaseType, ethValue: bigint) => Promise<Call[]>;
+export declare const buildApproveAndTransactCalls: (tokenAddresses: string[], amounts: bigint[], spenderAddress: string, contractForTransaction: ethers.Contract, zkCallData: NewZkCallDataType, dimData: DimDataType, circomData: CircomDataType, ethValue: bigint) => Call[];
+export declare const buildApproveAndProoflessDepositCalls: (tokenAddresses: string[], amounts: bigint[], spenderAddress: string, contractForTransaction: ethers.Contract, prooflessDepositTokenAddresses: string[], prooflessDepositAmountChanges: bigint[], prooflessDepositTokenIds: bigint[], stealthAddressStructures: StealthAddressStructure[], ethValue: bigint) => Call[];

package/functions/web3/functionCalls/constructBatchCall.mjs

@@ -1,22 +1,59 @@
-import { ethers as i } from "ethers";
-import { ERC20ABI as A } from "../../../externalABIs/index.mjs";
-const m = (t, e) => new i.Interface(A).encodeFunctionData("approve", [t, e]), v = (t, e, n, o) => o.encodeFunctionData("transact", [t[0], t[1], t[2], e, n]), h = async (t, e, n, o, p, u, f, c) => {
-  const r = [];
-  for (let a = 0; a < t.length; a += 1) {
-    const s = t[a], d = e[a];
-    s !== i.ZeroAddress && d > 0n && r.push({
-      to: s,
+import { ethers as p } from "ethers";
+import { ERC20ABI as v } from "../../../externalABIs/index.mjs";
+import { getContractAddress as f } from "../../utils/getContractAddress.mjs";
+const A = (t, o) => new p.Interface(v).encodeFunctionData("approve", [t, o]), m = (t, o, n, e) => e.encodeFunctionData("transact", [t[0], t[1], t[2], o, n]), x = (t, o, n, e, c) => c.encodeFunctionData("prooflessDeposit", [
+  t,
+  o,
+  n,
+  e
+]), C = (t, o, n, e, c, l) => {
+  const d = [];
+  for (let r = 0; r < t.length; r += 1) {
+    const a = t[r], s = o[r];
+    a !== p.ZeroAddress && s > 0n && d.push({
+      to: a,
       value: "0x0",
-      data: m(n, d)
+      data: A(n, s)
     });
   }
-  const l = await o.getAddress();
-  return r.push({
-    to: l,
-    value: c > 0n ? `0x${c.toString(16)}` : "0x0",
-    data: v(p, u, f, o.interface)
-  }), r;
+  return d.push({
+    to: e,
+    value: l > 0n ? `0x${l.toString(16)}` : "0x0",
+    data: c
+  }), d;
+}, b = (t, o, n, e, c, l, d, r) => {
+  const a = [];
+  for (let s = 0; s < t.length; s += 1) {
+    const i = t[s], u = o[s];
+    i !== p.ZeroAddress && u > 0n && a.push({
+      to: i,
+      value: "0x0",
+      data: A(n, u)
+    });
+  }
+  return a.push({
+    to: f(e),
+    value: r > 0n ? `0x${r.toString(16)}` : "0x0",
+    data: m(c, l, d, e.interface)
+  }), a;
+}, I = (t, o, n, e, c, l, d, r, a) => {
+  const s = x(
+    c,
+    l,
+    d,
+    r,
+    e.interface
+  );
+  return C(
+    t,
+    o,
+    n,
+    f(e),
+    s,
+    a
+  );
 };
 export {
-  h as buildApproveAndTransactCalls
+  I as buildApproveAndProoflessDepositCalls,
+  b as buildApproveAndTransactCalls
 };

package/functions/web3/functionCalls/estimateGasRelayer.d.ts

@@ -1,5 +1,4 @@
-import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
-import { CircomDataBaseType, DimDataType } from '../../../types/circom-data.types';
+import { CircomDataType, DimDataType } from '../../../types/circom-data.types';
 import { NewZkCallDataType } from '../../../types/snark.types';
 import { type AuthorizationData } from '../../../types/hinkal.types';
-export declare const estimateGasRelayer: (hinkal: IHinkal, newZkCallData: NewZkCallDataType, dimData: DimDataType, circomData: CircomDataBaseType, authorizationData?: AuthorizationData) => Promise<bigint>;
+export declare const estimateGasRelayer: (chainId: number, newZkCallData: NewZkCallDataType, dimData: DimDataType, circomData: CircomDataType, authorizationData?: AuthorizationData) => Promise<bigint>;

package/functions/web3/functionCalls/recoverTransactionFromError.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("../../utils/time.utils.cjs");require("../../../types/circom-data.types.cjs");const s=require("../../../types/transactions.types.cjs");require("../../../types/activities.types.cjs");const n=1*1e3,u=30*1e3,l=async(t,e,i=0)=>{if((await t.getTransactionReceipt(e))?.status!==s.TransactionReceiptStatus.Succeeded)return;i>0&&await t.waitForTransaction(e,i);const c=u/n;let r=null;for(let a=0;a<c;a+=1){try{if(r=await t.getTransaction(e),r)break}catch{}a<c-1&&await o.waitLittle(n)}return r??void 0};exports.recoverTransactionFromError=l;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("../../utils/time.utils.cjs");require("../../../types/circom-data.types.cjs");require("../../../constants/chains.constants.cjs");const s=require("../../../types/transactions.types.cjs");require("../../../types/activities.types.cjs");const n=1*1e3,u=30*1e3,l=async(t,e,a=0)=>{if((await t.getTransactionReceipt(e))?.status!==s.TransactionReceiptStatus.Succeeded)return;a>0&&await t.waitForTransaction(e,a);const c=u/n;let r=null;for(let i=0;i<c;i+=1){try{if(r=await t.getTransaction(e),r)break}catch{}i<c-1&&await o.waitLittle(n)}return r??void 0};exports.recoverTransactionFromError=l;

package/functions/web3/functionCalls/recoverTransactionFromError.mjs

@@ -1,23 +1,24 @@
 import { waitLittle as n } from "../../utils/time.utils.mjs";
 import "../../../types/circom-data.types.mjs";
+import "../../../constants/chains.constants.mjs";
 import { TransactionReceiptStatus as s } from "../../../types/transactions.types.mjs";
 import "../../../types/activities.types.mjs";
-const c = 1 * 1e3, m = 30 * 1e3, L = async (t, e, i = 0) => {
+const c = 1 * 1e3, m = 30 * 1e3, l = async (t, e, i = 0) => {
   if ((await t.getTransactionReceipt(e))?.status !== s.Succeeded)
     return;
   i > 0 && await t.waitForTransaction(e, i);
   const o = m / c;
-  let a = null;
-  for (let r = 0; r < o; r += 1) {
+  let r = null;
+  for (let a = 0; a < o; a += 1) {
     try {
-      if (a = await t.getTransaction(e), a)
+      if (r = await t.getTransaction(e), r)
         break;
     } catch {
     }
-    r < o - 1 && await n(c);
+    a < o - 1 && await n(c);
   }
-  return a ?? void 0;
+  return r ?? void 0;
 };
 export {
-  L as recoverTransactionFromError
+  l as recoverTransactionFromError
 };

package/functions/web3/functionCalls/transactCallDirect.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const S=require("ethers"),b=require("../../../constants/protocol.constants.cjs"),F=require("../../../types/ethereum-network.types.cjs"),L=require("../../utils/time.utils.cjs"),N=require("./approveTokensToHinkal.cjs"),_=require("./constructBatchCall.cjs"),z=require("./recoverTransactionFromError.cjs"),G=require("../../utils/getContractAddress.cjs"),M=async(r,h,g,n,v,C,k,x,H=!0,u=!1)=>{const a=Array.isArray(h)?h:[h],e=Array.isArray(g)?g:[g];if(a.length!==e.length)throw new Error("token and amount length mismatch");const f=r.getContractWithSigner(F.ContractType.HinkalContract),B=await r.getEthereumAddress(),T=k??f,s=x??f,p="transact",y=e.findIndex(({erc20TokenAddress:t})=>t===b.zeroAddress),E=e.some(({erc20TokenAddress:t})=>t!==b.zeroAddress),A=y===-1?0n:a[y],w=r.getProviderAdapter();if(!u&&E&&await w.supportsBatchCall?.()&&w.sendBatchCallsTransaction){const t=e.map(I=>I.erc20TokenAddress),l=await _.buildApproveAndTransactCalls(t,a,G.getContractAddress(T),s,n,C,v,A);return await w.sendBatchCallsTransaction(l)}u||await N.approveTokensToHinkal(r,T,e,a);const q={value:A>0n?BigInt(A).toString():void 0,gasLimit:void 0};let o;const i=[n[0],n[1],n[2],C,v,{...q,from:B}],{runner:c}=s;if(!(c instanceof S.ethers.AbstractSigner))throw new Error("expected signer");if(H)try{o=Number(await s[p].estimateGas(...i)),console.log({gasCosts:o}),console.log({signerAddress:await c.getAddress(),chainIdHinkal:r.getCurrentChainId(),ethersNetwork:await c.provider.getNetwork()})}catch(t){console.log("hinkalDeposit: gas estimation error",{err:t})}const m=o&&o>=0?Math.ceil(o*12/10):void 0;q.gasLimit=m,m&&(i[5].gasLimit=m),await L.waitLittle();let d;try{u?d=await s[p].populateTransaction(...i):d=await s[p](...i)}catch(t){if(!t?.transactionHash)throw t;const l=await z.recoverTransactionFromError(c.provider,t.transactionHash);if(!l)throw t;d=l}return d};exports.transactCallDirect=M;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const G=require("ethers"),x=require("../../../constants/protocol.constants.cjs"),M=require("../../../types/ethereum-network.types.cjs"),N=require("../../utils/time.utils.cjs"),P=require("./approveTokensToHinkal.cjs"),j=require("./constructBatchCall.cjs"),O=require("./recoverTransactionFromError.cjs"),W=require("./waitForErc20Approvals.cjs"),F=require("../../utils/getContractAddress.cjs"),J=async(o,r,p,u,c,w,C,H,S,k=!0,A=!1)=>{const n=Array.isArray(p)?p:[p],e=Array.isArray(u)?u:[u];if(n.length!==e.length)throw new Error("token and amount length mismatch");const f=o.getContractWithSigner(r,M.ContractType.HinkalContract),y=await o.getEthereumAddressByChain(r),g=H??f,a=S??f,h="transact",T=e.findIndex(({erc20TokenAddress:t})=>t===x.zeroAddress),q=e.some(({erc20TokenAddress:t})=>t!==x.zeroAddress),m=T===-1?0n:n[T],v=o.getProviderAdapter(r),L=await v.supportsBatchCall?.(r);if(!A&&q&&L&&v.sendBatchCallsTransaction){const t=e.map(z=>z.erc20TokenAddress),s=j.buildApproveAndTransactCalls(t,n,F.getContractAddress(g),a,c,C,w,m);return await v.sendBatchCallsTransaction(r,s)}if(!A&&(await P.approveTokensToHinkal(o,r,g,e,n),q)){const t=e.map(({erc20TokenAddress:s},b)=>({tokenAddress:s,requiredAmount:n[b]}));await W.waitForErc20Approvals(o,r,y,F.getContractAddress(g),t)}const _={value:m>0n?BigInt(m).toString():void 0,gasLimit:void 0};let i;const d=[c[0],c[1],c[2],C,w,{..._,from:y}],{runner:B}=a;if(!(B instanceof G.ethers.AbstractSigner))throw new Error("expected signer");if(k)try{i=Number(await a[h].estimateGas(...d))}catch(t){console.log("hinkalDeposit: gas estimation error",{err:t})}const E=i&&i>=0?Math.ceil(i*12/10):void 0;E&&(d[5].gasLimit=E),await N.waitLittle();let l;try{A?l=await a[h].populateTransaction(...d):l=await a[h](...d)}catch(t){if(!t?.transactionHash)throw t;const s=await O.recoverTransactionFromError(B.provider,t.transactionHash);if(!s)throw t;l=s}return l};exports.transactCallDirect=J;

package/functions/web3/functionCalls/transactCallDirect.d.ts

@@ -1,6 +1,6 @@
 import { ethers } from 'ethers';
 import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
-import { CircomDataBaseType, DimDataType } from '../../../types/circom-data.types';
+import { CircomDataType, DimDataType } from '../../../types/circom-data.types';
 import { ERC20Token } from '../../../types/token.types';
 import { NewZkCallDataType } from '../../../types/snark.types';
-export declare const transactCallDirect: (hinkal: IHinkal, amount: bigint | bigint[], tokenToApprove: ERC20Token | ERC20Token[], newZkCallData: NewZkCallDataType, circomData: CircomDataBaseType, dimData: DimDataType, contractApproval?: ethers.Contract, contractTransaction?: ethers.Contract, preEstimateGas?: boolean, returnTxData?: boolean) => Promise<any>;
+export declare const transactCallDirect: (hinkal: IHinkal, chainId: number, amount: bigint | bigint[], tokenToApprove: ERC20Token | ERC20Token[], newZkCallData: NewZkCallDataType, circomData: CircomDataType, dimData: DimDataType, contractApproval?: ethers.Contract, contractTransaction?: ethers.Contract, preEstimateGas?: boolean, returnTxData?: boolean) => Promise<ethers.TransactionResponse | ethers.TransactionRequest>;

package/functions/web3/functionCalls/transactCallDirect.mjs

@@ -1,70 +1,79 @@
-import { ethers as F } from "ethers";
-import { zeroAddress as H } from "../../../constants/protocol.constants.mjs";
+import { ethers as M } from "ethers";
+import { zeroAddress as F } from "../../../constants/protocol.constants.mjs";
 import { ContractType as N } from "../../../types/ethereum-network.types.mjs";
-import { waitLittle as S } from "../../utils/time.utils.mjs";
-import { approveTokensToHinkal as G } from "./approveTokensToHinkal.mjs";
-import { buildApproveAndTransactCalls as z } from "./constructBatchCall.mjs";
-import { recoverTransactionFromError as M } from "./recoverTransactionFromError.mjs";
-import { getContractAddress as P } from "../../utils/getContractAddress.mjs";
-const V = async (r, l, p, a, v, C, I, b, B = !0, h = !1) => {
-  const n = Array.isArray(l) ? l : [l], o = Array.isArray(p) ? p : [p];
-  if (n.length !== o.length)
+import { waitLittle as P } from "../../utils/time.utils.mjs";
+import { approveTokensToHinkal as W } from "./approveTokensToHinkal.mjs";
+import { buildApproveAndTransactCalls as j } from "./constructBatchCall.mjs";
+import { recoverTransactionFromError as J } from "./recoverTransactionFromError.mjs";
+import { waitForErc20Approvals as K } from "./waitForErc20Approvals.mjs";
+import { getContractAddress as H } from "../../utils/getContractAddress.mjs";
+const I = async (e, r, d, l, i, w, u, L, S, q = !0, f = !1) => {
+  const a = Array.isArray(d) ? d : [d], o = Array.isArray(l) ? l : [l];
+  if (a.length !== o.length)
     throw new Error("token and amount length mismatch");
-  const u = r.getContractWithSigner(N.HinkalContract), E = await r.getEthereumAddress(), y = I ?? u, e = b ?? u, g = "transact", T = o.findIndex(({ erc20TokenAddress: t }) => t === H), L = o.some(({ erc20TokenAddress: t }) => t !== H), f = T === -1 ? 0n : n[T], A = r.getProviderAdapter();
-  if (!h && L && await A.supportsBatchCall?.() && A.sendBatchCallsTransaction) {
-    const t = o.map((k) => k.erc20TokenAddress), m = await z(
+  const C = e.getContractWithSigner(r, N.HinkalContract), y = await e.getEthereumAddressByChain(r), A = L ?? C, n = S ?? C, h = "transact", T = o.findIndex(({ erc20TokenAddress: t }) => t === F), x = o.some(({ erc20TokenAddress: t }) => t !== F), g = T === -1 ? 0n : a[T], v = e.getProviderAdapter(r), G = await v.supportsBatchCall?.(r);
+  if (!f && x && G && v.sendBatchCallsTransaction) {
+    const t = o.map((z) => z.erc20TokenAddress), s = j(
       t,
+      a,
+      H(A),
       n,
-      P(y),
+      i,
+      u,
+      w,
+      g
+    );
+    return await v.sendBatchCallsTransaction(r, s);
+  }
+  if (!f && (await W(e, r, A, o, a), x)) {
+    const t = o.map(({ erc20TokenAddress: s }, b) => ({
+      tokenAddress: s,
+      requiredAmount: a[b]
+    }));
+    await K(
       e,
-      a,
-      C,
-      v,
-      f
+      r,
+      y,
+      H(A),
+      t
     );
-    return await A.sendBatchCallsTransaction(m);
   }
-  h || await G(r, y, o, n);
-  const x = {
-    value: f > 0n ? BigInt(f).toString() : void 0,
+  const k = {
+    value: g > 0n ? BigInt(g).toString() : void 0,
     gasLimit: void 0
   };
-  let s;
-  const i = [
-    a[0],
-    a[1],
-    a[2],
-    C,
-    v,
-    { ...x, from: E }
-  ], { runner: c } = e;
-  if (!(c instanceof F.AbstractSigner))
+  let c;
+  const m = [
+    i[0],
+    i[1],
+    i[2],
+    u,
+    w,
+    { ...k, from: y }
+  ], { runner: B } = n;
+  if (!(B instanceof M.AbstractSigner))
     throw new Error("expected signer");
-  if (B)
+  if (q)
     try {
-      s = Number(await e[g].estimateGas(...i)), console.log({ gasCosts: s }), console.log({
-        signerAddress: await c.getAddress(),
-        chainIdHinkal: r.getCurrentChainId(),
-        ethersNetwork: await c.provider.getNetwork()
-      });
+      c = Number(await n[h].estimateGas(...m));
     } catch (t) {
       console.log("hinkalDeposit: gas estimation error", { err: t });
     }
-  const w = s && s >= 0 ? Math.ceil(s * 12 / 10) : void 0;
-  x.gasLimit = w, w && (i[5].gasLimit = w), await S();
-  let d;
+  const E = c && c >= 0 ? Math.ceil(c * 12 / 10) : void 0;
+  E && (m[5].gasLimit = E), await P();
+  let p;
   try {
-    h ? d = await e[g].populateTransaction(...i) : d = await e[g](...i);
+    f ? p = await n[h].populateTransaction(...m) : p = await n[h](...m);
   } catch (t) {
     if (!t?.transactionHash)
       throw t;
-    const m = await M(c.provider, t.transactionHash);
-    if (!m)
+    const s = await J(B.provider, t.transactionHash);
+    if (!s)
       throw t;
-    d = m;
+    p = s;
   }
-  return d;
+  return p;
 };
 export {
-  V as transactCallDirect
+  I as transactCallDirect
 };

package/functions/web3/functionCalls/transactCallDirectTron.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const L=require("../../../constants/chains.constants.cjs"),N=require("../../utils/tronSimulation.utils.cjs"),n=require("../../utils/tron.utils.cjs"),P=require("../../utils/caseInsensitive.utils.cjs"),W=require("../../../externalABIs/index.cjs"),j=require("./waitForErc20Approvals.cjs"),z=require("../../../constants/protocol.constants.cjs"),D=async(w,d,e,A,v,f,s,q,y,S=!0)=>{const t=w.getTronWeb(),b="transact",l=n.evmHexToTronBase58Address(A.erc20TokenAddress),r=await w.getEthereumAddressByChain(d),{hinkalAddress:R,hinkalABI:F}=L.networkRegistry[d].contractData,T=t.contract(F,n.evmHexToTronBase58Address(R)),g=q??T,a=y??T;if(!g.address)throw new Error("contractForApproval address not set");if(!a.address)throw new Error("contractForTransaction address not set");const p=P.caseInsensitiveEqual(A.erc20TokenAddress,z.zeroAddress);if(!p&&e>0n){const i=g.address;if(!i)throw new Error("token approval spender not set");const u=e,_=await t.contract(W.ERC20ABI,l).allowance(r,i).call({from:r});if(BigInt(String(_))<u){const{transaction:I}=await t.transactionBuilder.triggerSmartContract(l,"approve(address,uint256)",{feeLimit:1e8},[{type:"address",value:i},{type:"uint256",value:u.toString()}],r),H=await t.trx.sign(I);if(!(await t.trx.sendRawTransaction(H)).result)throw new Error("Tron token approval failed");await j.waitForTronErc20Approvals(t,r,i,[{tokenAddress:l,requiredAmount:u}])}}const{a:m,b:k,c:x}=n.parseZkCalldata(v),c=await n.reorderZkCallData(!0,v,s,f,!1);if(!c)throw new Error("Tron proof signature not found");const E=[c.v,c.r,c.s],h=[s.tokenNumber,s.nullifierAmount,s.outputAmount],C=n.circomDataToArray(f);S&&await N.simulateTronTransaction(d,a.address,b,a.abi,[E,m,k,x,h,C],r,p?e:0n);const o=await a.transact(E,m,k,x,h,C).send({feeLimit:1e9,callValue:p?Number(e):0}),B=typeof o=="string"?o:o?.txid??o?.transaction?.txID??o?.transaction?.txid;if(!B)throw new Error("Tron transact failed (missing txid)");return B};exports.transactCallDirectTron=D;

package/functions/web3/functionCalls/transactCallDirectTron.d.ts

@@ -0,0 +1,6 @@
+import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
+import { CircomDataType, DimDataType } from '../../../types/circom-data.types';
+import { NewZkCallDataType } from '../../../types/snark.types';
+import { ERC20Token } from '../../../types/token.types';
+import { ContractInstance } from 'tronweb/lib/esm/types';
+export declare const transactCallDirectTron: (hinkal: IHinkal, chainId: number, amount: bigint, tokenToApprove: ERC20Token, newZkCallData: NewZkCallDataType, circomData: CircomDataType, dimData: DimDataType, contractApproval?: ContractInstance<any>, contractTransaction?: ContractInstance<any>, preEstimateGas?: boolean) => Promise<string>;

package/functions/web3/functionCalls/transactCallDirectTron.mjs

@@ -0,0 +1,63 @@
+import { networkRegistry as W } from "../../../constants/chains.constants.mjs";
+import { simulateTronTransaction as z } from "../../utils/tronSimulation.utils.mjs";
+import { evmHexToTronBase58Address as B, parseZkCalldata as H, reorderZkCallData as P, circomDataToArray as V } from "../../utils/tron.utils.mjs";
+import { caseInsensitiveEqual as Z } from "../../utils/caseInsensitive.utils.mjs";
+import { ERC20ABI as j } from "../../../externalABIs/index.mjs";
+import { waitForTronErc20Approvals as D } from "./waitForErc20Approvals.mjs";
+import { zeroAddress as G } from "../../../constants/protocol.constants.mjs";
+const or = async (w, c, n, f, u, m, e, y, R, b = !0) => {
+  const r = w.getTronWeb(), S = "transact", p = B(f.erc20TokenAddress), t = await w.getEthereumAddressByChain(c), { hinkalAddress: F, hinkalABI: I } = W[c].contractData, A = r.contract(I, B(F)), v = y ?? A, a = R ?? A;
+  if (!v.address)
+    throw new Error("contractForApproval address not set");
+  if (!a.address)
+    throw new Error("contractForTransaction address not set");
+  const d = Z(f.erc20TokenAddress, G);
+  if (!d && n > 0n) {
+    const i = v.address;
+    if (!i)
+      throw new Error("token approval spender not set");
+    const l = n, q = await r.contract(j, p).allowance(t, i).call({
+      from: t
+    });
+    if (BigInt(String(q)) < l) {
+      const { transaction: L } = await r.transactionBuilder.triggerSmartContract(
+        p,
+        "approve(address,uint256)",
+        { feeLimit: 1e8 },
+        [
+          { type: "address", value: i },
+          { type: "uint256", value: l.toString() }
+        ],
+        t
+      ), N = await r.trx.sign(L);
+      if (!(await r.trx.sendRawTransaction(N)).result)
+        throw new Error("Tron token approval failed");
+      await D(r, t, i, [
+        { tokenAddress: p, requiredAmount: l }
+      ]);
+    }
+  }
+  const { a: g, b: T, c: k } = H(u), s = await P(!0, u, e, m, !1);
+  if (!s)
+    throw new Error("Tron proof signature not found");
+  const x = [s.v, s.r, s.s], E = [e.tokenNumber, e.nullifierAmount, e.outputAmount], h = V(m);
+  b && await z(
+    c,
+    a.address,
+    S,
+    a.abi,
+    [x, g, T, k, E, h],
+    t,
+    d ? n : 0n
+  );
+  const o = await a.transact(x, g, T, k, E, h).send({
+    feeLimit: 1e9,
+    callValue: d ? Number(n) : 0
+  }), C = typeof o == "string" ? o : o?.txid ?? o?.transaction?.txID ?? o?.transaction?.txid;
+  if (!C)
+    throw new Error("Tron transact failed (missing txid)");
+  return C;
+};
+export {
+  or as transactCallDirectTron
+};

package/functions/web3/functionCalls/transactCallRelayer.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../../error-handling/error-codes.constants.cjs");require("ethers");const y=require("../../../error-handling/customErrors/ErrorWithTx.cjs");require("../../../types/circom-data.types.cjs");require("../../../types/activities.types.cjs");const R=require("../../../constants/server.constants.cjs");require("../../../API/getServerURL.cjs");const C=require("../../../data-structures/http/HttpClient.cjs");require("axios");require("../../../constants/chains.constants.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../../constants/vite.constants.cjs");require("../../../constants/save-depths.cjs");require("../../../constants/reorg-depths.constants.cjs");require("../../utils/mutexes.utils.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("../../../data-structures/crypto-keys/keys.cjs");const l=require("../../../API/callRelayer.cjs"),q=require("../../snarkjs/common.snarkjs.cjs");require("node-forge");require("../../../constants/token-data/index.cjs");require("idb-keyval");require("../../utils/convertIntegrationProviderToExternalActionId.cjs");const w=require("../../../API/getRelayerURL.cjs");require("@solana/spl-token");require("../../../constants/contracts.constants.cjs");require("../../../constants/kyc.constants.cjs");require("../../../constants/coingecko.constants.cjs");require("../../../constants/addresses.constants.cjs");require("../../../constants/token.limits.constants.cjs");require("../../../constants/presale.constants.cjs");require("../../../constants/activity.constants.cjs");require("../../../constants/tasks.constants.cjs");require("../../../constants/events.constants.cjs");require("../../utils/userAgent.cjs");require("multiformats");require("../../../API/tenderly.api.cjs");const m=r=>{if(r.status==="success")return r.message;throw r.message&&r.error?new y.ErrorWithRelayerTransaction(r.error,r.message):new Error(r.error)},D=async(r,a,t,i,c,s,n,o)=>{const e=q.serializeCircomData(i),u=await l.callRelayerTransactAPI(r,{a:a[0],b:a[1],c:a[2],dimData:t,circomData:e,withPrivateMempool:c,withUniswapWorkAround:s,authorizationData:n,adminData:o});return m(u)},T=async(r,a)=>{const t=await C.httpClient.post(`${w.getRelayerURL(r)}${R.RELAYER_CONFIG.SOLANA_TRANSACT}`,a);return m(t)},h=r=>{if(r.status==="success")return r.message.scheduleId;throw new Error(r.error||"Batch transaction failed")},d=async(r,a,t,i,c)=>{const s=a.map(e=>q.serializeCircomData(e.circomData)),n={transactions:a.map((e,u)=>({a:e.zkCallData[0],b:e.zkCallData[1],c:e.zkCallData[2],dimData:e.dimData,circomData:s[u],withPrivateMempool:e.withPrivateMempool,withUniswapWorkAround:e.withUniswapWorkAround,authorizationData:e.authorizationData,adminData:e.adminData})),txCompletionTime:i,hashedEthereumAddress:t,ref:c},o=await l.callRelayerTransactBatchAPI(r,n);return h(o)},A=async(r,a,t,i,c)=>{const s={transactions:a,hashedEthereumAddress:t,txCompletionTime:i,ref:c},n=await l.callRelayerSolanaTransactBatchAPI(r,s);return h(n)};exports.solanaTransactCallRelayer=T;exports.solanaTransactCallRelayerBatch=A;exports.transactCallRelayer=D;exports.transactCallRelayerBatch=d;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../../error-handling/error-codes.constants.cjs");require("ethers");const y=require("../../../error-handling/customErrors/ErrorWithTx.cjs");require("../../../types/circom-data.types.cjs");require("../../../constants/chains.constants.cjs");require("../../../types/activities.types.cjs");require("../../../constants/vite.constants.cjs");const l=require("../../../API/callRelayer.cjs");require("circomlibjs-hinkal-fork");require("../../../data-structures/crypto-keys/keys.cjs");const q=require("../../snarkjs/common.snarkjs.cjs");require("node-forge");require("libsodium-wrappers");const R=require("../../../data-structures/http/HttpClient.cjs");require("axios");require("../../../constants/token-data/index.cjs");require("../../../constants/tokens.constants.cjs");require("idb-keyval");require("@solana/web3.js");require("../../utils/convertIntegrationProviderToExternalActionId.cjs");const d=require("../../../constants/server.constants.cjs"),C=require("../../../API/getServerURL.cjs");require("tronweb");require("@coral-xyz/anchor");require("@solana/spl-token");require("tweetnacl");require("bs58");require("buffer");require("lodash");require("../../../API/enclaveUtxoCalls.cjs");require("../../../constants/contracts.constants.cjs");require("../../../constants/kyc.constants.cjs");require("../../../constants/coingecko.constants.cjs");require("../../../constants/reorg-depths.constants.cjs");require("../../../constants/addresses.constants.cjs");require("../../../constants/token.limits.constants.cjs");require("../../../constants/presale.constants.cjs");require("../../../constants/activity.constants.cjs");require("../../../constants/tasks.constants.cjs");require("../../../constants/events.constants.cjs");require("../../../constants/schedule.constants.cjs");require("../../utils/userAgent.cjs");require("multiformats");require("async-mutex");require("process");require("../../../providers/EthersProviderAdapter.cjs");const m=r=>{if(r.status==="success")return r.message;throw r.message&&r.error?new y.ErrorWithRelayerTransaction(r.error,r.message):new Error(r.error)},A=async(r,a,t,i,c,s,n,o)=>{const e=q.serializeCircomData(i),u=await l.callRelayerTransactAPI({chainId:r,a:a[0],b:a[1],c:a[2],dimData:t,circomData:e,withUniswapWorkAround:c,authorizationData:s,adminData:n,tronProofSignature:o});return m(u)},D=async r=>{const a=await R.httpClient.post(`${C.RELAYER_URL}${d.RELAYER_CONFIG.SOLANA_TRANSACT}`,r);return m(a)},h=r=>{if(r.status==="success")return r.message.scheduleId;throw new Error(r.error||"Batch transaction failed")},T=async(r,a,t,i,c)=>{const s=a.map(e=>q.serializeCircomData(e.circomData)),n={chainId:r,transactions:a.map((e,u)=>({chainId:r,a:e.zkCallData[0],b:e.zkCallData[1],c:e.zkCallData[2],dimData:e.dimData,circomData:s[u],withUniswapWorkAround:e.withUniswapWorkAround,authorizationData:e.authorizationData,adminData:e.adminData,recipientAddress:e.recipientAddress,tronProofSignature:e.tronProofSignature})),txCompletionTime:i,hashedEthereumAddress:t,ref:c},o=await l.callRelayerTransactBatchAPI(n);return h(o)},w=async(r,a,t,i,c)=>{const s={chainId:r,transactions:a,hashedEthereumAddress:t,txCompletionTime:i,ref:c},n=await l.callRelayerSolanaTransactBatchAPI(s);return h(n)};exports.solanaTransactCallRelayer=D;exports.solanaTransactCallRelayerBatch=w;exports.transactCallRelayer=A;exports.transactCallRelayerBatch=T;