@hinkal/common 0.3.3 → 0.3.5

package/common/src/constants/vite.constants.cjs

@@ -1 +1 @@
-var e=function(e){return e.DEVELOPMENT=`development`,e.PLAYGROUND=`playground`,e.PRODUCTION=`production`,e.STAGING=`staging`,e}({});e.DEVELOPMENT,e.PLAYGROUND,e.STAGING;var t=typeof process<`u`&&process?.release?.name===`node`,n=typeof process<`u`&&process.versions!=null&&process.versions.node!=null,r=typeof window<`u`&&window?.location?.protocol===`chrome-extension:`,i=e.PRODUCTION,a=i===e.DEVELOPMENT,o=i===e.PLAYGROUND,s=i===e.STAGING,c=s||a||o,l=typeof navigator<`u`&&navigator.product===`ReactNative`,u=c||t&&i===e.PRODUCTION;exports.DEPLOYMENT_MODE=e,exports.deploymentMode=i,exports.isDevelopment=a,exports.isExtension=r,exports.isNode=n,exports.isNotClientProduction=u,exports.isNotProduction=c,exports.isPlayground=o,exports.isReactNative=l,exports.isStaging=s;
+const e=require(`../functions/utils/enum.utils.cjs`);var t=function(e){return e.DEVELOPMENT=`development`,e.PLAYGROUND=`playground`,e.PRODUCTION=`production`,e.STAGING=`staging`,e}({}),n={[t.DEVELOPMENT]:[`localhost`,`192.`,`127.`],[t.PLAYGROUND]:[`playground`],[t.STAGING]:[`working`,`staging`]},r=typeof process<`u`&&process?.release?.name===`node`,i=typeof process<`u`&&process.versions!=null&&process.versions.node!=null,a=typeof window<`u`&&window?.location?.protocol===`chrome-extension:`;function o(e,t){return t.some(t=>e.includes(t))}var s=()=>(require(`dotenv`).config({path:`DOTENV_OVERRIDE`in process.env?process.env.DOTENV_OVERRIDE:void 0}),process.env.DEPLOYMENT_MODE?.startsWith(`production`)?t.PRODUCTION:e.toEnumValue(t,process.env.DEPLOYMENT_MODE)||t.DEVELOPMENT),c=(()=>{if(!r&&typeof window>`u`)return;if(r)return s();if(window?.location?.protocol===`chrome-extension:`)return e.toEnumValue(t,WALLET_DEPLOYMENT_MODE)||t.STAGING;let i=window?.location?.host;return i?o(i,n[t.DEVELOPMENT])?t.DEVELOPMENT:o(i,n[t.PLAYGROUND])?t.PLAYGROUND:o(i,n[t.STAGING])?t.STAGING:t.PRODUCTION:t.PRODUCTION})(),l=c===t.DEVELOPMENT,u=c===t.PLAYGROUND,d=c===t.STAGING,f=d||l||u,p=typeof navigator<`u`&&navigator.product===`ReactNative`,m=f||r&&c===t.PRODUCTION;exports.DEPLOYMENT_MODE=t,exports.deploymentMode=c,exports.isDevelopment=l,exports.isExtension=a,exports.isNode=i,exports.isNotClientProduction=m,exports.isNotProduction=f,exports.isPlayground=u,exports.isReactNative=p,exports.isStaging=d;

package/common/src/constants/vite.constants.mjs

@@ -1,8 +1,26 @@
+import { __require as e } from "../../../_virtual/_rolldown/runtime.mjs";
+import { toEnumValue as t } from "../functions/utils/enum.utils.mjs";
 //#region libs/shared/common/src/constants/vite.constants.ts
