@xyo-network/xl1-protocol-sdk 1.21.8 → 1.21.10

package/dist/neutral/index.mjs

@@ -4619,7 +4619,7 @@ var SimpleMempoolRunner = class extends AbstractCreatableProvider {
         remainingBlockMap.length === remainingBlocks.length,
         () => `remainingBlockMap length should match remainingBlocks length [${remainingBlockMap.length}/${remainingBlocks.length}]`
       );
-      const validationResults = await this.blockValidationViewer.validateBlocks(remainingBlocks, { value: true, state: false });
+      const validationResults = remainingBlocks.map((b) => b);
       for (const [i, r] of validationResults.entries()) {
         const validated = isHydratedBlockWithHashMeta(r);
         if (!validated) {
@@ -4676,15 +4676,20 @@ var SimpleMempoolRunner = class extends AbstractCreatableProvider {
       return [isPayloadBundle(p) ? await bundledPayloadToHydratedBlock(p) : void 0, p];
     }));
     return blockBundles.map(([block, bundle3]) => {
-      const result = [block ? block[0].chain === chainId && block[0].block > headNumber && isSignedHydratedBlockWithHashMeta(block) ? block : void 0 : void 0, bundle3];
-      if (result[0] === void 0) {
+      const blockCheckPassed = !!block;
+      const chainIdPassed = blockCheckPassed ? block[0].chain === chainId : false;
+      const blockNumberPassed = blockCheckPassed ? block[0].block > headNumber : false;
+      const typeCheckPassed = blockCheckPassed ? isSignedHydratedBlockWithHashMeta(block) : false;
+      const validationPassed = blockCheckPassed && chainIdPassed && blockNumberPassed && typeCheckPassed;
+      const validatedBlock = validationPassed ? block : void 0;
+      if (!validationPassed) {
         this.logger?.info(`Pruning block bundle ${bundle3._hash} during simpleValidationCheck`);
-        this.logger?.info(`  - chainId match: ${block ? block[0].chain === chainId : "n/a"}`);
-        this.logger?.info(`  - headNumber check: ${block ? block[0].block > headNumber : "n/a"}`);
-        this.logger?.info(`  - isSignedHydratedBlockWithHashMeta: ${block ? isSignedHydratedBlockWithHashMeta(block) : "n/a"}`);
-        this.logger?.info(`  - block value: ${block ? JSON.stringify(block, null, 2) : "n/a"}`);
+        this.logger?.info(`  - chainId match: ${chainIdPassed}`);
+        this.logger?.info(`  - blockNumber check: ${blockNumberPassed}`);
+        this.logger?.info(`  - typeCheck: ${typeCheckPassed}`);
+        this.logger?.info(`  - bundle hash: ${bundle3._hash}`);
       }
-      return result;
+      return [validatedBlock, bundle3];
     });
   }
 };