@hinkal/common 0.2.33 → 0.2.34

package/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.mjs

@@ -17,24 +17,23 @@ import { constructAdminData as y } from "../../functions/pre-transaction/constru
 import { fetchSolanaTransaction as b } from "../../functions/pre-transaction/sendV0Transaction.mjs";
 import { getFeeStructure as x } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import { waitForDepositedUtxosInMerkleTree as S } from "../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
-import { buildCommitmentValidationData as C } from "../../functions/pre-transaction/buildCommitmentValidationData.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { getOnChainUtxosFromReceiptSolana as w } from "../../functions/utils/getUtxosFromReceiptSolana.mjs";
-import { calculateModifiedFeeStructure as T, calculateTotalFee as E } from "../../functions/utils/fees.utils.mjs";
+import { getOnChainUtxosFromReceiptSolana as C } from "../../functions/utils/getUtxosFromReceiptSolana.mjs";
+import { calculateModifiedFeeStructure as w, calculateTotalFee as T } from "../../functions/utils/fees.utils.mjs";
 import "../../functions/web3/index.mjs";
-import { constructSolanaZkProof as D } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
-import { solanaTransactCallRelayerBatch as O } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { safeUpdateDepositAndWithdrawStatus as k, updateDepositAndWithdrawStatus as A } from "../../API/deposit-and-withdraw-status-calls.mjs";
+import { constructSolanaZkProof as E } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { solanaTransactCallRelayerBatch as D } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { safeUpdateDepositAndWithdrawStatus as O, updateDepositAndWithdrawStatus as k } from "../../API/deposit-and-withdraw-status-calls.mjs";
 import "../../functions/index.mjs";
