sdk-triggerx 0.1.30 → 0.1.31

package/dist/api/topupTg.js

@@ -22,6 +22,7 @@ const topupTg = async (tgAmount, signer) => {
         let gasRegistryContractAddress;
         let contract;
         let contractWithSigner;
+        let rpcProvider;
         let resolvedChainId;
         let signerAddress;
         try {
@@ -35,6 +36,7 @@ const topupTg = async (tgAmount, signer) => {
             const contractInstances = await (0, contractUtils_1.createContractWithSdkRpcAndSigner)(gasRegistryContractAddress, GasRegistry_json_1.default, signer, resolvedChainId);
             contract = contractInstances.contract;
             contractWithSigner = contractInstances.contractWithSigner;
+            rpcProvider = contractInstances.rpcProvider;
         }
         catch (configError) {
             if (configError instanceof errors_1.ConfigurationError) {
@@ -67,14 +69,14 @@ const topupTg = async (tgAmount, signer) => {
                 value: amountInEthWei,
                 gasLimit: gasWithBuffer
             });
-            await tx.wait();
+            await (0, contractUtils_1.waitForTransactionReceiptWithRpcFallback)(tx, rpcProvider);
             return { success: true, data: tx };
         }
         catch (gasEstimateError) {
             // If gas estimation fails, try without gas limit (let provider estimate)
             console.warn('Gas estimation failed (using SDK RPC), proceeding without gas limit:', gasEstimateError);
             const tx = await contractWithSigner.purchaseTG(amountInEthWei, { value: amountInEthWei });
-            await tx.wait();
+            await (0, contractUtils_1.waitForTransactionReceiptWithRpcFallback)(tx, rpcProvider);
             return { success: true, data: tx };
         }
     }

package/dist/api/withdrawTg.js

@@ -25,15 +25,21 @@ const withdrawTg = async (signer, amountTG) => {
     try {
         // Resolve chain ID and create contract instances with SDK RPC provider
         let resolvedChainId;
+        let contract;
         let contractWithSigner;
+        let rpcProvider;
+        let signerAddress;
         try {
             // Resolve chain ID from signer
+            signerAddress = await signer.getAddress();
             resolvedChainId = await (0, contractUtils_1.resolveChainId)(signer);
             // Get contract address
             const gasRegistryContractAddress = (0, contractUtils_1.getContractAddress)(resolvedChainId, 'gasRegistry');
             // Create contract instances with SDK RPC provider
             const contractInstances = await (0, contractUtils_1.createContractWithSdkRpcAndSigner)(gasRegistryContractAddress, GasRegistry_json_1.default, signer, resolvedChainId);
+            contract = contractInstances.contract;
             contractWithSigner = contractInstances.contractWithSigner;
+            rpcProvider = contractInstances.rpcProvider;
         }
         catch (configError) {
             if (configError instanceof errors_1.ConfigurationError) {
@@ -43,8 +49,24 @@ const withdrawTg = async (signer, amountTG) => {
         }
         // Assumes the contract has a function: claimEthForTg(uint256 amount)
         const amountTGWei = ethers_1.ethers.parseEther(amountTG.toString());
-        const tx = await contractWithSigner.claimETHForTG(amountTGWei);
-        await tx.wait();
+        let tx;
+        try {
+            console.log('Estimating gas for claimETHForTG using SDK RPC provider...');
+            const estimatedGas = await contract.claimETHForTG.estimateGas(amountTGWei, {
+                from: signerAddress,
+            });
+            console.log('Estimated gas (claimETHForTG):', estimatedGas.toString());
+            const gasWithBuffer = (estimatedGas * BigInt(110)) / BigInt(100);
+            console.log('Gas with 10% buffer (claimETHForTG):', gasWithBuffer.toString());
+            tx = await contractWithSigner.claimETHForTG(amountTGWei, {
+                gasLimit: gasWithBuffer,
+            });
+        }
+        catch (gasEstimateError) {
+            console.warn('Gas estimation failed for claimETHForTG (using SDK RPC), proceeding without explicit gas limit:', gasEstimateError);
+            tx = await contractWithSigner.claimETHForTG(amountTGWei);
+        }
+        await (0, contractUtils_1.waitForTransactionReceiptWithRpcFallback)(tx, rpcProvider);
         return { success: true, data: tx };
     }
     catch (error) {

package/dist/contracts/JobRegistry.js

@@ -6,7 +6,7 @@ const contractUtils_1 = require("./contractUtils");
 async function createJobOnChain({ jobTitle, jobType, timeFrame, targetContractAddress, encodedData, contractAddress, abi, signer, }) {
     // Resolve chain ID and create contract with SDK RPC provider
     const chainId = await (0, contractUtils_1.resolveChainId)(signer);
-    const { contract, contractWithSigner } = await (0, contractUtils_1.createContractWithSdkRpcAndSigner)(contractAddress, abi, signer, chainId);
+    const { contract, contractWithSigner, rpcProvider } = await (0, contractUtils_1.createContractWithSdkRpcAndSigner)(contractAddress, abi, signer, chainId);
     const signerAddress = await signer.getAddress();
     let tx;
     try {
@@ -27,7 +27,7 @@ async function createJobOnChain({ jobTitle, jobType, timeFrame, targetContractAd
         console.warn('Gas estimation failed for createJob (using SDK RPC), proceeding without explicit gas limit:', gasEstimateError);
         tx = await contractWithSigner.createJob(jobTitle, jobType, timeFrame, targetContractAddress, encodedData);
     }
-    const receipt = await tx.wait();
+    const receipt = await (0, contractUtils_1.waitForTransactionReceiptWithRpcFallback)(tx, rpcProvider);
     // Try to extract jobId from event logs (assume event is JobCreated(jobId,...))
     // Use contract (with SDK RPC) for parsing logs
     const event = receipt.logs
@@ -48,7 +48,7 @@ async function createJobOnChain({ jobTitle, jobType, timeFrame, targetContractAd
 async function deleteJobOnChain({ jobId, contractAddress, abi, signer, }) {
     // Resolve chain ID and create contract with SDK RPC provider
     const chainId = await (0, contractUtils_1.resolveChainId)(signer);
-    const { contract, contractWithSigner } = await (0, contractUtils_1.createContractWithSdkRpcAndSigner)(contractAddress, abi.abi || abi, signer, chainId);
+    const { contract, contractWithSigner, rpcProvider } = await (0, contractUtils_1.createContractWithSdkRpcAndSigner)(contractAddress, abi.abi || abi, signer, chainId);
     const signerAddress = await signer.getAddress();
     try {
         console.log('Estimating gas for deleteJob using SDK RPC provider...');
@@ -61,11 +61,11 @@ async function deleteJobOnChain({ jobId, contractAddress, abi, signer, }) {
         const tx = await contractWithSigner.deleteJob(jobId, {
             gasLimit: gasWithBuffer,
         });
-        await tx.wait();
+        await (0, contractUtils_1.waitForTransactionReceiptWithRpcFallback)(tx, rpcProvider);
     }
     catch (gasEstimateError) {
         console.warn('Gas estimation failed for deleteJob (using SDK RPC), proceeding without explicit gas limit:', gasEstimateError);
         const tx = await contractWithSigner.deleteJob(jobId);
-        await tx.wait();
+        await (0, contractUtils_1.waitForTransactionReceiptWithRpcFallback)(tx, rpcProvider);
     }
 }

package/dist/contracts/contractUtils.d.ts

@@ -43,7 +43,20 @@ export declare function createContractWithSdkRpcAndSigner(contractAddress: strin
     contract: Contract;
     contractWithSigner: Contract;
     chainId: string;
+    rpcProvider: ethers.JsonRpcProvider;
 }>;
+/**
+ * Wait for a transaction receipt, falling back to eth_getTransactionReceipt if tx.wait fails
+ * This helps when the user's wallet/provider does not implement getTransactionReceipt properly.
+ * @param tx - Transaction response returned from contract call
+ * @param rpcProvider - SDK RPC provider that supports eth_getTransactionReceipt
+ * @param options - Optional polling configuration
+ * @returns Transaction receipt once available
+ */
+export declare function waitForTransactionReceiptWithRpcFallback(tx: ethers.ContractTransactionResponse, rpcProvider: ethers.JsonRpcProvider, options?: {
+    pollIntervalMs?: number;
+    maxAttempts?: number;
+}): Promise<ethers.TransactionReceipt>;
 /**
  * Get contract address for a given chain ID
  * @param chainId - Chain ID as string or number

package/dist/contracts/contractUtils.js

@@ -4,6 +4,7 @@ exports.getSdkRpcProvider = getSdkRpcProvider;
 exports.resolveChainId = resolveChainId;
 exports.createContractWithSdkRpc = createContractWithSdkRpc;
 exports.createContractWithSdkRpcAndSigner = createContractWithSdkRpcAndSigner;
+exports.waitForTransactionReceiptWithRpcFallback = waitForTransactionReceiptWithRpcFallback;
 exports.getContractAddress = getContractAddress;
 const ethers_1 = require("ethers");
 const config_1 = require("../config");
@@ -103,8 +104,48 @@ async function createContractWithSdkRpcAndSigner(contractAddress, abi, signer, c
         contract,
         contractWithSigner,
         chainId: resolvedChainId,
+        rpcProvider,
     };
 }
+/**
+ * Wait for a transaction receipt, falling back to eth_getTransactionReceipt if tx.wait fails
+ * This helps when the user's wallet/provider does not implement getTransactionReceipt properly.
+ * @param tx - Transaction response returned from contract call
+ * @param rpcProvider - SDK RPC provider that supports eth_getTransactionReceipt
+ * @param options - Optional polling configuration
+ * @returns Transaction receipt once available
+ */
+async function waitForTransactionReceiptWithRpcFallback(tx, rpcProvider, options) {
+    const pollIntervalMs = options?.pollIntervalMs ?? 3000;
+    const maxAttempts = options?.maxAttempts ?? 40;
+    try {
+        const directReceipt = await tx.wait();
+        if (directReceipt) {
+            return directReceipt;
+        }
+        console.warn(`tx.wait() returned null receipt for ${tx.hash}; falling back to eth_getTransactionReceipt via SDK RPC provider.`);
+    }
+    catch (waitError) {
+        console.warn('tx.wait() failed; falling back to eth_getTransactionReceipt via SDK RPC provider.', waitError);
+    }
+    const txHash = tx.hash;
+    if (!txHash) {
+        throw new Error('Transaction hash missing; cannot fetch receipt');
+    }
+    for (let attempt = 0; attempt < maxAttempts; attempt++) {
+        const receipt = await rpcProvider
+            .send('eth_getTransactionReceipt', [txHash])
+            .catch((rpcError) => {
+            console.warn('eth_getTransactionReceipt RPC call failed:', rpcError);
+            return null;
+        });
+        if (receipt) {
+            return receipt;
+        }
+        await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
+    }
+    throw new Error(`Transaction receipt not found for ${txHash} after ${maxAttempts} attempts using eth_getTransactionReceipt`);
+}
 /**
  * Get contract address for a given chain ID
  * @param chainId - Chain ID as string or number

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sdk-triggerx",
-  "version": "0.1.30",
+  "version": "0.1.31",
   "description": "SDK for interacting with the TriggerX backend and smart contracts.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",