@primuslabs/fund-js-sdk 0.1.0 → 0.1.2

package/README.md

@@ -7,4 +7,4 @@ For details, please refer to the following links:
 - [Overview](./README/overview.md)
 - [How to intall the SDK](./README/install.md)
 - [Example: Funding Tokens](./README/example.md)
-- [Receiver Guide](./README/receiver-guide.md)
+- [Receiver Guide: Claiming Tokens](./README/receiver-guide.md)

package/dist/index.d.mts

@@ -46,7 +46,7 @@ type  RecipientBaseInfo = {
 
 type  RecipientInfo = RecipientBaseInfo & {
     tokenAmount: string;// The amount of the token
-    nftIds?: bigint[];// The nft token ids when token is nft.
+    nftIds?: bigint[] | [];// The nft token ids when token is nft.
 }
 
 type FundParam = {
@@ -59,4 +59,10 @@ type ClaimParam = RecipientBaseInfo & {
     fundIndex?: number;
 }
 
-export type { AttNetworkRequest, AttNetworkResponseResolve, Attestation, Attestor, ClaimParam, FundParam, RecipientBaseInfo, RecipientInfo, TokenInfo, TokenType };
+type AttestParams = {
+    socialPlatform: string;
+    userIdentifier: string;
+    address: string
+}
+
+export type { AttNetworkRequest, AttNetworkResponseResolve, AttestParams, Attestation, Attestor, ClaimParam, FundParam, RecipientBaseInfo, RecipientInfo, TokenInfo, TokenType };

package/dist/index.d.ts

@@ -46,7 +46,7 @@ type  RecipientBaseInfo = {
 
 type  RecipientInfo = RecipientBaseInfo & {
     tokenAmount: string;// The amount of the token
-    nftIds?: bigint[];// The nft token ids when token is nft.
+    nftIds?: bigint[] | [];// The nft token ids when token is nft.
 }
 
 type FundParam = {
@@ -59,4 +59,10 @@ type ClaimParam = RecipientBaseInfo & {
     fundIndex?: number;
 }
 
-export type { AttNetworkRequest, AttNetworkResponseResolve, Attestation, Attestor, ClaimParam, FundParam, RecipientBaseInfo, RecipientInfo, TokenInfo, TokenType };
+type AttestParams = {
+    socialPlatform: string;
+    userIdentifier: string;
+    address: string
+}
+
+export type { AttNetworkRequest, AttNetworkResponseResolve, AttestParams, Attestation, Attestor, ClaimParam, FundParam, RecipientBaseInfo, RecipientInfo, TokenInfo, TokenType };

package/dist/index.js

@@ -30,17 +30,53 @@ var import_ethers2 = require("ethers");
 var import_zktls_js_sdk = require("@primuslabs/zktls-js-sdk");
 
 // src/config/constants.ts
-var Fund_CONTRACTS = {
+var DATASOURCETEMPLATESMAP = {
+  x: {
+    id: "2e3160ae-8b1e-45e3-8c59-426366278b9d",
+    field: "screen_name"
+  },
+  tiktok: {
+    id: "2b22c9f8-686d-4482-a0cf-c9c43c1181ad",
+    field: "username"
+  },
+  "google account": {
+    id: "3bad8a55-4415-4bec-9b47-a4c7bbe93518",
+    field: "2"
+  }
+};
+var SUPPORTEDSOCIALPLATFORMS = Object.keys(DATASOURCETEMPLATESMAP);
+var SUPPORTEDCHAINIDSMAP = {
+  10143: {
+    chainId: 10143,
+    chainName: "Monad testnet",
+    nativeCurrency: {
+      name: "MON",
+      symbol: "MON",
+      decimals: 18
+    },
+    contractAddress: "0xcd1Ed9C1595A7e9DADe76808dd5e66aA95940A92"
+  }
   // monad testnet
-  10143: "0xcd1Ed9C1595A7e9DADe76808dd5e66aA95940A92"
 };
+var NATIVETOKENS = Object.values(SUPPORTEDCHAINIDSMAP).reduce((prev, curr) => {
+  return {
+    ...prev,
+    [curr.chainId]: curr.nativeCurrency.symbol
+  };
+}, {});
+var CHAINNAMES = Object.values(SUPPORTEDCHAINIDSMAP).reduce((prev, curr) => {
+  return {
+    ...prev,
+    [curr.chainId]: curr.chainName
+  };
+}, {});
+var Fund_CONTRACTS = Object.values(SUPPORTEDCHAINIDSMAP).reduce((prev, curr) => {
+  return {
+    ...prev,
+    [curr.chainId]: curr.contractAddress
+  };
+}, {});
 var SUPPORTEDCHAINIDS = Object.keys(Fund_CONTRACTS).map((i) => Number(i));
-var DATASOURCETEMPLATEMAP = {
-  x: "2e3160ae-8b1e-45e3-8c59-426366278b9d",
-  tiktok: "2b22c9f8-686d-4482-a0cf-c9c43c1181ad",
-  "google account": ""
-};
-var SUPPORTEDSOCIALPLATFORMS = Object.keys(DATASOURCETEMPLATEMAP);
 
 // src/classes/Contract.ts
 var import_ethers = require("ethers");
@@ -89,7 +125,8 @@ var Contract = class {
         resolve(txreceipt);
       } catch (error) {
         console.log("sendTransaction error:", error);
-        if (error?.code === "ACTION_REJECTED") {
+        const errStr = error?.toString()?.toLowerCase() || "";
+        if (error?.code === "ACTION_REJECTED" || errStr.indexOf("user rejected") > -1 || errStr.indexOf("approval denied") > -1) {
           return reject("user rejected transaction");
         }
         if (error?.reason) {
@@ -98,6 +135,7 @@ var Contract = class {
         if (error?.data?.message === "insufficient balance") {
           return reject(error?.data?.message);
         }
+        return reject(error);
       }
     });
   }
@@ -1037,12 +1075,14 @@ var erc20Abi_default = [
 ];
 
 // src/classes/Fund.ts
+var { parseUnits, formatUnits } = import_ethers2.ethers.utils;
 var Fund = class {
   _attestLoading;
   zkTlsSdk;
   fundContract;
   provider;
-  _dataSourceTemplateMap = DATASOURCETEMPLATEMAP;
+  chainId;
+  _dataSourceTemplateMap = DATASOURCETEMPLATESMAP;
   constructor() {
     this._attestLoading = false;
   }
@@ -1064,6 +1104,7 @@ var Fund = class {
         }
         this.fundContract = new Contract_default(provider, fundContractAddress, abi_default);
         this.provider = provider;
+        this.chainId = chainId;
         if (appId) {
           this.zkTlsSdk = new import_zktls_js_sdk.PrimusZKTLS();
           const extensionVersion = await this.zkTlsSdk.init(
@@ -1090,7 +1131,7 @@ var Fund = class {
           const erc20Contract = new import_ethers2.ethers.Contract(tokenInfo.tokenAddress, erc20Abi_default, this.provider);
           decimals = await erc20Contract.decimals();
         }
-        const tokenAmount = import_ethers2.ethers.utils.parseUnits(recipientInfo.tokenAmount.toString(), decimals);
+        const tokenAmount = parseUnits(recipientInfo.tokenAmount.toString(), decimals);
         const newFundRecipientInfo = {
           idSource: recipientInfo.socialPlatform,
           id: recipientInfo.userIdentifier,
@@ -1135,9 +1176,9 @@ var Fund = class {
           const erc20Contract = new import_ethers2.ethers.Contract(tokenInfo.tokenAddress, erc20Abi_default, this.provider);
           decimals = await erc20Contract.decimals();
         }
-        let totalFormatAmount = recipientInfoList.reduce((acc, cur) => acc.add(import_ethers2.ethers.utils.parseUnits(cur.tokenAmount.toString(), decimals)), import_ethers2.ethers.BigNumber.from(0));
+        let totalFormatAmount = recipientInfoList.reduce((acc, cur) => acc.add(parseUnits(cur.tokenAmount.toString(), decimals)), import_ethers2.ethers.BigNumber.from(0));
         const newRecipientInfoList = recipientInfoList.map((i) => {
-          const formatAmount = import_ethers2.ethers.utils.parseUnits(i.tokenAmount.toString(), decimals);
+          const formatAmount = parseUnits(i.tokenAmount.toString(), decimals);
           return {
             idSource: i.socialPlatform,
             id: i.userIdentifier,
@@ -1165,7 +1206,7 @@ var Fund = class {
         const erc20Contract = new import_ethers2.ethers.Contract(tokenInfo.tokenAddress, erc20Abi_default, signer);
         const allowance = await erc20Contract.allowance(address, this.fundContract.address);
         const decimals = await erc20Contract.decimals();
-        const requiredAllowance = recipientInfoList.reduce((acc, cur) => acc.add(import_ethers2.ethers.utils.parseUnits(cur.tokenAmount.toString(), decimals)), import_ethers2.ethers.BigNumber.from(0));
+        const requiredAllowance = recipientInfoList.reduce((acc, cur) => acc.add(parseUnits(cur.tokenAmount.toString(), decimals)), import_ethers2.ethers.BigNumber.from(0));
         if (allowance.lt(requiredAllowance)) {
           const tx = await erc20Contract.approve(this.fundContract.address, requiredAllowance);
           await tx.wait();
@@ -1183,7 +1224,7 @@ var Fund = class {
       }
     });
   }
-  async attest(socialPlatform, address, genAppSignature) {
+  async attest(attestParams, genAppSignature) {
     return new Promise(async (resolve, reject) => {
       if (!this.zkTlsSdk?.padoExtensionVersion) {
         return reject(`Uninitialized!`);
@@ -1191,15 +1232,26 @@ var Fund = class {
       if (this._attestLoading) {
         return reject(`Under proof!`);
       }
+      const { socialPlatform, userIdentifier, address } = attestParams;
       this._attestLoading = true;
-      const templateId = this._dataSourceTemplateMap[socialPlatform];
+      const { id: templateId, field } = this._dataSourceTemplateMap[socialPlatform];
       const attRequest = this.zkTlsSdk.generateRequestParams(
         templateId,
         address
       );
+      attRequest.setAttConditions([
+        [
+          {
+            field,
+            op: "STREQ",
+            value: userIdentifier
+          }
+        ]
+      ]);
       const signParams = attRequest.toJsonString();
       const signature = await genAppSignature(signParams);
       if (!signature) {
+        this._attestLoading = false;
         return reject(`appSignature is empty!`);
       }
       try {
@@ -1213,8 +1265,9 @@ var Fund = class {
           JSON.stringify(formatAttestParams)
         );
         this._attestLoading = false;
-        resolve(attestation);
+        return resolve(attestation);
       } catch (error) {
+        this._attestLoading = false;
         return reject(error);
       }
     });
@@ -1226,7 +1279,7 @@ var Fund = class {
         const fundRecords = await this.fundContract.callMethod("getTipRecords", [{ idSource: socialPlatform, id: userIdentifier }]);
         console.log("fundRecords", fundRecords);
         const recordCount = fundRecords.length;
-        if (fundRecords <= 0) {
+        if (recordCount <= 0) {
           return reject(`No fund records.`);
         } else {
           const totalFee = claimFee.mul(recordCount);
@@ -1265,6 +1318,53 @@ var Fund = class {
       }
     });
   }
+  async getTipRecords(getFundRecordsParams) {
+    return new Promise(async (resolve, reject) => {
+      try {
+        const formatGetFundRecordsParams = getFundRecordsParams.map((item) => {
+          return {
+            idSource: item.socialPlatform,
+            id: item.userIdentifier
+          };
+        });
+        const fundRecords = await this.fundContract.callMethod("getTipRecords", formatGetFundRecordsParams);
+        console.log("fundRecords", fundRecords);
+        let formatRecords = [];
+        for (const record of fundRecords) {
+          const { tipper, timestamp, tipToken: [tokenType, tokenAddress], amount } = record;
+          let decimals = 18;
+          let symbol = "";
+          if (tokenType === 0) {
+            const erc20Contract = new import_ethers2.ethers.Contract(tokenAddress, erc20Abi_default, this.provider);
+            decimals = await erc20Contract.decimals();
+            symbol = await erc20Contract.symbol();
+          } else if (tokenType === 1) {
+            symbol = NATIVETOKENS[this.chainId];
+          }
+          let fundToken = {
+            tokenType,
+            // tokenAmount: formatUnits(amount, decimals),
+            decimals,
+            symbol,
+            chainName: CHAINNAMES[this.chainId]
+          };
+          if (tokenType === 0) {
+            fundToken.tokenAddress = tokenAddress;
+          }
+          formatRecords.push({
+            funder: tipper,
+            fundToken,
+            amount: formatUnits(amount, decimals),
+            timestamp: timestamp.toNumber() * 1e3
+          });
+        }
+        console.log("formatRecords", formatRecords);
+        return resolve(formatRecords);
+      } catch (error) {
+        return reject(error);
+      }
+    });
+  }
 };
 
 // src/index.ts
@@ -1279,7 +1379,13 @@ var PrimusFund = class {
           return reject("chainId is not supported");
         }
         this._fund = new Fund();
-        const result = await this._fund.init(new import_ethers3.ethers.providers.Web3Provider(provider), chainId, appId);
+        let formatProvider;
+        if (provider instanceof import_ethers3.ethers.providers.JsonRpcProvider) {
+          formatProvider = new import_ethers3.ethers.providers.JsonRpcProvider(defaultRpcUrl);
+        } else {
+          formatProvider = new import_ethers3.ethers.providers.Web3Provider(provider);
+        }
+        const result = await this._fund.init(formatProvider, chainId, appId);
         return resolve(result);
       } catch (error) {
         return reject(error);
@@ -1301,9 +1407,17 @@ var PrimusFund = class {
           tokenInfo.tokenAddress = import_ethers3.ethers.constants.AddressZero;
         }
         const newFundRecipientInfos = recipientInfos.map((i) => {
-          i.nftIds = [];
-          i.socialPlatform = i.socialPlatform.toLowerCase();
-          return i;
+          const formatSocialPlatform = i.socialPlatform.toLowerCase();
+          let formatUserIdentifier = i.userIdentifier;
+          if (i.socialPlatform === "x" && i.userIdentifier.startsWith("@")) {
+            formatUserIdentifier = i.userIdentifier.slice(1);
+          }
+          return {
+            nftIds: [],
+            socialPlatform: formatSocialPlatform,
+            userIdentifier: formatUserIdentifier,
+            tokenAmount: i.tokenAmount
+          };
         });
         if (recipientInfos.length === 1) {
           const result = await this._fund?.fund(tokenInfo, newFundRecipientInfos[0]);
@@ -1325,6 +1439,9 @@ var PrimusFund = class {
         }
         const newRecipients = recipients.map((i) => {
           i.socialPlatform = i.socialPlatform.toLowerCase();
+          if (i.socialPlatform === "x" && i.userIdentifier.startsWith("@")) {
+            i.userIdentifier = i.userIdentifier.slice(1);
+          }
           return i;
         });
         const result = await this._fund?.refund(newRecipients);
@@ -1334,11 +1451,15 @@ var PrimusFund = class {
       }
     });
   }
-  async attest(socialPlatform, address, genAppSignature) {
+  async attest(attestParams, genAppSignature) {
     return new Promise(async (resolve, reject) => {
       try {
+        const { socialPlatform } = attestParams;
         const lcSocialPlatform = socialPlatform.toLowerCase();
-        const attestation = await this._fund?.attest(lcSocialPlatform, address, genAppSignature);
+        const attestation = await this._fund?.attest({
+          ...attestParams,
+          socialPlatform: lcSocialPlatform
+        }, genAppSignature);
         return resolve(attestation);
       } catch (error) {
         return reject(error);
@@ -1359,9 +1480,12 @@ var PrimusFund = class {
         socialPlatforms[i] = claimParamList[i].socialPlatform.toLowerCase();
         attestations[i] = claimParamList[i].attestation;
         userIdentifiers[i] = claimParamList[i].userIdentifier;
+        if (socialPlatforms[i] === "x" && userIdentifiers[i].startsWith("@")) {
+          claimParamList[i].userIdentifier = claimParamList[i].userIdentifier.slice(1);
+        }
       }
       if (socialPlatforms.length !== userIdentifiers.length || socialPlatforms.length !== attestations.length) {
-        return reject(`claimParamList is wrong`);
+        return reject(`claimParams is wrong`);
       }
       try {
         if (socialPlatforms.length === 1) {
@@ -1376,6 +1500,33 @@ var PrimusFund = class {
       }
     });
   }
+  async getFundRecords(getFundRecordsParams) {
+    const queryList = Array.isArray(getFundRecordsParams) ? getFundRecordsParams : [getFundRecordsParams];
+    return new Promise(async (resolve, reject) => {
+      if (!queryList || queryList?.length === 0) {
+        const error = new Error("getFundRecordsParams is empty");
+        return reject(error);
+      }
+      const socialPlatforms = [];
+      const userIdentifiers = [];
+      for (let i = 0; i < queryList.length; i++) {
+        socialPlatforms[i] = queryList[i].socialPlatform.toLowerCase();
+        userIdentifiers[i] = queryList[i].userIdentifier;
+        if (socialPlatforms[i] === "x" && userIdentifiers[i].startsWith("@")) {
+          queryList[i].userIdentifier = queryList[i].userIdentifier.slice(1);
+        }
+      }
+      if (socialPlatforms.length !== userIdentifiers.length) {
+        return reject(`getFundRecordsParams is wrong`);
+      }
+      try {
+        const result = await this._fund?.getTipRecords(queryList);
+        resolve(result);
+      } catch (error) {
+        return reject(error);
+      }
+    });
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/index.mjs

@@ -6,17 +6,53 @@ import { ethers as ethers2 } from "ethers";
 import { PrimusZKTLS } from "@primuslabs/zktls-js-sdk";
 
 // src/config/constants.ts
-var Fund_CONTRACTS = {
+var DATASOURCETEMPLATESMAP = {
+  x: {
+    id: "2e3160ae-8b1e-45e3-8c59-426366278b9d",
+    field: "screen_name"
+  },
+  tiktok: {
+    id: "2b22c9f8-686d-4482-a0cf-c9c43c1181ad",
+    field: "username"
+  },
+  "google account": {
+    id: "3bad8a55-4415-4bec-9b47-a4c7bbe93518",
+    field: "2"
+  }
+};
+var SUPPORTEDSOCIALPLATFORMS = Object.keys(DATASOURCETEMPLATESMAP);
+var SUPPORTEDCHAINIDSMAP = {
+  10143: {
+    chainId: 10143,
+    chainName: "Monad testnet",
+    nativeCurrency: {
+      name: "MON",
+      symbol: "MON",
+      decimals: 18
+    },
+    contractAddress: "0xcd1Ed9C1595A7e9DADe76808dd5e66aA95940A92"
+  }
   // monad testnet
-  10143: "0xcd1Ed9C1595A7e9DADe76808dd5e66aA95940A92"
 };
+var NATIVETOKENS = Object.values(SUPPORTEDCHAINIDSMAP).reduce((prev, curr) => {
+  return {
+    ...prev,
+    [curr.chainId]: curr.nativeCurrency.symbol
+  };
+}, {});
+var CHAINNAMES = Object.values(SUPPORTEDCHAINIDSMAP).reduce((prev, curr) => {
+  return {
+    ...prev,
+    [curr.chainId]: curr.chainName
+  };
+}, {});
+var Fund_CONTRACTS = Object.values(SUPPORTEDCHAINIDSMAP).reduce((prev, curr) => {
+  return {
+    ...prev,
+    [curr.chainId]: curr.contractAddress
+  };
+}, {});
 var SUPPORTEDCHAINIDS = Object.keys(Fund_CONTRACTS).map((i) => Number(i));
-var DATASOURCETEMPLATEMAP = {
-  x: "2e3160ae-8b1e-45e3-8c59-426366278b9d",
-  tiktok: "2b22c9f8-686d-4482-a0cf-c9c43c1181ad",
-  "google account": ""
-};
-var SUPPORTEDSOCIALPLATFORMS = Object.keys(DATASOURCETEMPLATEMAP);
 
 // src/classes/Contract.ts
 import { ethers } from "ethers";
@@ -65,7 +101,8 @@ var Contract = class {
         resolve(txreceipt);
       } catch (error) {
         console.log("sendTransaction error:", error);
-        if (error?.code === "ACTION_REJECTED") {
+        const errStr = error?.toString()?.toLowerCase() || "";
+        if (error?.code === "ACTION_REJECTED" || errStr.indexOf("user rejected") > -1 || errStr.indexOf("approval denied") > -1) {
           return reject("user rejected transaction");
         }
         if (error?.reason) {
@@ -74,6 +111,7 @@ var Contract = class {
         if (error?.data?.message === "insufficient balance") {
           return reject(error?.data?.message);
         }
+        return reject(error);
       }
     });
   }
@@ -1013,12 +1051,14 @@ var erc20Abi_default = [
 ];
 
 // src/classes/Fund.ts
+var { parseUnits, formatUnits } = ethers2.utils;
 var Fund = class {
   _attestLoading;
   zkTlsSdk;
   fundContract;
   provider;
-  _dataSourceTemplateMap = DATASOURCETEMPLATEMAP;
+  chainId;
+  _dataSourceTemplateMap = DATASOURCETEMPLATESMAP;
   constructor() {
     this._attestLoading = false;
   }
@@ -1040,6 +1080,7 @@ var Fund = class {
         }
         this.fundContract = new Contract_default(provider, fundContractAddress, abi_default);
         this.provider = provider;
+        this.chainId = chainId;
         if (appId) {
           this.zkTlsSdk = new PrimusZKTLS();
           const extensionVersion = await this.zkTlsSdk.init(
@@ -1066,7 +1107,7 @@ var Fund = class {
           const erc20Contract = new ethers2.Contract(tokenInfo.tokenAddress, erc20Abi_default, this.provider);
           decimals = await erc20Contract.decimals();
         }
-        const tokenAmount = ethers2.utils.parseUnits(recipientInfo.tokenAmount.toString(), decimals);
+        const tokenAmount = parseUnits(recipientInfo.tokenAmount.toString(), decimals);
         const newFundRecipientInfo = {
           idSource: recipientInfo.socialPlatform,
           id: recipientInfo.userIdentifier,
@@ -1111,9 +1152,9 @@ var Fund = class {
           const erc20Contract = new ethers2.Contract(tokenInfo.tokenAddress, erc20Abi_default, this.provider);
           decimals = await erc20Contract.decimals();
         }
-        let totalFormatAmount = recipientInfoList.reduce((acc, cur) => acc.add(ethers2.utils.parseUnits(cur.tokenAmount.toString(), decimals)), ethers2.BigNumber.from(0));
+        let totalFormatAmount = recipientInfoList.reduce((acc, cur) => acc.add(parseUnits(cur.tokenAmount.toString(), decimals)), ethers2.BigNumber.from(0));
         const newRecipientInfoList = recipientInfoList.map((i) => {
-          const formatAmount = ethers2.utils.parseUnits(i.tokenAmount.toString(), decimals);
+          const formatAmount = parseUnits(i.tokenAmount.toString(), decimals);
           return {
             idSource: i.socialPlatform,
             id: i.userIdentifier,
@@ -1141,7 +1182,7 @@ var Fund = class {
         const erc20Contract = new ethers2.Contract(tokenInfo.tokenAddress, erc20Abi_default, signer);
         const allowance = await erc20Contract.allowance(address, this.fundContract.address);
         const decimals = await erc20Contract.decimals();
-        const requiredAllowance = recipientInfoList.reduce((acc, cur) => acc.add(ethers2.utils.parseUnits(cur.tokenAmount.toString(), decimals)), ethers2.BigNumber.from(0));
+        const requiredAllowance = recipientInfoList.reduce((acc, cur) => acc.add(parseUnits(cur.tokenAmount.toString(), decimals)), ethers2.BigNumber.from(0));
         if (allowance.lt(requiredAllowance)) {
           const tx = await erc20Contract.approve(this.fundContract.address, requiredAllowance);
           await tx.wait();
@@ -1159,7 +1200,7 @@ var Fund = class {
       }
     });
   }
-  async attest(socialPlatform, address, genAppSignature) {
+  async attest(attestParams, genAppSignature) {
     return new Promise(async (resolve, reject) => {
       if (!this.zkTlsSdk?.padoExtensionVersion) {
         return reject(`Uninitialized!`);
@@ -1167,15 +1208,26 @@ var Fund = class {
       if (this._attestLoading) {
         return reject(`Under proof!`);
       }
+      const { socialPlatform, userIdentifier, address } = attestParams;
       this._attestLoading = true;
-      const templateId = this._dataSourceTemplateMap[socialPlatform];
+      const { id: templateId, field } = this._dataSourceTemplateMap[socialPlatform];
       const attRequest = this.zkTlsSdk.generateRequestParams(
         templateId,
         address
       );
+      attRequest.setAttConditions([
+        [
+          {
+            field,
+            op: "STREQ",
+            value: userIdentifier
+          }
+        ]
+      ]);
       const signParams = attRequest.toJsonString();
       const signature = await genAppSignature(signParams);
       if (!signature) {
+        this._attestLoading = false;
         return reject(`appSignature is empty!`);
       }
       try {
@@ -1189,8 +1241,9 @@ var Fund = class {
           JSON.stringify(formatAttestParams)
         );
         this._attestLoading = false;
-        resolve(attestation);
+        return resolve(attestation);
       } catch (error) {
+        this._attestLoading = false;
         return reject(error);
       }
     });
@@ -1202,7 +1255,7 @@ var Fund = class {
         const fundRecords = await this.fundContract.callMethod("getTipRecords", [{ idSource: socialPlatform, id: userIdentifier }]);
         console.log("fundRecords", fundRecords);
         const recordCount = fundRecords.length;
-        if (fundRecords <= 0) {
+        if (recordCount <= 0) {
           return reject(`No fund records.`);
         } else {
           const totalFee = claimFee.mul(recordCount);
@@ -1241,6 +1294,53 @@ var Fund = class {
       }
     });
   }
+  async getTipRecords(getFundRecordsParams) {
+    return new Promise(async (resolve, reject) => {
+      try {
+        const formatGetFundRecordsParams = getFundRecordsParams.map((item) => {
+          return {
+            idSource: item.socialPlatform,
+            id: item.userIdentifier
+          };
+        });
+        const fundRecords = await this.fundContract.callMethod("getTipRecords", formatGetFundRecordsParams);
+        console.log("fundRecords", fundRecords);
+        let formatRecords = [];
+        for (const record of fundRecords) {
+          const { tipper, timestamp, tipToken: [tokenType, tokenAddress], amount } = record;
+          let decimals = 18;
+          let symbol = "";
+          if (tokenType === 0) {
+            const erc20Contract = new ethers2.Contract(tokenAddress, erc20Abi_default, this.provider);
+            decimals = await erc20Contract.decimals();
+            symbol = await erc20Contract.symbol();
+          } else if (tokenType === 1) {
+            symbol = NATIVETOKENS[this.chainId];
+          }
+          let fundToken = {
+            tokenType,
+            // tokenAmount: formatUnits(amount, decimals),
+            decimals,
+            symbol,
+            chainName: CHAINNAMES[this.chainId]
+          };
+          if (tokenType === 0) {
+            fundToken.tokenAddress = tokenAddress;
+          }
+          formatRecords.push({
+            funder: tipper,
+            fundToken,
+            amount: formatUnits(amount, decimals),
+            timestamp: timestamp.toNumber() * 1e3
+          });
+        }
+        console.log("formatRecords", formatRecords);
+        return resolve(formatRecords);
+      } catch (error) {
+        return reject(error);
+      }
+    });
+  }
 };
 
 // src/index.ts
@@ -1255,7 +1355,13 @@ var PrimusFund = class {
           return reject("chainId is not supported");
         }
         this._fund = new Fund();
-        const result = await this._fund.init(new ethers3.providers.Web3Provider(provider), chainId, appId);
+        let formatProvider;
+        if (provider instanceof ethers3.providers.JsonRpcProvider) {
+          formatProvider = new ethers3.providers.JsonRpcProvider(defaultRpcUrl);
+        } else {
+          formatProvider = new ethers3.providers.Web3Provider(provider);
+        }
+        const result = await this._fund.init(formatProvider, chainId, appId);
         return resolve(result);
       } catch (error) {
         return reject(error);
@@ -1277,9 +1383,17 @@ var PrimusFund = class {
           tokenInfo.tokenAddress = ethers3.constants.AddressZero;
         }
         const newFundRecipientInfos = recipientInfos.map((i) => {
-          i.nftIds = [];
-          i.socialPlatform = i.socialPlatform.toLowerCase();
-          return i;
+          const formatSocialPlatform = i.socialPlatform.toLowerCase();
+          let formatUserIdentifier = i.userIdentifier;
+          if (i.socialPlatform === "x" && i.userIdentifier.startsWith("@")) {
+            formatUserIdentifier = i.userIdentifier.slice(1);
+          }
+          return {
+            nftIds: [],
+            socialPlatform: formatSocialPlatform,
+            userIdentifier: formatUserIdentifier,
+            tokenAmount: i.tokenAmount
+          };
         });
         if (recipientInfos.length === 1) {
           const result = await this._fund?.fund(tokenInfo, newFundRecipientInfos[0]);
@@ -1301,6 +1415,9 @@ var PrimusFund = class {
         }
         const newRecipients = recipients.map((i) => {
           i.socialPlatform = i.socialPlatform.toLowerCase();
+          if (i.socialPlatform === "x" && i.userIdentifier.startsWith("@")) {
+            i.userIdentifier = i.userIdentifier.slice(1);
+          }
           return i;
         });
         const result = await this._fund?.refund(newRecipients);
@@ -1310,11 +1427,15 @@ var PrimusFund = class {
       }
     });
   }
-  async attest(socialPlatform, address, genAppSignature) {
+  async attest(attestParams, genAppSignature) {
     return new Promise(async (resolve, reject) => {
       try {
+        const { socialPlatform } = attestParams;
         const lcSocialPlatform = socialPlatform.toLowerCase();
-        const attestation = await this._fund?.attest(lcSocialPlatform, address, genAppSignature);
+        const attestation = await this._fund?.attest({
+          ...attestParams,
+          socialPlatform: lcSocialPlatform
+        }, genAppSignature);
         return resolve(attestation);
       } catch (error) {
         return reject(error);
@@ -1335,9 +1456,12 @@ var PrimusFund = class {
         socialPlatforms[i] = claimParamList[i].socialPlatform.toLowerCase();
         attestations[i] = claimParamList[i].attestation;
         userIdentifiers[i] = claimParamList[i].userIdentifier;
+        if (socialPlatforms[i] === "x" && userIdentifiers[i].startsWith("@")) {
+          claimParamList[i].userIdentifier = claimParamList[i].userIdentifier.slice(1);
+        }
       }
       if (socialPlatforms.length !== userIdentifiers.length || socialPlatforms.length !== attestations.length) {
-        return reject(`claimParamList is wrong`);
+        return reject(`claimParams is wrong`);
       }
       try {
         if (socialPlatforms.length === 1) {
@@ -1352,6 +1476,33 @@ var PrimusFund = class {
       }
     });
   }
+  async getFundRecords(getFundRecordsParams) {
+    const queryList = Array.isArray(getFundRecordsParams) ? getFundRecordsParams : [getFundRecordsParams];
+    return new Promise(async (resolve, reject) => {
+      if (!queryList || queryList?.length === 0) {
+        const error = new Error("getFundRecordsParams is empty");
+        return reject(error);
+      }
+      const socialPlatforms = [];
+      const userIdentifiers = [];
+      for (let i = 0; i < queryList.length; i++) {
+        socialPlatforms[i] = queryList[i].socialPlatform.toLowerCase();
+        userIdentifiers[i] = queryList[i].userIdentifier;
+        if (socialPlatforms[i] === "x" && userIdentifiers[i].startsWith("@")) {
+          queryList[i].userIdentifier = queryList[i].userIdentifier.slice(1);
+        }
+      }
+      if (socialPlatforms.length !== userIdentifiers.length) {
+        return reject(`getFundRecordsParams is wrong`);
+      }
+      try {
+        const result = await this._fund?.getTipRecords(queryList);
+        resolve(result);
+      } catch (error) {
+        return reject(error);
+      }
+    });
+  }
 };
 export {
   PrimusFund

package/package.json

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