@fileverse/api 0.0.20 → 0.0.21

package/dist/cloudflare.js

@@ -1438,29 +1438,19 @@ var init_pimlico_utils = __esm({
         version: "0.7"
       }
     });
-    signerToSmartAccount = async (signer) => {
-      console.log("[pimlico] creating public client");
-      const client = getPublicClient();
-      console.log("[pimlico] calling toSafeSmartAccount");
-      const account = await toSafeSmartAccount({
-        client,
-        owners: [signer],
-        entryPoint: {
-          address: entryPoint07Address,
-          version: "0.7"
-        },
-        version: "1.4.1"
-      });
-      console.log("[pimlico] safe smart account created");
-      return account;
-    };
+    signerToSmartAccount = async (signer) => await toSafeSmartAccount({
+      client: getPublicClient(),
+      owners: [signer],
+      entryPoint: {
+        address: entryPoint07Address,
+        version: "0.7"
+      },
+      version: "1.4.1"
+    });
     getSmartAccountClient = async (signer, authToken, portalAddress) => {
-      console.log("[pimlico] signerToSmartAccount start");
       const smartAccount = await signerToSmartAccount(signer);
-      console.log("[pimlico] creating pimlico client");
       const pimlicoClient = getPimlicoClient(authToken, portalAddress, smartAccount.address);
-      console.log("[pimlico] creating smart account client");
-      const result = createSmartAccountClient({
+      return createSmartAccountClient({
         account: smartAccount,
         chain: CHAIN,
         paymaster: pimlicoClient,
@@ -1478,8 +1468,6 @@ var init_pimlico_utils = __esm({
           estimateFeesPerGas: async () => (await pimlicoClient.getUserOperationGasPrice()).fast
         }
       });
-      console.log("[pimlico] smart account client created");
-      return result;
     };
     getNonce = () => hexToBigInt(
       toHex(toBytes(generatePrivateKey()).slice(0, 24), {
@@ -1523,17 +1511,13 @@ var init_smart_agent = __esm({
       MAX_CALL_GAS_LIMIT = 5e5;
       authOptions = { namespace: "proxy", segment: "ACCESS", scheme: "pimlico" };
       async initializeAgentClient(keyMaterial) {
-        console.log("[agent] creating account from key");
         const agentAccount = privateKeyToAccount(toHex2(keyMaterial));
-        console.log("[agent] getting auth token");
         const authToken = await this.authTokenProvider.getAuthToken(STATIC_CONFIG.PROXY_SERVER_DID, this.authOptions);
-        console.log("[agent] getting smart account client");
         const smartAccountClient = await getSmartAccountClient(
           agentAccount,
           authToken,
           this.authTokenProvider.portalAddress
         );
-        console.log("[agent] smart account client ready");
         this.smartAccountAgent = smartAccountClient;
       }
       getSmartAccountAgent() {
@@ -1573,19 +1557,17 @@ var init_smart_agent = __esm({
         ]);
       }
       async sendUserOperation(request, customGasLimit) {
-        const smartAccountAgent = this.getSmartAccountAgent();
-        console.log("[agent] encoding call data");
-        const callData = await this.getCallData(request);
-        console.log("[agent] generating nonce");
-        const nonce = getNonce();
-        console.log("[agent] sending user operation");
-        const hash2 = await smartAccountAgent.sendUserOperation({
-          callData,
-          callGasLimit: BigInt(customGasLimit || this.MAX_CALL_GAS_LIMIT),
-          nonce
-        });
-        console.log("[agent] user operation sent");
-        return hash2;
+        try {
+          const smartAccountAgent = this.getSmartAccountAgent();
+          const callData = await this.getCallData(request);
+          return await smartAccountAgent.sendUserOperation({
+            callData,
+            callGasLimit: BigInt(customGasLimit || this.MAX_CALL_GAS_LIMIT),
+            nonce: getNonce()
+          });
+        } catch (error48) {
+          throw error48;
+        }
       }
       async executeUserOperationRequest(request, timeout, customGasLimit) {
         const userOpHash = await this.sendUserOperation(request, customGasLimit);
@@ -3038,38 +3020,44 @@ var init_eventProcessor = __esm({
           if (!file2) throw new Error(`File ${fileId} not found`);
           if (file2.isDeleted === 1) {
             logger.info(`File ${fileId} is deleted, skipping create submit`);
-            return null;
+            return;
           }
           console.log("Submitting new file op");
           const result = await handleNewFileOp(fileId);
           console.log("New file op submitted");
+          await EventsModel.setEventPendingOp(event._id, result.userOpHash, {
+            metadata: result.metadata
+          });
           logger.info(`File ${file2.ddocId} create op submitted (hash: ${result.userOpHash})`);
-          return { userOpHash: result.userOpHash, pendingPayload: { metadata: result.metadata } };
+          break;
         }
         case "update": {
           const file2 = await FilesModel.findByIdExcludingDeleted(fileId);
-          if (!file2) return null;
-          if (file2.localVersion <= file2.onchainVersion) return null;
+          if (!file2) return;
+          if (file2.localVersion <= file2.onchainVersion) return;
           const result = await submitUpdateFileOp(fileId);
+          await EventsModel.setEventPendingOp(event._id, result.userOpHash, {
+            metadata: result.metadata,
+            localVersion: file2.localVersion
+          });
           logger.info(`File ${file2.ddocId} update op submitted (hash: ${result.userOpHash})`);
-          return {
-            userOpHash: result.userOpHash,
-            pendingPayload: { metadata: result.metadata, localVersion: file2.localVersion }
-          };
+          break;
         }
         case "delete": {
           const file2 = await FilesModel.findByIdIncludingDeleted(fileId);
-          if (!file2) return null;
+          if (!file2) return;
           if (file2.isDeleted === 1 && file2.syncStatus === "synced") {
             logger.info(`File ${fileId} deletion already synced, skipping`);
-            return null;
+            return;
           }
           if (file2.onChainFileId === null || file2.onChainFileId === void 0) {
-            return { noOp: true, fileId, portalAddress: file2.portalAddress };
+            await FilesModel.update(fileId, { syncStatus: "synced", isDeleted: 1 }, file2.portalAddress);
+            return;
           }
           const result = await submitDeleteFileOp(fileId);
+          await EventsModel.setEventPendingOp(event._id, result.userOpHash, {});
           logger.info(`File ${file2.ddocId} delete op submitted (hash: ${result.userOpHash})`);
-          return { userOpHash: result.userOpHash, pendingPayload: {} };
+          break;
         }
         default:
           throw new Error(`Unknown event type: ${type}`);
@@ -3825,12 +3813,7 @@ import hkdf from "futoin-hkdf";
 import tweetnacl2 from "tweetnacl";
 import { fromUint8Array as fromUint8Array4, toUint8Array as toUint8Array5 } from "js-base64";
 var deriveKeyFromAg2Hash = async (pass, salt) => {
-  const key = await getArgon2idHash(pass, salt, void 0, {
-    t: 2,
-    m: 4096,
-    p: 8,
-    dkLen: 32
-  });
+  const key = await getArgon2idHash(pass, salt);
   return hkdf(Buffer.from(key), tweetnacl2.secretbox.keyLength, {
     info: Buffer.from("encryptionKey")
   });