@sabaaa1/common 0.1.6 → 0.1.14

package/functions/pre-transaction/solana.mjs

@@ -0,0 +1,96 @@
+import { BN as u } from "@coral-xyz/anchor";
+import { PublicKey as c } from "@solana/web3.js";
+const f = (e) => {
+  const t = [];
+  let r = e;
+  for (; r > 0n; )
+    t.unshift(Number(r % 256n)), r /= 256n;
+  for (; t.length < 32; )
+    t.unshift(0);
+  return t;
+}, a = (e) => ({
+  extraRandomization: f(e.extraRandomization),
+  stealthAddress: f(e.stealthAddress),
+  h0: f(e.H0),
+  h1: f(e.H1)
+}), l = (e, t, r) => {
+  const o = f(e), n = [Buffer.from("hinkal_nullifier"), t.toBuffer(), Buffer.from(o)], [s] = c.findProgramAddressSync(n, r);
+  return s;
+}, A = (e, t) => {
+  const r = [Buffer.from("hinkal"), t.toBuffer()], [o] = c.findProgramAddressSync(r, e);
+  return o;
+}, B = (e, t) => {
+  const r = [Buffer.from("hinkal_merkle"), t.toBuffer()], [o] = c.findProgramAddressSync(r, e);
+  return o;
+}, m = (e, t) => {
+  const r = [Buffer.from("hinkal_merkle_access_token"), t.toBuffer()], [o] = c.findProgramAddressSync(r, e);
+  return o;
+}, g = (e, t) => {
+  const r = [Buffer.from("hinkal_access_token"), t.toBuffer()], [o] = c.findProgramAddressSync(r, e);
+  return o;
+}, y = (e, t) => {
+  const r = [Buffer.from("hinkal_swapper"), t.toBuffer()], [o] = c.findProgramAddressSync(r, e);
+  return o;
+}, P = (e, t) => {
+  const r = [Buffer.from("hinkal_vault"), t.toBuffer()], [o] = c.findProgramAddressSync(r, e);
+  return o;
+}, k = (e, t, r) => {
+  const o = f(e), n = [Buffer.from("hinkal_access_keys"), r.toBuffer(), Buffer.from(o)], [s] = c.findProgramAddressSync(n, t);
+  return s;
+}, S = (e, t, r, o) => {
+  const n = [
+    Buffer.from("hinkal_proof_part1"),
+    t.toBuffer(),
+    r.toBuffer(),
+    new u(o.toString()).toBuffer("be", 4)
+    // 4 here because type of id is u32
+  ], [s] = c.findProgramAddressSync(n, e);
+  return s;
+}, h = (e, t, r, o) => {
+  const n = [
+    Buffer.from("hinkal_proof_part2"),
+    t.toBuffer(),
+    r.toBuffer(),
+    new u(o.toString()).toBuffer("be", 4)
+    // 4 here because type of id is u32
+  ], [s] = c.findProgramAddressSync(n, e);
+  return s;
+}, _ = (e, t, r, o) => {
+  const n = [
+    Buffer.from("hinkal_encrypted_outputs"),
+    t.toBuffer(),
+    r.toBuffer(),
+    new u(o.toString()).toBuffer("be", 4)
+    // 4 here because type of id is u32
+  ], [s] = c.findProgramAddressSync(n, e);
+  return s;
+}, b = (e, t, r) => {
+  const o = [Buffer.from("hinkal_token_limit"), t.toBuffer(), r.toBuffer()], [n] = c.findProgramAddressSync(o, e);
+  return n;
+}, p = (e, t, r, o) => {
+  const n = [
+    Buffer.from("hinkal_instructions"),
+    t.toBuffer(),
+    r.toBuffer(),
+    new u(o.toString()).toBuffer("be", 4)
+    // 4 here because type of id is u32
+  ], [s] = c.findProgramAddressSync(n, e);
+  return s;
+};
+export {
+  a as buildAnchorStealthAddressStructure,
+  f as encodeToByte32Array,
+  k as getAccessTokenAccountPublicKey,
+  m as getAccessTokenMerkleAccountPublicKey,
+  g as getAccessTokenStorageAccountPublicKey,
+  _ as getEncryptedOutputsAccountPublicKey,
+  p as getInstructionsAccountPublicKey,
+  B as getMerkleAccountPublicKey,
+  l as getNullifierAccount,
+  S as getProofAccountPart1PublicKey,
+  h as getProofAccountPart2PublicKey,
+  A as getStorageAccountPublicKey,
+  P as getStorageVaultPublicKey,
+  y as getSwapperAccountPublicKey,
+  b as getTokenLimitStorageAccountPublicKey
+};

package/functions/pre-transaction/solanaTransfer.utils.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t=require("@solana/spl-token"),i=require("@solana/web3.js"),g=require("../../constants/protocol.constants.cjs"),p=async(l,e,c,T,a)=>{const{erc20TokenAddress:u,is2022Program:d,decimals:I}=T,s=[];if(u===g.solanaNativeAddress)return s.push(i.SystemProgram.transfer({fromPubkey:e,toPubkey:c,lamports:Number(a)})),{instructions:s,programId:i.SystemProgram.programId};const n=d?t.TOKEN_2022_PROGRAM_ID:t.TOKEN_PROGRAM_ID,r=new i.PublicKey(u),A=await t.getAssociatedTokenAddress(r,e,!0,n),o=await t.getAssociatedTokenAddress(r,c,!0,n);return await l.getAccountInfo(o)||s.push(t.createAssociatedTokenAccountInstruction(e,o,c,r,n)),d?s.push(t.createTransferCheckedInstruction(A,r,o,e,a,I,[],n)):s.push(t.createTransferInstruction(A,o,e,a,[],n)),{instructions:s,programId:n}};exports.buildSolanaTransferInstructions=p;

package/functions/pre-transaction/solanaTransfer.utils.d.ts

