@primuslabs/fund-js-sdk 0.1.27 → 0.1.29

package/dist/index.js

@@ -187,11 +187,16 @@ var formatErrFn = (error) => {
   if (isNoPendingWithdrawals) {
     formatError = "no pending withdrawals";
   }
-  const insufficientBalanceErrStrArr = ["insufficient balance", "INSUFFICIENT_FUNDS", "The caller does not have enough funds for value transfer.", "insufficient lamports", "Attempt to debit an account but found no record of a prior credit"];
+  const insufficientBalanceErrStrArr = ["insufficient", "The caller does not have enough funds for value transfer.", "insufficient lamports", "Attempt to debit an account but found no record of a prior credit"];
   const isInsufficientBalance = hasErrorFlagFn(curErrorStrArr, insufficientBalanceErrStrArr);
   if (isInsufficientBalance) {
     formatError = "insufficient balance";
   }
+  const mayInsufficientBalanceErrStrArr = ["unpredictable_gas_limit"];
+  const isMayInsufficientBalance = hasErrorFlagFn(curErrorStrArr, mayInsufficientBalanceErrStrArr);
+  if (isMayInsufficientBalance) {
+    formatError = "may insufficient balance";
+  }
   const alreadyClaimedErrStrArr = ["Already claimed"];
   const isAlreadyClaimed = hasErrorFlagFn(curErrorStrArr, alreadyClaimedErrStrArr);
   if (isAlreadyClaimed) {
@@ -248,35 +253,8 @@ var Contract = class {
         resolve(tx.hash);
       } catch (error) {
         console.log("sendTransaction error:", error);
-        const errStr = error?.message || error?.toString()?.toLowerCase() || "";
-        const errorMsg1 = typeof error === "string" ? error : error instanceof Error ? error.message : typeof error.message === "string" ? error.message : JSON.stringify(error);
-        const errorMsg2 = typeof error === "object" ? JSON.stringify(error) : error?.toString();
-        const curErrorStrArr = [errorMsg1, errorMsg2];
-        const userRejectErrStrArr = ["user rejected", "approval denied"];
-        const isUserRejected = hasErrorFlagFn(curErrorStrArr, userRejectErrStrArr);
-        if (error?.code === "ACTION_REJECTED" || isUserRejected) {
-          return reject("user rejected transaction");
-        }
-        const isNoPendingWithdrawals = hasErrorFlagFn(curErrorStrArr, ["no pending withdrawals"]);
-        if (isNoPendingWithdrawals) {
-          return reject("no pending withdrawals");
-        }
-        const insufficientBalanceErrStrArr = ["insufficient balance", "INSUFFICIENT_FUNDS", "The caller does not have enough funds for value transfer.", "insufficient lamports", "Attempt to debit an account but found no record of a prior credit"];
-        const isInsufficientBalance = hasErrorFlagFn(curErrorStrArr, insufficientBalanceErrStrArr);
-        if (isInsufficientBalance) {
-          return reject("insufficient balance");
-        }
-        const alreadyClaimedErrStrArr = ["Already claimed"];
-        const isAlreadyClaimed = hasErrorFlagFn(curErrorStrArr, alreadyClaimedErrStrArr);
-        if (isAlreadyClaimed) {
-          return reject("already claimed");
-        }
-        const allClaimedErrStrArr = ["All claimed"];
-        const isAllClaimed = hasErrorFlagFn(curErrorStrArr, allClaimedErrStrArr);
-        if (isAllClaimed) {
-          return reject("all claimed");
-        }
-        return reject(error);
+        const formatErr = formatErrFn(error);
+        return reject(formatErr);
       }
     });
   }
@@ -3008,6 +2986,12 @@ var getTxIsOnProcess = (err) => {
   const isOnProcess = hasErrorFlagFn(curErrorStrArr, strArr);
   return isOnProcess;
 };
