sdk-triggerx 0.1.36 → 0.1.38

package/dist/api/jobs.js

@@ -251,8 +251,9 @@ async function createJob(client, params) {
             return (0, errors_1.createErrorResponse)(new errors_1.ContractError('Failed to configure Safe wallet', { originalError: err, safeAddress: jobInput.safeAddress }), 'Contract error');
         }
         // Auto-set module target; user does not need to pass targetContractAddress in safe mode
+        // New ABI: execJobFromHub(safeAddress, actionTarget, actionValue, actionData, operation, jobOwner)
         jobInput.targetContractAddress = safeModule;
-        jobInput.targetFunction = 'execJobFromHub(address,address,uint256,bytes,uint8)';
+        jobInput.targetFunction = 'execJobFromHub';
         jobInput.abi = JSON.stringify([
             {
                 "type": "function", "name": "execJobFromHub", "stateMutability": "nonpayable", "inputs": [
@@ -260,7 +261,8 @@ async function createJob(client, params) {
                     { "name": "actionTarget", "type": "address" },
                     { "name": "actionValue", "type": "uint256" },
                     { "name": "actionData", "type": "bytes" },
-                    { "name": "operation", "type": "uint8" }
+                    { "name": "operation", "type": "uint8" },
+                    { "name": "jobOwner", "type": "address" }
                 ], "outputs": [{ "type": "bool", "name": "success" }]
             }
         ]);
@@ -283,7 +285,8 @@ async function createJob(client, params) {
                     tx.to,
                     tx.value,
                     tx.data,
-                    0 // CALL
+                    0, // CALL
+                    userAddress
                 ];
             }
             else {
@@ -297,7 +300,8 @@ async function createJob(client, params) {
                     multisendCallOnly,
                     '0',
                     encodedMultisendData,
-                    1 // DELEGATECALL
+                    1, // DELEGATECALL
+                    userAddress
                 ];
             }
         }

package/dist/client.js