@@ -0,0 +1,6 @@
+import { Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';
+import { ERC20Token } from '../../types/token.types';
+export declare const buildSolanaTransferInstructions: (connection: Connection, fromPubkey: PublicKey, toPubkey: PublicKey, token: ERC20Token, amount: bigint) => Promise<{
+    instructions: TransactionInstruction[];
+    programId: PublicKey;
+}>;

package/functions/pre-transaction/solanaTransfer.utils.mjs

@@ -0,0 +1,38 @@
+import { TOKEN_2022_PROGRAM_ID as f, TOKEN_PROGRAM_ID as T, getAssociatedTokenAddress as d, createAssociatedTokenAccountInstruction as g, createTransferCheckedInstruction as l, createTransferInstruction as h } from "@solana/spl-token";
+import { SystemProgram as A, PublicKey as _ } from "@solana/web3.js";
+import { solanaNativeAddress as w } from "../../constants/protocol.constants.mjs";
+const D = async (p, n, c, I, e) => {
+  const { erc20TokenAddress: a, is2022Program: i, decimals: m } = I, t = [];
+  if (a === w)
+    return t.push(
+      A.transfer({
+        fromPubkey: n,
+        toPubkey: c,
+        lamports: Number(e)
+      })
+    ), {
+      instructions: t,
+      programId: A.programId
+    };
+  const r = i ? f : T, o = new _(a), u = await d(o, n, !0, r), s = await d(o, c, !0, r);
+  return await p.getAccountInfo(s) || t.push(
+    g(n, s, c, o, r)
+  ), i ? t.push(
+    l(
+      u,
+      o,
+      s,
+      n,
+      e,
+      m,
+      [],
+      r
+    )
+  ) : t.push(h(u, s, n, e, [], r)), {
+    instructions: t,
+    programId: r
+  };
+};
+export {
+  D as buildSolanaTransferInstructions
+};

package/functions/pre-transaction/store-instructions.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("./sendV0Transaction.cjs"),i=require("./solana.cjs"),a=async(o,n,t,s,c,e)=>{const r=await n.methods.storeInstructions(Number(c),e).accounts({signer:t.publicKey,originalDeployer:s}).instruction();return await u.sendV0Transaction(o,[r],t,[t]),i.getInstructionsAccountPublicKey(n.programId,s,t.publicKey,c)};exports.storeInstructions=a;

package/functions/pre-transaction/store-instructions.d.ts

@@ -0,0 +1,4 @@
+import { Program } from '@coral-xyz/anchor';
+import { HinkalInstruction } from './convert-okx-instructions';
+import { Connection, Keypair, PublicKey } from '@solana/web3.js';
+export declare const storeInstructions: (connection: Connection, hinkalProgram: Program, signer: Keypair, originalDeployer: PublicKey, id: bigint, instructions: HinkalInstruction[]) => Promise<PublicKey>;

package/functions/pre-transaction/store-instructions.mjs

@@ -0,0 +1,9 @@
+import { sendV0Transaction as i } from "./sendV0Transaction.mjs";
+import { getInstructionsAccountPublicKey as e } from "./solana.mjs";
+const p = async (s, c, t, o, n, r) => {
+  const u = await c.methods.storeInstructions(Number(n), r).accounts({ signer: t.publicKey, originalDeployer: o }).instruction();
+  return await i(s, [u], t, [t]), e(c.programId, o, t.publicKey, n);
+};
+export {
+  p as storeInstructions
+};

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

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("./solana.cjs"),e=require("./sendV0Transaction.cjs"),f=require("../../constants/protocol.constants.cjs"),K=async(s,o,t,c,u,b,d,y,A,n)=>{const a=r.getEncryptedOutputsAccountPublicKey(o.programId,c,t.publicKey,u),N={outputs:b.map(I=>Buffer.from(I))},T=await o.methods.storeEncryptedOutputs(Number(u),N).accounts({originalDeployer:c,signer:t.publicKey,encryptedOutputsAccount:a}).instruction();await e.sendV0Transaction(s,[T],t,[t]);const P=r.getProofAccountPart1PublicKey(o.programId,c,t.publicKey,u),_=await o.methods.storeProofPart1(Number(u),d,y,A,n.slice(0,f.SOLANA_PUBLIC_INPUT_PART_ONE_LENGTH)).accounts({originalDeployer:c,signer:t.publicKey,proofAccountPart1:P}).instruction();await e.sendV0Transaction(s,[_],t,[t]);const p=r.getProofAccountPart2PublicKey(o.programId,c,t.publicKey,u),O=await o.methods.storeProofPart2(Number(u),n.slice(f.SOLANA_PUBLIC_INPUT_PART_ONE_LENGTH)).accounts({originalDeployer:c,signer:t.publicKey,proofAccountPart2:p}).instruction();return await e.sendV0Transaction(s,[O],t,[t]),{proofAccountPart1:P,proofAccountPart2:p,encryptedOutputsAccount:a}};exports.storeProof=K;

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

@@ -0,0 +1,7 @@
+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<{
+    proofAccountPart1: PublicKey;
+    proofAccountPart2: PublicKey;
+    encryptedOutputsAccount: PublicKey;
+}>;

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

@@ -0,0 +1,55 @@
+import { getEncryptedOutputsAccountPublicKey as O, getProofAccountPart1PublicKey as w, getProofAccountPart2PublicKey as E } from "./solana.mjs";
+import { sendV0Transaction as r } from "./sendV0Transaction.mjs";
+import { SOLANA_PUBLIC_INPUT_PART_ONE_LENGTH as f } from "../../constants/protocol.constants.mjs";
+const B = async (s, c, t, o, u, n, m, b, y, p) => {
+  const e = O(
+    c.programId,
+    o,
+    t.publicKey,
+    u
+  ), K = {
+    outputs: n.map((N) => Buffer.from(N))
+  }, A = await c.methods.storeEncryptedOutputs(
+    Number(u),
+    K
+  ).accounts({
+    originalDeployer: o,
+    signer: t.publicKey,
+    encryptedOutputsAccount: e
+  }).instruction();
+  await r(s, [A], t, [t]);
+  const a = w(
+    c.programId,
+    o,
+    t.publicKey,
+    u
+  ), d = await c.methods.storeProofPart1(
+    Number(u),
+    m,
+    b,
+    y,
+    p.slice(0, f)
+  ).accounts({
+    originalDeployer: o,
+    signer: t.publicKey,
+    proofAccountPart1: a
+  }).instruction();
+  await r(s, [d], t, [t]);
+  const P = E(
+    c.programId,
+    o,
+    t.publicKey,
+    u
+  ), I = await c.methods.storeProofPart2(
+    Number(u),
+    p.slice(f)
+  ).accounts({
+    originalDeployer: o,
+    signer: t.publicKey,
+    proofAccountPart2: P
+  }).instruction();
+  return await r(s, [I], t, [t]), { proofAccountPart1: a, proofAccountPart2: P, encryptedOutputsAccount: e };
+};
+export {
+  B as storeProof
+};

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("ethers"),p=require("../../constants/protocol.constants.cjs"),g=require("../../types/ethereum-network.types.cjs");require("idb-keyval");const I=require("../utils/create-provider.cjs");require("../../constants/token-data/index.cjs");require("../../error-handling/error-codes.constants.cjs");const f=require("../../constants/chains.constants.cjs");require("../utils/convertIntegrationProviderToExternalActionId.cjs");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");require("circomlibjs-hinkal-fork");const y=require("../../data-structures/crypto-keys/keys.cjs");require("../../constants/server.constants.cjs");require("../../constants/vite.constants.cjs");require("axios");const h=require("../utils/caseInsensitive.utils.cjs");require("../../API/getServerURL.cjs");require("../../constants/reorg-depths.constants.cjs");require("../utils/mutexes.utils.cjs");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/save-depths.cjs");const w=require("../../error-handling/logger.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.constants.cjs");require("../../constants/presale.constants.cjs");require("../../constants/mystery-boxes.constants.cjs");require("../../constants/activity.constants.cjs");require("../../constants/tasks.constants.cjs");require("../../constants/events.constants.cjs");require("../utils/userAgent.cjs");const F=require("../utils/string.utils.cjs");require("multiformats");require("../../API/tenderly.api.cjs");const O=require("../utils/replaceAddressInCalldata.cjs"),P=require("ethers-v6h"),m=({contract:e,func:r,args:n,callDataString:t,invokeWallet:i,value:s})=>{let o=new Uint8Array,c=t?u.utils.arrayify(t):new Uint8Array;if(typeof e=="object"&&"address"in e){if(o=u.utils.arrayify(e.address),t?.length&&t?.length>0)throw Error("If function and args are providedm no calldata is needed");r&&n&&!t&&(c=u.utils.arrayify(e.interface.encodeFunctionData(r,n)))}else o=u.utils.arrayify(e);const a=u.utils.arrayify([i?1:0]),d=u.utils.zeroPad(u.utils.arrayify(u.BigNumber.from(s??0n)),16),l=u.utils.concat([o,a,d,c]);return u.utils.hexlify(l)},D=async(e,r,n,t,i,s)=>{const o=n?await y.UserKeys.signTypedDataFromPrivateKey(n,{name:"Emporium",version:"1.0.0",chainId:e,verifyingContract:r},{EmporiumSignature:[{name:"message",type:"uint256"}]},{message:i}):void 0,{v:c,r:a,s:d}=o?u.utils.splitSignature(o):{v:0,r:"0x",s:"0x"};return u.utils.defaultAbiCoder.encode(["tuple(uint8 v,bytes32 r, bytes32 s, uint256 message, address signerAddress, bytes[] ops)"],[{v:c,r:a,s:d,message:i??0n,signerAddress:s??p.zeroAddress,ops:t}])},q=(e,r,n,t)=>m(e?{contract:e,func:"transfer",args:[r,n],invokeWallet:t}:{contract:r,value:n,invokeWallet:t}),W=(e,r,n,t)=>{const i=e.getContractWithFetcher(g.ContractType.HinkalContract);return r.map((s,o)=>{const c=h.caseInsensitiveEqual(s,p.zeroAddress)?void 0:e.getContractWithFetcher(g.ContractType.ERC20Contract,s);return q(c,t??i.address,n[o],!0)})},v=(e,r,n,t)=>m({contract:e,func:"approve",args:[r,n],invokeWallet:t}),A=(e,r,n)=>{const t=e.getSelectedNetwork()?.contractData.hinkalAddress;if(!t)throw Error("No Hinkal Address Provided to modifyDataForProxy");return F.replaceAllInstances(n,t.slice(2),r.slice(2))},T=(e,r,n)=>{if(!r)throw Error("No private key provided to modifyDataForProxy");const t=y.UserKeys.getSignerAddressFromPrivateKey(r);return A(e,t,n)},C=(e,r,n,t,i,s,o)=>{const c=[];for(let a=0;a<r.length;a+=1){const d=r[a],l=h.caseInsensitiveEqual(d,p.zeroAddress)?void 0:e.getContractWithFetcher(g.ContractType.ERC20Contract,d);c.push(q(l,s,n[a],!1))}if(o)for(let a=0;a<t.length;a+=1){const d=t[a];if(!h.caseInsensitiveEqual(d,p.zeroAddress)){const l=e.getContractWithFetcher(g.ContractType.ERC20Contract,d);c.push(v(l,o,i[a],!0))}}return c},x=(e,r,n,t,i,s,o,c,a,d)=>{const l=C(e,r,n,t,i,s,o);if(!!c&&!!a){const k=e.getContractWithFetcher(g.ContractType.HinkalContract);l.push(m({contract:c,callDataString:O.replaceAddressesInCalldata(a,k.address,s),value:d,invokeWallet:!0}))}return l},z="0xef0100",E=async(e,r)=>{try{const{fetchRpcUrl:n}=f.networkRegistry[e];if(!n)throw new Error("RPC URL not found for the specified chain ID");const t=I.createTorRpcProvider(n),i=await t.getCode(r);if(i==="0x"||!i)return{delegated:!1,implementation:void 0,nonce:void 0};if(i.toLowerCase().startsWith(z)&&i.length===48){const s=`0x${i.slice(8)}`,o=await t.getTransactionCount(r);return{delegated:!0,implementation:u.utils.getAddress(s),nonce:o}}else throw Error("checkEOAWithDelegation: It is a contract")}catch(n){throw w.Logger.error("checkEOAWithDelegation error",{error:n}),n}},B=e=>{const{hinkalWalletAddress:r}=f.networkRegistry[e].contractData;if(!r||h.caseInsensitiveEqual(r,p.zeroAddress))throw Error("Hinkal Wallet Address is not set");return r},R=async(e,r)=>{if(e===f.chainIds.localhost||!r)return;const n=y.UserKeys.getSignerAddressFromPrivateKey(r),{delegated:t,implementation:i}=await E(e,n),s=B(e);if(!t||!h.caseInsensitiveEqual(i,s)){const o=await y.UserKeys.authorizeDelegationFromPrivateKey(r,e,s);return{v:o.signature.v.toString(),r:o.signature.r,s:o.signature.s,nonce:o.nonce.toString(),address:s,chainId:String(e)}}},b=e=>{if(!e)return;const{v:r,r:n,s:t,nonce:i,chainId:s,address:o}=e;return{signature:P.ethers.Signature.from({v:r,r:n,s:t}),nonce:BigInt(i),chainId:BigInt(s),address:o}};exports.checkEOAWithDelegation=E;exports.createApproveEmporiumOp=v;exports.createTransaferEmporiumOpsBatch=W;exports.createTransferToEmporiumOp=q;exports.emporiumOp=m;exports.encodeEmporiumMetadata=D;exports.generateFundAndApproveOps=C;exports.generateFundApproveAndTransactOps=x;exports.getAuthorizationDataIfNeeded=R;exports.modifyDataForProxy=A;exports.modifyDataForProxyWithPrivateKey=T;exports.recoverAuthorizationData=b;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("ethers"),p=require("../../constants/protocol.constants.cjs"),g=require("../../types/ethereum-network.types.cjs");require("idb-keyval");const f=require("../../constants/chains.constants.cjs"),w=require("../utils/create-provider.cjs");require("../../constants/token-data/index.cjs");require("../../error-handling/error-codes.constants.cjs");require("../utils/convertIntegrationProviderToExternalActionId.cjs");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");require("circomlibjs-hinkal-fork");const h=require("../../data-structures/crypto-keys/keys.cjs");require("../../constants/server.constants.cjs");require("../../constants/vite.constants.cjs");require("../../data-structures/http/HttpClient.cjs");require("axios");const m=require("../utils/caseInsensitive.utils.cjs");require("../../API/getServerURL.cjs");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("../utils/mutexes.utils.cjs");require("@coral-xyz/anchor");const I=require("../../error-handling/logger.cjs");require("@solana/web3.js");require("@solana/spl-token");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.constants.cjs");require("../../constants/presale.constants.cjs");require("../../constants/activity.constants.cjs");require("../../constants/tasks.constants.cjs");require("../../constants/events.constants.cjs");require("../utils/userAgent.cjs");const O=require("../utils/string.utils.cjs");require("multiformats");require("../../API/tenderly.api.cjs");const D=require("../utils/replaceAddressInCalldata.cjs"),F=require("ethers-v6h"),y=({contract:e,func:r,args:n,callDataString:t,invokeWallet:i,value:s})=>{let o=new Uint8Array,c=t?u.utils.arrayify(t):new Uint8Array;if(typeof e=="object"&&"address"in e){if(o=u.utils.arrayify(e.address),t?.length&&t?.length>0)throw Error("If function and args are providedm no calldata is needed");r&&n&&!t&&(c=u.utils.arrayify(e.interface.encodeFunctionData(r,n)))}else o=u.utils.arrayify(e);const a=u.utils.arrayify([i?1:0]),d=u.utils.zeroPad(u.utils.arrayify(u.BigNumber.from(s??0n)),16),l=u.utils.concat([o,a,d,c]);return u.utils.hexlify(l)},P=async(e,r,n,t,i,s)=>{const o=n?await h.UserKeys.signTypedDataFromPrivateKey(e,n,{name:"Emporium",version:"1.0.0",chainId:e,verifyingContract:r},{EmporiumSignature:[{name:"message",type:"uint256"}]},{message:i}):void 0,{v:c,r:a,s:d}=o?u.utils.splitSignature(o):{v:0,r:"0x",s:"0x"};return u.utils.defaultAbiCoder.encode(["tuple(uint8 v,bytes32 r, bytes32 s, uint256 message, address signerAddress, bytes[] ops)"],[{v:c,r:a,s:d,message:i??0n,signerAddress:s??p.zeroAddress,ops:t}])},q=(e,r,n,t)=>y(e?{contract:e,func:"transfer",args:[r,n],invokeWallet:t}:{contract:r,value:n,invokeWallet:t}),W=(e,r,n,t)=>{const i=e.getContractWithFetcher(g.ContractType.HinkalContract);return r.map((s,o)=>{const c=m.caseInsensitiveEqual(s,p.zeroAddress)?void 0:e.getContractWithFetcher(g.ContractType.ERC20Contract,s);return q(c,t??i.address,n[o],!0)})},v=(e,r,n,t)=>y({contract:e,func:"approve",args:[r,n],invokeWallet:t}),A=(e,r,n)=>{const t=e.getSelectedNetwork()?.contractData.hinkalAddress;if(!t)throw Error("No Hinkal Address Provided to modifyDataForProxy");return O.replaceAllInstances(n,t.slice(2),r.slice(2))},T=(e,r,n)=>{if(!r)throw Error("No private key provided to modifyDataForProxy");const t=h.UserKeys.getSignerAddressFromPrivateKey(e.getCurrentChainId(),r);return A(e,t,n)},C=(e,r,n,t,i,s,o)=>{const c=[];for(let a=0;a<r.length;a+=1){const d=r[a],l=m.caseInsensitiveEqual(d,p.zeroAddress)?void 0:e.getContractWithFetcher(g.ContractType.ERC20Contract,d);c.push(q(l,s,n[a],!1))}if(o)for(let a=0;a<t.length;a+=1){const d=t[a];if(!m.caseInsensitiveEqual(d,p.zeroAddress)){const l=e.getContractWithFetcher(g.ContractType.ERC20Contract,d);c.push(v(l,o,i[a],!0))}}return c},x=(e,r,n,t,i,s,o,c,a,d)=>{const l=C(e,r,n,t,i,s,o);if(!!c&&!!a){const k=e.getContractWithFetcher(g.ContractType.HinkalContract);l.push(y({contract:c,callDataString:D.replaceAddressesInCalldata(a,k.address,s),value:d,invokeWallet:!0}))}return l},z="0xef0100",E=async(e,r)=>{try{const{fetchRpcUrl:n}=f.networkRegistry[e];if(!n)throw new Error("RPC URL not found for the specified chain ID");const t=w.createCustomRpcProvider(n),i=await t.getCode(r);if(i==="0x"||!i)return{delegated:!1,implementation:void 0,nonce:void 0};if(i.toLowerCase().startsWith(z)&&i.length===48){const s=`0x${i.slice(8)}`,o=await t.getTransactionCount(r);return{delegated:!0,implementation:u.utils.getAddress(s),nonce:o}}else throw Error("checkEOAWithDelegation: It is a contract")}catch(n){throw I.Logger.error("checkEOAWithDelegation error",{error:n}),n}},B=e=>{const{hinkalWalletAddress:r}=f.networkRegistry[e].contractData;if(!r||m.caseInsensitiveEqual(r,p.zeroAddress))throw Error("Hinkal Wallet Address is not set");return r},R=async(e,r)=>{if(e===f.chainIds.localhost||!r)return;const n=h.UserKeys.getSignerAddressFromPrivateKey(e,r),{delegated:t,implementation:i}=await E(e,n),s=B(e);if(!t||!m.caseInsensitiveEqual(i,s)){const o=await h.UserKeys.authorizeDelegation(e,r,s);return{v:o.signature.v.toString(),r:o.signature.r,s:o.signature.s,nonce:o.nonce.toString(),address:s,chainId:String(e)}}},b=e=>{if(!e)return;const{v:r,r:n,s:t,nonce:i,chainId:s,address:o}=e;return{signature:F.ethers.Signature.from({v:r,r:n,s:t}),nonce:BigInt(i),chainId:BigInt(s),address:o}};exports.checkEOAWithDelegation=E;exports.createApproveEmporiumOp=v;exports.createTransaferEmporiumOpsBatch=W;exports.createTransferToEmporiumOp=q;exports.emporiumOp=y;exports.encodeEmporiumMetadata=P;exports.generateFundAndApproveOps=C;exports.generateFundApproveAndTransactOps=x;exports.getAuthorizationDataIfNeeded=R;exports.modifyDataForProxy=A;exports.modifyDataForProxyWithPrivateKey=T;exports.recoverAuthorizationData=b;

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