+async function isSolanaBalanceZero(connection, userPK) {
+  const balanceLamports = await connection.getBalance(userPK);
+  const balanceSOL = balanceLamports / 1e9;
+  console.log(`Account balance: ${balanceSOL} SOL`);
+  return balanceSOL <= 0;
+}
 
 // src/config/redPacketIdl.json
 var redPacketIdl_default = {
@@ -5882,6 +5866,13 @@ 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;
@@ -5958,8 +5949,11 @@ async function reClaim({
       tx = new import_web33.Transaction().add(instruction);
       tx.feePayer = userKey;
       tx.recentBlockhash = (await provider.connection.getLatestBlockhash()).blockhash;
+      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) {
@@ -5968,9 +5962,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);
       }

package/dist/index.mjs

@@ -153,11 +153,16 @@ var formatErrFn = (error) => {
   if (isNoPendingWithdrawals) {
     formatError = "no pending withdrawals";
   }
-  const insufficientBalanceErrStrArr = ["insufficient balance", "INSUFFICIENT_FUNDS", "The caller does not have enough funds for value transfer.", "insufficient lamports", "Attempt to debit an account but found no record of a prior credit"];
+  const insufficientBalanceErrStrArr = ["insufficient", "The caller does not have enough funds for value transfer.", "insufficient lamports", "Attempt to debit an account but found no record of a prior credit"];
   const isInsufficientBalance = hasErrorFlagFn(curErrorStrArr, insufficientBalanceErrStrArr);
   if (isInsufficientBalance) {
     formatError = "insufficient balance";
   }
+  const mayInsufficientBalanceErrStrArr = ["unpredictable_gas_limit"];
+  const isMayInsufficientBalance = hasErrorFlagFn(curErrorStrArr, mayInsufficientBalanceErrStrArr);
+  if (isMayInsufficientBalance) {
+    formatError = "may insufficient balance";
+  }
   const alreadyClaimedErrStrArr = ["Already claimed"];
   const isAlreadyClaimed = hasErrorFlagFn(curErrorStrArr, alreadyClaimedErrStrArr);
   if (isAlreadyClaimed) {
@@ -214,35 +219,8 @@ var Contract = class {
         resolve(tx.hash);
       } catch (error) {
         console.log("sendTransaction error:", error);
-        const errStr = error?.message || error?.toString()?.toLowerCase() || "";
-        const errorMsg1 = typeof error === "string" ? error : error instanceof Error ? error.message : typeof error.message === "string" ? error.message : JSON.stringify(error);
-        const errorMsg2 = typeof error === "object" ? JSON.stringify(error) : error?.toString();
-        const curErrorStrArr = [errorMsg1, errorMsg2];
-        const userRejectErrStrArr = ["user rejected", "approval denied"];
-        const isUserRejected = hasErrorFlagFn(curErrorStrArr, userRejectErrStrArr);
-        if (error?.code === "ACTION_REJECTED" || isUserRejected) {
-          return reject("user rejected transaction");
-        }
-        const isNoPendingWithdrawals = hasErrorFlagFn(curErrorStrArr, ["no pending withdrawals"]);
-        if (isNoPendingWithdrawals) {
-          return reject("no pending withdrawals");
-        }
-        const insufficientBalanceErrStrArr = ["insufficient balance", "INSUFFICIENT_FUNDS", "The caller does not have enough funds for value transfer.", "insufficient lamports", "Attempt to debit an account but found no record of a prior credit"];
-        const isInsufficientBalance = hasErrorFlagFn(curErrorStrArr, insufficientBalanceErrStrArr);
-        if (isInsufficientBalance) {
-          return reject("insufficient balance");
-        }
-        const alreadyClaimedErrStrArr = ["Already claimed"];
-        const isAlreadyClaimed = hasErrorFlagFn(curErrorStrArr, alreadyClaimedErrStrArr);
-        if (isAlreadyClaimed) {
-          return reject("already claimed");
-        }
-        const allClaimedErrStrArr = ["All claimed"];
-        const isAllClaimed = hasErrorFlagFn(curErrorStrArr, allClaimedErrStrArr);
-        if (isAllClaimed) {
-          return reject("all claimed");
-        }
-        return reject(error);
+        const formatErr = formatErrFn(error);
+        return reject(formatErr);
       }
     });
   }
@@ -2974,6 +2952,12 @@ var getTxIsOnProcess = (err) => {
   const isOnProcess = hasErrorFlagFn(curErrorStrArr, strArr);
   return isOnProcess;
 };
+async function isSolanaBalanceZero(connection, userPK) {
+  const balanceLamports = await connection.getBalance(userPK);
+  const balanceSOL = balanceLamports / 1e9;
+  console.log(`Account balance: ${balanceSOL} SOL`);
+  return balanceSOL <= 0;
+}
 
 // src/config/redPacketIdl.json
 var redPacketIdl_default = {
@@ -5547,7 +5531,6 @@ var zktlsIdl_default = {
 import * as anchor2 from "@coral-xyz/anchor";
 import {
   PublicKey as PublicKey3,
-  Connection as Connection2,
   SystemProgram,
   Transaction,
   Keypair
@@ -5856,6 +5839,13 @@ 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;
@@ -5932,8 +5922,11 @@ async function reClaim({
       tx = new Transaction().add(instruction);
       tx.feePayer = userKey;
       tx.recentBlockhash = (await provider.connection.getLatestBlockhash()).blockhash;
+      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) {
@@ -5942,9 +5935,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);
       }

package/package.json

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