@hinkal/common 0.3.13 → 0.3.14

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

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

package/common/src/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(`../../error-handling/error-codes.constants.cjs`),n=require(`../../functions/utils/solanaMint.utils.cjs`),r=require(`../../functions/utils/addresses.cjs`),i=require(`../../functions/utils/token-check.utils.cjs`),a=require(`../../functions/pre-transaction/solana.cjs`),o=require(`../../functions/pre-transaction/constructAdminData.cjs`),s=require(`../../functions/utils/create-provider.cjs`),c=require(`../AccountActions/AccountActions.cjs`),l=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),u=require(`../../functions/utils/fees.utils.cjs`),d=require(`../../functions/utils/solana-program.utils.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 _=async({program:e,mintPublicKey:t,mintAddressString:n,tokenAmount:r,stealthAddressStructure:i,recipientEncryptionKey:o,senderPublickey:s,originalDeployer:c,storageAccount:l,storageVault:u,merkleAccount:d,rootBuckets:f,createBlockedUtxos:p})=>{let h=new g.BN(r.toString()),_=a.buildAnchorStealthAddressStructure(i),v=n===`11111111111111111111111111111111`?null:t,y=n===`11111111111111111111111111111111`?null:void 0,[b]=m.buildProoflessEncryptedOutputs([i],[o]),x=Buffer.from(b.slice(2),`hex`),{current:S,next:C}=f;return e.methods.prooflessDeposit(h,_,x,p).accounts({mint:v,signer:s,signerAta:y,originalDeployer:c,storageAccount:l,storageVault:u,merkleAccount:d,rootBucketCurrent:S,rootBucketNext:C??e.programId,storageVaultAta:y}).instruction()},v=async({chainId:i,token:o,tokenAmount:c,senderAddress:l,recipientInfo:u,createBlockedUtxos:f=!1})=>{if(!r.isValidPrivateAddress(u))throw Error(t.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let{hinkalIdl:p,hinkalAddress:m,originalDeployer:g}=e.networkRegistry[i].contractData;if(!p)throw Error(`No IDL configured for Solana program on this network`);if(!g)throw Error(`missing original deployer`);let{rpcUrl:v}=e.networkRegistry[i],y=s.createCustomSolanaConnection(v),b=d.createReadOnlySolanaProgram(y,p),x=new h.PublicKey(g),S=new h.PublicKey(m),C=new h.PublicKey(l),{erc20TokenAddress:w}=o,{mintPublicKey:T}=n.formatMintAddress(w),E=T.toString(),D=a.getStorageAccountPublicKey(S,x),O=a.getStorageVaultPublicKey(S,x),k=a.getMerkleAccountPublicKey(S,x),A=r.constructStealthAddressStructure(u),j=r.getEncryptionKeyFromRecipientInfo(u),M=await a.resolveSolanaRootBuckets(b,k,1),N=await _({program:b,mintPublicKey:T,mintAddressString:E,tokenAmount:c,stealthAddressStructure:A,recipientEncryptionKey:j,senderPublickey:C,originalDeployer:x,storageAccount:D,storageVault:O,merkleAccount:k,rootBuckets:M,createBlockedUtxos:f}),P=n.getSolanaTokenProgramId(o.is2022Program);return{connection:y,senderAddress:l,senderPublickey:C,instructions:[N],storageAccount:D,storageVault:O,rootBucketCurrent:M.current,programId:P}},y=async(e,n,r,i,a,o,s=!1,l=0n)=>{let d=c.AccountActions.getAddressFromSubAccount(n,a);if(!d)throw Error(`Public account address is not available`);let f=await v({chainId:n,token:r,tokenAmount:i,senderAddress:d,recipientInfo:o??e.getRecipientInfo(),createBlockedUtxos:s});if(l<=0n)return f;let m=await e.getRandomRelay(n,!1);if(!m)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let{instructions:g}=await p.buildSolanaTransferInstructions(f.connection,f.senderPublickey,new h.PublicKey(m),r,u.calculateVariableFee(i,l));return{...f,instructions:[...g,...f.instructions]}},b=async(e,t,n,r,a,s=!1,c=0n,u)=>{if(!r)throw Error(`subAccount is required`);let d=i.validateAndGetChainId([t]),[{connection:p,senderPublickey:m,instructions:h},g]=await Promise.all([y(e,d,t,n,r,a,s,c),e.getEthereumAddress()]),_=await l.sendProxyV0Transaction({connection:p,chainId:d,subAccount:r,payerPublicKey:m,instructions:h});return f.emitTxPublicData(o.constructAdminData(u,d,[t.erc20TokenAddress],[n],g)),_};exports.hinkalSolanaProxyShield=b;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../functions/utils/solanaMint.utils.cjs`),r=require(`../../functions/utils/addresses.cjs`),i=require(`../../functions/utils/create-provider.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(`../AccountActions/AccountActions.cjs`),l=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),u=require(`../../functions/utils/fees.utils.cjs`),d=require(`../../functions/utils/solana-program.utils.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 _=async({program:e,mintPublicKey:t,mintAddressString:n,tokenAmount:r,stealthAddressStructure:i,recipientEncryptionKey:a,senderPublickey:s,originalDeployer:c,storageAccount:l,storageVault:u,merkleAccount:d,rootBuckets:f,createBlockedUtxos:p})=>{let h=new g.BN(r.toString()),_=o.buildAnchorStealthAddressStructure(i),v=n===`11111111111111111111111111111111`?null:t,y=n===`11111111111111111111111111111111`?null:void 0,[b]=m.buildProoflessEncryptedOutputs([i],[a]),x=Buffer.from(b.slice(2),`hex`),{current:S,next:C}=f;return e.methods.prooflessDeposit(h,_,x,p).accounts({mint:v,signer:s,signerAta:y,originalDeployer:c,storageAccount:l,storageVault:u,merkleAccount:d,rootBucketCurrent:S,rootBucketNext:C??e.programId,storageVaultAta:y}).instruction()},v=async({chainId:a,token:s,tokenAmount:c,senderAddress:l,recipientInfo:u,createBlockedUtxos:f=!1})=>{if(!r.isValidPrivateAddress(u))throw Error(t.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let{hinkalIdl:p,hinkalAddress:m,originalDeployer:g}=e.networkRegistry[a].contractData;if(!p)throw Error(`No IDL configured for Solana program on this network`);if(!g)throw Error(`missing original deployer`);let{rpcUrl:v}=e.networkRegistry[a],y=i.createCustomSolanaConnection(v),b=d.createReadOnlySolanaProgram(y,p),x=new h.PublicKey(g),S=new h.PublicKey(m),C=new h.PublicKey(l),{erc20TokenAddress:w}=s,{mintPublicKey:T}=n.formatMintAddress(w),E=T.toString(),D=o.getStorageAccountPublicKey(S,x),O=o.getStorageVaultPublicKey(S,x),k=o.getMerkleAccountPublicKey(S,x),A=r.constructStealthAddressStructure(u),j=r.getEncryptionKeyFromRecipientInfo(u),M=await o.resolveSolanaRootBuckets(b,k,1),N=await _({program:b,mintPublicKey:T,mintAddressString:E,tokenAmount:c,stealthAddressStructure:A,recipientEncryptionKey:j,senderPublickey:C,originalDeployer:x,storageAccount:D,storageVault:O,merkleAccount:k,rootBuckets:M,createBlockedUtxos:f}),P=n.getSolanaTokenProgramId(s.is2022Program);return{connection:y,senderAddress:l,senderPublickey:C,instructions:[N],storageAccount:D,storageVault:O,rootBucketCurrent:M.current,programId:P}},y=async(e,n,r,i,a,o,s=!1,l=0n)=>{let d=c.AccountActions.getAddressFromSubAccount(n,a);if(!d)throw Error(`Public account address is not available`);let f=await v({chainId:n,token:r,tokenAmount:i,senderAddress:d,recipientInfo:o??e.getRecipientInfo(),createBlockedUtxos:s});if(l<=0n)return f;let m=await e.getRandomRelay(n,!1);if(!m)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let{instructions:g}=await p.buildSolanaTransferInstructions(f.connection,f.senderPublickey,new h.PublicKey(m),r,u.calculateVariableFee(i,l));return{...f,instructions:[...g,...f.instructions]}},b=async(e,t,n,r,i,o=!1,c=0n,u)=>{if(!r)throw Error(`subAccount is required`);let d=a.validateAndGetChainId([t]),[{connection:p,senderPublickey:m,instructions:h},g]=await Promise.all([y(e,d,t,n,r,i,o,c),e.getEthereumAddress()]),_=await l.sendProxyV0Transaction({connection:p,chainId:d,subAccount:r,payerPublicKey:m,instructions:h});return f.emitTxPublicData(s.constructAdminData(u,d,[t.erc20TokenAddress],[n],g)),_};exports.hinkalSolanaProxyShield=b;

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

@@ -3,10 +3,10 @@ import "../../constants/protocol.constants.mjs";
 import { transactionErrorCodes as t } from "../../error-handling/error-codes.constants.mjs";
 import { formatMintAddress as n, getSolanaTokenProgramId as r } from "../../functions/utils/solanaMint.utils.mjs";
 import { constructStealthAddressStructure as i, getEncryptionKeyFromRecipientInfo as a, isValidPrivateAddress as o } from "../../functions/utils/addresses.mjs";
-import { validateAndGetChainId as s } from "../../functions/utils/token-check.utils.mjs";
-import { buildAnchorStealthAddressStructure as c, getMerkleAccountPublicKey as l, getStorageAccountPublicKey as u, getStorageVaultPublicKey as d, resolveSolanaRootBuckets as f } from "../../functions/pre-transaction/solana.mjs";
-import { constructAdminData as p } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { createCustomSolanaConnection as m } from "../../functions/utils/create-provider.mjs";
+import { createCustomSolanaConnection as s } from "../../functions/utils/create-provider.mjs";
+import { validateAndGetChainId as c } from "../../functions/utils/token-check.utils.mjs";
+import { buildAnchorStealthAddressStructure as l, getMerkleAccountPublicKey as u, getStorageAccountPublicKey as d, getStorageVaultPublicKey as f, resolveSolanaRootBuckets as p } from "../../functions/pre-transaction/solana.mjs";
+import { constructAdminData as m } from "../../functions/pre-transaction/constructAdminData.mjs";
 import { AccountActions as h } from "../AccountActions/AccountActions.mjs";
 import { sendProxyV0Transaction as g } from "../../functions/pre-transaction/sendV0Transaction.mjs";
 import { calculateVariableFee as _ } from "../../functions/utils/fees.utils.mjs";
@@ -17,30 +17,30 @@ import { buildProoflessEncryptedOutputs as x } from "./hinkalProoflessDeposit.ut
 import { PublicKey as S } from "@solana/web3.js";
 import { BN as C } from "@coral-xyz/anchor";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaProxyShield.ts
-var w = async ({ program: e, mintPublicKey: t, mintAddressString: n, tokenAmount: r, stealthAddressStructure: i, recipientEncryptionKey: a, senderPublickey: o, originalDeployer: s, storageAccount: l, storageVault: u, merkleAccount: d, rootBuckets: f, createBlockedUtxos: p }) => {
-	let m = new C(r.toString()), h = c(i), g = n === "11111111111111111111111111111111" ? null : t, _ = n === "11111111111111111111111111111111" ? null : void 0, [v] = x([i], [a]), y = Buffer.from(v.slice(2), "hex"), { current: b, next: S } = f;
+var w = async ({ program: e, mintPublicKey: t, mintAddressString: n, tokenAmount: r, stealthAddressStructure: i, recipientEncryptionKey: a, senderPublickey: o, originalDeployer: s, storageAccount: c, storageVault: u, merkleAccount: d, rootBuckets: f, createBlockedUtxos: p }) => {
+	let m = new C(r.toString()), h = l(i), g = n === "11111111111111111111111111111111" ? null : t, _ = n === "11111111111111111111111111111111" ? null : void 0, [v] = x([i], [a]), y = Buffer.from(v.slice(2), "hex"), { current: b, next: S } = f;
 	return e.methods.prooflessDeposit(m, h, y, p).accounts({
 		mint: g,
 		signer: o,
 		signerAta: _,
 		originalDeployer: s,
-		storageAccount: l,
+		storageAccount: c,
 		storageVault: u,
 		merkleAccount: d,
 		rootBucketCurrent: b,
 		rootBucketNext: S ?? e.programId,
 		storageVaultAta: _
 	}).instruction();
-}, T = async ({ chainId: s, token: c, tokenAmount: p, senderAddress: h, recipientInfo: g, createBlockedUtxos: _ = !1 }) => {
+}, T = async ({ chainId: c, token: l, tokenAmount: m, senderAddress: h, recipientInfo: g, createBlockedUtxos: _ = !1 }) => {
 	if (!o(g)) throw Error(t.RECIPIENT_FORMAT_INCORRECT);
-	let { hinkalIdl: y, hinkalAddress: b, originalDeployer: x } = e[s].contractData;
+	let { hinkalIdl: y, hinkalAddress: b, originalDeployer: x } = e[c].contractData;
 	if (!y) throw Error("No IDL configured for Solana program on this network");
 	if (!x) throw Error("missing original deployer");
-	let { rpcUrl: C } = e[s], T = m(C), E = v(T, y), D = new S(x), O = new S(b), k = new S(h), { erc20TokenAddress: A } = c, { mintPublicKey: j } = n(A), M = j.toString(), N = u(O, D), P = d(O, D), F = l(O, D), I = i(g), L = a(g), R = await f(E, F, 1), z = await w({
+	let { rpcUrl: C } = e[c], T = s(C), E = v(T, y), D = new S(x), O = new S(b), k = new S(h), { erc20TokenAddress: A } = l, { mintPublicKey: j } = n(A), M = j.toString(), N = d(O, D), P = f(O, D), F = u(O, D), I = i(g), L = a(g), R = await p(E, F, 1), z = await w({
 		program: E,
 		mintPublicKey: j,
 		mintAddressString: M,
-		tokenAmount: p,
+		tokenAmount: m,
 		stealthAddressStructure: I,
 		recipientEncryptionKey: L,
 		senderPublickey: k,
@@ -50,7 +50,7 @@ var w = async ({ program: e, mintPublicKey: t, mintAddressString: n, tokenAmount
 		merkleAccount: F,
 		rootBuckets: R,
 		createBlockedUtxos: _
-	}), B = r(c.is2022Program);
+	}), B = r(l.is2022Program);
 	return {
 		connection: T,
 		senderAddress: h,
@@ -80,16 +80,16 @@ var w = async ({ program: e, mintPublicKey: t, mintAddressString: n, tokenAmount
 		...u,
 		instructions: [...f, ...u.instructions]
 	};
-}, D = async (e, t, n, r, i, a = !1, o = 0n, c) => {
+}, D = async (e, t, n, r, i, a = !1, o = 0n, s) => {
 	if (!r) throw Error("subAccount is required");
-	let l = s([t]), [{ connection: u, senderPublickey: d, instructions: f }, m] = await Promise.all([E(e, l, t, n, r, i, a, o), e.getEthereumAddress()]), h = await g({
+	let l = c([t]), [{ connection: u, senderPublickey: d, instructions: f }, p] = await Promise.all([E(e, l, t, n, r, i, a, o), e.getEthereumAddress()]), h = await g({
 		connection: u,
 		chainId: l,
 		subAccount: r,
 		payerPublicKey: d,
 		instructions: f
 	});
-	return y(p(c, l, [t.erc20TokenAddress], [n], m)), h;
+	return y(m(s, l, [t.erc20TokenAddress], [n], p)), h;
 };
 //#endregion
 export { D as hinkalSolanaProxyShield };

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../types/external-action.types.cjs`),r=require(`../../functions/utils/token-check.utils.cjs`),i=require(`../../functions/utils/erc20tokenFunctions.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/utils/fees.utils.cjs`),d=require(`../../API/admin-calls.cjs`);require(`../../constants/index.cjs`);const f=require(`../../functions/pre-transaction/solanaTransfer.utils.cjs`);require(`../AccountActions/index.cjs`);let p=require(`@solana/web3.js`);var m=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 p.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 p.TransactionInstruction({keys:e.accounts.map(e=>({pubkey:new p.PublicKey(e.pubkey),isSigner:e.isSigner,isWritable:e.isWritable})),programId:new p.PublicKey(e.programId),data:Buffer.from(e.data,`base64`)})),lookupTableAccounts:i}},h=async(e,t)=>{let n=p.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}=p.TransactionMessage.decompile(n.message,{addressLookupTableAccounts:r});return{instructions:i,lookupTableAccounts:r}},g=async(t,r,i,a)=>{let c=s.AccountActions.getAddressFromSubAccount(t,i);if(!c)throw Error(`Public account address is not available`);let{rpcUrl:l}=e.networkRegistry[t],u=o.createCustomSolanaConnection(l),d=new p.PublicKey(c),{instructions:f,lookupTableAccounts:g}=a===n.ExternalActionId.Lifi?await h(u,r):await m(u,r);return{connection:u,walletPublicKey:d,instructions:f,lookupTableAccounts:g}},_=async(e,o,s,m,h,_,v,y,b,x,S,C)=>{let w=r.validateAndGetChainId(o),[{connection:T,walletPublicKey:E,instructions:D,lookupTableAccounts:O},k,A]=await Promise.all([g(w,m,h,_),e.getRandomRelay(w),e.getEthereumAddressByChain(w)]);if(!k)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let j=D,M=b??await l.getFeeStructure(w,y,o.map(e=>e.erc20TokenAddress),n.ExternalActionId.Emporium,[],35n);if(v){let e=o[1],t=s[1]*M.variableRate/10000n,{instructions:n}=await f.buildSolanaTransferInstructions(T,E,new p.PublicKey(k),e,t);j=[...D,...n]}else{let e={...M,flatFee:0n},t=S&&C!==void 0?await u.calculateModifiedFeeStructure(w,S,C,e):e;if(t.flatFee>0n){let e=await i.getErc20TokenFromAPI(w,t.feeToken);if(!e)throw Error(`Failed to find fee token`);let{instructions:n}=await f.buildSolanaTransferInstructions(T,E,new p.PublicKey(k),e,t.flatFee);j=[...D,...n]}}let N=await c.sendProxyV0Transaction({connection:T,chainId:w,subAccount:h,payerPublicKey:E,instructions:j,lookupTableAccounts:O});return d.emitTxPublicData(a.constructAdminData(x,w,o.map(e=>e.erc20TokenAddress),s,A,o)),N};exports.hinkalSolanaProxySwap=_;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../types/external-action.types.cjs`),r=require(`../../functions/utils/create-provider.cjs`),i=require(`../../functions/utils/token-check.utils.cjs`),a=require(`../../functions/utils/erc20tokenFunctions.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/utils/fees.utils.cjs`),d=require(`../../API/admin-calls.cjs`);require(`../../constants/index.cjs`);const f=require(`../../functions/utils/admin-dimensions.cjs`),p=require(`../../functions/pre-transaction/solanaTransfer.utils.cjs`);require(`../AccountActions/index.cjs`);let m=require(`@solana/web3.js`);var h=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 m.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 m.TransactionInstruction({keys:e.accounts.map(e=>({pubkey:new m.PublicKey(e.pubkey),isSigner:e.isSigner,isWritable:e.isWritable})),programId:new m.PublicKey(e.programId),data:Buffer.from(e.data,`base64`)})),lookupTableAccounts:i}},g=async(e,t)=>{let n=m.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}=m.TransactionMessage.decompile(n.message,{addressLookupTableAccounts:r});return{instructions:i,lookupTableAccounts:r}},_=async(t,i,a,o)=>{let c=s.AccountActions.getAddressFromSubAccount(t,a);if(!c)throw Error(`Public account address is not available`);let{rpcUrl:l}=e.networkRegistry[t],u=r.createCustomSolanaConnection(l),d=new m.PublicKey(c),{instructions:f,lookupTableAccounts:p}=o===n.ExternalActionId.Lifi?await g(u,i):await h(u,i);return{connection:u,walletPublicKey:d,instructions:f,lookupTableAccounts:p}},v=async(e,r,s,h,g,v,y,b,x,S,C,w)=>{let T=i.validateAndGetChainId(r),[{connection:E,walletPublicKey:D,instructions:O,lookupTableAccounts:k},A,j]=await Promise.all([_(T,h,g,v),e.getRandomRelay(T),e.getEthereumAddressByChain(T)]);if(!A)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let M=O,N=x??await l.getFeeStructure(T,b,r.map(e=>e.erc20TokenAddress),n.ExternalActionId.Emporium,[],35n),P=r[1],F;if(y)F=s[1]*N.variableRate/10000n;else{let e={...N,flatFee:0n},t=C&&w!==void 0?await u.calculateModifiedFeeStructure(T,C,w,e):e;if(F=t.flatFee,F>0n){let e=await a.getErc20TokenFromAPI(T,t.feeToken);if(!e)throw Error(`Failed to find fee token`);P=e}}if(F>0n){let{instructions:e}=await p.buildSolanaTransferInstructions(E,D,new m.PublicKey(A),P,F);M=[...M,...e]}let I=await c.sendProxyV0Transaction({connection:E,chainId:T,subAccount:g,payerPublicKey:D,instructions:M,lookupTableAccounts:k}),L=f.resolveSwapPairTokens(S,r,C);return d.emitTxPublicData(o.constructAdminData(S,T,r.map(e=>e.erc20TokenAddress),s,j,L)),I};exports.hinkalSolanaProxySwap=v;

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

@@ -2,5 +2,5 @@ import { AdminTransactionType, ERC20Token, SubAccount } from '../../types';
 import { IHinkal } from './IHinkal';
 import { FeeStructure } from '../../types/hinkal.types';
 import { ExternalActionId } from '../../types/external-action.types';
-export declare const hinkalSolanaProxySwap: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], data: string, subAccount: SubAccount, externalActionId: ExternalActionId, isTheSameChainSwap: boolean, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType, bridgedToken?: ERC20Token, bridgedTokenAmount?: bigint) => Promise<string>;
+export declare const hinkalSolanaProxySwap: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], data: string, subAccount: SubAccount, externalActionId: ExternalActionId, isTheSameChainSwap: boolean, feeTokenAddress?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType, bridgedToken?: ERC20Token, bridgedTokenAmount?: bigint) => Promise<string>;
 export declare const getSolanaProxySwapSerializedTransaction: (chainId: number, data: string, subAccount: SubAccount, externalActionId: ExternalActionId) => Promise<string>;

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

