sdk-triggerx 0.1.19 → 0.1.21

package/dist/contracts/safe/SafeFactory.js

@@ -26,8 +26,15 @@ async function createSafeWalletForUser(factoryAddress, signer, user) {
         }
     })
         .find((e) => e && e.name === 'SafeWalletCreated');
+    let safeAddress;
     if (evt && evt.args && evt.args.safeWallet) {
-        return evt.args.safeWallet;
+        safeAddress = evt.args.safeWallet;
     }
-    return await factory.latestSafeWallet(user);
+    else {
+        safeAddress = await factory.latestSafeWallet(user);
+    }
+    // Wait a bit for the Safe contract to be fully initialized
+    // This is important because Safe proxy contracts need time to be set up
+    await new Promise(resolve => setTimeout(resolve, 2000));
+    return safeAddress;
 }

package/dist/contracts/safe/SafeWallet.js

@@ -54,23 +54,37 @@ async function enableSafeModule(safeAddress, signer, moduleAddress) {
     if (!provider)
         throw new Error('Signer provider is required');
     const safeProxy = new ethers_1.ethers.Contract(safeAddress, exports.SAFE_ABI, provider);
-    // If already enabled, exit early
-    const already = await safeProxy.isModuleEnabled(moduleAddress);
-    if (already) {
-        console.log('Module is already enabled');
-        return;
+    // Check if contract is deployed and initialized
+    try {
+        // If already enabled, exit early
+        const already = await safeProxy.isModuleEnabled(moduleAddress);
+        if (already) {
+            console.log('Module is already enabled');
+            return;
+        }
+    }
+    catch (error) {
+        // If we can't decode the result, the Safe might not be fully initialized
+        if (error.code === 'BAD_DATA' && error.value === '0x') {
+            console.log('Safe wallet not fully initialized yet, waiting a moment...');
+            await new Promise(resolve => setTimeout(resolve, 2000));
+        }
+        else {
+            throw error;
+        }
     }
-    // First, let's try the direct approach for single-owner Safes
+    // Verify Safe is properly initialized by checking owners and threshold
     try {
-        console.log('Attempting direct enableModule call...');
-        const safeWithSigner = new ethers_1.ethers.Contract(safeAddress, exports.SAFE_ABI, signer);
-        const tx = await safeWithSigner.enableModule(moduleAddress);
-        await tx.wait();
-        console.log('Module enabled via direct call');
-        return;
+        const [owners, threshold] = await Promise.all([
+            safeProxy.getOwners(),
+            safeProxy.getThreshold(),
+        ]);
+        const signerAddress = await signer.getAddress();
+        console.log(`Safe has ${owners.length} owner(s), threshold: ${threshold}`);
+        console.log(`Signer: ${signerAddress}, Owners: ${owners.join(', ')}`);
     }
     catch (error) {
-        console.log('Direct call failed, trying execTransaction approach...');
+        console.log('Could not verify Safe owners, proceeding anyway...');
     }
     // If direct call fails, use execTransaction with proper signature
     const safeNonce = await safeProxy.nonce();
@@ -99,11 +113,17 @@ async function enableSafeModule(safeAddress, signer, moduleAddress) {
     // Execute the transaction through Safe's execTransaction
     const safeProxyWithSigner = new ethers_1.ethers.Contract(safeAddress, exports.SAFE_ABI, signer);
     const tx = await safeProxyWithSigner.execTransaction(to, value, data, operation, safeTxGas, baseGas, gasPrice, gasToken, refundReceiver, signature);
-    await tx.wait();
+    console.log('Waiting for transaction confirmation...');
+    const receipt = await tx.wait();
+    console.log(`Transaction confirmed in block ${receipt.blockNumber}`);
+    // Wait a bit for state to propagate
+    await new Promise(resolve => setTimeout(resolve, 2000));
     // Verify module is enabled
     const isNowEnabled = await safeProxy.isModuleEnabled(moduleAddress);
     if (!isNowEnabled) {
+        console.error('Module is still not enabled after transaction');
+        console.error(`Transaction hash: ${receipt.hash}`);
         throw new Error("Module verification failed");
     }
-    console.log('Module enabled successfully via execTransaction');
+    console.log('✅ Module enabled successfully via execTransaction');
 }

package/dist/index.d.ts

@@ -8,5 +8,6 @@ export * from './api/checkTgBalance';
 export * from './api/topupTg';
 export * from './api/deleteJob';
 export * from './api/getJobDataById';
+export * from './api/safeWallet';
 export * from './contracts';
 export * from './utils/errors';

package/dist/index.js

@@ -24,6 +24,7 @@ __exportStar(require("./api/checkTgBalance"), exports);
 __exportStar(require("./api/topupTg"), exports);
 __exportStar(require("./api/deleteJob"), exports);
 __exportStar(require("./api/getJobDataById"), exports);
+__exportStar(require("./api/safeWallet"), exports);
 // export { createJobOnChain } from './contracts/JobRegistry';
 __exportStar(require("./contracts"), exports);
 __exportStar(require("./utils/errors"), exports);

package/package.json

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