@kapa123456789/sdk 0.0.68 → 0.0.70

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

@@ -1 +1 @@
-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;
+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 console.log(`url`,i),i?o(i,n[t.DEVELOPMENT])?t.DEVELOPMENT:o(i,n[t.PLAYGROUND])?t.PLAYGROUND:o(i,n[t.STAGING])?t.STAGING:(console.log(`returning production`),t.PRODUCTION):t.PRODUCTION})(),l=c===t.DEVELOPMENT,u=c===t.PLAYGROUND,d=c===t.STAGING,f=d||l||u;console.log(`navigator`,navigator),console.log(`navigator.product`,navigator.product);var p=typeof navigator<`u`&&navigator.product===`ReactNative`;console.log(`isReactNative`,p);var 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

@@ -20,7 +20,11 @@ var c = () => (e("dotenv").config({ path: "DOTENV_OVERRIDE" in process.env ? pro
 	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;
+	return console.log("url", e), e ? s(e, r[n.DEVELOPMENT]) ? n.DEVELOPMENT : s(e, r[n.PLAYGROUND]) ? n.PLAYGROUND : s(e, r[n.STAGING]) ? n.STAGING : (console.log("returning production"), n.PRODUCTION) : n.PRODUCTION;
+})(), u = l === n.DEVELOPMENT, d = l === n.PLAYGROUND, f = l === n.STAGING, p = f || u || d;
+console.log("navigator", navigator), console.log("navigator.product", navigator.product);
+var m = typeof navigator < "u" && navigator.product === "ReactNative";
+console.log("isReactNative", m);
+var h = p || i && l === n.PRODUCTION;
 //#endregion
 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/BabyJubRN.cjs

@@ -0,0 +1 @@
+const e=require(`../constants/protocol.constants.cjs`),t=require(`../functions/utils/bigint-math.utils.cjs`);var n=e.CIRCOM_P,r={p:n,zero:0n,one:1n,e:e=>t.mod(BigInt(e)),add:(e,n)=>t.mod(e+n),sub:(e,n)=>t.mod(e-n),mul:(e,n)=>t.mod(e*n),div:(e,r)=>{if(r===0n)throw Error(`Division by zero in BabyJub field`);return t.mod(e*t.modpow(r,n-2n,n))},toString:e=>t.mod(e).toString()},i=class{F=r;A=r.e(`168700`);D=r.e(`168696`);Base8=[r.e(`5299619240641551281634865583518297030282874472190772894086521144482721001553`),r.e(`16950150798460657717958625567821834550301663161624707787222815936182638968203`)];addPoint(e,t){let n=r.mul(e[0],t[1]),i=r.mul(e[1],t[0]),a=r.mul(r.sub(e[1],r.mul(this.A,e[0])),r.add(t[0],t[1])),o=r.mul(n,i),s=r.mul(this.D,o);return[r.div(r.add(n,i),r.add(r.one,s)),r.div(r.add(a,r.sub(r.mul(this.A,n),i)),r.sub(r.one,s))]}mulPointEscalar(e,t){let n=[r.zero,r.one],i=BigInt(t),a=e;for(;i!==0n;)i%2n==1n&&(n=this.addPoint(n,a)),a=this.addPoint(a,a),i/=2n;return n}};exports.BabyJubRN=i;

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

@@ -0,0 +1,18 @@
+export declare class BabyJubRN {
+    F: {
+        p: bigint;
+        zero: bigint;
+        one: bigint;
+        e: (v: bigint | number | string) => bigint;
+        add: (a: bigint, b: bigint) => bigint;
+        sub: (a: bigint, b: bigint) => bigint;
+        mul: (a: bigint, b: bigint) => bigint;
+        div: (a: bigint, b: bigint) => bigint;
+        toString: (a: bigint) => string;
+    };
+    A: bigint;
+    D: bigint;
+    Base8: [bigint, bigint];
+    addPoint(a: [bigint, bigint], b: [bigint, bigint]): [bigint, bigint];
+    mulPointEscalar(base: [bigint, bigint], e: bigint | number | string): [bigint, bigint];
+}

package/common/src/crypto/BabyJubRN.mjs

@@ -0,0 +1,33 @@
+import { CIRCOM_P as e } from "../constants/protocol.constants.mjs";
+import { mod as t, modpow as n } from "../functions/utils/bigint-math.utils.mjs";
+//#region libs/shared/common/src/crypto/BabyJubRN.ts
+var r = e, i = {
+	p: r,
+	zero: 0n,
+	one: 1n,
+	e: (e) => t(BigInt(e)),
+	add: (e, n) => t(e + n),
+	sub: (e, n) => t(e - n),
+	mul: (e, n) => t(e * n),
+	div: (e, i) => {
+		if (i === 0n) throw Error("Division by zero in BabyJub field");
+		return t(e * n(i, r - 2n, r));
+	},
+	toString: (e) => t(e).toString()
+}, a = class {
+	F = i;
+	A = i.e("168700");
+	D = i.e("168696");
+	Base8 = [i.e("5299619240641551281634865583518297030282874472190772894086521144482721001553"), i.e("16950150798460657717958625567821834550301663161624707787222815936182638968203")];
+	addPoint(e, t) {
+		let n = i.mul(e[0], t[1]), r = i.mul(e[1], t[0]), a = i.mul(i.sub(e[1], i.mul(this.A, e[0])), i.add(t[0], t[1])), o = i.mul(n, r), s = i.mul(this.D, o);
+		return [i.div(i.add(n, r), i.add(i.one, s)), i.div(i.add(a, i.sub(i.mul(this.A, n), r)), i.sub(i.one, s))];
+	}
+	mulPointEscalar(e, t) {
+		let n = [i.zero, i.one], r = BigInt(t), a = e;
+		for (; r !== 0n;) r % 2n == 1n && (n = this.addPoint(n, a)), a = this.addPoint(a, a), r /= 2n;
+		return n;
+	}
+};
+//#endregion
+export { a as BabyJubRN };

package/common/src/crypto/babyJub.cjs

@@ -1 +1 @@
-require(`../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../constants/vite.constants.cjs`);let t=require(`circomlibjs-hinkal-fork`);var n=BigInt(`21888242871839275222246405745257275088548364400416034343698204186575808495617`),r=(e,t,n)=>{let r=1n,i=(e%n+n)%n,a=t;for(;a>0n;)a%2n==1n&&(r=r*i%n),a/=2n,i=i*i%n;return r},i={p:n,zero:0n,one:1n,e:e=>(BigInt(e)%n+n)%n,add:(e,t)=>(e+t)%n,sub:(e,t)=>((e-t)%n+n)%n,mul:(e,t)=>e*t%n,div:(e,t)=>e*r(t,n-2n,n)%n,toString:e=>BigInt(e).toString()},a=class{F=i;A=i.e(`168700`);D=i.e(`168696`);Base8=[i.e(`5299619240641551281634865583518297030282874472190772894086521144482721001553`),i.e(`16950150798460657717958625567821834550301663161624707787222815936182638968203`)];addPoint(e,t){let n=i.mul(e[0],t[1]),r=i.mul(e[1],t[0]),a=i.mul(i.sub(e[1],i.mul(this.A,e[0])),i.add(t[0],t[1])),o=i.mul(n,r),s=i.mul(this.D,o);return[i.div(i.add(n,r),i.add(i.one,s)),i.div(i.add(a,i.sub(i.mul(this.A,n),r)),i.sub(i.one,s))]}mulPointEscalar(e,t){let n=[i.zero,i.one],r=BigInt(t),a=e;for(;r!==0n;)r%2n==1n&&(n=this.addPoint(n,a)),a=this.addPoint(a,a),r/=2n;return n}},o=new class{babyjub=void 0;async init(){this.babyjub||=(console.log(`JubHolder.init`,e.isReactNative),e.isReactNative?new a:await(0,t.buildBabyjub)())}getJub(){return this.babyjub}},s=()=>o.getJub();exports.babyJubInstance=s,exports.jubHolder=o;
+require(`../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../constants/vite.constants.cjs`),t=require(`./BabyJubRN.cjs`);let n=require(`circomlibjs-hinkal-fork`);var r=new class{babyjub=void 0;async init(){this.babyjub||=(console.log(`isReactNative JubHolder`,e.isReactNative),e.isReactNative?new t.BabyJubRN:await(0,n.buildBabyjub)())}getJub(){return this.babyjub}},i=()=>r.getJub();exports.babyJubInstance=i,exports.jubHolder=r;

package/common/src/crypto/babyJub.mjs

@@ -1,42 +1,14 @@
 import { isReactNative as e } from "../constants/vite.constants.mjs";
-import { buildBabyjub as t } from "circomlibjs-hinkal-fork";
-//#region libs/shared/common/src/crypto/babyJub.ts
-var n = BigInt("21888242871839275222246405745257275088548364400416034343698204186575808495617"), r = (e, t, n) => {
-	let r = 1n, i = (e % n + n) % n, a = t;
-	for (; a > 0n;) a % 2n == 1n && (r = r * i % n), a /= 2n, i = i * i % n;
-	return r;
-}, i = {
-	p: n,
-	zero: 0n,
-	one: 1n,
-	e: (e) => (BigInt(e) % n + n) % n,
-	add: (e, t) => (e + t) % n,
-	sub: (e, t) => ((e - t) % n + n) % n,
-	mul: (e, t) => e * t % n,
-	div: (e, t) => e * r(t, n - 2n, n) % n,
-	toString: (e) => BigInt(e).toString()
-}, a = class {
-	F = i;
-	A = i.e("168700");
-	D = i.e("168696");
-	Base8 = [i.e("5299619240641551281634865583518297030282874472190772894086521144482721001553"), i.e("16950150798460657717958625567821834550301663161624707787222815936182638968203")];
-	addPoint(e, t) {
-		let n = i.mul(e[0], t[1]), r = i.mul(e[1], t[0]), a = i.mul(i.sub(e[1], i.mul(this.A, e[0])), i.add(t[0], t[1])), o = i.mul(n, r), s = i.mul(this.D, o);
-		return [i.div(i.add(n, r), i.add(i.one, s)), i.div(i.add(a, i.sub(i.mul(this.A, n), r)), i.sub(i.one, s))];
-	}
-	mulPointEscalar(e, t) {
-		let n = [i.zero, i.one], r = BigInt(t), a = e;
-		for (; r !== 0n;) r % 2n == 1n && (n = this.addPoint(n, a)), a = this.addPoint(a, a), r /= 2n;
-		return n;
-	}
-}, o = new class {
+import { BabyJubRN as t } from "./BabyJubRN.mjs";
+import { buildBabyjub as n } from "circomlibjs-hinkal-fork";
+var r = new class {
 	babyjub = void 0;
 	async init() {
-		this.babyjub ||= (console.log("JubHolder.init", e), e ? new a() : await t());
+		this.babyjub ||= (console.log("isReactNative JubHolder", e), e ? new t() : await n());
 	}
 	getJub() {
 		return this.babyjub;
 	}
-}(), s = () => o.getJub();
+}(), i = () => r.getJub();
 //#endregion
-export { s as babyJubInstance, o as jubHolder };
+export { i as babyJubInstance, r as jubHolder };

package/common/src/crypto/poseidon.cjs

@@ -1 +1 @@
-require(`../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../constants/vite.constants.cjs`),t=require(`../functions/utils/amounts.utils.cjs`);let n=require(`ethers`),r=require(`circomlibjs-hinkal-fork`);var i=()=>{console.log(`buildPoseidonRN`);let e=require(`poseidon-lite`),t=t=>{let n=e[`poseidon${t.length}`];if(!n)throw Error(`Poseidon: arity ${t.length} not supported (1..16)`);return n(t.map(e=>BigInt(e)))};return t.F={toString:e=>BigInt(e).toString()},t},a=new class{poseidon=void 0;async init(){this.poseidon||=(console.log(`PoseidonHolder.init`,e.isReactNative),e.isReactNative?i():await(0,r.buildPoseidon)())}getPoseidon(){return this.poseidon}};function o(...e){let n=a.getPoseidon();return t.toBigInt(n.F.toString(n(e)))}var s=(...e)=>{let t=a.getPoseidon();return n.ethers.toBeHex(t.F.toString(t([...e])))};exports.poseidonFunction=o,exports.poseidonHash=s,exports.poseidonHolder=a;
+const e=require(`../../../_virtual/_rolldown/runtime.cjs`),t=require(`../constants/vite.constants.cjs`),n=require(`../functions/utils/amounts.utils.cjs`);let r=require(`ethers`),i=require(`poseidon-lite`);i=e.__toESM(i);let a=require(`circomlibjs-hinkal-fork`);var o=()=>{let e=e=>{let t=i[`poseidon${e.length}`];if(!t)throw Error(`Poseidon: arity ${e.length} not supported (1..16)`);return t(e.map(e=>BigInt(e)))};return e.F={toString:e=>BigInt(e).toString()},e},s=new class{poseidon=void 0;async init(){this.poseidon||=(console.log(`isReactNative PoseidonHolder`,t.isReactNative),t.isReactNative?o():await(0,a.buildPoseidon)())}getPoseidon(){return this.poseidon}};function c(...e){let t=s.getPoseidon();return n.toBigInt(t.F.toString(t(e)))}var l=(...e)=>{let t=s.getPoseidon();return r.ethers.toBeHex(t.F.toString(t([...e])))};exports.poseidonFunction=c,exports.poseidonHash=l,exports.poseidonHolder=s;

package/common/src/crypto/poseidon.mjs

@@ -1,33 +1,32 @@
-import { __require as e } from "../../../_virtual/_rolldown/runtime.mjs";
-import { isReactNative as t } from "../constants/vite.constants.mjs";
-import { toBigInt as n } from "../functions/utils/amounts.utils.mjs";
-import { ethers as r } from "ethers";
+import { isReactNative as e } from "../constants/vite.constants.mjs";
+import { toBigInt as t } from "../functions/utils/amounts.utils.mjs";
+import { ethers as n } from "ethers";
+import * as r from "poseidon-lite";
 import { buildPoseidon as i } from "circomlibjs-hinkal-fork";
 //#region libs/shared/common/src/crypto/poseidon.ts
 var a = () => {
-	console.log("buildPoseidonRN");
-	let t = e("poseidon-lite"), n = (e) => {
-		let n = t[`poseidon${e.length}`];
-		if (!n) throw Error(`Poseidon: arity ${e.length} not supported (1..16)`);
-		return n(e.map((e) => BigInt(e)));
+	let e = (e) => {
+		let t = r[`poseidon${e.length}`];
+		if (!t) throw Error(`Poseidon: arity ${e.length} not supported (1..16)`);
+		return t(e.map((e) => BigInt(e)));
 	};
-	return n.F = { toString: (e) => BigInt(e).toString() }, n;
+	return e.F = { toString: (e) => BigInt(e).toString() }, e;
 }, o = new class {
 	poseidon = void 0;
 	async init() {
-		this.poseidon ||= (console.log("PoseidonHolder.init", t), t ? a() : await i());
+		this.poseidon ||= (console.log("isReactNative PoseidonHolder", e), e ? a() : await i());
 	}
 	getPoseidon() {
 		return this.poseidon;
 	}
 }();
 function s(...e) {
-	let t = o.getPoseidon();
-	return n(t.F.toString(t(e)));
+	let n = o.getPoseidon();
+	return t(n.F.toString(n(e)));
 }
 var c = (...e) => {
 	let t = o.getPoseidon();
-	return r.toBeHex(t.F.toString(t([...e])));
+	return n.toBeHex(t.F.toString(t([...e])));
 };
 //#endregion
 export { s as poseidonFunction, c as poseidonHash, o as poseidonHolder };

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

@@ -1 +1 @@
-const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../types/ethereum-network.types.cjs`),n=require(`../../types/admin.types.cjs`);require(`../../types/index.cjs`);const r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/utils/time.utils.cjs`),a=require(`../utxo/Utxo.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../functions/utils/token-check.utils.cjs`),c=require(`../../functions/web3/events/getShieldedBalance.cjs`),l=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),u=require(`../../functions/pre-transaction/constructAdminData.cjs`),d=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`),f=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),p=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`),m=require(`../../API/admin-calls.cjs`);var h=async(e,t,n,r)=>{let i=await e.getEthereumAddressByChain(t),{patchAccessTokenMerkleTree:a,signatureData:o}=await d.getKycAndSignatureData(e,t,n,r,i);return{signatureData:o,externalActionData:{externalActionId:0n,externalAddress:i,externalActionMetadata:`0x00`},contractTransaction:void 0,contractToApprove:void 0,patchAccessTokenMerkleTree:a}},g=async(e,t,n,r)=>{let a=[...await c.addPaddingToUtxos(e,t,n,r)],o=[],s=i.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=l.outputUtxoProcessing(e.userKeys,a[t],r[t],s);o.push(n)}return{inputUtxosArray:a,outputUtxosArray:o}},_=async(r,i,a,o=!0,c=!1)=>{console.log(`[hinkalDeposit] start`,{tokenCount:i.length,amountChanges:a,preEstimateGas:o,returnTxData:c});let l=s.validateAndGetChainId(i);console.log(`[hinkalDeposit] chainId`,l);let d=i.map(e=>e.erc20TokenAddress);console.log(`[hinkalDeposit] erc20Addresses`,d),console.log(`[hinkalDeposit] loading transaction parameters and utxos`);let[{externalActionData:_,contractTransaction:v,contractToApprove:y,patchAccessTokenMerkleTree:b,signatureData:x},{inputUtxosArray:S,outputUtxosArray:C}]=await Promise.all([h(r,l,d,a),g(r,l,d,a)]);console.log(`[hinkalDeposit] transaction parameters ready`,{externalActionData:_,hasContractTransaction:!!v,hasContractToApprove:!!y,hasPatchAccessTokenMerkleTree:!!b,hasSignatureData:!!x}),console.log(`[hinkalDeposit] utxos ready`,{inputUtxoGroups:S.length,outputUtxoGroups:C.length,inputUtxoSizes:S.map(e=>e.length),outputUtxoSizes:C.map(e=>e.length)});let w=`swapperM${a.length.toString()}x${S[0].length}x1`;console.log(`[hinkalDeposit] circuitName`,w),console.log(`[hinkalDeposit] constructing zk proof`);let{zkCallData:T,circomData:E,dimData:D}=await f.constructZkProof(r.merkleTreeHinkalByChain[l],r.merkleTreeAccessTokenByChain[l],S,C,r.userKeys,w,_.externalActionId,_.externalAddress,_.externalActionMetadata,r.generateProofRemotely,e.zeroAddress,l,void 0,void 0,void 0,b,void 0,void 0,r.getContractWithFetcher(l,t.ContractType.HinkalHelperContract),x);console.log(`[hinkalDeposit] zk proof ready`,{zkCallDataLength:T?.length,circomDataLength:Array.isArray(E)?E.length:void 0,dimDataLength:Array.isArray(D)?D.length:void 0}),console.log(`[hinkalDeposit] calling transactCallDirect`);let O=await p.transactCallDirect(r,l,a,i,T,E,D,y,v,o,c);console.log(`[hinkalDeposit] transactCallDirect result`,O),console.log(`[hinkalDeposit] constructing admin data`);let k=u.constructAdminData(n.AdminTransactionType.Onboarding,l,d,a,await r.getEthereumAddress());return console.log(`[hinkalDeposit] adminData`,k),console.log(`[hinkalDeposit] emitting public tx data`),m.emitTxPublicData(k),console.log(`[hinkalDeposit] complete`),O},v=async(i,c,l,d,g=!0,_=!1)=>{let v=s.validateAndGetChainId(c),y=c.map(e=>e.erc20TokenAddress),[b,x,S]=d.split(`,`);if(!o.isValidPrivateAddress(d))throw Error(r.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let C=y.map(e=>[new a.Utxo({amount:0n,erc20TokenAddress:e,shieldedPrivateKey:i.userKeys.getShieldedPrivateKey()}),new a.Utxo({amount:0n,erc20TokenAddress:e,shieldedPrivateKey:i.userKeys.getShieldedPrivateKey()})]),w=`swapperM${l.length.toString()}x${C[0].length}x1`,T=y.map((e,t)=>[new a.Utxo({amount:l[t],erc20TokenAddress:e,randomization:BigInt(b),stealthAddress:x,encryptionKey:S})]),{externalActionData:E,contractTransaction:D,contractToApprove:O,patchAccessTokenMerkleTree:k}=await h(i,v,y,l),{zkCallData:A,circomData:j,dimData:M}=await f.constructZkProof(i.merkleTreeHinkalByChain[v],i.merkleTreeAccessTokenByChain[v],C,T,i.userKeys,w,E.externalActionId,E.externalAddress,E.externalActionMetadata,i.generateProofRemotely,e.zeroAddress,v,void 0,void 0,void 0,k,void 0,void 0,i.getContractWithFetcher(v,t.ContractType.HinkalHelperContract)),N=await p.transactCallDirect(i,v,l,c,A,j,M,O,D,g,_);return m.emitTxPublicData(u.constructAdminData(n.AdminTransactionType.PaymentLink,v,y,l,await i.getEthereumAddress())),N};exports.hinkalDeposit=_,exports.hinkalDepositForOther=v;
+const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../types/ethereum-network.types.cjs`),n=require(`../../types/admin.types.cjs`);require(`../../types/index.cjs`);const r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/utils/time.utils.cjs`),a=require(`../utxo/Utxo.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../functions/utils/token-check.utils.cjs`),c=require(`../../functions/web3/events/getShieldedBalance.cjs`),l=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),u=require(`../../functions/pre-transaction/constructAdminData.cjs`),d=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`),f=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),p=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`),m=require(`../../API/admin-calls.cjs`);var h=async(e,t,n,r)=>{let i=await e.getEthereumAddressByChain(t),{patchAccessTokenMerkleTree:a,signatureData:o}=await d.getKycAndSignatureData(e,t,n,r,i);return{signatureData:o,externalActionData:{externalActionId:0n,externalAddress:i,externalActionMetadata:`0x00`},contractTransaction:void 0,contractToApprove:void 0,patchAccessTokenMerkleTree:a}},g=async(e,t,n,r)=>{let a=[...await c.addPaddingToUtxos(e,t,n,r)],o=[],s=i.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=l.outputUtxoProcessing(e.userKeys,a[t],r[t],s);o.push(n)}return{inputUtxosArray:a,outputUtxosArray:o}},_=async(r,i,a,o=!0,c=!1)=>{let l=s.validateAndGetChainId(i),d=i.map(e=>e.erc20TokenAddress),[{externalActionData:_,contractTransaction:v,contractToApprove:y,patchAccessTokenMerkleTree:b,signatureData:x},{inputUtxosArray:S,outputUtxosArray:C}]=await Promise.all([h(r,l,d,a),g(r,l,d,a)]),w=`swapperM${a.length.toString()}x${S[0].length}x1`,{zkCallData:T,circomData:E,dimData:D}=await f.constructZkProof(r.merkleTreeHinkalByChain[l],r.merkleTreeAccessTokenByChain[l],S,C,r.userKeys,w,_.externalActionId,_.externalAddress,_.externalActionMetadata,r.generateProofRemotely,e.zeroAddress,l,void 0,void 0,void 0,b,void 0,void 0,r.getContractWithFetcher(l,t.ContractType.HinkalHelperContract),x),O=await p.transactCallDirect(r,l,a,i,T,E,D,y,v,o,c);return m.emitTxPublicData(u.constructAdminData(n.AdminTransactionType.Onboarding,l,d,a,await r.getEthereumAddress())),O},v=async(i,c,l,d,g=!0,_=!1)=>{let v=s.validateAndGetChainId(c),y=c.map(e=>e.erc20TokenAddress),[b,x,S]=d.split(`,`);if(!o.isValidPrivateAddress(d))throw Error(r.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let C=y.map(e=>[new a.Utxo({amount:0n,erc20TokenAddress:e,shieldedPrivateKey:i.userKeys.getShieldedPrivateKey()}),new a.Utxo({amount:0n,erc20TokenAddress:e,shieldedPrivateKey:i.userKeys.getShieldedPrivateKey()})]),w=`swapperM${l.length.toString()}x${C[0].length}x1`,T=y.map((e,t)=>[new a.Utxo({amount:l[t],erc20TokenAddress:e,randomization:BigInt(b),stealthAddress:x,encryptionKey:S})]),{externalActionData:E,contractTransaction:D,contractToApprove:O,patchAccessTokenMerkleTree:k}=await h(i,v,y,l),{zkCallData:A,circomData:j,dimData:M}=await f.constructZkProof(i.merkleTreeHinkalByChain[v],i.merkleTreeAccessTokenByChain[v],C,T,i.userKeys,w,E.externalActionId,E.externalAddress,E.externalActionMetadata,i.generateProofRemotely,e.zeroAddress,v,void 0,void 0,void 0,k,void 0,void 0,i.getContractWithFetcher(v,t.ContractType.HinkalHelperContract)),N=await p.transactCallDirect(i,v,l,c,A,j,M,O,D,g,_);return m.emitTxPublicData(u.constructAdminData(n.AdminTransactionType.PaymentLink,v,y,l,await i.getEthereumAddress())),N};exports.hinkalDeposit=_,exports.hinkalDepositForOther=v;

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

@@ -39,41 +39,8 @@ var h = async (e, t, n, r) => {
 		outputUtxosArray: o
 	};
 }, _ = async (r, i, a, o = !0, c = !1) => {
-	console.log("[hinkalDeposit] start", {
-		tokenCount: i.length,
-		amountChanges: a,
-		preEstimateGas: o,
-		returnTxData: c
-	});
-	let l = s(i);
-	console.log("[hinkalDeposit] chainId", l);
-	let d = i.map((e) => e.erc20TokenAddress);
-	console.log("[hinkalDeposit] erc20Addresses", d), console.log("[hinkalDeposit] loading transaction parameters and utxos");
-	let [{ externalActionData: _, contractTransaction: v, contractToApprove: y, patchAccessTokenMerkleTree: b, signatureData: x }, { inputUtxosArray: S, outputUtxosArray: C }] = await Promise.all([h(r, l, d, a), g(r, l, d, a)]);
-	console.log("[hinkalDeposit] transaction parameters ready", {
-		externalActionData: _,
-		hasContractTransaction: !!v,
-		hasContractToApprove: !!y,
-		hasPatchAccessTokenMerkleTree: !!b,
-		hasSignatureData: !!x
-	}), console.log("[hinkalDeposit] utxos ready", {
-		inputUtxoGroups: S.length,
-		outputUtxoGroups: C.length,
-		inputUtxoSizes: S.map((e) => e.length),
-		outputUtxoSizes: C.map((e) => e.length)
-	});
-	let w = `swapperM${a.length.toString()}x${S[0].length}x1`;
-	console.log("[hinkalDeposit] circuitName", w), console.log("[hinkalDeposit] constructing zk proof");
-	let { zkCallData: T, circomData: E, dimData: D } = await f(r.merkleTreeHinkalByChain[l], r.merkleTreeAccessTokenByChain[l], S, C, r.userKeys, w, _.externalActionId, _.externalAddress, _.externalActionMetadata, r.generateProofRemotely, e, l, void 0, void 0, void 0, b, void 0, void 0, r.getContractWithFetcher(l, t.HinkalHelperContract), x);
-	console.log("[hinkalDeposit] zk proof ready", {
-		zkCallDataLength: T?.length,
-		circomDataLength: Array.isArray(E) ? E.length : void 0,
-		dimDataLength: Array.isArray(D) ? D.length : void 0
-	}), console.log("[hinkalDeposit] calling transactCallDirect");
-	let O = await p(r, l, a, i, T, E, D, y, v, o, c);
-	console.log("[hinkalDeposit] transactCallDirect result", O), console.log("[hinkalDeposit] constructing admin data");
-	let k = u(n.Onboarding, l, d, a, await r.getEthereumAddress());
-	return console.log("[hinkalDeposit] adminData", k), console.log("[hinkalDeposit] emitting public tx data"), m(k), console.log("[hinkalDeposit] complete"), O;
+	let l = s(i), d = i.map((e) => e.erc20TokenAddress), [{ externalActionData: _, contractTransaction: v, contractToApprove: y, patchAccessTokenMerkleTree: b, signatureData: x }, { inputUtxosArray: S, outputUtxosArray: C }] = await Promise.all([h(r, l, d, a), g(r, l, d, a)]), w = `swapperM${a.length.toString()}x${S[0].length}x1`, { zkCallData: T, circomData: E, dimData: D } = await f(r.merkleTreeHinkalByChain[l], r.merkleTreeAccessTokenByChain[l], S, C, r.userKeys, w, _.externalActionId, _.externalAddress, _.externalActionMetadata, r.generateProofRemotely, e, l, void 0, void 0, void 0, b, void 0, void 0, r.getContractWithFetcher(l, t.HinkalHelperContract), x), O = await p(r, l, a, i, T, E, D, y, v, o, c);
+	return m(u(n.Onboarding, l, d, a, await r.getEthereumAddress())), O;
 }, v = async (i, c, l, d, g = !0, _ = !1) => {
 	let v = s(c), y = c.map((e) => e.erc20TokenAddress), [b, x, S] = d.split(",");
 	if (!o(d)) throw Error(r.RECIPIENT_FORMAT_INCORRECT);

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

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/ethereum-network.types.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/web3/etherFunctions.cjs`),a=require(`../../functions/utils/caseInsensitive.utils.cjs`),o=require(`../utxo/Utxo.cjs`),s=require(`../../functions/utils/getContractAddress.cjs`),c=require(`../../functions/utils/tron.utils.cjs`),l=require(`../../error-handling/logger.cjs`),u=require(`../../functions/utils/token-check.utils.cjs`),d=require(`../../functions/snarkjs/common.snarkjs.cjs`),f=require(`../../functions/pre-transaction/constructAdminData.cjs`),p=require(`../../externalABIs/index.cjs`),m=require(`../../functions/utils/tx-confirmation.utils.cjs`),h=require(`../../functions/utils/tronSimulation.utils.cjs`),g=require(`../../functions/web3/functionCalls/waitForErc20Approvals.cjs`),_=require(`../../API/admin-calls.cjs`),v=require(`../../functions/web3/functionCalls/constructBatchCall.cjs`);var y=(e,t)=>{let n=[],r=0;for(let i=0;i<e.length;i+=1){let a=!1;for(let o=0;o<r;o+=1)if(u.isSameERC20Token(n[o].token,e[i])){n[o].balance+=t[i],a=!0;break}a||(n[r]={token:e[i],balance:t[i]},r+=1)}return n},b=async(e,r,i,o)=>{for(let s=0;s<o.length;s+=1)a.caseInsensitiveEqual(o[s].token.erc20TokenAddress,t.zeroAddress)||await m.waitForEthereumTransactionConfirmation(r,(await e.getContractWithSigner(r,n.ContractType.ERC20Contract,o[s].token.erc20TokenAddress).approve(i,o[s].balance)).hash)},x=async(e,n,r,i)=>{let a=Array.from(i.entries());for(let i=0;i<a.length;i+=1){let[o,s]=a[i],c=await e.contract(p.ERC20ABI,o).allowance(n,r).call({from:n});if(BigInt(String(c))<s){let{transaction:i}=await e.transactionBuilder.triggerSmartContract(o,`approve(address,uint256)`,{feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN},[{type:`address`,value:r},{type:`uint256`,value:s.toString()}],n),a=await e.trx.sign(i),c=await e.trx.sendRawTransaction(a);if(!c.result){let e=c.code??`UNKNOWN`,t=c.message?Buffer.from(c.message,`hex`).toString():`no message`;throw Error(`Tron token approval failed: ${e} - ${t}`)}}}},S=e=>{let t=new Set;e.forEach(({extraRandomization:e,stealthAddress:n})=>{let r=`${e.toString()}:${n.toString()}`;if(t.has(r))throw Error(`Duplicate randomization and stealth address pair detected in stealthAddressStructures`);t.add(r)})},C=async(n,i,o,s,u)=>{let d=n.getTronWeb(),{hinkalAddress:f}=e.networkRegistry[i].contractData,p=c.evmHexToTronBase58Address(f),m=await n.getEthereumAddressByChain(i),_=o.map(e=>e.erc20TokenAddress),v=o.map(()=>0n),y=0n,b=new Map;for(let e=0;e<o.length;e+=1){let n=c.evmHexToTronBase58Address(o[e].erc20TokenAddress);if(a.caseInsensitiveEqual(o[e].erc20TokenAddress,t.zeroAddress))y+=s[e];else{let t=b.get(n)??0n;b.set(n,t+s[e])}}await x(d,m,p,b),await g.waitForTronErc20Approvals(d,m,p,Array.from(b.entries()).map(([e,t])=>({tokenAddress:e,requiredAmount:t})));let S=u.map(e=>({extraRandomization:e.extraRandomization.toString(),stealthAddress:e.stealthAddress.toString(),H0:e.H0.toString(),H1:e.H1.toString()}));if(await h.simulateTronTransaction(i,p,`prooflessDeposit`,e.networkRegistry[i].contractData.hinkalABI,[_,s.map(String),v.map(String),u.map(e=>[e.extraRandomization.toString(),e.stealthAddress.toString(),e.H0.toString(),e.H1.toString()])],m,y>0n?y:void 0),y>0n){let n=BigInt(await d.trx.getBalance(m)),a=BigInt(t.TRON_DEFAULT_FEE_LIMIT_SUN);try{let{hinkalABI:t}=e.networkRegistry[i].contractData;if(!t)throw Error(`Hinkal ABI not found`);a=await c.estimateTronFeeSunWithPadding(d,i,p,m,c.createTronCallData(t,`prooflessDeposit`,[_,s.map(String),v.map(String),u.map(e=>[e.extraRandomization.toString(),e.stealthAddress.toString(),e.H0.toString(),e.H1.toString()])]),y)}catch(e){l.Logger.error(`Error estimating Tron prooflessDeposit fee`,e)}if(n<y+a)throw Error(r.insufficientResourcesErrorCodes.INSUFFICIENT_TRON_BALANCE_FOR_FEE)}let{transaction:C}=await d.transactionBuilder.triggerSmartContract(p,`prooflessDeposit(address[],uint256[],uint256[],(uint256,uint256,uint256,uint256)[])`,{feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN,callValue:y>0n?Number(y):0},[{type:`address[]`,value:_},{type:`uint256[]`,value:s.map(String)},{type:`uint256[]`,value:v.map(String)},{type:`tuple(uint256,uint256,uint256,uint256)[]`,value:S.map(e=>[e.extraRandomization,e.stealthAddress,e.H0,e.H1])}],m),w=await d.trx.sign(C),T=await d.trx.sendRawTransaction(w);if(!T.result)throw l.Logger.error(`Tron prooflessDeposit broadcast failed`,T),Error(`Tron prooflessDeposit broadcast failed`);let E=typeof T==`string`?T:T?.txid??T?.transaction?.txID;if(!E)throw Error(`Tron prooflessDeposit failed (missing txid)`);return E},w=async(r,c,l,p,m)=>{let h=u.validateAndGetChainId(c),x=e.isTronLike(h),w=await r.getEthereumAddressByChain(h),T=r.userKeys.getShieldedPrivateKey(),E=p??c.map(()=>d.calcStealthAddressStructure(o.Utxo.findCorrectRandomization(i.randomBigInt(31),T),T));if(E.length!==c.length)throw Error(`Stealth address structures length must be equal to erc20 tokens length`);S(E);let D;if(x)D=await C(r,h,c,l,E);else{let e=r.getContractWithSigner(h,n.ContractType.HinkalContract),i=r.getProviderAdapter(h),o=y(c,l),u=c.reduce((e,n,r)=>a.caseInsensitiveEqual(n.erc20TokenAddress,t.zeroAddress)?e+l[r]:e,0n),d=o.filter(({token:e,balance:n})=>!a.caseInsensitiveEqual(e.erc20TokenAddress,t.zeroAddress)&&n>0n),f;if(d.length>0&&await i.supportsBatchCall?.(h)&&i.sendBatchCallsTransaction){let t=v.buildApproveAndProoflessDepositCalls(d.map(({token:e})=>e.erc20TokenAddress),d.map(({balance:e})=>e),s.getContractAddress(e),e,c.map(({erc20TokenAddress:e})=>e),l,c.map(()=>0n),E,u);f=await i.sendBatchCallsTransaction(h,t)}else{await b(r,h,s.getContractAddress(e),o);let t=await r.getEthereumAddressByChain(h),n=o.map(({token:e,balance:t})=>({tokenAddress:e.erc20TokenAddress,requiredAmount:t}));await g.waitForErc20Approvals(r,h,t,s.getContractAddress(e),n),f=await e.prooflessDeposit(c.map(({erc20TokenAddress:e})=>e),l,c.map(()=>0n),E,{value:u>0n?u:void 0})}D=f.hash}return _.emitTxPublicData(f.constructAdminData(m,h,c.map(({erc20TokenAddress:e})=>e),l,w)),D};exports.hinkalProoflessDeposit=w;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/ethereum-network.types.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/web3/etherFunctions.cjs`),a=require(`../../functions/utils/caseInsensitive.utils.cjs`),o=require(`../utxo/Utxo.cjs`),s=require(`../../functions/utils/getContractAddress.cjs`),c=require(`../../functions/utils/tron.utils.cjs`),l=require(`../../error-handling/logger.cjs`),u=require(`../../functions/utils/token-check.utils.cjs`),d=require(`../../functions/snarkjs/common.snarkjs.cjs`),f=require(`../../functions/pre-transaction/constructAdminData.cjs`),p=require(`../../externalABIs/index.cjs`),m=require(`../../functions/utils/tx-confirmation.utils.cjs`),h=require(`../../functions/utils/tronSimulation.utils.cjs`),g=require(`../../functions/web3/functionCalls/constructBatchCall.cjs`),_=require(`../../functions/web3/functionCalls/waitForErc20Approvals.cjs`),v=require(`../../API/admin-calls.cjs`);var y=(e,t)=>{let n=[],r=0;for(let i=0;i<e.length;i+=1){let a=!1;for(let o=0;o<r;o+=1)if(u.isSameERC20Token(n[o].token,e[i])){n[o].balance+=t[i],a=!0;break}a||(n[r]={token:e[i],balance:t[i]},r+=1)}return n},b=async(e,r,i,o)=>{for(let s=0;s<o.length;s+=1)a.caseInsensitiveEqual(o[s].token.erc20TokenAddress,t.zeroAddress)||await m.waitForEthereumTransactionConfirmation(r,(await e.getContractWithSigner(r,n.ContractType.ERC20Contract,o[s].token.erc20TokenAddress).approve(i,o[s].balance)).hash)},x=async(e,n,r,i)=>{let a=Array.from(i.entries());for(let i=0;i<a.length;i+=1){let[o,s]=a[i],c=await e.contract(p.ERC20ABI,o).allowance(n,r).call({from:n});if(BigInt(String(c))<s){let{transaction:i}=await e.transactionBuilder.triggerSmartContract(o,`approve(address,uint256)`,{feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN},[{type:`address`,value:r},{type:`uint256`,value:s.toString()}],n),a=await e.trx.sign(i),c=await e.trx.sendRawTransaction(a);if(!c.result){let e=c.code??`UNKNOWN`,t=c.message?Buffer.from(c.message,`hex`).toString():`no message`;throw Error(`Tron token approval failed: ${e} - ${t}`)}}}},S=e=>{let t=new Set;e.forEach(({extraRandomization:e,stealthAddress:n})=>{let r=`${e.toString()}:${n.toString()}`;if(t.has(r))throw Error(`Duplicate randomization and stealth address pair detected in stealthAddressStructures`);t.add(r)})},C=async(n,i,o,s,u)=>{let d=n.getTronWeb(),{hinkalAddress:f}=e.networkRegistry[i].contractData,p=c.evmHexToTronBase58Address(f),m=await n.getEthereumAddressByChain(i),g=o.map(e=>e.erc20TokenAddress),v=o.map(()=>0n),y=0n,b=new Map;for(let e=0;e<o.length;e+=1){let n=c.evmHexToTronBase58Address(o[e].erc20TokenAddress);if(a.caseInsensitiveEqual(o[e].erc20TokenAddress,t.zeroAddress))y+=s[e];else{let t=b.get(n)??0n;b.set(n,t+s[e])}}await x(d,m,p,b),await _.waitForTronErc20Approvals(d,m,p,Array.from(b.entries()).map(([e,t])=>({tokenAddress:e,requiredAmount:t})));let S=u.map(e=>({extraRandomization:e.extraRandomization.toString(),stealthAddress:e.stealthAddress.toString(),H0:e.H0.toString(),H1:e.H1.toString()}));if(await h.simulateTronTransaction(i,p,`prooflessDeposit`,e.networkRegistry[i].contractData.hinkalABI,[g,s.map(String),v.map(String),u.map(e=>[e.extraRandomization.toString(),e.stealthAddress.toString(),e.H0.toString(),e.H1.toString()])],m,y>0n?y:void 0),y>0n){let n=BigInt(await d.trx.getBalance(m)),a=BigInt(t.TRON_DEFAULT_FEE_LIMIT_SUN);try{let{hinkalABI:t}=e.networkRegistry[i].contractData;if(!t)throw Error(`Hinkal ABI not found`);a=await c.estimateTronFeeSunWithPadding(d,i,p,m,c.createTronCallData(t,`prooflessDeposit`,[g,s.map(String),v.map(String),u.map(e=>[e.extraRandomization.toString(),e.stealthAddress.toString(),e.H0.toString(),e.H1.toString()])]),y)}catch(e){l.Logger.error(`Error estimating Tron prooflessDeposit fee`,e)}if(n<y+a)throw Error(r.insufficientResourcesErrorCodes.INSUFFICIENT_TRON_BALANCE_FOR_FEE)}let{transaction:C}=await d.transactionBuilder.triggerSmartContract(p,`prooflessDeposit(address[],uint256[],uint256[],(uint256,uint256,uint256,uint256)[])`,{feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN,callValue:y>0n?Number(y):0},[{type:`address[]`,value:g},{type:`uint256[]`,value:s.map(String)},{type:`uint256[]`,value:v.map(String)},{type:`tuple(uint256,uint256,uint256,uint256)[]`,value:S.map(e=>[e.extraRandomization,e.stealthAddress,e.H0,e.H1])}],m),w=await d.trx.sign(C),T=await d.trx.sendRawTransaction(w);if(!T.result)throw l.Logger.error(`Tron prooflessDeposit broadcast failed`,T),Error(`Tron prooflessDeposit broadcast failed`);let E=typeof T==`string`?T:T?.txid??T?.transaction?.txID;if(!E)throw Error(`Tron prooflessDeposit failed (missing txid)`);return E},w=async(r,c,l,p,m)=>{let h=u.validateAndGetChainId(c),x=e.isTronLike(h),w=await r.getEthereumAddressByChain(h),T=r.userKeys.getShieldedPrivateKey(),E=p??c.map(()=>d.calcStealthAddressStructure(o.Utxo.findCorrectRandomization(i.randomBigInt(31),T),T));if(E.length!==c.length)throw Error(`Stealth address structures length must be equal to erc20 tokens length`);S(E);let D;if(x)D=await C(r,h,c,l,E);else{let e=r.getContractWithSigner(h,n.ContractType.HinkalContract),i=r.getProviderAdapter(h),o=y(c,l),u=c.reduce((e,n,r)=>a.caseInsensitiveEqual(n.erc20TokenAddress,t.zeroAddress)?e+l[r]:e,0n),d=o.filter(({token:e,balance:n})=>!a.caseInsensitiveEqual(e.erc20TokenAddress,t.zeroAddress)&&n>0n),f;if(d.length>0&&await i.supportsBatchCall?.(h)&&i.sendBatchCallsTransaction){let t=g.buildApproveAndProoflessDepositCalls(d.map(({token:e})=>e.erc20TokenAddress),d.map(({balance:e})=>e),s.getContractAddress(e),e,c.map(({erc20TokenAddress:e})=>e),l,c.map(()=>0n),E,u);f=await i.sendBatchCallsTransaction(h,t)}else{await b(r,h,s.getContractAddress(e),o);let t=await r.getEthereumAddressByChain(h),n=o.map(({token:e,balance:t})=>({tokenAddress:e.erc20TokenAddress,requiredAmount:t}));await _.waitForErc20Approvals(r,h,t,s.getContractAddress(e),n),f=await e.prooflessDeposit(c.map(({erc20TokenAddress:e})=>e),l,c.map(()=>0n),E,{value:u>0n?u:void 0})}D=f.hash}return v.emitTxPublicData(f.constructAdminData(m,h,c.map(({erc20TokenAddress:e})=>e),l,w)),D};exports.hinkalProoflessDeposit=w;

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

