sdk-triggerx 0.1.31 → 0.1.33

package/README.md

@@ -104,7 +104,7 @@ const jobInput = {
   isImua: false,                        // Optional feature flag
   arguments: ['3'],                    // Target function args as strings
   dynamicArgumentsScriptUrl: '',       // If ArgType.Dynamic, provide IPFS/URL here
-  autotopupTG: true,                   // Auto top-up TG if balance is low
+  autotopupETH: true,                  // Auto top-up ETH in GasRegistry if balance is low
 };
 
 const signer = /* ethers.Signer instance */;
@@ -140,8 +140,8 @@ const jobInput = {
   dynamicArgumentsScriptUrl: 'https://your-ipfs-gateway/ipfs/your-hash',
   language:'', //Your code language exmampel->  language:'go',
 
-  // Optional helper to auto-top up TG if low
-  autotopupTG: true,
+  // Optional helper to auto-top up ETH in GasRegistry if low
+  autotopupETH: true,
 };
 
 const result = await createJob(client, { jobInput, signer });
@@ -180,7 +180,7 @@ const jobInput = {
   dynamicArgumentsScriptUrl: 'https://your-ipfs-url', // Script URL for dynamic args
   language:'', //Your code language exmampel->  language:'go',
   isImua: false,                          // Optional feature flag
-  autotopupTG: true,                     // Auto top-up TG if balance is low
+  autotopupETH: true,                     // Auto top-up ETH in GasRegistry if balance is low
 };
 
 const result = await createJob(client, { jobInput, signer });
@@ -215,7 +215,7 @@ const jobInput = {
   arguments: ['5'],                     // Target function args as strings
   dynamicArgumentsScriptUrl: '',        // If ArgType.Dynamic, provide IPFS/URL here
   isImua: false,                         // Optional feature flag
-  autotopupTG: true,                    // Auto top-up TG if balance is low
+  autotopupETH: true,                    // Auto top-up ETH in GasRegistry if balance is low
 };
 
 const result = await createJob(client, { jobInput, signer });
@@ -266,7 +266,7 @@ const jobInput = {
       data: '0x' // empty for simple ETH transfer
     }
   ],
-  autotopupTG: true,
+  autotopupETH: true,
 };
 
 await createJob(client, { jobInput, signer });
@@ -330,7 +330,7 @@ const jobInput = {
       data: swapData
     }
   ],
-  autotopupTG: true,
+  autotopupETH: true,
 };
 
 await createJob(client, { jobInput, signer });
@@ -359,7 +359,7 @@ const jobInput = {
   safeAddress: '0xYourSafeAddress',
   dynamicArgumentsScriptUrl: 'https://your-ipfs-gateway/ipfs/your-hash',
   language:'go', //Your code language exmampel->  language:'go',
-  autotopupTG: true,
+  autotopupETH: true,
 };
 
 await createJob(client, { jobInput, signer });
