@hinkal/common 0.3.1 → 0.3.2

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`),i=require(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../utxo/Utxo.cjs`),s=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/snarkjs/common.snarkjs.cjs`),u=require(`../../functions/pre-transaction/getFeeStructure.cjs`),d=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),f=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let p=require(`ethers`);var m=async(m,h,g,_,v)=>{let y=c.validateAndGetChainId([h]),b=h.erc20TokenAddress;if(g.getTokenAddress(y)!==b)throw Error(`Off-chain UTXO token mismatch`);let x=v?new i.UserKeys(v):new i.UserKeys(g.nullifyingKey,g.nullifyingKey);if(!g.nullifyingKey&&!v)throw Error(`Claimable UTXO nullifyingKey is missing`);let S=x.getShieldedPrivateKey();if(g.nullifyingKey&&g.nullifyingKey!==S)throw Error(`Claimable UTXO key mismatch`);let{originalDeployer:C}=e.networkRegistry[y].contractData;if(!C)throw Error(`missing data`);let w=o.Utxo.createFrom(g,{nullifyingKey:S}),T=_??await u.getFeeStructure(y,b,[b],s.ExternalActionId.Transact,void 0,void 0,{mintTo:b,nullifierCount:1});if(T.feeToken!==b)throw Error(`Claim fee token mismatch: fee must be paid from claimed UTXO token`);let E=T.variableRate>0n?T.variableRate:t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;if(w.amount<=T.flatFee)throw Error(n.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let D=w.amount-T.flatFee,O=D*E/10000n,k=D-O;if(k<=0n)throw Error(n.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);let A=T.flatFee+O,[j,M,N,,P]=m.getRecipientInfo().split(`,`);if(!M||!N||!j||!P)throw Error(`Invalid recipient info`);let F=a.getCurrentTimeInSeconds().toString(),I=new o.Utxo({amount:0n,erc20TokenAddress:w.erc20TokenAddress,mintAddress:w.mintAddress,nullifyingKey:x.getShieldedPrivateKey(),...w.isNewStyle?{spendingPublicKey:x.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),L=new o.Utxo({amount:0n,erc20TokenAddress:w.erc20TokenAddress,mintAddress:w.mintAddress,nullifyingKey:x.getShieldedPrivateKey(),timeStamp:F,spendingPublicKey:x.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}),R=new o.Utxo({amount:k,erc20TokenAddress:w.erc20TokenAddress,mintAddress:w.mintAddress,timeStamp:F,H0:[BigInt(M),BigInt(N)],stealthAddress:j,encryptionKey:P,isNewStyle:!0}),z=[w,I],B=[L,R],V=await m.getRandomRelay(y,!0);if(!V)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let H=i.UserKeys.findCorrectRandomization(r.randomBigInt(31),x.getShieldedPrivateKey()),U={tokenNumber:1,nullifierAmount:z.length,outputAmount:B.length},W=l.calcEncryptedOutputs([B])[0].map(e=>Array.from(p.ethers.getBytes(e))),{proofAArr:G,proofBArr:K,proofCArr:q,publicInputsArr:J,commitmentValidationData:Y}=await d.constructSolanaZkProof(m.generateProofRemotely,m.merkleTreeHinkalByChain[y],x,[b],[z],[B],H,A,0n,t.solanaNativeAddress,V,U,W,y),X={recipient:V,mint:b===`11111111111111111111111111111111`?void 0:b};return f.solanaTransactCallRelayer({chainId:y,relayAddress:V,functionName:`transfer`,args:{proofAArr:G,proofBArr:K,proofCArr:q,publicInputsArr:J,encryptedOutputs:W,relayerFee:A.toString(),dimensions:U},accounts:X,commitmentValidationData:Y})};exports.hinkalSolanaClaimUtxo=m;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`),i=require(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../utxo/Utxo.cjs`),s=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/snarkjs/common.snarkjs.cjs`),u=require(`../../functions/pre-transaction/getFeeStructure.cjs`),d=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),f=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let p=require(`ethers`);var m=async(m,h,g,_,v)=>{let y=c.validateAndGetChainId([h]),b=h.erc20TokenAddress;if(g.getTokenAddress(y)!==b)throw Error(`Off-chain UTXO token mismatch`);let x=v?new i.UserKeys(v):new i.UserKeys(g.nullifyingKey,g.nullifyingKey);if(!g.nullifyingKey&&!v)throw Error(`Claimable UTXO nullifyingKey is missing`);let S=x.getShieldedPrivateKey();if(g.nullifyingKey&&g.nullifyingKey!==S)throw Error(`Claimable UTXO key mismatch`);let{originalDeployer:C}=e.networkRegistry[y].contractData;if(!C)throw Error(`missing data`);let w=o.Utxo.createFrom(g,{nullifyingKey:S}),T=_??await u.getFeeStructure(y,b,[b],s.ExternalActionId.Transact,void 0,void 0,{mintTo:b,nullifierCount:1});if(T.feeToken!==b)throw Error(`Claim fee token mismatch: fee must be paid from claimed UTXO token`);let E=T.variableRate>0n?T.variableRate:t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;if(w.amount<=T.flatFee)throw Error(n.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let D=w.amount-T.flatFee,O=D*E/10000n,k=D-O;if(k<=0n)throw Error(n.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);let A=T.flatFee+O,[j,M,N,,,P]=m.getRecipientInfo().split(`,`);if(!M||!N||!j||!P)throw Error(`Invalid recipient info`);let F=a.getCurrentTimeInSeconds().toString(),I=new o.Utxo({amount:0n,erc20TokenAddress:w.erc20TokenAddress,mintAddress:w.mintAddress,nullifyingKey:x.getShieldedPrivateKey(),spendingPublicKey:x.getSpendingKeyPair().pubSpendingBJJPoint}),L=new o.Utxo({amount:0n,erc20TokenAddress:w.erc20TokenAddress,mintAddress:w.mintAddress,nullifyingKey:x.getShieldedPrivateKey(),timeStamp:F,spendingPublicKey:x.getSpendingKeyPair().pubSpendingBJJPoint}),R=new o.Utxo({amount:k,erc20TokenAddress:w.erc20TokenAddress,mintAddress:w.mintAddress,timeStamp:F,H0:[BigInt(M),BigInt(N)],stealthAddress:j,encryptionKey:P}),z=[w,I],B=[L,R],V=await m.getRandomRelay(y,!0);if(!V)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let H=i.UserKeys.findCorrectRandomization(r.randomBigInt(31),x.getShieldedPrivateKey()),U={tokenNumber:1,nullifierAmount:z.length,outputAmount:B.length},W=l.calcEncryptedOutputs([B])[0].map(e=>Array.from(p.ethers.getBytes(e))),{proofAArr:G,proofBArr:K,proofCArr:q,publicInputsArr:J,commitmentValidationData:Y}=await d.constructSolanaZkProof(m.generateProofRemotely,m.merkleTreeHinkalByChain[y],x,[b],[z],[B],H,A,0n,t.solanaNativeAddress,V,U,W,y),X={recipient:V,mint:b===`11111111111111111111111111111111`?void 0:b};return f.solanaTransactCallRelayer({chainId:y,relayAddress:V,functionName:`transfer`,args:{proofAArr:G,proofBArr:K,proofCArr:q,publicInputsArr:J,encryptedOutputs:W,relayerFee:A.toString(),dimensions:U},accounts:X,commitmentValidationData:Y})};exports.hinkalSolanaClaimUtxo=m;

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

@@ -32,25 +32,21 @@ var h = async (h, g, _, v, y) => {
 	if (T.amount <= E.flatFee) throw Error(r.INSUFFICIENT_FUNDS_TO_TRANSACT);
 	let O = T.amount - E.flatFee, k = O * D / 10000n, A = O - k;
 	if (A <= 0n) throw Error(r.RECIPIENT_AMOUNT_INVALID);
-	let j = E.flatFee + k, [M, N, P, , F] = h.getRecipientInfo().split(",");
+	let j = E.flatFee + k, [M, N, P, , , F] = h.getRecipientInfo().split(",");
 	if (!N || !P || !M || !F) throw Error("Invalid recipient info");
 	let I = o().toString(), L = new s({
 		amount: 0n,
 		erc20TokenAddress: T.erc20TokenAddress,
 		mintAddress: T.mintAddress,
 		nullifyingKey: S.getShieldedPrivateKey(),
-		...T.isNewStyle ? {
-			spendingPublicKey: S.getSpendingKeyPair().pubSpendingBJJPoint,
-			isNewStyle: !0
-		} : { isNewStyle: !1 }
+		spendingPublicKey: S.getSpendingKeyPair().pubSpendingBJJPoint
 	}), R = new s({
 		amount: 0n,
 		erc20TokenAddress: T.erc20TokenAddress,
 		mintAddress: T.mintAddress,
 		nullifyingKey: S.getShieldedPrivateKey(),
 		timeStamp: I,
-		spendingPublicKey: S.getSpendingKeyPair().pubSpendingBJJPoint,
-		isNewStyle: !0
+		spendingPublicKey: S.getSpendingKeyPair().pubSpendingBJJPoint
 	}), z = new s({
 		amount: A,
 		erc20TokenAddress: T.erc20TokenAddress,
@@ -58,8 +54,7 @@ var h = async (h, g, _, v, y) => {
 		timeStamp: I,
 		H0: [BigInt(N), BigInt(P)],
 		stealthAddress: M,
-		encryptionKey: F,
-		isNewStyle: !0
+		encryptionKey: F
 	}), B = [T, L], V = [R, z], H = await h.getRandomRelay(b, !0);
 	if (!H) throw Error(r.RELAYER_NOT_AVAILABLE);
 	let U = a.findCorrectRandomization(i(31), S.getShieldedPrivateKey()), W = {

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`),i=require(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/solanaMint.utils.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../functions/utils/token-check.utils.cjs`),c=require(`../../functions/snarkjs/common.snarkjs.cjs`),l=require(`../../functions/pre-transaction/solana.cjs`),u=require(`../../functions/pre-transaction/constructAdminData.cjs`),d=require(`../../error-handling/retrySolanaError.cjs`),f=require(`../../API/admin-calls.cjs`),p=require(`../../functions/pre-transaction/solanaTransfer.utils.cjs`),m=require(`./hinkalProoflessDeposit.utils.cjs`);let h=require(`@solana/web3.js`),g=require(`@coral-xyz/anchor`);var _=(n,r)=>{let i=s.validateAndGetChainId([r]),o=r.erc20TokenAddress,{hinkalIdl:c,hinkalAddress:u,originalDeployer:d}=e.networkRegistry[i].contractData;if(!c)throw Error(`No IDL configured for Solana program on this network`);if(!d)throw Error(`missing original deployer`);let f=n.getSolanaProgram(c),p=n.getSolanaPublicKey(),{connection:m,wallet:g}=f.provider;if(!g)throw Error(`missing solana wallet`);let _=new h.PublicKey(d),v=new h.PublicKey(u),{mintPublicKey:y}=a.formatMintAddress(o),b=y.toString()===t.solanaNativeAddress;return{chainId:i,mintAddress:o,program:f,publicKey:p,connection:m,wallet:g,originalDeployer:_,mintPublicKey:y,mint:b?null:y,atasValue:b?null:void 0,storageAccount:l.getStorageAccountPublicKey(v,_),storageVault:l.getStorageVaultPublicKey(v,_),merkleAccount:l.getMerkleAccountPublicKey(v,_)}},v=(e,t,n)=>{let r=n.map(e=>l.buildAnchorStealthAddressStructure(e));return e.program.methods.multiPaymentDeposit(t.map(e=>new g.BN(e.toString())),r,!1).accounts({mint:e.mint,signer:e.publicKey,signerAta:e.atasValue,originalDeployer:e.originalDeployer,storageAccount:e.storageAccount,storageVault:e.storageVault,merkleAccount:e.merkleAccount,storageVaultAta:e.atasValue}).instruction()},y=async(e,t,n,r)=>{for(let i=0;i<10;i+=1){let a=i===9;try{let{blockhash:i,lastValidBlockHeight:a}=await e.getLatestBlockhash(),o=new h.VersionedTransaction(new h.TransactionMessage({payerKey:n,recentBlockhash:i,instructions:r}).compileToV0Message()),s=await t.signTransaction(o),c=await e.sendTransaction(s);return await e.confirmTransaction({signature:c,blockhash:i,lastValidBlockHeight:a},`confirmed`),c}catch(e){if(d.shouldRetryForSolanaError(e)&&!a)continue;throw e}}return``},b=(e,t)=>{if(e.length===0)throw Error(`amounts must not be empty`);if(e.length!==t.length)throw Error(`amounts and stealthAddressStructures length mismatch`);if(e.some(e=>e<=0n))throw Error(`all amounts must be positive`);m.assertNoDuplicateStealthAddressStructures(t)},x=async(e,t,n,r,i,a=!1)=>{b(n,r);let o=_(e,t),s=u.constructAdminData(i,o.chainId,Array(n.length).fill(o.mintAddress),n,await e.getEthereumAddress()),c=await v(o,n,r);if(a){let{blockhash:e}=await o.connection.getLatestBlockhash(),t=new h.Transaction().add(c);return t.recentBlockhash=e,t.feePayer=o.publicKey,Buffer.from(t.serialize({requireAllSignatures:!1})).toString(`base64`)}let l=await y(o.connection,o.wallet,o.publicKey,[c]);return await f.emitTxPublicData(s),l},S=async(e,t,n,r,i,a)=>{b(n,r);let o=_(e,t),s=await e.getRandomRelay(o.chainId,!1);if(!s)throw Error(`No relay available for chainId ${o.chainId}`);let{instructions:c}=await p.buildSolanaTransferInstructions(o.connection,o.publicKey,new h.PublicKey(s),t,i),l=await v(o,n,r),d=u.constructAdminData(a,o.chainId,Array(n.length).fill(o.mintAddress),n,await e.getEthereumAddress()),m=await y(o.connection,o.wallet,o.publicKey,[...c,l]);return await f.emitTxPublicData(d),m},C=async(e,t,n,a=!1)=>{let o=e.userKeys.getShieldedPrivateKey(),s=c.calcStealthAddressStructure(i.UserKeys.findCorrectRandomization(r.randomBigInt(31),o),o,e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint);return x(e,n,[t],[s],void 0,a)},w=async(e,t,r,i,a=!1,s)=>{if(!o.isValidPrivateAddress(i))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let c=o.constructStealthAddressStructure(i);return x(e,r,[t],[c],s,a)};exports.hinkalSolanaDeposit=C,exports.hinkalSolanaDepositForOther=w,exports.hinkalSolanaProoflessDepositWithPublicFee=S,exports.submitSolanaProoflessDeposit=x;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`),i=require(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/solanaMint.utils.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../functions/utils/token-check.utils.cjs`),c=require(`../../functions/snarkjs/common.snarkjs.cjs`),l=require(`../../functions/pre-transaction/solana.cjs`),u=require(`../../functions/pre-transaction/constructAdminData.cjs`),d=require(`../../error-handling/retrySolanaError.cjs`),f=require(`../../API/admin-calls.cjs`),p=require(`./hinkalProoflessDeposit.utils.cjs`);require(`../../functions/pre-transaction/solanaTransfer.utils.cjs`);let m=require(`@solana/web3.js`),h=require(`@coral-xyz/anchor`);var g=(n,r)=>{let i=s.validateAndGetChainId([r]),o=r.erc20TokenAddress,{hinkalIdl:c,hinkalAddress:u,originalDeployer:d}=e.networkRegistry[i].contractData;if(!c)throw Error(`No IDL configured for Solana program on this network`);if(!d)throw Error(`missing original deployer`);let f=n.getSolanaProgram(c),p=n.getSolanaPublicKey(),{connection:h,wallet:g}=f.provider;if(!g)throw Error(`missing solana wallet`);let _=new m.PublicKey(d),v=new m.PublicKey(u),{mintPublicKey:y}=a.formatMintAddress(o),b=y.toString()===t.solanaNativeAddress;return{chainId:i,mintAddress:o,program:f,publicKey:p,connection:h,wallet:g,originalDeployer:_,mintPublicKey:y,mint:b?null:y,atasValue:b?null:void 0,storageAccount:l.getStorageAccountPublicKey(v,_),storageVault:l.getStorageVaultPublicKey(v,_),merkleAccount:l.getMerkleAccountPublicKey(v,_)}},_=(e,t,n)=>{let r=n.map(e=>l.buildAnchorStealthAddressStructure(e));return e.program.methods.multiPaymentDeposit(t.map(e=>new h.BN(e.toString())),r,!1).accounts({mint:e.mint,signer:e.publicKey,signerAta:e.atasValue,originalDeployer:e.originalDeployer,storageAccount:e.storageAccount,storageVault:e.storageVault,merkleAccount:e.merkleAccount,storageVaultAta:e.atasValue}).instruction()},v=async(e,t,n,r)=>{for(let i=0;i<10;i+=1){let a=i===9;try{let{blockhash:i,lastValidBlockHeight:a}=await e.getLatestBlockhash(),o=new m.VersionedTransaction(new m.TransactionMessage({payerKey:n,recentBlockhash:i,instructions:r}).compileToV0Message()),s=await t.signTransaction(o),c=await e.sendTransaction(s);return await e.confirmTransaction({signature:c,blockhash:i,lastValidBlockHeight:a},`confirmed`),c}catch(e){if(d.shouldRetryForSolanaError(e)&&!a)continue;throw e}}return``},y=(e,t)=>{if(e.length===0)throw Error(`amounts must not be empty`);if(e.length!==t.length)throw Error(`amounts and stealthAddressStructures length mismatch`);if(e.some(e=>e<=0n))throw Error(`all amounts must be positive`);p.assertNoDuplicateStealthAddressStructures(t)},b=async(e,t,n,r,i,a=!1)=>{y(n,r);let o=g(e,t),s=u.constructAdminData(i,o.chainId,Array(n.length).fill(o.mintAddress),n,await e.getEthereumAddress()),c=await _(o,n,r);if(a){let{blockhash:e}=await o.connection.getLatestBlockhash(),t=new m.Transaction().add(c);return t.recentBlockhash=e,t.feePayer=o.publicKey,Buffer.from(t.serialize({requireAllSignatures:!1})).toString(`base64`)}let l=await v(o.connection,o.wallet,o.publicKey,[c]);return await f.emitTxPublicData(s),l},x=async(e,t,n,a=!1)=>{let o=e.userKeys.getShieldedPrivateKey(),s=c.calcStealthAddressStructure(i.UserKeys.findCorrectRandomization(r.randomBigInt(31),o),o,e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint);return b(e,n,[t],[s],void 0,a)},S=async(e,t,r,i,a=!1,s)=>{if(!o.isValidPrivateAddress(i))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let c=o.constructStealthAddressStructure(i);return b(e,r,[t],[c],s,a)};exports.hinkalSolanaDeposit=x,exports.hinkalSolanaDepositForOther=S,exports.submitSolanaProoflessDeposit=b;

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

@@ -11,18 +11,18 @@ import { buildAnchorStealthAddressStructure as u, getMerkleAccountPublicKey as d
 import { constructAdminData as m } from "../../functions/pre-transaction/constructAdminData.mjs";
 import { shouldRetryForSolanaError as h } from "../../error-handling/retrySolanaError.mjs";
 import { emitTxPublicData as g } from "../../API/admin-calls.mjs";
-import { buildSolanaTransferInstructions as _ } from "../../functions/pre-transaction/solanaTransfer.utils.mjs";
-import { assertNoDuplicateStealthAddressStructures as v } from "./hinkalProoflessDeposit.utils.mjs";
-import { PublicKey as y, Transaction as b, TransactionMessage as x, VersionedTransaction as S } from "@solana/web3.js";
-import { BN as C } from "@coral-xyz/anchor";
+import { assertNoDuplicateStealthAddressStructures as _ } from "./hinkalProoflessDeposit.utils.mjs";
+import "../../functions/pre-transaction/solanaTransfer.utils.mjs";
+import { PublicKey as v, Transaction as y, TransactionMessage as b, VersionedTransaction as x } from "@solana/web3.js";
+import { BN as S } from "@coral-xyz/anchor";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaDeposit.ts
-var w = (n, r) => {
+var C = (n, r) => {
 	let i = c([r]), o = r.erc20TokenAddress, { hinkalIdl: s, hinkalAddress: l, originalDeployer: u } = e[i].contractData;
 	if (!s) throw Error("No IDL configured for Solana program on this network");
 	if (!u) throw Error("missing original deployer");
 	let m = n.getSolanaProgram(s), h = n.getSolanaPublicKey(), { connection: g, wallet: _ } = m.provider;
 	if (!_) throw Error("missing solana wallet");
-	let v = new y(u), b = new y(l), { mintPublicKey: x } = a(o), S = x.toString() === t;
+	let y = new v(u), b = new v(l), { mintPublicKey: x } = a(o), S = x.toString() === t;
 	return {
 		chainId: i,
 		mintAddress: o,
@@ -30,17 +30,17 @@ var w = (n, r) => {
 		publicKey: h,
 		connection: g,
 		wallet: _,
-		originalDeployer: v,
+		originalDeployer: y,
 		mintPublicKey: x,
 		mint: S ? null : x,
 		atasValue: S ? null : void 0,
-		storageAccount: f(b, v),
-		storageVault: p(b, v),
-		merkleAccount: d(b, v)
+		storageAccount: f(b, y),
+		storageVault: p(b, y),
+		merkleAccount: d(b, y)
 	};
-}, T = (e, t, n) => {
+}, w = (e, t, n) => {
 	let r = n.map((e) => u(e));
-	return e.program.methods.multiPaymentDeposit(t.map((e) => new C(e.toString())), r, !1).accounts({
+	return e.program.methods.multiPaymentDeposit(t.map((e) => new S(e.toString())), r, !1).accounts({
 		mint: e.mint,
 		signer: e.publicKey,
 		signerAta: e.atasValue,
@@ -50,11 +50,11 @@ var w = (n, r) => {
 		merkleAccount: e.merkleAccount,
 		storageVaultAta: e.atasValue
 	}).instruction();
-}, E = async (e, t, n, r) => {
+}, T = async (e, t, n, r) => {
 	for (let i = 0; i < 10; i += 1) {
 		let a = i === 9;
 		try {
-			let { blockhash: i, lastValidBlockHeight: a } = await e.getLatestBlockhash(), o = new S(new x({
+			let { blockhash: i, lastValidBlockHeight: a } = await e.getLatestBlockhash(), o = new x(new b({
 				payerKey: n,
 				recentBlockhash: i,
 				instructions: r
@@ -70,33 +70,27 @@ var w = (n, r) => {
 		}
 	}
 	return "";
-}, D = (e, t) => {
+}, E = (e, t) => {
 	if (e.length === 0) throw Error("amounts must not be empty");
 	if (e.length !== t.length) throw Error("amounts and stealthAddressStructures length mismatch");
 	if (e.some((e) => e <= 0n)) throw Error("all amounts must be positive");
-	v(t);
-}, O = async (e, t, n, r, i, a = !1) => {
-	D(n, r);
-	let o = w(e, t), s = m(i, o.chainId, Array(n.length).fill(o.mintAddress), n, await e.getEthereumAddress()), c = await T(o, n, r);
+	_(t);
+}, D = async (e, t, n, r, i, a = !1) => {
+	E(n, r);
+	let o = C(e, t), s = m(i, o.chainId, Array(n.length).fill(o.mintAddress), n, await e.getEthereumAddress()), c = await w(o, n, r);
 	if (a) {
-		let { blockhash: e } = await o.connection.getLatestBlockhash(), t = new b().add(c);
+		let { blockhash: e } = await o.connection.getLatestBlockhash(), t = new y().add(c);
 		return t.recentBlockhash = e, t.feePayer = o.publicKey, Buffer.from(t.serialize({ requireAllSignatures: !1 })).toString("base64");
 	}
-	let l = await E(o.connection, o.wallet, o.publicKey, [c]);
+	let l = await T(o.connection, o.wallet, o.publicKey, [c]);
 	return await g(s), l;
-}, k = async (e, t, n, r, i, a) => {
-	D(n, r);
-	let o = w(e, t), s = await e.getRandomRelay(o.chainId, !1);
-	if (!s) throw Error(`No relay available for chainId ${o.chainId}`);
-	let { instructions: c } = await _(o.connection, o.publicKey, new y(s), t, i), l = await T(o, n, r), u = m(a, o.chainId, Array(n.length).fill(o.mintAddress), n, await e.getEthereumAddress()), d = await E(o.connection, o.wallet, o.publicKey, [...c, l]);
-	return await g(u), d;
-}, A = async (e, t, n, a = !1) => {
+}, O = async (e, t, n, a = !1) => {
 	let o = e.userKeys.getShieldedPrivateKey(), s = l(i.findCorrectRandomization(r(31), o), o, e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint);
-	return O(e, n, [t], [s], void 0, a);
-}, j = async (e, t, r, i, a = !1, c) => {
+	return D(e, n, [t], [s], void 0, a);
+}, k = async (e, t, r, i, a = !1, c) => {
 	if (!s(i)) throw Error(n.RECIPIENT_FORMAT_INCORRECT);
 	let l = o(i);
-	return O(e, r, [t], [l], c, a);
+	return D(e, r, [t], [l], c, a);
 };
 //#endregion
-export { A as hinkalSolanaDeposit, j as hinkalSolanaDepositForOther, k as hinkalSolanaProoflessDepositWithPublicFee, O as submitSolanaProoflessDeposit };
+export { O as hinkalSolanaDeposit, k as hinkalSolanaDepositForOther, D as submitSolanaProoflessDeposit };

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`),i=require(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../utxo/Utxo.cjs`),s=require(`../../types/external-action.types.cjs`),c=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const l=require(`../../functions/utils/solanaMint.utils.cjs`),u=require(`../../functions/utils/addresses.cjs`),d=require(`../../functions/utils/token-check.utils.cjs`),f=require(`../../functions/snarkjs/common.snarkjs.cjs`),p=require(`../../functions/pre-transaction/solana.cjs`),m=require(`../../functions/pre-transaction/constructAdminData.cjs`),h=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),g=require(`../../functions/pre-transaction/getFeeStructure.cjs`),_=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`);require(`../../functions/pre-transaction/index.cjs`);const v=require(`../../functions/utils/getUtxosFromReceiptSolana.cjs`),y=require(`../../functions/utils/fees.utils.cjs`);require(`../../functions/web3/index.cjs`);const b=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),x=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),S=require(`../../API/deposit-and-withdraw-status-calls.cjs`);require(`../../functions/index.cjs`);let C=require(`ethers`),w=require(`@solana/web3.js`),T=require(`@coral-xyz/anchor`);var E=(n,a,o,s)=>{let{hinkalIdl:c,hinkalAddress:u,originalDeployer:d}=e.networkRegistry[a].contractData;if(!c)throw Error(`No IDL configured for Solana program on this network`);if(!d)throw Error(`missing original deployer`);let m=n.userKeys.getShieldedPrivateKey(),h=n.getSolanaProgram(c),g=n.getSolanaPublicKey(),_=new w.PublicKey(d),v=new w.PublicKey(u),{mintPublicKey:y}=l.formatMintAddress(o.erc20TokenAddress),b=y.toString(),x=p.getStorageAccountPublicKey(v,_),S=p.getStorageVaultPublicKey(v,_),C=p.getMerkleAccountPublicKey(v,_),T=s.map(()=>p.buildAnchorStealthAddressStructure(f.calcStealthAddressStructure(i.UserKeys.findCorrectRandomization(r.randomBigInt(31),m),m,n.userKeys.getSpendingKeyPair().pubSpendingBJJPoint))),E=b===t.solanaNativeAddress;return{program:h,publicKey:g,originalDeployer:_,mint:E?null:y,atasValue:E?null:void 0,storageAccount:x,storageVault:S,merkleAccount:C,amounts:s,anchorStealthStructures:T}},D=e=>e.program.methods.multiPaymentDeposit(e.amounts.map(e=>new T.BN(e.toString())),e.anchorStealthStructures,!0).accounts({mint:e.mint,signer:e.publicKey,signerAta:e.atasValue,originalDeployer:e.originalDeployer,storageAccount:e.storageAccount,storageVault:e.storageVault,merkleAccount:e.merkleAccount,storageVaultAta:e.atasValue}),O=async(e,t,n,r,i,a,o)=>{let s=r.map(e=>e+y.calculateTotalFee(e,a)),u=E(e,t,n,s),d=(await S.updateDepositAndWithdrawStatus({chainId:t,hashedEthereumAddress:o,phase:c.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0,f=await D(u).rpc(),p=await u.program.provider.connection.getLatestBlockhash();await u.program.provider.connection.confirmTransaction({blockhash:p.blockhash,lastValidBlockHeight:p.lastValidBlockHeight,signature:f},`finalized`);let m=await h.fetchSolanaTransaction(u.program.provider.connection,f,`finalized`);if(!m)throw Error(`Transaction missing`);await S.safeUpdateDepositAndWithdrawStatus({id:d,chainId:t,hashedEthereumAddress:o,phase:c.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:f});let{compressedAddress:g}=l.formatMintAddress(n.erc20TokenAddress),_=v.getOnChainUtxosFromReceiptSolana(m,u.program,e.userKeys,g),b=[],x=[..._];return i.forEach((e,t)=>{let n=s[t],r=x.find(e=>e.amount===n);if(!r)throw Error(`Could not find newly created UTXO with amount ${n} for recipient ${e}.`);b.push({recipientAddress:e,utxo:r}),x.splice(x.indexOf(r),1)}),{userDepositedUtxos:b,depositTxHash:f,statusId:d}},k=async(s,u,d,p,h,g,_,v,w,T,E,D,O)=>{let k=d.erc20TokenAddress;if(p.length===0)throw Error(`userDepositedUtxos must not be empty`);let{originalDeployer:A}=e.networkRegistry[u].contractData;if(!A)throw Error(`missing data`);let j=await s.getRandomRelay(u,!0);if(!j)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let M=a.getCurrentTimeInSeconds().toString(),N=s.generateProofRemotely?5:1,P=[];for(let e=0;e<p.length;e+=N){let n=p.slice(e,e+N),a=await Promise.all(n.map(async({recipientAddress:e,utxo:n},a)=>{let{compressedAddress:c}=l.formatMintAddress(t.solanaNativeAddress),p=new o.Utxo({amount:0n,mintAddress:k,erc20TokenAddress:c,nullifyingKey:s.userKeys.getShieldedPrivateKey(),timeStamp:M,...n.isNewStyle?{spendingPublicKey:s.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),g=[n,p],v=[p],x=i.UserKeys.findCorrectRandomization(r.randomBigInt(31),s.userKeys.getShieldedPrivateKey()),S={tokenNumber:1,nullifierAmount:g.length,outputAmount:v.length},w=f.calcEncryptedOutputs([v])[0][0],T=Array.from(C.ethers.getBytes(w)),D=await y.calculateModifiedFeeStructure(u,d,_[a],h),A=m.constructAdminData(E,u,[k],[_[a]],await s.getEthereumAddress()),{proofAArr:N,proofBArr:P,proofCArr:F,publicInputsArr:I,commitmentValidationData:L}=await b.constructSolanaZkProof(s.generateProofRemotely,s.merkleTreeHinkalByChain[u],s.userKeys,[k],[g],[v],x,D.flatFee,D.variableRate,e,j,S,[T],u),R={recipient:e,mint:k===`11111111111111111111111111111111`?void 0:k};return{relayAddress:j,functionName:`transact`,chainId:u,recipientAmount:_[a].toString(),args:{proofAArr:N,proofBArr:P,proofCArr:F,publicInputsArr:I,encryptedOutputs:[T],relayerFee:D.flatFee.toString(),dimensions:S},accounts:R,adminData:A,commitmentValidationData:L,displayRecipient:O?.[a]}}));P.push(...a)}await S.safeUpdateDepositAndWithdrawStatus({id:v,chainId:u,hashedEthereumAddress:g,phase:c.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let F=await x.solanaTransactCallRelayerBatch(u,P,g,w,T,D);return await S.safeUpdateDepositAndWithdrawStatus({id:v,chainId:u,hashedEthereumAddress:g,phase:c.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:F}),F},A=async(e,t,n,r,i,a,o,c,l,f)=>{let p=d.validateAndGetChainId([t]),m=t.erc20TokenAddress,h=u.hashEthereumAddress(await e.getEthereumAddressByChain(p)),v=l?u.hashString(l):void 0,y=a??await g.getFeeStructure(p,m,[m],s.ExternalActionId.Transact,[],5n),{userDepositedUtxos:b,depositTxHash:x,statusId:S}=await O(e,p,t,n,r,y,h);return await _.waitForDepositedUtxosInMerkleTree(e,p,b),{depositTxHash:x,scheduleId:await k(e,p,t,b,y,h,n,S,i,o,c,v,f)}};exports.hinkalSolanaDepositAndWithdraw=A;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`),i=require(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../utxo/Utxo.cjs`),s=require(`../../functions/utils/solanaMint.utils.cjs`),c=require(`../../functions/utils/addresses.cjs`),l=require(`../../types/external-action.types.cjs`),u=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const d=require(`../../functions/utils/token-check.utils.cjs`),f=require(`../../functions/snarkjs/common.snarkjs.cjs`),p=require(`../../functions/pre-transaction/solana.cjs`),m=require(`../../functions/pre-transaction/constructAdminData.cjs`),h=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),g=require(`../../functions/pre-transaction/getFeeStructure.cjs`),_=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`);require(`../../functions/pre-transaction/index.cjs`);const v=require(`../../functions/utils/getUtxosFromReceiptSolana.cjs`),y=require(`../../functions/utils/fees.utils.cjs`);require(`../../functions/web3/index.cjs`);const b=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),x=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),S=require(`../../API/deposit-and-withdraw-status-calls.cjs`);require(`../../functions/index.cjs`);let C=require(`ethers`),w=require(`@solana/web3.js`),T=require(`@coral-xyz/anchor`);var E=(n,a,o,c)=>{let{hinkalIdl:l,hinkalAddress:u,originalDeployer:d}=e.networkRegistry[a].contractData;if(!l)throw Error(`No IDL configured for Solana program on this network`);if(!d)throw Error(`missing original deployer`);let m=n.userKeys.getShieldedPrivateKey(),h=n.getSolanaProgram(l),g=n.getSolanaPublicKey(),_=new w.PublicKey(d),v=new w.PublicKey(u),{mintPublicKey:y}=s.formatMintAddress(o.erc20TokenAddress),b=y.toString(),x=p.getStorageAccountPublicKey(v,_),S=p.getStorageVaultPublicKey(v,_),C=p.getMerkleAccountPublicKey(v,_),T=c.map(()=>p.buildAnchorStealthAddressStructure(f.calcStealthAddressStructure(i.UserKeys.findCorrectRandomization(r.randomBigInt(31),m),m,n.userKeys.getSpendingKeyPair().pubSpendingBJJPoint))),E=b===t.solanaNativeAddress;return{program:h,publicKey:g,originalDeployer:_,mint:E?null:y,atasValue:E?null:void 0,storageAccount:x,storageVault:S,merkleAccount:C,amounts:c,anchorStealthStructures:T}},D=e=>e.program.methods.multiPaymentDeposit(e.amounts.map(e=>new T.BN(e.toString())),e.anchorStealthStructures,!0).accounts({mint:e.mint,signer:e.publicKey,signerAta:e.atasValue,originalDeployer:e.originalDeployer,storageAccount:e.storageAccount,storageVault:e.storageVault,merkleAccount:e.merkleAccount,storageVaultAta:e.atasValue}),O=async(e,t,n,r,i,a,o)=>{let c=r.map(e=>e+y.calculateTotalFee(e,a)),l=E(e,t,n,c),d=(await S.updateDepositAndWithdrawStatus({chainId:t,hashedEthereumAddress:o,phase:u.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0,f=await D(l).rpc(),p=await l.program.provider.connection.getLatestBlockhash();await l.program.provider.connection.confirmTransaction({blockhash:p.blockhash,lastValidBlockHeight:p.lastValidBlockHeight,signature:f},`finalized`);let m=await h.fetchSolanaTransaction(l.program.provider.connection,f,`finalized`);if(!m)throw Error(`Transaction missing`);await S.safeUpdateDepositAndWithdrawStatus({id:d,chainId:t,hashedEthereumAddress:o,phase:u.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:f});let{compressedAddress:g}=s.formatMintAddress(n.erc20TokenAddress),_=v.getOnChainUtxosFromReceiptSolana(m,l.program,e.userKeys,g),b=[],x=[..._];return i.forEach((e,t)=>{let n=c[t],r=x.find(e=>e.amount===n);if(!r)throw Error(`Could not find newly created UTXO with amount ${n} for recipient ${e}.`);b.push({recipientAddress:e,utxo:r}),x.splice(x.indexOf(r),1)}),{userDepositedUtxos:b,depositTxHash:f,statusId:d}},k=async(c,l,d,p,h,g,_,v,w,T,E,D,O)=>{let k=d.erc20TokenAddress;if(p.length===0)throw Error(`userDepositedUtxos must not be empty`);let{originalDeployer:A}=e.networkRegistry[l].contractData;if(!A)throw Error(`missing data`);let j=await c.getRandomRelay(l,!0);if(!j)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let M=a.getCurrentTimeInSeconds().toString(),N=c.generateProofRemotely?5:1,P=[];for(let e=0;e<p.length;e+=N){let n=p.slice(e,e+N),a=await Promise.all(n.map(async({recipientAddress:e,utxo:n},a)=>{let{compressedAddress:u}=s.formatMintAddress(t.solanaNativeAddress),p=new o.Utxo({amount:0n,mintAddress:k,erc20TokenAddress:u,nullifyingKey:c.userKeys.getShieldedPrivateKey(),timeStamp:M,spendingPublicKey:c.userKeys.getSpendingKeyPair().pubSpendingBJJPoint}),g=[n,p],v=[p],x=i.UserKeys.findCorrectRandomization(r.randomBigInt(31),c.userKeys.getShieldedPrivateKey()),S={tokenNumber:1,nullifierAmount:g.length,outputAmount:v.length},w=f.calcEncryptedOutputs([v])[0][0],T=Array.from(C.ethers.getBytes(w)),D=await y.calculateModifiedFeeStructure(l,d,_[a],h),A=m.constructAdminData(E,l,[k],[_[a]],await c.getEthereumAddress()),{proofAArr:N,proofBArr:P,proofCArr:F,publicInputsArr:I,commitmentValidationData:L}=await b.constructSolanaZkProof(c.generateProofRemotely,c.merkleTreeHinkalByChain[l],c.userKeys,[k],[g],[v],x,D.flatFee,D.variableRate,e,j,S,[T],l),R={recipient:e,mint:k===`11111111111111111111111111111111`?void 0:k};return{relayAddress:j,functionName:`transact`,chainId:l,recipientAmount:_[a].toString(),args:{proofAArr:N,proofBArr:P,proofCArr:F,publicInputsArr:I,encryptedOutputs:[T],relayerFee:D.flatFee.toString(),dimensions:S},accounts:R,adminData:A,commitmentValidationData:L,displayRecipient:O?.[a]}}));P.push(...a)}await S.safeUpdateDepositAndWithdrawStatus({id:v,chainId:l,hashedEthereumAddress:g,phase:u.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let F=await x.solanaTransactCallRelayerBatch(l,P,g,w,T,D);return await S.safeUpdateDepositAndWithdrawStatus({id:v,chainId:l,hashedEthereumAddress:g,phase:u.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:F}),F},A=async(e,t,n,r,i,a,o,s,u,f)=>{let p=d.validateAndGetChainId([t]),m=t.erc20TokenAddress,h=c.hashEthereumAddress(await e.getEthereumAddressByChain(p)),v=u?c.hashString(u):void 0,y=a??await g.getFeeStructure(p,m,[m],l.ExternalActionId.Transact,[],5n,{mintTo:m,recipient:r[0],nullifierCount:1}),{userDepositedUtxos:b,depositTxHash:x,statusId:S}=await O(e,p,t,n,r,y,h);return await _.waitForDepositedUtxosInMerkleTree(e,p,b),{depositTxHash:x,scheduleId:await k(e,p,t,b,y,h,n,S,i,o,s,v,f)}};exports.hinkalSolanaDepositAndWithdraw=A;

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

@@ -5,11 +5,11 @@ import { randomBigInt as r } from "../../functions/web3/etherFunctions.mjs";
 import { UserKeys as i } from "../crypto-keys/keys.mjs";
 import { getCurrentTimeInSeconds as a } from "../../functions/utils/time.utils.mjs";
 import { Utxo as o } from "../utxo/Utxo.mjs";
-import { ExternalActionId as s } from "../../types/external-action.types.mjs";
-import { DepositAndWithdrawPhase as c } from "../../types/scheduled-transactions.types.mjs";
+import { formatMintAddress as s } from "../../functions/utils/solanaMint.utils.mjs";
+import { hashEthereumAddress as c, hashString as l } from "../../functions/utils/addresses.mjs";
+import { ExternalActionId as u } from "../../types/external-action.types.mjs";
+import { DepositAndWithdrawPhase as d } from "../../types/scheduled-transactions.types.mjs";
 import "../../types/index.mjs";
-import { formatMintAddress as l } from "../../functions/utils/solanaMint.utils.mjs";
-import { hashEthereumAddress as u, hashString as d } from "../../functions/utils/addresses.mjs";
 import { validateAndGetChainId as f } from "../../functions/utils/token-check.utils.mjs";
 import { calcEncryptedOutputs as p, calcStealthAddressStructure as m } from "../../functions/snarkjs/common.snarkjs.mjs";
 import { buildAnchorStealthAddressStructure as h, getMerkleAccountPublicKey as g, getStorageAccountPublicKey as _, getStorageVaultPublicKey as v } from "../../functions/pre-transaction/solana.mjs";
@@ -29,11 +29,11 @@ import { ethers as A } from "ethers";
 import { PublicKey as j } from "@solana/web3.js";
 import { BN as M } from "@coral-xyz/anchor";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.ts
-var N = (n, a, o, s) => {
-	let { hinkalIdl: c, hinkalAddress: u, originalDeployer: d } = e[a].contractData;
-	if (!c) throw Error("No IDL configured for Solana program on this network");
+var N = (n, a, o, c) => {
+	let { hinkalIdl: l, hinkalAddress: u, originalDeployer: d } = e[a].contractData;
+	if (!l) throw Error("No IDL configured for Solana program on this network");
 	if (!d) throw Error("missing original deployer");
-	let f = n.userKeys.getShieldedPrivateKey(), p = n.getSolanaProgram(c), y = n.getSolanaPublicKey(), b = new j(d), x = new j(u), { mintPublicKey: S } = l(o.erc20TokenAddress), C = S.toString(), w = _(x, b), T = v(x, b), E = g(x, b), D = s.map(() => h(m(i.findCorrectRandomization(r(31), f), f, n.userKeys.getSpendingKeyPair().pubSpendingBJJPoint))), O = C === t;
+	let f = n.userKeys.getShieldedPrivateKey(), p = n.getSolanaProgram(l), y = n.getSolanaPublicKey(), b = new j(d), x = new j(u), { mintPublicKey: S } = s(o.erc20TokenAddress), C = S.toString(), w = _(x, b), T = v(x, b), E = g(x, b), D = c.map(() => h(m(i.findCorrectRandomization(r(31), f), f, n.userKeys.getSpendingKeyPair().pubSpendingBJJPoint))), O = C === t;
 	return {
 		program: p,
 		publicKey: y,
@@ -43,7 +43,7 @@ var N = (n, a, o, s) => {
 		storageAccount: w,
 		storageVault: T,
 		merkleAccount: E,
-		amounts: s,
+		amounts: c,
 		anchorStealthStructures: D
 	};
 }, P = (e) => e.program.methods.multiPaymentDeposit(e.amounts.map((e) => new M(e.toString())), e.anchorStealthStructures, !0).accounts({
@@ -56,28 +56,28 @@ var N = (n, a, o, s) => {
 	merkleAccount: e.merkleAccount,
 	storageVaultAta: e.atasValue
 }), F = async (e, t, n, r, i, a, o) => {
-	let s = r.map((e) => e + T(e, a)), u = N(e, t, n, s), d = (await k({
+	let c = r.map((e) => e + T(e, a)), l = N(e, t, n, c), u = (await k({
 		chainId: t,
 		hashedEthereumAddress: o,
-		phase: c.BEFORE_DEPOSIT
-	})).id ?? void 0, f = await P(u).rpc(), p = await u.program.provider.connection.getLatestBlockhash();
-	await u.program.provider.connection.confirmTransaction({
+		phase: d.BEFORE_DEPOSIT
+	})).id ?? void 0, f = await P(l).rpc(), p = await l.program.provider.connection.getLatestBlockhash();
+	await l.program.provider.connection.confirmTransaction({
 		blockhash: p.blockhash,
 		lastValidBlockHeight: p.lastValidBlockHeight,
 		signature: f
 	}, "finalized");
-	let m = await b(u.program.provider.connection, f, "finalized");
+	let m = await b(l.program.provider.connection, f, "finalized");
 	if (!m) throw Error("Transaction missing");
 	await O({
-		id: d,
+		id: u,
 		chainId: t,
 		hashedEthereumAddress: o,
-		phase: c.AFTER_DEPOSIT,
+		phase: d.AFTER_DEPOSIT,
 		depositTxHash: f
 	});
-	let { compressedAddress: h } = l(n.erc20TokenAddress), g = C(m, u.program, e.userKeys, h), _ = [], v = [...g];
+	let { compressedAddress: h } = s(n.erc20TokenAddress), g = C(m, l.program, e.userKeys, h), _ = [], v = [...g];
 	return i.forEach((e, t) => {
-		let n = s[t], r = v.find((e) => e.amount === n);
+		let n = c[t], r = v.find((e) => e.amount === n);
 		if (!r) throw Error(`Could not find newly created UTXO with amount ${n} for recipient ${e}.`);
 		_.push({
 			recipientAddress: e,
@@ -86,40 +86,37 @@ var N = (n, a, o, s) => {
 	}), {
 		userDepositedUtxos: _,
 		depositTxHash: f,
-		statusId: d
+		statusId: u
 	};
-}, I = async (s, u, d, f, m, h, g, _, v, b, x, S, C) => {
-	let T = d.erc20TokenAddress;
+}, I = async (c, l, u, f, m, h, g, _, v, b, x, S, C) => {
+	let T = u.erc20TokenAddress;
 	if (f.length === 0) throw Error("userDepositedUtxos must not be empty");
-	let { originalDeployer: k } = e[u].contractData;
+	let { originalDeployer: k } = e[l].contractData;
 	if (!k) throw Error("missing data");
-	let j = await s.getRandomRelay(u, !0);
+	let j = await c.getRandomRelay(l, !0);
 	if (!j) throw Error(n.RELAYER_NOT_AVAILABLE);
-	let M = a().toString(), N = s.generateProofRemotely ? 5 : 1, P = [];
+	let M = a().toString(), N = c.generateProofRemotely ? 5 : 1, P = [];
 	for (let e = 0; e < f.length; e += N) {
 		let n = f.slice(e, e + N), a = await Promise.all(n.map(async ({ recipientAddress: e, utxo: n }, a) => {
-			let { compressedAddress: c } = l(t), f = new o({
+			let { compressedAddress: d } = s(t), f = new o({
 				amount: 0n,
 				mintAddress: T,
-				erc20TokenAddress: c,
-				nullifyingKey: s.userKeys.getShieldedPrivateKey(),
+				erc20TokenAddress: d,
+				nullifyingKey: c.userKeys.getShieldedPrivateKey(),
 				timeStamp: M,
-				...n.isNewStyle ? {
-					spendingPublicKey: s.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,
-					isNewStyle: !0
-				} : { isNewStyle: !1 }
-			}), h = [n, f], _ = [f], v = i.findCorrectRandomization(r(31), s.userKeys.getShieldedPrivateKey()), b = {
+				spendingPublicKey: c.userKeys.getSpendingKeyPair().pubSpendingBJJPoint
+			}), h = [n, f], _ = [f], v = i.findCorrectRandomization(r(31), c.userKeys.getShieldedPrivateKey()), b = {
 				tokenNumber: 1,
 				nullifierAmount: h.length,
 				outputAmount: _.length
-			}, S = p([_])[0][0], D = Array.from(A.getBytes(S)), O = await w(u, d, g[a], m), k = y(x, u, [T], [g[a]], await s.getEthereumAddress()), { proofAArr: N, proofBArr: P, proofCArr: F, publicInputsArr: I, commitmentValidationData: L } = await E(s.generateProofRemotely, s.merkleTreeHinkalByChain[u], s.userKeys, [T], [h], [_], v, O.flatFee, O.variableRate, e, j, b, [D], u), R = {
+			}, S = p([_])[0][0], D = Array.from(A.getBytes(S)), O = await w(l, u, g[a], m), k = y(x, l, [T], [g[a]], await c.getEthereumAddress()), { proofAArr: N, proofBArr: P, proofCArr: F, publicInputsArr: I, commitmentValidationData: L } = await E(c.generateProofRemotely, c.merkleTreeHinkalByChain[l], c.userKeys, [T], [h], [_], v, O.flatFee, O.variableRate, e, j, b, [D], l), R = {
 				recipient: e,
 				mint: T === "11111111111111111111111111111111" ? void 0 : T
 			};
 			return {
 				relayAddress: j,
 				functionName: "transact",
-				chainId: u,
+				chainId: l,
 				recipientAmount: g[a].toString(),
 				args: {
 					proofAArr: N,
@@ -140,23 +137,27 @@ var N = (n, a, o, s) => {
 	}
 	await O({
 		id: _,
-		chainId: u,
+		chainId: l,
 		hashedEthereumAddress: h,
-		phase: c.BEFORE_SCHEDULE_WITHDRAW
+		phase: d.BEFORE_SCHEDULE_WITHDRAW
 	});
-	let F = await D(u, P, h, v, b, S);
+	let F = await D(l, P, h, v, b, S);
 	return await O({
 		id: _,
-		chainId: u,
+		chainId: l,
 		hashedEthereumAddress: h,
-		phase: c.AFTER_SCHEDULE_WITHDRAW,
+		phase: d.AFTER_SCHEDULE_WITHDRAW,
 		scheduleId: F
 	}), F;
-}, L = async (e, t, n, r, i, a, o, c, l, p) => {
-	let m = f([t]), h = t.erc20TokenAddress, g = u(await e.getEthereumAddressByChain(m)), _ = l ? d(l) : void 0, v = a ?? await x(m, h, [h], s.Transact, [], 5n), { userDepositedUtxos: y, depositTxHash: b, statusId: C } = await F(e, m, t, n, r, v, g);
+}, L = async (e, t, n, r, i, a, o, s, d, p) => {
+	let m = f([t]), h = t.erc20TokenAddress, g = c(await e.getEthereumAddressByChain(m)), _ = d ? l(d) : void 0, v = a ?? await x(m, h, [h], u.Transact, [], 5n, {
+		mintTo: h,
+		recipient: r[0],
+		nullifierCount: 1
+	}), { userDepositedUtxos: y, depositTxHash: b, statusId: C } = await F(e, m, t, n, r, v, g);
 	return await S(e, m, y), {
 		depositTxHash: b,
-		scheduleId: await I(e, m, t, y, v, g, n, C, i, o, c, _, p)
+		scheduleId: await I(e, m, t, y, v, g, n, C, i, o, s, _, p)
 	};
 };
 //#endregion

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`),i=require(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const s=require(`../../functions/utils/addresses.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/snarkjs/common.snarkjs.cjs`),f=require(`../../functions/pre-transaction/constructAdminData.cjs`),p=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),m=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const h=require(`../../functions/utils/fees.utils.cjs`),g=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),_=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let v=require(`ethers`);var y=async(e,t,n,r,i,o)=>{let s=(await l.addPaddingToUtxos(e,t,n,r,6))[0],c=a.getCurrentTimeInSeconds().toString(),{outputUtxos:d}=u.outputUtxoProcessing(e.userKeys,s,r[0],c,!0,i,o);return{inputUtxos:s,senderUtxo:d[0],recipientUtxo:d[1]}},b=async(a,l,u,_,b,x,S)=>{if(!s.isValidPrivateAddress(_))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let C=c.validateAndGetChainId(l),w=[...u],{originalDeployer:T}=e.networkRegistry[C].contractData;if(!T)throw Error(`missing data`);let{userKeys:E,merkleTreeHinkalByChain:D}=a,O=l.map(e=>e.erc20TokenAddress);if(O.length>1)throw Error(`Solana Transfer: Only one mint address is supported`);let k=x??await m.getFeeStructure(C,b,O,o.ExternalActionId.Transact,[],5n);k.variableRate||=t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let A=h.calculateTotalFee(-w[0],k),j=-w[0];w[0]-=A;let[M,N,{inputUtxos:P,senderUtxo:F,recipientUtxo:I}]=await Promise.all([a.getRandomRelay(C,!0),a.getEthereumAddressByChain(C),y(a,C,O,w,_,j)]);if(!M)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let L=i.UserKeys.findCorrectRandomization(r.randomBigInt(31),a.userKeys.getShieldedPrivateKey()),R={tokenNumber:O.length,nullifierAmount:P.length,outputAmount:2},z=d.calcEncryptedOutputs([[F,I]])[0].map(e=>Array.from(v.ethers.getBytes(e)));p.ensureAmountChanges([P],[[F]],w);let{proofAArr:B,proofBArr:V,proofCArr:H,publicInputsArr:U,commitmentValidationData:W}=await g.constructSolanaZkProof(a.generateProofRemotely,D[C],E,[O[0]],[P],[[F,I]],L,A,0n,t.solanaNativeAddress,M,R,z,C),G={recipient:M,mint:O[0]===`11111111111111111111111111111111`?void 0:O[0]};return{chainId:C,relay:M,args:{proofAArr:B,proofBArr:V,proofCArr:H,publicInputsArr:U,encryptedOutputs:z,relayerFee:A.toString(),dimensions:R},accounts:G,adminData:f.constructAdminData(S,C,O,w,N),commitmentValidationData:W,recipientUtxo:I}},x=async(e,t,n,r,i,a,o,s=!1)=>{if(s)throw Error(`onlyGasEstimate is not supported for Solana transfer`);let c=await b(e,t,n,r,i,a,o);return _.solanaTransactCallRelayer({chainId:c.chainId,relayAddress:c.relay,functionName:`transfer`,args:c.args,accounts:c.accounts,adminData:c.adminData,commitmentValidationData:c.commitmentValidationData})};exports.hinkalSolanaTransfer=x;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`),i=require(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const 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/snarkjs/common.snarkjs.cjs`),f=require(`../../functions/pre-transaction/constructAdminData.cjs`),p=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),m=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const h=require(`../../functions/utils/fees.utils.cjs`),g=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),_=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let v=require(`ethers`);var y=async(e,t,n,r,i,o)=>{let s=(await l.addPaddingToUtxos(e,t,n,r,6))[0],c=a.getCurrentTimeInSeconds().toString(),{outputUtxos:d}=u.outputUtxoProcessing(e.userKeys,s,r[0],c,!0,i,o);return{inputUtxos:s,senderUtxo:d[0],recipientUtxo:d[1]}},b=async(a,l,u,_,b,x,S)=>{if(!o.isValidPrivateAddress(_))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let C=c.validateAndGetChainId(l),w=[...u],{originalDeployer:T}=e.networkRegistry[C].contractData;if(!T)throw Error(`missing data`);let{userKeys:E,merkleTreeHinkalByChain:D}=a,O=l.map(e=>e.erc20TokenAddress);if(O.length>1)throw Error(`Solana Transfer: Only one mint address is supported`);let k=x??await m.getFeeStructure(C,b,O,s.ExternalActionId.Transact,[],5n);k.variableRate||=t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let A=h.calculateTotalFee(-w[0],k),j=-w[0];w[0]-=A;let[M,N,{inputUtxos:P,senderUtxo:F,recipientUtxo:I}]=await Promise.all([a.getRandomRelay(C,!0),a.getEthereumAddressByChain(C),y(a,C,O,w,_,j)]);if(!M)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let L=i.UserKeys.findCorrectRandomization(r.randomBigInt(31),a.userKeys.getShieldedPrivateKey()),R={tokenNumber:O.length,nullifierAmount:P.length,outputAmount:2},z=d.calcEncryptedOutputs([[F,I]])[0].map(e=>Array.from(v.ethers.getBytes(e)));p.ensureAmountChanges([P],[[F]],w);let{proofAArr:B,proofBArr:V,proofCArr:H,publicInputsArr:U,commitmentValidationData:W}=await g.constructSolanaZkProof(a.generateProofRemotely,D[C],E,[O[0]],[P],[[F,I]],L,A,0n,t.solanaNativeAddress,M,R,z,C),G={recipient:M,mint:O[0]===`11111111111111111111111111111111`?void 0:O[0]};return{chainId:C,relay:M,args:{proofAArr:B,proofBArr:V,proofCArr:H,publicInputsArr:U,encryptedOutputs:z,relayerFee:A.toString(),dimensions:R},accounts:G,adminData:f.constructAdminData(S,C,O,w,N),commitmentValidationData:W,recipientUtxo:I}},x=async(e,t,n,r,i,a,o,s=!1)=>{if(s)throw Error(`onlyGasEstimate is not supported for Solana transfer`);let c=await b(e,t,n,r,i,a,o);return _.solanaTransactCallRelayer({chainId:c.chainId,relayAddress:c.relay,functionName:`transfer`,args:c.args,accounts:c.accounts,adminData:c.adminData,commitmentValidationData:c.commitmentValidationData})};exports.hinkalSolanaTransfer=x;

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

@@ -4,9 +4,9 @@ import { transactionErrorCodes as r } from "../../error-handling/error-codes.con
 import { randomBigInt as i } from "../../functions/web3/etherFunctions.mjs";
 import { UserKeys as a } from "../crypto-keys/keys.mjs";
 import { getCurrentTimeInSeconds as o } from "../../functions/utils/time.utils.mjs";
-import { ExternalActionId as s } from "../../types/external-action.types.mjs";
+import { isValidPrivateAddress as s } from "../../functions/utils/addresses.mjs";
+import { ExternalActionId as c } from "../../types/external-action.types.mjs";
 import "../../types/index.mjs";
-import { isValidPrivateAddress as c } from "../../functions/utils/addresses.mjs";
 import { validateAndGetChainId as l } from "../../functions/utils/token-check.utils.mjs";
 import { addPaddingToUtxos as u } from "../../functions/web3/events/getShieldedBalance.mjs";
 import { outputUtxoProcessing as d } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
@@ -28,12 +28,12 @@ var b = async (e, t, n, r, i, a) => {
 		recipientUtxo: l[1]
 	};
 }, x = async (o, u, d, v, x, S, C) => {
-	if (!c(v)) throw Error(r.RECIPIENT_FORMAT_INCORRECT);
+	if (!s(v)) throw Error(r.RECIPIENT_FORMAT_INCORRECT);
 	let w = l(u), T = [...d], { originalDeployer: E } = e[w].contractData;
 	if (!E) throw Error("missing data");
 	let { userKeys: D, merkleTreeHinkalByChain: O } = o, k = u.map((e) => e.erc20TokenAddress);
 	if (k.length > 1) throw Error("Solana Transfer: Only one mint address is supported");
-	let A = S ?? await h(w, x, k, s.Transact, [], 5n);
+	let A = S ?? await h(w, x, k, c.Transact, [], 5n);
 	A.variableRate ||= t;
 	let j = g(-T[0], A), M = -T[0];
 	T[0] -= j;

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

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/utils/time.utils.cjs`),i=require(`../../types/external-action.types.cjs`),a=require(`../../functions/utils/addresses.cjs`),o=require(`../../functions/utils/tron.utils.cjs`),s=require(`../../functions/utils/token-check.utils.cjs`),c=require(`../../functions/web3/events/getShieldedBalance.cjs`),l=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),u=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const p=require(`../../functions/utils/fees.utils.cjs`),m=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),h=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),g=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var _=async(e,t,n,i,a,o)=>{let s=[...await c.addPaddingToUtxos(e,t,n,i)],u=[],d=r.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=l.outputUtxoProcessing(e.userKeys,s[t],i[t],d,!0,a,t===0?o:0n);u.push(n)}return{inputUtxosArray:s,outputUtxosArray:u}},v=async(r,c,l,v,y,b,x)=>{let S=s.validateAndGetChainId(c),C=e.isTronLike(S);if(!a.isValidPrivateAddress(v))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let w=o.addressToHexFormat(await r.getEthereumAddressByChain(S)),T=c.map(e=>e.erc20TokenAddress),E=await u.modifyVolatileTokenAmountChanges(S,c,l),D=b??await f.getFeeStructure(S,y,T,i.ExternalActionId.Transact,[],5n);D.variableRate||=t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let O=c[0];if(!O)throw Error(`Transfer Action: No Token Found`);let k=-E[0],A=await p.calculateModifiedFeeStructure(S,O,k,D);await g.mergeWithFeeStructure(S,T,E,A);let[j,{inputUtxosArray:M,outputUtxosArray:N}]=await Promise.all([r.getRandomRelay(S,!0),_(r,S,T,E,v,k)]);if(!j)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let P={externalActionId:0n,externalAddress:j,externalActionMetadata:`0x00`},{zkCallData:F,circomData:I,dimData:L,commitmentValidationData:R}=await m.constructZkProof(r.merkleTreeHinkalByChain[S],M,N,r.userKeys,P.externalActionId,P.externalAddress,P.externalActionMetadata,r.generateProofRemotely,A,j,S),z=await o.reorderZkCallData(C,F,L,I);return await h.transactCallRelayer(S,F,L,I,R,void 0,void 0,d.constructAdminData(x,S,T,E,w),z)};exports.hinkalTransfer=v;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/utils/time.utils.cjs`),i=require(`../../functions/utils/addresses.cjs`),a=require(`../../functions/utils/tron.utils.cjs`),o=require(`../../types/external-action.types.cjs`),s=require(`../../functions/utils/token-check.utils.cjs`),c=require(`../../functions/web3/events/getShieldedBalance.cjs`),l=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),u=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const p=require(`../../functions/utils/fees.utils.cjs`),m=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),h=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),g=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var _=async(e,t,n,i,a,o)=>{let s=[...await c.addPaddingToUtxos(e,t,n,i)],u=[],d=r.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=l.outputUtxoProcessing(e.userKeys,s[t],i[t],d,!0,a,t===0?o:0n);u.push(n)}return{inputUtxosArray:s,outputUtxosArray:u}},v=async(r,c,l,v,y,b,x)=>{let S=s.validateAndGetChainId(c),C=e.isTronLike(S);if(!i.isValidPrivateAddress(v))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let w=a.addressToHexFormat(await r.getEthereumAddressByChain(S)),T=c.map(e=>e.erc20TokenAddress),E=await u.modifyVolatileTokenAmountChanges(S,c,l),D=b??await f.getFeeStructure(S,y,T,o.ExternalActionId.Transact,[],5n);D.variableRate||=t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let O=c[0];if(!O)throw Error(`Transfer Action: No Token Found`);let k=-E[0],A=await p.calculateModifiedFeeStructure(S,O,k,D);await g.mergeWithFeeStructure(S,T,E,A);let[j,{inputUtxosArray:M,outputUtxosArray:N}]=await Promise.all([r.getRandomRelay(S,!0),_(r,S,T,E,v,k)]);if(!j)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let P={externalActionId:0n,externalAddress:j,externalActionMetadata:`0x00`},{zkCallData:F,circomData:I,dimData:L,commitmentValidationData:R}=await m.constructZkProof(r.merkleTreeHinkalByChain[S],M,N,r.userKeys,P.externalActionId,P.externalAddress,P.externalActionMetadata,r.generateProofRemotely,A,j,S),z=await a.reorderZkCallData(C,F,L,I);return await h.transactCallRelayer(S,F,L,I,R,void 0,void 0,d.constructAdminData(x,S,T,E,w),z)};exports.hinkalTransfer=v;

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

@@ -2,9 +2,9 @@ import { isTronLike as e } from "../../constants/chains.constants.mjs";
 import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as t } from "../../constants/protocol.constants.mjs";
 import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
 import { getCurrentTimeInSeconds as r } from "../../functions/utils/time.utils.mjs";
-import { ExternalActionId as i } from "../../types/external-action.types.mjs";
-import { isValidPrivateAddress as a } from "../../functions/utils/addresses.mjs";
-import { addressToHexFormat as o, reorderZkCallData as s } from "../../functions/utils/tron.utils.mjs";
+import { isValidPrivateAddress as i } from "../../functions/utils/addresses.mjs";
+import { addressToHexFormat as a, reorderZkCallData as o } from "../../functions/utils/tron.utils.mjs";
+import { ExternalActionId as s } from "../../types/external-action.types.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";
@@ -29,8 +29,8 @@ var v = async (e, t, n, i, a, o) => {
 	};
 }, y = async (r, l, u, y, b, x, S) => {
 	let C = c(l), w = e(C);
-	if (!a(y)) throw Error(n.RECIPIENT_FORMAT_INCORRECT);
-	let T = o(await r.getEthereumAddressByChain(C)), E = l.map((e) => e.erc20TokenAddress), D = await d(C, l, u), O = x ?? await p(C, b, E, i.Transact, [], 5n);
+	if (!i(y)) throw Error(n.RECIPIENT_FORMAT_INCORRECT);
+	let T = a(await r.getEthereumAddressByChain(C)), E = l.map((e) => e.erc20TokenAddress), D = await d(C, l, u), O = x ?? await p(C, b, E, s.Transact, [], 5n);
 	O.variableRate ||= t;
 	let k = l[0];
 	if (!k) throw Error("Transfer Action: No Token Found");
@@ -42,7 +42,7 @@ var v = async (e, t, n, i, a, o) => {
 		externalActionId: 0n,
 		externalAddress: M,
 		externalActionMetadata: "0x00"
-	}, { zkCallData: I, circomData: L, dimData: R, commitmentValidationData: z } = await h(r.merkleTreeHinkalByChain[C], N, P, r.userKeys, F.externalActionId, F.externalAddress, F.externalActionMetadata, r.generateProofRemotely, j, M, C), B = await s(w, I, R, L);
+	}, { zkCallData: I, circomData: L, dimData: R, commitmentValidationData: z } = await h(r.merkleTreeHinkalByChain[C], N, P, r.userKeys, F.externalActionId, F.externalAddress, F.externalActionMetadata, r.generateProofRemotely, j, M, C), B = await o(w, I, R, L);
 	return await g(C, I, R, L, z, void 0, void 0, f(S, C, E, D, T), B);
 };
 //#endregion

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

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/hinkal.types.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/utils/time.utils.cjs`),a=require(`../../types/external-action.types.cjs`),o=require(`../../functions/utils/tron.utils.cjs`),s=require(`../../functions/utils/token-check.utils.cjs`),c=require(`../../functions/web3/events/getShieldedBalance.cjs`),l=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),u=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const p=require(`../../functions/utils/fees.utils.cjs`),m=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),h=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`),g=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),_=require(`../../functions/web3/functionCalls/transactCallDirectTron.cjs`),v=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var y=async(e,t,n,r)=>{let a=[...await c.addPaddingToUtxos(e,t,n,r)],o=[],s=i.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=l.outputUtxoProcessing(e.userKeys,a[t],r[t],s);o.push(n)}return{inputUtxosArray:a,outputUtxosArray:o}},b=async(i,c,l,b,x,S,C,w)=>{let T=s.validateAndGetChainId(c),E=e.isTronLike(T),D=o.addressToHexFormat(await i.getEthereumAddressByChain(T)),O=c.map(e=>e.erc20TokenAddress),k=await u.modifyVolatileTokenAmountChanges(T,c,l),A=c[0];if(!A)throw Error(`Deposit Action: No Token Found`);let j;if(!x){let e=C??await f.getFeeStructure(T,S,O,a.ExternalActionId.Transact);j=await p.calculateModifiedFeeStructure(T,A,-k[0],e),await v.mergeWithFeeStructure(T,O,k,j)}let M={externalActionId:0n,externalAddress:o.addressToHexFormat(b),externalActionMetadata:`0x00`},[N,{inputUtxosArray:P,outputUtxosArray:F}]=await Promise.all([i.getRandomRelay(T,!0),y(i,T,O,k)]);if(!x&&!N)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let{zkCallData:I,circomData:L,dimData:R,commitmentValidationData:z}=await m.constructZkProof(i.merkleTreeHinkalByChain[T],P,F,i.userKeys,M.externalActionId,M.externalAddress,M.externalActionMetadata,i.generateProofRemotely,j??n.zeroFeeStructure,x?t.zeroAddress:N,T,void 0,void 0,x?D:void 0),B=E&&x?void 0:await o.reorderZkCallData(E,I,R,L);if(x){if(!A)throw Error(`Withdraw Action: No Token Found`);return E?await _.transactCallDirectTron(i,T,k[0],A,I,L,R):await h.transactCallDirect(i,T,k[0],A,I,L,R)}return await g.transactCallRelayer(T,I,R,L,z,void 0,void 0,d.constructAdminData(w,T,O,k,D),B)};exports.hinkalWithdraw=b;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/hinkal.types.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/utils/time.utils.cjs`),a=require(`../../functions/utils/tron.utils.cjs`),o=require(`../../types/external-action.types.cjs`),s=require(`../../functions/utils/token-check.utils.cjs`),c=require(`../../functions/web3/events/getShieldedBalance.cjs`),l=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),u=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const p=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),m=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`),h=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),g=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`),_=require(`../../functions/web3/functionCalls/transactCallDirectTron.cjs`);var v=async(e,t,n,r)=>{let a=[...await c.addPaddingToUtxos(e,t,n,r)],o=[],s=i.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=l.outputUtxoProcessing(e.userKeys,a[t],r[t],s);o.push(n)}return{inputUtxosArray:a,outputUtxosArray:o}},y=async(i,c,l,y,b,x,S,C)=>{let w=s.validateAndGetChainId(c),T=e.isTronLike(w),E=a.addressToHexFormat(await i.getEthereumAddressByChain(w)),D=c.map(e=>e.erc20TokenAddress),O=await u.modifyVolatileTokenAmountChanges(w,c,l),k=c[0];if(!k)throw Error(`Deposit Action: No Token Found`);let A;b||(A=S??await f.getFeeStructure(w,x,D,o.ExternalActionId.Transact),await g.mergeWithFeeStructure(w,D,O,A));let j={externalActionId:0n,externalAddress:a.addressToHexFormat(y),externalActionMetadata:`0x00`},[M,{inputUtxosArray:N,outputUtxosArray:P}]=await Promise.all([i.getRandomRelay(w,!0),v(i,w,D,O)]);if(!b&&!M)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let{zkCallData:F,circomData:I,dimData:L,commitmentValidationData:R}=await p.constructZkProof(i.merkleTreeHinkalByChain[w],N,P,i.userKeys,j.externalActionId,j.externalAddress,j.externalActionMetadata,i.generateProofRemotely,A??n.zeroFeeStructure,b?t.zeroAddress:M,w,void 0,void 0,b?E:void 0),z=T&&b?void 0:await a.reorderZkCallData(T,F,L,I);if(b){if(!k)throw Error(`Withdraw Action: No Token Found`);return T?await _.transactCallDirectTron(i,w,O[0],k,F,I,L):await m.transactCallDirect(i,w,O[0],k,F,I,L)}return await h.transactCallRelayer(w,F,L,I,R,void 0,void 0,d.constructAdminData(C,w,D,O,E),z)};exports.hinkalWithdraw=y;

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

@@ -3,8 +3,8 @@ import { zeroAddress as t } from "../../constants/protocol.constants.mjs";
 import { zeroFeeStructure as n } from "../../types/hinkal.types.mjs";
 import { transactionErrorCodes as r } from "../../error-handling/error-codes.constants.mjs";
 import { getCurrentTimeInSeconds as i } from "../../functions/utils/time.utils.mjs";
-import { ExternalActionId as a } from "../../types/external-action.types.mjs";
-import { addressToHexFormat as o, reorderZkCallData as s } from "../../functions/utils/tron.utils.mjs";
+import { addressToHexFormat as a, reorderZkCallData as o } from "../../functions/utils/tron.utils.mjs";
+import { ExternalActionId as s } from "../../types/external-action.types.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";
@@ -12,14 +12,13 @@ import { modifyVolatileTokenAmountChanges as d } from "../../functions/pre-trans
 import { constructAdminData as f } from "../../functions/pre-transaction/constructAdminData.mjs";
 import { getFeeStructure as p } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { calculateModifiedFeeStructure as m } from "../../functions/utils/fees.utils.mjs";
-import { constructZkProof as h } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallDirect as g } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
-import { transactCallRelayer as _ } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { constructZkProof as m } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallDirect as h } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
+import { transactCallRelayer as g } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { mergeWithFeeStructure as _ } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
 import { transactCallDirectTron as v } from "../../functions/web3/functionCalls/transactCallDirectTron.mjs";
-import { mergeWithFeeStructure as y } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalWithdraw.ts
-var b = async (e, t, n, r) => {
+var y = async (e, t, n, r) => {
 	let a = [...await l(e, t, n, r)], o = [], s = i().toString();
 	for (let t = 0; t < n.length; t += 1) {
 		let { outputUtxos: n } = u(e.userKeys, a[t], r[t], s);
@@ -29,26 +28,23 @@ var b = async (e, t, n, r) => {
 		inputUtxosArray: a,
 		outputUtxosArray: o
 	};
-}, x = async (i, l, u, x, S, C, w, T) => {
-	let E = c(l), D = e(E), O = o(await i.getEthereumAddressByChain(E)), k = l.map((e) => e.erc20TokenAddress), A = await d(E, l, u), j = l[0];
-	if (!j) throw Error("Deposit Action: No Token Found");
-	let M;
-	if (!S) {
-		let e = w ?? await p(E, C, k, a.Transact);
-		M = await m(E, j, -A[0], e), await y(E, k, A, M);
-	}
-	let N = {
+}, b = async (i, l, u, b, x, S, C, w) => {
+	let T = c(l), E = e(T), D = a(await i.getEthereumAddressByChain(T)), O = l.map((e) => e.erc20TokenAddress), k = await d(T, l, u), A = l[0];
+	if (!A) throw Error("Deposit Action: No Token Found");
+	let j;
+	x || (j = C ?? await p(T, S, O, s.Transact), await _(T, O, k, j));
+	let M = {
 		externalActionId: 0n,
-		externalAddress: o(x),
+		externalAddress: a(b),
 		externalActionMetadata: "0x00"
-	}, [P, { inputUtxosArray: F, outputUtxosArray: I }] = await Promise.all([i.getRandomRelay(E, !0), b(i, E, k, A)]);
-	if (!S && !P) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let { zkCallData: L, circomData: R, dimData: z, commitmentValidationData: B } = await h(i.merkleTreeHinkalByChain[E], F, I, i.userKeys, N.externalActionId, N.externalAddress, N.externalActionMetadata, i.generateProofRemotely, M ?? n, S ? t : P, E, void 0, void 0, S ? O : void 0), V = D && S ? void 0 : await s(D, L, z, R);
-	if (S) {
-		if (!j) throw Error("Withdraw Action: No Token Found");
-		return D ? await v(i, E, A[0], j, L, R, z) : await g(i, E, A[0], j, L, R, z);
+	}, [N, { inputUtxosArray: P, outputUtxosArray: F }] = await Promise.all([i.getRandomRelay(T, !0), y(i, T, O, k)]);
+	if (!x && !N) throw Error(r.RELAYER_NOT_AVAILABLE);
+	let { zkCallData: I, circomData: L, dimData: R, commitmentValidationData: z } = await m(i.merkleTreeHinkalByChain[T], P, F, i.userKeys, M.externalActionId, M.externalAddress, M.externalActionMetadata, i.generateProofRemotely, j ?? n, x ? t : N, T, void 0, void 0, x ? D : void 0), B = E && x ? void 0 : await o(E, I, R, L);
+	if (x) {
+		if (!A) throw Error("Withdraw Action: No Token Found");
+		return E ? await v(i, T, k[0], A, I, L, R) : await h(i, T, k[0], A, I, L, R);
 	}
-	return await _(E, L, z, R, B, void 0, void 0, f(T, E, k, A, O), V);
+	return await g(T, I, R, L, z, void 0, void 0, f(w, T, O, k, D), B);
 };
 //#endregion
-export { x as hinkalWithdraw };
+export { b as hinkalWithdraw };