h_test_1 0.0.11 → 0.0.13

package/functions/web3/functionCalls/transactCallDirect.cjs

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

package/functions/web3/functionCalls/transactCallDirect.mjs

@@ -6,42 +6,42 @@ import { approveTokensToHinkal as L } 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, m, a, A, w, y, H, I = !0, b = !1) => {
+const V = async (r, l, m, a, w, v, H, I, b = !0, p = !1) => {
   const n = Array.isArray(l) ? l : [l], o = Array.isArray(m) ? m : [m];
   if (n.length !== o.length)
     throw new Error("token and amount length mismatch");
-  const v = r.getContractWithSigner(S.HinkalContract), B = await r.getEthereumAddress(), u = y ?? v, e = H ?? v, p = "transact", C = o.findIndex(({ erc20TokenAddress: t }) => t === x), E = o.some(({ erc20TokenAddress: t }) => t !== x), h = C === -1 ? 0n : n[C], g = r.getProviderAdapter();
-  if (E && await g.supportsBatchCall?.() && g.sendBatchCallsTransaction) {
+  const C = r.getContractWithSigner(S.HinkalContract), B = await r.getEthereumAddress(), u = H ?? C, e = I ?? C, h = "transact", y = o.findIndex(({ erc20TokenAddress: t }) => t === x), E = o.some(({ erc20TokenAddress: t }) => t !== x), g = y === -1 ? 0n : n[y], f = r.getProviderAdapter();
+  if (!p && E && await f.supportsBatchCall?.() && f.sendBatchCallsTransaction) {
     const t = o.map((F) => F.erc20TokenAddress), d = await z(
       t,
       n,
       P(u),
       e,
       a,
+      v,
       w,
-      A,
-      h
+      g
     );
-    return await g.sendBatchCallsTransaction(d);
+    return await f.sendBatchCallsTransaction(d);
   }
-  await L(r, u, o, n);
+  p || await L(r, u, o, n);
   const T = {
-    value: h > 0n ? BigInt(h).toString() : void 0
+    value: g > 0n ? BigInt(g).toString() : void 0
   };
   let s;
-  const f = [
+  const A = [
     a[0],
     a[1],
     a[2],
+    v,
     w,
-    A,
     { ...T, from: B }
   ], { runner: i } = e;
   if (!(i instanceof N.AbstractSigner))
     throw new Error("expected signer");
-  if (I)
+  if (b)
     try {
-      s = Number(await e[p].estimateGas(...f)), console.log({ gasCosts: s }), console.log({
+      s = Number(await e[h].estimateGas(...A)), console.log({ gasCosts: s }), console.log({
         signerAddress: await i.getAddress(),
         chainIdHinkal: r.getCurrentChainId(),
         ethersNetwork: await i.provider.getNetwork()
@@ -53,7 +53,7 @@ const V = async (r, l, m, a, A, w, y, H, I = !0, b = !1) => {
   T.gasLimit = k, await G();
   let c;
   try {
-    b ? c = await e[p].populateTransaction(...f) : c = await e[p](...f);
+    p ? c = await e[h].populateTransaction(...A) : c = await e[h](...A);
   } catch (t) {
     if (!t?.transactionHash)
       throw t;

package/package.json

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