@@ -10,7 +10,8 @@ class TriggerXClient {
         this.apiKey = apiKey; // Initialize the apiKey
         // const baseConfig = getConfig();
         this.client = axios_1.default.create({
-            baseURL: 'https://data.triggerx.network', //'http://localhost:9002', //'https://data.triggerx.network',
+            baseURL: 'https://data.triggerx.network',
+            // baseURL: 'http://192.168.1.50:9002', //'https://data.triggerx.network',
             headers: { 'Authorization': `Bearer ${this.apiKey}` }, // Set the API key here
             timeout: 120000, // 120 second timeout
             ...config,

package/dist/config.js

@@ -16,7 +16,7 @@ exports.CONTRACT_ADDRESSES_BY_CHAIN = {
         gasRegistry: '0x248E9f1B99F1AC8068254233D1F271ed0e0903D6',
         jobRegistry: '0x476ACc7949a95e31144cC84b8F6BC7abF0967E4b',
         safeFactory: '0x04359eDC46Cd6C6BD7F6359512984222BE10F8Be',
-        safeModule: '0xa0bC1477cfc452C05786262c377DE51FB8bc4669',
+        safeModule: '0x71BB931AfBE9a10a1030bAc1dc24fe45a2960b7a',
         multisendCallOnly: '0x9641d764fc13c8B624c04430C7356C1C7C8102e2',
         rpcUrl: 'https://sepolia.optimism.io',
     },
@@ -25,7 +25,7 @@ exports.CONTRACT_ADDRESSES_BY_CHAIN = {
         gasRegistry: '0x248E9f1B99F1AC8068254233D1F271ed0e0903D6',
         jobRegistry: '0x476ACc7949a95e31144cC84b8F6BC7abF0967E4b',
         safeFactory: '0xdf76E2A796a206D877086c717979054544B1D9Bc',
-        safeModule: '0xa0bC1477cfc452C05786262c377DE51FB8bc4669',
+        safeModule: '0x71BB931AfBE9a10a1030bAc1dc24fe45a2960b7a',
         multisendCallOnly: '0x9641d764fc13c8B624c04430C7356C1C7C8102e2',
         rpcUrl: 'https://rpc.sepolia.org',
     },
@@ -34,7 +34,7 @@ exports.CONTRACT_ADDRESSES_BY_CHAIN = {
         gasRegistry: '0x248E9f1B99F1AC8068254233D1F271ed0e0903D6',
         jobRegistry: '0x476ACc7949a95e31144cC84b8F6BC7abF0967E4b',
         safeFactory: '0x04359eDC46Cd6C6BD7F6359512984222BE10F8Be',
-        safeModule: '0xa0bC1477cfc452C05786262c377DE51FB8bc4669',
+        safeModule: '0x71BB931AfBE9a10a1030bAc1dc24fe45a2960b7a',
         multisendCallOnly: '0x9641d764fc13c8B624c04430C7356C1C7C8102e2',
         rpcUrl: 'https://sepolia-rollup.arbitrum.io/rpc',
         // safeSingleton can be provided per deployment (Safe or SafeL2)
@@ -44,7 +44,7 @@ exports.CONTRACT_ADDRESSES_BY_CHAIN = {
         gasRegistry: '0x248E9f1B99F1AC8068254233D1F271ed0e0903D6',
         jobRegistry: '0x476ACc7949a95e31144cC84b8F6BC7abF0967E4b',
         safeFactory: '0x04359eDC46Cd6C6BD7F6359512984222BE10F8Be',
-        safeModule: '0xa0bC1477cfc452C05786262c377DE51FB8bc4669',
+        safeModule: '0x71BB931AfBE9a10a1030bAc1dc24fe45a2960b7a',
         multisendCallOnly: '0x9641d764fc13c8B624c04430C7356C1C7C8102e2',
         rpcUrl: 'https://sepolia.base.org',
     },
@@ -54,7 +54,7 @@ exports.CONTRACT_ADDRESSES_BY_CHAIN = {
         gasRegistry: '0xe2AC670F7D66c69D547A44D08F9bA1Fc0Fc0f991',
         jobRegistry: '0xAf1189aFd1F1880F09AeC3Cbc32cf415c735C710',
         safeFactory: '0x93528Df5984231059Cf5c5f2CE9b85c59250D096',
-        safeModule: '0x100656372C821539651f5905Ca39b7C95f9AA433',
+        safeModule: '0x91d317d9D4d9F1402ababD4456c28b5B1eC841E4',
         multisendCallOnly: '0x9641d764fc13c8B624c04430C7356C1C7C8102e2',
         rpcUrl: 'https://arb1.arbitrum.io/rpc',
     },

package/package.json

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

package/dist/api/checkTgBalance.d.ts

@@ -1,20 +0,0 @@
-import { ethers } from 'ethers';
-/**
- * Check TG balance for a given signer using SDK-provided RPC
- * This function uses our own RPC provider to ensure reliable connection
- * even if the user's RPC fails
- * @param signer - ethers.Signer instance (used to get wallet address)
- * @param chainId - Optional chain ID. If not provided, will try to get from signer's provider
- * @returns Balance information or error response
- */
-export declare const checkTgBalance: (signer: ethers.Signer, chainId?: string | number) => Promise<{
-    success: boolean;
-    data?: {
-        tgBalanceWei: bigint;
-        tgBalance: string;
-    };
-    error?: string;
-    errorCode?: string;
-    errorType?: string;
-    details?: any;
-}>;

package/dist/api/checkTgBalance.js

@@ -1,85 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkTgBalance = void 0;
-const ethers_1 = require("ethers");
-const GasRegistry_json_1 = __importDefault(require("../contracts/abi/GasRegistry.json"));
-const contractUtils_1 = require("../contracts/contractUtils");
-const errors_1 = require("../utils/errors");
-/**
- * Check TG balance for a given signer using SDK-provided RPC
- * This function uses our own RPC provider to ensure reliable connection
- * even if the user's RPC fails
- * @param signer - ethers.Signer instance (used to get wallet address)
- * @param chainId - Optional chain ID. If not provided, will try to get from signer's provider
- * @returns Balance information or error response
- */
-const checkTgBalance = async (signer, chainId) => {
-    // Validate inputs
-    if (!signer) {
-        return (0, errors_1.createErrorResponse)(new errors_1.ValidationError('signer', 'Signer is required'), 'Validation error');
-    }
-    try {
-        // Resolve chain ID (use provided chainId or resolve from signer)
-        let resolvedChainId;
-        try {
-            resolvedChainId = await (0, contractUtils_1.resolveChainId)(signer, chainId);
-        }
-        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 resolve chain ID', { originalError: configError }), 'Configuration error');
-        }
-        // Get contract address
-        let gasRegistryContractAddress;
-        try {
-            gasRegistryContractAddress = (0, contractUtils_1.getContractAddress)(resolvedChainId, 'gasRegistry');
-        }
-        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 get contract address', { originalError: configError }), 'Configuration error');
-        }
-        // Create contract instance with SDK RPC provider (read-only)
-        // This ensures we can read balance even if user's RPC fails
-        const contract = await (0, contractUtils_1.createContractWithSdkRpc)(gasRegistryContractAddress, GasRegistry_json_1.default, resolvedChainId, signer);
-        // Get address from signer (this doesn't require provider)
-        const address = await signer.getAddress();
-        // Read balance using our RPC provider
-        const balance = await contract.balances(address);
-        // balance is likely an array or object with ethSpent and TGbalance, both in wei
-        // We'll convert TGbalance from wei to ETH
-        // If balance is an array: [ethSpent, TGbalance]
-        // If balance is an object: { ethSpent, TGbalance }
-        let tgBalanceWei;
-        if (Array.isArray(balance)) {
-            tgBalanceWei = balance[1];
-        }
-        else if (balance && balance.TGbalance !== undefined) {
-            tgBalanceWei = balance.TGbalance;
-        }
-        else {
-            return (0, errors_1.createErrorResponse)(new errors_1.ContractError('Unexpected balance format from contract', { balance }), 'Contract error');
-        }
-        const tgBalance = ethers_1.ethers.formatEther(tgBalanceWei);
-        console.log('tgBalanceEth', tgBalance);
-        return { success: true, data: { tgBalanceWei, tgBalance } };
-    }
-    catch (error) {
-        console.error('Error checking TG balance:', 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 balance check', { originalError: error }), 'Network error');
-            }
-            else if (error.message.includes('contract') || error.message.includes('transaction')) {
-                return (0, errors_1.createErrorResponse)(new errors_1.ContractError('Contract error during balance check', { originalError: error }), 'Contract error');
-            }
-        }
-        return (0, errors_1.createErrorResponse)(error, 'Failed to check TG balance');
-    }
-};
-exports.checkTgBalance = checkTgBalance;

package/dist/api/topupTg.d.ts

@@ -1,9 +0,0 @@
-import { ethers } from 'ethers';
-export declare const topupTg: (tgAmount: number, signer: ethers.Signer) => Promise<{
-    success: boolean;
-    data?: any;
-    error?: string;
-    errorCode?: string;
-    errorType?: string;
-    details?: any;
-}>;

package/dist/api/topupTg.js

@@ -1,99 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.topupTg = 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 topupTg = async (tgAmount, signer) => {
-    console.log('topping up TG balance', tgAmount);
-    // Validate inputs
-    if (!tgAmount || tgAmount <= 0) {
-        return (0, errors_1.createErrorResponse)(new errors_1.ValidationError('tgAmount', 'TG amount must be a positive number'), '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');
-        }
-        // Each TG costs 0.001 ETH, so calculate the ETH required for the given TG amount
-        console.log('tgAmount', tgAmount);
-        const amountInEthWei = tgAmount;
-        // const amountInEthWei = ethers.parseEther(amountInEth.toString());
-        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.purchaseTG.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.purchaseTG(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.purchaseTG(amountInEthWei, { value: amountInEthWei });
-            await (0, contractUtils_1.waitForTransactionReceiptWithRpcFallback)(tx, rpcProvider);
-            return { success: true, data: tx };
-        }
-    }
-    catch (error) {
-        console.error('Error topping up TG:', 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 TG top-up', { originalError: error, tgAmount }), 'Network error');
-            }
-            else if (error.message.includes('contract') || error.message.includes('transaction')) {
-                return (0, errors_1.createErrorResponse)(new errors_1.ContractError('Contract error during TG top-up', { originalError: error, tgAmount }), '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 TG top-up', { originalError: error, tgAmount }), 'Validation error');
-            }
-        }
-        return (0, errors_1.createErrorResponse)(error, 'Failed to top up TG');
-    }
-};
-exports.topupTg = topupTg;