@@ -2,10 +2,10 @@ import { utils as m, BigNumber as A } from "ethers";
 import { zeroAddress as u } from "../../constants/protocol.constants.mjs";
 import { ContractType as f } from "../../types/ethereum-network.types.mjs";
 import "idb-keyval";
-import { createTorRpcProvider as E } from "../utils/create-provider.mjs";
+import { networkRegistry as y, chainIds as E } from "../../constants/chains.constants.mjs";
+import { createCustomRpcProvider as w } from "../utils/create-provider.mjs";
 import "../../constants/token-data/index.mjs";
 import "../../error-handling/error-codes.constants.mjs";
-import { networkRegistry as y, chainIds as k } from "../../constants/chains.constants.mjs";
 import "../utils/convertIntegrationProviderToExternalActionId.mjs";
 import "../../types/circom-data.types.mjs";
 import "../../types/transactions.types.mjs";
@@ -14,23 +14,26 @@ import "circomlibjs-hinkal-fork";
 import { UserKeys as g } from "../../data-structures/crypto-keys/keys.mjs";
 import "../../constants/server.constants.mjs";
 import "../../constants/vite.constants.mjs";
+import "../../data-structures/http/HttpClient.mjs";
 import "axios";
 import { caseInsensitiveEqual as l } from "../utils/caseInsensitive.utils.mjs";
 import "../../API/getServerURL.mjs";
