fix: refiltering datasorces and adding a test case to it

Author: Gmin2

packages/node-core/src/indexer/dynamic-ds.service.spec.ts

@@ -435,5 +435,25 @@ describe('DynamicDsService', () => {
         'Datasource at index 2 has template name "Other", not "Test"'
       );
     });
+
+    it('sets endBlock correctly allowing in-place removal during block processing', async () => {
+      const meta = mockMetadata([testParam1, testParam2, testParam3]);
+      await service.init(meta);
+
+      // Destroy datasource at index 1 at block 50
+      await service.destroyDynamicDatasource('Test', 50, 1);
+
+      // Verify the datasource has endBlock set
+      const dsParam = service.getDatasourceParamByIndex(1);
+      expect(dsParam).toBeDefined();
+      expect(dsParam?.endBlock).toBe(50);
+      expect(dsParam?.startBlock).toBe(2);
+      expect(dsParam?.templateName).toBe('Test');
+
+      // Verify the internal _datasources array also has endBlock set
+      const datasources = (service as any)._datasources;
+      expect(datasources[1]).toBeDefined();
+      expect((datasources[1] as any).endBlock).toBe(50);
+    });
   });
 });

packages/node-core/src/indexer/indexer.manager.ts

@@ -89,7 +89,7 @@ export abstract class BaseIndexerManager<
     const blockHeight = block.getHeader().blockHeight;
     monitorWrite(`- BlockHash: ${block.getHeader().blockHash}`);
 
-    let filteredDataSources = this.filterDataSources(blockHeight, dataSources);
+    const filteredDataSources = this.filterDataSources(blockHeight, dataSources);
 
     this.assertDataSources(filteredDataSources, blockHeight);
 
@@ -125,11 +125,21 @@ export abstract class BaseIndexerManager<
         vm.freeze(async (templateName: string, index: number) => {
           await this.dynamicDsService.destroyDynamicDatasource(templateName, blockHeight, index);
 
-          // Re-filter datasources to exclude the destroyed one
-          // The destroyed datasource now has endBlock set, so filterDataSources will exclude it
-          // Note: Reassigning filteredDataSources is intentional - subsequent handlers
-          // within the same block will see the updated filtered list
-          filteredDataSources = this.filterDataSources(blockHeight, filteredDataSources);
+          // Remove the destroyed datasource from the current processing array
+          // Find the datasource by matching the global index stored in the service
+          const destroyedDsParam = this.dynamicDsService.getDatasourceParamByIndex(index);
+          if (destroyedDsParam) {
+            const dsIndex = filteredDataSources.findIndex((fds) => {
+              return (
+                fds.startBlock === destroyedDsParam.startBlock &&
+                JSON.stringify((fds as any).options || (fds as any).processor?.options || {}) ===
+                  JSON.stringify(destroyedDsParam.args || {})
+              );
+            });
+            if (dsIndex !== -1) {
+              filteredDataSources.splice(dsIndex, 1);
+            }
+          }
         }, 'destroyDynamicDatasource');
 
         return vm;