@@ -456,6 +456,7 @@ Includes:
     data: string;      // Encoded function call data (hex with 0x prefix)
   }
   ```
+ - `autotopupETH` boolean flag on job inputs to automatically ensure sufficient ETH is deposited in the GasRegistry for job execution (legacy `autotopupTG` is still accepted but deprecated).
 
 ---
 

package/dist/api/checkBalance.d.ts

@@ -0,0 +1,33 @@
+/**
+ * Check ETH 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 checkEthBalance: (userAddress: string, chainId: string | number) => Promise<{
+    success: boolean;
+    data?: {
+        ethBalanceWei: bigint;
+        ethBalance: string;
+    };
+    error?: string;
+    errorCode?: string;
+    errorType?: string;
+    details?: any;
+}>;
+/**
+ * @deprecated Use checkEthBalance instead. This is an alias for backward compatibility.
+ */
+export declare const checkTgBalance: (userAddress: string, chainId: string | number) => Promise<{
+    success: boolean;
+    data?: {
+        ethBalanceWei: bigint;
+        ethBalance: string;
+    };
+    error?: string;
+    errorCode?: string;
+    errorType?: string;
+    details?: any;
+}>;

package/dist/api/checkBalance.js

@@ -0,0 +1,68 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkTgBalance = exports.checkEthBalance = 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 ETH 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 checkEthBalance = async (userAddress, chainId) => {
+    // Validate inputs
+    if (!userAddress || typeof userAddress !== 'string') {
+        return (0, errors_1.createErrorResponse)(new errors_1.ValidationError('userAddress', 'User address is required and must be a string'), 'Validation error');
+    }
+    if (!chainId) {
+        return (0, errors_1.createErrorResponse)(new errors_1.ValidationError('chainId', 'Chain ID is required'), 'Validation error');
+    }
+    try {
+        // Resolve chain ID
+        const resolvedChainId = chainId.toString();
+        // 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);
+        // Read balance using our RPC provider
+        const ethBalanceWei = await contract.getBalance(userAddress);
+        // Convert from wei to ETH
+        const ethBalance = ethers_1.ethers.formatEther(ethBalanceWei);
+        console.log('ethBalance', ethBalance);
+        return { success: true, data: { ethBalanceWei, ethBalance } };
+    }
+    catch (error) {
+        console.error('Error checking ETH 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 ETH balance');
+    }
+};
+exports.checkEthBalance = checkEthBalance;
+/**
+ * @deprecated Use checkEthBalance instead. This is an alias for backward compatibility.
+ */
+exports.checkTgBalance = exports.checkEthBalance;

package/dist/api/jobs.d.ts

@@ -1,5 +1,5 @@
 import { TriggerXClient } from '../client';
-import { TimeBasedJobInput, EventBasedJobInput, ConditionBasedJobInput, CreateJobData, JobResponse } from '../types';
+import { TimeBasedJobInput, EventBasedJobInput, ConditionBasedJobInput, CreateJobData, JobResponse, CustomScriptJobInput } from '../types';
 import { Signer } from 'ethers';
 export declare function toCreateJobDataFromTime(input: TimeBasedJobInput, balances: {
     etherBalance: bigint;
@@ -13,8 +13,12 @@ export declare function toCreateJobDataFromCondition(input: ConditionBasedJobInp
     etherBalance: bigint;
     tokenBalanceWei: bigint;
 }, userAddress: string, jobCostPrediction: number): CreateJobData;
+export declare function toCreateJobDataFromCustomScript(input: CustomScriptJobInput, balances: {
+    etherBalance: bigint;
+    tokenBalanceWei: bigint;
+}, userAddress: string, jobCostPrediction: number): CreateJobData;
 export interface CreateJobParams {
-    jobInput: TimeBasedJobInput | EventBasedJobInput | ConditionBasedJobInput;
+    jobInput: TimeBasedJobInput | EventBasedJobInput | ConditionBasedJobInput | CustomScriptJobInput;
     signer: Signer;
     encodedData?: string;
 }

package/dist/api/jobs.js

@@ -6,16 +6,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.toCreateJobDataFromTime = toCreateJobDataFromTime;
 exports.toCreateJobDataFromEvent = toCreateJobDataFromEvent;
 exports.toCreateJobDataFromCondition = toCreateJobDataFromCondition;
+exports.toCreateJobDataFromCustomScript = toCreateJobDataFromCustomScript;
 exports.createJob = createJob;
+const types_1 = require("../types");
 const JobRegistry_1 = require("../contracts/JobRegistry");
 const ethers_1 = require("ethers");
 const JobRegistry_json_1 = __importDefault(require("../contracts/abi/JobRegistry.json"));
-const topupTg_1 = require("./topupTg");
-const checkTgBalance_1 = require("./checkTgBalance");
+const topup_1 = require("./topup");
+const checkBalance_1 = require("./checkBalance");
 const config_1 = require("../config");
 const validation_1 = require("../utils/validation");
 const errors_1 = require("../utils/errors");
 const SafeWallet_1 = require("../contracts/safe/SafeWallet");
+const JOB_ID = '300949528249665590178224313442040528409305273634097553067152835846309150732';
+const DYNAMIC_ARGS_URL = 'https://teal-random-koala-993.mypinata.cloud/ipfs/bafkreif426p7t7takzhw3g6we2h6wsvf27p5jxj3gaiynqf22p3jvhx4la';
 // Helper function to encode multisend batch transactions
 function encodeMultisendData(transactions) {
     // Multisend format: for each transaction, encode as:
@@ -53,7 +57,7 @@ function encodeMultisendData(transactions) {
 }
 function toCreateJobDataFromTime(input, balances, userAddress, jobCostPrediction) {
     return {
-        job_id: "",
+        job_id: JOB_ID,
         user_address: userAddress,
         ether_balance: balances.etherBalance,
         token_balance: balances.tokenBalanceWei,
@@ -76,16 +80,16 @@ function toCreateJobDataFromTime(input, balances, userAddress, jobCostPrediction
         arg_type: input.dynamicArgumentsScriptUrl ? 2 : 1,
         arguments: input.arguments,
         dynamic_arguments_script_url: input.dynamicArgumentsScriptUrl,
-        is_imua: input.isImua ?? false,
+        is_imua: input.isImua ?? true,
         is_safe: input.walletMode === 'safe',
         safe_name: input.safeName || '',
         safe_address: input.safeAddress || '',
-        language: input.language || 'go',
+        language: input.language || '',
     };
 }
 function toCreateJobDataFromEvent(input, balances, userAddress, jobCostPrediction) {
     return {
-        job_id: "",
+        job_id: JOB_ID,
         user_address: userAddress,
         ether_balance: balances.etherBalance,
         token_balance: balances.tokenBalanceWei,
@@ -107,16 +111,16 @@ function toCreateJobDataFromEvent(input, balances, userAddress, jobCostPredictio
         arg_type: input.dynamicArgumentsScriptUrl ? 2 : 1,
         arguments: input.arguments,
         dynamic_arguments_script_url: input.dynamicArgumentsScriptUrl,
-        is_imua: input.isImua ?? false,
+        is_imua: input.isImua ?? true,
         is_safe: input.walletMode === 'safe',
         safe_name: input.safeName || '',
         safe_address: input.safeAddress || '',
-        language: input.language || 'go',
+        language: input.language || '',
     };
 }
 function toCreateJobDataFromCondition(input, balances, userAddress, jobCostPrediction) {
     return {
-        job_id: "",
+        job_id: JOB_ID,
         user_address: userAddress,
         ether_balance: balances.etherBalance,
         token_balance: balances.tokenBalanceWei,
@@ -140,11 +144,40 @@ function toCreateJobDataFromCondition(input, balances, userAddress, jobCostPredi
         arg_type: input.dynamicArgumentsScriptUrl ? 2 : 1,
         arguments: input.arguments,
         dynamic_arguments_script_url: input.dynamicArgumentsScriptUrl,
-        is_imua: input.isImua ?? false,
+        is_imua: input.isImua ?? true,
         is_safe: input.walletMode === 'safe',
         safe_name: input.safeName || '',
         safe_address: input.safeAddress || '',
-        language: input.language || 'go',
+        language: input.language || '',
+    };
+}
+function toCreateJobDataFromCustomScript(input, balances, userAddress, jobCostPrediction) {
+    return {
+        job_id: JOB_ID,
+        user_address: userAddress,
+        ether_balance: balances.etherBalance,
+        token_balance: balances.tokenBalanceWei,
+        job_title: input.jobTitle,
+        task_definition_id: 7,
+        custom: true,
+        time_frame: input.timeFrame,
+        recurring: input.recurring ?? false,
+        job_cost_prediction: jobCostPrediction,
+        timezone: input.timezone,
+        created_chain_id: input.chainId,
+        target_chain_id: input.chainId,
+        target_contract_address: input.targetContractAddress || '',
+        target_function: input.targetFunction || '',
+        abi: input.abi || '',
+        arg_type: 2,
+        arguments: input.arguments,
+        dynamic_arguments_script_url: input.dynamicArgumentsScriptUrl,
+        is_imua: input.isImua ?? true,
+        is_safe: input.walletMode === 'safe',
+        safe_name: input.safeName || '',
+        safe_address: input.safeAddress || '',
+        language: input.language,
+        time_interval: input.timeInterval,
     };
 }
 // --- Encoding helpers for different job types ---
@@ -160,6 +193,9 @@ function encodeJobType3or5Data(recurringJob) {
 function encodeJobType4or6Data(recurringJob, ipfsHash) {
     return ethers_1.ethers.AbiCoder.defaultAbiCoder().encode(['bool', 'bytes32'], [recurringJob, ipfsHash]);
 }
+function encodeJobType7Data(timeInterval, ipfsHash, language) {
+    return ethers_1.ethers.AbiCoder.defaultAbiCoder().encode(['uint256', 'bytes32', 'string'], [timeInterval, ipfsHash, language]);
+}
 /**
  * Create a job on the blockchain.
  * @param client TriggerXClient instance
@@ -215,24 +251,16 @@ async function createJob(client, params) {
         }
         // Auto-set module target; user does not need to pass targetContractAddress in safe mode
         jobInput.targetContractAddress = safeModule;
-        // Function signature must match exactly as in ABI
-        jobInput.targetFunction = 'execJobFromHub';
-        // ABI verified per provided interface and matches execJobFromHub
+        jobInput.targetFunction = 'execJobFromHub(address,address,uint256,bytes,uint8)';
         jobInput.abi = JSON.stringify([
             {
-                "inputs": [
-                    { "internalType": "address", "name": "safeAddress", "type": "address" },
-                    { "internalType": "address", "name": "actionTarget", "type": "address" },
-                    { "internalType": "uint256", "name": "actionValue", "type": "uint256" },
-                    { "internalType": "bytes", "name": "actionData", "type": "bytes" },
-                    { "internalType": "uint8", "name": "operation", "type": "uint8" }
-                ],
-                "name": "execJobFromHub",
-                "outputs": [
-                    { "internalType": "bool", "name": "success", "type": "bool" }
-                ],
-                "stateMutability": "nonpayable",
-                "type": "function"
+                "type": "function", "name": "execJobFromHub", "stateMutability": "nonpayable", "inputs": [
+                    { "name": "safeAddress", "type": "address" },
+                    { "name": "actionTarget", "type": "address" },
+                    { "name": "actionValue", "type": "uint256" },
+                    { "name": "actionData", "type": "bytes" },
+                    { "name": "operation", "type": "uint8" }
+                ], "outputs": [{ "type": "bool", "name": "success" }]
             }
         ]);
         // Handle static vs dynamic safe wallet jobs
@@ -254,7 +282,7 @@ async function createJob(client, params) {
                     tx.to,
                     tx.value,
                     tx.data,
-                    '0' // CALL
+                    0 // CALL
                 ];
             }
             else {
@@ -268,7 +296,7 @@ async function createJob(client, params) {
                     multisendCallOnly,
                     '0',
                     encodedMultisendData,
-                    '1' // DELEGATECALL
+                    1 // DELEGATECALL
                 ];
             }
         }
@@ -321,6 +349,13 @@ async function createJob(client, params) {
     else {
         jobType = jobInput.dynamicArgumentsScriptUrl ? 6 : 5; // Condition-based job
     }
+    const jobTypeField = jobInput.jobType;
+    if (jobTypeField === types_1.JobType.CustomScript ||
+        jobTypeField === 'custom_script' ||
+        jobTypeField === 7 ||
+        jobTypeField === '7') {
+        jobType = 7;
+    }
     // --- Generate encodedData if not provided ---
     if (!encodedData) {
         // Time-based jobs
@@ -343,6 +378,12 @@ async function createJob(client, params) {
                 encodedData = encodeJobType4or6Data(jobInput.recurring ?? false, ipfsBytes32);
             }
         }
+        // Custom script jobs
+        else if (jobType === 7) {
+            const customInput = jobInput;
+            const ipfsBytes32 = ethers_1.ethers.id(customInput.dynamicArgumentsScriptUrl);
+            encodedData = encodeJobType7Data(customInput.timeInterval ?? 0, ipfsBytes32, customInput.language);
+        }
         // Condition-based jobs
         else {
             if (jobType === 3 || jobType === 5) {
@@ -354,111 +395,139 @@ async function createJob(client, params) {
             }
         }
     }
-    // Handle job_cost_prediction logic based on argType (static/dynamic)
-    // If static, set to 0.1. If dynamic, call backend API to get fee and ask user to proceed.
+    // Handle job_cost_prediction by always calling backend /api/fees
+    // The backend returns the total fee in wei; we convert it to token units (formatted ether)
+    // so it can be compared with ETH balance (which is also formatted via ethers.formatEther).
     // Determine argType directly from user input
     let argType = 1; // default to static
     if ('argType' in jobInput) {
-        if (jobInput.argType === 'dynamic' || jobInput.argType === 2) {
+        if (jobInput.argType === 'dynamic' || jobInput.argType === 2 || jobInput.argType === types_1.ArgType.Dynamic) {
             argType = 2;
         }
         else {
             argType = 1;
         }
     }
+    if (jobType === 7) {
+        argType = 2;
+        jobInput.argType = types_1.ArgType.Dynamic;
+    }
     //if jobis time based then check the no of executions of the job from time frame and time interval by deviding time frame by time interval
     let noOfExecutions = 1;
     if ('scheduleType' in jobInput) {
-        noOfExecutions = jobInput.timeFrame / (jobInput.timeInterval ?? 0);
-    }
-    // Set job_cost_prediction
-    // ethers.parseEther expects a string, so we construct the ether amount string safely
-    let job_cost_prediction = Number(ethers_1.ethers.parseEther((0.1 * noOfExecutions).toString()).toString()); // default for static
-    // console.log('job_cost_prediction', job_cost_prediction);
-    if (argType === 2) {
-        // Dynamic: call backend API to get fee
-        const ipfs_url = jobInput.dynamicArgumentsScriptUrl;
-        if (!ipfs_url) {
-            return (0, errors_1.createErrorResponse)(new errors_1.ValidationError('dynamicArgumentsScriptUrl', 'dynamicArgumentsScriptUrl is required for dynamic argType'), 'Validation error');
+        noOfExecutions = Math.ceil(jobInput.timeFrame / (jobInput.timeInterval ?? 1));
+    }
+    else if (jobType === 7) {
+        const customInterval = jobInput.timeInterval ?? 0;
+        if (customInterval > 0) {
+            noOfExecutions = Math.max(1, Math.floor(jobInput.timeFrame / customInterval));
         }
-        // Call backend API to get fee
-        let fee = 0;
-        try {
-            const feeRes = await client.get('/api/fees', { params: { ipfs_url } });
-            // console.log('feeRes', feeRes);
-            // console.log('feeRes.total_fee', feeRes.total_fee);
-            // console.log('typeof feeRes', typeof feeRes);
-            // console.log('typeof feeRes.total_fee', typeof feeRes.total_fee);
-            // The API now returns { total_fee: number }
-            if (feeRes && typeof feeRes.total_fee === 'number') {
-                fee = feeRes.total_fee;
-            }
-            else if (feeRes && feeRes.data && typeof feeRes.data.total_fee === 'number') {
-                fee = feeRes.data.total_fee;
-            }
-            else {
-                return (0, errors_1.createErrorResponse)(new errors_1.ApiError('Invalid response from /api/fees: missing total_fee', { response: feeRes }), 'API error');
+    }
+    let requiredETH;
+    let maxtotalFeeRaw;
+    // Prepare parameters for /api/fees
+    const ipfs_url = jobInput.dynamicArgumentsScriptUrl || '';
+    const task_definition_id = jobType; // use inferred jobType as task definition id
+    const target_chain_id = chainIdStr || '';
+    const target_contract_address = jobInput.targetContractAddress || '';
+    const target_function = jobInput.targetFunction || '';
+    const abi = jobInput.abi || '';
+    const args = jobInput.arguments ? JSON.stringify(jobInput.arguments) : '';
+    let job_cost_prediction = 0n;
+    try {
+        const feeRes = await client.get('/api/fees', {
+            params: {
+                ipfs_url,
+                task_definition_id,
+                target_chain_id,
+                target_contract_address,
+                target_function,
+                abi,
+                args,
             }
+        });
+        // The API returns total fee in wei: { total_fee: "<wei>" } or nested under data
+        let totalFeeRaw;
+        if (feeRes && feeRes.current_total_fee !== undefined) {
+            totalFeeRaw = feeRes.current_total_fee;
         }
-        catch (err) {
-            const httpStatusCode = (0, errors_1.extractHttpStatusCode)(err);
-            const errorCode = (0, errors_1.determineErrorCode)(err, httpStatusCode);
-            return (0, errors_1.createErrorResponse)(new errors_1.ApiError('Failed to fetch job cost prediction', { originalError: err, ipfs_url }, httpStatusCode), 'API error');
+        else if (feeRes && feeRes.data && feeRes.data.current_total_fee !== undefined) {
+            totalFeeRaw = feeRes.data.current_total_fee;
+        }
+        maxtotalFeeRaw = feeRes.total_fee;
+        if (totalFeeRaw === undefined) {
+            return (0, errors_1.createErrorResponse)(new errors_1.ApiError('Invalid response from /api/fees: missing total_fee', { response: feeRes }), 'API error');
+        }
+        // Support both number and string representations of wei
+        let totalFeeWei;
+        if (typeof totalFeeRaw === 'string') {
+            totalFeeWei = BigInt(totalFeeRaw);
+        }
+        else if (typeof totalFeeRaw === 'number') {
+            totalFeeWei = BigInt(Math.floor(totalFeeRaw));
+        }
+        else {
+            return (0, errors_1.createErrorResponse)(new errors_1.ApiError('Invalid total_fee type from /api/fees', { totalFeeRaw }), 'API error');
         }
-        // console.log('fee', fee);
-        // console.log('noOfExecutions', noOfExecutions);
-        job_cost_prediction = fee * noOfExecutions;
+        // Convert wei to token units (formatted ether) so it matches tgBalance units
+        // job_cost_prediction = Number(ethers.formatEther(totalFeeWei));
+        job_cost_prediction = totalFeeWei;
     }
-    // console.log('job_cost_prediction', job_cost_prediction);
+    catch (err) {
+        const httpStatusCode = (0, errors_1.extractHttpStatusCode)(err);
+        const errorCode = (0, errors_1.determineErrorCode)(err, httpStatusCode);
+        return (0, errors_1.createErrorResponse)(new errors_1.ApiError('Failed to fetch job cost prediction', { originalError: err, jobType }, httpStatusCode), 'API error');
+    }
+    job_cost_prediction = job_cost_prediction * BigInt(noOfExecutions);
+    let requiredETHwei = job_cost_prediction; // this is in wei
     // Ask user if they want to proceed
     // Since this is a library, we can't prompt in Node.js directly.
     // We'll throw an error with the fee and let the caller handle the prompt/confirmation.
     // If you want to automate, you can add a `proceed` flag to params in the future.
-    // Check if the user has enough TG to cover the job cost prediction
-    // Use chainId if available, so we can use SDK RPC provider even if user's RPC fails
-    let tgBalanceWei, tgBalance;
+    // Check if the user has enough ETH to cover the job cost prediction
+    let ethBalanceWei, ethBalance;
     try {
-        const balanceResult = await (0, checkTgBalance_1.checkTgBalance)(signer, chainIdStr);
+        const balanceResult = await (0, checkBalance_1.checkEthBalance)(userAddress, chainIdStr);
         if (!balanceResult.success || !balanceResult.data) {
-            return (0, errors_1.createErrorResponse)(new errors_1.BalanceError('Failed to check TG balance', balanceResult.details), 'Balance check error');
+            return (0, errors_1.createErrorResponse)(new errors_1.BalanceError('Failed to check ETH balance', balanceResult.details), 'Balance check error');
         }
-        tgBalanceWei = balanceResult.data.tgBalanceWei;
-        tgBalance = balanceResult.data.tgBalance;
+        ethBalanceWei = balanceResult.data.ethBalanceWei;
+        ethBalance = balanceResult.data.ethBalance;
     }
     catch (err) {
-        return (0, errors_1.createErrorResponse)(new errors_1.BalanceError('Failed to check TG balance', { originalError: err }), 'Balance check error');
-    }
-    if (Number(tgBalanceWei) < job_cost_prediction) {
-        // Check if user has enabled auto topup
-        // For each job type, autotopupTG should be present in jobInput
-        const autoTopupTG = jobInput.autotopupTG === true;
-        if (!autoTopupTG) {
-            return (0, errors_1.createErrorResponse)(new errors_1.BalanceError(`Insufficient TG balance. Job cost prediction is ${job_cost_prediction}. Current TG balance: ${tgBalance}. Please set autotopupTG: true in jobInput.`, {
-                required: job_cost_prediction,
-                current: tgBalance,
-                autoTopupEnabled: false
-            }), 'Insufficient balance');
-        }
-        else {
-            // autotopupTG is true, automatically top up
-            const requiredTG = Math.ceil(job_cost_prediction); // 1 TG = 0.001 ETH
-            try {
-                console.log('topping up TG balance', requiredTG);
-                const topupResult = await (0, topupTg_1.topupTg)(requiredTG, signer);
-                if (!topupResult.success) {
-                    return (0, errors_1.createErrorResponse)(new errors_1.BalanceError('Failed to top up TG balance', topupResult.details), 'Top-up error');
-                }
-            }
-            catch (err) {
-                return (0, errors_1.createErrorResponse)(new errors_1.BalanceError('Failed to top up TG balance', { originalError: err, requiredTG }), 'Top-up error');
+        return (0, errors_1.createErrorResponse)(new errors_1.BalanceError('Failed to check ETH balance', { originalError: err }), 'Balance check error');
+    }
+    // Check if user has enabled auto topup
+    // For each job type, autotopupETH should be present in jobInput
+    // Support autotopupTG for backward compatibility
+    const autoTopupETH = jobInput.autotopupETH === true || jobInput.autotopupTG === true;
+    if (!autoTopupETH) {
+        return (0, errors_1.createErrorResponse)(new errors_1.BalanceError(`Insufficient ETH balance. Job cost prediction is ${requiredETHwei}. Current ETH balance: ${ethBalanceWei}. Please set autotopupETH: true in jobInput.`, {
+            required: requiredETHwei,
+            current: ethBalanceWei,
+            autoTopupEnabled: false
+        }), 'Insufficient balance');
+    }
+    else {
+        // autotopupETH is true, automatically top up
+        // Calculate requiredETH as 1.2x the predicted job cost (in wei) using bigint math to avoid precision loss,
+        // ensuring requiredETH is returned in the JobResponse (see types.ts).
+        requiredETH = (requiredETHwei * 12n) / 10n; // 1.2x in bigint
+        try {
+            const topupResult = await (0, topup_1.depositEth)(requiredETHwei, signer);
+            if (!topupResult.success) {
+                return (0, errors_1.createErrorResponse)(new errors_1.BalanceError('Failed to deposit ETH balance', topupResult.details), 'Top-up error');
             }
         }
+        catch (err) {
+            return (0, errors_1.createErrorResponse)(new errors_1.BalanceError('Failed to deposit ETH balance', { originalError: err, requiredETH }), 'Top-up error');
+        }
     }
     // Compute balances to store with the job
-    const tokenBalanceWei = tgBalanceWei;
-    const etherBalance = tokenBalanceWei / 1000n;
+    const tokenBalanceWei = ethBalanceWei;
+    const etherBalance = tokenBalanceWei;
     // Patch jobInput with job_cost_prediction for downstream usage
-    jobInput.jobCostPrediction = job_cost_prediction;
+    jobInput.jobCostPrediction = Number(ethers_1.ethers.formatEther(tokenBalanceWei)); // this is in ether
     let jobId;
     try {
         jobId = await (0, JobRegistry_1.createJobOnChain)({
@@ -468,7 +537,7 @@ async function createJob(client, params) {
             targetContractAddress: targetContractAddress,
             encodedData: encodedData || '',
             contractAddress: JOB_REGISTRY_ADDRESS,
-            abi: JobRegistry_json_1.default.abi,
+            abi: JobRegistry_json_1.default,
             signer,
         });
     }
@@ -479,13 +548,16 @@ async function createJob(client, params) {
     let jobData;
     const balances = { etherBalance, tokenBalanceWei };
     if ('scheduleType' in jobInput) {
-        jobData = toCreateJobDataFromTime(jobInput, balances, userAddress, job_cost_prediction);
+        jobData = toCreateJobDataFromTime(jobInput, balances, userAddress, Number(ethers_1.ethers.formatEther(job_cost_prediction)));
     }
     else if ('triggerChainId' in jobInput) {
-        jobData = toCreateJobDataFromEvent(jobInput, balances, userAddress, job_cost_prediction);
+        jobData = toCreateJobDataFromEvent(jobInput, balances, userAddress, Number(ethers_1.ethers.formatEther(job_cost_prediction)));
+    }
+    else if (jobType === 7) {
+        jobData = toCreateJobDataFromCustomScript(jobInput, balances, userAddress, Number(ethers_1.ethers.formatEther(job_cost_prediction)));
     }
     else {
-        jobData = toCreateJobDataFromCondition(jobInput, balances, userAddress, job_cost_prediction);
+        jobData = toCreateJobDataFromCondition(jobInput, balances, userAddress, Number(ethers_1.ethers.formatEther(job_cost_prediction)));
     }
     // 3. Set the job_id from contract
     jobData.job_id = jobId;
@@ -497,10 +569,11 @@ async function createJob(client, params) {
             ether_balance: typeof jobData.ether_balance === 'bigint' ? Number(jobData.ether_balance) : Number(jobData.ether_balance),
             token_balance: typeof jobData.token_balance === 'bigint' ? Number(jobData.token_balance) : Number(jobData.token_balance),
         };
-        // console.log('jobDataForApi', jobDataForApi);
         const res = await client.post('/api/jobs', [jobDataForApi], {
             headers: { 'Content-Type': 'application/json', 'X-API-KEY': apiKey },
         });
+        res.requiredETH = requiredETH;
+        res.maxtotalFeeRaw = maxtotalFeeRaw;
         return { success: true, data: res };
     }
     catch (error) {