@@ -14,9 +14,9 @@ import { constructAdminData as _ } from "../../functions/pre-transaction/constru
 import { ERC20ABI as v } from "../../externalABIs/index.mjs";
 import { waitForEthereumTransactionConfirmation as y } from "../../functions/utils/tx-confirmation.utils.mjs";
 import { simulateTronTransaction as b } from "../../functions/utils/tronSimulation.utils.mjs";
-import { waitForErc20Approvals as x, waitForTronErc20Approvals as S } from "../../functions/web3/functionCalls/waitForErc20Approvals.mjs";
-import { emitTxPublicData as C } from "../../API/admin-calls.mjs";
-import { buildApproveAndProoflessDepositCalls as w } from "../../functions/web3/functionCalls/constructBatchCall.mjs";
+import { buildApproveAndProoflessDepositCalls as x } from "../../functions/web3/functionCalls/constructBatchCall.mjs";
+import { waitForErc20Approvals as S, waitForTronErc20Approvals as C } from "../../functions/web3/functionCalls/waitForErc20Approvals.mjs";
+import { emitTxPublicData as w } from "../../API/admin-calls.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalProoflessDeposit.ts
 var T = (e, t) => {
 	let n = [], r = 0;
@@ -60,16 +60,16 @@ var T = (e, t) => {
 		t.add(r);
 	});
 }, k = async (e, i, o, c, l) => {
-	let m = e.getTronWeb(), { hinkalAddress: h } = t[i].contractData, g = f(h), _ = await e.getEthereumAddressByChain(i), v = o.map((e) => e.erc20TokenAddress), y = o.map(() => 0n), x = 0n, C = /* @__PURE__ */ new Map();
+	let m = e.getTronWeb(), { hinkalAddress: h } = t[i].contractData, g = f(h), _ = await e.getEthereumAddressByChain(i), v = o.map((e) => e.erc20TokenAddress), y = o.map(() => 0n), x = 0n, S = /* @__PURE__ */ new Map();
 	for (let e = 0; e < o.length; e += 1) {
 		let t = f(o[e].erc20TokenAddress);
 		if (s(o[e].erc20TokenAddress, r)) x += c[e];
 		else {
-			let n = C.get(t) ?? 0n;
-			C.set(t, n + c[e]);
+			let n = S.get(t) ?? 0n;
+			S.set(t, n + c[e]);
 		}
 	}
-	await D(m, _, g, C), await S(m, _, g, Array.from(C.entries()).map(([e, t]) => ({
+	await D(m, _, g, S), await C(m, _, g, Array.from(S.entries()).map(([e, t]) => ({
 		tokenAddress: e,
 		requiredAmount: t
 	})));
@@ -149,7 +149,7 @@ var T = (e, t) => {
 	else {
 		let e = t.getContractWithSigner(f, i.HinkalContract), o = t.getProviderAdapter(f), c = T(n, a), u = n.reduce((e, t, n) => s(t.erc20TokenAddress, r) ? e + a[n] : e, 0n), d = c.filter(({ token: e, balance: t }) => !s(e.erc20TokenAddress, r) && t > 0n), p;
 		if (d.length > 0 && await o.supportsBatchCall?.(f) && o.sendBatchCallsTransaction) {
-			let t = w(d.map(({ token: e }) => e.erc20TokenAddress), d.map(({ balance: e }) => e), l(e), e, n.map(({ erc20TokenAddress: e }) => e), a, n.map(() => 0n), y, u);
+			let t = x(d.map(({ token: e }) => e.erc20TokenAddress), d.map(({ balance: e }) => e), l(e), e, n.map(({ erc20TokenAddress: e }) => e), a, n.map(() => 0n), y, u);
 			p = await o.sendBatchCallsTransaction(f, t);
 		} else {
 			await E(t, f, l(e), c);
@@ -157,11 +157,11 @@ var T = (e, t) => {
 				tokenAddress: e.erc20TokenAddress,
 				requiredAmount: t
 			}));
-			await x(t, f, r, l(e), i), p = await e.prooflessDeposit(n.map(({ erc20TokenAddress: e }) => e), a, n.map(() => 0n), y, { value: u > 0n ? u : void 0 });
+			await S(t, f, r, l(e), i), p = await e.prooflessDeposit(n.map(({ erc20TokenAddress: e }) => e), a, n.map(() => 0n), y, { value: u > 0n ? u : void 0 });
 		}
 		b = p.hash;
 	}
-	return C(_(d, f, n.map(({ erc20TokenAddress: e }) => e), a, m)), b;
+	return w(_(d, f, n.map(({ erc20TokenAddress: e }) => e), a, m)), b;
 };
 //#endregion
 export { A as hinkalProoflessDeposit };

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

@@ -1 +1 @@
-require(`../../constants/protocol.constants.cjs`);const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../functions/utils/time.utils.cjs`),r=require(`../../functions/utils/token-check.utils.cjs`),i=require(`../../functions/web3/events/getShieldedBalance.cjs`),a=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),o=require(`../../functions/pre-transaction/constructAdminData.cjs`),s=require(`../../functions/pre-transaction/getFeeStructure.cjs`),c=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`),l=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const u=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),d=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),f=require(`../../functions/pre-transaction/getExternalSwapAddress.cjs`),p=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var m=async(e,t,r,o)=>{let s=[...await i.addPaddingToUtxos(e,t,r,o)],c=[],l=n.getCurrentTimeInSeconds().toString();for(let t=0;t<r.length;t+=1){let{outputUtxos:n}=a.outputUtxoProcessing(e.userKeys,s[t],o[t],l);c.push(n)}return{inputUtxosArray:s,outputUtxosArray:c}},h=async(n,i,a,h,g,_,v,y)=>{console.log(`[hinkalSwap] start`,{tokenCount:i.length,deltaAmounts:a,externalActionId:h,data:g,feeToken:_,hasFeeStructureOverride:!!v,action:y});let b=r.validateAndGetChainId(i);console.log(`[hinkalSwap] chainId`,b);let x=i.map(e=>e.erc20TokenAddress);console.log(`[hinkalSwap] erc20Addresses`,x);let S=await n.getEthereumAddressByChain(b);console.log(`[hinkalSwap] ethereumAddress`,S),console.log(`[hinkalSwap] resolving fee structure`);let C=v??await s.getFeeStructure(b,_,x,h,void 0,35n);console.log(`[hinkalSwap] feeStructure`,C),p.mergeWithFeeStructure(b,x,a,C),console.log(`[hinkalSwap] deltaAmounts after fee merge`,a);let w=f.getExternalSwapAddress(b,h);console.log(`[hinkalSwap] externalAddress`,w);let T={externalActionId:h,externalAddress:w,externalActionMetadata:g};console.log(`[hinkalSwap] externalActionData`,T),console.log(`[hinkalSwap] loading relay, kyc data, and utxos`);let[E,{patchAccessTokenMerkleTree:D,signatureData:O},{inputUtxosArray:k,outputUtxosArray:A}]=await Promise.all([n.getRandomRelay(b,!0),c.getKycAndSignatureData(n,b,x,a,S),m(n,b,x,a)]);if(console.log(`[hinkalSwap] relay and proof inputs ready`,{relay:E,hasPatchAccessTokenMerkleTree:!!D,hasSignatureData:!!O,inputUtxoGroups:k.length,outputUtxoGroups:A.length,inputUtxoSizes:k.map(e=>e.length),outputUtxoSizes:A.map(e=>e.length)}),!E)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let j=`swapperM${a.length.toString()}x${k[0].length}x1`;console.log(`[hinkalSwap] circuitName`,j);let M=[!1,!0,!1].slice(0,a.length);console.log(`[hinkalSwap] onChainCreation`,M),console.log(`[hinkalSwap] constructing zk proof and commitment validation data`);let[{zkCallData:N,circomData:P,dimData:F},I]=await Promise.all([u.constructZkProof(n.merkleTreeHinkalByChain[b],n.merkleTreeAccessTokenByChain[b],k,A,n.userKeys,j,T.externalActionId,T.externalAddress,T.externalActionMetadata,n.generateProofRemotely,E,b,M,void 0,void 0,D,void 0,C,n.getContractWithFetcher(b,e.ContractType.HinkalHelperContract),O),l.buildCommitmentValidationData(b,n.userKeys,x,k)]);console.log(`[hinkalSwap] proof data ready`,{zkCallDataLength:N?.length,circomDataLength:Array.isArray(P)?P.length:void 0,dimDataLength:Array.isArray(F)?F.length:void 0,commitmentValidationData:I});let L=o.constructAdminData(y,b,x,a,S,i);console.log(`[hinkalSwap] adminData`,L),console.log(`[hinkalSwap] calling transactCallRelayer`);let R=await d.transactCallRelayer(b,N,F,P,I,void 0,void 0,L);return console.log(`[hinkalSwap] txHash`,R),R};exports.hinkalSwap=h;
+require(`../../constants/protocol.constants.cjs`);const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../functions/utils/time.utils.cjs`),r=require(`../../functions/utils/token-check.utils.cjs`),i=require(`../../functions/web3/events/getShieldedBalance.cjs`),a=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),o=require(`../../functions/pre-transaction/constructAdminData.cjs`),s=require(`../../functions/pre-transaction/getFeeStructure.cjs`),c=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`),l=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const u=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),d=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),f=require(`../../functions/pre-transaction/getExternalSwapAddress.cjs`),p=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var m=async(e,t,r,o)=>{let s=[...await i.addPaddingToUtxos(e,t,r,o)],c=[],l=n.getCurrentTimeInSeconds().toString();for(let t=0;t<r.length;t+=1){let{outputUtxos:n}=a.outputUtxoProcessing(e.userKeys,s[t],o[t],l);c.push(n)}return{inputUtxosArray:s,outputUtxosArray:c}},h=async(n,i,a,h,g,_,v,y)=>{let b=r.validateAndGetChainId(i),x=i.map(e=>e.erc20TokenAddress),S=await n.getEthereumAddressByChain(b),C=v??await s.getFeeStructure(b,_,x,h,void 0,35n);p.mergeWithFeeStructure(b,x,a,C);let w={externalActionId:h,externalAddress:f.getExternalSwapAddress(b,h),externalActionMetadata:g},[T,{patchAccessTokenMerkleTree:E,signatureData:D},{inputUtxosArray:O,outputUtxosArray:k}]=await Promise.all([n.getRandomRelay(b,!0),c.getKycAndSignatureData(n,b,x,a,S),m(n,b,x,a)]);if(!T)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let A=`swapperM${a.length.toString()}x${O[0].length}x1`,j=[!1,!0,!1].slice(0,a.length),[{zkCallData:M,circomData:N,dimData:P},F]=await Promise.all([u.constructZkProof(n.merkleTreeHinkalByChain[b],n.merkleTreeAccessTokenByChain[b],O,k,n.userKeys,A,w.externalActionId,w.externalAddress,w.externalActionMetadata,n.generateProofRemotely,T,b,j,void 0,void 0,E,void 0,C,n.getContractWithFetcher(b,e.ContractType.HinkalHelperContract),D),l.buildCommitmentValidationData(b,n.userKeys,x,O)]);return await d.transactCallRelayer(b,M,P,N,F,void 0,void 0,o.constructAdminData(y,b,x,a,S,i))};exports.hinkalSwap=h;

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

