@primuslabs/fund-js-sdk 0.1.3 → 0.1.5

package/dist/index.d.mts

@@ -43,7 +43,9 @@ type  RecipientBaseInfo = {
     socialPlatform: string;// The name of the social platform.
     userIdentifier: string;// The user’s unique identifier on the platforms.
 }
-
+type RefundParam = RecipientBaseInfo &{
+    tipTimestamp?: number; // unit: s
+}
 type  RecipientInfo = RecipientBaseInfo & {
     tokenAmount: string;// The amount of the token
     nftIds?: bigint[] | [];// The nft token ids when token is nft.
@@ -65,4 +67,4 @@ type AttestParams = {
     address: string
 }
 
-export type { AttNetworkRequest, AttNetworkResponseResolve, AttestParams, Attestation, Attestor, ClaimParam, FundParam, RecipientBaseInfo, RecipientInfo, TokenInfo, TokenType };
+export type { AttNetworkRequest, AttNetworkResponseResolve, AttestParams, Attestation, Attestor, ClaimParam, FundParam, RecipientBaseInfo, RecipientInfo, RefundParam, TokenInfo, TokenType };

package/dist/index.d.ts

@@ -43,7 +43,9 @@ type  RecipientBaseInfo = {
     socialPlatform: string;// The name of the social platform.
     userIdentifier: string;// The user’s unique identifier on the platforms.
 }
-
+type RefundParam = RecipientBaseInfo &{
+    tipTimestamp?: number; // unit: s
+}
 type  RecipientInfo = RecipientBaseInfo & {
     tokenAmount: string;// The amount of the token
     nftIds?: bigint[] | [];// The nft token ids when token is nft.
@@ -65,4 +67,4 @@ type AttestParams = {
     address: string
 }
 
-export type { AttNetworkRequest, AttNetworkResponseResolve, AttestParams, Attestation, Attestor, ClaimParam, FundParam, RecipientBaseInfo, RecipientInfo, TokenInfo, TokenType };
+export type { AttNetworkRequest, AttNetworkResponseResolve, AttestParams, Attestation, Attestor, ClaimParam, FundParam, RecipientBaseInfo, RecipientInfo, RefundParam, TokenInfo, TokenType };

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;
@@ -124,24 +138,31 @@ var Contract = class {
         return reject(`Method ${functionName} does not exist on the contract`);
       }
       try {
-        console.log("sendTransaction params:", ...functionParams);
+        console.log("sendTransaction params:", functionName, ...functionParams);
         const tx = await this.contractInstance[functionName](...functionParams);
         const txreceipt = await tx.wait();
         console.log("txreceipt", txreceipt);
         resolve(txreceipt);
       } catch (error) {
         console.log("sendTransaction error:", error);
-        const errStr = error?.toString()?.toLowerCase() || "";
+        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 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");
         }
+        const isNoPendingWithdrawals = hasErrorFlagFn(curErrorStrArr, ["no pending withdrawals"]);
+        if (isNoPendingWithdrawals) {
+          return reject("no pending withdrawals");
+        }
         return reject(error);
       }
     });
@@ -599,10 +620,11 @@ var abi_default = [
       {
         name: "tipRecipients",
         type: "tuple[]",
-        internalType: "struct TipRecipient[]",
+        internalType: "struct TipWithdrawInfo[]",
         components: [
           { name: "idSource", type: "string", internalType: "string" },
-          { name: "id", type: "string", internalType: "string" }
+          { name: "id", type: "string", internalType: "string" },
+          { name: "tipTimestamp", type: "uint64", internalType: "uint64" }
         ]
       }
     ],
@@ -635,6 +657,12 @@ var abi_default = [
         indexed: true,
         internalType: "address"
       },
+      {
+        name: "claimTime",
+        type: "uint64",
+        indexed: false,
+        internalType: "uint64"
+      },
       {
         name: "idSource",
         type: "string",
@@ -664,6 +692,12 @@ var abi_default = [
         type: "uint256",
         indexed: false,
         internalType: "uint256"
+      },
+      {
+        name: "tipTime",
+        type: "uint64",
+        indexed: false,
+        internalType: "uint64"
       }
     ],
     anonymous: false
@@ -721,6 +755,24 @@ var abi_default = [
         type: "address",
         indexed: false,
         internalType: "address"
+      },
+      {
+        name: "tokenAddr",
+        type: "address",
+        indexed: false,
+        internalType: "address"
+      },
+      {
+        name: "amount",
+        type: "uint256",
+        indexed: false,
+        internalType: "uint256"
+      },
+      {
+        name: "tipTime",
+        type: "uint64",
+        indexed: false,
+        internalType: "uint64"
       }
     ],
     anonymous: false
