sdk-triggerx 0.1.30 → 0.1.32

package/dist/api/topup.d.ts

@@ -0,0 +1,20 @@
+import { ethers } from 'ethers';
+export declare const depositEth: (ethAmount: bigint, signer: ethers.Signer) => Promise<{
+    success: boolean;
+    data?: any;
+    error?: string;
+    errorCode?: string;
+    errorType?: string;
+    details?: any;
+}>;
+/**
+ * @deprecated Use depositEth instead. This is an alias for backward compatibility.
+ */
+export declare const topupTg: (ethAmount: bigint, signer: ethers.Signer) => Promise<{
+    success: boolean;
+    data?: any;
+    error?: string;
+    errorCode?: string;
+    errorType?: string;
+    details?: any;
+}>;

package/dist/api/topup.js

@@ -0,0 +1,102 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.topupTg = exports.depositEth = void 0;
+const GasRegistry_json_1 = __importDefault(require("../contracts/abi/GasRegistry.json"));
+const contractUtils_1 = require("../contracts/contractUtils");
+const errors_1 = require("../utils/errors");
+const depositEth = async (ethAmount, signer) => {
+    console.log('depositing ETH balance', ethAmount);
+    // Validate inputs
+    if (!ethAmount || ethAmount <= 0n) {
+        return (0, errors_1.createErrorResponse)(new errors_1.ValidationError('ethAmount', 'ETH amount must be a positive bigint'), 'Validation error');
+    }
+    if (!signer) {
+        return (0, errors_1.createErrorResponse)(new errors_1.ValidationError('signer', 'Signer is required'), 'Validation error');
+    }
+    try {
+        // Get contract address and create contract instances with SDK RPC provider
+        // This ensures we can interact with the contract even if user's RPC fails
+        let gasRegistryContractAddress;
+        let contract;
+        let contractWithSigner;
+        let rpcProvider;
+        let resolvedChainId;
+        let signerAddress;
+        try {
+            // Get signer address (this doesn't require the signer's provider to work)
+            signerAddress = await signer.getAddress();
+            // Resolve chain ID from signer
+            resolvedChainId = await (0, contractUtils_1.resolveChainId)(signer);
+            // Get contract address
+            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) {
+                return (0, errors_1.createErrorResponse)(configError, 'Configuration error');
+            }
+            return (0, errors_1.createErrorResponse)(new errors_1.ConfigurationError('Failed to initialize contract', { originalError: configError }), 'Configuration error');
+        }
+        // Convert ethAmount to wei if needed
+        console.log('ethAmount', ethAmount);
+        const amountInEthWei = typeof ethAmount === 'bigint' ? ethAmount : BigInt(ethAmount);
+        console.log('amountInEthWei', amountInEthWei);
+        // Estimate gas for the transaction using SDK RPC provider
+        // This ensures gas estimation works even if user's RPC fails
+        let estimatedGas;
+        try {
+            console.log('Estimating gas using SDK RPC provider...');
+            // Use contract instance with SDK RPC provider for estimation
+            // Specify the signer's address in the estimation options
+            estimatedGas = await contract.depositETH.estimateGas(amountInEthWei, {
+                value: amountInEthWei,
+                from: signerAddress // Specify the sender address for accurate estimation
+            });
+            console.log('Estimated gas (using SDK RPC):', estimatedGas.toString());
+            // Add 10% buffer to ensure transaction doesn't fail
+            const gasWithBuffer = (estimatedGas * BigInt(110)) / BigInt(100);
+            console.log('Gas with 10% buffer:', gasWithBuffer.toString());
+            // Execute transaction using signer (for signing)
+            const tx = await contractWithSigner.depositETH(amountInEthWei, {
+                value: amountInEthWei,
+                gasLimit: gasWithBuffer
+            });
+            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.depositETH(amountInEthWei, { value: amountInEthWei });
+            await (0, contractUtils_1.waitForTransactionReceiptWithRpcFallback)(tx, rpcProvider);
+            return { success: true, data: tx };
+        }
+    }
+    catch (error) {
+        console.error('Error depositing ETH:', error);
+        if (error instanceof Error) {
+            if (error.message.includes('network') || error.message.includes('timeout')) {
+                return (0, errors_1.createErrorResponse)(new errors_1.NetworkError('Network error during ETH deposit', { originalError: error, ethAmount }), 'Network error');
+            }
+            else if (error.message.includes('contract') || error.message.includes('transaction')) {
+                return (0, errors_1.createErrorResponse)(new errors_1.ContractError('Contract error during ETH deposit', { originalError: error, ethAmount }), 'Contract error');
+            }
+            else if (error.message.includes('insufficient funds') || error.message.includes('balance')) {
+                return (0, errors_1.createErrorResponse)(new errors_1.ValidationError('balance', 'Insufficient funds for ETH deposit', { originalError: error, ethAmount }), 'Validation error');
+            }
+        }
+        return (0, errors_1.createErrorResponse)(error, 'Failed to deposit ETH');
+    }
+};
+exports.depositEth = depositEth;
+/**
+ * @deprecated Use depositEth instead. This is an alias for backward compatibility.
+ */
+exports.topupTg = exports.depositEth;

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/withdraw.d.ts

