@hinkal/common 0.3.9 → 0.3.10

package/common/src/data-structures/Hinkal/hinkalTransact.cjs

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/hinkal.types.cjs`),r=require(`../utxo/Utxo.cjs`),i=require(`../../types/transact.types.cjs`),a=require(`../../functions/web3/events/getShieldedBalance.cjs`),o=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),s=require(`../../functions/snarkjs/common.snarkjs.cjs`),c=require(`../../functions/snarkjs/constructTxEnclave.cjs`),l=require(`../../functions/pre-transaction/speculativeUtxo.cjs`),u=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),d=require(`../../functions/web3/functionCalls/submitProof.cjs`);var f=2,p=6,m=(e,t)=>{let n=Math.max(...t.map(e=>e.length))<=f?f:p;return t.map(t=>{let i=t[0];if(!i)throw Error(`hinkalTransact: inputUtxos must contain at least one note per token`);let a=[...t];for(;a.length<n;)a.push(new r.Utxo({amount:0n,erc20TokenAddress:i.erc20TokenAddress,mintAddress:i.mintAddress,nullifyingKey:e.getShieldedPrivateKey(),spendingPublicKey:e.getSpendingKeyPair().pubSpendingBJJPoint}));return a})},h=(e,t,n)=>{if(t.length!==1||t[0].length!==1)throw Error(`selfOutputAmounts only supports a single token with a single self-output`);let i=t[0][0],a=n.reduce((e,t)=>e+t,0n);if(a!==i.amount)throw Error(`selfOutputAmounts sum to ${a}, expected ${i.amount}`);return[n.map(t=>new r.Utxo({amount:t,erc20TokenAddress:i.erc20TokenAddress,mintAddress:i.mintAddress,nullifyingKey:e.getShieldedPrivateKey(),timeStamp:i.timeStamp,spendingPublicKey:e.getSpendingKeyPair().pubSpendingBJJPoint}))]},g=async(e,r,i)=>{let{chainId:s,erc20Addresses:c,amountChanges:d,externalAddress:f,externalActionId:p,externalActionMetadata:g,feeStructure:_,relay:v,onChainCreation:y,recipientAddress:b,recipientAmounts:x,useBlockedUtxos:S,inputUtxos:C,forceEmptyUtxos:w,originalSender:T,subAccountPrivateKey:E,emporiumOps:D,createBlockedUtxos:O,selfOutputAmounts:k,speculative:A,slippageValues:j}=r,M=C?m(i,C):[...await a.addPaddingToUtxos(e,s,c,d,void 0,w,S)],N=o.buildOutputUtxos(i,M,d,b,x),P=k?h(i,N,k):N,F=e.merkleTreeHinkalByChain[s],I=A?l.speculativeMerkleTree(F,M,A.pendingLeaves):F,{zkCallData:L,circomData:R,dimData:z,commitmentValidationData:B}=await u.constructZkProof(I,M,P,i,p??0n,f,D??g??`0x00`,_??n.zeroFeeStructure,v??t.zeroAddress,s,y,void 0,T,E,void 0,O,I!==F,j);return{zkCallData:L,circomData:R,dimData:z,commitmentValidationData:B}},_=async(t,n,r)=>{let{chainId:i,erc20Addresses:a,externalAddress:o,amountChanges:s,relay:l,feeStructure:u,externalActionId:d,externalActionMetadata:f,onChainCreation:p,recipientAddress:m,recipientAmounts:h,useBlockedUtxos:g,createBlockedUtxos:_,skipLock:v,selfOutputAmounts:y,forceEmptyUtxos:b,messageSeed:x,inputUtxos:S,originalSender:C,speculative:w,slippageValues:T}=n,{jobId:E,signedMessageHash:D}=await c.prepareTxEnclaveCall(t,{chainId:i,hinkalAddress:e.networkRegistry[i].contractData.hinkalAddress,erc20Addresses:a,externalAddress:o,originalSender:C,amountChanges:s,relay:l,feeStructure:u,externalActionId:d,externalActionMetadata:f,onChainCreation:p,recipientAddress:m,recipientAmounts:h,useBlockedUtxos:g,createBlockedUtxos:_,skipLock:v,selfOutputAmounts:y,forceEmptyUtxos:b,messageSeed:x,inputCommitments:w?void 0:c.collectInputCommitments(S),speculative:w,slippageValues:T},r),{R8:O,S:k}=r.signEddsa(BigInt(D));return{jobId:E,eddsaSignature:{R8:O,S:k}}},v=async(e,t,n)=>{let r=await d.submitProof(e,t,n);return t.submit.mode!==i.SubmitMode.ProofOnly&&t.onTxSubmitLocally?.(n.circomData),r},y=async(e,t)=>{if(t.userKeys&&!t.inputUtxos)throw Error(`hinkalTransact: userKeys requires explicit inputUtxos`);let n=t.userKeys??e.userKeys,{chainId:r,submit:a}=t;if(e.generateProofRemotely){let{jobId:o,eddsaSignature:l}=await _(e,t,n);if(a.mode===i.SubmitMode.Relayer)return c.finalizeTxEnclaveCallRelay(o,l,r,{adminData:a.adminData,authorizationData:a.authorizationData,withUniswapWorkAround:a.withUniswapWorkAround});let{zkCallData:u,circomData:d,dimData:f,commitmentValidationData:p,tronProofSignature:m}=await c.finalizeTxEnclaveCall(o,l);return v(e,t,{zkCallData:u,circomData:s.deserializeCircomData(d),dimData:f,commitmentValidationData:p,tronProofSignature:m})}return v(e,t,await g(e,t,n))};exports.hinkalTransact=y;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/hinkal.types.cjs`),r=require(`../utxo/Utxo.cjs`),i=require(`../../types/transact.types.cjs`),a=require(`../../functions/web3/events/getShieldedBalance.cjs`),o=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),s=require(`../../functions/snarkjs/common.snarkjs.cjs`),c=require(`../../functions/snarkjs/constructTxEnclave.cjs`),l=require(`../../functions/pre-transaction/speculativeUtxo.cjs`),u=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),d=require(`../../functions/web3/functionCalls/submitProof.cjs`);var f=2,p=6,m=(e,t)=>{let n=Math.max(...t.map(e=>e.length))<=f?f:p;return t.map(t=>{let i=t[0];if(!i)throw Error(`hinkalTransact: inputUtxos must contain at least one note per token`);let a=[...t];for(;a.length<n;)a.push(new r.Utxo({amount:0n,erc20TokenAddress:i.erc20TokenAddress,mintAddress:i.mintAddress,nullifyingKey:e.getShieldedPrivateKey(),spendingPublicKey:e.getSpendingKeyPair().pubSpendingBJJPoint}));return a})},h=(e,t,n)=>{if(t.length!==1||t[0].length!==1)throw Error(`selfOutputAmounts only supports a single token with a single self-output`);let i=t[0][0],a=n.reduce((e,t)=>e+t,0n);if(a!==i.amount)throw Error(`selfOutputAmounts sum to ${a}, expected ${i.amount}`);return[n.map(t=>new r.Utxo({amount:t,erc20TokenAddress:i.erc20TokenAddress,mintAddress:i.mintAddress,nullifyingKey:e.getShieldedPrivateKey(),timeStamp:i.timeStamp,spendingPublicKey:e.getSpendingKeyPair().pubSpendingBJJPoint}))]},g=async(e,r,i)=>{let{chainId:s,erc20Addresses:c,amountChanges:d,externalAddress:f,externalActionId:p,externalActionMetadata:g,feeStructure:_,relay:v,onChainCreation:y,recipientAddress:b,recipientAmounts:x,useBlockedUtxos:S,inputUtxos:C,forceEmptyUtxos:w,originalSender:T,subAccountPrivateKey:E,emporiumOps:D,createBlockedUtxos:O,selfOutputAmounts:k,speculative:A,slippageValues:j}=r,M=C?m(i,C):[...await a.addPaddingToUtxos(e,s,c,d,void 0,w,S,y)],N=o.buildOutputUtxos(i,M,d,b,x),P=k?h(i,N,k):N,F=e.merkleTreeHinkalByChain[s],I=A?l.speculativeMerkleTree(F,M,A.pendingLeaves):F,{zkCallData:L,circomData:R,dimData:z,commitmentValidationData:B}=await u.constructZkProof(I,M,P,i,p??0n,f,D??g??`0x00`,_??n.zeroFeeStructure,v??t.zeroAddress,s,y,void 0,T,E,void 0,O,I!==F,j);return{zkCallData:L,circomData:R,dimData:z,commitmentValidationData:B}},_=async(t,n,r)=>{let{chainId:i,erc20Addresses:a,externalAddress:o,amountChanges:s,relay:l,feeStructure:u,externalActionId:d,externalActionMetadata:f,onChainCreation:p,recipientAddress:m,recipientAmounts:h,useBlockedUtxos:g,createBlockedUtxos:_,skipLock:v,selfOutputAmounts:y,forceEmptyUtxos:b,messageSeed:x,inputUtxos:S,originalSender:C,speculative:w,slippageValues:T}=n,{jobId:E,signedMessageHash:D}=await c.prepareTxEnclaveCall(t,{chainId:i,hinkalAddress:e.networkRegistry[i].contractData.hinkalAddress,erc20Addresses:a,externalAddress:o,originalSender:C,amountChanges:s,relay:l,feeStructure:u,externalActionId:d,externalActionMetadata:f,onChainCreation:p,recipientAddress:m,recipientAmounts:h,useBlockedUtxos:g,createBlockedUtxos:_,skipLock:v,selfOutputAmounts:y,forceEmptyUtxos:b,messageSeed:x,inputCommitments:w?void 0:c.collectInputCommitments(S),speculative:w,slippageValues:T},r),{R8:O,S:k}=r.signEddsa(BigInt(D));return{jobId:E,eddsaSignature:{R8:O,S:k}}},v=async(e,t,n)=>{let r=await d.submitProof(e,t,n);return t.submit.mode!==i.SubmitMode.ProofOnly&&t.onTxSubmitLocally?.(n.circomData),r},y=async(e,t)=>{if(t.userKeys&&!t.inputUtxos)throw Error(`hinkalTransact: userKeys requires explicit inputUtxos`);let n=t.userKeys??e.userKeys,{chainId:r,submit:a}=t;if(e.generateProofRemotely){let{jobId:o,eddsaSignature:l}=await _(e,t,n);if(a.mode===i.SubmitMode.Relayer)return c.finalizeTxEnclaveCallRelay(o,l,r,{adminData:a.adminData,authorizationData:a.authorizationData,withUniswapWorkAround:a.withUniswapWorkAround});let{zkCallData:u,circomData:d,dimData:f,commitmentValidationData:p,tronProofSignature:m}=await c.finalizeTxEnclaveCall(o,l);return v(e,t,{zkCallData:u,circomData:s.deserializeCircomData(d),dimData:f,commitmentValidationData:p,tronProofSignature:m})}return v(e,t,await g(e,t,n))};exports.hinkalTransact=y;