@@ -729,16 +781,34 @@ var abi_default = [
     type: "event",
     name: "WithdrawEvent",
     inputs: [
+      {
+        name: "withdrawTime",
+        type: "uint64",
+        indexed: false,
+        internalType: "uint64"
+      },
+      {
+        name: "idSource",
+        type: "string",
+        indexed: false,
+        internalType: "string"
+      },
+      {
+        name: "id",
+        type: "string",
+        indexed: false,
+        internalType: "string"
+      },
       {
         name: "tipper",
         type: "address",
-        indexed: true,
+        indexed: false,
         internalType: "address"
       },
       {
         name: "tokenAddr",
         type: "address",
-        indexed: true,
+        indexed: false,
         internalType: "address"
       },
       {
@@ -746,6 +816,12 @@ var abi_default = [
         type: "uint256",
         indexed: false,
         internalType: "uint256"
+      },
+      {
+        name: "tipTime",
+        type: "uint64",
+        indexed: false,
+        internalType: "uint64"
       }
     ],
     anonymous: false
@@ -1141,7 +1217,8 @@ var Fund = class {
         let params = [];
         if (tokenInfo.tokenType === 0) {
           await this.approve(tokenInfo, recipientInfos);
-          const erc20Contract = new import_ethers2.ethers.Contract(tokenInfo.tokenAddress, erc20Abi_default, this.provider);
+          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();
         }
         const tokenAmount = parseUnits(recipientInfo.tokenAmount.toString(), decimals);
@@ -1169,7 +1246,8 @@ var Fund = class {
         const newRecipients = recipients.map((i) => {
           return {
             idSource: i.socialPlatform,
-            id: i.userIdentifier
+            id: i.userIdentifier,
+            tipTimestamp: i.tipTimestamp
           };
         });
         const result = await this.fundContract.sendTransaction("tipperWithdraw", [newRecipients]);
@@ -1186,7 +1264,8 @@ var Fund = class {
         let params = [];
         if (tokenInfo.tokenType === 0) {
           await this.approve(tokenInfo, recipientInfoList);
-          const erc20Contract = new import_ethers2.ethers.Contract(tokenInfo.tokenAddress, erc20Abi_default, this.provider);
+          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();
         }
         let totalFormatAmount = recipientInfoList.reduce((acc, cur) => acc.add(parseUnits(cur.tokenAmount.toString(), decimals)), import_ethers2.ethers.BigNumber.from(0));
@@ -1214,7 +1293,8 @@ var Fund = class {
   async approve(tokenInfo, recipientInfoList) {
     return new Promise(async (resolve, reject) => {
       try {
-        const signer = this.provider.getSigner();
+        const web3Provider = new import_ethers2.ethers.providers.Web3Provider(this.provider);
+        const signer = web3Provider.getSigner();
         const address = await signer.getAddress();
         const erc20Contract = new import_ethers2.ethers.Contract(tokenInfo.tokenAddress, erc20Abi_default, signer);
         const allowance = await erc20Contract.allowance(address, this.fundContract.address);
@@ -1348,7 +1428,13 @@ var Fund = class {
           let decimals = 18;
           let symbol = "";
           if (tokenType === 0) {
-            const erc20Contract = new import_ethers2.ethers.Contract(tokenAddress, erc20Abi_default, this.provider);
+            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) {

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;
@@ -100,24 +114,31 @@ var Contract = class {
         return reject(`Method ${functionName} does not exist on the contract`);
       }
       try {
-        console.log("sendTransaction params:", ...functionParams);
+        console.log("sendTransaction params:", functionName, ...functionParams);
         const tx = await this.contractInstance[functionName](...functionParams);
         const txreceipt = await tx.wait();
         console.log("txreceipt", txreceipt);
         resolve(txreceipt);
       } catch (error) {
         console.log("sendTransaction error:", error);
-        const errStr = error?.toString()?.toLowerCase() || "";
+        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 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");
         }
+        const isNoPendingWithdrawals = hasErrorFlagFn(curErrorStrArr, ["no pending withdrawals"]);
+        if (isNoPendingWithdrawals) {
+          return reject("no pending withdrawals");
+        }
         return reject(error);
       }
     });
@@ -575,10 +596,11 @@ var abi_default = [
       {
         name: "tipRecipients",
         type: "tuple[]",
-        internalType: "struct TipRecipient[]",
+        internalType: "struct TipWithdrawInfo[]",
         components: [
           { name: "idSource", type: "string", internalType: "string" },
-          { name: "id", type: "string", internalType: "string" }
+          { name: "id", type: "string", internalType: "string" },
+          { name: "tipTimestamp", type: "uint64", internalType: "uint64" }
         ]
       }
     ],
@@ -611,6 +633,12 @@ var abi_default = [
         indexed: true,
         internalType: "address"
       },
+      {
+        name: "claimTime",
+        type: "uint64",
+        indexed: false,
+        internalType: "uint64"
+      },
       {
         name: "idSource",
         type: "string",
@@ -640,6 +668,12 @@ var abi_default = [
         type: "uint256",
         indexed: false,
         internalType: "uint256"
+      },
+      {
+        name: "tipTime",
+        type: "uint64",
+        indexed: false,
+        internalType: "uint64"
       }
     ],
     anonymous: false
@@ -697,6 +731,24 @@ var abi_default = [
         type: "address",
         indexed: false,
         internalType: "address"
+      },
+      {
+        name: "tokenAddr",
+        type: "address",
+        indexed: false,
+        internalType: "address"
+      },
+      {
+        name: "amount",
+        type: "uint256",
+        indexed: false,
+        internalType: "uint256"
+      },
+      {
+        name: "tipTime",
+        type: "uint64",
+        indexed: false,
+        internalType: "uint64"
       }
     ],
     anonymous: false
@@ -705,16 +757,34 @@ var abi_default = [
     type: "event",
     name: "WithdrawEvent",
     inputs: [
+      {
+        name: "withdrawTime",
+        type: "uint64",
+        indexed: false,
+        internalType: "uint64"
+      },
+      {
+        name: "idSource",
+        type: "string",
+        indexed: false,
+        internalType: "string"
+      },
+      {
+        name: "id",
+        type: "string",
+        indexed: false,
+        internalType: "string"
+      },
       {
         name: "tipper",
         type: "address",
-        indexed: true,
+        indexed: false,
         internalType: "address"
       },
       {
         name: "tokenAddr",
         type: "address",
-        indexed: true,
+        indexed: false,
         internalType: "address"
       },
       {
@@ -722,6 +792,12 @@ var abi_default = [
         type: "uint256",
         indexed: false,
         internalType: "uint256"
+      },
+      {
+        name: "tipTime",
+        type: "uint64",
+        indexed: false,
+        internalType: "uint64"
       }
     ],
     anonymous: false
@@ -1117,7 +1193,8 @@ var Fund = class {
         let params = [];
         if (tokenInfo.tokenType === 0) {
           await this.approve(tokenInfo, recipientInfos);
-          const erc20Contract = new ethers2.Contract(tokenInfo.tokenAddress, erc20Abi_default, this.provider);
+          const web3Provider = new ethers2.providers.Web3Provider(this.provider);
+          const erc20Contract = new ethers2.Contract(tokenInfo.tokenAddress, erc20Abi_default, web3Provider);
           decimals = await erc20Contract.decimals();
         }
         const tokenAmount = parseUnits(recipientInfo.tokenAmount.toString(), decimals);
@@ -1145,7 +1222,8 @@ var Fund = class {
         const newRecipients = recipients.map((i) => {
           return {
             idSource: i.socialPlatform,
-            id: i.userIdentifier
+            id: i.userIdentifier,
+            tipTimestamp: i.tipTimestamp
           };
         });
         const result = await this.fundContract.sendTransaction("tipperWithdraw", [newRecipients]);
@@ -1162,7 +1240,8 @@ var Fund = class {
         let params = [];
         if (tokenInfo.tokenType === 0) {
           await this.approve(tokenInfo, recipientInfoList);
-          const erc20Contract = new ethers2.Contract(tokenInfo.tokenAddress, erc20Abi_default, this.provider);
+          const web3Provider = new ethers2.providers.Web3Provider(this.provider);
+          const erc20Contract = new ethers2.Contract(tokenInfo.tokenAddress, erc20Abi_default, web3Provider);
           decimals = await erc20Contract.decimals();
         }
         let totalFormatAmount = recipientInfoList.reduce((acc, cur) => acc.add(parseUnits(cur.tokenAmount.toString(), decimals)), ethers2.BigNumber.from(0));
@@ -1190,7 +1269,8 @@ var Fund = class {
   async approve(tokenInfo, recipientInfoList) {
     return new Promise(async (resolve, reject) => {
       try {
-        const signer = this.provider.getSigner();
+        const web3Provider = new ethers2.providers.Web3Provider(this.provider);
+        const signer = web3Provider.getSigner();
         const address = await signer.getAddress();
         const erc20Contract = new ethers2.Contract(tokenInfo.tokenAddress, erc20Abi_default, signer);
         const allowance = await erc20Contract.allowance(address, this.fundContract.address);
@@ -1324,7 +1404,13 @@ var Fund = class {
           let decimals = 18;
           let symbol = "";
           if (tokenType === 0) {
-            const erc20Contract = new ethers2.Contract(tokenAddress, erc20Abi_default, this.provider);
+            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) {

package/package.json

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