@primuslabs/fund-js-sdk 0.1.2 → 0.1.4

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

@@ -94,8 +94,14 @@ var Contract = class {
     }
     this.address = address;
     this.provider = provider;
-    const signer = this.provider.getSigner();
-    this.contractInstance = new import_ethers.ethers.Contract(this.address, abiJson, signer);
+    let formatProvider;
+    if (provider instanceof import_ethers.ethers.providers.JsonRpcProvider) {
+      formatProvider = provider;
+    } else {
+      const web3Provider = new import_ethers.ethers.providers.Web3Provider(provider);
+      formatProvider = web3Provider.getSigner();
+    }
+    this.contractInstance = new import_ethers.ethers.Contract(this.address, abiJson, formatProvider);
   }
   // Example method to read from the contract
   async callMethod(functionName, functionParams) {
@@ -118,22 +124,26 @@ 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() || "";
-        if (error?.code === "ACTION_REJECTED" || errStr.indexOf("user rejected") > -1 || errStr.indexOf("approval denied") > -1) {
+        const errStr = error?.message || error?.toString()?.toLowerCase() || "";
+        const userRejectErrStrArr = ["user rejected", "approval denied"];
+        const isUserRejected = userRejectErrStrArr.some((str) => errStr.indexOf(str) > -1);
+        if (error?.code === "ACTION_REJECTED" || isUserRejected) {
           return reject("user rejected transaction");
         }
-        if (error?.reason) {
-          return reject(error.reason);
+        const insufficientBalanceErrStrArr = ["insufficient balance", "unpredictable_gas_limit"];
+        const isInsufficientBalance = insufficientBalanceErrStrArr.some((str) => errStr.indexOf(str) > -1);
+        if (isInsufficientBalance) {
+          return reject("insufficient balance");
         }
-        if (error?.data?.message === "insufficient balance") {
-          return reject(error?.data?.message);
+        if (errStr.indexOf("no pending withdrawals") > -1) {
+          return reject("no pending withdrawals");
         }
         return reject(error);
       }
@@ -592,10 +602,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" }
         ]
       }
     ],
@@ -628,6 +639,12 @@ var abi_default = [
         indexed: true,
         internalType: "address"
       },
+      {
+        name: "claimTime",
+        type: "uint64",
+        indexed: false,
+        internalType: "uint64"
+      },
       {
         name: "idSource",
         type: "string",
@@ -657,6 +674,12 @@ var abi_default = [
         type: "uint256",
         indexed: false,
         internalType: "uint256"
+      },
+      {
+        name: "tipTime",
+        type: "uint64",
+        indexed: false,
+        internalType: "uint64"
       }
     ],
     anonymous: false
@@ -714,6 +737,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
@@ -722,16 +763,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"
       },
       {
@@ -739,6 +798,12 @@ var abi_default = [
         type: "uint256",
         indexed: false,
         internalType: "uint256"
+      },
+      {
+        name: "tipTime",
+        type: "uint64",
+        indexed: false,
+        internalType: "uint64"
       }
     ],
     anonymous: false
