fix reset fn + tests

Author: Antoine de Chevigné

pm2-server/app.js

@@ -28,21 +28,6 @@ app.post('/log-listener', secretMiddleware, async (req, res) => {
     }
 });
 
-app.post('/safe-block-listener', secretMiddleware, async (req, res) => {
-    const data = req.body;
-
-    try {
-        if (!data.slug || !data.workspaceId)
-            throw new Error('Missing parameter');
-
-        const pm2Process = await pm2.startSafeBlockListener(data.slug, data.workspaceId);
-
-        return res.status(200).send(pm2Process);
-    } catch(error) {
-        handleError(res, error);
-    }
-});
-
 app.get('/processes', secretMiddleware, async (req, res) => {
     try {
         const processes = await pm2.list()

pm2-server/index.js

@@ -3,16 +3,6 @@ const app = require('./app.js');
 
 const port = process.env.PORT || 9090;
 
-const startL1Trackers = () => {
-    axios.post(`${process.env.ETHERNAL_HOST}/api/explorers/startSafeBlockListeners?secret=${process.env.ETHERNAL_SECRET}`)
-        .then(({ data }) => console.log(data))
-        .catch((error) => {
-            console.log(`Error when starting safe block listeners. Trying again in 1 second...`);
-            console.log(error);
-            setTimeout(triggerSync, 1000);
-        });
-}
-
 const triggerSync = () => {
     axios.post(`${process.env.ETHERNAL_HOST}/api/explorers/syncExplorers?secret=${process.env.ETHERNAL_SECRET}`)
         .then(({ data }) => console.log(data))

pm2-server/lib/pm2.js

@@ -131,34 +131,6 @@ const _delete = (slug) => {
     });
 };
 
-const startSafeBlockListener = (slug, workspaceId) => {
-    return new Promise((resolve, reject) => {
-        if (!slug || !workspaceId) reject(new Error('Missing parameter'));
-
-        pm2.connect(error => {
-            if (error) reject(new Error(error));
-
-            const options = {
-                name: `safeBlockListener-${slug}`,
-                script: './safeBlockListener.js',
-                args: String(workspaceId),
-                interpreter: 'none',
-                log_type: 'json'
-            };
-
-            pm2.start(options, (error) => {
-                if (error) reject(new Error(error));
-
-                pm2.describe(slug, (error, process) => {
-                    if (error) reject(new Error(error));
-
-                    resolve(process[0]);
-                });
-            });
-        });
-    });
-};
-
 const startLogListener = (slug, jsonArgs) => {
     return new Promise((resolve, reject) => {
         if (!slug || !jsonArgs) reject(new Error('Missing parameter'));
@@ -215,4 +187,4 @@ const start = (slug, workspaceId) => {
     });
 };
 
-module.exports = { list, show, stop, reload, restart, delete: _delete, start, resume, startSafeBlockListener, startLogListener };
+module.exports = { list, show, stop, reload, restart, delete: _delete, start, resume, startLogListener };

pm2-server/safeBlockListener.js

@@ -214,31 +214,4 @@ describe('POST /safe-block-listener', () => {
                 done();
             });
     });
-
-    it('Should successfully start safe block listener when all parameters are valid', (done) => {
-        const mockPm2Process = { id: 2, name: 'safe-block-process', status: 'online' };
-        jest.spyOn(pm2, 'startSafeBlockListener').mockResolvedValue(mockPm2Process);
-
-        request.post('/safe-block-listener')
-            .send({ slug: 'safe-block-process', workspaceId: 'workspace-123' })
-            .expect(200)
-            .then(({ body }) => {
-                expect(body).toEqual(mockPm2Process);
-                expect(pm2.startSafeBlockListener).toHaveBeenCalledWith('safe-block-process', 'workspace-123');
-                done();
-            });
-    });
-
-    it('Should handle pm2.startSafeBlockListener errors', (done) => {
-        const errorMessage = 'Safe block listener failed to start';
-        jest.spyOn(pm2, 'startSafeBlockListener').mockRejectedValue(new Error(errorMessage));
-
-        request.post('/safe-block-listener')
-            .send({ slug: 'safe-block-process', workspaceId: 'workspace-123' })
-            .expect(400)
-            .then(({ text }) => {
-                expect(text).toBe(errorMessage);
-                done();
-            });
-    });
 });

pm2-server/tests/app.test.js

@@ -108,17 +108,6 @@ describe('start', () => {
     });
 });
 