-import { ethers as j } from "ethers";
-import { PublicKey as M } from "@solana/web3.js";
-import { BN as N } from "@coral-xyz/anchor";
+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 P = (e, r, i, a) => {
+var N = (e, r, i, a) => {
 	let { hinkalIdl: o, hinkalAddress: l, originalDeployer: u } = t[r].contractData;
 	if (!o) throw Error("No IDL configured for Solana program on this network");
 	if (!u) throw Error("missing original deployer");
-	let f = e.userKeys.getShieldedPrivateKey(), p = e.getSolanaProgram(o), y = e.getSolanaPublicKey(), b = new M(u), x = new M(l), { mintPublicKey: S } = d(i.erc20TokenAddress), C = S.toString(), w = _(x, b), T = v(x, b), E = g(x, b), D = a.map(() => h(m(c.findCorrectRandomization(s(31), f), f, e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint))), O = C === n;
+	let f = e.userKeys.getShieldedPrivateKey(), p = e.getSolanaProgram(o), y = e.getSolanaPublicKey(), b = new j(u), x = new j(l), { mintPublicKey: S } = d(i.erc20TokenAddress), C = S.toString(), w = _(x, b), T = v(x, b), E = g(x, b), D = a.map(() => h(m(c.findCorrectRandomization(s(31), f), f, e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint))), O = C === n;
 	return {
 		program: p,
 		publicKey: y,
@@ -47,7 +46,7 @@ var P = (e, r, i, a) => {
 		amounts: a,
 		anchorStealthStructures: D
 	};
-}, F = (e) => e.program.methods.multiPaymentDeposit(e.amounts.map((e) => new N(e.toString())), e.anchorStealthStructures, !0).accounts({
+}, P = (e) => e.program.methods.multiPaymentDeposit(e.amounts.map((e) => new M(e.toString())), e.anchorStealthStructures, !0).accounts({
 	mint: e.mint,
 	signer: e.publicKey,
 	signerAta: e.atasValue,
@@ -56,12 +55,12 @@ var P = (e, r, i, a) => {
 	storageVault: e.storageVault,
 	merkleAccount: e.merkleAccount,
 	storageVaultAta: e.atasValue
-}), I = async (e, t, n, i, a, o, s) => {
-	let c = i.map((e) => e + E(e, o)), l = P(e, t, n, c), u = (await A({
+}), F = async (e, t, n, i, a, o, s) => {
+	let c = i.map((e) => e + T(e, o)), l = N(e, t, n, c), u = (await k({
 		chainId: t,
 		hashedEthereumAddress: s,
 		phase: r.BEFORE_DEPOSIT
-	})).id ?? void 0, f = await F(l).rpc(), p = await l.program.provider.connection.getLatestBlockhash();
+	})).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,
@@ -69,14 +68,14 @@ var P = (e, r, i, a) => {
 	}, "finalized");
 	let m = await b(l.program.provider.connection, f, "finalized");
 	if (!m) throw Error("Transaction missing");
-	await k({
+	await O({
 		id: u,
 		chainId: t,
 		hashedEthereumAddress: s,
 		phase: r.AFTER_DEPOSIT,
 		depositTxHash: f
 	});
-	let { compressedAddress: h } = d(n.erc20TokenAddress), g = w(m, l.program, e.userKeys, h), _ = [], v = [...g];
+	let { compressedAddress: h } = d(n.erc20TokenAddress), g = C(m, l.program, e.userKeys, h), _ = [], v = [...g];
 	return a.forEach((e, t) => {
 		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}.`);
@@ -89,22 +88,22 @@ var P = (e, r, i, a) => {
 		depositTxHash: f,
 		statusId: u
 	};
-}, L = async (e, i, a, f, m, h, g, _, v, b, x, S) => {
-	let w = a.erc20TokenAddress;
+}, I = async (e, i, a, f, m, h, g, _, v, b, x, S) => {
+	let C = a.erc20TokenAddress;
 	if (f.length === 0) throw Error("userDepositedUtxos must not be empty");
-	let { originalDeployer: E } = t[i].contractData;
-	if (!E) throw Error("missing data");
-	let A = await e.getRandomRelay(i, !0);
-	if (!A) throw Error(o.RELAYER_NOT_AVAILABLE);
-	let M = l().toString(), N = e.generateProofRemotely ? 5 : 1, P = [];
-	for (let t = 0; t < f.length; t += N) {
-		let r = f.slice(t, t + N), o = await Promise.all(r.map(async ({ recipientAddress: t, utxo: r }, o) => {
+	let { originalDeployer: T } = t[i].contractData;
+	if (!T) throw Error("missing data");
+	let k = await e.getRandomRelay(i, !0);
+	if (!k) throw Error(o.RELAYER_NOT_AVAILABLE);
+	let j = l().toString(), M = e.generateProofRemotely ? 5 : 1, N = [];
+	for (let t = 0; t < f.length; t += M) {
+		let r = f.slice(t, t + M), o = await Promise.all(r.map(async ({ recipientAddress: t, utxo: r }, o) => {
 			let { compressedAddress: l } = d(n), f = new u({
 				amount: 0n,
-				mintAddress: w,
+				mintAddress: C,
 				erc20TokenAddress: l,
 				nullifyingKey: e.userKeys.getShieldedPrivateKey(),
-				timeStamp: M,
+				timeStamp: j,
 				...r.isNewStyle ? {
 					spendingPublicKey: e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,
 					isNewStyle: !0
@@ -113,48 +112,48 @@ var P = (e, r, i, a) => {
 				tokenNumber: 1,
 				nullifierAmount: h.length,
 				outputAmount: _.length
-			}, S = p([_])[0][0], E = Array.from(j.getBytes(S)), O = await T(i, a, g[o], m), k = y(x, i, [w], [g[o]], await e.getEthereumAddress()), [{ proofAArr: N, proofBArr: P, proofCArr: F, publicInputsArr: I }, L] = await Promise.all([D(e.generateProofRemotely, e.merkleTreeHinkalByChain[i], e.userKeys, [w], [h], [_], v, O.flatFee, O.variableRate, t, A, b, [E], i), C(i, e.userKeys, [w], [h])]), R = {
+			}, S = p([_])[0][0], T = Array.from(A.getBytes(S)), D = await w(i, a, g[o], m), O = y(x, i, [C], [g[o]], await e.getEthereumAddress()), { proofAArr: M, proofBArr: N, proofCArr: P, publicInputsArr: F, commitmentValidationData: I } = await E(e.generateProofRemotely, e.merkleTreeHinkalByChain[i], e.userKeys, [C], [h], [_], v, D.flatFee, D.variableRate, t, k, b, [T], i), L = {
 				recipient: t,
-				mint: w === "11111111111111111111111111111111" ? void 0 : w
+				mint: C === "11111111111111111111111111111111" ? void 0 : C
 			};
 			return {
-				relayAddress: A,
+				relayAddress: k,
 				functionName: "transact",
 				chainId: i,
 				recipientAmount: g[o].toString(),
 				args: {
-					proofAArr: N,
-					proofBArr: P,
-					proofCArr: F,
-					publicInputsArr: I,
-					encryptedOutputs: [E],
-					relayerFee: O.flatFee.toString(),
+					proofAArr: M,
+					proofBArr: N,
+					proofCArr: P,
+					publicInputsArr: F,
+					encryptedOutputs: [T],
+					relayerFee: D.flatFee.toString(),
 					dimensions: b
 				},
-				accounts: R,
-				adminData: k,
-				commitmentValidationData: L
+				accounts: L,
+				adminData: O,
+				commitmentValidationData: I
 			};
 		}));
-		P.push(...o);
+		N.push(...o);
 	}
-	await k({
+	await O({
 		id: _,
 		chainId: i,
 		hashedEthereumAddress: h,
 		phase: r.BEFORE_SCHEDULE_WITHDRAW
 	});
-	let F = await O(i, P, h, v, b, S);
-	return await k({
+	let P = await D(i, N, h, v, b, S);
+	return await O({
 		id: _,
 		chainId: i,
 		hashedEthereumAddress: h,
 		phase: r.AFTER_SCHEDULE_WITHDRAW,
-		scheduleId: F
-	}), F;
-}, R = async (t, n, r, o, s, c, l, u, d) => {
-	let p = f([n]), m = n.erc20TokenAddress, h = i(await t.getEthereumAddressByChain(p)), g = d ? a(d) : void 0, _ = c ?? await x(p, m, [m], e.Transact, [], 5n), { userDepositedUtxos: v, depositTxHash: y, statusId: b } = await I(t, p, n, r, o, _, h);
-	return await S(t, p, v), await L(t, p, n, v, _, h, r, b, s, l, u, g), y;
+		scheduleId: P
+	}), P;
+}, L = async (t, n, r, o, s, c, l, u, d) => {
+	let p = f([n]), m = n.erc20TokenAddress, h = i(await t.getEthereumAddressByChain(p)), g = d ? a(d) : void 0, _ = c ?? await x(p, m, [m], e.Transact, [], 5n), { userDepositedUtxos: v, depositTxHash: y, statusId: b } = await F(t, p, n, r, o, _, h);
+	return await S(t, p, v), await I(t, p, n, v, _, h, r, b, s, l, u, g), y;
 };
 //#endregion
-export { F as buildMultiPaymentDepositBuilder, P as buildMultiPaymentDepositSetup, R as hinkalSolanaDepositAndWithdraw, L as hinkalSolanaWithdrawBatch };
+export { P as buildMultiPaymentDepositBuilder, N as buildMultiPaymentDepositSetup, L as hinkalSolanaDepositAndWithdraw, I as hinkalSolanaWithdrawBatch };

package/data-structures/Hinkal/hinkalSolanaProxySend.cjs

@@ -1 +1 @@
-require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../API/admin-calls.cjs`),n=require(`../../functions/utils/token-check.utils.cjs`),r=require(`../../functions/utils/create-provider.cjs`),i=require(`../../functions/pre-transaction/constructAdminData.cjs`),a=require(`../AccountActions/AccountActions.cjs`),o=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),s=require(`../../functions/pre-transaction/solanaTransfer.utils.cjs`);let c=require(`@solana/web3.js`);var l=async(t,i,o,l)=>{let u=n.validateAndGetChainId([t]),d=a.AccountActions.getAddressFromSubAccount(u,o);if(!d)throw Error(`Public account address is not available`);let{fetchRpcUrl:f}=e.networkRegistry[u];if(!f)throw Error(`RPC URL not found for the specified chain ID`);let p=r.createCustomSolanaConnection(f),m=new c.PublicKey(d),{instructions:h,programId:g}=await s.buildSolanaTransferInstructions(p,m,new c.PublicKey(l),t,i);return{connection:p,chainId:u,senderAddress:d,senderPublickey:m,programId:g,instructions:h}},u=async(e,n,r,a,s,c)=>{let[{connection:u,chainId:d,senderPublickey:f,instructions:p},m]=await Promise.all([l(n,r,a,s),e.getEthereumAddress()]),h=await o.sendProxyV0Transaction({connection:u,chainId:d,subAccount:a,payerPublicKey:f,instructions:p});return t.emitTxPublicData(i.constructAdminData(c,d,[n.erc20TokenAddress],[r],m)),h},d=async(e,t,n,r)=>{let{connection:i,senderPublickey:a,instructions:s}=await l(e,t,n,r);return o.serializeProxyV0Transaction(i,a,s)};exports.getSolanaProxySendSerializedTransaction=d,exports.hinkalSolanaProxySend=u;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../API/admin-calls.cjs`),n=require(`../../functions/utils/token-check.utils.cjs`),r=require(`../../functions/pre-transaction/constructAdminData.cjs`),i=require(`../../functions/utils/create-provider.cjs`),a=require(`../AccountActions/AccountActions.cjs`),o=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),s=require(`../../functions/pre-transaction/solanaTransfer.utils.cjs`);let c=require(`@solana/web3.js`);var l=async(t,r,o,l)=>{let u=n.validateAndGetChainId([t]),d=a.AccountActions.getAddressFromSubAccount(u,o);if(!d)throw Error(`Public account address is not available`);let{fetchRpcUrl:f}=e.networkRegistry[u];if(!f)throw Error(`RPC URL not found for the specified chain ID`);let p=i.createCustomSolanaConnection(f),m=new c.PublicKey(d),{instructions:h,programId:g}=await s.buildSolanaTransferInstructions(p,m,new c.PublicKey(l),t,r);return{connection:p,chainId:u,senderAddress:d,senderPublickey:m,programId:g,instructions:h}},u=async(e,n,i,a,s,c)=>{let[{connection:u,chainId:d,senderPublickey:f,instructions:p},m]=await Promise.all([l(n,i,a,s),e.getEthereumAddress()]),h=await o.sendProxyV0Transaction({connection:u,chainId:d,subAccount:a,payerPublicKey:f,instructions:p});return t.emitTxPublicData(r.constructAdminData(c,d,[n.erc20TokenAddress],[i],m)),h},d=async(e,t,n,r)=>{let{connection:i,senderPublickey:a,instructions:s}=await l(e,t,n,r);return o.serializeProxyV0Transaction(i,a,s)};exports.getSolanaProxySendSerializedTransaction=d,exports.hinkalSolanaProxySend=u;

package/data-structures/Hinkal/hinkalSolanaProxySend.mjs

@@ -1,19 +1,19 @@
 import { networkRegistry as e } from "../../constants/chains.constants.mjs";
 import { emitTxPublicData as t } from "../../API/admin-calls.mjs";
 import { validateAndGetChainId as n } from "../../functions/utils/token-check.utils.mjs";
-import { createCustomSolanaConnection as r } from "../../functions/utils/create-provider.mjs";
-import { constructAdminData as i } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { constructAdminData as r } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { createCustomSolanaConnection as i } from "../../functions/utils/create-provider.mjs";
 import { AccountActions as a } from "../AccountActions/AccountActions.mjs";
 import { sendProxyV0Transaction as o, serializeProxyV0Transaction as s } from "../../functions/pre-transaction/sendV0Transaction.mjs";
 import { buildSolanaTransferInstructions as c } from "../../functions/pre-transaction/solanaTransfer.utils.mjs";
 import { PublicKey as l } from "@solana/web3.js";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaProxySend.ts
-var u = async (t, i, o, s) => {
+var u = async (t, r, o, s) => {
 	let u = n([t]), d = a.getAddressFromSubAccount(u, o);
 	if (!d) throw Error("Public account address is not available");
 	let { fetchRpcUrl: f } = e[u];
 	if (!f) throw Error("RPC URL not found for the specified chain ID");
-	let p = r(f), m = new l(d), { instructions: h, programId: g } = await c(p, m, new l(s), t, i);
+	let p = i(f), m = new l(d), { instructions: h, programId: g } = await c(p, m, new l(s), t, r);
 	return {
 		connection: p,
 		chainId: u,
@@ -22,15 +22,15 @@ var u = async (t, i, o, s) => {
 		programId: g,
 		instructions: h
 	};
-}, d = async (e, n, r, a, s, c) => {
-	let [{ connection: l, chainId: d, senderPublickey: f, instructions: p }, m] = await Promise.all([u(n, r, a, s), e.getEthereumAddress()]), h = await o({
+}, d = async (e, n, i, a, s, c) => {
+	let [{ connection: l, chainId: d, senderPublickey: f, instructions: p }, m] = await Promise.all([u(n, i, a, s), e.getEthereumAddress()]), h = await o({
 		connection: l,
 		chainId: d,
 		subAccount: a,
 		payerPublicKey: f,
 		instructions: p
 	});
-	return t(i(c, d, [n.erc20TokenAddress], [r], m)), h;
+	return t(r(c, d, [n.erc20TokenAddress], [i], m)), h;
 }, f = async (e, t, n, r) => {
 	let { connection: i, senderPublickey: a, instructions: o } = await u(e, t, n, r);
 	return s(i, a, o);

package/data-structures/Hinkal/hinkalSolanaProxyShield.cjs

@@ -1 +1 @@
-require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../functions/utils/addresses.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../API/admin-calls.cjs`),i=require(`../../functions/utils/solanaMint.utils.cjs`),a=require(`../../functions/utils/token-check.utils.cjs`),o=require(`../../functions/pre-transaction/solana.cjs`),s=require(`../../functions/utils/create-provider.cjs`),c=require(`../../functions/pre-transaction/constructAdminData.cjs`),l=require(`../AccountActions/AccountActions.cjs`),u=require(`../../functions/pre-transaction/sendV0Transaction.cjs`);let d=require(`@solana/web3.js`),f=require(`@coral-xyz/anchor`),p=require(`@solana/spl-token`);var m=async({program:e,mintPublicKey:t,mintAddressString:n,tokenAmount:r,anchorStealthStructure:i,senderPublickey:a,originalDeployer:o,storageAccount:s,storageVault:c})=>{let l=new f.BN(r.toString()),u=n===`11111111111111111111111111111111`?null:t,d=n===`11111111111111111111111111111111`?null:void 0;return e.methods.prooflessDeposit(l,i).accounts({mint:u,signer:a,signerAta:d,originalDeployer:o,storageAccount:s,storageVault:c,storageVaultAta:d}).instruction()},h=async(r,a,c,u,f,h)=>{let g=h??r.getRecipientInfo();if(!t.isValidPrivateAddress(g))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let _=l.AccountActions.getAddressFromSubAccount(a,f);if(!_)throw Error(`Public account address is not available`);let{hinkalIdl:v,hinkalAddress:y,originalDeployer:b}=e.networkRegistry[a].contractData;if(!v)throw Error(`No IDL configured for Solana program on this network`);if(!b)throw Error(`missing original deployer`);let x=r.getSolanaProgram(v),S=new d.PublicKey(b),C=new d.PublicKey(y),w=new d.PublicKey(_),{erc20TokenAddress:T}=c,{fetchRpcUrl:E}=e.networkRegistry[a];if(!E)throw Error(`RPC URL not found for the specified chain ID`);let D=s.createCustomSolanaConnection(E),{mintPublicKey:O}=i.formatMintAddress(T),k=O.toString(),A=o.getStorageAccountPublicKey(C,S),j=o.getStorageVaultPublicKey(C,S),M=await m({program:x,mintPublicKey:O,mintAddressString:k,tokenAmount:u,anchorStealthStructure:o.buildAnchorStealthAddressStructure(t.constructStealthAddressStructure(g)),senderPublickey:w,originalDeployer:S,storageAccount:A,storageVault:j}),N=c.is2022Program?p.TOKEN_2022_PROGRAM_ID:p.TOKEN_PROGRAM_ID;return{connection:D,senderAddress:_,senderPublickey:w,instructions:[M],storageAccount:A,programId:N}},g=async(e,t,n,i,o,s)=>{if(!i)throw Error(`subAccount is required`);let l=a.validateAndGetChainId([t]),[{connection:d,senderPublickey:f,instructions:p},m]=await Promise.all([h(e,l,t,n,i,o),e.getEthereumAddress()]),g=await u.sendProxyV0Transaction({connection:d,chainId:l,subAccount:i,payerPublicKey:f,instructions:p});return r.emitTxPublicData(c.constructAdminData(s,l,[t.erc20TokenAddress],[n],m)),g},_=async(e,t,n,r,i)=>{let{connection:o,senderPublickey:s,instructions:c}=await h(e,a.validateAndGetChainId([t]),t,n,r,i);return u.serializeProxyV0Transaction(o,s,c)};exports.getSolanaProxyShieldSerializedTransaction=_,exports.hinkalSolanaProxyShield=g;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../functions/utils/addresses.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../API/admin-calls.cjs`),i=require(`../../functions/utils/solanaMint.utils.cjs`),a=require(`../../functions/utils/token-check.utils.cjs`),o=require(`../../functions/pre-transaction/solana.cjs`),s=require(`../../functions/pre-transaction/constructAdminData.cjs`),c=require(`../../functions/utils/create-provider.cjs`),l=require(`../AccountActions/AccountActions.cjs`),u=require(`../../functions/pre-transaction/sendV0Transaction.cjs`);let d=require(`@solana/web3.js`),f=require(`@coral-xyz/anchor`),p=require(`@solana/spl-token`);var m=async({program:e,mintPublicKey:t,mintAddressString:n,tokenAmount:r,anchorStealthStructure:i,senderPublickey:a,originalDeployer:o,storageAccount:s,storageVault:c})=>{let l=new f.BN(r.toString()),u=n===`11111111111111111111111111111111`?null:t,d=n===`11111111111111111111111111111111`?null:void 0;return e.methods.prooflessDeposit(l,i).accounts({mint:u,signer:a,signerAta:d,originalDeployer:o,storageAccount:s,storageVault:c,storageVaultAta:d}).instruction()},h=async(r,a,s,u,f,h)=>{let g=h??r.getRecipientInfo();if(!t.isValidPrivateAddress(g))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let _=l.AccountActions.getAddressFromSubAccount(a,f);if(!_)throw Error(`Public account address is not available`);let{hinkalIdl:v,hinkalAddress:y,originalDeployer:b}=e.networkRegistry[a].contractData;if(!v)throw Error(`No IDL configured for Solana program on this network`);if(!b)throw Error(`missing original deployer`);let x=r.getSolanaProgram(v),S=new d.PublicKey(b),C=new d.PublicKey(y),w=new d.PublicKey(_),{erc20TokenAddress:T}=s,{fetchRpcUrl:E}=e.networkRegistry[a];if(!E)throw Error(`RPC URL not found for the specified chain ID`);let D=c.createCustomSolanaConnection(E),{mintPublicKey:O}=i.formatMintAddress(T),k=O.toString(),A=o.getStorageAccountPublicKey(C,S),j=o.getStorageVaultPublicKey(C,S),M=await m({program:x,mintPublicKey:O,mintAddressString:k,tokenAmount:u,anchorStealthStructure:o.buildAnchorStealthAddressStructure(t.constructStealthAddressStructure(g)),senderPublickey:w,originalDeployer:S,storageAccount:A,storageVault:j}),N=s.is2022Program?p.TOKEN_2022_PROGRAM_ID:p.TOKEN_PROGRAM_ID;return{connection:D,senderAddress:_,senderPublickey:w,instructions:[M],storageAccount:A,programId:N}},g=async(e,t,n,i,o,c)=>{if(!i)throw Error(`subAccount is required`);let l=a.validateAndGetChainId([t]),[{connection:d,senderPublickey:f,instructions:p},m]=await Promise.all([h(e,l,t,n,i,o),e.getEthereumAddress()]),g=await u.sendProxyV0Transaction({connection:d,chainId:l,subAccount:i,payerPublicKey:f,instructions:p});return r.emitTxPublicData(s.constructAdminData(c,l,[t.erc20TokenAddress],[n],m)),g},_=async(e,t,n,r,i)=>{let{connection:o,senderPublickey:s,instructions:c}=await h(e,a.validateAndGetChainId([t]),t,n,r,i);return u.serializeProxyV0Transaction(o,s,c)};exports.getSolanaProxyShieldSerializedTransaction=_,exports.hinkalSolanaProxyShield=g;

package/data-structures/Hinkal/hinkalSolanaProxyShield.mjs

@@ -6,8 +6,8 @@ import { emitTxPublicData as i } from "../../API/admin-calls.mjs";
 import { formatMintAddress as a } from "../../functions/utils/solanaMint.utils.mjs";
 import { validateAndGetChainId as o } from "../../functions/utils/token-check.utils.mjs";
 import { buildAnchorStealthAddressStructure as s, getStorageAccountPublicKey as c, getStorageVaultPublicKey as l } from "../../functions/pre-transaction/solana.mjs";
-import { createCustomSolanaConnection as u } from "../../functions/utils/create-provider.mjs";
-import { constructAdminData as d } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { constructAdminData as u } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { createCustomSolanaConnection as d } from "../../functions/utils/create-provider.mjs";
 import { AccountActions as f } from "../AccountActions/AccountActions.mjs";
 import { sendProxyV0Transaction as p, serializeProxyV0Transaction as m } from "../../functions/pre-transaction/sendV0Transaction.mjs";
 import { PublicKey as h } from "@solana/web3.js";
@@ -25,7 +25,7 @@ var y = async ({ program: e, mintPublicKey: t, mintAddressString: n, tokenAmount
 		storageVault: c,
 		storageVaultAta: d
 	}).instruction();
-}, b = async (i, o, d, p, m, g) => {
+}, b = async (i, o, u, p, m, g) => {
 	let b = g ?? i.getRecipientInfo();
 	if (!n(b)) throw Error(r.RECIPIENT_FORMAT_INCORRECT);
 	let x = f.getAddressFromSubAccount(o, m);
@@ -33,9 +33,9 @@ var y = async ({ program: e, mintPublicKey: t, mintAddressString: n, tokenAmount
 	let { hinkalIdl: S, hinkalAddress: C, originalDeployer: w } = e[o].contractData;
 	if (!S) throw Error("No IDL configured for Solana program on this network");
 	if (!w) throw Error("missing original deployer");
-	let T = i.getSolanaProgram(S), E = new h(w), D = new h(C), O = new h(x), { erc20TokenAddress: k } = d, { fetchRpcUrl: A } = e[o];
+	let T = i.getSolanaProgram(S), E = new h(w), D = new h(C), O = new h(x), { erc20TokenAddress: k } = u, { fetchRpcUrl: A } = e[o];
 	if (!A) throw Error("RPC URL not found for the specified chain ID");
-	let j = u(A), { mintPublicKey: M } = a(k), N = M.toString(), P = c(D, E), F = l(D, E), I = await y({
+	let j = d(A), { mintPublicKey: M } = a(k), N = M.toString(), P = c(D, E), F = l(D, E), I = await y({
 		program: T,
 		mintPublicKey: M,
 		mintAddressString: N,
@@ -45,7 +45,7 @@ var y = async ({ program: e, mintPublicKey: t, mintAddressString: n, tokenAmount
 		originalDeployer: E,
 		storageAccount: P,
 		storageVault: F
-	}), L = d.is2022Program ? _ : v;
+	}), L = u.is2022Program ? _ : v;
 	return {
 		connection: j,
 		senderAddress: x,
@@ -56,14 +56,14 @@ var y = async ({ program: e, mintPublicKey: t, mintAddressString: n, tokenAmount
 	};
 }, x = async (e, t, n, r, a, s) => {
 	if (!r) throw Error("subAccount is required");
-	let c = o([t]), [{ connection: l, senderPublickey: u, instructions: f }, m] = await Promise.all([b(e, c, t, n, r, a), e.getEthereumAddress()]), h = await p({
+	let c = o([t]), [{ connection: l, senderPublickey: d, instructions: f }, m] = await Promise.all([b(e, c, t, n, r, a), e.getEthereumAddress()]), h = await p({
 		connection: l,
 		chainId: c,
 		subAccount: r,
-		payerPublicKey: u,
+		payerPublicKey: d,
 		instructions: f
 	});
-	return i(d(s, c, [t.erc20TokenAddress], [n], m)), h;
+	return i(u(s, c, [t.erc20TokenAddress], [n], m)), h;
 }, S = async (e, t, n, r, i) => {
 	let { connection: a, senderPublickey: s, instructions: c } = await b(e, o([t]), t, n, r, i);
 	return m(a, s, c);

package/data-structures/Hinkal/hinkalSolanaProxySwap.cjs

@@ -1 +1 @@
-require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`);require(`../../constants/index.cjs`);const r=require(`../../API/admin-calls.cjs`),i=require(`../../functions/utils/token-check.utils.cjs`),a=require(`../../functions/utils/create-provider.cjs`),o=require(`../../functions/pre-transaction/constructAdminData.cjs`),s=require(`../AccountActions/AccountActions.cjs`),c=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),l=require(`../../functions/pre-transaction/getFeeStructure.cjs`),u=require(`../../functions/pre-transaction/solanaTransfer.utils.cjs`);require(`../AccountActions/index.cjs`);let d=require(`@solana/web3.js`);var f=async(e,t)=>{let{addressLookupTableAccount:n,instructionLists:r}=JSON.parse(t).data,i=await Promise.all(n.map(async t=>{let n=await e.getAddressLookupTable(new d.PublicKey(t));if(!n.value)throw Error(`Failed to fetch lookup table: ${t}`);return n.value}));if(r.length===0)throw Error(`No instructions found`);return{instructions:r.map(e=>new d.TransactionInstruction({keys:e.accounts.map(e=>({pubkey:new d.PublicKey(e.pubkey),isSigner:e.isSigner,isWritable:e.isWritable})),programId:new d.PublicKey(e.programId),data:Buffer.from(e.data,`base64`)})),lookupTableAccounts:i}},p=async(e,t)=>{let n=d.VersionedTransaction.deserialize(Buffer.from(t,`base64`)),r=await Promise.all(n.message.addressTableLookups.map(async({accountKey:t})=>{let n=await e.getAddressLookupTable(t);if(!n.value)throw Error(`Failed to fetch lookup table: ${t.toBase58()}`);return n.value})),{instructions:i}=d.TransactionMessage.decompile(n.message,{addressLookupTableAccounts:r});return{instructions:i,lookupTableAccounts:r}},m=async(n,r,i,o)=>{let c=s.AccountActions.getAddressFromSubAccount(n,i);if(!c)throw Error(`Public account address is not available`);let{fetchRpcUrl:l}=t.networkRegistry[n];if(!l)throw Error(`RPC URL not found for the specified chain ID`);let u=a.createCustomSolanaConnection(l),m=new d.PublicKey(c),{instructions:h,lookupTableAccounts:g}=o===e.ExternalActionId.Lifi?await p(u,r):await f(u,r);return{connection:u,walletPublicKey:m,instructions:h,lookupTableAccounts:g}},h=async(t,a,s,f,p,h,g,_,v)=>{let y=i.validateAndGetChainId(a),b=h===e.ExternalActionId.Lifi,[{connection:x,walletPublicKey:S,instructions:C,lookupTableAccounts:w},T,E]=await Promise.all([m(y,f,p,h),b?Promise.resolve(null):t.getRandomRelay(y),t.getEthereumAddressByChain(y)]),D=C;if(!b){if(!T)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let t=a[1],r=s[1]*(_??await l.getFeeStructure(y,g,a.map(e=>e.erc20TokenAddress),e.ExternalActionId.Emporium)).variableRate/10000n,{instructions:i}=await u.buildSolanaTransferInstructions(x,S,new d.PublicKey(T),t,r);D=[...C,...i]}let O=await c.sendProxyV0Transaction({connection:x,chainId:y,subAccount:p,payerPublicKey:S,instructions:D,lookupTableAccounts:w});return r.emitTxPublicData(o.constructAdminData(v,y,a.map(e=>e.erc20TokenAddress),s,E,a)),O},g=async(t,n,r,i)=>{if(i===e.ExternalActionId.Lifi)return n;let{connection:a,walletPublicKey:o,instructions:s,lookupTableAccounts:l}=await m(t,n,r,i);return c.serializeProxyV0Transaction(a,o,s,l)};exports.getSolanaProxySwapSerializedTransaction=g,exports.hinkalSolanaProxySwap=h;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`);require(`../../constants/index.cjs`);const r=require(`../../API/admin-calls.cjs`),i=require(`../../functions/utils/token-check.utils.cjs`),a=require(`../../functions/pre-transaction/constructAdminData.cjs`),o=require(`../../functions/utils/create-provider.cjs`),s=require(`../AccountActions/AccountActions.cjs`),c=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),l=require(`../../functions/pre-transaction/getFeeStructure.cjs`),u=require(`../../functions/pre-transaction/solanaTransfer.utils.cjs`);require(`../AccountActions/index.cjs`);let d=require(`@solana/web3.js`);var f=async(e,t)=>{let{addressLookupTableAccount:n,instructionLists:r}=JSON.parse(t).data,i=await Promise.all(n.map(async t=>{let n=await e.getAddressLookupTable(new d.PublicKey(t));if(!n.value)throw Error(`Failed to fetch lookup table: ${t}`);return n.value}));if(r.length===0)throw Error(`No instructions found`);return{instructions:r.map(e=>new d.TransactionInstruction({keys:e.accounts.map(e=>({pubkey:new d.PublicKey(e.pubkey),isSigner:e.isSigner,isWritable:e.isWritable})),programId:new d.PublicKey(e.programId),data:Buffer.from(e.data,`base64`)})),lookupTableAccounts:i}},p=async(e,t)=>{let n=d.VersionedTransaction.deserialize(Buffer.from(t,`base64`)),r=await Promise.all(n.message.addressTableLookups.map(async({accountKey:t})=>{let n=await e.getAddressLookupTable(t);if(!n.value)throw Error(`Failed to fetch lookup table: ${t.toBase58()}`);return n.value})),{instructions:i}=d.TransactionMessage.decompile(n.message,{addressLookupTableAccounts:r});return{instructions:i,lookupTableAccounts:r}},m=async(n,r,i,a)=>{let c=s.AccountActions.getAddressFromSubAccount(n,i);if(!c)throw Error(`Public account address is not available`);let{fetchRpcUrl:l}=t.networkRegistry[n];if(!l)throw Error(`RPC URL not found for the specified chain ID`);let u=o.createCustomSolanaConnection(l),m=new d.PublicKey(c),{instructions:h,lookupTableAccounts:g}=a===e.ExternalActionId.Lifi?await p(u,r):await f(u,r);return{connection:u,walletPublicKey:m,instructions:h,lookupTableAccounts:g}},h=async(t,o,s,f,p,h,g,_,v)=>{let y=i.validateAndGetChainId(o),b=h===e.ExternalActionId.Lifi,[{connection:x,walletPublicKey:S,instructions:C,lookupTableAccounts:w},T,E]=await Promise.all([m(y,f,p,h),b?Promise.resolve(null):t.getRandomRelay(y),t.getEthereumAddressByChain(y)]),D=C;if(!b){if(!T)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let t=o[1],r=s[1]*(_??await l.getFeeStructure(y,g,o.map(e=>e.erc20TokenAddress),e.ExternalActionId.Emporium)).variableRate/10000n,{instructions:i}=await u.buildSolanaTransferInstructions(x,S,new d.PublicKey(T),t,r);D=[...C,...i]}let O=await c.sendProxyV0Transaction({connection:x,chainId:y,subAccount:p,payerPublicKey:S,instructions:D,lookupTableAccounts:w});return r.emitTxPublicData(a.constructAdminData(v,y,o.map(e=>e.erc20TokenAddress),s,E,o)),O},g=async(t,n,r,i)=>{if(i===e.ExternalActionId.Lifi)return n;let{connection:a,walletPublicKey:o,instructions:s,lookupTableAccounts:l}=await m(t,n,r,i);return c.serializeProxyV0Transaction(a,o,s,l)};exports.getSolanaProxySwapSerializedTransaction=g,exports.hinkalSolanaProxySwap=h;

package/data-structures/Hinkal/hinkalSolanaProxySwap.mjs

@@ -4,8 +4,8 @@ import { transactionErrorCodes as n } from "../../error-handling/error-codes.con
 import "../../constants/index.mjs";
 import { emitTxPublicData as r } from "../../API/admin-calls.mjs";
 import { validateAndGetChainId as i } from "../../functions/utils/token-check.utils.mjs";
-import { createCustomSolanaConnection as a } from "../../functions/utils/create-provider.mjs";
-import { constructAdminData as o } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { constructAdminData as a } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { createCustomSolanaConnection as o } from "../../functions/utils/create-provider.mjs";
 import { AccountActions as s } from "../AccountActions/AccountActions.mjs";
 import { sendProxyV0Transaction as c, serializeProxyV0Transaction as l } from "../../functions/pre-transaction/sendV0Transaction.mjs";
 import { getFeeStructure as u } from "../../functions/pre-transaction/getFeeStructure.mjs";
@@ -42,27 +42,27 @@ var g = async (e, t) => {
 		instructions: i,
 		lookupTableAccounts: r
 	};
-}, v = async (n, r, i, o) => {
+}, v = async (n, r, i, a) => {
 	let c = s.getAddressFromSubAccount(n, i);
 	if (!c) throw Error("Public account address is not available");
 	let { fetchRpcUrl: l } = t[n];
 	if (!l) throw Error("RPC URL not found for the specified chain ID");
-	let u = a(l), d = new f(c), { instructions: p, lookupTableAccounts: m } = o === e.Lifi ? await _(u, r) : await g(u, r);
+	let u = o(l), d = new f(c), { instructions: p, lookupTableAccounts: m } = a === e.Lifi ? await _(u, r) : await g(u, r);
 	return {
 		connection: u,
 		walletPublicKey: d,
 		instructions: p,
 		lookupTableAccounts: m
 	};
-}, y = async (t, a, s, l, p, m, h, g, _) => {
-	let y = i(a), b = m === e.Lifi, [{ connection: x, walletPublicKey: S, instructions: C, lookupTableAccounts: w }, T, E] = await Promise.all([
+}, y = async (t, o, s, l, p, m, h, g, _) => {
+	let y = i(o), b = m === e.Lifi, [{ connection: x, walletPublicKey: S, instructions: C, lookupTableAccounts: w }, T, E] = await Promise.all([
 		v(y, l, p, m),
 		b ? Promise.resolve(null) : t.getRandomRelay(y),
 		t.getEthereumAddressByChain(y)
 	]), D = C;
 	if (!b) {
 		if (!T) throw Error(n.RELAYER_NOT_AVAILABLE);
-		let t = a[1], r = s[1] * (g ?? await u(y, h, a.map((e) => e.erc20TokenAddress), e.Emporium)).variableRate / 10000n, { instructions: i } = await d(x, S, new f(T), t, r);
+		let t = o[1], r = s[1] * (g ?? await u(y, h, o.map((e) => e.erc20TokenAddress), e.Emporium)).variableRate / 10000n, { instructions: i } = await d(x, S, new f(T), t, r);
 		D = [...C, ...i];
 	}
 	let O = await c({
@@ -73,7 +73,7 @@ var g = async (e, t) => {
 		instructions: D,
 		lookupTableAccounts: w
 	});
-	return r(o(_, y, a.map((e) => e.erc20TokenAddress), s, E, a)), O;
+	return r(a(_, y, o.map((e) => e.erc20TokenAddress), s, E, o)), O;
 }, b = async (t, n, r, i) => {
 	if (i === e.Lifi) return n;
 	let { connection: a, walletPublicKey: o, instructions: s, lookupTableAccounts: c } = await v(t, n, r, i);

package/data-structures/Hinkal/hinkalSolanaSwap.cjs

@@ -1 +1 @@
-require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../../types/cache.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../../functions/web3/etherFunctions.cjs`),o=require(`../crypto-keys/keys.cjs`),s=require(`../../functions/utils/time.utils.cjs`),c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/web3/events/getShieldedBalance.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),ee=require(`../../functions/snarkjs/common.snarkjs.cjs`),d=require(`../../functions/pre-transaction/solana.cjs`),f=require(`../../functions/pre-transaction/constructAdminData.cjs`),p=require(`../../functions/pre-transaction/convert-okx-instructions.cjs`),m=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),h=require(`../../functions/pre-transaction/getFeeStructure.cjs`),g=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`),_=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),v=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let y=require(`ethers`),b=require(`@solana/web3.js`);var x=async(e,t,n,r)=>{let i=[...await l.addPaddingToUtxos(e,t,n,r,6)],a=s.getCurrentTimeInSeconds().toString(),o=[];for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=u.outputUtxoProcessing(e.userKeys,i[t],r[t],a);o.push([n[0]])}return{inputUtxosArray:i,outputUtxosArray:o}},S=async(s,l,u,S,C,w,te,T,E)=>{let D=c.validateAndGetChainId(l),O=new b.PublicKey(n.solanaNativeAddress),{hinkalAddress:ne,originalDeployer:k}=t.networkRegistry[D].contractData;if(!k)throw Error(`No IDL configured for Solana program on this network`);let A=new b.PublicKey(k),j=new b.PublicKey(ne),M=l.map(e=>e.erc20TokenAddress),{userKeys:N,merkleTreeHinkalByChain:P}=s,F=T??await h.getFeeStructure(D,te,M,e.ExternalActionId.Transact),I=u[1],L=Number(s.cacheDevice.get(r.StorageKeys.SLIPPAGE_PERCENTAGE)??0),R=l[1],z=a.getAmountInToken(R,I),B=Number(z)*L/100;u[1]-=a.getAmountInWei(R,B.toFixed(R.decimals));let V=I*BigInt(F.variableRate??0)/10000n+F.flatFee;if(u[1]-=V,u[1]<0)throw Error(i.transactionErrorCodes.LOW_OUTPUT_AMOUNT);let H=F.variableRate.toString(),[U,W,{inputUtxosArray:G,outputUtxosArray:K}]=await Promise.all([s.getRandomRelay(D,!0),s.getEthereumAddressByChain(D),x(s,D,M,u)]);if(!U)throw Error(i.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let q=s.userKeys.getShieldedPrivateKey(),J=o.UserKeys.findCorrectRandomization(a.randomBigInt(31),q),Y={tokenNumber:2,nullifierAmount:G[0].length,outputAmount:1},X=ee.calcEncryptedOutputs(K).map(e=>[...y.ethers.getBytes(e[0])]),Z=d.getSwapperAccountPublicKeyFromSalt(j,A,S),{remainingAccounts:Q,hinkalInstructions:$}=p.convertOKXToHinkalInstructions(C,Z);m.ensureAmountChanges(G,K,u);let[{proofAArr:re,proofBArr:ie,proofCArr:ae,publicInputsArr:oe},se]=await Promise.all([_.constructSolanaZkProof(s.generateProofRemotely,P[D],N,M,G,K,J,F.flatFee,F.variableRate,O.toString(),U,Y,X,D,$,Q,S),g.buildCommitmentValidationData(D,N,M,G)]),ce=d.getStorageAccountPublicKey(j,A),le=d.getStorageVaultPublicKey(j,A),ue=l[0].erc20TokenAddress===`11111111111111111111111111111111`?null:new b.PublicKey(l[0].erc20TokenAddress),de=l[1].erc20TokenAddress===`11111111111111111111111111111111`?null:new b.PublicKey(l[1].erc20TokenAddress),fe={recipient:O.toString(),storageAccount:ce.toString(),storageVault:le.toString(),swapperAccount:Z.toString(),mintFrom:ue?.toString()??null,mintTo:de?.toString()??null,remainingAccounts:Q.map(e=>({pubkey:e.pubkey.toString(),isSigner:e.isSigner,isWritable:e.isWritable})),addressLookupTableAccount:w};return v.solanaTransactCallRelayer({chainId:D,relayAddress:U,functionName:`swap`,args:{encryptedOutputs:X,proofAArr:re,proofBArr:ie,proofCArr:ae,publicInputsArr:oe,relayerFee:F.flatFee.toString(),variableRate:H,dimensions:Y,hinkalInstructions:$.map(e=>({accountIndexes:[...e.accountIndexes],data:[...e.data],programIndex:e.programIndex}))},accounts:fe,commitmentValidationData:se,adminData:f.constructAdminData(E,D,M,u,W,l)})};exports.hinkalSolanaSwap=S;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../../types/cache.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../../functions/web3/etherFunctions.cjs`),o=require(`../crypto-keys/keys.cjs`),s=require(`../../functions/utils/time.utils.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/solana.cjs`),p=require(`../../functions/pre-transaction/constructAdminData.cjs`),ee=require(`../../functions/pre-transaction/convert-okx-instructions.cjs`),m=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),h=require(`../../functions/pre-transaction/getFeeStructure.cjs`),g=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),_=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let v=require(`ethers`),y=require(`@solana/web3.js`);var b=async(e,t,n,r)=>{let i=[...await l.addPaddingToUtxos(e,t,n,r,6)],a=s.getCurrentTimeInSeconds().toString(),o=[];for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=u.outputUtxoProcessing(e.userKeys,i[t],r[t],a);o.push([n[0]])}return{inputUtxosArray:i,outputUtxosArray:o}},x=async(s,l,u,x,te,S,C,w,T)=>{let E=c.validateAndGetChainId(l),D=new y.PublicKey(n.solanaNativeAddress),{hinkalAddress:ne,originalDeployer:O}=t.networkRegistry[E].contractData;if(!O)throw Error(`No IDL configured for Solana program on this network`);let k=new y.PublicKey(O),A=new y.PublicKey(ne),j=l.map(e=>e.erc20TokenAddress),{userKeys:M,merkleTreeHinkalByChain:N}=s,P=w??await h.getFeeStructure(E,C,j,e.ExternalActionId.Transact),F=u[1],I=Number(s.cacheDevice.get(r.StorageKeys.SLIPPAGE_PERCENTAGE)??0),L=l[1],R=a.getAmountInToken(L,F),z=Number(R)*I/100;u[1]-=a.getAmountInWei(L,z.toFixed(L.decimals));let B=F*BigInt(P.variableRate??0)/10000n+P.flatFee;if(u[1]-=B,u[1]<0)throw Error(i.transactionErrorCodes.LOW_OUTPUT_AMOUNT);let V=P.variableRate.toString(),[H,U,{inputUtxosArray:W,outputUtxosArray:G}]=await Promise.all([s.getRandomRelay(E,!0),s.getEthereumAddressByChain(E),b(s,E,j,u)]);if(!H)throw Error(i.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let K=s.userKeys.getShieldedPrivateKey(),q=o.UserKeys.findCorrectRandomization(a.randomBigInt(31),K),J={tokenNumber:2,nullifierAmount:W[0].length,outputAmount:1},Y=d.calcEncryptedOutputs(G).map(e=>[...v.ethers.getBytes(e[0])]),X=f.getSwapperAccountPublicKeyFromSalt(A,k,x),{remainingAccounts:Z,hinkalInstructions:Q}=ee.convertOKXToHinkalInstructions(te,X);m.ensureAmountChanges(W,G,u);let{proofAArr:re,proofBArr:ie,proofCArr:ae,publicInputsArr:oe,commitmentValidationData:$}=await g.constructSolanaZkProof(s.generateProofRemotely,N[E],M,j,W,G,q,P.flatFee,P.variableRate,D.toString(),H,J,Y,E,Q,Z,x),se=f.getStorageAccountPublicKey(A,k),ce=f.getStorageVaultPublicKey(A,k),le=l[0].erc20TokenAddress===`11111111111111111111111111111111`?null:new y.PublicKey(l[0].erc20TokenAddress),ue=l[1].erc20TokenAddress===`11111111111111111111111111111111`?null:new y.PublicKey(l[1].erc20TokenAddress),de={recipient:D.toString(),storageAccount:se.toString(),storageVault:ce.toString(),swapperAccount:X.toString(),mintFrom:le?.toString()??null,mintTo:ue?.toString()??null,remainingAccounts:Z.map(e=>({pubkey:e.pubkey.toString(),isSigner:e.isSigner,isWritable:e.isWritable})),addressLookupTableAccount:S};return _.solanaTransactCallRelayer({chainId:E,relayAddress:H,functionName:`swap`,args:{encryptedOutputs:Y,proofAArr:re,proofBArr:ie,proofCArr:ae,publicInputsArr:oe,relayerFee:P.flatFee.toString(),variableRate:V,dimensions:J,hinkalInstructions:Q.map(e=>({accountIndexes:[...e.accountIndexes],data:[...e.data],programIndex:e.programIndex}))},accounts:de,commitmentValidationData:$,adminData:p.constructAdminData(T,E,j,u,U,l)})};exports.hinkalSolanaSwap=x;

package/data-structures/Hinkal/hinkalSolanaSwap.mjs

@@ -11,18 +11,17 @@ import { validateAndGetChainId as u } from "../../functions/utils/token-check.ut
 import { addPaddingToUtxos as d } from "../../functions/web3/events/getShieldedBalance.mjs";
 import { outputUtxoProcessing as f } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
 import { calcEncryptedOutputs as p } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { getStorageAccountPublicKey as m, getStorageVaultPublicKey as h, getSwapperAccountPublicKeyFromSalt as g } from "../../functions/pre-transaction/solana.mjs";
-import { constructAdminData as _ } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { convertOKXToHinkalInstructions as v } from "../../functions/pre-transaction/convert-okx-instructions.mjs";
-import { ensureAmountChanges as y } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
-import { getFeeStructure as ee } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { buildCommitmentValidationData as b } from "../../functions/pre-transaction/buildCommitmentValidationData.mjs";
-import { constructSolanaZkProof as x } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
-import { solanaTransactCallRelayer as S } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { ethers as C } from "ethers";
-import { PublicKey as w } from "@solana/web3.js";
+import { getStorageAccountPublicKey as ee, getStorageVaultPublicKey as m, getSwapperAccountPublicKeyFromSalt as h } from "../../functions/pre-transaction/solana.mjs";
+import { constructAdminData as g } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { convertOKXToHinkalInstructions as _ } from "../../functions/pre-transaction/convert-okx-instructions.mjs";
+import { ensureAmountChanges as v } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
+import { getFeeStructure as y } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { constructSolanaZkProof as b } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { solanaTransactCallRelayer as x } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ethers as S } from "ethers";
+import { PublicKey as C } from "@solana/web3.js";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaSwap.ts
-var T = async (e, t, n, r) => {
+var te = async (e, t, n, r) => {
 	let i = [...await d(e, t, n, r, 6)], a = l().toString(), o = [];
 	for (let t = 0; t < n.length; t += 1) {
 		let { outputUtxos: n } = f(e.userKeys, i[t], r[t], a);
@@ -32,62 +31,62 @@ var T = async (e, t, n, r) => {
 		inputUtxosArray: i,
 		outputUtxosArray: o
 	};
-}, E = async (l, d, f, E, te, ne, re, ie, D) => {
-	let O = u(d), k = new w(n), { hinkalAddress: A, originalDeployer: j } = t[O].contractData;
-	if (!j) throw Error("No IDL configured for Solana program on this network");
-	let M = new w(j), N = new w(A), P = d.map((e) => e.erc20TokenAddress), { userKeys: F, merkleTreeHinkalByChain: I } = l, L = ie ?? await ee(O, re, P, e.Transact), R = f[1], z = Number(l.cacheDevice.get(r.SLIPPAGE_PERCENTAGE) ?? 0), B = d[1], V = a(B, R), H = Number(V) * z / 100;
-	f[1] -= o(B, H.toFixed(B.decimals));
-	let U = R * BigInt(L.variableRate ?? 0) / 10000n + L.flatFee;
-	if (f[1] -= U, f[1] < 0) throw Error(i.LOW_OUTPUT_AMOUNT);
-	let W = L.variableRate.toString(), [G, ae, { inputUtxosArray: K, outputUtxosArray: q }] = await Promise.all([
-		l.getRandomRelay(O, !0),
-		l.getEthereumAddressByChain(O),
-		T(l, O, P, f)
+}, w = async (l, d, f, w, ne, re, ie, ae, T) => {
+	let E = u(d), D = new C(n), { hinkalAddress: O, originalDeployer: k } = t[E].contractData;
+	if (!k) throw Error("No IDL configured for Solana program on this network");
+	let A = new C(k), j = new C(O), M = d.map((e) => e.erc20TokenAddress), { userKeys: N, merkleTreeHinkalByChain: P } = l, F = ae ?? await y(E, ie, M, e.Transact), I = f[1], L = Number(l.cacheDevice.get(r.SLIPPAGE_PERCENTAGE) ?? 0), R = d[1], z = a(R, I), B = Number(z) * L / 100;
+	f[1] -= o(R, B.toFixed(R.decimals));
+	let V = I * BigInt(F.variableRate ?? 0) / 10000n + F.flatFee;
+	if (f[1] -= V, f[1] < 0) throw Error(i.LOW_OUTPUT_AMOUNT);
+	let H = F.variableRate.toString(), [U, oe, { inputUtxosArray: W, outputUtxosArray: G }] = await Promise.all([
+		l.getRandomRelay(E, !0),
+		l.getEthereumAddressByChain(E),
+		te(l, E, M, f)
 	]);
-	if (!G) throw Error(i.RELAYER_NOT_AVAILABLE);
-	let J = l.userKeys.getShieldedPrivateKey(), oe = c.findCorrectRandomization(s(31), J), Y = {
+	if (!U) throw Error(i.RELAYER_NOT_AVAILABLE);
+	let K = l.userKeys.getShieldedPrivateKey(), q = c.findCorrectRandomization(s(31), K), J = {
 		tokenNumber: 2,
-		nullifierAmount: K[0].length,
+		nullifierAmount: W[0].length,
 		outputAmount: 1
-	}, X = p(q).map((e) => [...C.getBytes(e[0])]), Z = g(N, M, E), { remainingAccounts: Q, hinkalInstructions: $ } = v(te, Z);
-	y(K, q, f);
-	let [{ proofAArr: se, proofBArr: ce, proofCArr: le, publicInputsArr: ue }, de] = await Promise.all([x(l.generateProofRemotely, I[O], F, P, K, q, oe, L.flatFee, L.variableRate, k.toString(), G, Y, X, O, $, Q, E), b(O, F, P, K)]), fe = m(N, M), pe = h(N, M), me = d[0].erc20TokenAddress === "11111111111111111111111111111111" ? null : new w(d[0].erc20TokenAddress), he = d[1].erc20TokenAddress === "11111111111111111111111111111111" ? null : new w(d[1].erc20TokenAddress), ge = {
-		recipient: k.toString(),
-		storageAccount: fe.toString(),
-		storageVault: pe.toString(),
-		swapperAccount: Z.toString(),
-		mintFrom: me?.toString() ?? null,
-		mintTo: he?.toString() ?? null,
-		remainingAccounts: Q.map((e) => ({
+	}, Y = p(G).map((e) => [...S.getBytes(e[0])]), X = h(j, A, w), { remainingAccounts: Z, hinkalInstructions: Q } = _(ne, X);
+	v(W, G, f);
+	let { proofAArr: se, proofBArr: $, proofCArr: ce, publicInputsArr: le, commitmentValidationData: ue } = await b(l.generateProofRemotely, P[E], N, M, W, G, q, F.flatFee, F.variableRate, D.toString(), U, J, Y, E, Q, Z, w), de = ee(j, A), fe = m(j, A), pe = d[0].erc20TokenAddress === "11111111111111111111111111111111" ? null : new C(d[0].erc20TokenAddress), me = d[1].erc20TokenAddress === "11111111111111111111111111111111" ? null : new C(d[1].erc20TokenAddress), he = {
+		recipient: D.toString(),
+		storageAccount: de.toString(),
+		storageVault: fe.toString(),
+		swapperAccount: X.toString(),
+		mintFrom: pe?.toString() ?? null,
+		mintTo: me?.toString() ?? null,
+		remainingAccounts: Z.map((e) => ({
 			pubkey: e.pubkey.toString(),
 			isSigner: e.isSigner,
 			isWritable: e.isWritable
 		})),
-		addressLookupTableAccount: ne
+		addressLookupTableAccount: re
 	};
-	return S({
-		chainId: O,
-		relayAddress: G,
+	return x({
+		chainId: E,
+		relayAddress: U,
 		functionName: "swap",
 		args: {
-			encryptedOutputs: X,
+			encryptedOutputs: Y,
 			proofAArr: se,
-			proofBArr: ce,
-			proofCArr: le,
-			publicInputsArr: ue,
-			relayerFee: L.flatFee.toString(),
-			variableRate: W,
-			dimensions: Y,
-			hinkalInstructions: $.map((e) => ({
+			proofBArr: $,
+			proofCArr: ce,
+			publicInputsArr: le,
+			relayerFee: F.flatFee.toString(),
+			variableRate: H,
+			dimensions: J,
+			hinkalInstructions: Q.map((e) => ({
 				accountIndexes: [...e.accountIndexes],
 				data: [...e.data],
 				programIndex: e.programIndex
 			}))
 		},
-		accounts: ge,
-		commitmentValidationData: de,
-		adminData: _(D, O, P, f, ae, d)
+		accounts: he,
+		commitmentValidationData: ue,
+		adminData: g(T, E, M, f, oe, d)
 	});
 };
 //#endregion
-export { E as hinkalSolanaSwap };
+export { w as hinkalSolanaSwap };

package/data-structures/Hinkal/hinkalSolanaTransfer.cjs

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