-var e = /* @__PURE__ */ function(e) {
+var n = /* @__PURE__ */ function(e) {
 	return e.DEVELOPMENT = "development", e.PLAYGROUND = "playground", e.PRODUCTION = "production", e.STAGING = "staging", e;
-}({});
-e.DEVELOPMENT, e.PLAYGROUND, e.STAGING;
-var t = typeof process < "u" && process?.release?.name === "node", n = typeof process < "u" && process.versions != null && process.versions.node != null, r = typeof window < "u" && window?.location?.protocol === "chrome-extension:", i = e.PRODUCTION, a = i === e.DEVELOPMENT, o = i === e.PLAYGROUND, s = i === e.STAGING, c = s || a || o, l = typeof navigator < "u" && navigator.product === "ReactNative", u = c || t && i === e.PRODUCTION;
+}({}), r = {
+	[n.DEVELOPMENT]: [
+		"localhost",
+		"192.",
+		"127."
+	],
+	[n.PLAYGROUND]: ["playground"],
+	[n.STAGING]: ["working", "staging"]
+}, i = typeof process < "u" && process?.release?.name === "node", a = typeof process < "u" && process.versions != null && process.versions.node != null, o = typeof window < "u" && window?.location?.protocol === "chrome-extension:";
+function s(e, t) {
+	return t.some((t) => e.includes(t));
+}
+var c = () => (e("dotenv").config({ path: "DOTENV_OVERRIDE" in process.env ? process.env.DOTENV_OVERRIDE : void 0 }), process.env.DEPLOYMENT_MODE?.startsWith("production") ? n.PRODUCTION : t(n, process.env.DEPLOYMENT_MODE) || n.DEVELOPMENT), l = (() => {
+	if (!i && typeof window > "u") return;
+	if (i) return c();
+	if (window?.location?.protocol === "chrome-extension:") return t(n, WALLET_DEPLOYMENT_MODE) || n.STAGING;
+	let e = window?.location?.host;
+	return e ? s(e, r[n.DEVELOPMENT]) ? n.DEVELOPMENT : s(e, r[n.PLAYGROUND]) ? n.PLAYGROUND : s(e, r[n.STAGING]) ? n.STAGING : n.PRODUCTION : n.PRODUCTION;
+})(), u = l === n.DEVELOPMENT, d = l === n.PLAYGROUND, f = l === n.STAGING, p = f || u || d, m = typeof navigator < "u" && navigator.product === "ReactNative", h = p || i && l === n.PRODUCTION;
 //#endregion
-export { e as DEPLOYMENT_MODE, i as deploymentMode, a as isDevelopment, r as isExtension, n as isNode, u as isNotClientProduction, c as isNotProduction, o as isPlayground, l as isReactNative, s as isStaging };
+export { n as DEPLOYMENT_MODE, l as deploymentMode, u as isDevelopment, o as isExtension, a as isNode, h as isNotClientProduction, p as isNotProduction, d as isPlayground, m as isReactNative, f as isStaging };

package/common/src/crypto/index.cjs

@@ -1 +1 @@
-require(`./poseidon.cjs`),require(`./babyJub.cjs`),require(`./eddsa.cjs`),require(`./ecdh-sealed-keys.cjs`),require(`./preProcessing.cjs`),require(`./ecdh.cjs`),require(`./ecdh-dual-path.cjs`);
+require(`./poseidon.cjs`),require(`./babyJub.cjs`),require(`./eddsa.cjs`),require(`./ecdh-sealed-keys.cjs`),require(`./preProcessing.cjs`),require(`./ecdh.cjs`);

package/common/src/crypto/index.d.ts

@@ -4,4 +4,3 @@ export * from './preProcessing';
 export * from './eddsa';
 export * from './ecdh';
 export * from './ecdh-sealed-keys';
-export * from './ecdh-dual-path';

package/common/src/crypto/index.mjs

@@ -4,4 +4,3 @@ import "./eddsa.mjs";
 import "./ecdh-sealed-keys.mjs";
 import "./preProcessing.mjs";
 import "./ecdh.mjs";
-import "./ecdh-dual-path.mjs";

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

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

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

@@ -1,111 +1,64 @@
 import { networkRegistry as e } from "../../constants/chains.constants.mjs";
 import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as t, solanaNativeAddress as n } from "../../constants/protocol.constants.mjs";
 import { transactionErrorCodes as r } from "../../error-handling/error-codes.constants.mjs";
