@hinkal/common 0.2.31 → 0.2.32

package/data-structures/Hinkal/handleAutoDepositBack.cjs

@@ -1 +1 @@
-const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../types/transactions.types.cjs`),r=require(`../../types/admin.types.cjs`),i=require(`../../types/activities.types.cjs`),a=require(`../../types/transaction.types.cjs`),o=require(`../../types/offscreen.types.cjs`);require(`../../types/index.cjs`);const s=require(`../../functions/utils/caseInsensitive.utils.cjs`),c=require(`../../API/API.cjs`),l=require(`../../error-handling/error-codes.constants.cjs`),u=require(`../../functions/web3/etherFunctions.cjs`),d=require(`../../functions/utils/erc20tokenFunctions.cjs`),f=require(`../../functions/utils/time.utils.cjs`),p=require(`../../error-handling/customErrors/ErrorWithTx.cjs`),m=require(`../../error-handling/logger.cjs`),h=require(`../../functions/utils/fees.utils.cjs`),g=require(`../../functions/utils/create-provider.cjs`),_=require(`../../error-handling/get-error.message.cjs`);require(`../../error-handling/index.cjs`);const v=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),y=require(`../../functions/pre-transaction/getFeeStructure.cjs`),b=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),x=require(`../../functions/utils/postToOffscreen.cjs`),S=require(`../../functions/private-wallet/emporium.helpers.cjs`),C=require(`../../functions/auto-deposit-back-helpers/get-tokens-to-deposit-back.cjs`),w=require(`../../functions/auto-deposit-back-helpers/get-gas-token-records.cjs`),T=require(`../../functions/auto-deposit-back-helpers/select-gas-token.cjs`),ee=require(`../../functions/auto-deposit-back-helpers/update-hinkal.cjs`);require(`../../functions/index.cjs`);const E=require(`../IndexedDB/activity-db.cjs`);require(`../IndexedDB/index.cjs`);var D=3*1e3,O=13*1e3,k=async(k,A,j,M,N,P,F,I)=>{if(!j||F.length===0)return;let L;try{let a=g.createCustomRpcProvider(A);await f.waitLittle(A===t.chainIds.ethMainnet?O:D);let p=await C.getTokensToDepositBack(F,N,j,a);if(!p.length){x.postToOffscreen(o.MessagesFromOffscreen.AutoShieldTxStatus,{message:l.transactionErrorCodes.AUTO_SHIELD_SKIPPED});return}let m=h.getGasTokenSymbols(A).map(e=>d.getERC20TokenBySymbol(e,A)).filter(e=>e!==void 0),{prices:_}=await c.API.getTokenPrices(A,m.map(e=>e.erc20TokenAddress)),R=new Map(_.map((e,t)=>[m[t].erc20TokenAddress.toLowerCase(),e])),z=p.map(({token:e})=>e),B=p.map(({balance:e})=>e),V=z.map(({erc20TokenAddress:e})=>e),H=S.createTransaferEmporiumOpsBatch(k,A,V,await v.modifyVolatileTokenAmountChanges(A,z,B,j)),U=await y.getFeeStructure(A,N,V,e.ExternalActionId.Emporium,H.map(e=>b.convertEmporiumOpToCallInfo(e,j,A))),{flatFee:W}=U??{},G=d.getERC20Token(U.feeToken,A);if(!G)return;let K=u.getAmountInToken(G,W),q=(R.get(G.erc20TokenAddress.toLowerCase())??0)*Number(K),J=await T.selectGasToken(N,q,A,z,H,await w.getGasTokenRecords(m,A,k,j,a,R),U,V,j);if(!J)return;let{feeToken:Y,feeStructure:X}=J??{};if(P&&Number(P)<q){x.postToOffscreen(o.MessagesFromOffscreen.AutoShieldTxStatus,{message:l.gasErrorCodes.GAS_PRICE_EXCEEDS_AUTOSHIELD_LIMIT});return}let Z=z.findIndex(e=>s.caseInsensitiveEqual(e.erc20TokenAddress,Y));Z!==-1&&(B[Z]-=X?.flatFee??0n);let{hinkalAddress:Q}=t.networkRegistry[A].contractData,$={activityType:i.ActivityTypes.AUTO_SHIELD,chainId:A,from:j,to:Q,gasInDollar:q.toString(),tokensReceive:z.map((e,t)=>({amount:u.getAmountInToken(e,B[t]),token:e}))};L=await E.activityStorage.saveTxRequest($),x.postToOffscreen(o.MessagesFromOffscreen.AutoShieldTxStatus,{status:n.TransactionStatus.Loading}),ee.updateHinkal(I,A,k);let te={id:0,success:!0,txHash:await k.actionReceive(z,B,Y,X,M,r.AdminTransactionType.AutoShield)};await E.activityStorage.updatePendingTransactions(te,L),x.postToOffscreen(o.MessagesFromOffscreen.AutoShieldTxStatus,{status:n.TransactionStatus.Confirmed,activityRequest:$})}catch(e){let t;e instanceof p.ErrorWithRelayerTransaction&&(t=e.txHash);let r={error:e,id:0,success:!1,...t?{erroredTx:t}:{}};L&&await E.activityStorage.updatePendingTransactions(r,L),x.postToOffscreen(o.MessagesFromOffscreen.AutoShieldTxStatus,{status:n.TransactionStatus.Failed,error:_.getErrorMessageFromTransactionRequest(e,a.TransactionRequestType.ReceiveFromShieldedAccount)}),m.Logger.error(`Error in auto deposit back:`,e)}};exports.handleAutoDepositBack=k;
+const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../types/transactions.types.cjs`),r=require(`../../types/admin.types.cjs`),i=require(`../../types/activities.types.cjs`),a=require(`../../types/transaction.types.cjs`),o=require(`../../types/offscreen.types.cjs`);require(`../../types/index.cjs`);const s=require(`../../functions/utils/caseInsensitive.utils.cjs`),c=require(`../../API/API.cjs`),l=require(`../../error-handling/error-codes.constants.cjs`),u=require(`../../functions/web3/etherFunctions.cjs`),d=require(`../../functions/utils/erc20tokenFunctions.cjs`),f=require(`../../functions/utils/time.utils.cjs`),p=require(`../../error-handling/customErrors/ErrorWithTx.cjs`),m=require(`../../error-handling/logger.cjs`),h=require(`../../functions/utils/create-provider.cjs`),g=require(`../../error-handling/get-error.message.cjs`);require(`../../error-handling/index.cjs`);const _=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),v=require(`../../functions/pre-transaction/getFeeStructure.cjs`),y=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),b=require(`../../functions/utils/postToOffscreen.cjs`),x=require(`../../functions/utils/fees.utils.cjs`),S=require(`../../functions/private-wallet/emporium.helpers.cjs`),C=require(`../../functions/auto-deposit-back-helpers/get-tokens-to-deposit-back.cjs`),w=require(`../../functions/auto-deposit-back-helpers/get-gas-token-records.cjs`),T=require(`../../functions/auto-deposit-back-helpers/select-gas-token.cjs`),ee=require(`../../functions/auto-deposit-back-helpers/update-hinkal.cjs`);require(`../../functions/index.cjs`);const E=require(`../IndexedDB/activity-db.cjs`);require(`../IndexedDB/index.cjs`);var D=3*1e3,O=13*1e3,k=async(k,A,j,M,N,P,F,I)=>{if(!j||F.length===0)return;let L;try{let a=h.createJsonRpcProvider(A);await f.waitLittle(A===t.chainIds.ethMainnet?O:D);let p=await C.getTokensToDepositBack(F,N,j,a);if(!p.length){b.postToOffscreen(o.MessagesFromOffscreen.AutoShieldTxStatus,{message:l.transactionErrorCodes.AUTO_SHIELD_SKIPPED});return}let m=x.getGasTokenSymbols(A).map(e=>d.getERC20TokenBySymbol(e,A)).filter(e=>e!==void 0),{prices:g}=await c.API.getTokenPrices(A,m.map(e=>e.erc20TokenAddress)),R=new Map(g.map((e,t)=>[m[t].erc20TokenAddress.toLowerCase(),e])),z=p.map(({token:e})=>e),B=p.map(({balance:e})=>e),V=z.map(({erc20TokenAddress:e})=>e),H=S.createTransaferEmporiumOpsBatch(k,A,V,await _.modifyVolatileTokenAmountChanges(A,z,B,j)),U=await v.getFeeStructure(A,N,V,e.ExternalActionId.Emporium,H.map(e=>y.convertEmporiumOpToCallInfo(e,j,A))),{flatFee:W}=U??{},G=d.getERC20Token(U.feeToken,A);if(!G)return;let K=u.getAmountInToken(G,W),q=(R.get(G.erc20TokenAddress.toLowerCase())??0)*Number(K),J=await T.selectGasToken(N,q,A,z,H,await w.getGasTokenRecords(m,A,k,j,a,R),U,V,j);if(!J)return;let{feeToken:Y,feeStructure:X}=J??{};if(P&&Number(P)<q){b.postToOffscreen(o.MessagesFromOffscreen.AutoShieldTxStatus,{message:l.gasErrorCodes.GAS_PRICE_EXCEEDS_AUTOSHIELD_LIMIT});return}let Z=z.findIndex(e=>s.caseInsensitiveEqual(e.erc20TokenAddress,Y));Z!==-1&&(B[Z]-=X?.flatFee??0n);let{hinkalAddress:Q}=t.networkRegistry[A].contractData,$={activityType:i.ActivityTypes.AUTO_SHIELD,chainId:A,from:j,to:Q,gasInDollar:q.toString(),tokensReceive:z.map((e,t)=>({amount:u.getAmountInToken(e,B[t]),token:e}))};L=await E.activityStorage.saveTxRequest($),b.postToOffscreen(o.MessagesFromOffscreen.AutoShieldTxStatus,{status:n.TransactionStatus.Loading}),ee.updateHinkal(I,A,k);let te={id:0,success:!0,txHash:await k.actionReceive(z,B,Y,X,M,r.AdminTransactionType.AutoShield)};await E.activityStorage.updatePendingTransactions(te,L),b.postToOffscreen(o.MessagesFromOffscreen.AutoShieldTxStatus,{status:n.TransactionStatus.Confirmed,activityRequest:$})}catch(e){let t;e instanceof p.ErrorWithRelayerTransaction&&(t=e.txHash);let r={error:e,id:0,success:!1,...t?{erroredTx:t}:{}};L&&await E.activityStorage.updatePendingTransactions(r,L),b.postToOffscreen(o.MessagesFromOffscreen.AutoShieldTxStatus,{status:n.TransactionStatus.Failed,error:g.getErrorMessageFromTransactionRequest(e,a.TransactionRequestType.ReceiveFromShieldedAccount)}),m.Logger.error(`Error in auto deposit back:`,e)}};exports.handleAutoDepositBack=k;

