@primuslabs/fund-js-sdk 0.1.4 → 0.1.6

package/dist/index.d.mts

@@ -34,10 +34,11 @@ declare global {
 //
 // ERC20_TYPE = 0;
 // NATIVE_TYPE = 1;
-type TokenType = 0 | 1
-type TokenInfo =
-  | { tokenType: 0; tokenAddress: string }
-  | { tokenType: 1; tokenAddress?: string }; 
+// ERC721_TYPE = 2;
+type TokenType = 0 | 1 | 2
+type TokenInfo = { tokenType: 0; tokenAddress: string }
+    | { tokenType: 1; tokenAddress?: string }
+    | { tokenType: 2; tokenAddress: string }; 
 
 type  RecipientBaseInfo = {
     socialPlatform: string;// The name of the social platform.

package/dist/index.d.ts

@@ -34,10 +34,11 @@ declare global {
 //
 // ERC20_TYPE = 0;
 // NATIVE_TYPE = 1;
-type TokenType = 0 | 1
-type TokenInfo =
-  | { tokenType: 0; tokenAddress: string }
-  | { tokenType: 1; tokenAddress?: string }; 
+// ERC721_TYPE = 2;
+type TokenType = 0 | 1 | 2
+type TokenInfo = { tokenType: 0; tokenAddress: string }
+    | { tokenType: 1; tokenAddress?: string }
+    | { tokenType: 2; tokenAddress: string }; 
 
 type  RecipientBaseInfo = {
     socialPlatform: string;// The name of the social platform.

package/dist/index.js

@@ -42,6 +42,10 @@ var DATASOURCETEMPLATESMAP = {
   "google account": {
     id: "3bad8a55-4415-4bec-9b47-a4c7bbe93518",
     field: "2"
+  },
+  xiaohongshu: {
+    id: "93c6e6df-63ab-41af-8cba-f2927c0d2f1c",
+    field: "red_id"
   }
 };
 var SUPPORTEDSOCIALPLATFORMS = Object.keys(DATASOURCETEMPLATESMAP);
@@ -80,6 +84,16 @@ var SUPPORTEDCHAINIDS = Object.keys(Fund_CONTRACTS).map((i) => Number(i));
 
 // src/classes/Contract.ts
 var import_ethers = require("ethers");
+
+// src/utils/utils.ts
+var hasErrorFlagFn = (curErrorArr, targetErrorStrArr) => {
+  return curErrorArr.some((curErrorStr) => {
+    let f = targetErrorStrArr.some((targetErrorStr) => curErrorStr.toLowerCase().includes(targetErrorStr.toLowerCase()));
+    return f;
+  });
+};
+
+// src/classes/Contract.ts
 var Contract = class {
   address;
   provider;
@@ -132,19 +146,23 @@ var Contract = class {
       } 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 = userRejectErrStrArr.some((str) => errStr.indexOf(str) > -1);
+        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", "unpredictable_gas_limit"];
-        const isInsufficientBalance = insufficientBalanceErrStrArr.some((str) => errStr.indexOf(str) > -1);
+        const isInsufficientBalance = hasErrorFlagFn(curErrorStrArr, insufficientBalanceErrStrArr);
         if (isInsufficientBalance) {
           return reject("insufficient balance");
         }
-        if (errStr.indexOf("no pending withdrawals") > -1) {
-          return reject("no pending withdrawals");
-        }
         return reject(error);
       }
     });
@@ -1139,6 +1157,190 @@ var erc20Abi_default = [
   }
 ];
 
+// src/config/erc721Abi.json
+var erc721Abi_default = [
+  {
+    type: "function",
+    name: "supportsInterface",
+    stateMutability: "view",
+    inputs: [
+      { internalType: "bytes4", name: "interfaceId", type: "bytes4" }
+    ],
+    outputs: [{ internalType: "bool", name: "", type: "bool" }]
+  },
+  {
+    type: "function",
+    name: "balanceOf",
+    stateMutability: "view",
+    inputs: [
+      { internalType: "address", name: "owner", type: "address" }
+    ],
+    outputs: [{ internalType: "uint256", name: "", type: "uint256" }]
+  },
+  {
+    type: "function",
+    name: "ownerOf",
+    stateMutability: "view",
+    inputs: [
+      { internalType: "uint256", name: "tokenId", type: "uint256" }
+    ],
+    outputs: [{ internalType: "address", name: "", type: "address" }]
+  },
+  {
+    type: "function",
+    name: "tokenURI",
+    stateMutability: "view",
+    inputs: [
+      { internalType: "uint256", name: "tokenId", type: "uint256" }
+    ],
+    outputs: [{ internalType: "string", name: "", type: "string" }]
+  },
+  {
+    type: "function",
+    name: "approve",
+    stateMutability: "nonpayable",
+    inputs: [
+      { internalType: "address", name: "to", type: "address" },
+      { internalType: "uint256", name: "tokenId", type: "uint256" }
+    ],
+    outputs: []
+  },
+  {
+    type: "function",
+    name: "getApproved",
+    stateMutability: "view",
+    inputs: [
+      { internalType: "uint256", name: "tokenId", type: "uint256" }
+    ],
+    outputs: [{ internalType: "address", name: "", type: "address" }]
+  },
+  {
+    type: "function",
+    name: "setApprovalForAll",
+    stateMutability: "nonpayable",
+    inputs: [
+      { internalType: "address", name: "operator", type: "address" },
+      { internalType: "bool", name: "approved", type: "bool" }
+    ],
+    outputs: []
+  },
+  {
+    type: "function",
+    name: "isApprovedForAll",
+    stateMutability: "view",
+    inputs: [
+      { internalType: "address", name: "owner", type: "address" },
+      { internalType: "address", name: "operator", type: "address" }
+    ],
+    outputs: [{ internalType: "bool", name: "", type: "bool" }]
+  },
+  {
+    type: "function",
+    name: "transferFrom",
+    stateMutability: "nonpayable",
+    inputs: [
+      { internalType: "address", name: "from", type: "address" },
+      { internalType: "address", name: "to", type: "address" },
+      { internalType: "uint256", name: "tokenId", type: "uint256" }
+    ],
+    outputs: []
+  },
+  {
+    type: "function",
+    name: "safeTransferFrom",
+    stateMutability: "nonpayable",
+    inputs: [
+      { internalType: "address", name: "from", type: "address" },
+      { internalType: "address", name: "to", type: "address" },
+      { internalType: "uint256", name: "tokenId", type: "uint256" }
+    ],
+    outputs: []
+  },
+  {
+    type: "function",
+    name: "name",
+    stateMutability: "view",
+    inputs: [],
+    outputs: [{ internalType: "string", name: "", type: "string" }]
+  },
+  {
+    type: "function",
+    name: "symbol",
+    stateMutability: "view",
+    inputs: [],
+    outputs: [{ internalType: "string", name: "", type: "string" }]
+  }
+];
+
+// src/classes/Erc721Contract.ts
+var Erc721Contract = class {
+  contractInstance;
+  constructor(provider, address) {
+    if (!provider || !address) {
+      throw new Error("provider, address are required");
+    }
+    this.contractInstance = new Contract_default(provider, address, erc721Abi_default);
+  }
+  async approve(address, tokenId) {
+    return new Promise(async (resolve, reject) => {
+      try {
+        const approver = await this.contractInstance.callMethod("getApproved", [tokenId]);
+        if (approver === address) {
+          console.log(`Already approved:: ${approver}`);
+          resolve("Approved");
+        } else {
+          await this.contractInstance.sendTransaction("approve", [address, tokenId]);
+          console.log(`Approved`);
+          resolve("Approved");
+        }
+      } catch (error) {
+        console.error("Approval failed:", error);
+        return reject(error);
+      }
+    });
+  }
+  // ownerAddress: string, 
+  async setApprovalForAll(operatorAddress) {
+    return new Promise(async (resolve, reject) => {
+      try {
+        await this.contractInstance.sendTransaction("setApprovalForAll", [operatorAddress, true]);
+        console.log(`Approved`);
+        resolve("Approved");
+      } catch (error) {
+        console.error("Approval failed:", error);
+        return reject(error);
+      }
+    });
+  }
+  async fetchMetaData(nftContractAddress, tokenId) {
+    return new Promise(async (resolve, reject) => {
+      try {
+        let url = await this.contractInstance.callMethod("tokenURI", [tokenId]);
+        if (url.startsWith("ipfs://")) {
+          url = url.replace("ipfs://", "https://ipfs.io/ipfs/");
+        }
+        const res = await fetch(url);
+        if (!res.ok) {
+          return reject(`Failed to fetch metadata from ${url}`);
+        }
+        let metadata = await res.json();
+        if (metadata.image && metadata.image.startsWith("ipfs://")) {
+          metadata.image = metadata.image.replace(
+            "ipfs://",
+            "https://ipfs.io/ipfs/"
+          );
+        }
+        metadata.address = nftContractAddress;
+        metadata.tokenId = tokenId;
+        return resolve(metadata);
+      } catch (error) {
+        return reject(error);
+      }
+    });
+  }
+};
+var Erc721Contract_default = Erc721Contract;
+
 // src/classes/Fund.ts
 var { parseUnits, formatUnits } = import_ethers2.ethers.utils;
 var Fund = class {
@@ -1202,18 +1404,22 @@ var Fund = class {
           const web3Provider = new import_ethers2.ethers.providers.Web3Provider(this.provider);
           const erc20Contract = new import_ethers2.ethers.Contract(tokenInfo.tokenAddress, erc20Abi_default, web3Provider);
           decimals = await erc20Contract.decimals();
+        } else if (tokenInfo.tokenType === 2) {
+          decimals = 0;
+          const erc721ContractInstance = new Erc721Contract_default(this.provider, tokenInfo.tokenAddress);
+          await erc721ContractInstance.approve(this.fundContract.address, recipientInfo.nftIds[0]);
         }
         const tokenAmount = parseUnits(recipientInfo.tokenAmount.toString(), decimals);
         const newFundRecipientInfo = {
           idSource: recipientInfo.socialPlatform,
           id: recipientInfo.userIdentifier,
           amount: tokenAmount,
-          nftIds: []
+          nftIds: recipientInfo.nftIds
         };
-        if (tokenInfo.tokenType === 0) {
-          params = [tokenInfo, newFundRecipientInfo];
-        } else {
+        if (tokenInfo.tokenType === 1) {
           params = [tokenInfo, newFundRecipientInfo, { value: tokenAmount }];
+        } else {
+          params = [tokenInfo, newFundRecipientInfo];
         }
         const result = await this.fundContract.sendTransaction("tip", params);
         resolve(result);
@@ -1249,6 +1455,10 @@ var Fund = class {
           const web3Provider = new import_ethers2.ethers.providers.Web3Provider(this.provider);
           const erc20Contract = new import_ethers2.ethers.Contract(tokenInfo.tokenAddress, erc20Abi_default, web3Provider);
           decimals = await erc20Contract.decimals();
+        } else if (tokenInfo.tokenType === 2) {
+          decimals = 0;
+          const erc721ContractInstance = new Erc721Contract_default(this.provider, tokenInfo.tokenAddress);
+          await erc721ContractInstance.setApprovalForAll(this.fundContract.address);
         }
         let totalFormatAmount = recipientInfoList.reduce((acc, cur) => acc.add(parseUnits(cur.tokenAmount.toString(), decimals)), import_ethers2.ethers.BigNumber.from(0));
         const newRecipientInfoList = recipientInfoList.map((i) => {
@@ -1257,13 +1467,13 @@ var Fund = class {
             idSource: i.socialPlatform,
             id: i.userIdentifier,
             amount: formatAmount,
-            nftIds: []
+            nftIds: i.nftIds
           };
         });
-        if (tokenInfo.tokenType === 0) {
-          params = [tokenInfo, newRecipientInfoList];
-        } else {
+        if (tokenInfo.tokenType === 1) {
           params = [tokenInfo, newRecipientInfoList, { value: totalFormatAmount }];
+        } else {
+          params = [tokenInfo, newRecipientInfoList];
         }
         const result = await this.fundContract.sendTransaction("tipBatch", params);
         return resolve(result);
@@ -1406,16 +1616,28 @@ var Fund = class {
         console.log("fundRecords", fundRecords);
         let formatRecords = [];
         for (const record of fundRecords) {
-          const { tipper, timestamp, tipToken: [tokenType, tokenAddress], amount } = record;
+          const { tipper, timestamp, tipToken: [tokenType, tokenAddress], amount, nftIds } = record;
           let decimals = 18;
           let symbol = "";
+          let tokenId = null;
+          let nftInfo = null;
           if (tokenType === 0) {
-            const web3Provider = new import_ethers2.ethers.providers.Web3Provider(this.provider);
-            const erc20Contract = new import_ethers2.ethers.Contract(tokenAddress, erc20Abi_default, web3Provider);
+            let formatProvider;
+            if (this.provider instanceof import_ethers2.ethers.providers.JsonRpcProvider) {
+              formatProvider = this.provider;
+            } else {
+              formatProvider = new import_ethers2.ethers.providers.Web3Provider(this.provider);
+            }
+            const erc20Contract = new import_ethers2.ethers.Contract(tokenAddress, erc20Abi_default, formatProvider);
             decimals = await erc20Contract.decimals();
             symbol = await erc20Contract.symbol();
           } else if (tokenType === 1) {
             symbol = NATIVETOKENS[this.chainId];
+          } else if (tokenType === 2) {
+            decimals = 0;
+            tokenId = parseInt(nftIds[0]);
+            const erc721ContractInstance = new Erc721Contract_default(this.provider, tokenAddress);
+            nftInfo = await erc721ContractInstance.fetchMetaData(tokenAddress, tokenId);
           }
           let fundToken = {
             tokenType,
@@ -1427,11 +1649,14 @@ var Fund = class {
           if (tokenType === 0) {
             fundToken.tokenAddress = tokenAddress;
           }
+          if (tokenType === 2) {
+            Object.assign(fundToken, nftInfo ?? {});
+          }
           formatRecords.push({
             funder: tipper,
             fundToken,
             amount: formatUnits(amount, decimals),
-            timestamp: timestamp.toNumber() * 1e3
+            timestamp: timestamp.toNumber()
           });
         }
         console.log("formatRecords", formatRecords);
@@ -1483,7 +1708,7 @@ var PrimusFund = class {
             formatUserIdentifier = i.userIdentifier.slice(1);
           }
           return {
-            nftIds: [],
+            nftIds: i.nftIds ?? [],
             socialPlatform: formatSocialPlatform,
             userIdentifier: formatUserIdentifier,
             tokenAmount: i.tokenAmount

package/dist/index.mjs

@@ -18,6 +18,10 @@ var DATASOURCETEMPLATESMAP = {
   "google account": {
     id: "3bad8a55-4415-4bec-9b47-a4c7bbe93518",
     field: "2"
+  },
+  xiaohongshu: {
+    id: "93c6e6df-63ab-41af-8cba-f2927c0d2f1c",
+    field: "red_id"
   }
 };
 var SUPPORTEDSOCIALPLATFORMS = Object.keys(DATASOURCETEMPLATESMAP);
@@ -56,6 +60,16 @@ var SUPPORTEDCHAINIDS = Object.keys(Fund_CONTRACTS).map((i) => Number(i));
 
 // src/classes/Contract.ts
 import { ethers } from "ethers";
+
+// src/utils/utils.ts
+var hasErrorFlagFn = (curErrorArr, targetErrorStrArr) => {
+  return curErrorArr.some((curErrorStr) => {
+    let f = targetErrorStrArr.some((targetErrorStr) => curErrorStr.toLowerCase().includes(targetErrorStr.toLowerCase()));
+    return f;
+  });
+};
+
+// src/classes/Contract.ts
 var Contract = class {
   address;
   provider;
@@ -108,19 +122,23 @@ var Contract = class {
       } 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 = userRejectErrStrArr.some((str) => errStr.indexOf(str) > -1);
+        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", "unpredictable_gas_limit"];
-        const isInsufficientBalance = insufficientBalanceErrStrArr.some((str) => errStr.indexOf(str) > -1);
+        const isInsufficientBalance = hasErrorFlagFn(curErrorStrArr, insufficientBalanceErrStrArr);
         if (isInsufficientBalance) {
           return reject("insufficient balance");
         }
-        if (errStr.indexOf("no pending withdrawals") > -1) {
-          return reject("no pending withdrawals");
-        }
         return reject(error);
       }
     });
@@ -1115,6 +1133,190 @@ var erc20Abi_default = [
   }
 ];
 
+// src/config/erc721Abi.json
+var erc721Abi_default = [
+  {
+    type: "function",
+    name: "supportsInterface",
+    stateMutability: "view",
+    inputs: [
+      { internalType: "bytes4", name: "interfaceId", type: "bytes4" }
+    ],
+    outputs: [{ internalType: "bool", name: "", type: "bool" }]
+  },
+  {
+    type: "function",
+    name: "balanceOf",
+    stateMutability: "view",
+    inputs: [
+      { internalType: "address", name: "owner", type: "address" }
+    ],
+    outputs: [{ internalType: "uint256", name: "", type: "uint256" }]
+  },
+  {
+    type: "function",
+    name: "ownerOf",
+    stateMutability: "view",
+    inputs: [
+      { internalType: "uint256", name: "tokenId", type: "uint256" }
+    ],
+    outputs: [{ internalType: "address", name: "", type: "address" }]
+  },
+  {
+    type: "function",
+    name: "tokenURI",
+    stateMutability: "view",
+    inputs: [
+      { internalType: "uint256", name: "tokenId", type: "uint256" }
+    ],
+    outputs: [{ internalType: "string", name: "", type: "string" }]
+  },
+  {
+    type: "function",
+    name: "approve",
+    stateMutability: "nonpayable",
+    inputs: [
+      { internalType: "address", name: "to", type: "address" },
+      { internalType: "uint256", name: "tokenId", type: "uint256" }
+    ],
+    outputs: []
+  },
+  {
+    type: "function",
+    name: "getApproved",
+    stateMutability: "view",
+    inputs: [
+      { internalType: "uint256", name: "tokenId", type: "uint256" }
+    ],
+    outputs: [{ internalType: "address", name: "", type: "address" }]
+  },
+  {
+    type: "function",
+    name: "setApprovalForAll",
+    stateMutability: "nonpayable",
+    inputs: [
+      { internalType: "address", name: "operator", type: "address" },
+      { internalType: "bool", name: "approved", type: "bool" }
+    ],
+    outputs: []
+  },
+  {
+    type: "function",
+    name: "isApprovedForAll",
+    stateMutability: "view",
+    inputs: [
+      { internalType: "address", name: "owner", type: "address" },
+      { internalType: "address", name: "operator", type: "address" }
+    ],
+    outputs: [{ internalType: "bool", name: "", type: "bool" }]
+  },
+  {
+    type: "function",
+    name: "transferFrom",
+    stateMutability: "nonpayable",
+    inputs: [
+      { internalType: "address", name: "from", type: "address" },
+      { internalType: "address", name: "to", type: "address" },
+      { internalType: "uint256", name: "tokenId", type: "uint256" }
+    ],
+    outputs: []
+  },
+  {
+    type: "function",
+    name: "safeTransferFrom",
+    stateMutability: "nonpayable",
+    inputs: [
+      { internalType: "address", name: "from", type: "address" },
+      { internalType: "address", name: "to", type: "address" },
+      { internalType: "uint256", name: "tokenId", type: "uint256" }
+    ],
+    outputs: []
+  },
+  {
+    type: "function",
+    name: "name",
+    stateMutability: "view",
+    inputs: [],
+    outputs: [{ internalType: "string", name: "", type: "string" }]
+  },
+  {
+    type: "function",
+    name: "symbol",
+    stateMutability: "view",
+    inputs: [],
+    outputs: [{ internalType: "string", name: "", type: "string" }]
+  }
+];
+
+// src/classes/Erc721Contract.ts
+var Erc721Contract = class {
+  contractInstance;
+  constructor(provider, address) {
+    if (!provider || !address) {
+      throw new Error("provider, address are required");
+    }
+    this.contractInstance = new Contract_default(provider, address, erc721Abi_default);
+  }
+  async approve(address, tokenId) {
+    return new Promise(async (resolve, reject) => {
+      try {
+        const approver = await this.contractInstance.callMethod("getApproved", [tokenId]);
+        if (approver === address) {
+          console.log(`Already approved:: ${approver}`);
+          resolve("Approved");
+        } else {
+          await this.contractInstance.sendTransaction("approve", [address, tokenId]);
+          console.log(`Approved`);
+          resolve("Approved");
+        }
+      } catch (error) {
+        console.error("Approval failed:", error);
+        return reject(error);
+      }
+    });
+  }
+  // ownerAddress: string, 
+  async setApprovalForAll(operatorAddress) {
+    return new Promise(async (resolve, reject) => {
+      try {
+        await this.contractInstance.sendTransaction("setApprovalForAll", [operatorAddress, true]);
+        console.log(`Approved`);
+        resolve("Approved");
+      } catch (error) {
+        console.error("Approval failed:", error);
+        return reject(error);
+      }
+    });
+  }
+  async fetchMetaData(nftContractAddress, tokenId) {
+    return new Promise(async (resolve, reject) => {
+      try {
+        let url = await this.contractInstance.callMethod("tokenURI", [tokenId]);
+        if (url.startsWith("ipfs://")) {
+          url = url.replace("ipfs://", "https://ipfs.io/ipfs/");
+        }
+        const res = await fetch(url);
+        if (!res.ok) {
+          return reject(`Failed to fetch metadata from ${url}`);
+        }
+        let metadata = await res.json();
+        if (metadata.image && metadata.image.startsWith("ipfs://")) {
+          metadata.image = metadata.image.replace(
+            "ipfs://",
+            "https://ipfs.io/ipfs/"
+          );
+        }
+        metadata.address = nftContractAddress;
+        metadata.tokenId = tokenId;
+        return resolve(metadata);
+      } catch (error) {
+        return reject(error);
+      }
+    });
+  }
+};
+var Erc721Contract_default = Erc721Contract;
+
 // src/classes/Fund.ts
 var { parseUnits, formatUnits } = ethers2.utils;
 var Fund = class {
@@ -1178,18 +1380,22 @@ var Fund = class {
           const web3Provider = new ethers2.providers.Web3Provider(this.provider);
           const erc20Contract = new ethers2.Contract(tokenInfo.tokenAddress, erc20Abi_default, web3Provider);
           decimals = await erc20Contract.decimals();
+        } else if (tokenInfo.tokenType === 2) {
+          decimals = 0;
+          const erc721ContractInstance = new Erc721Contract_default(this.provider, tokenInfo.tokenAddress);
+          await erc721ContractInstance.approve(this.fundContract.address, recipientInfo.nftIds[0]);
         }
         const tokenAmount = parseUnits(recipientInfo.tokenAmount.toString(), decimals);
         const newFundRecipientInfo = {
           idSource: recipientInfo.socialPlatform,
           id: recipientInfo.userIdentifier,
           amount: tokenAmount,
-          nftIds: []
+          nftIds: recipientInfo.nftIds
         };
-        if (tokenInfo.tokenType === 0) {
-          params = [tokenInfo, newFundRecipientInfo];
-        } else {
+        if (tokenInfo.tokenType === 1) {
           params = [tokenInfo, newFundRecipientInfo, { value: tokenAmount }];
+        } else {
+          params = [tokenInfo, newFundRecipientInfo];
         }
         const result = await this.fundContract.sendTransaction("tip", params);
         resolve(result);
@@ -1225,6 +1431,10 @@ var Fund = class {
           const web3Provider = new ethers2.providers.Web3Provider(this.provider);
           const erc20Contract = new ethers2.Contract(tokenInfo.tokenAddress, erc20Abi_default, web3Provider);
           decimals = await erc20Contract.decimals();
+        } else if (tokenInfo.tokenType === 2) {
+          decimals = 0;
+          const erc721ContractInstance = new Erc721Contract_default(this.provider, tokenInfo.tokenAddress);
+          await erc721ContractInstance.setApprovalForAll(this.fundContract.address);
         }
         let totalFormatAmount = recipientInfoList.reduce((acc, cur) => acc.add(parseUnits(cur.tokenAmount.toString(), decimals)), ethers2.BigNumber.from(0));
         const newRecipientInfoList = recipientInfoList.map((i) => {
@@ -1233,13 +1443,13 @@ var Fund = class {
             idSource: i.socialPlatform,
             id: i.userIdentifier,
             amount: formatAmount,
-            nftIds: []
+            nftIds: i.nftIds
           };
         });
-        if (tokenInfo.tokenType === 0) {
-          params = [tokenInfo, newRecipientInfoList];
-        } else {
+        if (tokenInfo.tokenType === 1) {
           params = [tokenInfo, newRecipientInfoList, { value: totalFormatAmount }];
+        } else {
+          params = [tokenInfo, newRecipientInfoList];
         }
         const result = await this.fundContract.sendTransaction("tipBatch", params);
         return resolve(result);
@@ -1382,16 +1592,28 @@ var Fund = class {
         console.log("fundRecords", fundRecords);
         let formatRecords = [];
         for (const record of fundRecords) {
-          const { tipper, timestamp, tipToken: [tokenType, tokenAddress], amount } = record;
+          const { tipper, timestamp, tipToken: [tokenType, tokenAddress], amount, nftIds } = record;
           let decimals = 18;
           let symbol = "";
+          let tokenId = null;
+          let nftInfo = null;
           if (tokenType === 0) {
-            const web3Provider = new ethers2.providers.Web3Provider(this.provider);
-            const erc20Contract = new ethers2.Contract(tokenAddress, erc20Abi_default, web3Provider);
+            let formatProvider;
+            if (this.provider instanceof ethers2.providers.JsonRpcProvider) {
+              formatProvider = this.provider;
+            } else {
+              formatProvider = new ethers2.providers.Web3Provider(this.provider);
+            }
+            const erc20Contract = new ethers2.Contract(tokenAddress, erc20Abi_default, formatProvider);
             decimals = await erc20Contract.decimals();
             symbol = await erc20Contract.symbol();
           } else if (tokenType === 1) {
             symbol = NATIVETOKENS[this.chainId];
+          } else if (tokenType === 2) {
+            decimals = 0;
+            tokenId = parseInt(nftIds[0]);
+            const erc721ContractInstance = new Erc721Contract_default(this.provider, tokenAddress);
+            nftInfo = await erc721ContractInstance.fetchMetaData(tokenAddress, tokenId);
           }
           let fundToken = {
             tokenType,
@@ -1403,11 +1625,14 @@ var Fund = class {
           if (tokenType === 0) {
             fundToken.tokenAddress = tokenAddress;
           }
+          if (tokenType === 2) {
+            Object.assign(fundToken, nftInfo ?? {});
+          }
           formatRecords.push({
             funder: tipper,
             fundToken,
             amount: formatUnits(amount, decimals),
-            timestamp: timestamp.toNumber() * 1e3
+            timestamp: timestamp.toNumber()
           });
         }
         console.log("formatRecords", formatRecords);
@@ -1459,7 +1684,7 @@ var PrimusFund = class {
             formatUserIdentifier = i.userIdentifier.slice(1);
           }
           return {
-            nftIds: [],
+            nftIds: i.nftIds ?? [],
             socialPlatform: formatSocialPlatform,
             userIdentifier: formatUserIdentifier,
             tokenAmount: i.tokenAmount

package/package.json

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