@@ -0,0 +1,26 @@
+import { ethers } from 'ethers';
+/**
+ * Withdraw ETH from the Gas Registry.
+ * @param signer ethers.Signer instance
+ * @param amountETH The amount of ETH to withdraw (as a string or BigNumberish)
+ * @returns The transaction object or error response
+ */
+export declare const withdrawEth: (signer: ethers.Signer, amountETHwei: string | ethers.BigNumberish) => Promise<{
+    success: boolean;
+    data?: any;
+    error?: string;
+    errorCode?: string;
+    errorType?: string;
+    details?: any;
+}>;
+/**
+ * @deprecated Use withdrawEth instead. This is an alias for backward compatibility.
+ */
+export declare const withdrawTg: (signer: ethers.Signer, amountETHwei: string | ethers.BigNumberish) => Promise<{
+    success: boolean;
+    data?: any;
+    error?: string;
+    errorCode?: string;
+    errorType?: string;
+    details?: any;
+}>;

package/dist/api/withdraw.js

@@ -0,0 +1,89 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withdrawTg = exports.withdrawEth = void 0;
+const GasRegistry_json_1 = __importDefault(require("../contracts/abi/GasRegistry.json"));
+const contractUtils_1 = require("../contracts/contractUtils");
+const errors_1 = require("../utils/errors");
+/**
+ * Withdraw ETH from the Gas Registry.
+ * @param signer ethers.Signer instance
+ * @param amountETH The amount of ETH to withdraw (as a string or BigNumberish)
+ * @returns The transaction object or error response
+ */
+const withdrawEth = async (signer, amountETHwei) => {
+    // Validate inputs
+    if (!signer) {
+        return (0, errors_1.createErrorResponse)(new errors_1.ValidationError('signer', 'Signer is required'), 'Validation error');
+    }
+    if (!amountETHwei || (typeof amountETHwei === 'string' && amountETHwei.trim() === '') || Number(amountETHwei) <= 0) {
+        return (0, errors_1.createErrorResponse)(new errors_1.ValidationError('amountETHwei', 'Amount must be a positive number'), 'Validation error');
+    }
+    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) {
+                return (0, errors_1.createErrorResponse)(configError, 'Configuration error');
+            }
+            return (0, errors_1.createErrorResponse)(new errors_1.ConfigurationError('Failed to initialize contract', { originalError: configError }), 'Configuration error');
+        }
+        let tx;
+        try {
+            console.log('Estimating gas for withdrawETHBalance using SDK RPC provider...');
+            const estimatedGas = await contract.withdrawETHBalance.estimateGas(amountETHwei, {
+                from: signerAddress,
+            });
+            console.log('Estimated gas (withdrawETHBalance):', estimatedGas.toString());
+            const gasWithBuffer = (estimatedGas * BigInt(110)) / BigInt(100);
+            console.log('Gas with 10% buffer (withdrawETHBalance):', gasWithBuffer.toString());
+            tx = await contractWithSigner.withdrawETHBalance(amountETHwei, {
+                gasLimit: gasWithBuffer,
+            });
+        }
+        catch (gasEstimateError) {
+            console.warn('Gas estimation failed for withdrawETHBalance (using SDK RPC), proceeding without explicit gas limit:', gasEstimateError);
+            tx = await contractWithSigner.withdrawETHBalance(amountETHwei);
+        }
+        await (0, contractUtils_1.waitForTransactionReceiptWithRpcFallback)(tx, rpcProvider);
+        return { success: true, data: tx };
+    }
+    catch (error) {
+        console.error('Error withdrawing ETH:', error);
+        if (error instanceof Error) {
+            if (error.message.includes('network') || error.message.includes('timeout')) {
+                return (0, errors_1.createErrorResponse)(new errors_1.NetworkError('Network error during ETH withdrawal', { originalError: error, amountETHwei }), 'Network error');
+            }
+            else if (error.message.includes('contract') || error.message.includes('transaction')) {
+                return (0, errors_1.createErrorResponse)(new errors_1.ContractError('Contract error during ETH withdrawal', { originalError: error, amountETHwei }), 'Contract error');
+            }
+            else if (error.message.includes('insufficient') || error.message.includes('balance')) {
+                return (0, errors_1.createErrorResponse)(new errors_1.ValidationError('balance', 'Insufficient ETH balance for withdrawal', { originalError: error, amountETHwei }), 'Validation error');
+            }
+        }
+        return (0, errors_1.createErrorResponse)(error, 'Failed to withdraw ETH');
+    }
+};
+exports.withdrawEth = withdrawEth;
+/**
+ * @deprecated Use withdrawEth instead. This is an alias for backward compatibility.
+ */
+exports.withdrawTg = exports.withdrawEth;

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/config.js