@@ -2,91 +2,93 @@ import { networkRegistry as e } from "../../constants/chains.constants.mjs";
 import "../../constants/protocol.constants.mjs";
 import { transactionErrorCodes as t } from "../../error-handling/error-codes.constants.mjs";
 import { ExternalActionId as n } from "../../types/external-action.types.mjs";
-import { validateAndGetChainId as r } from "../../functions/utils/token-check.utils.mjs";
-import { getErc20TokenFromAPI as i } from "../../functions/utils/erc20tokenFunctions.mjs";
-import { constructAdminData as a } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { createCustomSolanaConnection as o } from "../../functions/utils/create-provider.mjs";
+import { createCustomSolanaConnection as r } from "../../functions/utils/create-provider.mjs";
+import { validateAndGetChainId as i } from "../../functions/utils/token-check.utils.mjs";
+import { getErc20TokenFromAPI as a } from "../../functions/utils/erc20tokenFunctions.mjs";
+import { constructAdminData as o } from "../../functions/pre-transaction/constructAdminData.mjs";
 import { AccountActions as s } from "../AccountActions/AccountActions.mjs";
 import { sendProxyV0Transaction as c } from "../../functions/pre-transaction/sendV0Transaction.mjs";
 import { getFeeStructure as l } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import { calculateModifiedFeeStructure as u } from "../../functions/utils/fees.utils.mjs";
 import { emitTxPublicData as d } from "../../API/admin-calls.mjs";
 import "../../constants/index.mjs";