package/common/src/data-structures/Hinkal/hinkalTransact.mjs

@@ -39,7 +39,7 @@ var h = 2, g = 6, _ = (e, t) => {
 		spendingPublicKey: e.getSpendingKeyPair().pubSpendingBJJPoint
 	}))];
 }, y = async (e, r, i) => {
-	let { chainId: s, erc20Addresses: c, amountChanges: l, externalAddress: u, externalActionId: d, externalActionMetadata: m, feeStructure: h, relay: g, onChainCreation: y, recipientAddress: b, recipientAmounts: x, useBlockedUtxos: S, inputUtxos: C, forceEmptyUtxos: w, originalSender: T, subAccountPrivateKey: E, emporiumOps: D, createBlockedUtxos: O, selfOutputAmounts: k, speculative: A, slippageValues: j } = r, M = C ? _(i, C) : [...await a(e, s, c, l, void 0, w, S)], N = o(i, M, l, b, x), P = k ? v(i, N, k) : N, F = e.merkleTreeHinkalByChain[s], I = A ? f(F, M, A.pendingLeaves) : F, { zkCallData: L, circomData: R, dimData: z, commitmentValidationData: B } = await p(I, M, P, i, d ?? 0n, u, D ?? m ?? "0x00", h ?? n, g ?? t, s, y, void 0, T, E, void 0, O, I !== F, j);
+	let { chainId: s, erc20Addresses: c, amountChanges: l, externalAddress: u, externalActionId: d, externalActionMetadata: m, feeStructure: h, relay: g, onChainCreation: y, recipientAddress: b, recipientAmounts: x, useBlockedUtxos: S, inputUtxos: C, forceEmptyUtxos: w, originalSender: T, subAccountPrivateKey: E, emporiumOps: D, createBlockedUtxos: O, selfOutputAmounts: k, speculative: A, slippageValues: j } = r, M = C ? _(i, C) : [...await a(e, s, c, l, void 0, w, S, y)], N = o(i, M, l, b, x), P = k ? v(i, N, k) : N, F = e.merkleTreeHinkalByChain[s], I = A ? f(F, M, A.pendingLeaves) : F, { zkCallData: L, circomData: R, dimData: z, commitmentValidationData: B } = await p(I, M, P, i, d ?? 0n, u, D ?? m ?? "0x00", h ?? n, g ?? t, s, y, void 0, T, E, void 0, O, I !== F, j);
 	return {
 		zkCallData: L,
 		circomData: R,

package/common/src/data-structures/Hinkal/hinkalTransfer.cjs

@@ -1 +1 @@
-const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../functions/utils/addresses.cjs`),r=require(`../../functions/utils/tron.utils.cjs`),i=require(`../../types/external-action.types.cjs`),a=require(`../../types/transact.types.cjs`),o=require(`../../functions/utils/token-check.utils.cjs`),s=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),c=require(`../../functions/pre-transaction/constructAdminData.cjs`),l=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const u=require(`./hinkalTransact.cjs`),d=require(`../../functions/utils/fees.utils.cjs`),f=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var p=async(p,m,h,g,_,v,y)=>{let b=o.validateAndGetChainId(m);if(!n.isValidPrivateAddress(g))throw Error(t.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let x=r.addressToHexFormat(await p.getEthereumAddressByChain(b)),S=m.map(e=>e.erc20TokenAddress),C=await s.modifyVolatileTokenAmountChanges(b,m,h),w=v??await l.getFeeStructure(b,_,S,i.ExternalActionId.Transact,[],5n);w.variableRate||=e.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let T=m[0];if(!T)throw Error(`Transfer Action: No Token Found`);let E=-C[0],D=await d.calculateModifiedFeeStructure(b,T,E,w);await f.mergeWithFeeStructure(b,S,C,D);let O=await p.getRandomRelay(b,!0);if(!O)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let k=c.constructAdminData(y,b,S,C,x);return u.hinkalTransact(p,{chainId:b,erc20Addresses:S,amountChanges:C,externalAddress:O,feeStructure:D,relay:O,recipientAddress:[g],recipientAmounts:[S.map((e,t)=>t===0?E:0n)],submit:{mode:a.SubmitMode.Relayer,adminData:k}})};exports.hinkalTransfer=p;
+const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../functions/utils/tron.utils.cjs`),r=require(`../../functions/utils/addresses.cjs`),i=require(`../../types/external-action.types.cjs`),a=require(`../../types/transact.types.cjs`),o=require(`../../functions/utils/token-check.utils.cjs`),s=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),c=require(`../../functions/pre-transaction/constructAdminData.cjs`),l=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const u=require(`./hinkalTransact.cjs`),d=require(`../../functions/utils/fees.utils.cjs`),f=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var p=async(p,m,h,g,_,v,y)=>{let b=o.validateAndGetChainId(m);if(!r.isValidPrivateAddress(g))throw Error(t.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let x=n.addressToHexFormat(await p.getEthereumAddressByChain(b)),S=m.map(e=>e.erc20TokenAddress),C=await s.modifyVolatileTokenAmountChanges(b,m,h),w=v??await l.getFeeStructure(b,_,S,i.ExternalActionId.Transact,[],5n);w.variableRate||=e.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let T=m[0];if(!T)throw Error(`Transfer Action: No Token Found`);let E=-C[0],D=await d.calculateModifiedFeeStructure(b,T,E,w);await f.mergeWithFeeStructure(b,S,C,D);let O=await p.getRandomRelay(b,!0);if(!O)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let k=c.constructAdminData(y,b,S,C,x);return u.hinkalTransact(p,{chainId:b,erc20Addresses:S,amountChanges:C,externalAddress:O,feeStructure:D,relay:O,recipientAddress:[g],recipientAmounts:[S.map((e,t)=>t===0?E:0n)],submit:{mode:a.SubmitMode.Relayer,adminData:k}})};exports.hinkalTransfer=p;

package/common/src/data-structures/Hinkal/hinkalTransfer.mjs

@@ -1,7 +1,7 @@
 import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as e } from "../../constants/protocol.constants.mjs";
 import { transactionErrorCodes as t } from "../../error-handling/error-codes.constants.mjs";
-import { isValidPrivateAddress as n } from "../../functions/utils/addresses.mjs";
-import { addressToHexFormat as r } from "../../functions/utils/tron.utils.mjs";
+import { addressToHexFormat as n } from "../../functions/utils/tron.utils.mjs";
+import { isValidPrivateAddress as r } from "../../functions/utils/addresses.mjs";
 import { ExternalActionId as i } from "../../types/external-action.types.mjs";
 import { SubmitMode as a } from "../../types/transact.types.mjs";
 import { validateAndGetChainId as o } from "../../functions/utils/token-check.utils.mjs";
