@primuslabs/fund-js-sdk 0.1.28 → 0.1.30

package/dist/index.js

@@ -176,6 +176,10 @@ var getErrArrFn = (error) => {
   return curErrorStrArr;
 };
 var formatErrFn = (error) => {
+  try {
+    console.log("error:", JSON.stringify(error));
+  } catch {
+  }
   let formatError = error;
   const curErrorStrArr = getErrArrFn(error);
   const userRejectErrStrArr = ["user rejected", "approval denied"];
@@ -2986,11 +2990,52 @@ var getTxIsOnProcess = (err) => {
   const isOnProcess = hasErrorFlagFn(curErrorStrArr, strArr);
   return isOnProcess;
 };
-async function isSolanaBalanceZero(connection, userPK) {
+async function getSolanaBalance(connection, userPK) {
   const balanceLamports = await connection.getBalance(userPK);
-  const balanceSOL = balanceLamports / 1e9;
-  console.log(`Account balance: ${balanceSOL} SOL`);
-  return balanceSOL <= 0;
+  return balanceLamports;
+}
+async function isInsufficentSolanaBalance(connection, userPK, requireBalance) {
+  const balanceLamports = await getSolanaBalance(connection, userPK);
+  console.log("use balance:", balanceLamports);
+  const BIBalance = BigInt(balanceLamports);
+  const BIRequire = BigInt(requireBalance);
+  return BIBalance < BIRequire;
+}
+var SOL_TO_LAMPORTS = 1e9;
+function solToLamports(sol) {
+  return sol * SOL_TO_LAMPORTS;
+}
+function getPrimusFee() {
+  return solToLamports(25e-4);
+}
+function getFee() {
+  return solToLamports(1e-3);
+}
+async function checkIfATAExists(connection, ata, tokenProgram) {
+  try {
+    const accountInfo = await (0, import_spl_token.getAccount)(connection, ata, void 0, tokenProgram);
+    console.log("ATA exists, balance:", Number(accountInfo.amount) / 10 ** 9);
+    return true;
+  } catch (e) {
+    if (e.message.includes("TokenAccountNotFoundError")) {
+      console.log("ATA not found");
+      return false;
+    } else {
+      console.error("Unexpected error:", e);
+      return false;
+    }
+  }
+}
+async function getRentExemption(connection, ata, tokenProgram) {
+  const isExist = await checkIfATAExists(connection, ata, tokenProgram);
+  if (!isExist) {
+    const TOKEN_ACCOUNT_SIZE = 165;
+    const rentExemption = await connection.getMinimumBalanceForRentExemption(TOKEN_ACCOUNT_SIZE);
+    console.log(`Estimated rentExemption:: ${rentExemption} lamports (${rentExemption.toFixed(6)} SOL)`);
+    return rentExemption;
+  } else {
+    return 0;
+  }
 }
 
 // src/config/redPacketIdl.json
@@ -5857,7 +5902,8 @@ async function reClaim({
   provider,
   zktlsProgram,
   reId,
-  attObj
+  attObj,
+  walletName
 }) {
   return new Promise(async (resolve, reject) => {
     const [redEnvelopePda] = getPrimusRedEnvelopePda({ programId: redEnvelopeProgram.programId });
@@ -5866,13 +5912,6 @@ async function reClaim({
     console.log("primusZktlsPda:", primusZktlsPda.toBase58());
     console.log("reRecordPda:", reRecordPda.toBase58());
     const attRecipient = new import_web33.PublicKey(attObj.recipient);
-    const isEmptyWallet = await isSolanaBalanceZero(provider.connection, attRecipient);
-    if (isEmptyWallet) {
-      const err = "insufficient";
-      const formatErr = formatErrFn(err);
-      reject(formatErr);
-      return;
-    }
     const redEnvelopeState = await redEnvelopeProgram.account.redEnvelopeState.fetch(redEnvelopePda);
     console.log("redEnvelopeState.feeRecipient", redEnvelopeState.feeRecipient.toBase58());
     const feeRecipient = redEnvelopeState.feeRecipient;
@@ -5949,8 +5988,23 @@ async function reClaim({
       tx = new import_web33.Transaction().add(instruction);
       tx.feePayer = userKey;
       tx.recentBlockhash = (await provider.connection.getLatestBlockhash()).blockhash;
+      if (walletName?.toLowerCase() == "phantom") {
+        let totalCost = reRecord.tokenType == ERC20_TYPE ? await getRentExemption(provider.connection, toTokenAccount, tokenProgram) : 0;
+        totalCost += getPrimusFee();
+        totalCost += getFee();
+        const isInsufficent = await isInsufficentSolanaBalance(provider.connection, attRecipient, totalCost);
+        if (isInsufficent) {
+          const err = "insufficient";
+          const formatErr = formatErrFn(err);
+          reject(formatErr);
+          return;
+        }
+      }
+      signatureStr = await provider.sendAndConfirm(tx);
+      return resolve(signatureStr);
       console.log("UnSigned tx size:", tx.serialize({ requireAllSignatures: false, verifySignatures: false }).length, "bytes");
       const signedTx = await provider.wallet.signTransaction(tx);
+      signedTx.partialSign();
       signatureStr = getTxSigStrFromTx(signedTx);
       const isOnChain = await getTxIsOnChain(signatureStr, provider.connection);
       if (isOnChain) {
@@ -5959,9 +6013,7 @@ async function reClaim({
       } else {
         const serializeSignedTx = signedTx.serialize();
         console.log("Signed tx size:", serializeSignedTx.length, "bytes");
-        const rpc = "https://unipay-solanam-6275.mainnet.rpcpool.com";
-        const rpcConnection = new import_web33.Connection(rpc);
-        signatureStr = await rpcConnection.sendRawTransaction(serializeSignedTx);
+        signatureStr = await provider.connection.sendRawTransaction(serializeSignedTx);
         console.log("reClaim done ", signatureStr);
         return resolve(signatureStr);
       }
@@ -6115,7 +6167,7 @@ var FundOnSolanaForRedPacket = class {
       }
     });
   }
-  async claim(redPacketId, attestation) {
+  async claim(redPacketId, attestation, walletName) {
     return new Promise(async (resolve, reject) => {
       try {
         const zktlsProgram = getProgram(zktlsIdl_default, this.provider);
@@ -6127,7 +6179,8 @@ var FundOnSolanaForRedPacket = class {
           provider: this.provider,
           zktlsProgram,
           reId: formatReId,
-          attObj
+          attObj,
+          walletName
         });
         return resolve(result);
       } catch (error) {
@@ -6714,12 +6767,12 @@ var PrimusFund = class {
       }
     });
   }
-  async claimOnSolanaForRedPacket(redPacketId, attestation) {
+  async claimOnSolanaForRedPacket(redPacketId, attestation, walletName) {
     return new Promise(async (resolve, reject) => {
       try {
         let formatAttestation2 = { ...attestation, responseResolve: attestation.reponseResolve };
         delete formatAttestation2.reponseResolve;
-        const result = await this._fundOnSolanaForRedPacket?.claim(redPacketId, formatAttestation2);
+        const result = await this._fundOnSolanaForRedPacket?.claim(redPacketId, formatAttestation2, walletName);
         return resolve(result);
       } catch (error) {
         return reject(error);

package/dist/index.mjs

@@ -142,6 +142,10 @@ var getErrArrFn = (error) => {
   return curErrorStrArr;
 };
 var formatErrFn = (error) => {
+  try {
+    console.log("error:", JSON.stringify(error));
+  } catch {
+  }
   let formatError = error;
   const curErrorStrArr = getErrArrFn(error);
   const userRejectErrStrArr = ["user rejected", "approval denied"];
@@ -2738,7 +2742,7 @@ import * as anchor3 from "@coral-xyz/anchor";
 import { Program } from "@coral-xyz/anchor";
 import * as anchor from "@coral-xyz/anchor";
 import { PublicKey } from "@solana/web3.js";
-import { getMint, TOKEN_2022_PROGRAM_ID } from "@solana/spl-token";
+import { getMint, TOKEN_2022_PROGRAM_ID, getAccount } from "@solana/spl-token";
 import { encode as encodeBase58 } from "micro-base58";
 import * as borsh from "borsh";
 var { deserialize } = borsh;
@@ -2952,11 +2956,52 @@ var getTxIsOnProcess = (err) => {
   const isOnProcess = hasErrorFlagFn(curErrorStrArr, strArr);
   return isOnProcess;
 };
-async function isSolanaBalanceZero(connection, userPK) {
+async function getSolanaBalance(connection, userPK) {
   const balanceLamports = await connection.getBalance(userPK);
-  const balanceSOL = balanceLamports / 1e9;
-  console.log(`Account balance: ${balanceSOL} SOL`);
-  return balanceSOL <= 0;
+  return balanceLamports;
+}
+async function isInsufficentSolanaBalance(connection, userPK, requireBalance) {
+  const balanceLamports = await getSolanaBalance(connection, userPK);
+  console.log("use balance:", balanceLamports);
+  const BIBalance = BigInt(balanceLamports);
+  const BIRequire = BigInt(requireBalance);
+  return BIBalance < BIRequire;
+}
+var SOL_TO_LAMPORTS = 1e9;
+function solToLamports(sol) {
+  return sol * SOL_TO_LAMPORTS;
+}
+function getPrimusFee() {
+  return solToLamports(25e-4);
+}
+function getFee() {
+  return solToLamports(1e-3);
+}
+async function checkIfATAExists(connection, ata, tokenProgram) {
+  try {
+    const accountInfo = await getAccount(connection, ata, void 0, tokenProgram);
+    console.log("ATA exists, balance:", Number(accountInfo.amount) / 10 ** 9);
+    return true;
+  } catch (e) {
+    if (e.message.includes("TokenAccountNotFoundError")) {
+      console.log("ATA not found");
+      return false;
+    } else {
+      console.error("Unexpected error:", e);
+      return false;
+    }
+  }
+}
+async function getRentExemption(connection, ata, tokenProgram) {
+  const isExist = await checkIfATAExists(connection, ata, tokenProgram);
+  if (!isExist) {
+    const TOKEN_ACCOUNT_SIZE = 165;
+    const rentExemption = await connection.getMinimumBalanceForRentExemption(TOKEN_ACCOUNT_SIZE);
+    console.log(`Estimated rentExemption:: ${rentExemption} lamports (${rentExemption.toFixed(6)} SOL)`);
+    return rentExemption;
+  } else {
+    return 0;
+  }
 }
 
 // src/config/redPacketIdl.json
@@ -5531,7 +5576,6 @@ var zktlsIdl_default = {
 import * as anchor2 from "@coral-xyz/anchor";
 import {
   PublicKey as PublicKey3,
-  Connection as Connection2,
   SystemProgram,
   Transaction,
   Keypair
@@ -5831,7 +5875,8 @@ async function reClaim({
   provider,
   zktlsProgram,
   reId,
-  attObj
+  attObj,
+  walletName
 }) {
   return new Promise(async (resolve, reject) => {
     const [redEnvelopePda] = getPrimusRedEnvelopePda({ programId: redEnvelopeProgram.programId });
@@ -5840,13 +5885,6 @@ async function reClaim({
     console.log("primusZktlsPda:", primusZktlsPda.toBase58());
     console.log("reRecordPda:", reRecordPda.toBase58());
     const attRecipient = new PublicKey3(attObj.recipient);
-    const isEmptyWallet = await isSolanaBalanceZero(provider.connection, attRecipient);
-    if (isEmptyWallet) {
-      const err = "insufficient";
-      const formatErr = formatErrFn(err);
-      reject(formatErr);
-      return;
-    }
     const redEnvelopeState = await redEnvelopeProgram.account.redEnvelopeState.fetch(redEnvelopePda);
     console.log("redEnvelopeState.feeRecipient", redEnvelopeState.feeRecipient.toBase58());
     const feeRecipient = redEnvelopeState.feeRecipient;
@@ -5923,8 +5961,23 @@ async function reClaim({
       tx = new Transaction().add(instruction);
       tx.feePayer = userKey;
       tx.recentBlockhash = (await provider.connection.getLatestBlockhash()).blockhash;
+      if (walletName?.toLowerCase() == "phantom") {
+        let totalCost = reRecord.tokenType == ERC20_TYPE ? await getRentExemption(provider.connection, toTokenAccount, tokenProgram) : 0;
+        totalCost += getPrimusFee();
+        totalCost += getFee();
+        const isInsufficent = await isInsufficentSolanaBalance(provider.connection, attRecipient, totalCost);
+        if (isInsufficent) {
+          const err = "insufficient";
+          const formatErr = formatErrFn(err);
+          reject(formatErr);
+          return;
+        }
+      }
+      signatureStr = await provider.sendAndConfirm(tx);
+      return resolve(signatureStr);
       console.log("UnSigned tx size:", tx.serialize({ requireAllSignatures: false, verifySignatures: false }).length, "bytes");
       const signedTx = await provider.wallet.signTransaction(tx);
+      signedTx.partialSign();
       signatureStr = getTxSigStrFromTx(signedTx);
       const isOnChain = await getTxIsOnChain(signatureStr, provider.connection);
       if (isOnChain) {
@@ -5933,9 +5986,7 @@ async function reClaim({
       } else {
         const serializeSignedTx = signedTx.serialize();
         console.log("Signed tx size:", serializeSignedTx.length, "bytes");
-        const rpc = "https://unipay-solanam-6275.mainnet.rpcpool.com";
-        const rpcConnection = new Connection2(rpc);
-        signatureStr = await rpcConnection.sendRawTransaction(serializeSignedTx);
+        signatureStr = await provider.connection.sendRawTransaction(serializeSignedTx);
         console.log("reClaim done ", signatureStr);
         return resolve(signatureStr);
       }
@@ -6089,7 +6140,7 @@ var FundOnSolanaForRedPacket = class {
       }
     });
   }
-  async claim(redPacketId, attestation) {
+  async claim(redPacketId, attestation, walletName) {
     return new Promise(async (resolve, reject) => {
       try {
         const zktlsProgram = getProgram(zktlsIdl_default, this.provider);
@@ -6101,7 +6152,8 @@ var FundOnSolanaForRedPacket = class {
           provider: this.provider,
           zktlsProgram,
           reId: formatReId,
-          attObj
+          attObj,
+          walletName
         });
         return resolve(result);
       } catch (error) {
@@ -6688,12 +6740,12 @@ var PrimusFund = class {
       }
     });
   }
-  async claimOnSolanaForRedPacket(redPacketId, attestation) {
+  async claimOnSolanaForRedPacket(redPacketId, attestation, walletName) {
     return new Promise(async (resolve, reject) => {
       try {
         let formatAttestation2 = { ...attestation, responseResolve: attestation.reponseResolve };
         delete formatAttestation2.reponseResolve;
-        const result = await this._fundOnSolanaForRedPacket?.claim(redPacketId, formatAttestation2);
+        const result = await this._fundOnSolanaForRedPacket?.claim(redPacketId, formatAttestation2, walletName);
         return resolve(result);
       } catch (error) {
         return reject(error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@primuslabs/fund-js-sdk",
-  "version": "0.1.28",
+  "version": "0.1.30",
   "author": "Primus Labs <dev@primuslabs.org>",
   "description": "Primus fund js sdk",
   "repository": {