@@ -13,7 +13,7 @@ exports.CONTRACT_ADDRESSES_BY_CHAIN = {
     // TESTNET CONFIGURATIONS
     // OP Sepolia (11155420) - Optimism Sepolia Testnet
     '11155420': {
-        gasRegistry: '0x664CB20BCEEc9416D290AC820e5446e61a5c75e4',
+        gasRegistry: '0x248E9f1B99F1AC8068254233D1F271ed0e0903D6',
         jobRegistry: '0x476ACc7949a95e31144cC84b8F6BC7abF0967E4b',
         safeFactory: '0x04359eDC46Cd6C6BD7F6359512984222BE10F8Be',
         safeModule: '0xa0bC1477cfc452C05786262c377DE51FB8bc4669',
@@ -22,7 +22,7 @@ exports.CONTRACT_ADDRESSES_BY_CHAIN = {
     },
     // Ethereum Sepolia (11155111) - Ethereum Sepolia Testnet
     '11155111': {
-        gasRegistry: '0x664CB20BCEEc9416D290AC820e5446e61a5c75e4',
+        gasRegistry: '0x248E9f1B99F1AC8068254233D1F271ed0e0903D6',
         jobRegistry: '0x476ACc7949a95e31144cC84b8F6BC7abF0967E4b',
         safeFactory: '0xdf76E2A796a206D877086c717979054544B1D9Bc',
         safeModule: '0xa0bC1477cfc452C05786262c377DE51FB8bc4669',
@@ -31,7 +31,7 @@ exports.CONTRACT_ADDRESSES_BY_CHAIN = {
     },
     // Arbitrum Sepolia (421614) - Arbitrum Sepolia Testnet
     '421614': {
-        gasRegistry: '0x664CB20BCEEc9416D290AC820e5446e61a5c75e4',
+        gasRegistry: '0x248E9f1B99F1AC8068254233D1F271ed0e0903D6',
         jobRegistry: '0x476ACc7949a95e31144cC84b8F6BC7abF0967E4b',
         safeFactory: '0x04359eDC46Cd6C6BD7F6359512984222BE10F8Be',
         safeModule: '0xa0bC1477cfc452C05786262c377DE51FB8bc4669',
@@ -41,7 +41,7 @@ exports.CONTRACT_ADDRESSES_BY_CHAIN = {
     },
     // Base Sepolia (84532) - Base Sepolia Testnet
     '84532': {
-        gasRegistry: '0x664CB20BCEEc9416D290AC820e5446e61a5c75e4',
+        gasRegistry: '0x248E9f1B99F1AC8068254233D1F271ed0e0903D6',
         jobRegistry: '0x476ACc7949a95e31144cC84b8F6BC7abF0967E4b',
         safeFactory: '0x04359eDC46Cd6C6BD7F6359512984222BE10F8Be',
         safeModule: '0xa0bC1477cfc452C05786262c377DE51FB8bc4669',
@@ -51,7 +51,7 @@ exports.CONTRACT_ADDRESSES_BY_CHAIN = {
     // MAINNET CONFIGURATIONS
     // Arbitrum One (42161) - Mainnet
     '42161': {
-        gasRegistry: '0x93dDB2307F3Af5df85F361E5Cddd898Acd3d132d',
+        gasRegistry: '0xe2AC670F7D66c69D547A44D08F9bA1Fc0Fc0f991',
         jobRegistry: '0xAf1189aFd1F1880F09AeC3Cbc32cf415c735C710',
         multisendCallOnly: '0x9641d764fc13c8B624c04430C7356C1C7C8102e2',
         rpcUrl: 'https://arb1.arbitrum.io/rpc',

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);
     }
 }