@@ -15,8 +15,8 @@ import { mergeWithFeeStructure as f } from "../../functions/pre-transaction/merg
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalTransfer.ts
 var p = async (p, m, h, g, _, v, y) => {
 	let b = o(m);
-	if (!n(g)) throw Error(t.RECIPIENT_FORMAT_INCORRECT);
-	let x = r(await p.getEthereumAddressByChain(b)), S = m.map((e) => e.erc20TokenAddress), C = await s(b, m, h), w = v ?? await l(b, _, S, i.Transact, [], 5n);
+	if (!r(g)) throw Error(t.RECIPIENT_FORMAT_INCORRECT);
+	let x = n(await p.getEthereumAddressByChain(b)), S = m.map((e) => e.erc20TokenAddress), C = await s(b, m, h), w = v ?? await l(b, _, S, i.Transact, [], 5n);
 	w.variableRate ||= e;
 	let T = m[0];
 	if (!T) throw Error("Transfer Action: No Token Found");

package/common/src/data-structures/Hinkal/hinkalWithdrawStuckUtxos.cjs

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../functions/utils/amounts.utils.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/utils/encodeTokenWithId.cjs`),i=require(`../../functions/utils/addresses.cjs`),a=require(`../../functions/utils/tron.utils.cjs`),o=require(`../../functions/web3/events/getInputUtxoAndBalance.cjs`),s=require(`../../types/external-action.types.cjs`),c=require(`../../types/transact.types.cjs`),l=require(`../../types/solana-transact.types.cjs`),u=require(`../../error-handling/logger.cjs`),d=require(`../../functions/utils/token-check.utils.cjs`),f=require(`../../functions/snarkjs/constructTxEnclave.cjs`),p=require(`../../functions/pre-transaction/getFeeStructure.cjs`),m=require(`./hinkalTransact.cjs`),h=require(`../../functions/auto-deposit-back-helpers/update-hinkal.cjs`),g=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`),_=require(`./hinkalSolanaTransact.cjs`);var v=6,y=async(t,r,o,c)=>{let l=o.erc20TokenAddress,d=await t.getEthereumAddressByChain(r),[m,h]=await Promise.all([p.getFeeStructure(r,l,[l],s.ExternalActionId.Transact),t.getRandomRelay(r,!0)]);if(!h)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let g=await f.prepareStuckWithdrawEnclaveCall(t,{chainId:r,hinkalAddress:e.networkRegistry[r].contractData.hinkalAddress,erc20Address:l,externalAddress:a.addressToHexFormat(c),relay:h,feeStructure:m,hashedEthereumAddress:i.hashEthereumAddress(d)}),_=[];for(let e=0;e<g.length;e+=1)try{let{jobId:n,signedMessageHash:i}=g[e],{R8:a,S:o}=t.userKeys.signEddsa(BigInt(i));_.push(await f.finalizeTxEnclaveCallRelay(n,{R8:a,S:o},r))}catch(e){if(!_.length)throw e;return u.Logger.error(`Stuck withdrawal partially submitted (${_.length}/${g.length})`,e),_}return _},b=async(e,t,n)=>{let r=await Promise.all(Array.from({length:v},async(r,i)=>{let a=i+1,o=await p.getFeeStructure(e,t,[t],s.ExternalActionId.Transact,void 0,void 0,{mintTo:t,recipient:n,nullifierCount:a});return[String(a),o]}));return Object.fromEntries(r)},x=async(e,t,r,a)=>{let o=r.erc20TokenAddress,[s,c,l]=await Promise.all([e.getEthereumAddressByChain(t),e.getRandomRelay(t,!0),b(t,o,a)]);if(!c)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let u=await f.prepareSolanaStuckWithdrawEnclaveCall(e,{chainId:t,mintAddress:o,recipient:a,relayAddress:c,accounts:{recipient:a,mint:o===`11111111111111111111111111111111`?void 0:o},feeStructures:l,hashedEthereumAddress:i.hashEthereumAddress(s)}),d=[];for(let n=0;n<u.length;n+=1){let{jobId:r,signedMessageHash:i}=u[n],{R8:a,S:o}=e.userKeys.signEddsa(BigInt(i));d.push(await f.finalizeSolanaTxEnclaveCallRelay(r,{R8:a,S:o},t))}return d},S=async(e,t,r,i,o)=>{let l=[r.erc20TokenAddress],u=r.erc20TokenAddress,[d,f]=await Promise.all([p.getFeeStructure(t,u,l,s.ExternalActionId.Transact),e.getRandomRelay(t,!0)]);if(!f)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let _=a.addressToHexFormat(o),v=i-d.flatFee;if(v<=0n)throw Error(`Insufficient balance to cover fee. Balance: ${i}, Fee: ${d.flatFee}`);let y=[-v];return await g.mergeWithFeeStructure(t,l,y,d),{tx:await m.hinkalTransact(e,{chainId:t,erc20Addresses:l,amountChanges:y,externalAddress:_,feeStructure:d,relay:f,useBlockedUtxos:!0,onTxSubmitLocally:n=>{h.updateHinkal(t,e,n.inputNullifiers?.flat(),n.outCommitments?.flat(),n.encryptedOutputs?.flat())},submit:{mode:c.SubmitMode.Relayer}}),amountToRecipient:v}},C=async(t,r,i,a,o,c)=>{let u=[i.erc20TokenAddress],{originalDeployer:d}=e.networkRegistry[r].contractData;if(!d)throw Error(`missing data`);let f=i.erc20TokenAddress,[m,g]=await Promise.all([p.getFeeStructure(r,f,u,s.ExternalActionId.Transact,void 0,void 0,{mintTo:u[0],recipient:o,nullifierCount:c}),t.getRandomRelay(r,!0)]);if(!g)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let v=a-m.flatFee;if(v<=0n)throw Error(`Insufficient balance to cover fee. Balance: ${a}, Fee: ${m.flatFee}`);let y=[-v];return y[0]-=m.flatFee,{tx:await _.hinkalSolanaTransact(t,{chainId:r,mintAddresses:u,amountChanges:y,relayAddress:g,recipient:o,signer:g,functionName:`transact`,accounts:{recipient:o,mint:u[0]===`11111111111111111111111111111111`?void 0:u[0]},relayerFee:m.flatFee,variableRate:m.variableRate,useBlockedUtxos:!0,onTxSubmitLocally:({inputNullifiers:e,outCommitments:n,encryptedOutputs:i})=>{h.updateHinkal(r,t,e,n,i)},submit:{mode:l.SolanaSubmitMode.Relayer}}),amountToRecipient:v}},w=async(t,n,r,i,a,o)=>e.isSolanaLike(n)?C(t,n,r,i,a,o):S(t,n,r,i,a),T=async(i,a,s)=>{let c=d.validateAndGetChainId([a]);if(i.generateProofRemotely){let t=e.isSolanaLike(c)?await x(i,c,a,s):await y(i,c,a,s);if(!t.length)throw Error(n.transactionErrorCodes.NO_STUCK_BALANCE_TO_WITHDRAW);return t}let l=[],f=r.normalizeTokenAddress(c,a.erc20TokenAddress);await i.resetMerkleTreesIfNecessary([c]);let p=((await o.getInputUtxoAndBalancePerToken({hinkal:i,sliceIfMore6:!1,useBlockedUtxos:!0,chainId:c}))?.get(f)??[]).filter(e=>e.amount>0n).sort((e,t)=>Number(t.amount-e.amount));if(!p.length)throw Error(n.transactionErrorCodes.NO_STUCK_BALANCE_TO_WITHDRAW);for(let e=0;e<p.length;e+=v){let n=p.slice(e,e+v),r=t.countTotalAmountInUtxos(n);try{let{tx:e}=await w(i,c,a,r,s,n.length);l.push(e)}catch(e){if(!l.length)throw e;return u.Logger.error(`Stuck withdrawal partially submitted (${l.length}/${Math.ceil(p.length/v)})`,e),l}}return l};exports.hinkalWithdrawStuckUtxos=T;
+const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../functions/utils/caseInsensitive.utils.cjs`),n=require(`../../functions/utils/amounts.utils.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/utils/encodeTokenWithId.cjs`),a=require(`../../error-handling/logger.cjs`),o=require(`../../functions/utils/tron.utils.cjs`),s=require(`../../functions/utils/addresses.cjs`),c=require(`../../functions/web3/events/getInputUtxoAndBalance.cjs`),l=require(`../../types/external-action.types.cjs`),u=require(`../../types/transact.types.cjs`),d=require(`../../types/solana-transact.types.cjs`),f=require(`../../functions/utils/token-check.utils.cjs`),p=require(`../../functions/snarkjs/constructTxEnclave.cjs`),m=require(`../../functions/pre-transaction/getFeeStructure.cjs`),h=require(`./hinkalTransact.cjs`),g=require(`../../functions/auto-deposit-back-helpers/update-hinkal.cjs`),_=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`),v=require(`./hinkalSolanaTransact.cjs`);var y=6,b=async(t,n,i,c)=>{let u=i.erc20TokenAddress,d=await t.getEthereumAddressByChain(n),[f,h]=await Promise.all([m.getFeeStructure(n,u,[u],l.ExternalActionId.Transact),t.getRandomRelay(n,!0)]);if(!h)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let g=await p.prepareStuckWithdrawEnclaveCall(t,{chainId:n,hinkalAddress:e.networkRegistry[n].contractData.hinkalAddress,erc20Address:u,externalAddress:o.addressToHexFormat(c),relay:h,feeStructure:f,hashedEthereumAddress:s.hashEthereumAddress(d)}),_=[];for(let e=0;e<g.length;e+=1)try{let{jobId:r,signedMessageHash:i}=g[e],{R8:a,S:o}=t.userKeys.signEddsa(BigInt(i));_.push(await p.finalizeTxEnclaveCallRelay(r,{R8:a,S:o},n))}catch(e){if(!_.length)throw e;return a.Logger.error(`Stuck withdrawal partially submitted (${_.length}/${g.length})`,e),_}return _},x=async(e,t,n)=>{let r=await Promise.all(Array.from({length:y},async(r,i)=>{let a=i+1,o=await m.getFeeStructure(e,t,[t],l.ExternalActionId.Transact,void 0,void 0,{mintTo:t,recipient:n,nullifierCount:a});return[String(a),o]}));return Object.fromEntries(r)},S=async(e,t,n,i)=>{let a=n.erc20TokenAddress,[o,c,l]=await Promise.all([e.getEthereumAddressByChain(t),e.getRandomRelay(t,!0),x(t,a,i)]);if(!c)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let u=await p.prepareSolanaStuckWithdrawEnclaveCall(e,{chainId:t,mintAddress:a,recipient:i,relayAddress:c,accounts:{recipient:i,mint:a===`11111111111111111111111111111111`?void 0:a},feeStructures:l,hashedEthereumAddress:s.hashEthereumAddress(o)}),d=[];for(let n=0;n<u.length;n+=1){let{jobId:r,signedMessageHash:i}=u[n],{R8:a,S:o}=e.userKeys.signEddsa(BigInt(i));d.push(await p.finalizeSolanaTxEnclaveCallRelay(r,{R8:a,S:o},t))}return d},C=async(e,t,n,i,a)=>{let s=[n.erc20TokenAddress],c=n.erc20TokenAddress,[d,f]=await Promise.all([m.getFeeStructure(t,c,s,l.ExternalActionId.Transact),e.getRandomRelay(t,!0)]);if(!f)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let p=o.addressToHexFormat(a),v=i-d.flatFee;if(v<=0n)throw Error(`Insufficient balance to cover fee. Balance: ${i}, Fee: ${d.flatFee}`);let y=[-v];return await _.mergeWithFeeStructure(t,s,y,d),{tx:await h.hinkalTransact(e,{chainId:t,erc20Addresses:s,amountChanges:y,externalAddress:p,feeStructure:d,relay:f,useBlockedUtxos:!0,onTxSubmitLocally:n=>{g.updateHinkal(t,e,n.inputNullifiers?.flat(),n.outCommitments?.flat(),n.encryptedOutputs?.flat())},submit:{mode:u.SubmitMode.Relayer}}),amountToRecipient:v}},w=async(t,n,i,a,o,s)=>{let c=[i.erc20TokenAddress],{originalDeployer:u}=e.networkRegistry[n].contractData;if(!u)throw Error(`missing data`);let f=i.erc20TokenAddress,[p,h]=await Promise.all([m.getFeeStructure(n,f,c,l.ExternalActionId.Transact,void 0,void 0,{mintTo:c[0],recipient:o,nullifierCount:s}),t.getRandomRelay(n,!0)]);if(!h)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let _=a-p.flatFee;if(_<=0n)throw Error(`Insufficient balance to cover fee. Balance: ${a}, Fee: ${p.flatFee}`);let y=[-_];return y[0]-=p.flatFee,{tx:await v.hinkalSolanaTransact(t,{chainId:n,mintAddresses:c,amountChanges:y,relayAddress:h,recipient:o,signer:h,functionName:`transact`,accounts:{recipient:o,mint:c[0]===`11111111111111111111111111111111`?void 0:c[0]},relayerFee:p.flatFee,variableRate:p.variableRate,useBlockedUtxos:!0,onTxSubmitLocally:({inputNullifiers:e,outCommitments:r,encryptedOutputs:i})=>{g.updateHinkal(n,t,e,r,i)},submit:{mode:d.SolanaSubmitMode.Relayer}}),amountToRecipient:_}},T=async(t,n,r,i,a,o)=>e.isSolanaLike(n)?w(t,n,r,i,a,o):C(t,n,r,i,a),E=async(e,n,r)=>{try{return((await e.getStuckShieldedBalances([n])).get(n)??[]).find(e=>t.caseInsensitiveEqual(e.token.erc20TokenAddress,r.erc20TokenAddress))?.balance??0n}catch(e){return a.Logger.error(`Failed to read stuck balance after an empty stuck withdrawal`,e),0n}},D=async(t,o,s)=>{let l=f.validateAndGetChainId([o]);if(t.generateProofRemotely){let n=e.isSolanaLike(l)?await S(t,l,o,s):await b(t,l,o,s);if(!n.length)throw await E(t,l,o)>0n?Error(r.DIRECTLY_SHOW_MESSAGE_ERROR_CODES.INSUFFICIENT_FUNDS_FOR_RECOVERY_FEES):Error(r.transactionErrorCodes.NO_STUCK_BALANCE_TO_WITHDRAW);return n}let u=[],d=i.normalizeTokenAddress(l,o.erc20TokenAddress);await t.resetMerkleTreesIfNecessary([l]);let p=((await c.getInputUtxoAndBalancePerToken({hinkal:t,sliceIfMore6:!1,useBlockedUtxos:!0,chainId:l}))?.get(d)??[]).filter(e=>e.amount>0n).sort((e,t)=>Number(t.amount-e.amount));if(!p.length)throw Error(r.transactionErrorCodes.NO_STUCK_BALANCE_TO_WITHDRAW);for(let e=0;e<p.length;e+=y){let r=p.slice(e,e+y),i=n.countTotalAmountInUtxos(r);try{let{tx:e}=await T(t,l,o,i,s,r.length);u.push(e)}catch(e){if(!u.length)throw e;return a.Logger.error(`Stuck withdrawal partially submitted (${u.length}/${Math.ceil(p.length/y)})`,e),u}}return u};exports.hinkalWithdrawStuckUtxos=D;