-import { randomBigInt as i } from "../../functions/web3/etherFunctions.mjs";
-import { UserKeys as a } from "../crypto-keys/keys.mjs";
-import { getCurrentTimeInSeconds as o } from "../../functions/utils/time.utils.mjs";
-import { Utxo as s } from "../utxo/Utxo.mjs";
-import { ExternalActionId as c } from "../../types/external-action.types.mjs";
+import { UserKeys as i } from "../crypto-keys/keys.mjs";
+import { Utxo as a } from "../utxo/Utxo.mjs";
+import { ExternalActionId as o } from "../../types/external-action.types.mjs";
+import { SolanaSubmitMode as s } from "../../types/solana-transact.types.mjs";
 import "../../types/index.mjs";
-import { validateAndGetChainId as l } from "../../functions/utils/token-check.utils.mjs";
-import { finalizeSolanaTxEnclaveCallRelay as u, prepareSolanaTxEnclaveCall as d } from "../../functions/snarkjs/constructTxEnclave.mjs";
-import { getFeeStructure as f } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { solanaTransactCallRelayer as p } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { constructSolanaZkProof as m } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { validateAndGetChainId as c } from "../../functions/utils/token-check.utils.mjs";
+import { getFeeStructure as l } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { hinkalSolanaTransact as u } from "./hinkalSolanaTransact.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaClaimUtxo.ts
-var h = async (e, t, r, i, a, o, s, c, l, f, p) => {
-	let { jobId: m, signedMessageHash: h } = await d(e, {
-		chainId: t,
-		mintAddresses: [r],
-		amountChanges: i,
-		relayAddress: a,
-		recipient: n,
-		signer: a,
-		functionName: "transfer",
-		accounts: o,
-		relayerFee: l,
-		variableRate: 0n,
-		hinkalInstructions: [],
-		remainingAccounts: [],
-		recipientAddress: s,
-		recipientAmounts: [c],
-		inputCommitments: [p]
-	}, f), { R8: g, S: _ } = f.signEddsa(BigInt(h));
-	return u(m, {
-		R8: g,
-		S: _
-	}, t);
-}, g = async (u, d, g, _, v) => {
-	let y = l([d]), b = d.erc20TokenAddress;
-	if (g.getTokenAddress(y) !== b) throw Error("Off-chain UTXO token mismatch");
-	let x = v ? new a(v) : new a(g.nullifyingKey, g.nullifyingKey);
-	if (!g.nullifyingKey && !v) throw Error("Claimable UTXO nullifyingKey is missing");
-	let S = x.getShieldedPrivateKey();
-	if (g.nullifyingKey && g.nullifyingKey !== S) throw Error("Claimable UTXO key mismatch");
-	let { originalDeployer: C } = e[y].contractData;
-	if (!C) throw Error("missing data");
-	let w = s.createFrom(g, { nullifyingKey: S }), T = _ ?? await f(y, b, [b], c.Transact, void 0, void 0, {
-		mintTo: b,
+var d = async (d, f, p, m, h) => {
+	let g = c([f]), _ = f.erc20TokenAddress;
+	if (p.getTokenAddress(g) !== _) throw Error("Off-chain UTXO token mismatch");
+	let v = h ? new i(h) : new i(p.nullifyingKey, p.nullifyingKey);
+	if (!p.nullifyingKey && !h) throw Error("Claimable UTXO nullifyingKey is missing");
+	let y = v.getShieldedPrivateKey();
+	if (p.nullifyingKey && p.nullifyingKey !== y) throw Error("Claimable UTXO key mismatch");
+	let { originalDeployer: b } = e[g].contractData;
+	if (!b) throw Error("missing data");
+	let x = a.createFrom(p, { nullifyingKey: y }), S = m ?? await l(g, _, [_], o.Transact, void 0, void 0, {
+		mintTo: _,
 		nullifierCount: 1,
 		rootInsertCount: 2
 	});
-	if (T.feeToken !== b) throw Error("Claim fee token mismatch: fee must be paid from claimed UTXO token");
-	let E = T.variableRate > 0n ? T.variableRate : t;
-	if (w.amount <= T.flatFee) throw Error(r.INSUFFICIENT_FUNDS_TO_TRANSACT);
-	let D = w.amount - T.flatFee, O = D * E / 10000n, k = D - O;
-	if (k <= 0n) throw Error(r.RECIPIENT_AMOUNT_INVALID);
-	let A = T.flatFee + O, j = u.getRecipientInfo(), [M, N, P, , , F] = j.split(",");
-	if (!N || !P || !M || !F) throw Error("Invalid recipient info");
-	let I = o().toString(), L = new s({
+	if (S.feeToken !== _) throw Error("Claim fee token mismatch: fee must be paid from claimed UTXO token");
+	let C = S.variableRate > 0n ? S.variableRate : t;
+	if (x.amount <= S.flatFee) throw Error(r.INSUFFICIENT_FUNDS_TO_TRANSACT);
+	let w = x.amount - S.flatFee, T = w * C / 10000n, E = w - T;
+	if (E <= 0n) throw Error(r.RECIPIENT_AMOUNT_INVALID);
+	let D = S.flatFee + T, O = d.getRecipientInfo(), [k, A, j, , , M] = O.split(",");
+	if (!A || !j || !k || !M) throw Error("Invalid recipient info");
+	let N = new a({
 		amount: 0n,
-		erc20TokenAddress: w.erc20TokenAddress,
-		mintAddress: w.mintAddress,
-		nullifyingKey: x.getShieldedPrivateKey(),
-		spendingPublicKey: x.getSpendingKeyPair().pubSpendingBJJPoint
-	}), R = new s({
-		amount: 0n,
-		erc20TokenAddress: w.erc20TokenAddress,
-		mintAddress: w.mintAddress,
-		nullifyingKey: x.getShieldedPrivateKey(),
-		timeStamp: I,
-		spendingPublicKey: x.getSpendingKeyPair().pubSpendingBJJPoint
-	}), z = new s({
-		amount: k,
-		erc20TokenAddress: w.erc20TokenAddress,
-		mintAddress: w.mintAddress,
-		timeStamp: I,
-		H0: [BigInt(N), BigInt(P)],
-		stealthAddress: M,
-		encryptionKey: F
-	}), B = [w, L], V = [R, z], H = await u.getRandomRelay(y, !0);
-	if (!H) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let U = {
-		recipient: H,
-		mint: b === "11111111111111111111111111111111" ? void 0 : b
+		erc20TokenAddress: x.erc20TokenAddress,
+		mintAddress: x.mintAddress,
+		nullifyingKey: v.getShieldedPrivateKey(),
+		spendingPublicKey: v.getSpendingKeyPair().pubSpendingBJJPoint
+	}), P = await d.getRandomRelay(g, !0);
+	if (!P) throw Error(r.RELAYER_NOT_AVAILABLE);
+	let F = {
+		recipient: P,
+		mint: _ === "11111111111111111111111111111111" ? void 0 : _
 	};
-	if (u.generateProofRemotely) return h(u, y, b, [-(k + A)], H, U, j, k, A, x, w.getCommitment());
-	let W = a.findCorrectRandomization(i(31), x.getShieldedPrivateKey()), G = {
-		tokenNumber: 1,
-		nullifierAmount: B.length,
-		outputAmount: V.length
-	}, { proofAArr: K, proofBArr: q, proofCArr: J, publicInputsArr: Y, commitmentValidationData: X, rootHashHinkalIndex: Z, encryptedOutputs: Q } = await m(u.merkleTreeHinkalByChain[y], x, [b], [B], [V], W, A, 0n, n, H, G, void 0, y);
-	return p({
-		chainId: y,
-		relayAddress: H,
+	return u(d, {
+		chainId: g,
+		mintAddresses: [_],
+		amountChanges: [-(E + D)],
+		relayAddress: P,
+		recipient: n,
+		signer: P,
 		functionName: "transfer",
-		args: {
-			proofAArr: K,
-			proofBArr: q,
-			proofCArr: J,
-			publicInputsArr: Y,
-			encryptedOutputs: Q,
-			relayerFee: A.toString(),
-			dimensions: G,
-			rootHashIndex: Z.toString()
-		},
-		accounts: U,
-		commitmentValidationData: X
+		accounts: F,
+		relayerFee: D,
+		recipientAddress: O,
+		recipientAmounts: [E],
+		inputUtxos: [[x, N]],
+		userKeys: v,
+		submit: { mode: s.Relayer }
 	});
 };
 //#endregion
-export { g as hinkalSolanaClaimUtxo };
+export { d as hinkalSolanaClaimUtxo };

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

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

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

@@ -9,34 +9,34 @@ import { formatMintAddress as s } from "../../functions/utils/solanaMint.utils.m
 import { hashEthereumAddress as c, hashString as l } from "../../functions/utils/addresses.mjs";
 import { ExternalActionId as u } from "../../types/external-action.types.mjs";
 import { DepositAndWithdrawPhase as d } from "../../types/scheduled-transactions.types.mjs";
+import { SolanaSubmitMode as f } from "../../types/solana-transact.types.mjs";
 import "../../types/index.mjs";
-import { validateAndGetChainId as f } from "../../functions/utils/token-check.utils.mjs";
-import { calcStealthAddressStructure as p } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { buildAnchorStealthAddressStructure as m, getMerkleAccountPublicKey as h, getStorageAccountPublicKey as g, getStorageVaultPublicKey as _, resolveSolanaRootBuckets as v } from "../../functions/pre-transaction/solana.mjs";
-import { constructAdminData as y } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { finalizeSolanaTxEnclaveCall as b, prepareSolanaTxEnclaveCall as x } from "../../functions/snarkjs/constructTxEnclave.mjs";
-import { fetchSolanaTransaction as S } from "../../functions/pre-transaction/sendV0Transaction.mjs";
-import { getFeeStructure as C } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { waitForDepositedUtxosInMerkleTree as w } from "../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
+import { validateAndGetChainId as p } from "../../functions/utils/token-check.utils.mjs";
+import { calcStealthAddressStructure as m } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { buildAnchorStealthAddressStructure as h, getMerkleAccountPublicKey as g, getStorageAccountPublicKey as _, getStorageVaultPublicKey as v, resolveSolanaRootBuckets as y } from "../../functions/pre-transaction/solana.mjs";
+import { constructAdminData as b } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { fetchSolanaTransaction as x } from "../../functions/pre-transaction/sendV0Transaction.mjs";
+import { getFeeStructure as S } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { waitForDepositedUtxosInMerkleTree as C } from "../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { solanaTransactCallRelayerBatch as T } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { buildProoflessEncryptedOutputs as E } from "./hinkalProoflessDeposit.utils.mjs";
-import { safeUpdateDepositAndWithdrawStatus as D, updateDepositAndWithdrawStatus as O } from "../../API/deposit-and-withdraw-status-calls.mjs";
-import { getOnChainUtxosFromReceiptSolana as k } from "../../functions/utils/getUtxosFromReceiptSolana.mjs";
-import { calculateModifiedFeeStructure as A, calculateTotalFee as j } from "../../functions/utils/fees.utils.mjs";
+import { solanaTransactCallRelayerBatch as w } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { buildProoflessEncryptedOutputs as T } from "./hinkalProoflessDeposit.utils.mjs";
+import { safeUpdateDepositAndWithdrawStatus as E, updateDepositAndWithdrawStatus as D } from "../../API/deposit-and-withdraw-status-calls.mjs";
+import { getOnChainUtxosFromReceiptSolana as O } from "../../functions/utils/getUtxosFromReceiptSolana.mjs";
+import { calculateModifiedFeeStructure as k, calculateTotalFee as A } from "../../functions/utils/fees.utils.mjs";
 import "../../functions/web3/index.mjs";
-import { constructSolanaZkProof as M } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
 import "../../functions/index.mjs";
-import { PublicKey as N } from "@solana/web3.js";
-import { BN as P } from "@coral-xyz/anchor";
+import { hinkalSolanaTransact as j } from "./hinkalSolanaTransact.mjs";
+import { PublicKey as M } from "@solana/web3.js";
+import { BN as N } from "@coral-xyz/anchor";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.ts
-var F = (n, a, o, c) => {
+var P = (n, a, o, c) => {
 	let { hinkalIdl: l, hinkalAddress: u, originalDeployer: d } = e[a].contractData;
 	if (!l) throw Error("No IDL configured for Solana program on this network");
 	if (!d) throw Error("missing original deployer");
-	let f = n.userKeys.getShieldedPrivateKey(), v = n.getSolanaProgram(l), y = n.getSolanaPublicKey(), b = new N(d), x = new N(u), { mintPublicKey: S } = s(o.erc20TokenAddress), C = S.toString(), w = g(x, b), T = _(x, b), E = h(x, b), D = c.map(() => p(i.findCorrectRandomization(r(31), f), f, n.userKeys.getSpendingKeyPair().pubSpendingBJJPoint)), O = D.map((e) => m(e)), k = i.getEncryptionKeyPair(f).publicKey, A = C === t;
+	let f = n.userKeys.getShieldedPrivateKey(), p = n.getSolanaProgram(l), y = n.getSolanaPublicKey(), b = new M(d), x = new M(u), { mintPublicKey: S } = s(o.erc20TokenAddress), C = S.toString(), w = _(x, b), T = v(x, b), E = g(x, b), D = c.map(() => m(i.findCorrectRandomization(r(31), f), f, n.userKeys.getSpendingKeyPair().pubSpendingBJJPoint)), O = D.map((e) => h(e)), k = i.getEncryptionKeyPair(f).publicKey, A = C === t;
 	return {
-		program: v,
+		program: p,
 		publicKey: y,
 		originalDeployer: b,
 		mint: A ? null : S,
@@ -50,9 +50,9 @@ var F = (n, a, o, c) => {
 		anchorStealthStructures: O,
 		ownEncryptionKey: k
 	};
-}, I = async (e) => {
-	let t = E(e.stealthAddressStructures, e.amounts.map(() => e.ownEncryptionKey)).map((e) => Buffer.from(e.slice(2), "hex")), { current: n, next: r } = await v(e.program, e.merkleAccount, e.amounts.length);
-	return e.program.methods.multiPaymentDeposit(e.amounts.map((e) => new P(e.toString())), e.anchorStealthStructures, t, !0).accounts({
+}, F = async (e) => {
+	let t = T(e.stealthAddressStructures, e.amounts.map(() => e.ownEncryptionKey)).map((e) => Buffer.from(e.slice(2), "hex")), { current: n, next: r } = await y(e.program, e.merkleAccount, e.amounts.length);
+	return e.program.methods.multiPaymentDeposit(e.amounts.map((e) => new N(e.toString())), e.anchorStealthStructures, t, !0).accounts({
 		mint: e.mint,
 		signer: e.publicKey,
 		signerAta: e.atasValue,
@@ -64,27 +64,27 @@ var F = (n, a, o, c) => {
 		rootBucketNext: r ?? e.program.programId,
 		storageVaultAta: e.atasValue
 	});
-}, L = async (e, t, n, r, i, a, o) => {
-	let c = r.map((e) => e + j(e, a)), l = F(e, t, n, c), u = (await O({
+}, I = async (e, t, n, r, i, a, o) => {
+	let c = r.map((e) => e + A(e, a)), l = P(e, t, n, c), u = (await D({
 		chainId: t,
 		hashedEthereumAddress: o,
 		phase: d.BEFORE_DEPOSIT
-	})).id ?? void 0, f = await (await I(l)).rpc(), p = await l.program.provider.connection.getLatestBlockhash();
+	})).id ?? void 0, f = await (await F(l)).rpc(), p = await l.program.provider.connection.getLatestBlockhash();
 	await l.program.provider.connection.confirmTransaction({
 		blockhash: p.blockhash,
 		lastValidBlockHeight: p.lastValidBlockHeight,
 		signature: f
 	}, "finalized");
-	let m = await S(l.program.provider.connection, f, "finalized");
+	let m = await x(l.program.provider.connection, f, "finalized");
 	if (!m) throw Error("Transaction missing");
-	await D({
+	await E({
 		id: u,
 		chainId: t,
 		hashedEthereumAddress: o,
 		phase: d.AFTER_DEPOSIT,
 		depositTxHash: f
 	});
-	let { compressedAddress: h } = s(n.erc20TokenAddress), g = k(m, l.program, e.userKeys, h), _ = [], v = [...g];
+	let { compressedAddress: h } = s(n.erc20TokenAddress), g = O(m, l.program, e.userKeys, h), _ = [], v = [...g];
 	return i.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}.`);
@@ -97,120 +97,82 @@ var F = (n, a, o, c) => {
 		depositTxHash: f,
 		statusId: u
 	};
-}, R = async (e, t, n, r, i, a, o, s) => {
-	let { jobId: c, signedMessageHash: l } = await x(e, {
-		chainId: t,
-		mintAddresses: [n],
-		amountChanges: [-r.amount],
-		relayAddress: a,
-		recipient: i,
-		signer: a,
-		functionName: "transact",
-		accounts: o,
-		relayerFee: s.flatFee,
-		variableRate: s.variableRate,
-		hinkalInstructions: [],
-		remainingAccounts: [],
-		inputCommitments: [r.getCommitment()],
-		useBlockedUtxos: !0
-	}), { R8: u, S: d } = e.userKeys.signEddsa(BigInt(l));
-	return b(c, {
-		R8: u,
-		S: d
-	});
-}, z = async (c, l, u, f, p, m, h, g, _, v, b, x, S, C) => {
-	let w = u.erc20TokenAddress;
-	if (f.length === 0) throw Error("userDepositedUtxos must not be empty");
-	let { originalDeployer: E } = e[l].contractData;
-	if (!E) throw Error("missing data");
-	let O = await c.getRandomRelay(l, !0);
-	if (!O) throw Error(n.RELAYER_NOT_AVAILABLE);
-	let k = a().toString(), j = c.generateProofRemotely, N = j ? 5 : 1, P = [];
-	for (let e = 0; e < f.length; e += N) {
-		let n = f.slice(e, e + N), a = await Promise.all(n.map(async ({ recipientAddress: n, utxo: a }, d) => {
-			let f = e + d, m = {
+}, L = async (r, i, c, l, u, p, m, h, g, _, v, y, x, S) => {
+	let C = c.erc20TokenAddress;
+	if (l.length === 0) throw Error("userDepositedUtxos must not be empty");
+	let { originalDeployer: T } = e[i].contractData;
+	if (!T) throw Error("missing data");
+	let D = await r.getRandomRelay(i, !0);
+	if (!D) throw Error(n.RELAYER_NOT_AVAILABLE);
+	let O = a().toString(), A = r.generateProofRemotely ? 5 : 1, M = [];
+	for (let e = 0; e < l.length; e += A) {
+		let n = l.slice(e, e + A), a = await Promise.all(n.map(async ({ recipientAddress: n, utxo: a }, l) => {
+			let d = e + l, p = {
 				recipient: n,
-				mint: w === "11111111111111111111111111111111" ? void 0 : w
-			}, g = await A(l, u, h[f], p), _ = y(b, l, [w], [h[f]], await c.getEthereumAddress());
-			if (j) {
-				let { solanaArgs: e, commitmentValidationData: t } = await R(c, l, w, a, n, O, m, g);
-				return {
-					relayAddress: O,
-					functionName: "transact",
-					chainId: l,
-					recipientAmount: h[f].toString(),
-					args: e,
-					accounts: m,
-					adminData: _,
-					commitmentValidationData: t,
-					displayRecipient: S?.[f],
-					destinationChainId: C?.chainId,
-					destinationTokenAddress: C?.tokenAddress,
-					destinationTokenAmount: C?.tokenAmounts?.[f]
-				};
-			}
-			let { compressedAddress: v } = s(t), x = new o({
+				mint: C === "11111111111111111111111111111111" ? void 0 : C
+			}, h = await k(i, c, m[d], u), g = b(v, i, [C], [m[d]], await r.getEthereumAddress()), { compressedAddress: _ } = s(t), y = new o({
 				amount: 0n,
-				mintAddress: w,
-				erc20TokenAddress: v,
-				nullifyingKey: c.userKeys.getShieldedPrivateKey(),
-				timeStamp: k,
-				spendingPublicKey: c.userKeys.getSpendingKeyPair().pubSpendingBJJPoint
-			}), T = [a, x], E = [x], D = i.findCorrectRandomization(r(31), c.userKeys.getShieldedPrivateKey()), N = {
-				tokenNumber: 1,
-				nullifierAmount: T.length,
-				outputAmount: E.length
-			}, { proofAArr: P, proofBArr: F, proofCArr: I, publicInputsArr: L, commitmentValidationData: z, rootHashHinkalIndex: B, encryptedOutputs: V } = await M(c.merkleTreeHinkalByChain[l], c.userKeys, [w], [T], [E], D, g.flatFee, g.variableRate, n, O, N, void 0, l);
+				mintAddress: C,
+				erc20TokenAddress: _,
+				nullifyingKey: r.userKeys.getShieldedPrivateKey(),
+				timeStamp: O,
+				spendingPublicKey: r.userKeys.getSpendingKeyPair().pubSpendingBJJPoint
+			}), { args: w, commitmentValidationData: T } = await j(r, {
+				chainId: i,
+				mintAddresses: [C],
+				amountChanges: [-a.amount],
+				relayAddress: D,
+				recipient: n,
+				signer: D,
+				functionName: "transact",
+				accounts: p,
+				relayerFee: h.flatFee,
+				variableRate: h.variableRate,
+				inputUtxos: [[a, y]],
+				useBlockedUtxos: !0,
+				submit: { mode: f.ProofOnly }
+			});
 			return {
-				relayAddress: O,
+				relayAddress: D,
 				functionName: "transact",
-				chainId: l,
-				recipientAmount: h[f].toString(),
-				args: {
-					proofAArr: P,
-					proofBArr: F,
-					proofCArr: I,
-					publicInputsArr: L,
-					encryptedOutputs: V,
-					relayerFee: g.flatFee.toString(),
-					dimensions: N,
-					rootHashIndex: B.toString()
-				},
-				accounts: m,
-				adminData: _,
-				commitmentValidationData: z,
-				displayRecipient: S?.[f],
-				destinationChainId: C?.chainId,
-				destinationTokenAddress: C?.tokenAddress,
-				destinationTokenAmount: C?.tokenAmounts?.[f]
+				chainId: i,
+				recipientAmount: m[d].toString(),
+				args: w,
+				accounts: p,
+				adminData: g,
+				commitmentValidationData: T,
+				displayRecipient: x?.[d],
+				destinationChainId: S?.chainId,
+				destinationTokenAddress: S?.tokenAddress,
+				destinationTokenAmount: S?.tokenAmounts?.[d]
 			};
 		}));
-		P.push(...a);
+		M.push(...a);
 	}
-	await D({
-		id: g,
-		chainId: l,
-		hashedEthereumAddress: m,
+	await E({
+		id: h,
+		chainId: i,
+		hashedEthereumAddress: p,
 		phase: d.BEFORE_SCHEDULE_WITHDRAW
 	});
-	let F = await T(l, P, m, _, v, x);
-	return await D({
-		id: g,
-		chainId: l,
-		hashedEthereumAddress: m,
+	let N = await w(i, M, p, g, _, y);
+	return await E({
+		id: h,
+		chainId: i,
+		hashedEthereumAddress: p,
 		phase: d.AFTER_SCHEDULE_WITHDRAW,
-		scheduleId: F
-	}), F;
-}, B = async (e, t, n, r, i, a, o, s, d, p, m) => {
-	let h = f([t]), g = t.erc20TokenAddress, _ = c(await e.getEthereumAddressByChain(h)), v = d ? l(d) : void 0, y = a ?? await C(h, g, [g], u.Transact, [], 5n, {
+		scheduleId: N
+	}), N;
+}, R = async (e, t, n, r, i, a, o, s, d, f, m) => {
+	let h = p([t]), g = t.erc20TokenAddress, _ = c(await e.getEthereumAddressByChain(h)), v = d ? l(d) : void 0, y = a ?? await S(h, g, [g], u.Transact, [], 5n, {
 		mintTo: g,
 		recipient: r[0],
 		nullifierCount: 1
-	}), { userDepositedUtxos: b, depositTxHash: x, statusId: S } = await L(e, h, t, n, r, y, _);
-	return await w(e, h, b), {
+	}), { userDepositedUtxos: b, depositTxHash: x, statusId: w } = await I(e, h, t, n, r, y, _);
+	return await C(e, h, b), {
 		depositTxHash: x,
-		scheduleId: await z(e, h, t, b, y, _, n, S, i, o, s, v, p, m)
+		scheduleId: await L(e, h, t, b, y, _, n, w, i, o, s, v, f, m)
 	};
 };
 //#endregion
-export { B as hinkalSolanaDepositAndWithdraw };
+export { R as hinkalSolanaDepositAndWithdraw };

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

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