-import "../../constants/reorg-depths.constants.mjs";
-import "../utils/mutexes.utils.mjs";
 import "libsodium-wrappers";
 import "process";
 import "buffer";
 import "../../constants/save-depths.mjs";
-import { Logger as w } from "../../error-handling/logger.mjs";
+import "../../constants/reorg-depths.constants.mjs";
+import "../utils/mutexes.utils.mjs";
+import "@coral-xyz/anchor";
+import { Logger as k } from "../../error-handling/logger.mjs";
+import "@solana/web3.js";
+import "@solana/spl-token";
 import "../../constants/contracts.constants.mjs";
 import "../../constants/kyc.constants.mjs";
 import "../../constants/coingecko.constants.mjs";
 import "../../constants/addresses.constants.mjs";
 import "../../constants/token.limits.constants.mjs";
 import "../../constants/presale.constants.mjs";
-import "../../constants/mystery-boxes.constants.mjs";
 import "../../constants/activity.constants.mjs";
 import "../../constants/tasks.constants.mjs";
 import "../../constants/events.constants.mjs";
@@ -39,7 +42,7 @@ import { replaceAllInstances as W } from "../utils/string.utils.mjs";
 import "multiformats";
 import "../../API/tenderly.api.mjs";
 import { replaceAddressesInCalldata as F } from "../utils/replaceAddressInCalldata.mjs";