package/common/src/data-structures/Hinkal/hinkalWithdrawStuckUtxos.mjs

@@ -1,49 +1,50 @@
 import { isSolanaLike as e, networkRegistry as t } from "../../constants/chains.constants.mjs";
 import "../../constants/protocol.constants.mjs";
-import { countTotalAmountInUtxos as n } from "../../functions/utils/amounts.utils.mjs";
-import { transactionErrorCodes as r } from "../../error-handling/error-codes.constants.mjs";
-import { normalizeTokenAddress as i } from "../../functions/utils/encodeTokenWithId.mjs";
-import { hashEthereumAddress as a } from "../../functions/utils/addresses.mjs";
-import { addressToHexFormat as o } from "../../functions/utils/tron.utils.mjs";
-import { getInputUtxoAndBalancePerToken as s } from "../../functions/web3/events/getInputUtxoAndBalance.mjs";
-import { ExternalActionId as c } from "../../types/external-action.types.mjs";
-import { SubmitMode as l } from "../../types/transact.types.mjs";
-import { SolanaSubmitMode as u } from "../../types/solana-transact.types.mjs";
-import { Logger as d } from "../../error-handling/logger.mjs";
-import { validateAndGetChainId as f } from "../../functions/utils/token-check.utils.mjs";
-import { finalizeSolanaTxEnclaveCallRelay as p, finalizeTxEnclaveCallRelay as m, prepareSolanaStuckWithdrawEnclaveCall as h, prepareStuckWithdrawEnclaveCall as g } from "../../functions/snarkjs/constructTxEnclave.mjs";
-import { getFeeStructure as _ } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { hinkalTransact as v } from "./hinkalTransact.mjs";
-import { updateHinkal as y } from "../../functions/auto-deposit-back-helpers/update-hinkal.mjs";
-import { mergeWithFeeStructure as b } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
-import { hinkalSolanaTransact as x } from "./hinkalSolanaTransact.mjs";
+import { caseInsensitiveEqual as n } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { countTotalAmountInUtxos as r } from "../../functions/utils/amounts.utils.mjs";
+import { DIRECTLY_SHOW_MESSAGE_ERROR_CODES as i, transactionErrorCodes as a } from "../../error-handling/error-codes.constants.mjs";
+import { normalizeTokenAddress as o } from "../../functions/utils/encodeTokenWithId.mjs";
+import { Logger as s } from "../../error-handling/logger.mjs";
+import { addressToHexFormat as c } from "../../functions/utils/tron.utils.mjs";
+import { hashEthereumAddress as l } from "../../functions/utils/addresses.mjs";
+import { getInputUtxoAndBalancePerToken as u } from "../../functions/web3/events/getInputUtxoAndBalance.mjs";
+import { ExternalActionId as d } from "../../types/external-action.types.mjs";
+import { SubmitMode as f } from "../../types/transact.types.mjs";
+import { SolanaSubmitMode as p } from "../../types/solana-transact.types.mjs";
+import { validateAndGetChainId as m } from "../../functions/utils/token-check.utils.mjs";
+import { finalizeSolanaTxEnclaveCallRelay as h, finalizeTxEnclaveCallRelay as g, prepareSolanaStuckWithdrawEnclaveCall as _, prepareStuckWithdrawEnclaveCall as v } from "../../functions/snarkjs/constructTxEnclave.mjs";
+import { getFeeStructure as y } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { hinkalTransact as b } from "./hinkalTransact.mjs";
+import { updateHinkal as x } from "../../functions/auto-deposit-back-helpers/update-hinkal.mjs";
+import { mergeWithFeeStructure as S } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+import { hinkalSolanaTransact as C } from "./hinkalSolanaTransact.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalWithdrawStuckUtxos.ts
-var S = 6, C = async (e, n, i, s) => {
-	let l = i.erc20TokenAddress, u = await e.getEthereumAddressByChain(n), [f, p] = await Promise.all([_(n, l, [l], c.Transact), e.getRandomRelay(n, !0)]);
-	if (!p) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let h = await g(e, {
+var w = 6, T = async (e, n, r, i) => {
+	let o = r.erc20TokenAddress, u = await e.getEthereumAddressByChain(n), [f, p] = await Promise.all([y(n, o, [o], d.Transact), e.getRandomRelay(n, !0)]);
+	if (!p) throw Error(a.RELAYER_NOT_AVAILABLE);
+	let m = await v(e, {
 		chainId: n,
 		hinkalAddress: t[n].contractData.hinkalAddress,
-		erc20Address: l,
-		externalAddress: o(s),
+		erc20Address: o,
+		externalAddress: c(i),
 		relay: p,
 		feeStructure: f,
-		hashedEthereumAddress: a(u)
-	}), v = [];
-	for (let t = 0; t < h.length; t += 1) try {
-		let { jobId: r, signedMessageHash: i } = h[t], { R8: a, S: o } = e.userKeys.signEddsa(BigInt(i));
-		v.push(await m(r, {
+		hashedEthereumAddress: l(u)
+	}), h = [];
+	for (let t = 0; t < m.length; t += 1) try {
+		let { jobId: r, signedMessageHash: i } = m[t], { R8: a, S: o } = e.userKeys.signEddsa(BigInt(i));
+		h.push(await g(r, {
 			R8: a,
 			S: o
 		}, n));
 	} catch (e) {
-		if (!v.length) throw e;
-		return d.error(`Stuck withdrawal partially submitted (${v.length}/${h.length})`, e), v;
+		if (!h.length) throw e;
+		return s.error(`Stuck withdrawal partially submitted (${h.length}/${m.length})`, e), h;
 	}
-	return v;
-}, w = async (e, t, n) => {
-	let r = await Promise.all(Array.from({ length: S }, async (r, i) => {
-		let a = i + 1, o = await _(e, t, [t], c.Transact, void 0, void 0, {
+	return h;
+}, E = async (e, t, n) => {
+	let r = await Promise.all(Array.from({ length: w }, async (r, i) => {
+		let a = i + 1, o = await y(e, t, [t], d.Transact, void 0, void 0, {
 			mintTo: t,
 			recipient: n,
 			nullifierCount: a
@@ -51,71 +52,71 @@ var S = 6, C = async (e, n, i, s) => {
 		return [String(a), o];
 	}));
 	return Object.fromEntries(r);
-}, T = async (e, t, n, i) => {
-	let o = n.erc20TokenAddress, [s, c, l] = await Promise.all([
+}, D = async (e, t, n, r) => {
+	let i = n.erc20TokenAddress, [o, s, c] = await Promise.all([
 		e.getEthereumAddressByChain(t),
 		e.getRandomRelay(t, !0),
-		w(t, o, i)
+		E(t, i, r)
 	]);
-	if (!c) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let u = await h(e, {
+	if (!s) throw Error(a.RELAYER_NOT_AVAILABLE);
+	let u = await _(e, {
 		chainId: t,
-		mintAddress: o,
-		recipient: i,
-		relayAddress: c,
+		mintAddress: i,
+		recipient: r,
+		relayAddress: s,
 		accounts: {
-			recipient: i,
-			mint: o === "11111111111111111111111111111111" ? void 0 : o
+			recipient: r,
+			mint: i === "11111111111111111111111111111111" ? void 0 : i
 		},
-		feeStructures: l,
-		hashedEthereumAddress: a(s)
+		feeStructures: c,
+		hashedEthereumAddress: l(o)
 	}), d = [];
 	for (let n = 0; n < u.length; n += 1) {
 		let { jobId: r, signedMessageHash: i } = u[n], { R8: a, S: o } = e.userKeys.signEddsa(BigInt(i));
-		d.push(await p(r, {
+		d.push(await h(r, {
 			R8: a,
 			S: o
 		}, t));
 	}
 	return d;
-}, E = async (e, t, n, i, a) => {
-	let s = [n.erc20TokenAddress], u = n.erc20TokenAddress, [d, f] = await Promise.all([_(t, u, s, c.Transact), e.getRandomRelay(t, !0)]);
-	if (!f) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let p = o(a), m = i - d.flatFee;
-	if (m <= 0n) throw Error(`Insufficient balance to cover fee. Balance: ${i}, Fee: ${d.flatFee}`);
+}, O = async (e, t, n, r, i) => {
+	let o = [n.erc20TokenAddress], s = n.erc20TokenAddress, [l, u] = await Promise.all([y(t, s, o, d.Transact), e.getRandomRelay(t, !0)]);
+	if (!u) throw Error(a.RELAYER_NOT_AVAILABLE);
+	let p = c(i), m = r - l.flatFee;
+	if (m <= 0n) throw Error(`Insufficient balance to cover fee. Balance: ${r}, Fee: ${l.flatFee}`);
 	let h = [-m];
-	return await b(t, s, h, d), {
-		tx: await v(e, {
+	return await S(t, o, h, l), {
+		tx: await b(e, {
 			chainId: t,
-			erc20Addresses: s,
+			erc20Addresses: o,
 			amountChanges: h,
 			externalAddress: p,
-			feeStructure: d,
-			relay: f,
+			feeStructure: l,
+			relay: u,
 			useBlockedUtxos: !0,
 			onTxSubmitLocally: (n) => {
-				y(t, e, n.inputNullifiers?.flat(), n.outCommitments?.flat(), n.encryptedOutputs?.flat());
+				x(t, e, n.inputNullifiers?.flat(), n.outCommitments?.flat(), n.encryptedOutputs?.flat());
 			},
-			submit: { mode: l.Relayer }
+			submit: { mode: f.Relayer }
 		}),
 		amountToRecipient: m
 	};
-}, D = async (e, n, i, a, o, s) => {
-	let l = [i.erc20TokenAddress], { originalDeployer: d } = t[n].contractData;
-	if (!d) throw Error("missing data");
-	let f = i.erc20TokenAddress, [p, m] = await Promise.all([_(n, f, l, c.Transact, void 0, void 0, {
-		mintTo: l[0],
+}, k = async (e, n, r, i, o, s) => {
+	let c = [r.erc20TokenAddress], { originalDeployer: l } = t[n].contractData;
+	if (!l) throw Error("missing data");
+	let u = r.erc20TokenAddress, [f, m] = await Promise.all([y(n, u, c, d.Transact, void 0, void 0, {
+		mintTo: c[0],
 		recipient: o,
 		nullifierCount: s
 	}), e.getRandomRelay(n, !0)]);
-	if (!m) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let h = a - p.flatFee;
-	if (h <= 0n) throw Error(`Insufficient balance to cover fee. Balance: ${a}, Fee: ${p.flatFee}`);
+	if (!m) throw Error(a.RELAYER_NOT_AVAILABLE);
+	let h = i - f.flatFee;
+	if (h <= 0n) throw Error(`Insufficient balance to cover fee. Balance: ${i}, Fee: ${f.flatFee}`);
 	let g = [-h];
-	return g[0] -= p.flatFee, {
-		tx: await x(e, {
+	return g[0] -= f.flatFee, {
+		tx: await C(e, {
 			chainId: n,
-			mintAddresses: l,
+			mintAddresses: c,
 			amountChanges: g,
 			relayAddress: m,
 			recipient: o,
@@ -123,45 +124,51 @@ var S = 6, C = async (e, n, i, s) => {
 			functionName: "transact",
 			accounts: {
 				recipient: o,
-				mint: l[0] === "11111111111111111111111111111111" ? void 0 : l[0]
+				mint: c[0] === "11111111111111111111111111111111" ? void 0 : c[0]
 			},
-			relayerFee: p.flatFee,
-			variableRate: p.variableRate,
+			relayerFee: f.flatFee,
+			variableRate: f.variableRate,
 			useBlockedUtxos: !0,
 			onTxSubmitLocally: ({ inputNullifiers: t, outCommitments: r, encryptedOutputs: i }) => {
-				y(n, e, t, r, i);
+				x(n, e, t, r, i);
 			},
-			submit: { mode: u.Relayer }
+			submit: { mode: p.Relayer }
 		}),
 		amountToRecipient: h
 	};
-}, O = async (t, n, r, i, a, o) => e(n) ? D(t, n, r, i, a, o) : E(t, n, r, i, a), k = async (t, a, o) => {
-	let c = f([a]);
+}, A = async (t, n, r, i, a, o) => e(n) ? k(t, n, r, i, a, o) : O(t, n, r, i, a), j = async (e, t, r) => {
+	try {
+		return ((await e.getStuckShieldedBalances([t])).get(t) ?? []).find((e) => n(e.token.erc20TokenAddress, r.erc20TokenAddress))?.balance ?? 0n;
+	} catch (e) {
+		return s.error("Failed to read stuck balance after an empty stuck withdrawal", e), 0n;
+	}
+}, M = async (t, n, c) => {
+	let l = m([n]);
 	if (t.generateProofRemotely) {
-		let n = e(c) ? await T(t, c, a, o) : await C(t, c, a, o);
-		if (!n.length) throw Error(r.NO_STUCK_BALANCE_TO_WITHDRAW);
-		return n;
+		let r = e(l) ? await D(t, l, n, c) : await T(t, l, n, c);
+		if (!r.length) throw await j(t, l, n) > 0n ? Error(i.INSUFFICIENT_FUNDS_FOR_RECOVERY_FEES) : Error(a.NO_STUCK_BALANCE_TO_WITHDRAW);
+		return r;
 	}
-	let l = [], u = i(c, a.erc20TokenAddress);
-	await t.resetMerkleTreesIfNecessary([c]);
-	let p = ((await s({
+	let d = [], f = o(l, n.erc20TokenAddress);
+	await t.resetMerkleTreesIfNecessary([l]);
+	let p = ((await u({
 		hinkal: t,
 		sliceIfMore6: !1,
 		useBlockedUtxos: !0,
-		chainId: c
-	}))?.get(u) ?? []).filter((e) => e.amount > 0n).sort((e, t) => Number(t.amount - e.amount));
-	if (!p.length) throw Error(r.NO_STUCK_BALANCE_TO_WITHDRAW);
-	for (let e = 0; e < p.length; e += S) {
-		let r = p.slice(e, e + S), i = n(r);
+		chainId: l
+	}))?.get(f) ?? []).filter((e) => e.amount > 0n).sort((e, t) => Number(t.amount - e.amount));
+	if (!p.length) throw Error(a.NO_STUCK_BALANCE_TO_WITHDRAW);
+	for (let e = 0; e < p.length; e += w) {
+		let i = p.slice(e, e + w), a = r(i);
 		try {
-			let { tx: e } = await O(t, c, a, i, o, r.length);
-			l.push(e);
+			let { tx: e } = await A(t, l, n, a, c, i.length);
+			d.push(e);
 		} catch (e) {
-			if (!l.length) throw e;
-			return d.error(`Stuck withdrawal partially submitted (${l.length}/${Math.ceil(p.length / S)})`, e), l;
+			if (!d.length) throw e;
+			return s.error(`Stuck withdrawal partially submitted (${d.length}/${Math.ceil(p.length / w)})`, e), d;
 		}
 	}
-	return l;
+	return d;
 };
 //#endregion
-export { k as hinkalWithdrawStuckUtxos };
+export { M as hinkalWithdrawStuckUtxos };

package/common/src/data-structures/Hinkal/index.d.ts

@@ -23,4 +23,3 @@ export * from './hinkalSolanaDepositAndWithdraw';
 export * from './hinkalNearDepositAndBridge';
 export * from './hinkalBridgePrivateToPrivate';
 export * from './hinkalSolanaSponsoredShield';
-export * from './hinkalSolanaSponsoredProxySend';

package/common/src/data-structures/IndexedDB/activity-db.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../error-handling/error-codes.constants.cjs`),t=require(`../../types/activities.types.cjs`),n=require(`../../types/cache.types.cjs`);require(`../../types/index.cjs`);const r=require(`../../error-handling/logger.cjs`);require(`../../error-handling/index.cjs`);const i=require(`../../constants/tx-confirmation.constants.cjs`),a=require(`../../functions/utils/tx-confirmation.utils.cjs`);require(`../../functions/index.cjs`);const o=require(`../../functions/utils/aggregateTokenAmounts.cjs`);let s=require(`idb-keyval`);var c=class{generateTxId(){return`tx_${new Date().getTime()}_${Math.random().toString(36).substring(2,15)}`}async getTransactionRecord(){return await(0,s.get)(n.StorageKeys.TX_ACTIVITY)||{}}async saveTxRequest(e){let{from:r,to:i,gasInDollar:a,extraNativeTokenFee:c,chainId:l,status:u,txHash:d,activityType:f,tokensReceive:p,tokensSpend:m,tokensApprove:h,activityIcon:g,dappUrl:_,dappName:v,integrationProvider:y,knownPartialSignature:b}=e,x=this.generateTxId(),S=m?.length?o.aggregateTokensBySymbol(m):[],C=p?.length?o.aggregateTokensBySymbol(p):[],w={id:x,from:r,to:i,gasInDollar:a?.toString(),extraNativeTokenFee:c?.toString(),chainId:l,txHash:d,activityType:f,status:u??t.ActivityStatus.PENDING,timestamp:new Date,tokensReceive:C,tokensSpend:S,tokensApprove:h,activityIcon:g,dappUrl:_,dappName:v,integrationProvider:y,knownPartialSignature:b};return await(0,s.update)(n.StorageKeys.TX_ACTIVITY,(e={})=>(e[x]=w,e)),x}async getTxRequest(e){return(await this.getTransactionRecord())[e]||null}async getAllTxRequests(e){let t=await this.getTransactionRecord();return Object.values(t).filter(t=>t.chainId===e).sort((e,t)=>new Date(t.timestamp).getTime()-new Date(e.timestamp).getTime())}async updateTxHash(e,t){let r=await this.getTxRequest(e);if(!r)throw Error(`Activity not found`);let i={...r,txHash:t};await(0,s.update)(n.StorageKeys.TX_ACTIVITY,(t={})=>(t[e]=i,t))}async updateTxStatusAndHash(e,t,r){let i=await this.getTxRequest(e);if(!i)throw Error(`Transaction not found`);let a={...i,status:t,txHash:r,timestamp:new Date};return await(0,s.update)(n.StorageKeys.TX_ACTIVITY,(t={})=>(t[e]=a,t)),a}async updateActivity(e,t,n){try{await this.updateTxStatusAndHash(e,t,n)}catch(e){r.Logger.error(`error in updating tx request`,e)}}async removePendingTransactions(e){try{await(0,s.update)(n.StorageKeys.TX_ACTIVITY,(t={})=>(delete t[e],t))}catch(e){r.Logger.error(`error in deleting tx requests`,e)}}async updatePendingTransactions(n,o,s,c){try{let r=await this.getTxRequest(o);if(!r)throw Error(`Transaction not found`);let{chainId:l}=r;if(!n.success){c?.(n.error),await this.updateActivity(o,t.ActivityStatus.FAILED,`erroredTx`in n?n.erroredTx:void 0);return}if(`txHash`in n){let{txHash:r}=n;try{await a.waitForTransactionConfirmation(l,r,{evmTimeoutMs:i.RELAYER_TX_CONFIRMATION_TIMEOUT})}catch(n){let i=n instanceof Error?n:Error(e.transactionErrorCodes.UNKNOWN);c?.(i),await this.updateActivity(o,t.ActivityStatus.FAILED,r);return}s?.(),await this.updateActivity(o,t.ActivityStatus.SUCCESSFUL,r)}}catch(e){r.Logger.error(`error in updating pending transactions`,e)}}},l=new c;exports.ActivityStorage=c,exports.activityStorage=l;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../error-handling/error-codes.constants.cjs`),t=require(`../../error-handling/logger.cjs`),n=require(`../../types/activities.types.cjs`),r=require(`../../types/cache.types.cjs`);require(`../../types/index.cjs`),require(`../../error-handling/index.cjs`);const i=require(`../../constants/tx-confirmation.constants.cjs`),a=require(`../../functions/utils/tx-confirmation.utils.cjs`);require(`../../functions/index.cjs`);const o=require(`../../functions/utils/aggregateTokenAmounts.cjs`);let s=require(`idb-keyval`);var c=class{generateTxId(){return`tx_${new Date().getTime()}_${Math.random().toString(36).substring(2,15)}`}async getTransactionRecord(){return await(0,s.get)(r.StorageKeys.TX_ACTIVITY)||{}}async saveTxRequest(e){let{from:t,to:i,gasInDollar:a,extraNativeTokenFee:c,chainId:l,status:u,txHash:d,activityType:f,tokensReceive:p,tokensSpend:m,tokensApprove:h,activityIcon:g,dappUrl:_,dappName:v,integrationProvider:y,knownPartialSignature:b}=e,x=this.generateTxId(),S=m?.length?o.aggregateTokensBySymbol(m):[],C=p?.length?o.aggregateTokensBySymbol(p):[],w={id:x,from:t,to:i,gasInDollar:a?.toString(),extraNativeTokenFee:c?.toString(),chainId:l,txHash:d,activityType:f,status:u??n.ActivityStatus.PENDING,timestamp:new Date,tokensReceive:C,tokensSpend:S,tokensApprove:h,activityIcon:g,dappUrl:_,dappName:v,integrationProvider:y,knownPartialSignature:b};return await(0,s.update)(r.StorageKeys.TX_ACTIVITY,(e={})=>(e[x]=w,e)),x}async getTxRequest(e){return(await this.getTransactionRecord())[e]||null}async getAllTxRequests(e){let t=await this.getTransactionRecord();return Object.values(t).filter(t=>t.chainId===e).sort((e,t)=>new Date(t.timestamp).getTime()-new Date(e.timestamp).getTime())}async updateTxHash(e,t){let n=await this.getTxRequest(e);if(!n)throw Error(`Activity not found`);let i={...n,txHash:t};await(0,s.update)(r.StorageKeys.TX_ACTIVITY,(t={})=>(t[e]=i,t))}async updateTxStatusAndHash(e,t,n){let i=await this.getTxRequest(e);if(!i)throw Error(`Transaction not found`);let a={...i,status:t,txHash:n,timestamp:new Date};return await(0,s.update)(r.StorageKeys.TX_ACTIVITY,(t={})=>(t[e]=a,t)),a}async updateActivity(e,n,r){try{await this.updateTxStatusAndHash(e,n,r)}catch(e){t.Logger.error(`error in updating tx request`,e)}}async removePendingTransactions(e){try{await(0,s.update)(r.StorageKeys.TX_ACTIVITY,(t={})=>(delete t[e],t))}catch(e){t.Logger.error(`error in deleting tx requests`,e)}}async updatePendingTransactions(r,o,s,c){try{let t=await this.getTxRequest(o);if(!t)throw Error(`Transaction not found`);let{chainId:l}=t;if(!r.success){c?.(r.error),await this.updateActivity(o,n.ActivityStatus.FAILED,`erroredTx`in r?r.erroredTx:void 0);return}if(`txHash`in r){let{txHash:t}=r;try{await a.waitForTransactionConfirmation(l,t,{evmTimeoutMs:i.RELAYER_TX_CONFIRMATION_TIMEOUT})}catch(r){let i=r instanceof Error?r:Error(e.transactionErrorCodes.UNKNOWN);c?.(i),await this.updateActivity(o,n.ActivityStatus.FAILED,t);return}s?.(),await this.updateActivity(o,n.ActivityStatus.SUCCESSFUL,t)}}catch(e){t.Logger.error(`error in updating pending transactions`,e)}}},l=new c;exports.ActivityStorage=c,exports.activityStorage=l;

package/common/src/data-structures/IndexedDB/activity-db.mjs

@@ -1,8 +1,8 @@
 import { transactionErrorCodes as e } from "../../error-handling/error-codes.constants.mjs";
-import { ActivityStatus as t } from "../../types/activities.types.mjs";
-import { StorageKeys as n } from "../../types/cache.types.mjs";
+import { Logger as t } from "../../error-handling/logger.mjs";
+import { ActivityStatus as n } from "../../types/activities.types.mjs";
+import { StorageKeys as r } from "../../types/cache.types.mjs";
 import "../../types/index.mjs";
-import { Logger as r } from "../../error-handling/logger.mjs";
 import "../../error-handling/index.mjs";
 import { RELAYER_TX_CONFIRMATION_TIMEOUT as i } from "../../constants/tx-confirmation.constants.mjs";
 import { waitForTransactionConfirmation as a } from "../../functions/utils/tx-confirmation.utils.mjs";
@@ -15,19 +15,19 @@ var l = class {
 		return `tx_${(/* @__PURE__ */ new Date()).getTime()}_${Math.random().toString(36).substring(2, 15)}`;
 	}
 	async getTransactionRecord() {
-		return await s(n.TX_ACTIVITY) || {};
+		return await s(r.TX_ACTIVITY) || {};
 	}
 	async saveTxRequest(e) {
-		let { from: r, to: i, gasInDollar: a, extraNativeTokenFee: s, chainId: l, status: u, txHash: d, activityType: f, tokensReceive: p, tokensSpend: m, tokensApprove: h, activityIcon: g, dappUrl: _, dappName: v, integrationProvider: y, knownPartialSignature: b } = e, x = this.generateTxId(), S = m?.length ? o(m) : [], C = p?.length ? o(p) : [], w = {
+		let { from: t, to: i, gasInDollar: a, extraNativeTokenFee: s, chainId: l, status: u, txHash: d, activityType: f, tokensReceive: p, tokensSpend: m, tokensApprove: h, activityIcon: g, dappUrl: _, dappName: v, integrationProvider: y, knownPartialSignature: b } = e, x = this.generateTxId(), S = m?.length ? o(m) : [], C = p?.length ? o(p) : [], w = {
 			id: x,
-			from: r,
+			from: t,
 			to: i,
 			gasInDollar: a?.toString(),
 			extraNativeTokenFee: s?.toString(),
 			chainId: l,
 			txHash: d,
 			activityType: f,
-			status: u ?? t.PENDING,
+			status: u ?? n.PENDING,
 			timestamp: /* @__PURE__ */ new Date(),
 			tokensReceive: C,
 			tokensSpend: S,
@@ -38,7 +38,7 @@ var l = class {
 			integrationProvider: y,
 			knownPartialSignature: b
 		};
-		return await c(n.TX_ACTIVITY, (e = {}) => (e[x] = w, e)), x;
+		return await c(r.TX_ACTIVITY, (e = {}) => (e[x] = w, e)), x;
 	}
 	async getTxRequest(e) {
 		return (await this.getTransactionRecord())[e] || null;
@@ -48,61 +48,61 @@ var l = class {
 		return Object.values(t).filter((t) => t.chainId === e).sort((e, t) => new Date(t.timestamp).getTime() - new Date(e.timestamp).getTime());
 	}
 	async updateTxHash(e, t) {
-		let r = await this.getTxRequest(e);
-		if (!r) throw Error("Activity not found");
+		let n = await this.getTxRequest(e);
+		if (!n) throw Error("Activity not found");
 		let i = {
-			...r,
+			...n,
 			txHash: t
 		};
-		await c(n.TX_ACTIVITY, (t = {}) => (t[e] = i, t));
+		await c(r.TX_ACTIVITY, (t = {}) => (t[e] = i, t));
 	}
-	async updateTxStatusAndHash(e, t, r) {
+	async updateTxStatusAndHash(e, t, n) {
 		let i = await this.getTxRequest(e);
 		if (!i) throw Error("Transaction not found");
 		let a = {
 			...i,
 			status: t,
-			txHash: r,
+			txHash: n,
 			timestamp: /* @__PURE__ */ new Date()
 		};
-		return await c(n.TX_ACTIVITY, (t = {}) => (t[e] = a, t)), a;
+		return await c(r.TX_ACTIVITY, (t = {}) => (t[e] = a, t)), a;
 	}
-	async updateActivity(e, t, n) {
+	async updateActivity(e, n, r) {
 		try {
-			await this.updateTxStatusAndHash(e, t, n);
+			await this.updateTxStatusAndHash(e, n, r);
 		} catch (e) {
-			r.error("error in updating tx request", e);
+			t.error("error in updating tx request", e);
 		}
 	}
 	async removePendingTransactions(e) {
 		try {
-			await c(n.TX_ACTIVITY, (t = {}) => (delete t[e], t));
+			await c(r.TX_ACTIVITY, (t = {}) => (delete t[e], t));
 		} catch (e) {
-			r.error("error in deleting tx requests", e);
+			t.error("error in deleting tx requests", e);
 		}
 	}
-	async updatePendingTransactions(n, o, s, c) {
+	async updatePendingTransactions(r, o, s, c) {
 		try {
-			let r = await this.getTxRequest(o);
-			if (!r) throw Error("Transaction not found");
-			let { chainId: l } = r;
-			if (!n.success) {
-				c?.(n.error), await this.updateActivity(o, t.FAILED, "erroredTx" in n ? n.erroredTx : void 0);
+			let t = await this.getTxRequest(o);
+			if (!t) throw Error("Transaction not found");
+			let { chainId: l } = t;
+			if (!r.success) {
+				c?.(r.error), await this.updateActivity(o, n.FAILED, "erroredTx" in r ? r.erroredTx : void 0);
 				return;
 			}
-			if ("txHash" in n) {
-				let { txHash: r } = n;
+			if ("txHash" in r) {
+				let { txHash: t } = r;
 				try {
-					await a(l, r, { evmTimeoutMs: i });
-				} catch (n) {
-					let i = n instanceof Error ? n : Error(e.UNKNOWN);
-					c?.(i), await this.updateActivity(o, t.FAILED, r);
+					await a(l, t, { evmTimeoutMs: i });
+				} catch (r) {
+					let i = r instanceof Error ? r : Error(e.UNKNOWN);
+					c?.(i), await this.updateActivity(o, n.FAILED, t);
 					return;
 				}
-				s?.(), await this.updateActivity(o, t.SUCCESSFUL, r);
+				s?.(), await this.updateActivity(o, n.SUCCESSFUL, t);
 			}
 		} catch (e) {
-			r.error("error in updating pending transactions", e);
+			t.error("error in updating pending transactions", e);
 		}
 	}
 }, u = new l();

package/common/src/data-structures/IndexedDB/index.cjs

@@ -1 +1 @@
-require(`./key-val-store.cjs`),require(`./activity-db.cjs`),require(`./balances-db.cjs`),require(`./private-balances-db.cjs`),require(`./prices-db.cjs`),require(`./contact-db.cjs`),require(`./signatures-db.cjs`),require(`./pay-activity-db.cjs`);
+require(`./key-val-store.cjs`),require(`./activity-db.cjs`),require(`./balances-db.cjs`),require(`./private-balances-db.cjs`),require(`./prices-db.cjs`),require(`./contact-db.cjs`),require(`./signatures-db.cjs`),require(`./pay-activity-db.cjs`),require(`./scheduled-transactions-db.cjs`);

package/common/src/data-structures/IndexedDB/index.d.ts

@@ -6,3 +6,4 @@ export * from './prices-db';
 export * from './contact-db';
 export * from './signatures-db';
 export * from './pay-activity-db';
+export * from './scheduled-transactions-db';

package/common/src/data-structures/IndexedDB/index.mjs

@@ -6,3 +6,4 @@ import "./prices-db.mjs";
 import "./contact-db.mjs";
 import "./signatures-db.mjs";
 import "./pay-activity-db.mjs";
+import "./scheduled-transactions-db.mjs";

package/common/src/data-structures/IndexedDB/scheduled-transactions-db.cjs

@@ -0,0 +1 @@
+require(`../../functions/utils/tron.utils.cjs`);const e=require(`../../types/cache.types.cjs`),t=require(`./key-val-store.cjs`);new class{scheduledTransactionsRecordLabel=e.StorageKeys.SCHEDULED_TRANSACTIONS;async getAll(){return t.keyValStore.get(this.scheduledTransactionsRecordLabel)}async getByAddress(e){let t=await this.getAll();return t?t[e]??[]:[]}async saveScheduledTransaction(e,n){await t.keyValStore.update(this.scheduledTransactionsRecordLabel,(t={})=>({...t,[e]:[...t[e]??[],n]}))}async updateLegs(e,n,r){await t.keyValStore.update(this.scheduledTransactionsRecordLabel,(t={})=>({...t,[e]:(t[e]??[]).map(e=>e.scheduleId===n?{...e,legs:e.legs.map((e,t)=>r[t]?{...e,status:r[t].status,scheduledTime:r[t].scheduledTime,txHash:r[t].txHash}:e)}:e)}))}};

package/common/src/data-structures/IndexedDB/scheduled-transactions-db.d.ts

@@ -0,0 +1,11 @@
+import { ScheduledTransactionCacheEntry, ScheduledTransactionItemStatus } from '../../types/scheduled-transactions.types';
+export declare const getScheduledTransactionCacheAddressKey: (address: string, isSignedIn: boolean, isSolana: boolean) => string;
+declare class ScheduledTransactionsStorage {
+    private readonly scheduledTransactionsRecordLabel;
+    private getAll;
+    getByAddress(addressKey: string): Promise<ScheduledTransactionCacheEntry[]>;
+    saveScheduledTransaction(addressKey: string, entry: ScheduledTransactionCacheEntry): Promise<void>;
+    updateLegs(addressKey: string, scheduleId: string, polledLegs: ScheduledTransactionItemStatus[]): Promise<void>;
+}
+export declare const scheduledTransactionsStorage: ScheduledTransactionsStorage;
+export {};

package/common/src/data-structures/IndexedDB/scheduled-transactions-db.mjs

@@ -0,0 +1,34 @@
+import "../../functions/utils/tron.utils.mjs";
+import { StorageKeys as e } from "../../types/cache.types.mjs";
+import { keyValStore as t } from "./key-val-store.mjs";
+new class {
+	scheduledTransactionsRecordLabel = e.SCHEDULED_TRANSACTIONS;
+	async getAll() {
+		return t.get(this.scheduledTransactionsRecordLabel);
+	}
+	async getByAddress(e) {
+		let t = await this.getAll();
+		return t ? t[e] ?? [] : [];
+	}
+	async saveScheduledTransaction(e, n) {
+		await t.update(this.scheduledTransactionsRecordLabel, (t = {}) => ({
+			...t,
+			[e]: [...t[e] ?? [], n]
+		}));
+	}
+	async updateLegs(e, n, r) {
+		await t.update(this.scheduledTransactionsRecordLabel, (t = {}) => ({
+			...t,
+			[e]: (t[e] ?? []).map((e) => e.scheduleId === n ? {
+				...e,
+				legs: e.legs.map((e, t) => r[t] ? {
+					...e,
+					status: r[t].status,
+					scheduledTime: r[t].scheduledTime,
+					txHash: r[t].txHash
+				} : e)
+			} : e)
+		}));
+	}
+}();
+//#endregion

package/common/src/data-structures/IndexedDB/signatures-db.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/cache.types.cjs`);require(`../../types/index.cjs`);const t=require(`../../error-handling/logger.cjs`);require(`../../error-handling/index.cjs`);let n=require(`idb-keyval`);new class{generateMessageId(){return`msg_${new Date().getTime()}_${Math.random().toString(36).substring(2,15)}`}async saveSignedMessage(r,i,a,o,s,c){try{let t=this.generateMessageId(),l=await(0,n.get)(e.StorageKeys.SIGNED_MESSAGES)||{},u={chainId:r,messageText:i,messageType:a,subAccountAddress:o,signature:s,appMetaData:c};l[t]={timestamp:new Date().toISOString(),...u},await(0,n.set)(e.StorageKeys.SIGNED_MESSAGES,l)}catch(e){t.Logger.error(`Failed to save signed message:`,e,{chainId:r,messageType:a})}}async getAllSignedMessages(){try{let t=await(0,n.get)(e.StorageKeys.SIGNED_MESSAGES)||{};return Object.values(t).sort((e,t)=>new Date(t.timestamp).getTime()-new Date(e.timestamp).getTime())}catch(e){return t.Logger.error(`Failed to retrieve signed messages:`,e),[]}}};
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../error-handling/logger.cjs`),t=require(`../../types/cache.types.cjs`);require(`../../types/index.cjs`),require(`../../error-handling/index.cjs`);let n=require(`idb-keyval`);new class{generateMessageId(){return`msg_${new Date().getTime()}_${Math.random().toString(36).substring(2,15)}`}async saveSignedMessage(r,i,a,o,s,c){try{let e=this.generateMessageId(),l=await(0,n.get)(t.StorageKeys.SIGNED_MESSAGES)||{},u={chainId:r,messageText:i,messageType:a,subAccountAddress:o,signature:s,appMetaData:c};l[e]={timestamp:new Date().toISOString(),...u},await(0,n.set)(t.StorageKeys.SIGNED_MESSAGES,l)}catch(t){e.Logger.error(`Failed to save signed message:`,t,{chainId:r,messageType:a})}}async getAllSignedMessages(){try{let e=await(0,n.get)(t.StorageKeys.SIGNED_MESSAGES)||{};return Object.values(e).sort((e,t)=>new Date(t.timestamp).getTime()-new Date(e.timestamp).getTime())}catch(t){return e.Logger.error(`Failed to retrieve signed messages:`,t),[]}}};