@hinkal/common 0.3.1 → 0.3.3

package/common/src/functions/pre-transaction/outputUtxoProcessing.d.ts

@@ -1,5 +1,5 @@
 import { UserKeys } from '../../data-structures/crypto-keys/keys';
 import { Utxo } from '../../data-structures/utxo/Utxo';
-export declare const outputUtxoProcessing: (userKeys: UserKeys, inputUtxos: Utxo[], amountChange: bigint, timeStamp?: string, revertIfNegative?: boolean, recipientAddress?: string, recipientAmountChange?: bigint) => {
+export declare const outputUtxoProcessing: (userKeys: UserKeys, inputUtxos: Utxo[], amountChange: bigint, timeStamp?: string, revertIfNegative?: boolean, recipientAddresses?: string[], recipientAmountChanges?: bigint[]) => {
     outputUtxos: Utxo[];
 };

package/common/src/functions/pre-transaction/outputUtxoProcessing.mjs

@@ -11,23 +11,20 @@ var i = (i, a, o, s, c = !0, l, u) => {
 		mintAddress: p,
 		nullifyingKey: i.getShieldedPrivateKey(),
 		timeStamp: s,
-		spendingPublicKey: i.getSpendingKeyPair().pubSpendingBJJPoint,
-		isNewStyle: !0
+		spendingPublicKey: i.getSpendingKeyPair().pubSpendingBJJPoint
 	})];
-	if (l !== void 0 && u !== void 0) {
-		let [e, t, n, , i] = l.split(",");
+	return l !== void 0 && u !== void 0 && l.forEach((e, t) => {
+		let [n, i, a, , , o] = e.split(",");
 		m.push(new r({
-			amount: u,
+			amount: u[t],
 			erc20TokenAddress: f,
 			mintAddress: p,
-			H0: [BigInt(t), BigInt(n)],
-			stealthAddress: e,
-			encryptionKey: i,
-			timeStamp: s,
-			isNewStyle: !0
+			H0: [BigInt(i), BigInt(a)],
+			stealthAddress: n,
+			encryptionKey: o,
+			timeStamp: s
 		}));
-	}
-	return { outputUtxos: m };
+	}), { outputUtxos: m };
 };
 //#endregion
 export { i as outputUtxoProcessing };

package/common/src/functions/pre-transaction/solana-public-signals.d.ts

@@ -3,6 +3,7 @@ export declare const convertSolanaPublicSignals: (publicInputsArr: number[][], d
     nullifierAmount: number;
     outputAmount: number;
 }) => {
+    outH1Ax: number[];
     outH1Ay: number[];
     outStealthAddress: number[];
     message: number[];

package/common/src/functions/pre-transaction/solana.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../crypto/poseidon.cjs`);let t=require(`@solana/web3.js`),n=require(`@coral-xyz/anchor`);var r=e=>new TextEncoder().encode(e),i=e=>{let t=[],n=e;for(;n>0n;)t.unshift(Number(n%256n)),n/=256n;for(;t.length<32;)t.unshift(0);return t},a=e=>({extraRandomization:i(e.extraRandomization),stealthAddress:i(e.stealthAddress),h0:i(e.H0),h1:i(e.H1)}),o=(e,n)=>{let i=[r(`hinkal`),n.toBytes()],[a]=t.PublicKey.findProgramAddressSync(i,e);return a},s=(e,n)=>{let i=[r(`hinkal_merkle`),n.toBytes()],[a]=t.PublicKey.findProgramAddressSync(i,e);return a},c=(e,i,a)=>{let o=[r(`hinkal_swapper`),i.toBytes(),new Uint8Array(new n.BN(a.toString()).toArray(`be`,32))],[s]=t.PublicKey.findProgramAddressSync(o,e);return s},l=(t,n,r)=>c(t,n,e.poseidonFunction(r)),u=(e,n)=>{let i=[r(`hinkal_vault`),n.toBytes()],[a]=t.PublicKey.findProgramAddressSync(i,e);return a};exports.buildAnchorStealthAddressStructure=a,exports.encodeToByte32Array=i,exports.getMerkleAccountPublicKey=s,exports.getStorageAccountPublicKey=o,exports.getStorageVaultPublicKey=u,exports.getSwapperAccountPublicKey=c,exports.getSwapperAccountPublicKeyFromSalt=l;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../crypto/poseidon.cjs`);let n=require(`@solana/web3.js`),r=require(`@coral-xyz/anchor`);var i=e=>new TextEncoder().encode(e),a=e=>{let t=[],n=e;for(;n>0n;)t.unshift(Number(n%256n)),n/=256n;for(;t.length<32;)t.unshift(0);return t},o=e=>({h0X:a(e.H0x),h0Y:a(e.H0y),h1X:a(e.H1x),h1Y:a(e.H1y),stealthAddress:a(e.stealthAddress)}),s=(e,t,r)=>{let o=a(e),s=[i(`hinkal_nullifier`),t.toBytes(),new Uint8Array(o)],[c]=n.PublicKey.findProgramAddressSync(s,r);return c},c=(e,t)=>{let r=[i(`hinkal`),t.toBytes()],[a]=n.PublicKey.findProgramAddressSync(r,e);return a},l=(e,t)=>{let r=[i(`hinkal_merkle`),t.toBytes()],[a]=n.PublicKey.findProgramAddressSync(r,e);return a},u=327680n,d=e=>2n**(e-1n),f=e=>e/u,p=e=>e%u,m=(e,t,a)=>{let o=[i(`hinkal_root_bucket`),t.toBytes(),new Uint8Array(new r.BN(a.toString()).toArray(`le`,8))],[s]=n.PublicKey.findProgramAddressSync(o,e);return s},h=async(e,t)=>{let n=await e.account.merkle.fetch(t);return BigInt(`0x${Buffer.from(n.mIndex).toString(`hex`)}`)},g=async(t,n,r)=>{let i=await h(t,n)-d(e.MERKLE_LEVELS),a=f(i);return{current:m(t.programId,n,a),next:i%327680n+BigInt(r)>327680n?m(t.programId,n,a+1n):null}},_=(e,t,a)=>{let o=[i(`hinkal_swapper`),t.toBytes(),new Uint8Array(new r.BN(a.toString()).toArray(`be`,32))],[s]=n.PublicKey.findProgramAddressSync(o,e);return s},v=(e,n,r)=>_(e,n,t.poseidonFunction(r)),y=(e,t)=>{let r=[i(`hinkal_vault`),t.toBytes()],[a]=n.PublicKey.findProgramAddressSync(r,e);return a};exports.ROOT_BUCKET_CAP=u,exports.buildAnchorStealthAddressStructure=o,exports.encodeToByte32Array=a,exports.fetchSolanaMIndex=h,exports.getMerkleAccountPublicKey=l,exports.getMerkleMinimumIndex=d,exports.getNullifierAccount=s,exports.getRootBucketIndex=f,exports.getRootBucketPublicKey=m,exports.getRootBucketSlot=p,exports.getStorageAccountPublicKey=c,exports.getStorageVaultPublicKey=y,exports.getSwapperAccountPublicKey=_,exports.getSwapperAccountPublicKeyFromSalt=v,exports.resolveSolanaRootBuckets=g;

package/common/src/functions/pre-transaction/solana.d.ts