@@ -26,64 +26,24 @@ var m = async (e, t, r, o) => {
 		outputUtxosArray: c
 	};
 }, h = async (n, i, a, h, g, _, v, y) => {
-	console.log("[hinkalSwap] start", {
-		tokenCount: i.length,
-		deltaAmounts: a,
+	let b = r(i), x = i.map((e) => e.erc20TokenAddress), S = await n.getEthereumAddressByChain(b), C = v ?? await s(b, _, x, h, void 0, 35n);
+	p(b, x, a, C);
+	let w = {
 		externalActionId: h,
-		data: g,
-		feeToken: _,
-		hasFeeStructureOverride: !!v,
-		action: y
-	});
-	let b = r(i);
-	console.log("[hinkalSwap] chainId", b);
-	let x = i.map((e) => e.erc20TokenAddress);
-	console.log("[hinkalSwap] erc20Addresses", x);
-	let S = await n.getEthereumAddressByChain(b);
-	console.log("[hinkalSwap] ethereumAddress", S), console.log("[hinkalSwap] resolving fee structure");
-	let C = v ?? await s(b, _, x, h, void 0, 35n);
-	console.log("[hinkalSwap] feeStructure", C), p(b, x, a, C), console.log("[hinkalSwap] deltaAmounts after fee merge", a);
-	let w = f(b, h);
-	console.log("[hinkalSwap] externalAddress", w);
-	let T = {
-		externalActionId: h,
-		externalAddress: w,
+		externalAddress: f(b, h),
 		externalActionMetadata: g
-	};
-	console.log("[hinkalSwap] externalActionData", T), console.log("[hinkalSwap] loading relay, kyc data, and utxos");
-	let [E, { patchAccessTokenMerkleTree: D, signatureData: O }, { inputUtxosArray: k, outputUtxosArray: A }] = await Promise.all([
+	}, [T, { patchAccessTokenMerkleTree: E, signatureData: D }, { inputUtxosArray: O, outputUtxosArray: k }] = await Promise.all([
 		n.getRandomRelay(b, !0),
 		c(n, b, x, a, S),
 		m(n, b, x, a)
 	]);
-	if (console.log("[hinkalSwap] relay and proof inputs ready", {
-		relay: E,
-		hasPatchAccessTokenMerkleTree: !!D,
-		hasSignatureData: !!O,
-		inputUtxoGroups: k.length,
-		outputUtxoGroups: A.length,
-		inputUtxoSizes: k.map((e) => e.length),
-		outputUtxoSizes: A.map((e) => e.length)
-	}), !E) throw Error(t.RELAYER_NOT_AVAILABLE);
-	let j = `swapperM${a.length.toString()}x${k[0].length}x1`;
-	console.log("[hinkalSwap] circuitName", j);
-	let M = [
+	if (!T) throw Error(t.RELAYER_NOT_AVAILABLE);
+	let A = `swapperM${a.length.toString()}x${O[0].length}x1`, j = [
 		!1,
 		!0,
 		!1
-	].slice(0, a.length);
-	console.log("[hinkalSwap] onChainCreation", M), console.log("[hinkalSwap] constructing zk proof and commitment validation data");
-	let [{ zkCallData: N, circomData: P, dimData: F }, I] = await Promise.all([u(n.merkleTreeHinkalByChain[b], n.merkleTreeAccessTokenByChain[b], k, A, n.userKeys, j, T.externalActionId, T.externalAddress, T.externalActionMetadata, n.generateProofRemotely, E, b, M, void 0, void 0, D, void 0, C, n.getContractWithFetcher(b, e.HinkalHelperContract), O), l(b, n.userKeys, x, k)]);
-	console.log("[hinkalSwap] proof data ready", {
-		zkCallDataLength: N?.length,
-		circomDataLength: Array.isArray(P) ? P.length : void 0,
-		dimDataLength: Array.isArray(F) ? F.length : void 0,
-		commitmentValidationData: I
-	});
-	let L = o(y, b, x, a, S, i);
-	console.log("[hinkalSwap] adminData", L), console.log("[hinkalSwap] calling transactCallRelayer");
-	let R = await d(b, N, F, P, I, void 0, void 0, L);
-	return console.log("[hinkalSwap] txHash", R), R;
+	].slice(0, a.length), [{ zkCallData: M, circomData: N, dimData: P }, F] = await Promise.all([u(n.merkleTreeHinkalByChain[b], n.merkleTreeAccessTokenByChain[b], O, k, n.userKeys, A, w.externalActionId, w.externalAddress, w.externalActionMetadata, n.generateProofRemotely, T, b, j, void 0, void 0, E, void 0, C, n.getContractWithFetcher(b, e.HinkalHelperContract), D), l(b, n.userKeys, x, O)]);
+	return await d(b, M, P, N, F, void 0, void 0, o(y, b, x, a, S, i));
 };
 //#endregion
 export { h as hinkalSwap };

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

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/ethereum-network.types.cjs`),r=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../functions/utils/tron.utils.cjs`),c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/web3/events/getShieldedBalance.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),d=require(`../../functions/utils/fees.utils.cjs`),f=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),p=require(`../../functions/pre-transaction/constructAdminData.cjs`),m=require(`../../functions/pre-transaction/getFeeStructure.cjs`),h=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`),g=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const _=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),v=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),y=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var b=async(e,t,n,r,i,o)=>{let s=[...await l.addPaddingToUtxos(e,t,n,r)],c=[],d=a.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=u.outputUtxoProcessing(e.userKeys,s[t],r[t],d,void 0,!0,i,t===0?o:0n);c.push(n)}return{inputUtxosArray:s,outputUtxosArray:c}},x=async(a,l,u,x,S,C,w)=>{console.log(`[hinkalTransfer] start`,{tokenCount:l.length,amountChangesBase:u,recipientAddress:x,feeToken:S,hasFeeStructureOverride:!!C,action:w});let T=c.validateAndGetChainId(l);console.log(`[hinkalTransfer] chainId`,T);let E=e.isTronLike(T);if(console.log(`[hinkalTransfer] isTron`,E),!o.isValidPrivateAddress(x))throw console.log(`[hinkalTransfer] invalid recipientAddress`,x),Error(i.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);console.log(`[hinkalTransfer] recipientAddress validated`);let D=s.addressToHexFormat(await a.getEthereumAddressByChain(T));console.log(`[hinkalTransfer] ethereumAddress`,D);let O=l.map(e=>e.erc20TokenAddress);console.log(`[hinkalTransfer] erc20Addresses`,O);let k=await f.modifyVolatileTokenAmountChanges(T,l,u);console.log(`[hinkalTransfer] amountChanges`,k),console.log(`[hinkalTransfer] resolving fee structure`);let A=C??await m.getFeeStructure(T,S,O,r.ExternalActionId.Transact,[],5n);console.log(`[hinkalTransfer] feeStructure initial`,A),A.variableRate||=t.HINKAL_PRIVATE_SEND_VARIABLE_RATE,console.log(`[hinkalTransfer] feeStructure normalized`,A);let j=d.calculateTotalFee(-k[0],A);console.log(`[hinkalTransfer] totalFee`,j);let M=-k[0];console.log(`[hinkalTransfer] recipientAmount`,M);let N={feeToken:A.feeToken,flatFee:j,variableRate:0n};console.log(`[hinkalTransfer] transferFeeStructure`,N),y.mergeWithFeeStructure(T,O,k,N),console.log(`[hinkalTransfer] amountChanges after fee merge`,k);let P=l[0];if(console.log(`[hinkalTransfer] primary token`,P),!P)throw Error(`Transfer Action: No Token Found`);console.log(`[hinkalTransfer] loading relay, kyc data, and utxos`);let[F,{patchAccessTokenMerkleTree:I,signatureData:L},{inputUtxosArray:R,outputUtxosArray:z}]=await Promise.all([a.getRandomRelay(T,!0),h.getKycAndSignatureData(a,T,O,k,D),b(a,T,O,k,x,M)]);if(console.log(`[hinkalTransfer] relay and proof inputs ready`,{relay:F,hasPatchAccessTokenMerkleTree:!!I,hasSignatureData:!!L,inputUtxoGroups:R.length,outputUtxoGroups:z.length,inputUtxoSizes:R.map(e=>e.length),outputUtxoSizes:z.map(e=>e.length)}),!F)throw Error(i.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let B={externalActionId:0n,externalAddress:F,externalActionMetadata:`0x00`};console.log(`[hinkalTransfer] externalActionData`,B);let V=`swapperM${k.length}x${R[0].length}x2`;console.log(`[hinkalTransfer] circuitName`,V),console.log(`[hinkalTransfer] constructing zk proof and commitment validation data`);let[{zkCallData:H,circomData:U,dimData:W},G]=await Promise.all([_.constructZkProof(a.merkleTreeHinkalByChain[T],a.merkleTreeAccessTokenByChain[T],R,z,a.userKeys,V,B.externalActionId,B.externalAddress,B.externalActionMetadata,a.generateProofRemotely,F,T,void 0,void 0,void 0,I,void 0,N,a.getContractWithFetcher(T,n.ContractType.HinkalHelperContract),L),g.buildCommitmentValidationData(T,a.userKeys,O,R)]);console.log(`[hinkalTransfer] proof data ready`,{zkCallDataLength:H?.length,circomDataLength:Array.isArray(U)?U.length:void 0,dimDataLength:Array.isArray(W)?W.length:void 0,commitmentValidationData:G});let K=await s.reorderZkCallData(E,H,W,U);console.log(`[hinkalTransfer] tronProofSignature`,K);let q=p.constructAdminData(w,T,O,k,D);console.log(`[hinkalTransfer] adminData`,q),console.log(`[hinkalTransfer] calling transactCallRelayer`);let J=await v.transactCallRelayer(T,H,W,U,G,void 0,void 0,q,K);return console.log(`[hinkalTransfer] txHash`,J),J};exports.hinkalTransfer=x;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/ethereum-network.types.cjs`),r=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../functions/utils/tron.utils.cjs`),c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/web3/events/getShieldedBalance.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),d=require(`../../functions/utils/fees.utils.cjs`),f=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),p=require(`../../functions/pre-transaction/constructAdminData.cjs`),m=require(`../../functions/pre-transaction/getFeeStructure.cjs`),h=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`),g=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const _=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),v=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),y=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var b=async(e,t,n,r,i,o)=>{let s=[...await l.addPaddingToUtxos(e,t,n,r)],c=[],d=a.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=u.outputUtxoProcessing(e.userKeys,s[t],r[t],d,void 0,!0,i,t===0?o:0n);c.push(n)}return{inputUtxosArray:s,outputUtxosArray:c}},x=async(a,l,u,x,S,C,w)=>{let T=c.validateAndGetChainId(l),E=e.isTronLike(T);if(!o.isValidPrivateAddress(x))throw Error(i.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let D=s.addressToHexFormat(await a.getEthereumAddressByChain(T)),O=l.map(e=>e.erc20TokenAddress),k=await f.modifyVolatileTokenAmountChanges(T,l,u),A=C??await m.getFeeStructure(T,S,O,r.ExternalActionId.Transact,[],5n);A.variableRate||=t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let j=d.calculateTotalFee(-k[0],A),M=-k[0],N={feeToken:A.feeToken,flatFee:j,variableRate:0n};if(y.mergeWithFeeStructure(T,O,k,N),!l[0])throw Error(`Transfer Action: No Token Found`);let[P,{patchAccessTokenMerkleTree:F,signatureData:I},{inputUtxosArray:L,outputUtxosArray:R}]=await Promise.all([a.getRandomRelay(T,!0),h.getKycAndSignatureData(a,T,O,k,D),b(a,T,O,k,x,M)]);if(!P)throw Error(i.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let z={externalActionId:0n,externalAddress:P,externalActionMetadata:`0x00`},B=`swapperM${k.length}x${L[0].length}x2`,[{zkCallData:V,circomData:H,dimData:U},W]=await Promise.all([_.constructZkProof(a.merkleTreeHinkalByChain[T],a.merkleTreeAccessTokenByChain[T],L,R,a.userKeys,B,z.externalActionId,z.externalAddress,z.externalActionMetadata,a.generateProofRemotely,P,T,void 0,void 0,void 0,F,void 0,N,a.getContractWithFetcher(T,n.ContractType.HinkalHelperContract),I),g.buildCommitmentValidationData(T,a.userKeys,O,L)]),G=await s.reorderZkCallData(E,V,U,H);return await v.transactCallRelayer(T,V,U,H,W,void 0,void 0,p.constructAdminData(w,T,O,k,D),G)};exports.hinkalTransfer=x;

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

@@ -32,75 +32,28 @@ var x = async (e, t, n, r, i, o) => {
 		outputUtxosArray: c
 	};
 }, S = async (a, u, d, S, C, w, T) => {
-	console.log("[hinkalTransfer] start", {
-		tokenCount: u.length,
-		amountChangesBase: d,
-		recipientAddress: S,
-		feeToken: C,
-		hasFeeStructureOverride: !!w,
-		action: T
-	});
-	let E = l(u);
-	console.log("[hinkalTransfer] chainId", E);
-	let D = e(E);
-	if (console.log("[hinkalTransfer] isTron", D), !o(S)) throw console.log("[hinkalTransfer] invalid recipientAddress", S), Error(i.RECIPIENT_FORMAT_INCORRECT);
-	console.log("[hinkalTransfer] recipientAddress validated");
-	let O = s(await a.getEthereumAddressByChain(E));
-	console.log("[hinkalTransfer] ethereumAddress", O);
-	let k = u.map((e) => e.erc20TokenAddress);
-	console.log("[hinkalTransfer] erc20Addresses", k);
-	let A = await p(E, u, d);
-	console.log("[hinkalTransfer] amountChanges", A), console.log("[hinkalTransfer] resolving fee structure");
-	let j = w ?? await h(E, C, k, r.Transact, [], 5n);
-	console.log("[hinkalTransfer] feeStructure initial", j), j.variableRate ||= t, console.log("[hinkalTransfer] feeStructure normalized", j);
-	let M = f(-A[0], j);
-	console.log("[hinkalTransfer] totalFee", M);
-	let N = -A[0];
-	console.log("[hinkalTransfer] recipientAmount", N);
-	let P = {
+	let E = l(u), D = e(E);
+	if (!o(S)) throw Error(i.RECIPIENT_FORMAT_INCORRECT);
+	let O = s(await a.getEthereumAddressByChain(E)), k = u.map((e) => e.erc20TokenAddress), A = await p(E, u, d), j = w ?? await h(E, C, k, r.Transact, [], 5n);
+	j.variableRate ||= t;
+	let M = f(-A[0], j), N = -A[0], P = {
 		feeToken: j.feeToken,
 		flatFee: M,
 		variableRate: 0n
 	};
-	console.log("[hinkalTransfer] transferFeeStructure", P), b(E, k, A, P), console.log("[hinkalTransfer] amountChanges after fee merge", A);
-	let F = u[0];
-	if (console.log("[hinkalTransfer] primary token", F), !F) throw Error("Transfer Action: No Token Found");
-	console.log("[hinkalTransfer] loading relay, kyc data, and utxos");
-	let [I, { patchAccessTokenMerkleTree: L, signatureData: R }, { inputUtxosArray: z, outputUtxosArray: B }] = await Promise.all([
+	if (b(E, k, A, P), !u[0]) throw Error("Transfer Action: No Token Found");
+	let [F, { patchAccessTokenMerkleTree: I, signatureData: L }, { inputUtxosArray: R, outputUtxosArray: z }] = await Promise.all([
 		a.getRandomRelay(E, !0),
 		g(a, E, k, A, O),
 		x(a, E, k, A, S, N)
 	]);
-	if (console.log("[hinkalTransfer] relay and proof inputs ready", {
-		relay: I,
-		hasPatchAccessTokenMerkleTree: !!L,
-		hasSignatureData: !!R,
-		inputUtxoGroups: z.length,
-		outputUtxoGroups: B.length,
-		inputUtxoSizes: z.map((e) => e.length),
-		outputUtxoSizes: B.map((e) => e.length)
-	}), !I) throw Error(i.RELAYER_NOT_AVAILABLE);
-	let V = {
+	if (!F) throw Error(i.RELAYER_NOT_AVAILABLE);
+	let B = {
 		externalActionId: 0n,
-		externalAddress: I,
+		externalAddress: F,
 		externalActionMetadata: "0x00"
-	};
-	console.log("[hinkalTransfer] externalActionData", V);
-	let H = `swapperM${A.length}x${z[0].length}x2`;
-	console.log("[hinkalTransfer] circuitName", H), console.log("[hinkalTransfer] constructing zk proof and commitment validation data");
-	let [{ zkCallData: U, circomData: W, dimData: G }, K] = await Promise.all([v(a.merkleTreeHinkalByChain[E], a.merkleTreeAccessTokenByChain[E], z, B, a.userKeys, H, V.externalActionId, V.externalAddress, V.externalActionMetadata, a.generateProofRemotely, I, E, void 0, void 0, void 0, L, void 0, P, a.getContractWithFetcher(E, n.HinkalHelperContract), R), _(E, a.userKeys, k, z)]);
-	console.log("[hinkalTransfer] proof data ready", {
-		zkCallDataLength: U?.length,
-		circomDataLength: Array.isArray(W) ? W.length : void 0,
-		dimDataLength: Array.isArray(G) ? G.length : void 0,
-		commitmentValidationData: K
-	});
-	let q = await c(D, U, G, W);
-	console.log("[hinkalTransfer] tronProofSignature", q);
-	let J = m(T, E, k, A, O);
-	console.log("[hinkalTransfer] adminData", J), console.log("[hinkalTransfer] calling transactCallRelayer");
-	let Y = await y(E, U, G, W, K, void 0, void 0, J, q);
-	return console.log("[hinkalTransfer] txHash", Y), Y;
+	}, V = `swapperM${A.length}x${R[0].length}x2`, [{ zkCallData: H, circomData: U, dimData: W }, G] = await Promise.all([v(a.merkleTreeHinkalByChain[E], a.merkleTreeAccessTokenByChain[E], R, z, a.userKeys, V, B.externalActionId, B.externalAddress, B.externalActionMetadata, a.generateProofRemotely, F, E, void 0, void 0, void 0, I, void 0, P, a.getContractWithFetcher(E, n.HinkalHelperContract), L), _(E, a.userKeys, k, R)]), K = await c(D, H, W, U);
+	return await y(E, H, W, U, G, void 0, void 0, m(T, E, k, A, O), K);
 };
 //#endregion
 export { S as hinkalTransfer };

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

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/ethereum-network.types.cjs`),r=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../../functions/utils/tron.utils.cjs`),s=require(`../../functions/utils/token-check.utils.cjs`),c=require(`../../functions/web3/events/getShieldedBalance.cjs`),l=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),u=require(`../../functions/utils/fees.utils.cjs`),d=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),f=require(`../../functions/pre-transaction/constructAdminData.cjs`),p=require(`../../functions/pre-transaction/getFeeStructure.cjs`),m=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`),h=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const g=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),_=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`),v=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),y=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var b=async(e,t,n,r)=>{let i=[...await c.addPaddingToUtxos(e,t,n,r)],o=[],s=a.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=l.outputUtxoProcessing(e.userKeys,i[t],r[t],s);o.push(n)}return{inputUtxosArray:i,outputUtxosArray:o}},x=async(a,c,l,x,S,C,w,T)=>{console.log(`[hinkalWithdraw] start`,{tokenCount:c.length,deltaAmountsBase:l,recipientAddress:x,isRelayerOff:S,feeToken:C,hasFeeStructureOverride:!!w,action:T});let E=s.validateAndGetChainId(c);console.log(`[hinkalWithdraw] chainId`,E);let D=e.isTronLike(E);console.log(`[hinkalWithdraw] isTron`,D);let O=o.addressToHexFormat(await a.getEthereumAddressByChain(E));console.log(`[hinkalWithdraw] ethereumAddress`,O);let k=c.map(e=>e.erc20TokenAddress);console.log(`[hinkalWithdraw] erc20Addresses`,k);let A=await d.modifyVolatileTokenAmountChanges(E,c,l);console.log(`[hinkalWithdraw] deltaAmounts`,A);let j;if(console.log(`[hinkalWithdraw] feeStructure initialized as undefined`),!S){console.log(`[hinkalWithdraw] resolving relayer fee structure`);let e=w??await p.getFeeStructure(E,C,k,r.ExternalActionId.Transact);console.log(`[hinkalWithdraw] rawFeeStructure`,e);let t=u.calculateTotalFee(-A[0],e);console.log(`[hinkalWithdraw] totalFee`,t),j={feeToken:e.feeToken,flatFee:t,variableRate:0n},console.log(`[hinkalWithdraw] feeStructure`,j),y.mergeWithFeeStructure(E,k,A,j),console.log(`[hinkalWithdraw] deltaAmounts after fee merge`,A)}let M=c[0];if(console.log(`[hinkalWithdraw] primary token`,M),!M)throw Error(`Deposit Action: No Token Found`);let N={externalActionId:0n,externalAddress:o.addressToHexFormat(x),externalActionMetadata:`0x00`};console.log(`[hinkalWithdraw] externalActionData`,N),console.log(`[hinkalWithdraw] loading relay, kyc data, and utxos`);let[P,{patchAccessTokenMerkleTree:F,signatureData:I},{inputUtxosArray:L,outputUtxosArray:R}]=await Promise.all([a.getRandomRelay(E,!0),m.getKycAndSignatureData(a,E,k,A,O),b(a,E,k,A)]);if(console.log(`[hinkalWithdraw] relay and proof inputs ready`,{relay:P,hasPatchAccessTokenMerkleTree:!!F,hasSignatureData:!!I,inputUtxoGroups:L.length,outputUtxoGroups:R.length,inputUtxoSizes:L.map(e=>e.length),outputUtxoSizes:R.map(e=>e.length)}),!S&&!P)throw Error(i.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let z=`swapperM${A.length.toString()}x${L[0].length}x1`;console.log(`[hinkalWithdraw] circuitName`,z),console.log(`[hinkalWithdraw] constructing zk proof and commitment validation data`);let[{zkCallData:B,circomData:V,dimData:H},U]=await Promise.all([g.constructZkProof(a.merkleTreeHinkalByChain[E],a.merkleTreeAccessTokenByChain[E],L,R,a.userKeys,z,N.externalActionId,N.externalAddress,N.externalActionMetadata,a.generateProofRemotely,S?t.zeroAddress:P,E,void 0,void 0,void 0,F,void 0,j,a.getContractWithFetcher(E,n.ContractType.HinkalHelperContract),I,S?O:void 0),h.buildCommitmentValidationData(E,a.userKeys,k,L)]);console.log(`[hinkalWithdraw] proof data ready`,{zkCallDataLength:B?.length,circomDataLength:Array.isArray(V)?V.length:void 0,dimDataLength:Array.isArray(H)?H.length:void 0,commitmentValidationData:U});let W=await o.reorderZkCallData(D,B,H,V);if(console.log(`[hinkalWithdraw] tronProofSignature`,W),S){if(console.log(`[hinkalWithdraw] relayer disabled, using direct transaction path`),!M)throw Error(`Withdraw Action: No Token Found`);let e=await _.transactCallDirect(a,E,A[0],M,B,V,H);return console.log(`[hinkalWithdraw] direct transaction result`,e),e}let G=f.constructAdminData(T,E,k,A,O);console.log(`[hinkalWithdraw] adminData`,G),console.log(`[hinkalWithdraw] calling transactCallRelayer`);let K=await v.transactCallRelayer(E,B,H,V,U,void 0,void 0,G,W);return console.log(`[hinkalWithdraw] txHash`,K),K};exports.hinkalWithdraw=x;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/ethereum-network.types.cjs`),r=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../../functions/utils/tron.utils.cjs`),s=require(`../../functions/utils/token-check.utils.cjs`),c=require(`../../functions/web3/events/getShieldedBalance.cjs`),l=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),u=require(`../../functions/utils/fees.utils.cjs`),d=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),f=require(`../../functions/pre-transaction/constructAdminData.cjs`),p=require(`../../functions/pre-transaction/getFeeStructure.cjs`),m=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`),h=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const g=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),_=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`),v=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),y=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var b=async(e,t,n,r)=>{let i=[...await c.addPaddingToUtxos(e,t,n,r)],o=[],s=a.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=l.outputUtxoProcessing(e.userKeys,i[t],r[t],s);o.push(n)}return{inputUtxosArray:i,outputUtxosArray:o}},x=async(a,c,l,x,S,C,w,T)=>{let E=s.validateAndGetChainId(c),D=e.isTronLike(E),O=o.addressToHexFormat(await a.getEthereumAddressByChain(E)),k=c.map(e=>e.erc20TokenAddress),A=await d.modifyVolatileTokenAmountChanges(E,c,l),j;if(!S){let e=w??await p.getFeeStructure(E,C,k,r.ExternalActionId.Transact),t=u.calculateTotalFee(-A[0],e);j={feeToken:e.feeToken,flatFee:t,variableRate:0n},y.mergeWithFeeStructure(E,k,A,j)}let M=c[0];if(!M)throw Error(`Deposit Action: No Token Found`);let N={externalActionId:0n,externalAddress:o.addressToHexFormat(x),externalActionMetadata:`0x00`},[P,{patchAccessTokenMerkleTree:F,signatureData:I},{inputUtxosArray:L,outputUtxosArray:R}]=await Promise.all([a.getRandomRelay(E,!0),m.getKycAndSignatureData(a,E,k,A,O),b(a,E,k,A)]);if(!S&&!P)throw Error(i.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let z=`swapperM${A.length.toString()}x${L[0].length}x1`,[{zkCallData:B,circomData:V,dimData:H},U]=await Promise.all([g.constructZkProof(a.merkleTreeHinkalByChain[E],a.merkleTreeAccessTokenByChain[E],L,R,a.userKeys,z,N.externalActionId,N.externalAddress,N.externalActionMetadata,a.generateProofRemotely,S?t.zeroAddress:P,E,void 0,void 0,void 0,F,void 0,j,a.getContractWithFetcher(E,n.ContractType.HinkalHelperContract),I,S?O:void 0),h.buildCommitmentValidationData(E,a.userKeys,k,L)]),W=await o.reorderZkCallData(D,B,H,V);if(S){if(!M)throw Error(`Withdraw Action: No Token Found`);return await _.transactCallDirect(a,E,A[0],M,B,V,H)}return await v.transactCallRelayer(E,B,H,V,U,void 0,void 0,f.constructAdminData(T,E,k,A,O),W)};exports.hinkalWithdraw=x;