package/dist/api/withdrawTg.d.ts

@@ -1,15 +0,0 @@
-import { ethers } from 'ethers';
-/**
- * Withdraw ETH in exchange for TG tokens.
- * @param signer ethers.Signer instance
- * @param amountTG The amount of TG tokens to withdraw (as a string or BigNumberish)
- * @returns The transaction object or error response
- */
-export declare const withdrawTg: (signer: ethers.Signer, amountTG: string | ethers.BigNumberish) => Promise<{
-    success: boolean;
-    data?: any;
-    error?: string;
-    errorCode?: string;
-    errorType?: string;
-    details?: any;
-}>;

package/dist/api/withdrawTg.js

@@ -1,88 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.withdrawTg = void 0;
-const ethers_1 = require("ethers");
-const GasRegistry_json_1 = __importDefault(require("../contracts/abi/GasRegistry.json"));
-const contractUtils_1 = require("../contracts/contractUtils");
-const errors_1 = require("../utils/errors");
-/**
- * Withdraw ETH in exchange for TG tokens.
- * @param signer ethers.Signer instance
- * @param amountTG The amount of TG tokens to withdraw (as a string or BigNumberish)
- * @returns The transaction object or error response
- */
-const withdrawTg = async (signer, amountTG) => {
-    // Validate inputs
-    if (!signer) {
-        return (0, errors_1.createErrorResponse)(new errors_1.ValidationError('signer', 'Signer is required'), 'Validation error');
-    }
-    if (!amountTG || (typeof amountTG === 'string' && amountTG.trim() === '') || Number(amountTG) <= 0) {
-        return (0, errors_1.createErrorResponse)(new errors_1.ValidationError('amountTG', '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');
-        }
-        // Assumes the contract has a function: claimEthForTg(uint256 amount)
-        const amountTGWei = ethers_1.ethers.parseEther(amountTG.toString());
-        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) {
-        console.error('Error withdrawing TG:', 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 TG withdrawal', { originalError: error, amountTG }), 'Network error');
-            }
-            else if (error.message.includes('contract') || error.message.includes('transaction')) {
-                return (0, errors_1.createErrorResponse)(new errors_1.ContractError('Contract error during TG withdrawal', { originalError: error, amountTG }), 'Contract error');
-            }
-            else if (error.message.includes('insufficient') || error.message.includes('balance')) {
-                return (0, errors_1.createErrorResponse)(new errors_1.ValidationError('balance', 'Insufficient TG balance for withdrawal', { originalError: error, amountTG }), 'Validation error');
-            }
-        }
-        return (0, errors_1.createErrorResponse)(error, 'Failed to withdraw TG');
-    }
-};
-exports.withdrawTg = withdrawTg;