-import { ethers as P } from "ethers-v6h";
+import { ethers as D } from "ethers-v6h";
 const h = ({
   contract: t,
   func: r,
@@ -57,8 +60,9 @@ const h = ({
     n = m.arrayify(t);
   const s = m.arrayify([i ? 1 : 0]), p = m.zeroPad(m.arrayify(A.from(a ?? 0n)), 16), d = m.concat([n, s, p, c]);
   return m.hexlify(d);
-}, kt = async (t, r, o, e, i, a) => {
+}, Ft = async (t, r, o, e, i, a) => {
   const n = o ? await g.signTypedDataFromPrivateKey(
+    t,
     o,
     { name: "Emporium", version: "1.0.0", chainId: t, verifyingContract: r },
     { EmporiumSignature: [{ name: "message", type: "uint256" }] },
@@ -82,13 +86,13 @@ const h = ({
   func: "transfer",
   args: [r, o],
   invokeWallet: e
-} : { contract: r, value: o, invokeWallet: e }), wt = (t, r, o, e) => {
+} : { contract: r, value: o, invokeWallet: e }), Dt = (t, r, o, e) => {
   const i = t.getContractWithFetcher(f.HinkalContract);
   return r.map((a, n) => {
     const c = l(a, u) ? void 0 : t.getContractWithFetcher(f.ERC20Contract, a);
     return v(c, e ?? i.address, o[n], !0);
   });
-}, D = (t, r, o, e) => h({
+}, P = (t, r, o, e) => h({
   contract: t,
   func: "approve",
   args: [r, o],
@@ -98,10 +102,10 @@ const h = ({
   if (!e)
     throw Error("No Hinkal Address Provided to modifyDataForProxy");
   return W(o, e.slice(2), r.slice(2));
-}, Wt = (t, r, o) => {
+}, Pt = (t, r, o) => {
   if (!r)
     throw Error("No private key provided to modifyDataForProxy");
-  const e = g.getSignerAddressFromPrivateKey(r);
+  const e = g.getSignerAddressFromPrivateKey(t.getCurrentChainId(), r);
   return I(t, e, o);
 }, x = (t, r, o, e, i, a, n) => {
   const c = [];
@@ -114,11 +118,11 @@ const h = ({
       const p = e[s];
       if (!l(p, u)) {
         const d = t.getContractWithFetcher(f.ERC20Contract, p);
-        c.push(D(d, n, i[s], !0));
+        c.push(P(d, n, i[s], !0));
       }
     }
   return c;
-}, Ft = (t, r, o, e, i, a, n, c, s, p) => {
+}, It = (t, r, o, e, i, a, n, c, s, p) => {
   const d = x(
     t,
     r,
@@ -145,7 +149,7 @@ const h = ({
     const { fetchRpcUrl: o } = y[t];
     if (!o)
       throw new Error("RPC URL not found for the specified chain ID");
-    const e = E(o), i = await e.getCode(r);
+    const e = w(o), i = await e.getCode(r);
     if (i === "0x" || !i)
       return { delegated: !1, implementation: void 0, nonce: void 0 };
     if (i.toLowerCase().startsWith(O) && i.length === 48) {
@@ -154,19 +158,19 @@ const h = ({
     } else
       throw Error("checkEOAWithDelegation: It is a contract");
   } catch (o) {
-    throw w.error("checkEOAWithDelegation error", { error: o }), o;
+    throw k.error("checkEOAWithDelegation error", { error: o }), o;
   }
 }, R = (t) => {
   const { hinkalWalletAddress: r } = y[t].contractData;
   if (!r || l(r, u))
     throw Error("Hinkal Wallet Address is not set");
   return r;
-}, Pt = async (t, r) => {
-  if (t === k.localhost || !r)
+}, xt = async (t, r) => {
+  if (t === E.localhost || !r)
     return;
-  const o = g.getSignerAddressFromPrivateKey(r), { delegated: e, implementation: i } = await B(t, o), a = R(t);
+  const o = g.getSignerAddressFromPrivateKey(t, r), { delegated: e, implementation: i } = await B(t, o), a = R(t);
   if (!e || !l(i, a)) {
-    const n = await g.authorizeDelegationFromPrivateKey(r, t, a);
+    const n = await g.authorizeDelegation(t, r, a);
     return {
       v: n.signature.v.toString(),
       r: n.signature.r,
@@ -176,23 +180,23 @@ const h = ({
       chainId: String(t)
     };
   }
-}, Dt = (t) => {
+}, Ot = (t) => {
   if (!t)
     return;
   const { v: r, r: o, s: e, nonce: i, chainId: a, address: n } = t;
-  return { signature: P.Signature.from({ v: r, r: o, s: e }), nonce: BigInt(i), chainId: BigInt(a), address: n };
+  return { signature: D.Signature.from({ v: r, r: o, s: e }), nonce: BigInt(i), chainId: BigInt(a), address: n };
 };
 export {
   B as checkEOAWithDelegation,
-  D as createApproveEmporiumOp,
-  wt as createTransaferEmporiumOpsBatch,
+  P as createApproveEmporiumOp,
+  Dt as createTransaferEmporiumOpsBatch,
   v as createTransferToEmporiumOp,
   h as emporiumOp,
-  kt as encodeEmporiumMetadata,
+  Ft as encodeEmporiumMetadata,
   x as generateFundAndApproveOps,
-  Ft as generateFundApproveAndTransactOps,
-  Pt as getAuthorizationDataIfNeeded,
+  It as generateFundApproveAndTransactOps,
+  xt as getAuthorizationDataIfNeeded,
   I as modifyDataForProxy,
-  Wt as modifyDataForProxyWithPrivateKey,
-  Dt as recoverAuthorizationData
+  Pt as modifyDataForProxyWithPrivateKey,
+  Ot as recoverAuthorizationData
 };

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const y=require("ethers"),m=require("./emporium.helpers.cjs"),_=require("../../constants/addresses.constants.cjs"),R=require("../../types/external-action.types.cjs"),h=require("../../types/ethereum-network.types.cjs"),A=require("../pre-transaction/getExternalSwapAddress.cjs"),v=require("../utils/string.utils.cjs"),C=require("../../constants/protocol.constants.cjs");require("../../constants/token-data/index.cjs");const L=require("../utils/caseInsensitive.utils.cjs"),N=require("../../error-handling/logger.cjs"),z=require("../../constants/token-data/ERC20Registry.cjs"),T=(e,n,a,u,t,i,o=!1)=>{const r=y.BigNumber.from(i).toBigInt(),E={tokenIn:n,tokenOut:u,fee:r,recipient:t,amountIn:a,amountOutMinimum:0,sqrtPriceLimitX96:0},c=["function exactInputSingle(tuple(address tokenIn,address tokenOut,uint24 fee,address recipient,uint256 amountIn,uint256 amountOutMinimum,uint160 sqrtPriceLimitX96)) external payable returns (uint256 amountOut)"],g=new y.ethers.Contract(e,c);return m.emporiumOp({contract:g,func:"exactInputSingle",args:[E],invokeWallet:o})},F=(e,n,a,u,t,i,o=!1)=>{const r=A.getExternalSwapAddress(e,n),E=v.replaceAllInstances(u,r.slice(2),t.slice(2));return m.emporiumOp({contract:a,callDataString:E,value:i,invokeWallet:o})},P=async(e,n,a,u,t,i)=>{const o=a.address,E=z.getERC20Registry(e.getCurrentChainId()).find(c=>c.symbol==="USDT");if(E&&L.caseInsensitiveEqual(o,E.erc20TokenAddress))try{(await a.allowance(u,t)).toBigInt()>0n&&n.push(m.createApproveEmporiumOp(a,t,0n,i))}catch(c){N.Logger.error("Error in nullifyApprovalBeforeSwap",c)}},D=async(e,n,a,u,t,i,o)=>{if(n!==C.zeroAddress){const r=_.SWAP_FEE_TAKER_ADDRESSES[e.getCurrentChainId()],E=e.getContractWithFetcher(h.ContractType.ERC20Contract,n),c=await E.balanceOf(a);t.push(m.createApproveEmporiumOp(E,r,2n**256n-1n,i));const g=["function takeSwapFee(address token, uint256 beforeBalance, uint256 variableRate, address relay) external payable"],s=new y.ethers.Contract(r,g),w=u;t.push(m.emporiumOp({contract:s,func:"takeSwapFee",args:[n,c,C.HINKAL_SWAP_VARIABLE_RATE,w],invokeWallet:i}))}else{const r=u;t.push(m.emporiumOp({contract:r,value:o*C.HINKAL_SWAP_VARIABLE_RATE/10000n,invokeWallet:i}))}},d=async(e,n,a,u,t,i,o,r,E,c,g,s=!1)=>{const w=i<0n?-1n*i:i,b=e.getCurrentChainId(),f=[],S=_.NATIVE_TOKEN_WRAPPER_ADDRESSES[b];let q=!1,O;if(n===R.ExternalActionId.OneInch||n===R.ExternalActionId.Lifi){if(t!==C.zeroAddress){const l=e.getContractWithFetcher(h.ContractType.ERC20Contract,t);f.push(m.createApproveEmporiumOp(l,a,w,s))}let p=0n;t===C.zeroAddress&&(p+=w),o&&r===C.zeroAddress&&o<0n&&(p+=-1n*o);const I=p>0n?p:void 0;return O=F(e,n,a,u,c,I,s),f.push(O),(n===R.ExternalActionId.OneInch||E&&n===R.ExternalActionId.Lifi)&&r&&o!==void 0&&await D(e,r,c,g,f,s,o),f}if(!r||!o)throw Error("There should be output token for UniSwap and Odos");if(t===C.zeroAddress){const p=e.getContractWithFetcher(h.ContractType.ERC20Contract,S);f.push(m.emporiumOp({contract:p,func:"deposit",value:w,invokeWallet:s})),t=S}let B=0n;if(r===C.zeroAddress&&(r=S,q=!0,B=await e.getContractWithFetcher(h.ContractType.ERC20Contract,S).balanceOf(c)),t!==C.zeroAddress){const p=e.getContractWithFetcher(h.ContractType.ERC20Contract,t);await P(e,f,p,c,a,s),f.push(m.createApproveEmporiumOp(p,a,w,s))}if(n===R.ExternalActionId.Uniswap?O=T(a,t,w,r,c,u,s):O=F(e,n,a,u,c,void 0,s),f.push(O),await D(e,r,c,g,f,s,o),q){const p=_.WRAPPER_TOKEN_EXCHANGE_ADDRESSES[b],I=e.getContractWithFetcher(h.ContractType.ERC20Contract,S);f.push(m.createApproveEmporiumOp(I,p,2n**256n-1n,s));const l=["function withdrawBalanceDifference(uint256 beforeBalance) external"],x=new y.ethers.Contract(p,l);f.push(m.emporiumOp({contract:x,func:"withdrawBalanceDifference",args:[B],invokeWallet:s}))}return f};exports.createSwapToEmporiumOpForUniswap=T;exports.createSwapToEmporiumOpFromData=F;exports.createSwapToEmporiumOps=d;exports.nullifyApprovalBeforeSwap=P;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const R=require("ethers"),E=require("./emporium.helpers.cjs"),l=require("../../constants/addresses.constants.cjs"),I=require("../../types/external-action.types.cjs"),h=require("../../types/ethereum-network.types.cjs"),P=require("../pre-transaction/getExternalSwapAddress.cjs"),x=require("../utils/string.utils.cjs"),C=require("../../constants/protocol.constants.cjs");require("../../constants/token-data/index.cjs");const U=require("../utils/caseInsensitive.utils.cjs"),A=require("../../error-handling/logger.cjs"),L=require("../../constants/token-data/ERC20Registry.cjs"),B=(e,n,c,a,t,i,o=!1)=>{const r=R.BigNumber.from(i).toBigInt(),m={tokenIn:n,tokenOut:a,fee:r,recipient:t,amountIn:c,amountOutMinimum:0,sqrtPriceLimitX96:0},f=["function exactInputSingle(tuple(address tokenIn,address tokenOut,uint24 fee,address recipient,uint256 amountIn,uint256 amountOutMinimum,uint160 sqrtPriceLimitX96)) external payable returns (uint256 amountOut)"],g=new R.ethers.Contract(e,f);return E.emporiumOp({contract:g,func:"exactInputSingle",args:[m],invokeWallet:o})},F=(e,n,c,a,t,i,o=!1)=>{const r=P.getExternalSwapAddress(e,n),m=x.replaceAllInstances(a,r.slice(2),t.slice(2));return E.emporiumOp({contract:c,callDataString:m,value:i,invokeWallet:o})},v=(e,n)=>{const a=L.getERC20Registry(n).find(t=>t.symbol==="USDT");return a?U.caseInsensitiveEqual(e,a.erc20TokenAddress):!1},b=async(e,n,c,a,t,i)=>{const o=c.address;if(v(o,e.getCurrentChainId()))try{(await c.allowance(a,t)).toBigInt()>0n&&n.push(E.createApproveEmporiumOp(c,t,0n,i))}catch(r){A.Logger.error("Error in nullifyUsdtApprovalIfNeeded",r)}},d=async(e,n,c,a,t,i,o)=>{if(n!==C.zeroAddress){const r=l.SWAP_FEE_TAKER_ADDRESSES[e.getCurrentChainId()],m=e.getContractWithFetcher(h.ContractType.ERC20Contract,n),f=await m.balanceOf(c);await b(e,t,m,c,r,i),t.push(E.createApproveEmporiumOp(m,r,2n**256n-1n,i));const g=["function takeSwapFee(address token, uint256 beforeBalance, uint256 variableRate, address relay) external payable"],s=new R.ethers.Contract(r,g),w=a;t.push(E.emporiumOp({contract:s,func:"takeSwapFee",args:[n,f,C.HINKAL_SWAP_VARIABLE_RATE,w],invokeWallet:i}))}else{const r=a;t.push(E.emporiumOp({contract:r,value:o*C.HINKAL_SWAP_VARIABLE_RATE/10000n,invokeWallet:i}))}},z=async(e,n,c,a,t,i,o,r,m,f,g,s=!1)=>{const w=i<0n?-1n*i:i,q=e.getCurrentChainId(),u=[],O=l.NATIVE_TOKEN_WRAPPER_ADDRESSES[q];let D=!1,S;if(n===I.ExternalActionId.OneInch||n===I.ExternalActionId.Lifi){if(t!==C.zeroAddress){const _=e.getContractWithFetcher(h.ContractType.ERC20Contract,t);u.push(E.createApproveEmporiumOp(_,c,w,s))}let p=0n;t===C.zeroAddress&&(p+=w),o&&r===C.zeroAddress&&o<0n&&(p+=-1n*o);const y=p>0n?p:void 0;return S=F(e,n,c,a,f,y,s),u.push(S),(n===I.ExternalActionId.OneInch||m&&n===I.ExternalActionId.Lifi)&&r&&o!==void 0&&await d(e,r,f,g,u,s,o),u}if(!r||!o)throw Error("There should be output token for UniSwap and Odos");if(t===C.zeroAddress){const p=e.getContractWithFetcher(h.ContractType.ERC20Contract,O);u.push(E.emporiumOp({contract:p,func:"deposit",value:w,invokeWallet:s})),t=O}let T=0n;if(r===C.zeroAddress&&(r=O,D=!0,T=await e.getContractWithFetcher(h.ContractType.ERC20Contract,O).balanceOf(f)),t!==C.zeroAddress){const p=e.getContractWithFetcher(h.ContractType.ERC20Contract,t);await b(e,u,p,f,c,s),u.push(E.createApproveEmporiumOp(p,c,w,s))}if(n===I.ExternalActionId.Uniswap?S=B(c,t,w,r,f,a,s):S=F(e,n,c,a,f,void 0,s),u.push(S),await d(e,r,f,g,u,s,o),D){const p=l.WRAPPER_TOKEN_EXCHANGE_ADDRESSES[q],y=e.getContractWithFetcher(h.ContractType.ERC20Contract,O);u.push(E.createApproveEmporiumOp(y,p,2n**256n-1n,s));const _=["function withdrawBalanceDifference(uint256 beforeBalance) external"],N=new R.ethers.Contract(p,_);u.push(E.emporiumOp({contract:N,func:"withdrawBalanceDifference",args:[T],invokeWallet:s}))}return u};exports.createSwapToEmporiumOpForUniswap=B;exports.createSwapToEmporiumOpFromData=F;exports.createSwapToEmporiumOps=z;exports.nullifyUsdtApprovalIfNeeded=b;

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

@@ -3,5 +3,5 @@ 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 createSwapToEmporiumOpFromData: (hinkal: IHinkal, externalActionId: ExternalActionId, routerAddress: string, data: string, walletAddress: string, value?: bigint, invokeWallet?: boolean) => string;
-export declare const nullifyApprovalBeforeSwap: (hinkal: IHinkal, ops: string[], tokenContract: ethers.Contract, walletAddress: string, routerAddress: string, invokeWallet: boolean) => Promise<void>;
+export declare const nullifyUsdtApprovalIfNeeded: (hinkal: IHinkal, ops: string[], tokenContract: ethers.Contract, walletAddress: string, spenderAddress: string, invokeWallet: boolean) => Promise<void>;
 export declare const createSwapToEmporiumOps: (hinkal: IHinkal, 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[]>;