@@ -1092,7 +1157,13 @@ var Fund = class {
   async init(provider, chainId, appId) {
     return new Promise(async (resolve, reject) => {
       try {
-        const network = await provider.getNetwork();
+        let formatProvider;
+        if (provider instanceof import_ethers2.ethers.providers.JsonRpcProvider) {
+          formatProvider = provider;
+        } else {
+          formatProvider = new import_ethers2.ethers.providers.Web3Provider(provider);
+        }
+        const network = await formatProvider.getNetwork();
         const providerChainId = network.chainId;
         console.log("init provider", provider, network);
         if (providerChainId !== chainId) {
@@ -1128,7 +1199,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);
@@ -1156,7 +1228,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]);
@@ -1173,7 +1246,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));
@@ -1201,7 +1275,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);
@@ -1335,7 +1410,8 @@ var Fund = class {
           let decimals = 18;
           let symbol = "";
           if (tokenType === 0) {
-            const erc20Contract = new import_ethers2.ethers.Contract(tokenAddress, erc20Abi_default, this.provider);
+            const web3Provider = new import_ethers2.ethers.providers.Web3Provider(this.provider);
+            const erc20Contract = new import_ethers2.ethers.Contract(tokenAddress, erc20Abi_default, web3Provider);
             decimals = await erc20Contract.decimals();
             symbol = await erc20Contract.symbol();
           } else if (tokenType === 1) {
@@ -1379,13 +1455,7 @@ var PrimusFund = class {
           return reject("chainId is not supported");
         }
         this._fund = new Fund();
-        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);
+        const result = await this._fund.init(provider, chainId, appId);
         return resolve(result);
       } catch (error) {
         return reject(error);

package/dist/index.mjs

@@ -70,8 +70,14 @@ var Contract = class {
     }
     this.address = address;
     this.provider = provider;
-    const signer = this.provider.getSigner();
-    this.contractInstance = new ethers.Contract(this.address, abiJson, signer);
+    let formatProvider;
+    if (provider instanceof ethers.providers.JsonRpcProvider) {
+      formatProvider = provider;
+    } else {
+      const web3Provider = new ethers.providers.Web3Provider(provider);
+      formatProvider = web3Provider.getSigner();
+    }
+    this.contractInstance = new ethers.Contract(this.address, abiJson, formatProvider);
   }
   // Example method to read from the contract
   async callMethod(functionName, functionParams) {
@@ -94,22 +100,26 @@ 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() || "";
-        if (error?.code === "ACTION_REJECTED" || errStr.indexOf("user rejected") > -1 || errStr.indexOf("approval denied") > -1) {
+        const errStr = error?.message || error?.toString()?.toLowerCase() || "";
+        const userRejectErrStrArr = ["user rejected", "approval denied"];
+        const isUserRejected = userRejectErrStrArr.some((str) => errStr.indexOf(str) > -1);
+        if (error?.code === "ACTION_REJECTED" || isUserRejected) {
           return reject("user rejected transaction");
         }
-        if (error?.reason) {
-          return reject(error.reason);
+        const insufficientBalanceErrStrArr = ["insufficient balance", "unpredictable_gas_limit"];
+        const isInsufficientBalance = insufficientBalanceErrStrArr.some((str) => errStr.indexOf(str) > -1);
+        if (isInsufficientBalance) {
+          return reject("insufficient balance");
         }
-        if (error?.data?.message === "insufficient balance") {
-          return reject(error?.data?.message);
+        if (errStr.indexOf("no pending withdrawals") > -1) {
+          return reject("no pending withdrawals");
         }
         return reject(error);
       }
@@ -568,10 +578,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" }
         ]
       }
     ],
@@ -604,6 +615,12 @@ var abi_default = [
         indexed: true,
         internalType: "address"
       },
+      {
+        name: "claimTime",
+        type: "uint64",
+        indexed: false,
+        internalType: "uint64"
+      },
       {
         name: "idSource",
         type: "string",
@@ -633,6 +650,12 @@ var abi_default = [
         type: "uint256",
         indexed: false,
         internalType: "uint256"
+      },
+      {
+        name: "tipTime",
+        type: "uint64",
+        indexed: false,
+        internalType: "uint64"
       }
     ],
     anonymous: false
@@ -690,6 +713,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
@@ -698,16 +739,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"
       },
       {
@@ -715,6 +774,12 @@ var abi_default = [
         type: "uint256",
         indexed: false,
         internalType: "uint256"
+      },
+      {
+        name: "tipTime",
+        type: "uint64",
+        indexed: false,
+        internalType: "uint64"
       }
     ],
     anonymous: false
@@ -1068,7 +1133,13 @@ var Fund = class {
   async init(provider, chainId, appId) {
     return new Promise(async (resolve, reject) => {
       try {
-        const network = await provider.getNetwork();
+        let formatProvider;
+        if (provider instanceof ethers2.providers.JsonRpcProvider) {
+          formatProvider = provider;
+        } else {
+          formatProvider = new ethers2.providers.Web3Provider(provider);
+        }
+        const network = await formatProvider.getNetwork();
         const providerChainId = network.chainId;
         console.log("init provider", provider, network);
         if (providerChainId !== chainId) {
@@ -1104,7 +1175,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);
@@ -1132,7 +1204,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]);
@@ -1149,7 +1222,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));
@@ -1177,7 +1251,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);
@@ -1311,7 +1386,8 @@ var Fund = class {
           let decimals = 18;
           let symbol = "";
           if (tokenType === 0) {
-            const erc20Contract = new ethers2.Contract(tokenAddress, erc20Abi_default, this.provider);
+            const web3Provider = new ethers2.providers.Web3Provider(this.provider);
+            const erc20Contract = new ethers2.Contract(tokenAddress, erc20Abi_default, web3Provider);
             decimals = await erc20Contract.decimals();
             symbol = await erc20Contract.symbol();
           } else if (tokenType === 1) {
@@ -1355,13 +1431,7 @@ var PrimusFund = class {
           return reject("chainId is not supported");
         }
         this._fund = new Fund();
-        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);
+        const result = await this._fund.init(provider, chainId, appId);
         return resolve(result);
       } catch (error) {
         return reject(error);

package/package.json

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