@@ -1,3 +1,4 @@
+import { Idl, Program } from '@coral-xyz/anchor';
 import { AnchorStealthAddressStructure, StealthAddressStructure } from '../../types/circom-data.types';
 import { PublicKey } from '@solana/web3.js';
 export declare const encodeToByte32Array: (value: bigint) => number[];
@@ -5,6 +6,18 @@ export declare const buildAnchorStealthAddressStructure: (structure: StealthAddr
 export declare const getNullifierAccount: (nullifier: bigint, originalDeployer: PublicKey, programId: PublicKey) => PublicKey;
 export declare const getStorageAccountPublicKey: (programId: PublicKey, originalDeployer: PublicKey) => PublicKey;
 export declare const getMerkleAccountPublicKey: (programId: PublicKey, originalDeployer: PublicKey) => PublicKey;
+export declare const ROOT_BUCKET_CAP = 327680n;
+export declare const getMerkleMinimumIndex: (levels: bigint) => bigint;
+export declare const getRootBucketIndex: (relativeIndex: bigint) => bigint;
+export declare const getRootBucketSlot: (relativeIndex: bigint) => bigint;
+export declare const getRootBucketIndexFromAbsolute: (absoluteIndex: bigint, levels: bigint) => bigint;
+export declare const getRootBucketPublicKey: (programId: PublicKey, merkleAccount: PublicKey, bucketIndex: bigint) => PublicKey;
+export declare const fetchSolanaMIndex: (program: Program<Idl>, merkleAccount: PublicKey) => Promise<bigint>;
+export declare const resolveSolanaRootBuckets: (program: Program<Idl>, merkleAccount: PublicKey, insertCount: number) => Promise<{
+    current: PublicKey;
+    next: PublicKey | null;
+}>;
+export declare const resolveSolanaVerifyBucket: (programId: PublicKey, merkleAccount: PublicKey, rootIndexAbsolute: bigint) => PublicKey;
 export declare const getSwapperAccountPublicKey: (programId: PublicKey, originalDeployer: PublicKey, swapperAccountAdditionalSeed: bigint) => PublicKey;
 export declare const getSwapperAccountPublicKeyFromSalt: (programId: PublicKey, originalDeployer: PublicKey, swapperAccountSalt: bigint) => PublicKey;
 export declare const getStorageVaultPublicKey: (programId: PublicKey, originalDeployer: PublicKey) => PublicKey;

package/common/src/functions/pre-transaction/solana.mjs

@@ -1,33 +1,58 @@
-import { poseidonFunction as e } from "../../crypto/poseidon.mjs";
-import { PublicKey as t } from "@solana/web3.js";
-import { BN as n } from "@coral-xyz/anchor";
+import { MERKLE_LEVELS as e } from "../../constants/protocol.constants.mjs";
+import { poseidonFunction as t } from "../../crypto/poseidon.mjs";
+import { PublicKey as n } from "@solana/web3.js";
+import { BN as r } from "@coral-xyz/anchor";
 //#region libs/shared/common/src/functions/pre-transaction/solana.ts
-var r = (e) => new TextEncoder().encode(e), i = (e) => {
+var i = (e) => new TextEncoder().encode(e), a = (e) => {
 	let t = [], n = e;
 	for (; n > 0n;) t.unshift(Number(n % 256n)), n /= 256n;
 	for (; t.length < 32;) t.unshift(0);
 	return t;
-}, a = (e) => ({
-	extraRandomization: i(e.extraRandomization),
-	stealthAddress: i(e.stealthAddress),
-	h0: i(e.H0),
-	h1: i(e.H1)
-}), o = (e, n) => {
-	let i = [r("hinkal"), n.toBytes()], [a] = t.findProgramAddressSync(i, e);
+}, o = (e) => ({
+	h0X: a(e.H0x),
+	h0Y: a(e.H0y),
+	h1X: a(e.H1x),
+	h1Y: a(e.H1y),
+	stealthAddress: a(e.stealthAddress)
+}), s = (e, t, r) => {
+	let o = a(e), s = [
+		i("hinkal_nullifier"),
+		t.toBytes(),
+		new Uint8Array(o)
+	], [c] = n.findProgramAddressSync(s, r);
+	return c;
+}, c = (e, t) => {
+	let r = [i("hinkal"), t.toBytes()], [a] = n.findProgramAddressSync(r, e);
 	return a;
-}, s = (e, n) => {
-	let i = [r("hinkal_merkle"), n.toBytes()], [a] = t.findProgramAddressSync(i, e);
+}, l = (e, t) => {
+	let r = [i("hinkal_merkle"), t.toBytes()], [a] = n.findProgramAddressSync(r, e);
 	return a;
-}, c = (e, i, a) => {
+}, u = 327680n, d = (e) => 2n ** (e - 1n), f = (e) => e / u, p = (e) => e % u, m = (e, t, a) => {
 	let o = [
-		r("hinkal_swapper"),
-		i.toBytes(),
-		new Uint8Array(new n(a.toString()).toArray("be", 32))
-	], [s] = t.findProgramAddressSync(o, e);
+		i("hinkal_root_bucket"),
+		t.toBytes(),
+		new Uint8Array(new r(a.toString()).toArray("le", 8))
+	], [s] = n.findProgramAddressSync(o, e);
 	return s;
-}, l = (t, n, r) => c(t, n, e(r)), u = (e, n) => {
-	let i = [r("hinkal_vault"), n.toBytes()], [a] = t.findProgramAddressSync(i, e);
+}, h = async (e, t) => {
+	let n = await e.account.merkle.fetch(t);
+	return BigInt(`0x${Buffer.from(n.mIndex).toString("hex")}`);
+}, g = async (t, n, r) => {
+	let i = await h(t, n) - d(e), a = f(i);
+	return {
+		current: m(t.programId, n, a),
+		next: i % 327680n + BigInt(r) > 327680n ? m(t.programId, n, a + 1n) : null
+	};
+}, _ = (e, t, a) => {
+	let o = [
+		i("hinkal_swapper"),
+		t.toBytes(),
+		new Uint8Array(new r(a.toString()).toArray("be", 32))
+	], [s] = n.findProgramAddressSync(o, e);
+	return s;
+}, v = (e, n, r) => _(e, n, t(r)), y = (e, t) => {
+	let r = [i("hinkal_vault"), t.toBytes()], [a] = n.findProgramAddressSync(r, e);
 	return a;
 };
 //#endregion
-export { a as buildAnchorStealthAddressStructure, i as encodeToByte32Array, s as getMerkleAccountPublicKey, o as getStorageAccountPublicKey, u as getStorageVaultPublicKey, c as getSwapperAccountPublicKey, l as getSwapperAccountPublicKeyFromSalt };
+export { u as ROOT_BUCKET_CAP, o as buildAnchorStealthAddressStructure, a as encodeToByte32Array, h as fetchSolanaMIndex, l as getMerkleAccountPublicKey, d as getMerkleMinimumIndex, s as getNullifierAccount, f as getRootBucketIndex, m as getRootBucketPublicKey, p as getRootBucketSlot, c as getStorageAccountPublicKey, y as getStorageVaultPublicKey, _ as getSwapperAccountPublicKey, v as getSwapperAccountPublicKeyFromSalt, g as resolveSolanaRootBuckets };

package/common/src/functions/pre-transaction/store-proof.cjs

@@ -1 +1 @@
-require(`../../constants/protocol.constants.cjs`),require(`./solana.cjs`),require(`./sendV0Transaction.cjs`);
+require(`../../constants/protocol.constants.cjs`),require(`./solana.cjs`),require(`./sendV0Transaction.cjs`),require(`ethers`);

package/common/src/functions/pre-transaction/store-proof.d.ts

@@ -1,6 +1,6 @@
 import { Program } from '@coral-xyz/anchor';
 import { Connection, Keypair, PublicKey } from '@solana/web3.js';
-export declare const storeProof: (connection: Connection, hinkalProgram: Program, signer: Keypair, originalDeployer: PublicKey, id: bigint, encryptedOutputs: number[][], proofAArr: number[], proofBArr: number[], proofCArr: number[], publicInputsArr: number[][]) => Promise<{
+export declare const storeProof: (connection: Connection, hinkalProgram: Program, signer: Keypair, originalDeployer: PublicKey, id: bigint, encryptedOutputs: number[][], onChainEncryptedOutput: string, onChainCreation: boolean[], proofAArr: number[], proofBArr: number[], proofCArr: number[], publicInputsArr: number[][]) => Promise<{
     proofAccountPart1: PublicKey;
     proofAccountPart2: PublicKey;
     encryptedOutputsAccount: PublicKey;

package/common/src/functions/pre-transaction/store-proof.mjs

@@ -1,3 +1,4 @@
 import "../../constants/protocol.constants.mjs";
 import "./solana.mjs";
 import "./sendV0Transaction.mjs";
+import "ethers";

package/common/src/functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs

@@ -1 +1 @@
-const e=require(`../utils/time.utils.cjs`);var t=60,n=(e,t)=>{if(!e.length)return!0;let n=new Set(t.map(e=>e.toString()));return e.every(({utxo:e})=>{let t=BigInt(e.getCommitment());return n.has(t.toString())})},r=(e,t,n=20)=>{let r=e.merkleTreeHinkalByChain[t],i=r.getStartIndex(),{count:a}=r.toJSON(),o=BigInt(a);if(o===0n)return[];let s=r.getMerkleData(),c=[],l=o<BigInt(n)?o:BigInt(n);for(let e=0n;e<l;e+=1n){let t=i+o-1n-e,n=s.get(t);n&&n!==0n&&c.push(n)}return c},i=async(i,a,o)=>{if(o.length){for(let s=0;s<t;s+=1){if(n(o,r(i,a)))return;await e.waitLittle()}throw Error(`Timeout while waiting for deposited UTXOs to appear in Merkle tree.`)}};exports.waitForDepositedUtxosInMerkleTree=i;
+const e=require(`../utils/time.utils.cjs`);var t=60,n=(e,t)=>{if(!e.length)return!0;let n=new Set(t.map(e=>e.toString()));return e.every(({utxo:e})=>{let t=BigInt(e.getCommitment());return n.has(t.toString())})},r=(e,t,n=20)=>{let r=e.merkleTreeHinkalByChain[t],i=r.getStartIndex(),{count:a}=r.toJSON(),o=BigInt(a);if(o===0n)return[];let s=r.getMerkleData(),c=[],l=o<BigInt(n)?o:BigInt(n);for(let e=0n;e<l;e+=1n){let t=i+o-1n-e,n=s.get(t);n&&n!==0n&&c.push(n)}return c},i=async(i,a,o)=>{if(o.length&&!i.generateProofRemotely){for(let s=0;s<t;s+=1){if(n(o,r(i,a)))return;await e.waitLittle()}throw Error(`Timeout while waiting for deposited UTXOs to appear in Merkle tree.`)}};exports.waitForDepositedUtxosInMerkleTree=i;

package/common/src/functions/pre-transaction/waitForDepositedUtxosInMerkleTree.mjs

@@ -17,7 +17,7 @@ var t = 60, n = (e, t) => {
 	}
 	return c;
 }, i = async (i, a, o) => {
-	if (o.length) {
+	if (o.length && !i.generateProofRemotely) {
 		for (let s = 0; s < t; s += 1) {
 			if (n(o, r(i, a))) return;
 			await e();

package/common/src/functions/private-wallet/emporium.helpers.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../utils/caseInsensitive.utils.cjs`),r=require(`../../types/ethereum-network.types.cjs`),i=require(`../../error-handling/logger.cjs`),a=require(`../utils/create-provider.cjs`),o=require(`../../data-structures/AccountActions/AccountActions.cjs`),s=require(`../utils/getContractAddress.cjs`);require(`../utils/index.cjs`);let c=require(`ethers`);var l=e=>{if(typeof e.target==`string`)return e.target;if(e.address)return e.address;throw Error(`Contract address not found`)},u=({contract:e,func:t,args:n,callDataString:r,invokeWallet:i,value:a})=>{let o=new Uint8Array,s=r?c.ethers.getBytesCopy(r):new Uint8Array;if(typeof e==`object`){if(o=c.ethers.getBytesCopy(l(e)),r?.length&&r?.length>0)throw Error(`If function and args are providedm no calldata is needed`);t&&n&&!r&&(s=c.ethers.getBytesCopy(e.interface.encodeFunctionData(t,n)))}else o=c.ethers.getBytesCopy(e);let u=c.ethers.getBytesCopy(new Uint8Array([+!!i])),d=c.ethers.zeroPadValue(c.ethers.toBeHex(a??0n),16),f=c.ethers.concat([o,u,d,s]);return c.ethers.hexlify(f)},d=async(n,r,i,a,s,l)=>{let u=e.getOnchainChainId(n),d=i?await o.AccountActions.signTypedDataFromPrivateKey(u,i,{name:`Emporium`,version:`1.0.0`,chainId:u,verifyingContract:r},{EmporiumSignature:[{name:`message`,type:`uint256`},{name:`ops`,type:`bytes[]`}]},{message:s,ops:a}):void 0,{v:f,r:p,s:m}=d?c.ethers.Signature.from(d):{v:0,r:c.ethers.ZeroHash,s:c.ethers.ZeroHash};return c.ethers.AbiCoder.defaultAbiCoder().encode([`tuple(uint8 v,bytes32 r, bytes32 s, uint256 message, address signerAddress, bytes[] ops)`],[{v:f,r:p,s:m,message:s??0n,signerAddress:l??t.zeroAddress,ops:a}])},f=(e,t,n,r)=>u(e?{contract:e,func:`transfer`,args:[t,n],invokeWallet:r}:{contract:t,value:n,invokeWallet:r}),p=(e,i,a,o,c)=>{let l=e.getContractWithFetcher(i,r.ContractType.HinkalContract);return a.map((a,u)=>f(n.caseInsensitiveEqual(a,t.zeroAddress)?void 0:e.getContractWithFetcher(i,r.ContractType.ERC20Contract,a),c??s.getContractAddress(l),o[u],!0))},m=(e,t,n,r)=>u({contract:e,func:`approve`,args:[t,n],invokeWallet:r}),h=(e,i,a,o,s,c,l,u)=>{let d=[];for(let s=0;s<a.length;s+=1){let c=a[s],u=n.caseInsensitiveEqual(c,t.zeroAddress)?void 0:e.getContractWithFetcher(i,r.ContractType.ERC20Contract,c);d.push(f(u,l,o[s],!1))}if(u)for(let a=0;a<s.length;a+=1){let o=s[a];if(!n.caseInsensitiveEqual(o,t.zeroAddress)){let t=e.getContractWithFetcher(i,r.ContractType.ERC20Contract,o);d.push(m(t,u,c[a],!0))}}return d},g=(e,r,i,a,o,s,c,l)=>{let d=[],f=[o],p=[s];l.nativeFee>0n&&!n.caseInsensitiveEqual(o,t.zeroAddress)&&(f.push(t.zeroAddress),p.push(l.nativeFee));let m=h(e,r,f,p,[o],[c],i,a);d.push(...m);let g=l.nativeFee;return n.caseInsensitiveEqual(o,t.zeroAddress)&&(g+=c),d.push(u({contract:a,callDataString:l.calldata,value:g>0n?g:void 0,invokeWallet:!0})),d},_=`0xef0100`,v=async(e,t)=>{try{let n=a.createJsonRpcProvider(e),r=await n.getCode(t);if(r===`0x`||!r)return{delegated:!1,implementation:void 0,nonce:void 0};if(r.toLowerCase().startsWith(_)&&r.length===48){let e=`0x${r.slice(8)}`,i=await n.getTransactionCount(t);return{delegated:!0,implementation:c.ethers.getAddress(e),nonce:i}}else throw Error(`checkEOAWithDelegation: It is a contract`)}catch(e){throw i.Logger.error(`checkEOAWithDelegation error`,{error:e}),e}},y=r=>{let{hinkalWalletAddress:i}=e.networkRegistry[r].contractData;if(!i||n.caseInsensitiveEqual(i,t.zeroAddress))throw Error(`Hinkal Wallet Address is not set`);return i},b=async(t,r)=>{if(t===e.chainIds.localhost||!r)return;let i=e.getOnchainChainId(t),{delegated:a,implementation:s}=await v(t,o.AccountActions.getSignerAddressFromPrivateKey(t,r)),c=y(t);if(!a||!n.caseInsensitiveEqual(s,c)){let e=await o.AccountActions.authorizeDelegation(i,r,c);return{v:e.signature.v.toString(),r:e.signature.r,s:e.signature.s,nonce:e.nonce.toString(),address:c,chainId:String(i)}}};exports.checkEOAWithDelegation=v,exports.createApproveEmporiumOp=m,exports.createLifiBridgeOps=g,exports.createTransaferEmporiumOpsBatch=p,exports.createTransferToEmporiumOp=f,exports.emporiumOp=u,exports.encodeEmporiumMetadata=d,exports.generateFundAndApproveOps=h,exports.getAuthorizationDataIfNeeded=b;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../utils/caseInsensitive.utils.cjs`),r=require(`../../types/ethereum-network.types.cjs`),i=require(`../../error-handling/logger.cjs`),a=require(`../utils/create-provider.cjs`),o=require(`../../data-structures/AccountActions/AccountActions.cjs`),s=require(`../utils/getContractAddress.cjs`);let c=require(`ethers`);var l=e=>{if(typeof e.target==`string`)return e.target;if(e.address)return e.address;throw Error(`Contract address not found`)},u=`tuple(address endpoint, bool invokeWallet, uint128 value, bytes callData)`,d=`tuple(uint8 v, bytes32 r, bytes32 s, address signerAddress, ${u}[] ops)`,f=e=>{let[t]=c.ethers.AbiCoder.defaultAbiCoder().decode([u],e);return{endpoint:t.endpoint,invokeWallet:t.invokeWallet,value:BigInt(t.value),callData:t.callData}},p=({contract:e,func:t,args:n,callDataString:r,invokeWallet:i,value:a})=>{let o,s=r??`0x`;if(typeof e==`object`){if(o=l(e),r?.length&&r?.length>0)throw Error(`If function and args are providedm no calldata is needed`);t&&n&&!r&&(s=e.interface.encodeFunctionData(t,n))}else o=e;return c.ethers.AbiCoder.defaultAbiCoder().encode([u],[{endpoint:o,invokeWallet:!!i,value:a??0n,callData:s}])},m=async(n,r,i,a,s,l)=>{let u=e.getOnchainChainId(n),p=a.map(f),m=i?await o.AccountActions.signTypedDataFromPrivateKey(u,i,{name:`Emporium`,version:`1.0.0`,chainId:u,verifyingContract:r},{EmporiumSignature:[{name:`message`,type:`uint256`},{name:`ops`,type:`EmporiumOperation[]`}],EmporiumOperation:[{name:`endpoint`,type:`address`},{name:`invokeWallet`,type:`bool`},{name:`value`,type:`uint128`},{name:`callData`,type:`bytes`}]},{message:s,ops:p}):void 0,{v:h,r:g,s:_}=m?c.ethers.Signature.from(m):{v:0,r:c.ethers.ZeroHash,s:c.ethers.ZeroHash};return c.ethers.AbiCoder.defaultAbiCoder().encode([d],[{v:h,r:g,s:_,signerAddress:l??t.zeroAddress,ops:p}])},h=(e,t,n,r)=>p(e?{contract:e,func:`transfer`,args:[t,n],invokeWallet:r}:{contract:t,value:n,invokeWallet:r}),g=(e,i,a,o,c)=>{let l=e.getContractWithFetcher(i,r.ContractType.HinkalContract);return a.map((a,u)=>h(n.caseInsensitiveEqual(a,t.zeroAddress)?void 0:e.getContractWithFetcher(i,r.ContractType.ERC20Contract,a),c??s.getContractAddress(l),o[u],!0))},_=(e,t,n,r)=>p({contract:e,func:`approve`,args:[t,n],invokeWallet:r}),v=(e,i,a,o,s,c,l,u)=>{let d=[];for(let s=0;s<a.length;s+=1){let c=a[s],u=n.caseInsensitiveEqual(c,t.zeroAddress)?void 0:e.getContractWithFetcher(i,r.ContractType.ERC20Contract,c);d.push(h(u,l,o[s],!1))}if(u)for(let a=0;a<s.length;a+=1){let o=s[a];if(!n.caseInsensitiveEqual(o,t.zeroAddress)){let t=e.getContractWithFetcher(i,r.ContractType.ERC20Contract,o);d.push(_(t,u,c[a],!0))}}return d},y=(e,r,i,a,o,s,c,l)=>{let u=[],d=[o],f=[s];l.nativeFee>0n&&!n.caseInsensitiveEqual(o,t.zeroAddress)&&(d.push(t.zeroAddress),f.push(l.nativeFee));let m=v(e,r,d,f,[o],[c],i,a);u.push(...m);let h=l.nativeFee;return n.caseInsensitiveEqual(o,t.zeroAddress)&&(h+=c),u.push(p({contract:a,callDataString:l.calldata,value:h>0n?h:void 0,invokeWallet:!0})),u},b=`0xef0100`,x=async(e,t)=>{try{let n=a.createJsonRpcProvider(e),r=await n.getCode(t);if(r===`0x`||!r)return{delegated:!1,implementation:void 0,nonce:void 0};if(r.toLowerCase().startsWith(b)&&r.length===48){let e=`0x${r.slice(8)}`,i=await n.getTransactionCount(t);return{delegated:!0,implementation:c.ethers.getAddress(e),nonce:i}}else throw Error(`checkEOAWithDelegation: It is a contract`)}catch(e){throw i.Logger.error(`checkEOAWithDelegation error`,{error:e}),e}},S=r=>{let{hinkalWalletAddress:i}=e.networkRegistry[r].contractData;if(!i||n.caseInsensitiveEqual(i,t.zeroAddress))throw Error(`Hinkal Wallet Address is not set`);return i},C=async(t,r)=>{if(t===e.chainIds.localhost||!r)return;let i=e.getOnchainChainId(t),{delegated:a,implementation:s}=await x(t,o.AccountActions.getSignerAddressFromPrivateKey(t,r)),c=S(t);if(!a||!n.caseInsensitiveEqual(s,c)){let e=await o.AccountActions.authorizeDelegation(i,r,c);return{v:e.signature.v.toString(),r:e.signature.r,s:e.signature.s,nonce:e.nonce.toString(),address:c,chainId:String(i)}}};exports.checkEOAWithDelegation=x,exports.createApproveEmporiumOp=_,exports.createLifiBridgeOps=y,exports.createTransaferEmporiumOpsBatch=g,exports.createTransferToEmporiumOp=h,exports.emporiumOp=p,exports.encodeEmporiumMetadata=m,exports.generateFundAndApproveOps=v,exports.getAuthorizationDataIfNeeded=C;

package/common/src/functions/private-wallet/emporium.helpers.d.ts

@@ -19,12 +19,11 @@ export declare const emporiumOp: ({ contract, func, args, callDataString, invoke
     invokeWallet?: boolean;
     value?: bigint;
 }) => string;
-export declare const encodeEmporiumMetadata: (chainId: number, emporiumAddress: string, privateKey: string | undefined, ops: string[], message?: bigint, signerAddress?: string) => Promise<string>;
+export declare const encodeEmporiumMetadata: (chainId: number, emporiumAddress: string, privateKey: string | undefined, ops: string[], emporiumMessage?: bigint, signerAddress?: string) => Promise<string>;
 export declare const decodeEmporiumMetadata: (metadata: string) => {
     v: number;
     r: string;
     s: string;
-    message: bigint;
     signerAddress: string;
     ops: string[];
 };

package/common/src/functions/private-wallet/emporium.helpers.mjs

@@ -6,55 +6,80 @@ import { Logger as o } from "../../error-handling/logger.mjs";
 import { createJsonRpcProvider as s } from "../utils/create-provider.mjs";
 import { AccountActions as c } from "../../data-structures/AccountActions/AccountActions.mjs";
 import { getContractAddress as l } from "../utils/getContractAddress.mjs";
-import "../utils/index.mjs";
 import { ethers as u } from "ethers";
 //#region libs/shared/common/src/functions/private-wallet/emporium.helpers.ts
 var d = (e) => {
 	if (typeof e.target == "string") return e.target;
 	if (e.address) return e.address;
 	throw Error("Contract address not found");
-}, f = ({ contract: e, func: t, args: n, callDataString: r, invokeWallet: i, value: a }) => {
-	let o = new Uint8Array(), s = r ? u.getBytesCopy(r) : new Uint8Array();
+}, f = "tuple(address endpoint, bool invokeWallet, uint128 value, bytes callData)", p = `tuple(uint8 v, bytes32 r, bytes32 s, address signerAddress, ${f}[] ops)`, m = (e) => {
+	let [t] = u.AbiCoder.defaultAbiCoder().decode([f], e);
+	return {
+		endpoint: t.endpoint,
+		invokeWallet: t.invokeWallet,
+		value: BigInt(t.value),
+		callData: t.callData
+	};
+}, h = ({ contract: e, func: t, args: n, callDataString: r, invokeWallet: i, value: a }) => {
+	let o, s = r ?? "0x";
 	if (typeof e == "object") {
-		if (o = u.getBytesCopy(d(e)), r?.length && r?.length > 0) throw Error("If function and args are providedm no calldata is needed");
-		t && n && !r && (s = u.getBytesCopy(e.interface.encodeFunctionData(t, n)));
-	} else o = u.getBytesCopy(e);
-	let c = u.getBytesCopy(new Uint8Array([+!!i])), l = u.zeroPadValue(u.toBeHex(a ?? 0n), 16), f = u.concat([
-		o,
-		c,
-		l,
-		s
-	]);
-	return u.hexlify(f);
-}, p = async (e, n, i, a, o, s) => {
-	let l = t(e), d = i ? await c.signTypedDataFromPrivateKey(l, i, {
+		if (o = d(e), r?.length && r?.length > 0) throw Error("If function and args are providedm no calldata is needed");
+		t && n && !r && (s = e.interface.encodeFunctionData(t, n));
+	} else o = e;
+	return u.AbiCoder.defaultAbiCoder().encode([f], [{
+		endpoint: o,
+		invokeWallet: !!i,
+		value: a ?? 0n,
+		callData: s
+	}]);
+}, g = async (e, n, i, a, o, s) => {
+	let l = t(e), d = a.map(m), f = i ? await c.signTypedDataFromPrivateKey(l, i, {
 		name: "Emporium",
 		version: "1.0.0",
 		chainId: l,
 		verifyingContract: n
-	}, { EmporiumSignature: [{
-		name: "message",
-		type: "uint256"
 	}, {
-		name: "ops",
-		type: "bytes[]"
-	}] }, {
+		EmporiumSignature: [{
+			name: "message",
+			type: "uint256"
+		}, {
+			name: "ops",
+			type: "EmporiumOperation[]"
+		}],
+		EmporiumOperation: [
+			{
+				name: "endpoint",
+				type: "address"
+			},
+			{
+				name: "invokeWallet",
+				type: "bool"
+			},
+			{
+				name: "value",
+				type: "uint128"
+			},
+			{
+				name: "callData",
+				type: "bytes"
+			}
+		]
+	}, {
 		message: o,
-		ops: a
-	}) : void 0, { v: f, r: p, s: m } = d ? u.Signature.from(d) : {
+		ops: d
+	}) : void 0, { v: h, r: g, s: _ } = f ? u.Signature.from(f) : {
 		v: 0,
 		r: u.ZeroHash,
 		s: u.ZeroHash
 	};
-	return u.AbiCoder.defaultAbiCoder().encode(["tuple(uint8 v,bytes32 r, bytes32 s, uint256 message, address signerAddress, bytes[] ops)"], [{
-		v: f,
-		r: p,
-		s: m,
-		message: o ?? 0n,
+	return u.AbiCoder.defaultAbiCoder().encode([p], [{
+		v: h,
+		r: g,
+		s: _,
 		signerAddress: s ?? r,
-		ops: a
+		ops: d
 	}]);
-}, m = (e, t, n, r) => f(e ? {
+}, _ = (e, t, n, r) => h(e ? {
 	contract: e,
 	func: "transfer",
 	args: [t, n],
@@ -63,41 +88,41 @@ var d = (e) => {
 	contract: t,
 	value: n,
 	invokeWallet: r
-}), h = (e, t, n, o, s) => {
+}), v = (e, t, n, o, s) => {
 	let c = e.getContractWithFetcher(t, a.HinkalContract);
-	return n.map((n, u) => m(i(n, r) ? void 0 : e.getContractWithFetcher(t, a.ERC20Contract, n), s ?? l(c), o[u], !0));
-}, g = (e, t, n, r) => f({
+	return n.map((n, u) => _(i(n, r) ? void 0 : e.getContractWithFetcher(t, a.ERC20Contract, n), s ?? l(c), o[u], !0));
+}, y = (e, t, n, r) => h({
 	contract: e,
 	func: "approve",
 	args: [t, n],
 	invokeWallet: r
-}), _ = (e, t, n, o, s, c, l, u) => {
+}), b = (e, t, n, o, s, c, l, u) => {
 	let d = [];
 	for (let s = 0; s < n.length; s += 1) {
 		let c = n[s], u = i(c, r) ? void 0 : e.getContractWithFetcher(t, a.ERC20Contract, c);
-		d.push(m(u, l, o[s], !1));
+		d.push(_(u, l, o[s], !1));
 	}
 	if (u) for (let n = 0; n < s.length; n += 1) {
 		let o = s[n];
 		if (!i(o, r)) {
 			let r = e.getContractWithFetcher(t, a.ERC20Contract, o);
-			d.push(g(r, u, c[n], !0));
+			d.push(y(r, u, c[n], !0));
 		}
 	}
 	return d;
-}, v = (e, t, n, a, o, s, c, l) => {
-	let u = [], d = [o], p = [s];
-	l.nativeFee > 0n && !i(o, r) && (d.push(r), p.push(l.nativeFee));
-	let m = _(e, t, d, p, [o], [c], n, a);
-	u.push(...m);
-	let h = l.nativeFee;
-	return i(o, r) && (h += c), u.push(f({
+}, x = (e, t, n, a, o, s, c, l) => {
+	let u = [], d = [o], f = [s];
+	l.nativeFee > 0n && !i(o, r) && (d.push(r), f.push(l.nativeFee));
+	let p = b(e, t, d, f, [o], [c], n, a);
+	u.push(...p);
+	let m = l.nativeFee;
+	return i(o, r) && (m += c), u.push(h({
 		contract: a,
 		callDataString: l.calldata,
-		value: h > 0n ? h : void 0,
+		value: m > 0n ? m : void 0,
 		invokeWallet: !0
 	})), u;
-}, y = "0xef0100", b = async (e, t) => {
+}, S = "0xef0100", C = async (e, t) => {
 	try {
 		let n = s(e), r = await n.getCode(t);
 		if (r === "0x" || !r) return {
@@ -105,7 +130,7 @@ var d = (e) => {
 			implementation: void 0,
 			nonce: void 0
 		};
-		if (r.toLowerCase().startsWith(y) && r.length === 48) {
+		if (r.toLowerCase().startsWith(S) && r.length === 48) {
 			let e = `0x${r.slice(8)}`, i = await n.getTransactionCount(t);
 			return {
 				delegated: !0,
@@ -116,13 +141,13 @@ var d = (e) => {
 	} catch (e) {
 		throw o.error("checkEOAWithDelegation error", { error: e }), e;
 	}
-}, x = (e) => {
+}, w = (e) => {
 	let { hinkalWalletAddress: t } = n[e].contractData;
 	if (!t || i(t, r)) throw Error("Hinkal Wallet Address is not set");
 	return t;
-}, S = async (n, r) => {
+}, T = async (n, r) => {
 	if (n === e.localhost || !r) return;
-	let a = t(n), { delegated: o, implementation: s } = await b(n, c.getSignerAddressFromPrivateKey(n, r)), l = x(n);
+	let a = t(n), { delegated: o, implementation: s } = await C(n, c.getSignerAddressFromPrivateKey(n, r)), l = w(n);
 	if (!o || !i(s, l)) {
 		let e = await c.authorizeDelegation(a, r, l);
 		return {
@@ -136,4 +161,4 @@ var d = (e) => {
 	}
 };
 //#endregion
-export { b as checkEOAWithDelegation, g as createApproveEmporiumOp, v as createLifiBridgeOps, h as createTransaferEmporiumOpsBatch, m as createTransferToEmporiumOp, f as emporiumOp, p as encodeEmporiumMetadata, _ as generateFundAndApproveOps, S as getAuthorizationDataIfNeeded };
+export { C as checkEOAWithDelegation, y as createApproveEmporiumOp, x as createLifiBridgeOps, v as createTransaferEmporiumOpsBatch, _ as createTransferToEmporiumOp, h as emporiumOp, g as encodeEmporiumMetadata, b as generateFundAndApproveOps, T as getAuthorizationDataIfNeeded };

package/common/src/functions/private-wallet/emporium.swap.helpers.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/protocol.constants.cjs`),t=require(`../utils/caseInsensitive.utils.cjs`),n=require(`../../types/ethereum-network.types.cjs`),r=require(`../../types/external-action.types.cjs`),i=require(`../../error-handling/logger.cjs`),a=require(`../utils/string.utils.cjs`),o=require(`../utils/erc20tokenFunctions.cjs`),s=require(`../../constants/addresses.constants.cjs`),c=require(`../utils/getContractAddress.cjs`),l=require(`./emporium.helpers.cjs`),u=require(`../pre-transaction/getExternalSwapAddress.cjs`);let d=require(`ethers`);var f=(e,t,n,r,i,a,o=!1)=>{let s={tokenIn:t,tokenOut:r,fee:BigInt(a),recipient:i,amountIn:n,amountOutMinimum:0,sqrtPriceLimitX96:0};return l.emporiumOp({contract:new d.ethers.Contract(e,[`function exactInputSingle(tuple(address tokenIn,address tokenOut,uint24 fee,address recipient,uint256 amountIn,uint256 amountOutMinimum,uint160 sqrtPriceLimitX96)) external payable returns (uint256 amountOut)`]),func:`exactInputSingle`,args:[s],invokeWallet:o})},p=(e,t,n,r,i,o,s=!1)=>l.emporiumOp({contract:n,callDataString:a.replaceAllInstances(r,u.getExternalSwapAddress(e,t).slice(2),i.slice(2)),value:o,invokeWallet:s}),m=async(e,n)=>{let r=(await o.getErc20TokensForChainAPI(n)).find(e=>e.symbol===`USDT`);return r?t.caseInsensitiveEqual(e,r.erc20TokenAddress):!1},h=async(e,t,n,r,a,o)=>{if(await m(c.getContractAddress(n),e))try{await n.allowance(r,a)>0n&&t.push(l.createApproveEmporiumOp(n,a,0n,o))}catch(e){i.Logger.error(`Error in nullifyUsdtApprovalIfNeeded`,e)}},g=async(t,r,i,a,o,c,u,f)=>{if(i!==e.zeroAddress){let f=s.SWAP_FEE_TAKER_ADDRESSES[r],p=t.getContractWithFetcher(r,n.ContractType.ERC20Contract,i),m=await p.balanceOf(a);await h(r,c,p,a,f,u),c.push(l.createApproveEmporiumOp(p,f,2n**256n-1n,u));let g=new d.ethers.Contract(f,[`function takeSwapFee(address token, uint256 beforeBalance, uint256 variableRate, address relay) external payable`]),_=o;c.push(l.emporiumOp({contract:g,func:`takeSwapFee`,args:[i,m,e.HINKAL_SWAP_VARIABLE_RATE,_],invokeWallet:u}))}else{let t=o;c.push(l.emporiumOp({contract:t,value:f*e.HINKAL_SWAP_VARIABLE_RATE/10000n,invokeWallet:u}))}},_=async(t,i,a,o,c,u,m,_,v,y,b,x,S=!1)=>{let C=m<0n?-1n*m:m,w=[],T=s.NATIVE_TOKEN_WRAPPER_ADDRESSES[i],E=!1,D;if(a===r.ExternalActionId.OneInch||a===r.ExternalActionId.Lifi){if(u!==e.zeroAddress){let e=t.getContractWithFetcher(i,n.ContractType.ERC20Contract,u);w.push(l.createApproveEmporiumOp(e,o,C,S))}let s=0n;return u===e.zeroAddress&&(s+=C),_&&v===e.zeroAddress&&_<0n&&(s+=-1n*_),D=p(i,a,o,c,b,s>0n?s:void 0,S),w.push(D),(a===r.ExternalActionId.OneInch||y&&a===r.ExternalActionId.Lifi)&&v&&_!==void 0&&await g(t,i,v,b,x,w,S,_),w}if(!v||!_)throw Error(`There should be output token for UniSwap and Odos`);if(u===e.zeroAddress){let e=t.getContractWithFetcher(i,n.ContractType.ERC20Contract,T);w.push(l.emporiumOp({contract:e,func:`deposit`,value:C,invokeWallet:S})),u=T}let O=0n;if(v===e.zeroAddress&&(v=T,E=!0,O=await t.getContractWithFetcher(i,n.ContractType.ERC20Contract,T).balanceOf(b)),u!==e.zeroAddress){let e=t.getContractWithFetcher(i,n.ContractType.ERC20Contract,u);await h(i,w,e,b,o,S),w.push(l.createApproveEmporiumOp(e,o,C,S))}if(D=a===r.ExternalActionId.Uniswap?f(o,u,C,v,b,c,S):p(i,a,o,c,b,void 0,S),w.push(D),await g(t,i,v,b,x,w,S,_),E){let e=s.WRAPPER_TOKEN_EXCHANGE_ADDRESSES[i],r=t.getContractWithFetcher(i,n.ContractType.ERC20Contract,T);w.push(l.createApproveEmporiumOp(r,e,2n**256n-1n,S));let a=new d.ethers.Contract(e,[`function withdrawBalanceDifference(uint256 beforeBalance) external`]);w.push(l.emporiumOp({contract:a,func:`withdrawBalanceDifference`,args:[O],invokeWallet:S}))}return w};exports.createSwapToEmporiumOpForUniswap=f,exports.createSwapToEmporiumOps=_;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/protocol.constants.cjs`),t=require(`../utils/caseInsensitive.utils.cjs`),n=require(`../../types/ethereum-network.types.cjs`),r=require(`../../types/external-action.types.cjs`),i=require(`../../error-handling/logger.cjs`),a=require(`../utils/string.utils.cjs`),o=require(`../utils/erc20tokenFunctions.cjs`),s=require(`../pre-transaction/getExternalSwapAddress.cjs`),c=require(`../utils/getContractAddress.cjs`),l=require(`./emporium.helpers.cjs`),u=require(`../../constants/addresses.constants.cjs`);let d=require(`ethers`);var f=(e,t,n,r,i,o,c=!1)=>l.emporiumOp({contract:n,callDataString:a.replaceAllInstances(r,s.getExternalSwapAddress(e,t).slice(2),i.slice(2)),value:o,invokeWallet:c}),p=async(e,n)=>{let r=(await o.getErc20TokensForChainAPI(n)).find(e=>e.symbol===`USDT`);return r?t.caseInsensitiveEqual(e,r.erc20TokenAddress):!1},m=async(e,t,n,r,a,o)=>{if(await p(c.getContractAddress(n),e))try{await n.allowance(r,a)>0n&&t.push(l.createApproveEmporiumOp(n,a,0n,o))}catch(e){i.Logger.error(`Error in nullifyUsdtApprovalIfNeeded`,e)}},h=async(t,r,i,a,o,s,c,f)=>{if(i!==e.zeroAddress){let f=u.SWAP_FEE_TAKER_ADDRESSES[r],p=t.getContractWithFetcher(r,n.ContractType.ERC20Contract,i),h=await p.balanceOf(a);await m(r,s,p,a,f,c),s.push(l.createApproveEmporiumOp(p,f,2n**256n-1n,c));let g=new d.ethers.Contract(f,[`function takeSwapFee(address token, uint256 beforeBalance, uint256 variableRate, address relay) external payable`]),_=o;s.push(l.emporiumOp({contract:g,func:`takeSwapFee`,args:[i,h,e.HINKAL_SWAP_VARIABLE_RATE,_],invokeWallet:c}))}else{let t=o;s.push(l.emporiumOp({contract:t,value:f*e.HINKAL_SWAP_VARIABLE_RATE/10000n,invokeWallet:c}))}},g=async(t,i,a,o,s,c,u,d,p,m,g,_,v=!1)=>{if(a!==r.ExternalActionId.Lifi)throw Error(`Unsupported swap external action for emporium ops: ${a}`);let y=u<0n?-1n*u:u,b=[];if(c!==e.zeroAddress){let e=t.getContractWithFetcher(i,n.ContractType.ERC20Contract,c);b.push(l.createApproveEmporiumOp(e,o,y,v))}let x=0n;c===e.zeroAddress&&(x+=y),d&&p===e.zeroAddress&&d<0n&&(x+=-1n*d);let S=x>0n?x:void 0;return b.push(f(i,a,o,s,g,S,v)),m&&p&&d!==void 0&&await h(t,i,p,g,_,b,v,d),b};exports.createSwapToEmporiumOps=g;

package/common/src/functions/private-wallet/emporium.swap.helpers.d.ts

@@ -1,4 +1,3 @@
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
 import { ExternalActionId } from '../../types/external-action.types';
-export declare const createSwapToEmporiumOpForUniswap: (routerAddress: string, inputTokenAddress: string, positiveAmountInput: bigint, outputTokenAddress: string, recipient: string, data: string, invokeWallet?: boolean) => string;
 export declare const createSwapToEmporiumOps: (hinkal: IHinkal, chainId: number, externalActionId: ExternalActionId, routerAddress: string, data: string, inputTokenAddress: string, inputAmount: bigint, outputAmount: bigint | undefined, outputTokenAddress: string | undefined, isTheSameChainSwap: boolean, walletAddress: string, relay: string, invokeWallet?: boolean) => Promise<string[]>;

package/common/src/functions/private-wallet/emporium.swap.helpers.mjs

@@ -5,103 +5,61 @@ import { ExternalActionId as i } from "../../types/external-action.types.mjs";
 import { Logger as a } from "../../error-handling/logger.mjs";
 import { replaceAllInstances as o } from "../utils/string.utils.mjs";
 import { getErc20TokensForChainAPI as s } from "../utils/erc20tokenFunctions.mjs";
-import { NATIVE_TOKEN_WRAPPER_ADDRESSES as c, SWAP_FEE_TAKER_ADDRESSES as l, WRAPPER_TOKEN_EXCHANGE_ADDRESSES as u } from "../../constants/addresses.constants.mjs";
-import { getContractAddress as d } from "../utils/getContractAddress.mjs";
-import { createApproveEmporiumOp as f, emporiumOp as p } from "./emporium.helpers.mjs";
-import { getExternalSwapAddress as m } from "../pre-transaction/getExternalSwapAddress.mjs";
-import { ethers as h } from "ethers";
+import { getExternalSwapAddress as c } from "../pre-transaction/getExternalSwapAddress.mjs";
+import { getContractAddress as l } from "../utils/getContractAddress.mjs";
+import { createApproveEmporiumOp as u, emporiumOp as d } from "./emporium.helpers.mjs";
+import { SWAP_FEE_TAKER_ADDRESSES as f } from "../../constants/addresses.constants.mjs";
+import { ethers as p } from "ethers";
 //#region libs/shared/common/src/functions/private-wallet/emporium.swap.helpers.ts
-var g = (e, t, n, r, i, a, o = !1) => {
-	let s = {
-		tokenIn: t,
-		tokenOut: r,
-		fee: BigInt(a),
-		recipient: i,
-		amountIn: n,
-		amountOutMinimum: 0,
-		sqrtPriceLimitX96: 0
-	};
-	return p({
-		contract: new h.Contract(e, ["function exactInputSingle(tuple(address tokenIn,address tokenOut,uint24 fee,address recipient,uint256 amountIn,uint256 amountOutMinimum,uint160 sqrtPriceLimitX96)) external payable returns (uint256 amountOut)"]),
-		func: "exactInputSingle",
-		args: [s],
-		invokeWallet: o
-	});
-}, _ = (e, t, n, r, i, a, s = !1) => p({
+var m = (e, t, n, r, i, a, s = !1) => d({
 	contract: n,
-	callDataString: o(r, m(e, t).slice(2), i.slice(2)),
+	callDataString: o(r, c(e, t).slice(2), i.slice(2)),
 	value: a,
 	invokeWallet: s
-}), v = async (e, t) => {
+}), h = async (e, t) => {
 	let r = (await s(t)).find((e) => e.symbol === "USDT");
 	return r ? n(e, r.erc20TokenAddress) : !1;
-}, y = async (e, t, n, r, i, o) => {
-	if (await v(d(n), e)) try {
-		await n.allowance(r, i) > 0n && t.push(f(n, i, 0n, o));
+}, g = async (e, t, n, r, i, o) => {
+	if (await h(l(n), e)) try {
+		await n.allowance(r, i) > 0n && t.push(u(n, i, 0n, o));
 	} catch (e) {
 		a.error("Error in nullifyUsdtApprovalIfNeeded", e);
 	}
-}, b = async (n, i, a, o, s, c, u, d) => {
+}, _ = async (n, i, a, o, s, c, l, m) => {
 	if (a !== t) {
-		let t = l[i], d = n.getContractWithFetcher(i, r.ERC20Contract, a), m = await d.balanceOf(o);
-		await y(i, c, d, o, t, u), c.push(f(d, t, 2n ** 256n - 1n, u));
-		let g = new h.Contract(t, ["function takeSwapFee(address token, uint256 beforeBalance, uint256 variableRate, address relay) external payable"]), _ = s;
-		c.push(p({
-			contract: g,
+		let t = f[i], m = n.getContractWithFetcher(i, r.ERC20Contract, a), h = await m.balanceOf(o);
+		await g(i, c, m, o, t, l), c.push(u(m, t, 2n ** 256n - 1n, l));
+		let _ = new p.Contract(t, ["function takeSwapFee(address token, uint256 beforeBalance, uint256 variableRate, address relay) external payable"]), v = s;
+		c.push(d({
+			contract: _,
 			func: "takeSwapFee",
 			args: [
 				a,
-				m,
+				h,
 				e,
-				_
+				v
 			],
-			invokeWallet: u
+			invokeWallet: l
 		}));
 	} else {
 		let t = s;
-		c.push(p({
+		c.push(d({
 			contract: t,
-			value: d * e / 10000n,
-			invokeWallet: u
+			value: m * e / 10000n,
+			invokeWallet: l
 		}));
 	}
-}, x = async (e, n, a, o, s, l, d, m, v, x, S, C, w = !1) => {
-	let T = d < 0n ? -1n * d : d, E = [], D = c[n], O = !1, k;
-	if (a === i.OneInch || a === i.Lifi) {
-		if (l !== t) {
-			let t = e.getContractWithFetcher(n, r.ERC20Contract, l);
-			E.push(f(t, o, T, w));
-		}
-		let c = 0n;
-		return l === t && (c += T), m && v === t && m < 0n && (c += -1n * m), k = _(n, a, o, s, S, c > 0n ? c : void 0, w), E.push(k), (a === i.OneInch || x && a === i.Lifi) && v && m !== void 0 && await b(e, n, v, S, C, E, w, m), E;
+}, v = async (e, n, a, o, s, c, l, d, f, p, h, g, v = !1) => {
+	if (a !== i.Lifi) throw Error(`Unsupported swap external action for emporium ops: ${a}`);
+	let y = l < 0n ? -1n * l : l, b = [];
+	if (c !== t) {
+		let t = e.getContractWithFetcher(n, r.ERC20Contract, c);
+		b.push(u(t, o, y, v));
 	}
-	if (!v || !m) throw Error("There should be output token for UniSwap and Odos");
-	if (l === t) {
-		let t = e.getContractWithFetcher(n, r.ERC20Contract, D);
-		E.push(p({
-			contract: t,
-			func: "deposit",
-			value: T,
-			invokeWallet: w
-		})), l = D;
-	}
-	let A = 0n;
-	if (v === t && (v = D, O = !0, A = await e.getContractWithFetcher(n, r.ERC20Contract, D).balanceOf(S)), l !== t) {
-		let t = e.getContractWithFetcher(n, r.ERC20Contract, l);
-		await y(n, E, t, S, o, w), E.push(f(t, o, T, w));
-	}
-	if (k = a === i.Uniswap ? g(o, l, T, v, S, s, w) : _(n, a, o, s, S, void 0, w), E.push(k), await b(e, n, v, S, C, E, w, m), O) {
-		let t = u[n], i = e.getContractWithFetcher(n, r.ERC20Contract, D);
-		E.push(f(i, t, 2n ** 256n - 1n, w));
-		let a = new h.Contract(t, ["function withdrawBalanceDifference(uint256 beforeBalance) external"]);
-		E.push(p({
-			contract: a,
-			func: "withdrawBalanceDifference",
-			args: [A],
-			invokeWallet: w
-		}));
-	}
-	return E;
+	let x = 0n;
+	c === t && (x += y), d && f === t && d < 0n && (x += -1n * d);
+	let S = x > 0n ? x : void 0;
+	return b.push(m(n, a, o, s, h, S, v)), p && f && d !== void 0 && await _(e, n, f, h, g, b, v, d), b;
 };
 //#endregion
-export { g as createSwapToEmporiumOpForUniswap, x as createSwapToEmporiumOps };
+export { v as createSwapToEmporiumOps };

package/common/src/functions/private-wallet/index.cjs

@@ -1 +1 @@
-require(`./emporium.helpers.cjs`),require(`./opProducer.cjs`),require(`./emporium.swap.helpers.cjs`);
+require(`./emporium.helpers.cjs`),require(`./emporium.swap.helpers.cjs`);

package/common/src/functions/private-wallet/index.d.ts

@@ -1,3 +1,2 @@
 export * from './emporium.helpers';
-export * from './opProducer';
 export * from './emporium.swap.helpers';

package/common/src/functions/private-wallet/index.mjs

@@ -1,3 +1,2 @@
 import "./emporium.helpers.mjs";
-import "./opProducer.mjs";
 import "./emporium.swap.helpers.mjs";