-import { buildSolanaTransferInstructions as f } from "../../functions/pre-transaction/solanaTransfer.utils.mjs";
+import { resolveSwapPairTokens as f } from "../../functions/utils/admin-dimensions.mjs";
+import { buildSolanaTransferInstructions as p } from "../../functions/pre-transaction/solanaTransfer.utils.mjs";
 import "../AccountActions/index.mjs";
-import { PublicKey as p, TransactionInstruction as m, TransactionMessage as h, VersionedTransaction as g } from "@solana/web3.js";
+import { PublicKey as m, TransactionInstruction as h, TransactionMessage as g, VersionedTransaction as _ } from "@solana/web3.js";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaProxySwap.ts
-var _ = async (e, t) => {
+var v = 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 p(t));
+		let n = await e.getAddressLookupTable(new m(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 m({
+		instructions: r.map((e) => new h({
 			keys: e.accounts.map((e) => ({
-				pubkey: new p(e.pubkey),
+				pubkey: new m(e.pubkey),
 				isSigner: e.isSigner,
 				isWritable: e.isWritable
 			})),
-			programId: new p(e.programId),
+			programId: new m(e.programId),
 			data: Buffer.from(e.data, "base64")
 		})),
 		lookupTableAccounts: i
 	};
-}, v = async (e, t) => {
-	let n = g.deserialize(Buffer.from(t, "base64")), r = await Promise.all(n.message.addressTableLookups.map(async ({ accountKey: t }) => {
+}, y = async (e, t) => {
+	let n = _.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 } = h.decompile(n.message, { addressLookupTableAccounts: r });
+	})), { instructions: i } = g.decompile(n.message, { addressLookupTableAccounts: r });
 	return {
 		instructions: i,
 		lookupTableAccounts: r
 	};
-}, y = async (t, r, i, a) => {
-	let c = s.getAddressFromSubAccount(t, i);
+}, b = async (t, i, a, o) => {
+	let c = s.getAddressFromSubAccount(t, a);
 	if (!c) throw Error("Public account address is not available");
-	let { rpcUrl: l } = e[t], u = o(l), d = new p(c), { instructions: f, lookupTableAccounts: m } = a === n.Lifi ? await v(u, r) : await _(u, r);
+	let { rpcUrl: l } = e[t], u = r(l), d = new m(c), { instructions: f, lookupTableAccounts: p } = o === n.Lifi ? await y(u, i) : await v(u, i);
 	return {
 		connection: u,
 		walletPublicKey: d,
 		instructions: f,
-		lookupTableAccounts: m
+		lookupTableAccounts: p
 	};
-}, b = async (e, o, s, m, h, g, _, v, b, x, S, C) => {
-	let w = r(o), [{ connection: T, walletPublicKey: E, instructions: D, lookupTableAccounts: O }, k, A] = await Promise.all([
-		y(w, m, h, g),
-		e.getRandomRelay(w),
-		e.getEthereumAddressByChain(w)
+}, x = async (e, r, s, h, g, _, v, y, x, S, C, w) => {
+	let T = i(r), [{ connection: E, walletPublicKey: D, instructions: O, lookupTableAccounts: k }, A, j] = await Promise.all([
+		b(T, h, g, _),
+		e.getRandomRelay(T),
+		e.getEthereumAddressByChain(T)
 	]);
-	if (!k) throw Error(t.RELAYER_NOT_AVAILABLE);
-	let j = D, M = b ?? await l(w, v, o.map((e) => e.erc20TokenAddress), n.Emporium, [], 35n);
-	if (_) {
-		let e = o[1], t = s[1] * M.variableRate / 10000n, { instructions: n } = await f(T, E, new p(k), e, t);
-		j = [...D, ...n];
-	} else {
+	if (!A) throw Error(t.RELAYER_NOT_AVAILABLE);
+	let M = O, N = x ?? await l(T, y, r.map((e) => e.erc20TokenAddress), n.Emporium, [], 35n), P = r[1], F;
+	if (v) F = s[1] * N.variableRate / 10000n;
+	else {
 		let e = {
-			...M,
+			...N,
 			flatFee: 0n
-		}, t = S && C !== void 0 ? await u(w, S, C, e) : e;
-		if (t.flatFee > 0n) {
-			let e = await i(w, t.feeToken);
+		}, t = C && w !== void 0 ? await u(T, C, w, e) : e;
+		if (F = t.flatFee, F > 0n) {
+			let e = await a(T, t.feeToken);
 			if (!e) throw Error("Failed to find fee token");
-			let { instructions: n } = await f(T, E, new p(k), e, t.flatFee);
-			j = [...D, ...n];
+			P = e;
 		}
 	}
-	let N = await c({
-		connection: T,
-		chainId: w,
-		subAccount: h,
-		payerPublicKey: E,
-		instructions: j,
-		lookupTableAccounts: O
-	});
-	return d(a(x, w, o.map((e) => e.erc20TokenAddress), s, A, o)), N;
+	if (F > 0n) {
+		let { instructions: e } = await p(E, D, new m(A), P, F);
+		M = [...M, ...e];
+	}
+	let I = await c({
+		connection: E,
+		chainId: T,
+		subAccount: g,
+		payerPublicKey: D,
+		instructions: M,
+		lookupTableAccounts: k
+	}), L = f(S, r, C);
+	return d(o(S, T, r.map((e) => e.erc20TokenAddress), s, j, L)), I;
 };
 //#endregion
-export { b as hinkalSolanaProxySwap };
+export { x as hinkalSolanaProxySwap };

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

@@ -0,0 +1 @@
+const e=require(`../../../../_virtual/_rolldown/runtime.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../../functions/utils/solanaMint.utils.cjs`),i=require(`../../functions/utils/create-provider.cjs`),a=require(`../../functions/utils/receive-vault-solana.utils.cjs`),o=require(`../../functions/utils/receive-vault.utils.cjs`),s=require(`../../functions/pre-transaction/solana.cjs`),c=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),l=require(`../../functions/utils/solana-program.utils.cjs`);let u=require(`@solana/web3.js`),d=require(`bs58`);d=e.__toESM(d);let f=require(`@solana/spl-token`),p=require(`@coral-xyz/anchor`);var m=e=>({recipient:s.buildAnchorStealthAddressStructure(e.recipient),owner:new u.PublicKey(e.owner),version:Number(e.version)}),h=e=>{let n=o.getReceiveVaultFactoryAddress(e);if(!n)throw Error(`receive vault: no factory on chain ${e}`);let{hinkalIdl:r}=t.networkRegistry[e].contractData;if(!r)throw Error(`No IDL configured for Solana program on this network`);let{rpcUrl:a}=t.networkRegistry[e],s=i.createCustomSolanaConnection(a),c=l.createReadOnlySolanaProgram(s,r);return{factoryAddress:n,originalDeployer:o.getSolanaOriginalDeployer(e),connection:s,program:c,hinkalIdl:r}},g=async(e,t,i,o,s,l,g,_,v)=>{let{factoryAddress:y,originalDeployer:b,hinkalIdl:x,connection:S,program:C}=h(t),w=a.computeSolanaReceiveVaultAddress(i,y,b),T=new u.PublicKey(w),E=new u.PublicKey(s),D=new u.PublicKey(_),O=o===n.solanaNativeAddress,{mintPublicKey:k}=r.formatMintAddress(o),A=O?f.TOKEN_PROGRAM_ID:(await S.getAccountInfo(k))?.owner;if(!A||!A.equals(f.TOKEN_PROGRAM_ID)&&!A.equals(f.TOKEN_2022_PROGRAM_ID))throw Error(`receive vault: unsupported token program`);let j=a.getSolanaReceiveVaultRecoveryDigest(y,b,w,o,s,l),M=a.computeSolanaRecoveryMarkerAddress(y,b,j),N=u.Ed25519Program.createInstructionWithPublicKey({publicKey:new u.PublicKey(i.owner).toBytes(),message:j,signature:d.default.decode(g)}),P=await C.methods.receiveVaultRecover(m(i),E,new p.BN(l.toString()),Array.from(j)).accounts({signer:D,originalDeployer:new u.PublicKey(b),vault:T,vaultAta:O?null:(0,f.getAssociatedTokenAddressSync)(k,T,!0,A),mint:O?null:k,destination:E,destinationAta:O?null:void 0,tokenProgram:A,recoveryMarker:M,instructionsSysvar:u.SYSVAR_INSTRUCTIONS_PUBKEY}).instruction();if(v){let{blockhash:e}=await S.getLatestBlockhash(),t=new u.Transaction;return t.feePayer=D,t.recentBlockhash=e,t.add(N,P),t.serialize({requireAllSignatures:!1}).toString(`base64`)}let{connection:F,wallet:I}=e.getSolanaProgram(x).provider;if(!I)throw Error(`missing solana wallet`);return c.sendInstructions(F,I,D,[N,P])};exports.hinkalSolanaReceiveVaultRecover=g;

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

@@ -0,0 +1,5 @@
+import { TransactionInstruction } from '@solana/web3.js';
+import { ReceiveVaultParams } from '../../types/receive-vault.types';
+import { IHinkal } from './IHinkal';
+export declare const buildSolanaReceiveVaultSettleInstructions: (chainId: number, params: ReceiveVaultParams, token: string, encryptedOutput: string, outputSignature: string, relayerPublicKey: string, flatFee: bigint, variableRate: bigint) => Promise<TransactionInstruction[]>;
+export declare const hinkalSolanaReceiveVaultRecover: (hinkal: IHinkal, chainId: number, params: ReceiveVaultParams, token: string, to: string, deadline: bigint, signature: string, feePayer: string, returnTxData: boolean) => Promise<string>;

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

@@ -0,0 +1,60 @@
+import { networkRegistry as e } from "../../constants/chains.constants.mjs";
+import { solanaNativeAddress as t } from "../../constants/protocol.constants.mjs";
+import { formatMintAddress as n } from "../../functions/utils/solanaMint.utils.mjs";
+import { createCustomSolanaConnection as r } from "../../functions/utils/create-provider.mjs";
+import { computeSolanaReceiveVaultAddress as i, computeSolanaRecoveryMarkerAddress as a, getSolanaReceiveVaultRecoveryDigest as o } from "../../functions/utils/receive-vault-solana.utils.mjs";
+import { getReceiveVaultFactoryAddress as s, getSolanaOriginalDeployer as c } from "../../functions/utils/receive-vault.utils.mjs";
+import { buildAnchorStealthAddressStructure as l } from "../../functions/pre-transaction/solana.mjs";
+import { sendInstructions as u } from "../../functions/pre-transaction/sendV0Transaction.mjs";
+import { createReadOnlySolanaProgram as d } from "../../functions/utils/solana-program.utils.mjs";
+import { Ed25519Program as f, PublicKey as p, SYSVAR_INSTRUCTIONS_PUBKEY as m, Transaction as h } from "@solana/web3.js";
+import g from "bs58";
+import { TOKEN_2022_PROGRAM_ID as _, TOKEN_PROGRAM_ID as v, getAssociatedTokenAddressSync as y } from "@solana/spl-token";
+import { BN as b } from "@coral-xyz/anchor";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaReceiveVault.ts
+var x = (e) => ({
+	recipient: l(e.recipient),
+	owner: new p(e.owner),
+	version: Number(e.version)
+}), S = (t) => {
+	let n = s(t);
+	if (!n) throw Error(`receive vault: no factory on chain ${t}`);
+	let { hinkalIdl: i } = e[t].contractData;
+	if (!i) throw Error("No IDL configured for Solana program on this network");
+	let { rpcUrl: a } = e[t], o = r(a), l = d(o, i);
+	return {
+		factoryAddress: n,
+		originalDeployer: c(t),
+		connection: o,
+		program: l,
+		hinkalIdl: i
+	};
+}, C = async (e, r, s, c, l, d, C, w, T) => {
+	let { factoryAddress: E, originalDeployer: D, hinkalIdl: O, connection: k, program: A } = S(r), j = i(s, E, D), M = new p(j), N = new p(l), P = new p(w), F = c === t, { mintPublicKey: I } = n(c), L = F ? v : (await k.getAccountInfo(I))?.owner;
+	if (!L || !L.equals(v) && !L.equals(_)) throw Error("receive vault: unsupported token program");
+	let R = o(E, D, j, c, l, d), z = a(E, D, R), B = f.createInstructionWithPublicKey({
+		publicKey: new p(s.owner).toBytes(),
+		message: R,
+		signature: g.decode(C)
+	}), V = await A.methods.receiveVaultRecover(x(s), N, new b(d.toString()), Array.from(R)).accounts({
+		signer: P,
+		originalDeployer: new p(D),
+		vault: M,
+		vaultAta: F ? null : y(I, M, !0, L),
+		mint: F ? null : I,
+		destination: N,
+		destinationAta: F ? null : void 0,
+		tokenProgram: L,
+		recoveryMarker: z,
+		instructionsSysvar: m
+	}).instruction();
+	if (T) {
+		let { blockhash: e } = await k.getLatestBlockhash(), t = new h();
+		return t.feePayer = P, t.recentBlockhash = e, t.add(B, V), t.serialize({ requireAllSignatures: !1 }).toString("base64");
+	}
+	let { connection: H, wallet: U } = e.getSolanaProgram(O).provider;
+	if (!U) throw Error("missing solana wallet");
+	return u(H, U, P, [B, V]);
+};
+//#endregion
+export { C as hinkalSolanaReceiveVaultRecover };

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

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

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

@@ -6,38 +6,47 @@ import { validateAndGetChainId as i } from "../../functions/utils/token-check.ut
 import { modifyVolatileTokenAmountChanges as a } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
 import { constructAdminData as o } from "../../functions/pre-transaction/constructAdminData.mjs";
 import { getFeeStructure as s } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { calculateVariableFeeGrossUp as c } from "../../functions/utils/fees.utils.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { hinkalTransact as c } from "./hinkalTransact.mjs";
-import { mergeWithFeeStructure as l } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+import { hinkalTransact as l } from "./hinkalTransact.mjs";
+import { mergeWithFeeStructure as u } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalWithdraw.ts
-var u = async (u, d, f, p, m, h, g, _, v) => {
-	let y = i(d), b = t(await u.getEthereumAddressByChain(y)), x = d.map((e) => e.erc20TokenAddress), S = await a(y, d, f), C = d[0];
-	if (!C) throw Error("Withdraw Action: No Token Found");
-	let w;
-	m || (w = g ?? await s(y, h, x, n.Transact, [], _), g && _ !== void 0 && (w = {
-		...w,
-		variableRate: _
-	}), await l(y, x, S, w));
-	let T = m ? void 0 : await u.getRandomRelay(y, !0);
-	if (!m && !T) throw Error(e.RELAYER_NOT_AVAILABLE);
-	let E = m ? {
+var d = async (d, f, p, m, h, g, _, v, y) => {
+	let b = i(f), x = t(await d.getEthereumAddressByChain(b)), S = f.map((e) => e.erc20TokenAddress), C = await a(b, f, p), w = f[0];
+	if (!w) throw Error("Withdraw Action: No Token Found");
+	let T;
+	if (!h) {
+		T = _ ?? await s(b, g, S, n.Transact, [], v), _ && v !== void 0 && (T = {
+			...T,
+			variableRate: v
+		});
+		let e = [...C];
+		await u(b, S, C, T), T.variableRate > 0n && f.forEach((t, n) => {
+			if (C[n] >= 0n) return;
+			let r = -e[n];
+			C[n] -= c(r, T.variableRate);
+		});
+	}
+	let E = h ? void 0 : await d.getRandomRelay(b, !0);
+	if (!h && !E) throw Error(e.RELAYER_NOT_AVAILABLE);
+	let D = h ? {
 		mode: r.Self,
-		erc20Tokens: [C],
-		approvalAmounts: [S[0]]
+		erc20Tokens: [w],
+		approvalAmounts: [C[0]]
 	} : {
 		mode: r.Relayer,
-		adminData: o(v, y, x, S, b)
+		adminData: o(y, b, S, C, x)
 	};
-	return c(u, {
-		chainId: y,
-		erc20Addresses: x,
-		amountChanges: S,
-		externalAddress: t(p),
-		feeStructure: w,
-		relay: T,
-		originalSender: m ? b : void 0,
-		submit: E
+	return l(d, {
+		chainId: b,
+		erc20Addresses: S,
+		amountChanges: C,
+		externalAddress: t(m),
+		feeStructure: T,
+		relay: E,
+		originalSender: h ? x : void 0,
+		submit: D
 	});
 };
 //#endregion
-export { u as hinkalWithdraw };
+export { d as hinkalWithdraw };

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

@@ -26,4 +26,5 @@ export * from './hinkalReceiveVaultAccount';
 export * from './hinkalReceiveVaultCreate';
 export * from './hinkalReceiveVaultRecover';
 export * from './hinkalReceiveVaultSettle';
+export * from './hinkalSolanaReceiveVault';
 export * from './hinkalSolanaSponsoredShield';

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../types/ethereum-network.types.cjs`),n=require(`../../types/balances.types.cjs`),r=require(`../../types/events.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../functions/utils/map.utils.cjs`),a=require(`../../functions/utils/mutexes.utils.cjs`),o=require(`../../functions/utils/create-provider.cjs`),s=require(`../../functions/utils/getContractAddress.cjs`),c=require(`../private-balances/BalanceChangedHandler.cjs`),l=require(`../event-service/evm/ClientBlockchainEventEmitter.cjs`),u=require(`../event-service/solana/ClientSolanaBlockchainEventEmitter.cjs`);require(`../event-service/index.cjs`);const d=require(`../snapshot/SnapshotFetcherService.cjs`),f=require(`../snapshot/solana-snapshots/ClientSolanaCommitmentsSnapshotService.cjs`),p=require(`../snapshot/solana-snapshots/ClientSolanaNullifierSnapshotService.cjs`),m=require(`../snapshot/evm-snapshots/ClientCommitmentsSnapshotService.cjs`),h=require(`../snapshot/evm-snapshots/ClientNullifierSnapshotService.cjs`);require(`../snapshot/index.cjs`);let g=require(`@solana/web3.js`),_=require(`async-mutex`);var v=new Map,y=e=>i.getOrCreateMapValue(v,e,()=>new _.Mutex),b=async(i,_)=>{let v=(_??i.getSupportedChains()).map(_=>y(_).runExclusive(async()=>{if(i.generateProofRemotely)return;i.commitmentsSnapshotServiceByChain[_]?.intervalClear(),i.nullifierSnapshotServiceByChain[_]?.intervalClear();let{maxPageSize:v,rpcUrl:y,contractData:b}=e.networkRegistry[_],x;if(e.isSolanaLike(_)){let e=b.hinkalAddress;if(!e)throw Error(`Solana program ID is not set`);x=new u.ClientSolanaBlockchainEventEmitter(_,o.createCustomSolanaConnection(y),new g.PublicKey(e),0,a.getChainBalanceFetchingMutex(_),v);let t=b.hinkalIdl;t&&x.setIdl(t);let n=new d.SnapshotFetcherService(_,e);i.commitmentsSnapshotServiceByChain[_]=new f.ClientSolanaCommitmentsSnapshotService(x,n),i.nullifierSnapshotServiceByChain[_]=new p.ClientSolanaNullifierSnapshotService(x,n)}else{let e=i.getContractWithFetcherByChainId(_,t.ContractType.HinkalContract),n=a.getChainBalanceFetchingMutex(_);x=new l.ClientBlockchainEventEmitter(r.EventCategory.MainContractEvents,_,e,0,n,v);let o=new d.SnapshotFetcherService(_,s.getContractAddress(e));i.commitmentsSnapshotServiceByChain[_]=new m.ClientCommitmentsSnapshotService(x,o),i.nullifierSnapshotServiceByChain[_]=new h.ClientNullifierSnapshotService(x,o)}let S=i.commitmentsSnapshotServiceByChain[_],C=i.nullifierSnapshotServiceByChain[_];if(!S||!C)throw Error(`Missing snapshot service for chain ${_}`);await Promise.all([S.init(),C.init()]),await x.init(),i.merkleTreeHinkalByChain[_]=S.merkleTree,i.nullifiersByChain[_]=C.nullifiers,i.encryptedOutputsByChain[_]=S.encryptedOutputs,x.onEventsProcessed=e=>{e>0&&c.balanceChangedHandler.dispatch({updateType:n.PrivateBalanceUpdateType.FreshWithoutLoader,updateTokensListBefore:!0,chainIdToUpdate:_})}}));await Promise.allSettled(v)};exports.resetMerkleTrees=b;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../types/ethereum-network.types.cjs`),n=require(`../../types/balances.types.cjs`),r=require(`../../types/events.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../functions/utils/create-provider.cjs`),a=require(`../../functions/utils/map.utils.cjs`),o=require(`../../functions/utils/mutexes.utils.cjs`),s=require(`../../functions/utils/getContractAddress.cjs`),c=require(`../private-balances/BalanceChangedHandler.cjs`),l=require(`../event-service/evm/ClientBlockchainEventEmitter.cjs`),u=require(`../event-service/solana/ClientSolanaBlockchainEventEmitter.cjs`);require(`../event-service/index.cjs`);const d=require(`../snapshot/SnapshotFetcherService.cjs`),f=require(`../snapshot/solana-snapshots/ClientSolanaCommitmentsSnapshotService.cjs`),p=require(`../snapshot/solana-snapshots/ClientSolanaNullifierSnapshotService.cjs`),m=require(`../snapshot/evm-snapshots/ClientCommitmentsSnapshotService.cjs`),h=require(`../snapshot/evm-snapshots/ClientNullifierSnapshotService.cjs`);require(`../snapshot/index.cjs`);let g=require(`@solana/web3.js`),_=require(`async-mutex`);var v=new Map,y=e=>a.getOrCreateMapValue(v,e,()=>new _.Mutex),b=async(a,_)=>{let v=(_??a.getSupportedChains()).map(_=>y(_).runExclusive(async()=>{if(a.generateProofRemotely)return;a.commitmentsSnapshotServiceByChain[_]?.intervalClear(),a.nullifierSnapshotServiceByChain[_]?.intervalClear();let{maxPageSize:v,rpcUrl:y,contractData:b}=e.networkRegistry[_],x;if(e.isSolanaLike(_)){let e=b.hinkalAddress;if(!e)throw Error(`Solana program ID is not set`);x=new u.ClientSolanaBlockchainEventEmitter(_,i.createCustomSolanaConnection(y),new g.PublicKey(e),0,o.getChainBalanceFetchingMutex(_),v);let t=b.hinkalIdl;t&&x.setIdl(t);let n=new d.SnapshotFetcherService(_,e);a.commitmentsSnapshotServiceByChain[_]=new f.ClientSolanaCommitmentsSnapshotService(x,n),a.nullifierSnapshotServiceByChain[_]=new p.ClientSolanaNullifierSnapshotService(x,n)}else{let e=a.getContractWithFetcherByChainId(_,t.ContractType.HinkalContract),n=o.getChainBalanceFetchingMutex(_);x=new l.ClientBlockchainEventEmitter(r.EventCategory.MainContractEvents,_,e,0,n,v);let i=new d.SnapshotFetcherService(_,s.getContractAddress(e));a.commitmentsSnapshotServiceByChain[_]=new m.ClientCommitmentsSnapshotService(x,i),a.nullifierSnapshotServiceByChain[_]=new h.ClientNullifierSnapshotService(x,i)}let S=a.commitmentsSnapshotServiceByChain[_],C=a.nullifierSnapshotServiceByChain[_];if(!S||!C)throw Error(`Missing snapshot service for chain ${_}`);await Promise.all([S.init(),C.init()]),await x.init(),a.merkleTreeHinkalByChain[_]=S.merkleTree,a.nullifiersByChain[_]=C.nullifiers,a.encryptedOutputsByChain[_]=S.encryptedOutputs,x.onEventsProcessed=e=>{e>0&&c.balanceChangedHandler.dispatch({updateType:n.PrivateBalanceUpdateType.FreshWithoutLoader,updateTokensListBefore:!0,chainIdToUpdate:_})}}));await Promise.allSettled(v)};exports.resetMerkleTrees=b;

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

@@ -3,9 +3,9 @@ import { ContractType as n } from "../../types/ethereum-network.types.mjs";
 import { PrivateBalanceUpdateType as r } from "../../types/balances.types.mjs";
 import { EventCategory as i } from "../../types/events.types.mjs";
 import "../../types/index.mjs";
-import { getOrCreateMapValue as a } from "../../functions/utils/map.utils.mjs";
-import { getChainBalanceFetchingMutex as o } from "../../functions/utils/mutexes.utils.mjs";
-import { createCustomSolanaConnection as s } from "../../functions/utils/create-provider.mjs";
+import { createCustomSolanaConnection as a } from "../../functions/utils/create-provider.mjs";
+import { getOrCreateMapValue as o } from "../../functions/utils/map.utils.mjs";
+import { getChainBalanceFetchingMutex as s } from "../../functions/utils/mutexes.utils.mjs";
 import { getContractAddress as c } from "../../functions/utils/getContractAddress.mjs";
 import { balanceChangedHandler as l } from "../private-balances/BalanceChangedHandler.mjs";
 import { ClientBlockchainEventEmitter as u } from "../event-service/evm/ClientBlockchainEventEmitter.mjs";
@@ -20,28 +20,28 @@ import "../snapshot/index.mjs";
 import { PublicKey as _ } from "@solana/web3.js";
 import { Mutex as v } from "async-mutex";
 //#region libs/shared/common/src/data-structures/Hinkal/resetMerkleTrees.ts
-var y = /* @__PURE__ */ new Map(), b = (e) => a(y, e, () => new v()), x = async (a, v) => {
-	let y = (v ?? a.getSupportedChains()).map((v) => b(v).runExclusive(async () => {
-		if (a.generateProofRemotely) return;
-		a.commitmentsSnapshotServiceByChain[v]?.intervalClear(), a.nullifierSnapshotServiceByChain[v]?.intervalClear();
+var y = /* @__PURE__ */ new Map(), b = (e) => o(y, e, () => new v()), x = async (o, v) => {
+	let y = (v ?? o.getSupportedChains()).map((v) => b(v).runExclusive(async () => {
+		if (o.generateProofRemotely) return;
+		o.commitmentsSnapshotServiceByChain[v]?.intervalClear(), o.nullifierSnapshotServiceByChain[v]?.intervalClear();
 		let { maxPageSize: y, rpcUrl: b, contractData: x } = t[v], S;
 		if (e(v)) {
 			let e = x.hinkalAddress;
 			if (!e) throw Error("Solana program ID is not set");
-			S = new d(v, s(b), new _(e), 0, o(v), y);
+			S = new d(v, a(b), new _(e), 0, s(v), y);
 			let t = x.hinkalIdl;
 			t && S.setIdl(t);
 			let n = new f(v, e);
-			a.commitmentsSnapshotServiceByChain[v] = new p(S, n), a.nullifierSnapshotServiceByChain[v] = new m(S, n);
+			o.commitmentsSnapshotServiceByChain[v] = new p(S, n), o.nullifierSnapshotServiceByChain[v] = new m(S, n);
 		} else {
-			let e = a.getContractWithFetcherByChainId(v, n.HinkalContract), t = o(v);
+			let e = o.getContractWithFetcherByChainId(v, n.HinkalContract), t = s(v);
 			S = new u(i.MainContractEvents, v, e, 0, t, y);
 			let r = new f(v, c(e));
-			a.commitmentsSnapshotServiceByChain[v] = new h(S, r), a.nullifierSnapshotServiceByChain[v] = new g(S, r);
+			o.commitmentsSnapshotServiceByChain[v] = new h(S, r), o.nullifierSnapshotServiceByChain[v] = new g(S, r);
 		}
-		let C = a.commitmentsSnapshotServiceByChain[v], w = a.nullifierSnapshotServiceByChain[v];
+		let C = o.commitmentsSnapshotServiceByChain[v], w = o.nullifierSnapshotServiceByChain[v];
 		if (!C || !w) throw Error(`Missing snapshot service for chain ${v}`);
-		await Promise.all([C.init(), w.init()]), await S.init(), a.merkleTreeHinkalByChain[v] = C.merkleTree, a.nullifiersByChain[v] = w.nullifiers, a.encryptedOutputsByChain[v] = C.encryptedOutputs, S.onEventsProcessed = (e) => {
+		await Promise.all([C.init(), w.init()]), await S.init(), o.merkleTreeHinkalByChain[v] = C.merkleTree, o.nullifiersByChain[v] = w.nullifiers, o.encryptedOutputsByChain[v] = C.encryptedOutputs, S.onEventsProcessed = (e) => {
 			e > 0 && l.dispatch({
 				updateType: r.FreshWithoutLoader,
 				updateTokensListBefore: !0,