-describe('startSafeBlockListener', () => {
-    it('Should resolve with started process', (done) => {
-        jest.spyOn(pm2, 'describe').mockImplementation((_, cb) => cb(null, [{ process: 1 }]));
-        pm2Lib.startSafeBlockListener('slug', 1)
-            .then(process => {
-                expect(process).toEqual({ process: 1 });
-                done();
-            });
-    });
-});
-
 describe('startLogListener', () => {
     it('Should resolve with started process', (done) => {
         jest.spyOn(pm2, 'describe').mockImplementation((_, cb) => cb(null, [{ process: 1 }]));

pm2-server/tests/lib/pm2.test.js

@@ -7,6 +7,5 @@ jest.mock('../../../lib/pm2', () => ({
     delete: jest.fn(),
     start: jest.fn(),
     resume: jest.fn(),
-    startLogListener: jest.fn(),
-    startSafeBlockListener: jest.fn()
+    startLogListener: jest.fn()
 }));

pm2-server/tests/mocks/lib/pm2.js

@@ -56,7 +56,6 @@ router.get('/:id/orbitConfig', authMiddleware, async (req, res, next) => {
  * @param {string} config.challengeManagerContract - Challenge manager contract address
  * @param {string} config.validatorWalletCreatorContract - Validator wallet creator contract address
  * @param {string} config.stakeToken - Stake token address
- * @param {number} config.confirmationPeriodBlocks - The number of blocks to wait for confirmation
  * @param {string} config.parentMessageCountShift - The number of blocks to shift when counting messages
  * @returns {Promise<object>} - The updated orbit config
  */
@@ -118,7 +117,6 @@ router.put('/:id/orbitConfig', authMiddleware, async (req, res, next) => {
  * @param {string} config.challengeManagerContract - Challenge manager contract address
  * @param {string} config.validatorWalletCreatorContract - Validator wallet creator contract address
  * @param {string} config.stakeToken - Stake token address
- * @param {number} config.confirmationPeriodBlocks - The number of blocks to wait for confirmation
  * @param {string} config.parentMessageCountShift - The number of blocks to shift when counting messages
  * @returns {Promise<object>} - The updated orbit config
  */
@@ -300,16 +298,6 @@ router.post('/:id/startTrial', authMiddleware, async (req, res, next) => {
     }
 });
 
-router.post('/startSafeBlockListeners', secretMiddleware, async (req, res, next) => {
-    try {
-        await enqueue('safeBlockListenerCheck', 'safeBlockListenerCheck', {});
-
-        res.sendStatus(200);
-    } catch(error) {
-        unmanagedError(error, req, next);
-    }
-});
-
 router.post('/syncExplorers', secretMiddleware, async (req, res, next) => {
     try {
         const explorers = await Explorer.findAll();
@@ -810,7 +798,6 @@ router.post('/', authMiddleware, async (req, res, next) => {
         options['token'] = data.token;
         options['slug'] = data.slug;
         options['totalSupply'] = data.totalSupply;
-        options['l1Explorer'] = data.l1Explorer;
         options['branding'] = data.branding;
 
         const usingDefaultPlan = !data.plan && (!isStripeEnabled() || user.canUseDemoPlan);
@@ -961,7 +948,6 @@ router.get('/search', async (req, res, next) => {
             chainId: explorer.chainId,
             domain: explorer.domain,
             domains: explorer.domains,
-            l1Explorer: explorer.l1Explorer,
             name: explorer.name,
             rpcServer: explorer.rpcServer,
             slug: explorer.slug,

run/api/explorers.js

@@ -1,27 +1,15 @@
 const logger = require('../lib/logger');
-const { OrbitBatch, OrbitChainConfig } = require('../models');
+const { OrbitBatch, Workspace } = require('../models');
 const { Op } = require('sequelize');
 
 module.exports = async () => {
 
-    const orbitParentConfigs = await OrbitChainConfig.findAll({
-        where: {
-            topParentChainBlockValidationType: {
-                [Op.in]: ['SAFE', 'FINALIZED']
-            }
-        }
-    });
-
-    const workspaces = {};
-    for (const config of orbitParentConfigs) {
-        const parentWorkspace = await config.getTopParentWorkspace();
-        const orbitChildConfigs = await parentWorkspace.getOrbitChildConfigs();
-        workspaces[parentWorkspace.id] = Object.assign({}, parentWorkspace.toJSON(), { orbitChildConfigs, client: parentWorkspace.getViemPublicClient() });
-    }
+    const workspaces = await Workspace.findAll({ where: { isTopOrbitParent: true } });
 
     let allPendingBatches = [];
-    for (const workspace of Object.values(workspaces)) {
-        const block = await workspace.client.getBlock({ blockTag: 'safe' });
+    for (const workspace of workspaces) {
+        const client = workspace.getViemPublicClient();
+        const block = await client.getBlock({ blockTag: 'safe' });
         for (const orbitChildConfig of workspace.orbitChildConfigs) {
             logger.info(`Validating batches posted on ${workspace.name} by config ${orbitChildConfig.workspaceId} with block number ${block.number}`);
             const pendingBatches = await OrbitBatch.findAll({
@@ -37,7 +25,7 @@ module.exports = async () => {
             for (const batch of pendingBatches) {
                 await batch.confirm();
             }
-            
+
             allPendingBatches = allPendingBatches.concat(pendingBatches);
         }
     }