package/data-structures/Hinkal/handleAutoDepositBack.mjs

@@ -14,14 +14,14 @@ import { getERC20Token as p, getERC20TokenBySymbol as m } from "../../functions/
 import { waitLittle as h } from "../../functions/utils/time.utils.mjs";
 import { ErrorWithRelayerTransaction as g } from "../../error-handling/customErrors/ErrorWithTx.mjs";
 import { Logger as _ } from "../../error-handling/logger.mjs";
-import { getGasTokenSymbols as ee } from "../../functions/utils/fees.utils.mjs";
-import { createCustomRpcProvider as v } from "../../functions/utils/create-provider.mjs";
-import { getErrorMessageFromTransactionRequest as y } from "../../error-handling/get-error.message.mjs";
+import { createJsonRpcProvider as ee } from "../../functions/utils/create-provider.mjs";
+import { getErrorMessageFromTransactionRequest as v } from "../../error-handling/get-error.message.mjs";
 import "../../error-handling/index.mjs";
-import { modifyVolatileTokenAmountChanges as b } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
-import { getFeeStructure as x } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { convertEmporiumOpToCallInfo as S } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
-import { postToOffscreen as C } from "../../functions/utils/postToOffscreen.mjs";
+import { modifyVolatileTokenAmountChanges as y } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
+import { getFeeStructure as b } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { convertEmporiumOpToCallInfo as x } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
+import { postToOffscreen as S } from "../../functions/utils/postToOffscreen.mjs";
+import { getGasTokenSymbols as C } from "../../functions/utils/fees.utils.mjs";
 import { createTransaferEmporiumOpsBatch as w } from "../../functions/private-wallet/emporium.helpers.mjs";
 import { getTokensToDepositBack as T } from "../../functions/auto-deposit-back-helpers/get-tokens-to-deposit-back.mjs";
 import { getGasTokenRecords as E } from "../../functions/auto-deposit-back-helpers/get-gas-token-records.mjs";
@@ -35,20 +35,20 @@ var te = 3 * 1e3, ne = 13 * 1e3, A = async (A, j, M, N, P, F, I, L) => {
 	if (!M || I.length === 0) return;
 	let R;
 	try {
-		let o = v(j);
+		let o = ee(j);
 		await h(j === t.ethMainnet ? ne : te);
 		let g = await T(I, P, M, o);
 		if (!g.length) {
-			C(s.AutoShieldTxStatus, { message: d.AUTO_SHIELD_SKIPPED });
+			S(s.AutoShieldTxStatus, { message: d.AUTO_SHIELD_SKIPPED });
 			return;
 		}
-		let _ = ee(j).map((e) => m(e, j)).filter((e) => e !== void 0), { prices: y } = await l.getTokenPrices(j, _.map((e) => e.erc20TokenAddress)), z = new Map(y.map((e, t) => [_[t].erc20TokenAddress.toLowerCase(), e])), B = g.map(({ token: e }) => e), V = g.map(({ balance: e }) => e), H = B.map(({ erc20TokenAddress: e }) => e), U = w(A, j, H, await b(j, B, V, M)), W = await x(j, P, H, e.Emporium, U.map((e) => S(e, M, j))), { flatFee: G } = W ?? {}, K = p(W.feeToken, j);
+		let _ = C(j).map((e) => m(e, j)).filter((e) => e !== void 0), { prices: v } = await l.getTokenPrices(j, _.map((e) => e.erc20TokenAddress)), z = new Map(v.map((e, t) => [_[t].erc20TokenAddress.toLowerCase(), e])), B = g.map(({ token: e }) => e), V = g.map(({ balance: e }) => e), H = B.map(({ erc20TokenAddress: e }) => e), U = w(A, j, H, await y(j, B, V, M)), W = await b(j, P, H, e.Emporium, U.map((e) => x(e, M, j))), { flatFee: G } = W ?? {}, K = p(W.feeToken, j);
 		if (!K) return;
 		let q = f(K, G), J = (z.get(K.erc20TokenAddress.toLowerCase()) ?? 0) * Number(q), Y = await D(P, J, j, B, U, await E(_, j, A, M, o, z), W, H, M);
 		if (!Y) return;
 		let { feeToken: X, feeStructure: Z } = Y ?? {};
 		if (F && Number(F) < J) {
-			C(s.AutoShieldTxStatus, { message: u.GAS_PRICE_EXCEEDS_AUTOSHIELD_LIMIT });
+			S(s.AutoShieldTxStatus, { message: u.GAS_PRICE_EXCEEDS_AUTOSHIELD_LIMIT });
 			return;
 		}
 		let Q = B.findIndex((e) => c(e.erc20TokenAddress, X));
@@ -64,13 +64,13 @@ var te = 3 * 1e3, ne = 13 * 1e3, A = async (A, j, M, N, P, F, I, L) => {
 				token: e
 			}))
 		};
-		R = await k.saveTxRequest($), C(s.AutoShieldTxStatus, { status: r.Loading }), O(L, j, A);
+		R = await k.saveTxRequest($), S(s.AutoShieldTxStatus, { status: r.Loading }), O(L, j, A);
 		let ie = {
 			id: 0,
 			success: !0,
 			txHash: await A.actionReceive(B, V, X, Z, N, i.AutoShield)
 		};
