@primuslabs/fund-js-sdk 0.1.16 → 0.1.17

package/dist/index.mjs

@@ -2760,7 +2760,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 } from "@solana/spl-token";
+import { getMint, TOKEN_2022_PROGRAM_ID } from "@solana/spl-token";
 import { encode as encodeBase58 } from "micro-base58";
 import * as borsh from "borsh";
 var { deserialize } = borsh;
@@ -2775,10 +2775,35 @@ var toTokenAmount = (amount, decimals) => {
   const cleaned = raw.replace(/^0+/, "") || "0";
   return new BN2(cleaned);
 };
+var getTokenProgramType = async (mintAddress, connection) => {
+  if (!connection) {
+    return "";
+  }
+  const mintPubkey = new PublicKey(mintAddress);
+  const accountInfo = await connection.getAccountInfo(mintPubkey);
+  if (!accountInfo) {
+    throw new Error("Mint account not found");
+  }
+  const TOKEN_PROGRAM_ID2 = new PublicKey("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA");
+  const TOKEN_2022_PROGRAM_ID3 = new PublicKey("TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb");
+  if (accountInfo.owner.equals(TOKEN_PROGRAM_ID2)) {
+    return "Token";
+  } else if (accountInfo.owner.equals(TOKEN_2022_PROGRAM_ID3)) {
+    return "Token-2022";
+  } else {
+    return `Unknown Program: ${accountInfo.owner.toBase58()}`;
+  }
+};
 async function getTokenDecimals(mintAddress, connection) {
   const mintPubkey = new PublicKey(mintAddress);
-  const mintInfo = await getMint(connection, mintPubkey);
-  return mintInfo.decimals;
+  const tokenProgramType = await getTokenProgramType(mintAddress, connection);
+  if (tokenProgramType === "Token-2022") {
+    const mintInfo = await getMint(connection, mintPubkey, "confirmed", TOKEN_2022_PROGRAM_ID);
+    return mintInfo.decimals;
+  } else if (tokenProgramType === "Token") {
+    const mintInfo = await getMint(connection, mintPubkey);
+    return mintInfo.decimals;
+  }
 }
 var hexToUint8Array = (hex) => {
   let hexStr = hex.startsWith("0x") ? hex.slice(2) : hex;
@@ -3111,41 +3136,8 @@ var redPacketIdl_default = {
                 path: "state"
               },
               {
-                kind: "const",
-                value: [
-                  6,
-                  221,
-                  246,
-                  225,
-                  215,
-                  101,
-                  161,
-                  147,
-                  217,
-                  203,
-                  225,
-                  70,
-                  206,
-                  235,
-                  121,
-                  172,
-                  28,
-                  180,
-                  133,
-                  237,
-                  95,
-                  91,
-                  55,
-                  145,
-                  58,
-                  140,
-                  245,
-                  133,
-                  126,
-                  255,
-                  0,
-                  169
-                ]
+                kind: "account",
+                path: "token_program"
               },
               {
                 kind: "account",
@@ -3202,41 +3194,8 @@ var redPacketIdl_default = {
                 path: "att_recipient"
               },
               {
-                kind: "const",
-                value: [
-                  6,
-                  221,
-                  246,
-                  225,
-                  215,
-                  101,
-                  161,
-                  147,
-                  217,
-                  203,
-                  225,
-                  70,
-                  206,
-                  235,
-                  121,
-                  172,
-                  28,
-                  180,
-                  133,
-                  237,
-                  95,
-                  91,
-                  55,
-                  145,
-                  58,
-                  140,
-                  245,
-                  133,
-                  126,
-                  255,
-                  0,
-                  169
-                ]
+                kind: "account",
+                path: "token_program"
               },
               {
                 kind: "account",
@@ -3287,8 +3246,7 @@ var redPacketIdl_default = {
           optional: true
         },
         {
-          name: "token_program",
-          address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+          name: "token_program"
         },
         {
           name: "associated_token_program",
@@ -3434,41 +3392,8 @@ var redPacketIdl_default = {
                 path: "sender"
               },
               {
-                kind: "const",
-                value: [
-                  6,
-                  221,
-                  246,
-                  225,
-                  215,
-                  101,
-                  161,
-                  147,
-                  217,
-                  203,
-                  225,
-                  70,
-                  206,
-                  235,
-                  121,
-                  172,
-                  28,
-                  180,
-                  133,
-                  237,
-                  95,
-                  91,
-                  55,
-                  145,
-                  58,
-                  140,
-                  245,
-                  133,
-                  126,
-                  255,
-                  0,
-                  169
-                ]
+                kind: "account",
+                path: "token_program"
               },
               {
                 kind: "account",
@@ -3525,41 +3450,8 @@ var redPacketIdl_default = {
                 path: "state"
               },
               {
-                kind: "const",
-                value: [
-                  6,
-                  221,
-                  246,
-                  225,
-                  215,
-                  101,
-                  161,
-                  147,
-                  217,
-                  203,
-                  225,
-                  70,
-                  206,
-                  235,
-                  121,
-                  172,
-                  28,
-                  180,
-                  133,
-                  237,
-                  95,
-                  91,
-                  55,
-                  145,
-                  58,
-                  140,
-                  245,
-                  133,
-                  126,
-                  255,
-                  0,
-                  169
-                ]
+                kind: "account",
+                path: "token_program"
               },
               {
                 kind: "account",
@@ -3610,8 +3502,7 @@ var redPacketIdl_default = {
           optional: true
         },
         {
-          name: "token_program",
-          address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+          name: "token_program"
         },
         {
           name: "associated_token_program",
@@ -3712,41 +3603,8 @@ var redPacketIdl_default = {
                 path: "state"
               },
               {
-                kind: "const",
-                value: [
-                  6,
-                  221,
-                  246,
-                  225,
-                  215,
-                  101,
-                  161,
-                  147,
-                  217,
-                  203,
-                  225,
-                  70,
-                  206,
-                  235,
-                  121,
-                  172,
-                  28,
-                  180,
-                  133,
-                  237,
-                  95,
-                  91,
-                  55,
-                  145,
-                  58,
-                  140,
-                  245,
-                  133,
-                  126,
-                  255,
-                  0,
-                  169
-                ]
+                kind: "account",
+                path: "token_program"
               },
               {
                 kind: "account",
@@ -3803,41 +3661,8 @@ var redPacketIdl_default = {
                 path: "re_sender"
               },
               {
-                kind: "const",
-                value: [
-                  6,
-                  221,
-                  246,
-                  225,
-                  215,
-                  101,
-                  161,
-                  147,
-                  217,
-                  203,
-                  225,
-                  70,
-                  206,
-                  235,
-                  121,
-                  172,
-                  28,
-                  180,
-                  133,
-                  237,
-                  95,
-                  91,
-                  55,
-                  145,
-                  58,
-                  140,
-                  245,
-                  133,
-                  126,
-                  255,
-                  0,
-                  169
-                ]
+                kind: "account",
+                path: "token_program"
               },
               {
                 kind: "account",
@@ -3888,8 +3713,7 @@ var redPacketIdl_default = {
           optional: true
         },
         {
-          name: "token_program",
-          address: "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+          name: "token_program"
         },
         {
           name: "associated_token_program",
@@ -4257,236 +4081,241 @@ var redPacketIdl_default = {
     },
     {
       code: 6001,
+      name: "InvalidTokenProgram",
+      msg: "Invalid token program"
+    },
+    {
+      code: 6002,
       name: "InvalidTokenType",
       msg: "Invalid token type"
     },
     {
-      code: 6002,
+      code: 6003,
       name: "InvalidREType",
       msg: "Invalid red envelope type"
     },
     {
-      code: 6003,
+      code: 6004,
       name: "InvalidNumber",
       msg: "Invalid number"
     },
     {
-      code: 6004,
+      code: 6005,
       name: "InvalidEmptyRatio",
       msg: "Invalid empty ratio"
     },
     {
-      code: 6005,
+      code: 6006,
       name: "AmountTooLow",
       msg: "Amount too low"
     },
     {
-      code: 6006,
+      code: 6007,
       name: "WrongAmount",
       msg: "Wrong amount"
     },
     {
-      code: 6007,
+      code: 6008,
       name: "NoReId",
       msg: "Red envelope ID does not exist"
     },
     {
-      code: 6008,
+      code: 6009,
       name: "AllClaimed",
       msg: "All envelopes claimed"
     },
     {
-      code: 6009,
+      code: 6010,
       name: "UserIdEmpty",
       msg: "User ID empty"
     },
     {
-      code: 6010,
+      code: 6011,
       name: "InvalidUserAddress",
       msg: "Invalid User Address"
     },
     {
-      code: 6011,
+      code: 6012,
       name: "AlreadyClaimed",
       msg: "Already claimed"
     },
     {
-      code: 6012,
+      code: 6013,
       name: "AmountUnderflow",
       msg: "Amount underflow"
     },
     {
-      code: 6013,
+      code: 6014,
       name: "InvalidFeeRecipient",
       msg: "Invalid fee recipient"
     },
     {
-      code: 6014,
+      code: 6015,
       name: "InvalidStateAccount",
       msg: "Invalid state account"
     },
     {
-      code: 6015,
+      code: 6016,
       name: "RecipientIsZero",
       msg: "Recipient cannot be zero"
     },
     {
-      code: 6016,
+      code: 6017,
       name: "InvalidCheckType",
       msg: "Invalid checkType"
     },
     {
-      code: 6017,
+      code: 6018,
       name: "InvalidCheckParams",
       msg: "CheckParams decode failed"
     },
     {
-      code: 6018,
+      code: 6019,
       name: "NoFund",
       msg: "No fund"
     },
     {
-      code: 6019,
+      code: 6020,
       name: "NotOwner",
       msg: "Not owner"
     },
     {
-      code: 6020,
+      code: 6021,
       name: "NotExpired",
       msg: "Not expired"
     },
     {
-      code: 6021,
+      code: 6022,
       name: "UnsupportedTokenType",
       msg: "Unsupported Token Type"
     },
     {
-      code: 6022,
+      code: 6023,
       name: "InsufficientSOL",
       msg: "Insufficient SOL"
     },
     {
-      code: 6023,
+      code: 6024,
       name: "WrongTokenMint",
       msg: "Wrong token mint"
     },
     {
-      code: 6024,
+      code: 6025,
       name: "DeserializationFailed",
       msg: "Deserialization Failed"
     },
     {
-      code: 6025,
+      code: 6026,
       name: "JsonParseError",
       msg: "JSON Parse Error"
     },
     {
-      code: 6026,
+      code: 6027,
       name: "ResponseLengthError",
       msg: "response length error"
     },
     {
-      code: 6027,
+      code: 6028,
       name: "AttUrlError",
       msg: "att url error"
     },
     {
-      code: 6028,
+      code: 6029,
       name: "AttSuffixUrlError",
       msg: "att suffix url error"
     },
     {
-      code: 6029,
+      code: 6030,
       name: "JsonPathError",
       msg: "json path error"
     },
     {
-      code: 6030,
+      code: 6031,
       name: "UsernameKeyError",
       msg: "username key error"
     },
     {
-      code: 6031,
+      code: 6032,
       name: "FollowingError",
       msg: "following error"
     },
     {
-      code: 6032,
+      code: 6033,
       name: "FollowingNameError",
       msg: "following name error"
     },
     {
-      code: 6033,
+      code: 6034,
       name: "NameOpError",
       msg: "name op error"
     },
     {
-      code: 6034,
+      code: 6035,
       name: "AttConditionsError",
       msg: "att conditions error"
     },
     {
-      code: 6035,
+      code: 6036,
       name: "TooManyUrls",
       msg: "too many urls"
     },
     {
-      code: 6036,
+      code: 6037,
       name: "TooManyResponseresolve",
       msg: "too many responseResolve"
     },
     {
-      code: 6037,
+      code: 6038,
       name: "UserNameEmpty",
       msg: "user name empty"
     },
     {
-      code: 6038,
+      code: 6039,
       name: "SourceError",
       msg: "source error"
     },
     {
-      code: 6039,
+      code: 6040,
       name: "AccountResponseLengthError",
       msg: "account response length error"
     },
     {
-      code: 6040,
+      code: 6041,
       name: "TiktokAttUrlError",
       msg: "tiktok att url error"
     },
     {
-      code: 6041,
+      code: 6042,
       name: "TiktokJsonPathError",
       msg: "tiktok json path error"
     },
     {
-      code: 6042,
+      code: 6043,
       name: "XAttUrlError",
       msg: "x att url error"
     },
     {
-      code: 6043,
+      code: 6044,
       name: "XJsonPathError",
       msg: "x json path error"
     },
     {
-      code: 6044,
+      code: 6045,
       name: "GoogleAttUrlError",
       msg: "google att url error"
     },
     {
-      code: 6045,
+      code: 6046,
       name: "GoogleJsonPathError",
       msg: "google json path error"
     },
     {
-      code: 6046,
+      code: 6047,
       name: "XiaohongshuAttUrlError",
       msg: "xiaohongshu att url error"
     },
     {
-      code: 6047,
+      code: 6048,
       name: "XiaohongshuJsonPathError",
       msg: "xiaohongshu json path error"
     }
@@ -5864,13 +5693,37 @@ function getPrimusRERecordPda({
 
 // src/classes/solana/sdk.ts
 import { utils } from "ethers";
-import { getAssociatedTokenAddress } from "@solana/spl-token";
+import { getAssociatedTokenAddress, TOKEN_2022_PROGRAM_ID as TOKEN_2022_PROGRAM_ID2, TOKEN_PROGRAM_ID } from "@solana/spl-token";
 var ERC20_TYPE = 0;
 var CHUNK_SIZE = 960;
 var VERBOSE = 0;
 var RE_USERID_LEN = 8;
 var NATIVETOKENATTBUFFERMAXLEN = 718;
 var ERC20TOKENATTBUFFERMAXLEN = 622;
+async function getATAAndProgramId(connection, mint, owner, allowOwnerOffCurve = false) {
+  const accountInfo = await connection.getAccountInfo(mint);
+  if (!accountInfo) {
+    throw new Error("Mint account does not exist");
+  }
+  const mintOwner = accountInfo.owner;
+  let tokenProgramId;
+  if (mintOwner.equals(TOKEN_PROGRAM_ID)) {
+    tokenProgramId = TOKEN_PROGRAM_ID;
+  } else if (mintOwner.equals(TOKEN_2022_PROGRAM_ID2)) {
+    tokenProgramId = TOKEN_2022_PROGRAM_ID2;
+  } else {
+    throw new Error(
+      `Unknown mint owner: ${mintOwner.toBase58()}. Not SPL or Token-2022`
+    );
+  }
+  const ata = await getAssociatedTokenAddress(
+    mint,
+    owner,
+    allowOwnerOffCurve,
+    tokenProgramId
+  );
+  return { ata, tokenProgramId };
+}
 async function waitForTransactionConfirmation(provider, tx, retries = 5, delayMs = 1e3) {
   for (let i = 0; i < retries; i++) {
     const txDetails = await provider.connection.getTransaction(tx, {
@@ -5894,8 +5747,7 @@ async function reSend({
   userKey,
   provider,
   tipToken,
-  reSendParam,
-  payer = null
+  reSendParam
 }) {
   return new Promise(async (resolve, reject) => {
     let signatureStr;
@@ -5914,10 +5766,12 @@ async function reSend({
         space,
         programId: redEnvelopeProgram.programId
       });
+      debugger;
       const reRecordDataInitIx = await redEnvelopeProgram.methods.reRecordDataInit().accounts({
         reRecordData: spaceAccount.publicKey,
         sender: userKey
       }).signers([spaceAccount]).instruction();
+      debugger;
       const [redEnvelopePda] = getPrimusRedEnvelopePda({ programId: redEnvelopeProgram.programId });
       const redEnvelopeState = await redEnvelopeProgram.account.redEnvelopeState.fetch(redEnvelopePda);
       console.log("idCounter", redEnvelopeState.idCounter.toString());
@@ -5928,11 +5782,21 @@ async function reSend({
       let mint = null;
       let fromTokenAccount = null;
       let toTokenAccount = null;
+      let tokenProgram = TOKEN_PROGRAM_ID;
       if (tipToken.tokenType == ERC20_TYPE) {
         mint = tipToken.tokenAddress;
-        fromTokenAccount = await getAssociatedTokenAddress(mint, userKey);
-        toTokenAccount = await getAssociatedTokenAddress(mint, redEnvelopePda, true);
+        const from = await getATAAndProgramId(provider.connection, mint, userKey, false);
+        const to = await getATAAndProgramId(provider.connection, mint, redEnvelopePda, true);
+        if (from.tokenProgramId != to.tokenProgramId) {
+          throw new Error(
+            `from.tokenProgramId ${from.tokenProgramId.toBase58()} not equal to.tokenProgramId ${to.tokenProgramId.toBase58()}`
+          );
+        }
+        fromTokenAccount = from.ata;
+        toTokenAccount = to.ata;
+        tokenProgram = from.tokenProgramId;
       }
+      debugger;
       const reSendIx = await redEnvelopeProgram.methods.reSend(Array.from(reId), tipToken, reSendParam).accounts({
         state: redEnvelopePda,
         reRecord: reRecordPda,
@@ -5941,7 +5805,8 @@ async function reSend({
         // SPL
         fromTokenAccount,
         toTokenAccount,
-        mint
+        mint,
+        tokenProgram
       }).instruction();
       const tx = new Transaction().add(createIx).add(reRecordDataInitIx).add(reSendIx);
       tx.feePayer = userKey;
@@ -6000,6 +5865,7 @@ async function reClaim({
     console.log(`attBuffer.length=${attBuffer.length}`);
     let storeInitialized = false;
     let useStoreVersion = false;
+    debugger;
     if (reRecord.tokenType == ERC20_TYPE && attBuffer.length > ERC20TOKENATTBUFFERMAXLEN || reRecord.tokenType != ERC20_TYPE && attBuffer.length > NATIVETOKENATTBUFFERMAXLEN) {
       useStoreVersion = true;
     }
@@ -6024,11 +5890,20 @@ async function reClaim({
       let mint = null;
       let fromTokenAccount = null;
       let toTokenAccount = null;
+      let tokenProgram = TOKEN_PROGRAM_ID;
       if (reRecord.tokenType == ERC20_TYPE) {
         console.log("reRecord.tokenAddress:", reRecord.tokenAddress);
         mint = reRecord.tokenAddress;
-        fromTokenAccount = await getAssociatedTokenAddress(mint, redEnvelopePda, true);
-        toTokenAccount = await getAssociatedTokenAddress(mint, attRecipient);
+        const from = await getATAAndProgramId(provider.connection, mint, redEnvelopePda, true);
+        const to = await getATAAndProgramId(provider.connection, mint, attRecipient, false);
+        if (from.tokenProgramId != to.tokenProgramId) {
+          throw new Error(
+            `from.tokenProgramId ${from.tokenProgramId.toBase58()} not equal to.tokenProgramId ${to.tokenProgramId.toBase58()}`
+          );
+        }
+        fromTokenAccount = from.ata;
+        toTokenAccount = to.ata;
+        tokenProgram = from.tokenProgramId;
       }
       let _att = attObj;
       let _dataBufferKey = null;
@@ -6049,7 +5924,8 @@ async function reClaim({
         // SPL
         fromTokenAccount,
         toTokenAccount,
-        mint
+        mint,
+        tokenProgram
       }).transaction();
       tx.feePayer = userKey;
       tx.recentBlockhash = (await provider.connection.getLatestBlockhash()).blockhash;
@@ -6106,11 +5982,20 @@ async function reSenderWithdraw({
       let mint = null;
       let fromTokenAccount = null;
       let toTokenAccount = null;
+      let tokenProgram = TOKEN_PROGRAM_ID;
       if (reRecord.tokenType == ERC20_TYPE) {
         console.log("reRecord.tokenAddress:", reRecord.tokenAddress);
         mint = reRecord.tokenAddress;
-        fromTokenAccount = await getAssociatedTokenAddress(mint, redEnvelopePda, true);
-        toTokenAccount = await getAssociatedTokenAddress(mint, userKey);
+        const from = await getATAAndProgramId(provider.connection, mint, redEnvelopePda, true);
+        const to = await getATAAndProgramId(provider.connection, mint, userKey, false);
+        if (from.tokenProgramId != to.tokenProgramId) {
+          throw new Error(
+            `from.tokenProgramId ${from.tokenProgramId.toBase58()} not equal to.tokenProgramId ${to.tokenProgramId.toBase58()}`
+          );
+        }
+        fromTokenAccount = from.ata;
+        toTokenAccount = to.ata;
+        tokenProgram = from.tokenProgramId;
       }
       tx = await redEnvelopeProgram.methods.reSenderWithdraw(reId).accounts({
         state: redEnvelopePda,
@@ -6119,7 +6004,8 @@ async function reSenderWithdraw({
         // SPL
         fromTokenAccount,
         toTokenAccount,
-        mint
+        mint,
+        tokenProgram
       }).transaction();
       tx.feePayer = userKey;
       tx.recentBlockhash = (await provider.connection.getLatestBlockhash()).blockhash;