sdk-triggerx 0.1.30 → 0.1.32

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

@@ -4,8 +4,9 @@ export * from './types';
 export * from './api/jobs';
 export * from './api/getjob';
 export * from './api/getUserData';
-export * from './api/checkTgBalance';
-export * from './api/topupTg';
+export * from './api/checkBalance';
+export * from './api/topup';
+export * from './api/withdraw';
 export * from './api/deleteJob';
 export * from './api/getJobDataById';
 export * from './api/safeWallet';

package/dist/index.js

@@ -20,8 +20,9 @@ __exportStar(require("./types"), exports);
 __exportStar(require("./api/jobs"), exports);
 __exportStar(require("./api/getjob"), exports);
 __exportStar(require("./api/getUserData"), exports);
-__exportStar(require("./api/checkTgBalance"), exports);
-__exportStar(require("./api/topupTg"), exports);
+__exportStar(require("./api/checkBalance"), exports);
+__exportStar(require("./api/topup"), exports);
+__exportStar(require("./api/withdraw"), exports);
 __exportStar(require("./api/deleteJob"), exports);
 __exportStar(require("./api/getJobDataById"), exports);
 __exportStar(require("./api/safeWallet"), exports);

package/dist/types.d.ts

@@ -26,7 +26,8 @@ export type ApiResult<T> = SuccessResponse<T> | ErrorResponse;
 export declare enum JobType {
     Time = "time",
     Event = "event",
-    Condition = "condition"
+    Condition = "condition",
+    CustomScript = "custom_script"
 }
 export declare enum ArgType {
     Static = "static",
@@ -47,6 +48,9 @@ export type CreateJobInput = (TimeBasedJobInput & {
 }) | (ConditionBasedJobInput & {
     jobType: JobType.Condition;
     argType: ArgType.Static | ArgType.Dynamic;
+}) | (CustomScriptJobInput & {
+    jobType: JobType.CustomScript;
+    argType: ArgType.Dynamic;
 });
 export interface TimeBasedJobInput {
     jobTitle: string;
@@ -63,6 +67,8 @@ export interface TimeBasedJobInput {
     isImua?: boolean;
     arguments?: string[];
     dynamicArgumentsScriptUrl?: string;
+    autotopupETH?: boolean;
+    /** @deprecated Use autotopupETH instead */
     autotopupTG?: boolean;
     walletMode?: WalletMode;
     safeName?: string;
@@ -95,6 +101,8 @@ export interface EventBasedJobInput {
     isImua?: boolean;
     arguments?: string[];
     dynamicArgumentsScriptUrl?: string;
+    autotopupETH?: boolean;
+    /** @deprecated Use autotopupETH instead */
     autotopupTG?: boolean;
     walletMode?: WalletMode;
     safeName?: string;
@@ -129,6 +137,8 @@ export interface ConditionBasedJobInput {
     isImua?: boolean;
     arguments?: string[];
     dynamicArgumentsScriptUrl?: string;
+    autotopupETH?: boolean;
+    /** @deprecated Use autotopupETH instead */
     autotopupTG?: boolean;
     walletMode?: WalletMode;
     safeName?: string;
@@ -146,6 +156,27 @@ export interface ConditionBasedJobInput {
      */
     safeTransactions?: SafeTransaction[];
 }
+export interface CustomScriptJobInput {
+    jobTitle: string;
+    timeFrame: number;
+    timeInterval: number;
+    timezone: string;
+    chainId: string;
+    targetContractAddress?: string;
+    targetFunction?: string;
+    abi?: string;
+    isImua?: boolean;
+    arguments?: string[];
+    dynamicArgumentsScriptUrl: string;
+    autotopupETH?: boolean;
+    /** @deprecated Use autotopupETH instead */
+    autotopupTG?: boolean;
+    walletMode?: WalletMode;
+    safeName?: string;
+    language: string;
+    recurring?: boolean;
+    safeAddress?: string;
+}
 export interface CreateJobData {
     job_id: string;
     user_address: string;

package/dist/types.js

@@ -7,6 +7,7 @@ var JobType;
     JobType["Time"] = "time";
     JobType["Event"] = "event";
     JobType["Condition"] = "condition";
+    JobType["CustomScript"] = "custom_script";
 })(JobType || (exports.JobType = JobType = {}));
 var ArgType;
 (function (ArgType) {

package/dist/utils/validation.d.ts

@@ -1,5 +1,5 @@
-import { TimeBasedJobInput, EventBasedJobInput, ConditionBasedJobInput } from '../types';
+import { TimeBasedJobInput, EventBasedJobInput, ConditionBasedJobInput, CustomScriptJobInput } from '../types';
 export declare function validateTimeBasedJobInput(input: TimeBasedJobInput, argType: 'static' | 'dynamic' | 1 | 2 | undefined): void;
 export declare function validateEventBasedJobInput(input: EventBasedJobInput, argType: 'static' | 'dynamic' | 1 | 2 | undefined): void;
 export declare function validateConditionBasedJobInput(input: ConditionBasedJobInput, argType: 'static' | 'dynamic' | 1 | 2 | undefined): void;
-export declare function validateJobInput(jobInput: TimeBasedJobInput | EventBasedJobInput | ConditionBasedJobInput, argType?: 'static' | 'dynamic' | 1 | 2): void;
+export declare function validateJobInput(jobInput: TimeBasedJobInput | EventBasedJobInput | ConditionBasedJobInput | CustomScriptJobInput, argType?: 'static' | 'dynamic' | 1 | 2): void;

package/dist/utils/validation.js

@@ -5,6 +5,7 @@ exports.validateEventBasedJobInput = validateEventBasedJobInput;
 exports.validateConditionBasedJobInput = validateConditionBasedJobInput;
 exports.validateJobInput = validateJobInput;
 const ethers_1 = require("ethers");
+const types_1 = require("../types");
 const errors_1 = require("./errors");
 function isNonEmptyString(value) {
     return typeof value === 'string' && value.trim().length > 0;
@@ -278,14 +279,73 @@ function validateConditionBasedJobInput(input, argType) {
         }
     }
 }
+function validateCustomScriptJobInput(input) {
+    if (!isNonEmptyString(input.jobTitle)) {
+        throw new errors_1.ValidationError('jobTitle', 'Job title is required.');
+    }
+    if (!input.timeFrame || input.timeFrame <= 0) {
+        throw new errors_1.ValidationError('timeframe', 'Timeframe must be a positive number of seconds.');
+    }
+    if (!input.timeInterval || input.timeInterval <= 0) {
+        throw new errors_1.ValidationError('timeInterval', 'timeInterval is required and must be > 0 for custom script jobs.');
+    }
+    if (input.timeInterval > input.timeFrame) {
+        throw new errors_1.ValidationError('timeInterval', 'timeInterval cannot exceed the timeframe for custom script jobs.');
+    }
+    if (!isNonEmptyString(input.timezone)) {
+        throw new errors_1.ValidationError('timezone', 'Timezone is required.');
+    }
+    if (!isNonEmptyString(input.chainId)) {
+        throw new errors_1.ValidationError('chainId', 'Chain ID is required.');
+    }
+    if (!isNonEmptyString(input.dynamicArgumentsScriptUrl) || !isValidUrl(input.dynamicArgumentsScriptUrl)) {
+        throw new errors_1.ValidationError('contractIpfs', 'dynamicArgumentsScriptUrl is required and must be a valid URL for custom script jobs.');
+    }
+    if (!isNonEmptyString(input.language)) {
+        throw new errors_1.ValidationError('language', 'language is required for custom script jobs.');
+    }
+    // if (input.walletMode === 'safe') {
+    //   if (input.safeTransactions && input.safeTransactions.length > 0) {
+    //     throw new ValidationError('safeTransactions', 'Custom script jobs only support dynamic arguments; remove safeTransactions.');
+    //   }
+    // } else {
+    //   validateContractBasics(input.targetContractAddress, input.abi, input.targetFunction, 'contract');
+    // }
+}
+function isTimeBasedJobInput(jobInput) {
+    return jobInput && typeof jobInput === 'object' && 'scheduleType' in jobInput;
+}
+function isEventBasedJobInput(jobInput) {
+    return jobInput && typeof jobInput === 'object' && 'triggerChainId' in jobInput;
+}
+function isConditionBasedJobInput(jobInput) {
+    return jobInput && typeof jobInput === 'object' && 'conditionType' in jobInput;
+}
+function isCustomScriptJobInput(jobInput) {
+    if (!jobInput || typeof jobInput !== 'object') {
+        return false;
+    }
+    if ('scheduleType' in jobInput || 'triggerChainId' in jobInput || 'conditionType' in jobInput) {
+        return false;
+    }
+    return 'language' in jobInput && 'timeInterval' in jobInput && 'dynamicArgumentsScriptUrl' in jobInput;
+}
 function validateJobInput(jobInput, argType) {
-    if ('scheduleType' in jobInput) {
+    if (jobInput.jobType === types_1.JobType.CustomScript || isCustomScriptJobInput(jobInput)) {
+        validateCustomScriptJobInput(jobInput);
+        return;
+    }
+    if (isTimeBasedJobInput(jobInput)) {
         validateTimeBasedJobInput(jobInput, argType);
+        return;
     }
-    else if ('triggerChainId' in jobInput) {
+    if (isEventBasedJobInput(jobInput)) {
         validateEventBasedJobInput(jobInput, argType);
+        return;
     }
-    else {
+    if (isConditionBasedJobInput(jobInput)) {
         validateConditionBasedJobInput(jobInput, argType);
+        return;
     }
+    throw new errors_1.ValidationError('jobType', 'Unsupported job input payload.');
 }

package/package.json

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