-		await k.updatePendingTransactions(ie, R), C(s.AutoShieldTxStatus, {
+		await k.updatePendingTransactions(ie, R), S(s.AutoShieldTxStatus, {
 			status: r.Confirmed,
 			activityRequest: $
 		});
@@ -83,9 +83,9 @@ var te = 3 * 1e3, ne = 13 * 1e3, A = async (A, j, M, N, P, F, I, L) => {
 			success: !1,
 			...t ? { erroredTx: t } : {}
 		};
-		R && await k.updatePendingTransactions(n, R), C(s.AutoShieldTxStatus, {
+		R && await k.updatePendingTransactions(n, R), S(s.AutoShieldTxStatus, {
 			status: r.Failed,
-			error: y(e, o.ReceiveFromShieldedAccount)
+			error: v(e, o.ReceiveFromShieldedAccount)
 		}), _.error("Error in auto deposit back:", e);
 	}
 };

package/data-structures/Hinkal/hinkalClaimUtxo.cjs

@@ -1 +1 @@
-const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../../types/external-action.types.cjs`),n=require(`../../constants/chains.constants.cjs`),r=require(`../../constants/protocol.constants.cjs`),i=require(`../../types/hinkal.types.cjs`),a=require(`../../types/admin.types.cjs`),o=require(`../../functions/utils/caseInsensitive.utils.cjs`),s=require(`../../error-handling/error-codes.constants.cjs`),c=require(`../crypto-keys/keys.cjs`),ee=require(`../../functions/utils/time.utils.cjs`),l=require(`../utxo/Utxo.cjs`),u=require(`../../functions/utils/tron.utils.cjs`),d=require(`../../functions/utils/token-check.utils.cjs`),f=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),p=require(`../../functions/pre-transaction/constructAdminData.cjs`),m=require(`../../functions/pre-transaction/getFeeStructure.cjs`),h=require(`../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs`),g=require(`../../functions/pre-transaction/getSignatureDataForTransact.cjs`),_=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),v=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);var y=async(y,b,x,S,C)=>{let w=d.validateAndGetChainId([b]),te=n.isTronLike(w),T=b.erc20TokenAddress,E=u.addressToHexFormat(await y.getEthereumAddressByChain(w));if(!o.caseInsensitiveEqual(T,x.erc20TokenAddress))throw Error(`Off-chain UTXO token mismatch`);if(!x.shieldedPrivateKey)throw Error(`Claimable UTXO shieldedPrivateKey is missing`);let D=new c.UserKeys(void 0,x.shieldedPrivateKey),O=y.getRecipientInfo(),k=l.Utxo.createFrom(x,{shieldedPrivateKey:D.getShieldedPrivateKey()}),A=new l.Utxo({amount:0n,erc20TokenAddress:k.erc20TokenAddress,mintAddress:k.mintAddress,tokenId:k.tokenId,shieldedPrivateKey:D.getShieldedPrivateKey()}),j=[T],M=S??await m.getFeeStructure(w,T,[T],t.ExternalActionId.Transact);if(!o.caseInsensitiveEqual(M.feeToken,T))throw Error(`Claim fee token mismatch: fee must be paid from claimed UTXO token`);let N=M.variableRate>0n?M.variableRate:r.HINKAL_PRIVATE_SEND_VARIABLE_RATE;if(k.amount<=M.flatFee)throw Error(s.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let P=k.amount-M.flatFee,F=P*N/10000n,I=P-F;if(I<=0n)throw Error(s.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);let L={feeToken:M.feeToken,flatFee:M.flatFee+F,variableRate:0n},R=[-k.amount],z=await y.getRandomRelay(w,!0);if(!z)throw Error(s.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let B={externalActionId:0n,externalAddress:z??E,externalActionMetadata:`0x00`},V=[[k,A]],H=[],U=i.defaultHinkalLogicArgs(R.length,D),W=ee.getCurrentTimeInSeconds().toString(),{outputUtxos:G}=f.outputUtxoProcessing(D,V[0],R[0],W,k.tokenId,!0,O,I);H.push(G);let{patchAccessTokenMerkleTree:K,kycRequired:q,hasAccessToken:J}=await h.shouldPatchAccessTokenMerkleTree(y,w,j,R,D.getAccessKey()),Y=await g.getSignatureDataForTransact(w,E,D,q,J),X=`swapperM${R.length}x${V[0].length}x2`,{zkCallData:Z,circomData:Q,dimData:$}=await _.constructZkProof(y.merkleTreeHinkalByChain[w],y.merkleTreeAccessTokenByChain[w],V,H,D,X,B.externalActionId,B.externalAddress,B.externalActionMetadata,y.generateProofRemotely,z,w,void 0,void 0,void 0,K,U,void 0,L,y.getContractWithFetcher(w,e.ContractType.HinkalHelperContract),Y),ne=await u.reorderZkCallData(te,Z,$,Q);return v.transactCallRelayer(w,Z,$,Q,void 0,void 0,p.constructAdminData(C??a.AdminTransactionType.ClaimUtxo,w,j,R,E),ne)};exports.hinkalClaimUtxo=y;
+const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../../functions/utils/caseInsensitive.utils.cjs`),i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../crypto-keys/keys.cjs`),o=require(`../../functions/utils/time.utils.cjs`),s=require(`../utxo/Utxo.cjs`),c=require(`../../functions/utils/tron.utils.cjs`),l=require(`../../functions/utils/token-check.utils.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),d=require(`../../functions/pre-transaction/getFeeStructure.cjs`),f=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const p=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),m=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);var h=async(h,g,_,v,y)=>{let b=l.validateAndGetChainId([g]),x=t.isTronLike(b),S=g.erc20TokenAddress,C=c.addressToHexFormat(await h.getEthereumAddressByChain(b));if(!r.caseInsensitiveEqual(S,_.erc20TokenAddress))throw Error(`Off-chain UTXO token mismatch`);let w=y?new a.UserKeys(y):new a.UserKeys(_.nullifyingKey,_.nullifyingKey);if(!_.nullifyingKey&&!y)throw Error(`Claimable UTXO nullifyingKey is missing`);let T=w.getShieldedPrivateKey();if(_.nullifyingKey&&_.nullifyingKey!==T)throw Error(`Claimable UTXO key mismatch`);let E=h.getRecipientInfo(),D=s.Utxo.createFrom(_,{nullifyingKey:T}),O=new s.Utxo({amount:0n,erc20TokenAddress:D.erc20TokenAddress,mintAddress:D.mintAddress,nullifyingKey:T,...D.isNewStyle?{spendingPublicKey:w.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),k=[S],A=v??await d.getFeeStructure(b,S,[S],e.ExternalActionId.Transact);if(!r.caseInsensitiveEqual(A.feeToken,S))throw Error(`Claim fee token mismatch: fee must be paid from claimed UTXO token`);let j=A.variableRate>0n?A.variableRate:n.HINKAL_PRIVATE_SEND_VARIABLE_RATE;if(D.amount<=A.flatFee)throw Error(i.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let M=D.amount-A.flatFee,N=M*j/10000n,P=M-N;if(P<=0n)throw Error(i.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);let F={feeToken:A.feeToken,flatFee:A.flatFee+N,variableRate:0n},I=[-D.amount],L=await h.getRandomRelay(b,!0);if(!L)throw Error(i.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let R={externalActionId:0n,externalAddress:L??C,externalActionMetadata:`0x00`},z=[[D,O]],B=[],V=o.getCurrentTimeInSeconds().toString(),{outputUtxos:H}=u.outputUtxoProcessing(w,z[0],I[0],V,!0,E,P);B.push(H);let[{zkCallData:U,circomData:W,dimData:G},K]=await Promise.all([p.constructZkProof(h.merkleTreeHinkalByChain[b],z,B,w,R.externalActionId,R.externalAddress,R.externalActionMetadata,h.generateProofRemotely,F,L,b),f.buildCommitmentValidationData(b,w,k,z)]);return m.transactCallRelayer(b,U,G,W,K,void 0,void 0,void 0,await c.reorderZkCallData(x,U,G,W))};exports.hinkalClaimUtxo=h;

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

@@ -1,6 +1,5 @@
 import { ERC20Token } from '../../types/token.types';
 import { IHinkal } from './IHinkal';
 import { FeeStructure } from '../../types/hinkal.types';
-import { AdminTransactionType } from '../../types/admin.types';
 import { Utxo } from '../utxo/Utxo';
-export declare const hinkalClaimUtxo: (hinkal: IHinkal, erc20Token: ERC20Token, utxo: Utxo, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<string>;
+export declare const hinkalClaimUtxo: (hinkal: IHinkal, erc20Token: ERC20Token, utxo: Utxo, feeStructureOverride?: FeeStructure, claimableSignature?: string) => Promise<string>;

package/data-structures/Hinkal/hinkalClaimUtxo.mjs

@@ -1,54 +1,56 @@
-import { ContractType as e } from "../../types/ethereum-network.types.mjs";
-import { ExternalActionId as t } from "../../types/external-action.types.mjs";
-import { isTronLike as n } from "../../constants/chains.constants.mjs";
-import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as r } from "../../constants/protocol.constants.mjs";
-import { defaultHinkalLogicArgs as i } from "../../types/hinkal.types.mjs";
-import { AdminTransactionType as a } from "../../types/admin.types.mjs";
-import { caseInsensitiveEqual as o } from "../../functions/utils/caseInsensitive.utils.mjs";
-import { transactionErrorCodes as s } from "../../error-handling/error-codes.constants.mjs";
-import { UserKeys as c } from "../crypto-keys/keys.mjs";
-import { getCurrentTimeInSeconds as l } from "../../functions/utils/time.utils.mjs";
-import { Utxo as u } from "../utxo/Utxo.mjs";
-import { addressToHexFormat as d, reorderZkCallData as f } from "../../functions/utils/tron.utils.mjs";
-import { validateAndGetChainId as p } from "../../functions/utils/token-check.utils.mjs";
-import { outputUtxoProcessing as m } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { constructAdminData as h } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { getFeeStructure as g } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { shouldPatchAccessTokenMerkleTree as _ } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
-import { getSignatureDataForTransact as ee } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
-import { constructZkProof as v } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallRelayer as y } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ExternalActionId as e } from "../../types/external-action.types.mjs";
+import { isTronLike as t } from "../../constants/chains.constants.mjs";
+import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as n } from "../../constants/protocol.constants.mjs";
+import { caseInsensitiveEqual as r } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { transactionErrorCodes as i } from "../../error-handling/error-codes.constants.mjs";
+import { UserKeys as a } from "../crypto-keys/keys.mjs";
+import { getCurrentTimeInSeconds as o } from "../../functions/utils/time.utils.mjs";
+import { Utxo as s } from "../utxo/Utxo.mjs";
+import { addressToHexFormat as c, reorderZkCallData as l } from "../../functions/utils/tron.utils.mjs";
+import { validateAndGetChainId as u } from "../../functions/utils/token-check.utils.mjs";
+import { outputUtxoProcessing as d } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { getFeeStructure as f } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { buildCommitmentValidationData as p } from "../../functions/pre-transaction/buildCommitmentValidationData.mjs";
+import "../../functions/pre-transaction/index.mjs";
+import { constructZkProof as m } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallRelayer as h } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalClaimUtxo.ts
-var b = async (b, x, S, te, ne) => {
-	let C = p([x]), w = n(C), T = x.erc20TokenAddress, E = d(await b.getEthereumAddressByChain(C));
-	if (!o(T, S.erc20TokenAddress)) throw Error("Off-chain UTXO token mismatch");
-	if (!S.shieldedPrivateKey) throw Error("Claimable UTXO shieldedPrivateKey is missing");
-	let D = new c(void 0, S.shieldedPrivateKey), O = b.getRecipientInfo(), k = u.createFrom(S, { shieldedPrivateKey: D.getShieldedPrivateKey() }), A = new u({
+var g = async (g, _, v, y, b) => {
+	let x = u([_]), S = t(x), C = _.erc20TokenAddress, w = c(await g.getEthereumAddressByChain(x));
+	if (!r(C, v.erc20TokenAddress)) throw Error("Off-chain UTXO token mismatch");
+	let T = b ? new a(b) : new a(v.nullifyingKey, v.nullifyingKey);
+	if (!v.nullifyingKey && !b) throw Error("Claimable UTXO nullifyingKey is missing");
+	let E = T.getShieldedPrivateKey();
+	if (v.nullifyingKey && v.nullifyingKey !== E) throw Error("Claimable UTXO key mismatch");
+	let D = g.getRecipientInfo(), O = s.createFrom(v, { nullifyingKey: E }), k = new s({
 		amount: 0n,
-		erc20TokenAddress: k.erc20TokenAddress,
-		mintAddress: k.mintAddress,
-		tokenId: k.tokenId,
-		shieldedPrivateKey: D.getShieldedPrivateKey()
-	}), j = [T], M = te ?? await g(C, T, [T], t.Transact);
-	if (!o(M.feeToken, T)) throw Error("Claim fee token mismatch: fee must be paid from claimed UTXO token");
-	let N = M.variableRate > 0n ? M.variableRate : r;
-	if (k.amount <= M.flatFee) throw Error(s.INSUFFICIENT_FUNDS_TO_TRANSACT);
-	let P = k.amount - M.flatFee, F = P * N / 10000n, I = P - F;
-	if (I <= 0n) throw Error(s.RECIPIENT_AMOUNT_INVALID);
-	let L = {
-		feeToken: M.feeToken,
-		flatFee: M.flatFee + F,
+		erc20TokenAddress: O.erc20TokenAddress,
+		mintAddress: O.mintAddress,
+		nullifyingKey: E,
+		...O.isNewStyle ? {
+			spendingPublicKey: T.getSpendingKeyPair().pubSpendingBJJPoint,
+			isNewStyle: !0
+		} : { isNewStyle: !1 }
+	}), A = [C], j = y ?? await f(x, C, [C], e.Transact);
+	if (!r(j.feeToken, C)) throw Error("Claim fee token mismatch: fee must be paid from claimed UTXO token");
+	let M = j.variableRate > 0n ? j.variableRate : n;
+	if (O.amount <= j.flatFee) throw Error(i.INSUFFICIENT_FUNDS_TO_TRANSACT);
+	let N = O.amount - j.flatFee, P = N * M / 10000n, F = N - P;
+	if (F <= 0n) throw Error(i.RECIPIENT_AMOUNT_INVALID);
+	let I = {
+		feeToken: j.feeToken,
+		flatFee: j.flatFee + P,
 		variableRate: 0n
-	}, R = [-k.amount], z = await b.getRandomRelay(C, !0);
-	if (!z) throw Error(s.RELAYER_NOT_AVAILABLE);
-	let B = {
+	}, L = [-O.amount], R = await g.getRandomRelay(x, !0);
+	if (!R) throw Error(i.RELAYER_NOT_AVAILABLE);
+	let z = {
 		externalActionId: 0n,
-		externalAddress: z ?? E,
+		externalAddress: R ?? w,
 		externalActionMetadata: "0x00"
-	}, V = [[k, A]], H = [], U = i(R.length, D), W = l().toString(), { outputUtxos: G } = m(D, V[0], R[0], W, k.tokenId, !0, O, I);
-	H.push(G);
-	let { patchAccessTokenMerkleTree: K, kycRequired: q, hasAccessToken: J } = await _(b, C, j, R, D.getAccessKey()), Y = await ee(C, E, D, q, J), X = `swapperM${R.length}x${V[0].length}x2`, { zkCallData: Z, circomData: Q, dimData: $ } = await v(b.merkleTreeHinkalByChain[C], b.merkleTreeAccessTokenByChain[C], V, H, D, X, B.externalActionId, B.externalAddress, B.externalActionMetadata, b.generateProofRemotely, z, C, void 0, void 0, void 0, K, U, void 0, L, b.getContractWithFetcher(C, e.HinkalHelperContract), Y), re = await f(w, Z, $, Q);
-	return y(C, Z, $, Q, void 0, void 0, h(ne ?? a.ClaimUtxo, C, j, R, E), re);
+	}, B = [[O, k]], V = [], H = o().toString(), { outputUtxos: U } = d(T, B[0], L[0], H, !0, D, F);
+	V.push(U);
+	let [{ zkCallData: W, circomData: G, dimData: K }, q] = await Promise.all([m(g.merkleTreeHinkalByChain[x], B, V, T, z.externalActionId, z.externalAddress, z.externalActionMetadata, g.generateProofRemotely, I, R, x), p(x, T, A, B)]);
+	return h(x, W, K, G, q, void 0, void 0, void 0, await l(S, W, K, G));
 };
 //#endregion
-export { b as hinkalClaimUtxo };
+export { g as hinkalClaimUtxo };

package/data-structures/Hinkal/hinkalDeposit.cjs

@@ -1 +1 @@
-const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/admin.types.cjs`);require(`../../types/index.cjs`);const r=require(`../../functions/utils/addresses.cjs`),i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../../API/admin-calls.cjs`),o=require(`../../functions/utils/time.utils.cjs`),s=require(`../utxo/Utxo.cjs`),c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/web3/events/getShieldedBalance.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`),p=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),m=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`);var h=async(e,t,n,r)=>{let i=await e.getEthereumAddressByChain(t),{patchAccessTokenMerkleTree:a,signatureData:o}=await f.getKycAndSignatureData(e,t,n,r,i);return{signatureData:o,externalActionData:{externalActionId:0n,externalAddress:i,externalActionMetadata:`0x00`},contractTransaction:void 0,contractToApprove:void 0,patchAccessTokenMerkleTree:a}},g=async(e,t,n,r)=>{let i=[...await l.addPaddingToUtxos(e,t,n,r)],a=[],s=o.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=u.outputUtxoProcessing(e.userKeys,i[t],r[t],s);a.push(n)}return{inputUtxosArray:i,outputUtxosArray:a}},_=async(r,i,o,s=!0,l=!1)=>{let u=c.validateAndGetChainId(i),f=i.map(e=>e.erc20TokenAddress),[{externalActionData:_,contractTransaction:v,contractToApprove:y,patchAccessTokenMerkleTree:b,signatureData:x},{inputUtxosArray:S,outputUtxosArray:C}]=await Promise.all([h(r,u,f,o),g(r,u,f,o)]),w=`swapperM${o.length.toString()}x${S[0].length}x1`,{zkCallData:T,circomData:E,dimData:D}=await p.constructZkProof(r.merkleTreeHinkalByChain[u],r.merkleTreeAccessTokenByChain[u],S,C,r.userKeys,w,_.externalActionId,_.externalAddress,_.externalActionMetadata,r.generateProofRemotely,t.zeroAddress,u,void 0,void 0,void 0,b,void 0,void 0,void 0,r.getContractWithFetcher(u,e.ContractType.HinkalHelperContract),x),O=await m.transactCallDirect(r,u,o,i,T,E,D,y,v,s,l);return a.emitTxPublicData(d.constructAdminData(n.AdminTransactionType.Onboarding,u,f,o,await r.getEthereumAddress())),O},v=async(o,l,u,f,g=!0,_=!1)=>{let v=c.validateAndGetChainId(l),y=l.map(e=>e.erc20TokenAddress),[b,x,S]=f.split(`,`);if(!r.isValidPrivateAddress(f))throw Error(i.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let C=y.map(e=>[new s.Utxo({amount:0n,erc20TokenAddress:e,shieldedPrivateKey:o.userKeys.getShieldedPrivateKey()}),new s.Utxo({amount:0n,erc20TokenAddress:e,shieldedPrivateKey:o.userKeys.getShieldedPrivateKey()})]),w=`swapperM${u.length.toString()}x${C[0].length}x1`,T=y.map((e,t)=>[new s.Utxo({amount:u[t],erc20TokenAddress:e,randomization:BigInt(b),stealthAddress:x,encryptionKey:S})]),{externalActionData:E,contractTransaction:D,contractToApprove:O,patchAccessTokenMerkleTree:k}=await h(o,v,y,u),{zkCallData:A,circomData:j,dimData:M}=await p.constructZkProof(o.merkleTreeHinkalByChain[v],o.merkleTreeAccessTokenByChain[v],C,T,o.userKeys,w,E.externalActionId,E.externalAddress,E.externalActionMetadata,o.generateProofRemotely,t.zeroAddress,v,void 0,void 0,void 0,k,void 0,void 0,void 0,o.getContractWithFetcher(v,e.ContractType.HinkalHelperContract)),N=await m.transactCallDirect(o,v,u,l,A,j,M,O,D,g,_);return a.emitTxPublicData(d.constructAdminData(n.AdminTransactionType.PaymentLink,v,y,u,await o.getEthereumAddress())),N};exports.hinkalDeposit=_,exports.hinkalDepositForOther=v;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/hinkal.types.cjs`),r=require(`../../functions/utils/addresses.cjs`),i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../../API/admin-calls.cjs`),o=require(`../../functions/utils/time.utils.cjs`),s=require(`../utxo/Utxo.cjs`),c=require(`../../functions/utils/tron.utils.cjs`),l=require(`../../functions/utils/token-check.utils.cjs`),u=require(`../../functions/web3/events/getShieldedBalance.cjs`),d=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),f=require(`../../functions/pre-transaction/constructAdminData.cjs`),p=require(`../../functions/utils/tronSimulation.utils.cjs`),m=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),h=require(`../../functions/web3/functionCalls/waitForErc20Approvals.cjs`),g=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`);var _=async(e,t)=>({externalActionData:{externalActionId:0n,externalAddress:c.addressToHexFormat(await e.getEthereumAddressByChain(t)),externalActionMetadata:`0x00`},contractTransaction:void 0,contractToApprove:void 0}),v=async(e,t,n,r)=>{let i=[...await u.addPaddingToUtxos(e,t,n,r)],a=[],s=o.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=d.outputUtxoProcessing(e.userKeys,i[t],r[t],s);a.push(n)}return{inputUtxosArray:i,outputUtxosArray:a}},y=async(n,r,i,a,o,s,l,u=!0,d=!1)=>{let f=n.getTronWeb(),{hinkalAddress:m,hinkalABI:g}=e.networkRegistry[r].contractData;if(!g)throw Error(`Hinkal ABI not found`);let _=c.evmHexToTronBase58Address(m),v=await n.getEthereumAddressByChain(r),{totalTrxValue:y,tokensNeedingApproval:b}=c.splitTronTokensByNative(i,a),{a:x,b:S,c:C}=c.parseZkCalldata(o),w=await c.reorderZkCallData(!0,o,l,s,!1);if(!w)throw Error(`Tron proof signature not found`);let T=[w.v,w.r,w.s],E=[l.tokenNumber,l.nullifierAmount,l.outputAmount],D=c.circomDataToArray(s),O=y>0n?Number(y):0;if(d){let e=c.createTronCallData(g,`transact`,[T,x,S,C,E,D]),{transaction:n}=await f.transactionBuilder.triggerSmartContract(_,``,{feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN,callValue:O,input:e},[],v);return n}await c.approveTronTokens(f,v,_,b),b.size>0&&await h.waitForTronErc20Approvals(f,v,_,Array.from(b.entries()).map(([e,t])=>({tokenAddress:e,requiredAmount:t}))),u&&(await p.simulateTronTransaction(r,_,`transact`,g,[T,x,S,C,E,D],v,y>0n?y:void 0),await c.assertTronSufficientBalance(f,r,_,v,c.createTronCallData(g,`transact`,[T,x,S,C,E,D]),y));let k=await f.contract(g,_).transact(T,x,S,C,E,D).send({feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN,callValue:O}),A=typeof k==`string`?k:k?.txid??k?.transaction?.txID;if(!A)throw Error(`Tron deposit failed (missing txid)`);return A},b=async(r,i,a,o=!0,s=!1)=>{let c=l.validateAndGetChainId(i),u=e.isTronLike(c),d=i.map(e=>e.erc20TokenAddress),[{externalActionData:f,contractTransaction:p,contractToApprove:h},{inputUtxosArray:b,outputUtxosArray:x}]=await Promise.all([_(r,c),v(r,c,d,a)]),{zkCallData:S,circomData:C,dimData:w}=await m.constructZkProof(r.merkleTreeHinkalByChain[c],b,x,r.userKeys,f.externalActionId,f.externalAddress,f.externalActionMetadata,r.generateProofRemotely,n.zeroFeeStructure,t.zeroAddress,c);return u?await y(r,c,i,a,S,C,w,o,s):await g.transactCallDirect(r,c,a,i,S,C,w,h,p,o,s)},x=async(o,c,u,d,p=!0,h=!1,v)=>{let b=l.validateAndGetChainId(c),x=e.isTronLike(b),S=c.map(e=>e.erc20TokenAddress),[C,w,T,,E]=d.split(`,`);if(!r.isValidPrivateAddress(d))throw Error(i.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let D=S.map(e=>[new s.Utxo({amount:0n,erc20TokenAddress:e,nullifyingKey:o.userKeys.getShieldedPrivateKey(),spendingPublicKey:o.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}),new s.Utxo({amount:0n,erc20TokenAddress:e,nullifyingKey:o.userKeys.getShieldedPrivateKey(),spendingPublicKey:o.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0})]),O=S.map((e,t)=>[new s.Utxo({amount:u[t],erc20TokenAddress:e,H0:[BigInt(w),BigInt(T)],stealthAddress:C,encryptionKey:E,isNewStyle:!0})]),{externalActionData:k,contractTransaction:A,contractToApprove:j}=await _(o,b),{zkCallData:M,circomData:N,dimData:P}=await m.constructZkProof(o.merkleTreeHinkalByChain[b],D,O,o.userKeys,k.externalActionId,k.externalAddress,k.externalActionMetadata,o.generateProofRemotely,n.zeroFeeStructure,t.zeroAddress,b);if(x)return await y(o,b,c,u,M,N,P,p,h);let F=await g.transactCallDirect(o,b,u,c,M,N,P,j,A,p,h);return a.emitTxPublicData(f.constructAdminData(v,b,S,u,await o.getEthereumAddress())),F};exports.hinkalDeposit=b,exports.hinkalDepositForOther=x;

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

@@ -1,4 +1,6 @@
+import { ethers } from 'ethers';
+import { Types as TronWebTypes } from 'tronweb';
 import { IHinkal } from './IHinkal';
-import { ERC20Token } from '../../types';
-export declare const hinkalDeposit: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], preEstimateGas?: boolean, returnTxData?: boolean) => Promise<import('ethers').TransactionRequest | import('ethers').TransactionResponse>;
-export declare const hinkalDepositForOther: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], recipinetInfo: string, preEstimateGas?: boolean, returnTxData?: boolean) => Promise<import('ethers').TransactionRequest | import('ethers').TransactionResponse>;
+import { AdminTransactionType, ERC20Token } from '../../types';
+export declare const hinkalDeposit: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], preEstimateGas?: boolean, returnTxData?: boolean) => Promise<ethers.TransactionResponse | ethers.TransactionRequest | string | TronWebTypes.Transaction<TronWebTypes.TriggerSmartContract>>;
+export declare const hinkalDepositForOther: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], recipientInfo: string, preEstimateGas?: boolean, returnTxData?: boolean, action?: AdminTransactionType) => Promise<ethers.TransactionResponse | ethers.TransactionRequest | string | TronWebTypes.Transaction<TronWebTypes.TriggerSmartContract>>;

package/data-structures/Hinkal/hinkalDeposit.mjs

@@ -1,65 +1,121 @@
-import { ContractType as e } from "../../types/ethereum-network.types.mjs";
-import { zeroAddress as t } from "../../constants/protocol.constants.mjs";
-import { AdminTransactionType as n } from "../../types/admin.types.mjs";
-import "../../types/index.mjs";
-import { isValidPrivateAddress as r } from "../../functions/utils/addresses.mjs";
-import { transactionErrorCodes as i } from "../../error-handling/error-codes.constants.mjs";
-import { emitTxPublicData as a } from "../../API/admin-calls.mjs";
-import { getCurrentTimeInSeconds as o } from "../../functions/utils/time.utils.mjs";
-import { Utxo as s } from "../utxo/Utxo.mjs";
-import { validateAndGetChainId as c } from "../../functions/utils/token-check.utils.mjs";
-import { addPaddingToUtxos as l } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { outputUtxoProcessing as u } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { constructAdminData as d } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { getKycAndSignatureData as f } from "../../functions/pre-transaction/getKycAndSignatureData.mjs";
-import { constructZkProof as p } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallDirect as m } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
+import { isTronLike as e, networkRegistry as t } from "../../constants/chains.constants.mjs";
+import { TRON_DEFAULT_FEE_LIMIT_SUN as n, zeroAddress as r } from "../../constants/protocol.constants.mjs";
+import { zeroFeeStructure as i } from "../../types/hinkal.types.mjs";
+import { isValidPrivateAddress as a } from "../../functions/utils/addresses.mjs";
+import { transactionErrorCodes as o } from "../../error-handling/error-codes.constants.mjs";
+import { emitTxPublicData as s } from "../../API/admin-calls.mjs";
+import { getCurrentTimeInSeconds as c } from "../../functions/utils/time.utils.mjs";
+import { Utxo as l } from "../utxo/Utxo.mjs";
+import { addressToHexFormat as u, approveTronTokens as d, assertTronSufficientBalance as f, circomDataToArray as p, createTronCallData as m, evmHexToTronBase58Address as h, parseZkCalldata as g, reorderZkCallData as _, splitTronTokensByNative as v } from "../../functions/utils/tron.utils.mjs";
+import { validateAndGetChainId as y } from "../../functions/utils/token-check.utils.mjs";
+import { addPaddingToUtxos as b } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { outputUtxoProcessing as x } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { constructAdminData as S } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { simulateTronTransaction as C } from "../../functions/utils/tronSimulation.utils.mjs";
+import { constructZkProof as w } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { waitForTronErc20Approvals as T } from "../../functions/web3/functionCalls/waitForErc20Approvals.mjs";
+import { transactCallDirect as E } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalDeposit.ts
-var h = async (e, t, n, r) => {
-	let i = await e.getEthereumAddressByChain(t), { patchAccessTokenMerkleTree: a, signatureData: o } = await f(e, t, n, r, i);
-	return {
-		signatureData: o,
-		externalActionData: {
-			externalActionId: 0n,
-			externalAddress: i,
-			externalActionMetadata: "0x00"
-		},
-		contractTransaction: void 0,
-		contractToApprove: void 0,
-		patchAccessTokenMerkleTree: a
-	};
-}, g = async (e, t, n, r) => {
-	let i = [...await l(e, t, n, r)], a = [], s = o().toString();
+var D = async (e, t) => ({
+	externalActionData: {
+		externalActionId: 0n,
+		externalAddress: u(await e.getEthereumAddressByChain(t)),
+		externalActionMetadata: "0x00"
+	},
+	contractTransaction: void 0,
+	contractToApprove: void 0
+}), O = async (e, t, n, r) => {
+	let i = [...await b(e, t, n, r)], a = [], o = c().toString();
 	for (let t = 0; t < n.length; t += 1) {
-		let { outputUtxos: n } = u(e.userKeys, i[t], r[t], s);
+		let { outputUtxos: n } = x(e.userKeys, i[t], r[t], o);
 		a.push(n);
 	}
 	return {
 		inputUtxosArray: i,
 		outputUtxosArray: a
 	};
-}, _ = async (r, i, o, s = !0, l = !1) => {
-	let u = c(i), f = i.map((e) => e.erc20TokenAddress), [{ externalActionData: _, contractTransaction: v, contractToApprove: y, patchAccessTokenMerkleTree: b, signatureData: x }, { inputUtxosArray: S, outputUtxosArray: C }] = await Promise.all([h(r, u, f, o), g(r, u, f, o)]), w = `swapperM${o.length.toString()}x${S[0].length}x1`, { zkCallData: T, circomData: E, dimData: D } = await p(r.merkleTreeHinkalByChain[u], r.merkleTreeAccessTokenByChain[u], S, C, r.userKeys, w, _.externalActionId, _.externalAddress, _.externalActionMetadata, r.generateProofRemotely, t, u, void 0, void 0, void 0, b, void 0, void 0, void 0, r.getContractWithFetcher(u, e.HinkalHelperContract), x), O = await m(r, u, o, i, T, E, D, y, v, s, l);
-	return a(d(n.Onboarding, u, f, o, await r.getEthereumAddress())), O;
-}, v = async (o, l, u, f, g = !0, _ = !1) => {
-	let v = c(l), y = l.map((e) => e.erc20TokenAddress), [b, x, S] = f.split(",");
-	if (!r(f)) throw Error(i.RECIPIENT_FORMAT_INCORRECT);
-	let C = y.map((e) => [new s({
+}, k = async (e, r, i, a, o, s, c, l = !0, u = !1) => {
+	let y = e.getTronWeb(), { hinkalAddress: b, hinkalABI: x } = t[r].contractData;
+	if (!x) throw Error("Hinkal ABI not found");
+	let S = h(b), w = await e.getEthereumAddressByChain(r), { totalTrxValue: E, tokensNeedingApproval: D } = v(i, a), { a: O, b: k, c: A } = g(o), j = await _(!0, o, c, s, !1);
+	if (!j) throw Error("Tron proof signature not found");
+	let M = [
+		j.v,
+		j.r,
+		j.s
+	], N = [
+		c.tokenNumber,
+		c.nullifierAmount,
+		c.outputAmount
+	], P = p(s), F = E > 0n ? Number(E) : 0;
+	if (u) {
+		let e = m(x, "transact", [
+			M,
+			O,
+			k,
+			A,
+			N,
+			P
+		]), { transaction: t } = await y.transactionBuilder.triggerSmartContract(S, "", {
+			feeLimit: n,
+			callValue: F,
+			input: e
+		}, [], w);
+		return t;
+	}
+	await d(y, w, S, D), D.size > 0 && await T(y, w, S, Array.from(D.entries()).map(([e, t]) => ({
+		tokenAddress: e,
+		requiredAmount: t
+	}))), l && (await C(r, S, "transact", x, [
+		M,
+		O,
+		k,
+		A,
+		N,
+		P
+	], w, E > 0n ? E : void 0), await f(y, r, S, w, m(x, "transact", [
+		M,
+		O,
+		k,
+		A,
+		N,
+		P
+	]), E));
+	let I = await y.contract(x, S).transact(M, O, k, A, N, P).send({
+		feeLimit: n,
+		callValue: F
+	}), L = typeof I == "string" ? I : I?.txid ?? I?.transaction?.txID;
+	if (!L) throw Error("Tron deposit failed (missing txid)");
+	return L;
+}, A = async (t, n, a, o = !0, s = !1) => {
+	let c = y(n), l = e(c), u = n.map((e) => e.erc20TokenAddress), [{ externalActionData: d, contractTransaction: f, contractToApprove: p }, { inputUtxosArray: m, outputUtxosArray: h }] = await Promise.all([D(t, c), O(t, c, u, a)]), { zkCallData: g, circomData: _, dimData: v } = await w(t.merkleTreeHinkalByChain[c], m, h, t.userKeys, d.externalActionId, d.externalAddress, d.externalActionMetadata, t.generateProofRemotely, i, r, c);
+	return l ? await k(t, c, n, a, g, _, v, o, s) : await E(t, c, a, n, g, _, v, p, f, o, s);
+}, j = async (t, n, c, u, d = !0, f = !1, p) => {
+	let m = y(n), h = e(m), g = n.map((e) => e.erc20TokenAddress), [_, v, b, , x] = u.split(",");
+	if (!a(u)) throw Error(o.RECIPIENT_FORMAT_INCORRECT);
+	let C = g.map((e) => [new l({
 		amount: 0n,
 		erc20TokenAddress: e,
-		shieldedPrivateKey: o.userKeys.getShieldedPrivateKey()
-	}), new s({
+		nullifyingKey: t.userKeys.getShieldedPrivateKey(),
+		spendingPublicKey: t.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,
+		isNewStyle: !0
+	}), new l({
 		amount: 0n,
 		erc20TokenAddress: e,
-		shieldedPrivateKey: o.userKeys.getShieldedPrivateKey()
-	})]), w = `swapperM${u.length.toString()}x${C[0].length}x1`, T = y.map((e, t) => [new s({
-		amount: u[t],
+		nullifyingKey: t.userKeys.getShieldedPrivateKey(),
+		spendingPublicKey: t.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,
+		isNewStyle: !0
+	})]), T = g.map((e, t) => [new l({
+		amount: c[t],
 		erc20TokenAddress: e,
-		randomization: BigInt(b),
-		stealthAddress: x,
-		encryptionKey: S
-	})]), { externalActionData: E, contractTransaction: D, contractToApprove: O, patchAccessTokenMerkleTree: k } = await h(o, v, y, u), { zkCallData: A, circomData: j, dimData: M } = await p(o.merkleTreeHinkalByChain[v], o.merkleTreeAccessTokenByChain[v], C, T, o.userKeys, w, E.externalActionId, E.externalAddress, E.externalActionMetadata, o.generateProofRemotely, t, v, void 0, void 0, void 0, k, void 0, void 0, void 0, o.getContractWithFetcher(v, e.HinkalHelperContract)), N = await m(o, v, u, l, A, j, M, O, D, g, _);
-	return a(d(n.PaymentLink, v, y, u, await o.getEthereumAddress())), N;
+		H0: [BigInt(v), BigInt(b)],
+		stealthAddress: _,
+		encryptionKey: x,
+		isNewStyle: !0
+	})]), { externalActionData: O, contractTransaction: A, contractToApprove: j } = await D(t, m), { zkCallData: M, circomData: N, dimData: P } = await w(t.merkleTreeHinkalByChain[m], C, T, t.userKeys, O.externalActionId, O.externalAddress, O.externalActionMetadata, t.generateProofRemotely, i, r, m);
+	if (h) return await k(t, m, n, c, M, N, P, d, f);
+	let F = await E(t, m, c, n, M, N, P, j, A, d, f);
+	return s(S(p, m, g, c, await t.getEthereumAddress())), F;
 };
 //#endregion
-export { _ as hinkalDeposit, v as hinkalDepositForOther };
+export { A as hinkalDeposit, j as hinkalDepositForOther };

package/data-structures/Hinkal/hinkalDepositAndBridge.cjs

@@ -1 +1 @@
-const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../../types/external-action.types.cjs`),n=require(`../../constants/chains.constants.cjs`),r=require(`../../constants/protocol.constants.cjs`),i=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const a=require(`../../functions/utils/caseInsensitive.utils.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../API/API.cjs`),c=require(`../../constants/addresses.constants.cjs`),l=require(`../../error-handling/error-codes.constants.cjs`),u=require(`../../functions/utils/erc20tokenFunctions.cjs`),d=require(`../../functions/utils/time.utils.cjs`),f=require(`../utxo/Utxo.cjs`),p=require(`../../functions/utils/token-check.utils.cjs`),m=require(`../../functions/utils/fees.utils.cjs`),h=require(`../../functions/pre-transaction/constructAdminData.cjs`),g=require(`../../functions/pre-transaction/getFeeStructure.cjs`),_=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`),v=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),y=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`);require(`../../functions/utils/index.cjs`);const b=require(`../../functions/private-wallet/emporium.helpers.cjs`),x=require(`../../functions/snarkjs/constructEmporiumProof.cjs`),S=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),C=require(`../../API/deposit-and-withdraw-status-calls.cjs`),w=require(`./hinkalDepositOnChainUtxos.cjs`);require(`../../functions/index.cjs`);var T=async(o,u,p,g,v,y,w,T,E,D)=>{if(g.length===0)throw Error(`No recipients to bridge`);let O=p.erc20TokenAddress,{contractData:k}=n.networkRegistry[u],{emporiumAddress:A}=k;if(!A)throw Error(`No Emporium Address`);let j=c.SWAP_ROUTER_ADDRESSES[t.ExternalActionId.Lifi][u];if(!j)throw Error(`LIFI not configured for chain ${u}`);let M=await o.getRandomRelay(u);if(!M)throw Error(l.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let N=await o.getEthereumAddressByChain(u),P=d.getCurrentTimeInSeconds().toString(),F=o.generateProofRemotely?5:1,I=[];for(let t=0;t<g.length;t+=F){let n=g.slice(t,t+F),i=await Promise.all(n.map(async({utxo:t,nativeUtxo:n,bridgeAmount:i,quote:c,temporarySubAccount:l,recipientAddress:d})=>{await s.API.addTemporaryWalletNonce(u,y,l.index);let p=c.nativeFee>0n&&!a.caseInsensitiveEqual(O,r.zeroAddress),g=[O],S=[-t.amount],C=[!1],w=new f.Utxo({amount:0n,erc20TokenAddress:O,shieldedPrivateKey:o.userKeys.getShieldedPrivateKey(),timeStamp:P,tokenId:0}),T=[[t,w]],E=[[w]];if(p&&n){let e=new f.Utxo({amount:0n,erc20TokenAddress:r.zeroAddress,shieldedPrivateKey:o.userKeys.getShieldedPrivateKey(),timeStamp:P,tokenId:0});g.push(r.zeroAddress),S.push(-n.amount),C.push(!1),T.push([n,e]),E.push([e])}let k=b.createLifiBridgeOps(o,u,l.ethAddress,j,O,t.amount,i,c),{patchAccessTokenMerkleTree:F,signatureData:I}=await _.getKycAndSignatureData(o,u,g,S,N),L=m.calculateTotalFee(i,v),R={feeToken:v.feeToken,flatFee:L,variableRate:0n},z=h.constructAdminData(D,u,g,[-t.amount],N),{zkCallData:B,circomData:V,dimData:H,authorizationData:U}=await x.constructEmporiumProof(o.merkleTreeHinkalByChain[u],o.merkleTreeAccessTokenByChain[u],g,g.map(()=>0),T,E,o.userKeys,g.length,T[0].length,A,k,o.generateProofRemotely,M??r.zeroAddress,u,C,void 0,l.privateKey,void 0,F,void 0,R,o.getContractWithFetcher(u,e.ContractType.HinkalHelperContract),I);return{zkCallData:B,dimData:H,circomData:V,authorizationData:U,recipientAddress:d,adminData:z}}));I.push(...i)}await C.safeUpdateDepositAndWithdrawStatus({id:w,chainId:u,hashedEthereumAddress:y,phase:i.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let L=await S.transactCallRelayerBatch(u,I,y,T,E);return await C.safeUpdateDepositAndWithdrawStatus({id:w,chainId:u,hashedEthereumAddress:y,phase:i.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:L}),L},E=async(e,n,i,s,l,d,f,m=!0)=>{let h=n.erc20TokenAddress,_=p.validateAndGetChainId([n]),x=o.hashEthereumAddress(await e.getEthereumAddressByChain(_)),S=c.SWAP_ROUTER_ADDRESSES[t.ExternalActionId.Lifi][_];if(!S)throw Error(`LIFI router not configured`);let C;if(l)C=l;else{let n=i[0],a=b.createLifiBridgeOps(e,_,n.temporarySubAccount.ethAddress,S,h,n.bridgeAmount,n.bridgeAmount,n.quote).map(e=>y.convertEmporiumOpToCallInfo(e,n.temporarySubAccount.ethAddress,_));C=await g.getFeeStructure(_,h,[h],t.ExternalActionId.Emporium,a,r.PAY_SEND_VARIABLE_RATE)}let E={feeToken:C.feeToken,flatFee:0n,variableRate:0n},D=i.reduce((e,t)=>e+t.quote.nativeFee,0n)>0n&&!a.caseInsensitiveEqual(h,r.zeroAddress),O=i.map(e=>e.bridgeAmount),k=i.map(e=>e.recipientAddress),{userDepositedUtxos:A,statusId:j,depositTxHash:M}=await w.hinkalDepositOnChainUtxos(e,_,n,O,k,C,x,m),N=[];if(D){let t=u.getERC20Token(r.zeroAddress,_);if(!t)throw Error(`No native token`);let{userDepositedUtxos:n}=await w.hinkalDepositOnChainUtxos(e,_,t,i.map(e=>e.quote.nativeFee),k,E,x,m);N=n}return await v.waitForDepositedUtxosInMerkleTree(e,_,[...A,...N]),await T(e,_,n,i.map((e,t)=>({...e,utxo:A[t].utxo,nativeUtxo:D?N[t]?.utxo:void 0})),C,x,j,s,d,f),M};exports.hinkalDepositAndBridge=E;
+const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../functions/utils/caseInsensitive.utils.cjs`),a=require(`../../functions/utils/addresses.cjs`),o=require(`../../API/API.cjs`),s=require(`../../constants/addresses.constants.cjs`),c=require(`../../error-handling/error-codes.constants.cjs`),l=require(`../../functions/utils/erc20tokenFunctions.cjs`),u=require(`../../functions/utils/time.utils.cjs`),d=require(`../utxo/Utxo.cjs`),f=require(`../../functions/utils/token-check.utils.cjs`),p=require(`../../functions/pre-transaction/constructAdminData.cjs`),m=require(`../../functions/pre-transaction/getFeeStructure.cjs`),h=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),g=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const _=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),v=require(`../../functions/utils/fees.utils.cjs`);require(`../../functions/utils/index.cjs`);const y=require(`../../functions/private-wallet/emporium.helpers.cjs`),b=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),x=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),S=require(`../../API/deposit-and-withdraw-status-calls.cjs`),C=require(`./hinkalDepositOnChainUtxos.cjs`);require(`../../functions/index.cjs`);var w=async(a,l,f,m,h,_,C,w,T,E,D)=>{if(m.length===0)throw Error(`No recipients to bridge`);let O=f.erc20TokenAddress,{contractData:k}=t.networkRegistry[l],{emporiumAddress:A}=k;if(!A)throw Error(`No Emporium Address`);let j=s.SWAP_ROUTER_ADDRESSES[e.ExternalActionId.Lifi][l];if(!j)throw Error(`LIFI not configured for chain ${l}`);let M=await a.getRandomRelay(l);if(!M)throw Error(c.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let N=await a.getEthereumAddressByChain(l),P=u.getCurrentTimeInSeconds().toString(),F=a.generateProofRemotely?5:1,I=[];for(let t=0;t<m.length;t+=F){let r=m.slice(t,t+F),s=await Promise.all(r.map(async({utxo:t,nativeUtxo:r,bridgeAmount:s,quote:c,temporarySubAccount:u,recipientAddress:m})=>{await o.API.addTemporaryWalletNonce(l,_,u.index);let x=c.nativeFee>0n&&!i.caseInsensitiveEqual(O,n.zeroAddress),S=[O],C=[-t.amount],w=[!1],T=new d.Utxo({amount:0n,erc20TokenAddress:O,nullifyingKey:a.userKeys.getShieldedPrivateKey(),timeStamp:P,...t.isNewStyle?{spendingPublicKey:a.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),D=[[t,T]],k=[[T]];if(x&&r){let e=new d.Utxo({amount:0n,erc20TokenAddress:n.zeroAddress,nullifyingKey:a.userKeys.getShieldedPrivateKey(),timeStamp:P,...r.isNewStyle?{spendingPublicKey:a.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}});S.push(n.zeroAddress),C.push(-r.amount),w.push(!1),D.push([r,e]),k.push([e])}let F=y.createLifiBridgeOps(a,l,u.ethAddress,j,O,t.amount,s,c),I=await v.calculateModifiedFeeStructure(l,f,s,h),L=p.constructAdminData(E,l,S,[-t.amount],N),[{zkCallData:R,circomData:z,dimData:B},V,H]=await Promise.all([b.constructZkProof(a.merkleTreeHinkalByChain[l],D,k,a.userKeys,e.ExternalActionId.Emporium,A,F,a.generateProofRemotely,I,M??n.zeroAddress,l,w,void 0,void 0,u.privateKey),y.getAuthorizationDataIfNeeded(l,u.privateKey),g.buildCommitmentValidationData(l,a.userKeys,S,D)]);return{zkCallData:R,dimData:B,circomData:z,commitmentValidationData:H,authorizationData:V,recipientAddress:m,adminData:L}}));I.push(...s)}await S.safeUpdateDepositAndWithdrawStatus({id:C,chainId:l,hashedEthereumAddress:_,phase:r.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let L=await x.transactCallRelayerBatch(l,I,_,w,T,D);return await S.safeUpdateDepositAndWithdrawStatus({id:C,chainId:l,hashedEthereumAddress:_,phase:r.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:L}),L},T=async(t,r,o,c,u,d,p,g,v=!0)=>{let b=r.erc20TokenAddress,x=f.validateAndGetChainId([r]),S=g?a.hashString(g):void 0,T=a.hashEthereumAddress(await t.getEthereumAddressByChain(x)),E=s.SWAP_ROUTER_ADDRESSES[e.ExternalActionId.Lifi][x];if(!E)throw Error(`LIFI router not configured`);let D;if(u)D=u;else{let r=o[0],i=y.createLifiBridgeOps(t,x,r.temporarySubAccount.ethAddress,E,b,r.bridgeAmount,r.bridgeAmount,r.quote).map(e=>_.convertEmporiumOpToCallInfo(e,r.temporarySubAccount.ethAddress,x));D=await m.getFeeStructure(x,b,[b],e.ExternalActionId.Emporium,i,n.PAY_SEND_VARIABLE_RATE)}let O={feeToken:D.feeToken,flatFee:0n,variableRate:0n},k=o.reduce((e,t)=>e+t.quote.nativeFee,0n)>0n&&!i.caseInsensitiveEqual(b,n.zeroAddress),A=o.map(e=>e.bridgeAmount),j=o.map(e=>e.recipientAddress),{userDepositedUtxos:M,statusId:N,depositTxHash:P}=await C.hinkalDepositOnChainUtxos(t,x,r,A,j,D,T,v),F=[];if(k){let e=l.getERC20Token(n.zeroAddress,x);if(!e)throw Error(`No native token`);let{userDepositedUtxos:r}=await C.hinkalDepositOnChainUtxos(t,x,e,o.map(e=>e.quote.nativeFee),j,O,T,v);F=r}return await h.waitForDepositedUtxosInMerkleTree(t,x,[...M,...F]),await w(t,x,r,o.map((e,t)=>({...e,utxo:M[t].utxo,nativeUtxo:k?F[t]?.utxo:void 0})),D,T,N,c,d,p,S),P};exports.hinkalDepositAndBridge=T;

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

@@ -1,4 +1,4 @@
 import { IHinkal } from './IHinkal';
 import { AdminTransactionType, BridgeRecipient, ERC20Token } from '../../types';
 import { FeeStructure } from '../../types/hinkal.types';
-export declare const hinkalDepositAndBridge: (hinkal: IHinkal, erc20Token: ERC20Token, recipients: BridgeRecipient[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string, action?: AdminTransactionType, preEstimateGas?: boolean) => Promise<string>;
+export declare const hinkalDepositAndBridge: (hinkal: IHinkal, erc20Token: ERC20Token, recipients: BridgeRecipient[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string, action?: AdminTransactionType, dashboardAccountId?: string, preEstimateGas?: boolean) => Promise<string>;