@instadapp/interop-x 0.0.0-dev.a168c79 → 0.0.0-dev.a775e30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instadapp/interop-x",
-  "version": "0.0.0-dev.a168c79",
+  "version": "0.0.0-dev.a775e30",
   "license": "MIT",
   "main": "dist/index.js",
   "engines": {
@@ -12,7 +12,8 @@
     "build": "yarn generate-abi-types && export GIT_REF=$(git rev-parse --short HEAD) && rimraf ./dist && tsc -p tsconfig.json && replace-in-file '@GIT_SHORT_HASH@' $GIT_REF ./dist/**/*.js",
     "dev": "yarn generate-abi-types && NODE_ENV=development nodemon",
     "generate-abi-types": "typechain --target=ethers-v5 'src/abi/*.json' --out-dir 'src/typechain'",
-    "prepublishOnly": "yarn build"
+    "prepublishOnly": "yarn build",
+    "postinstall": "patch-package"
   },
   "nodemonConfig": {
     "watch": [
@@ -23,9 +24,10 @@
   },
   "dependencies": {
     "@achingbrain/libp2p-gossipsub": "^0.12.2",
+    "@fastify/cors": "^7.0.0",
+    "await-spawn": "^4.0.2",
     "axios": "^0.27.1",
     "axios-retry": "^3.2.4",
-    "bignumber.js": "^9.0.2",
     "chalk": "4.1.2",
     "dotenv": "^16.0.0",
     "ethereumjs-util": "^7.1.4",
@@ -33,7 +35,7 @@
     "ethers-multisend": "^2.1.1",
     "expand-home-dir": "^0.0.3",
     "fastify": "^3.28.0",
-    "fastify-cors": "^6.0.3",
+    "fs-extra": "^10.1.0",
     "libp2p": "^0.36.2",
     "libp2p-bootstrap": "^0.14.0",
     "libp2p-kad-dht": "^0.28.6",
@@ -45,7 +47,9 @@
     "libp2p-websockets": "^0.16.2",
     "luxon": "^2.3.2",
     "module-alias": "^2.2.2",
-    "sequelize": "^6.19.0",
+    "patch-package": "^6.4.7",
+    "postinstall-postinstall": "^2.1.0",
+    "sequelize": "6.18.0",
     "sqlite3": "^5.0.5",
     "waait": "^1.0.5"
   },

package/patches/@ethersproject+properties+5.6.0.patch

@@ -0,0 +1,13 @@
+diff --git a/node_modules/@ethersproject/properties/lib/index.js b/node_modules/@ethersproject/properties/lib/index.js
+index 41e0b52..4c7a9e3 100644
+--- a/node_modules/@ethersproject/properties/lib/index.js
++++ b/node_modules/@ethersproject/properties/lib/index.js
+@@ -44,7 +44,7 @@ function defineReadOnly(object, name, value) {
+     Object.defineProperty(object, name, {
+         enumerable: true,
+         value: value,
+-        writable: false,
++        writable: true,
+     });
+ }
+ exports.defineReadOnly = defineReadOnly;

package/src/api/index.ts

@@ -1,5 +1,5 @@
 import fastify from "fastify"
-import cors from 'fastify-cors'
+import cors from '@fastify/cors'
 import Logger from "@/logger"
 import { Transaction } from "@/db";
 
@@ -27,7 +27,7 @@ export const startApiServer = async () => {
 
         logger.log(`RPC Server listening at http://${HOST}:${PORT}`)
     } catch (err) {
-        logger.error(err)
+        logger.error(err.message)
         process.exit(1)
     }
 }

package/src/config/index.ts

@@ -1,5 +1,7 @@
 import { ethers, Wallet } from "ethers"
 import { EventBus, EventBusType } from "@/types"
+import fs from 'fs-extra'
+import expandHomeDir from "expand-home-dir";
 
 class Config {
     public readonly events: EventBusType
@@ -8,14 +10,18 @@ class Config {
     public readonly privateKey: string
     public readonly wallet: Wallet
     public readonly staging: boolean
+    public readonly autoUpdate: boolean
+    public readonly baseConfigPath: string
 
     constructor() {
         this.events = new EventBus()  as EventBusType
-        this.maxPeers = 10
+        this.maxPeers = 20
         this.privateKey = process.env.PRIVATE_KEY as string;
         this.staging = !! process.env.STAGING && process.env.STAGING === 'true';
+        this.autoUpdate = !! process.env.AUTO_UPDATE && process.env.AUTO_UPDATE === 'true';
         this.wallet = new Wallet(this.privateKey);
         this.leadNodeAddress = '0x910E413DBF3F6276Fe8213fF656726bDc142E08E'
+        this.baseConfigPath = expandHomeDir(`~/.interop-x`);
     }
 
     get publicAddress(){
@@ -25,6 +31,10 @@ class Config {
     isLeadNode() {
         return ethers.utils.getAddress(this.leadNodeAddress) === ethers.utils.getAddress(this.wallet.address)
     }
+
+    isMaintenanceMode(){
+        return fs.existsSync(this.baseConfigPath + '/maintenance')
+    }
 }
 
 export default new Config()

package/src/constants/itokens.ts

@@ -2,7 +2,7 @@ export const itokens = {
   1: [],
   137: [
     {
-      address: '0x6c20F03598d5ABF729348E2868b0ff5e8A48aB1F',
+      address: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
       symbol: 'USDC',
     }
   ],

package/src/index.ts

@@ -1,5 +1,6 @@
 import moduleAlias from 'module-alias';
-
+import expandHomeDir from "expand-home-dir";
+import fs from 'fs-extra'
 moduleAlias.addAliases({
     "@/": __dirname + "/",
     "@/logger": __dirname + "/logger",
@@ -16,8 +17,8 @@ moduleAlias.addAliases({
 })
 
 moduleAlias();
-import assert from "assert";
 import dotenv from "dotenv";
+import chalk from 'chalk';
 import { ethers } from "ethers";
 import packageJson from '../package.json'
 dotenv.config();
@@ -25,28 +26,77 @@ dotenv.config();
 import Logger from "@/logger";
 const logger = new Logger('Process')
 
+const GIT_SHORT_HASH = '@GIT_SHORT_HASH@';
+
+const printUsage = () => {
+    console.log()
+    console.log(`Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
+    console.log()
 
-if (process.argv.at(-1) === 'help') {
     console.log('Usage:')
-    console.log('   PRIVATE_KEY=abcd1234 interop-x')
-    console.log('   PRIVATE_KEY=abcd1234 STAGING=true interop-x')
+    console.log('   interop-x help                                                              Show this message')
+    console.log('   interop-x version                                                           Print out the installed version of Interop X')
+
+    console.log()
+
+    console.log('   interop-x down                                                              Put the node into maintenance mode')
+    console.log('   interop-x up                                                                Take the node out of maintenance mode')
+
+    console.log()
+
+    console.log('   PRIVATE_KEY=abcd1234 interop-x                                              Start the node with the given private key')
+    console.log('   PRIVATE_KEY=abcd1234 STAGING=true interop-x                                 Start the node in staging mode')
+    console.log('   PRIVATE_KEY=abcd1234 AUTO_UPDATE=true interop-x                             Start the node in auto update mode')
+    console.log('   PRIVATE_KEY=abcd1234 API_HOST=0.0.0.0 API_PORT=8080 interop-x               Start the node with custom API host and port')
+    console.log()
+
+}
+
+if (process.argv.at(-1) === 'help') {
+    printUsage()
+    process.exit(0)
+}
+
+const basePath = expandHomeDir(`~/.interop-x`);
+
+if (process.argv.at(-1) === 'down') {
+    fs.outputFileSync(basePath + '/maintenance', Date.now().toString())
+    console.log(chalk.red('Maintenance mode enabled'))
+    process.exit(0)
+}
+
+if (process.argv.at(-1) === 'up') {
+    fs.removeSync(basePath + '/maintenance')
+    console.log(chalk.green('Maintenance mode disabled'))
     process.exit(0)
 }
 
-assert(process.env.PRIVATE_KEY, "PRIVATE_KEY is not defined");
 
+if (process.argv.at(-1) === 'version') {
+    console.log(`Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
+    process.exit(0)
+}
+
+if (!process.env.PRIVATE_KEY) {
+    console.error(chalk.bgRed.white.bold('Please provide a private key\n'))
+    printUsage()
+    process.exit(1)
+}
 try {
     new ethers.Wallet(process.env.PRIVATE_KEY!)
 } catch (e) {
-    logger.error('Invalid private key')
+    console.error(chalk.bgRed.white('Invalid private key\n'))
+    printUsage()
     process.exit(1)
 }
 
-logger.debug(`Starting Interop X Node (v${packageJson.version} - rev.@GIT_SHORT_HASH@)`)
+logger.debug(`Starting Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
 
 import { Tasks } from "@/tasks";
-import { startPeer } from "@/net";
+import { startPeer, protocol, peerPool } from "@/net";
 import { startApiServer } from '@/api';
+import { Transaction } from './db';
+import { shortenHash } from './utils';
 
 async function main() {
 
@@ -57,6 +107,37 @@ async function main() {
     tasks.start();
 
     startApiServer()
+
+    protocol.on('TransactionStatus', async (payload) => {
+        if (!peerPool.isLeadNode(payload.peerId)) {
+            const peer = peerPool.getPeer(payload.peerId)
+
+            if (!peer) {
+                return;
+            }
+
+            logger.info(`ignored transaction status from ${payload.peerId} ${shortenHash(peer.publicAddress)} `)
+            return;
+        }
+
+        const transaction = await Transaction.findOne({ where: { transactionHash: payload.data.transactionHash } })
+
+        if (!transaction) {
+            return;
+        }
+
+        transaction.sourceStatus = payload.data.sourceStatus
+        transaction.sourceTransactionHash = payload.data.sourceTransactionHash
+        transaction.sourceErrors = payload.data.sourceErrors
+
+        transaction.targetStatus = payload.data.targetStatus
+        transaction.targetTransactionHash = payload.data.targetTransactionHash
+        transaction.targetErrors = payload.data.targetErrors
+
+        transaction.status = payload.data.status
+
+        await transaction.save()
+    })
 }
 
 main()

package/src/net/peer/index.ts

@@ -17,6 +17,7 @@ import KadDHT from "libp2p-kad-dht";
 import PubsubPeerDiscovery from "libp2p-pubsub-peer-discovery";
 import { protocol } from "@/net";
 import config from "@/config";
+import chalk from "chalk";
 
 const logger = new Logger("Peer");
 
@@ -80,7 +81,7 @@ export const startPeer = async ({ }: IPeerOptions) => {
     },
   });
 
-  logger.info("Peer ID:", node.peerId.toB58String());
+  logger.info("Peer ID:", chalk.bold(node.peerId.toB58String()));
 
   await node.start();
 
@@ -88,12 +89,13 @@ export const startPeer = async ({ }: IPeerOptions) => {
     libp2p: node
   })
 
-  node.on("peer:discovery", (peer) =>
-    logger.log(`Discovered peer ${peer}`)
-  ); // peer disc.
-  node.connectionManager.on("peer:connect", (connection) =>
-    logger.log(`Connected to ${connection.remotePeer.toB58String()}`)
-  );
+  node.on("peer:discovery", (peer) => {
+    // logger.log(`Discovered peer ${peer}`)
+  }); // peer disc.
+
+  node.connectionManager.on("peer:connect", (connection) => {
+    // logger.log(`Connected to ${connection.remotePeer.toB58String()}`)
+  });
 
   logger.log("Peer discovery started");
 

package/src/net/pool/index.ts

@@ -1,5 +1,12 @@
 import { Event } from "@/types";
 import config from "@/config";
+import Logger from "@/logger";
+import { getAddress } from "ethers/lib/utils";
+import { shortenHash } from "@/utils";
+import chalk from "chalk";
+
+
+const logger = new Logger('PeerPool')
 
 export interface IPeerInfo {
     id: string;
@@ -75,10 +82,15 @@ export class PeerPool {
      * @emits {@link Event.POOL_PEER_ADDED}
      */
     add(peer?: IPeerInfo) {
-        if (peer && peer.id && !this.pool.get(peer.id)) {
+        if (peer && peer.id) {
+            const newPeer = !this.pool.get(peer.id);
             this.pool.set(peer.id, peer)
             peer.pooled = true
-            config.events.emit(Event.POOL_PEER_ADDED, peer)
+
+            if (newPeer) {
+                config.events.emit(Event.POOL_PEER_ADDED, peer)
+                logger.info(`Peer ${chalk.bold(shortenHash(peer.id, 16))} with address ${chalk.bold(shortenHash(peer.publicAddress))} added to pool`)
+            }
         }
     }
 
@@ -92,6 +104,7 @@ export class PeerPool {
             if (this.pool.delete(peer.id)) {
                 peer.pooled = false
                 config.events.emit(Event.POOL_PEER_REMOVED, peer)
+                logger.info(`Peer ${chalk.bold(shortenHash(peer.id, 16))} with address ${chalk.bold(shortenHash(peer.publicAddress))} removed from pool`)
             }
         }
     }
@@ -100,7 +113,7 @@ export class PeerPool {
         this.cleanup()
 
         return this.peers.filter((p) => {
-            if(!p.pooled) return false;
+            if (!p.pooled) return false;
 
             const now = new Date()
 
@@ -112,16 +125,33 @@ export class PeerPool {
         return this.activePeers.map((p) => p.id)
     }
 
+    getPeer(id: string){
+     return this.pool.get(id);   
+    }
 
-    cleanup() {
-        let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
+    isLeadNode(id: string) {
+        const peer = this.pool.get(id);
 
-        this.peers.forEach((peerInfo) => {
-            if (peerInfo.updated.getTime() < compDate) {
-                console.log(`Peer ${peerInfo.id} idle for ${this.PEERS_CLEANUP_TIME_LIMIT} minutes`)
-                this.remove(peerInfo)
-            }
-        })
+        if (!peer) {
+            return false;
+        }
+
+        return getAddress(peer.publicAddress) === getAddress(config.leadNodeAddress)
+    }
+
+    getLeadPeer() {
+        return this.peers.find((p) => this.isLeadNode(p.id))
+    }
+
+    cleanup() {
+        // let compDate = Date.now() - this.PEERS_CLEANUP_TIME_LIMIT * 60
+
+        // this.peers.forEach((peerInfo) => {
+        //     if (peerInfo.updated.getTime() < compDate) {
+        //         console.log(`Peer ${peerInfo.id} idle for ${this.PEERS_CLEANUP_TIME_LIMIT} minutes`)
+        //         this.remove(peerInfo)
+        //     }
+        // })
     }
 }
 

package/src/net/protocol/dial/SignatureDialProtocol.1.ts

@@ -0,0 +1,31 @@
+import { BaseDialProtocol } from "./BaseDialProtocol";
+import { Transaction } from "@/db";
+
+export class TransactionStatusDialProtocol extends BaseDialProtocol<string, Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'status'> | null> {
+    protected timeout = 30000;
+
+    constructor(libp2p) {
+        super(libp2p, '/interop-x/transaction-status')
+    }
+
+    async response(transactionHash: string){
+        const transaction = await Transaction.findOne({ where: { transactionHash } })
+
+        if(! transaction){
+            return null
+        }
+        return {
+            transactionHash: transaction.transactionHash,
+
+            sourceStatus: transaction.sourceStatus,
+            sourceTransactionHash: transaction.sourceTransactionHash,
+            sourceErrors: transaction.sourceErrors,
+
+            targetStatus: transaction.targetStatus,
+            targetTransactionHash: transaction.targetTransactionHash,
+            targetErrors: transaction.targetErrors,
+
+            status: transaction.status,
+        }
+    }
+}

package/src/net/protocol/dial/SignatureDialProtocol.ts

@@ -47,12 +47,20 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
             };
         }
 
+        console.log("signing:", {
+            to: addresses[transaction.targetChainId].multisend,
+            data: await buildDataForTransaction(transaction, data.type),
+            chainId: transaction.targetChainId as ChainId,
+            safeTxGas: data.safeTxGas,
+            nonce: data.safeNonce,
+        });
+
         const signedData = await signGnosisSafeTx({
-            //TODO: chain id depends on event type
-            to: addresses[transaction.sourceChainId].multisend,
-            data:  buildDataForTransaction(transaction, data.type),
-            chainId: transaction.sourceChainId as ChainId,
+            to: addresses[transaction.targetChainId].multisend,
+            data: await buildDataForTransaction(transaction, data.type),
+            chainId: transaction.targetChainId as ChainId,
             safeTxGas: data.safeTxGas,
+            nonce: data.safeNonce,
         }, { signer });
 
         return {

package/src/net/protocol/index.ts

@@ -5,6 +5,8 @@ import { SignatureDialProtocol, ISignatureRequest, ISignatureResponse } from "./
 import { IPeerInfo, peerPool } from "..";
 import config from "@/config";
 import { Event } from "@/types";
+import { Transaction } from "@/db";
+import { TransactionStatusDialProtocol } from "./dial/SignatureDialProtocol.1";
 
 export interface ProtocolOptions {
     /* Handshake timeout in ms (default: 8000) */
@@ -33,7 +35,12 @@ interface PeerInfoEvent extends BaseMessageEvent {
     data: Omit<IPeerInfo, 'id' | 'updated' | 'idle' | 'pooled'>
 }
 
+interface TransactionStatusEvent extends BaseMessageEvent {
+    data: Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'status'>
+}
+
 declare interface Protocol {
+    on(event: 'TransactionStatus', listener: (payload: TransactionStatusEvent) => void): this;
     on(event: 'PeerInfo', listener: (payload: PeerInfoEvent) => void): this;
     on(event: string, listener: (payload: BaseMessageEvent) => void): this;
 }
@@ -44,7 +51,7 @@ class Protocol extends EventEmitter {
     private protocolMessages: Message[] = [
         {
             name: 'PeerInfo',
-            code: 0x09,
+            code: 0x01,
             encode: (info: Pick<IPeerInfo, 'publicAddress'>) => [
                 Buffer.from(info.publicAddress),
             ],
@@ -52,8 +59,39 @@ class Protocol extends EventEmitter {
                 publicAddress: publicAddress.toString(),
             }),
         },
+        {
+            name: 'TransactionStatus',
+            code: 0x02,
+            encode: (transaction: Transaction) => [
+                Buffer.from(transaction.transactionHash),
+
+                Buffer.from(transaction.sourceStatus),
+                Buffer.from(transaction.sourceTransactionHash),
+                transaction.sourceErrors ? transaction.sourceErrors.map((e) => Buffer.from(e)) : [],
+
+                Buffer.from(transaction.targetStatus),
+                Buffer.from(transaction.targetTransactionHash),
+                transaction.targetErrors ? transaction.targetErrors.map((e) => Buffer.from(e)) : [],
+
+                Buffer.from(transaction.status),
+            ],
+            decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, targetStatus, targetTransactionHash, targetErrors, status]: [Buffer, Buffer, Buffer, Buffer[], Buffer, Buffer, Buffer[], Buffer]) => ({
+                transactionHash: transactionHash.toString(),
+
+                sourceStatus: sourceStatus.toString(),
+                sourceTransactionHash: sourceTransactionHash.toString(),
+                sourceErrors: sourceErrors.map((e) => e.toString()),
+
+                targetStatus: targetStatus.toString(),
+                targetTransactionHash: targetTransactionHash.toString(),
+                targetErrors: targetErrors.map((e) => e.toString()),
+
+                status: status.toString(),
+            }),
+        },
     ];
     private signature: SignatureDialProtocol;
+    private transactionStatus: TransactionStatusDialProtocol;
 
 
     start({ libp2p, topic = null, }) {
@@ -73,6 +111,7 @@ class Protocol extends EventEmitter {
         })
 
         this.signature = new SignatureDialProtocol(this.libp2p);
+        this.transactionStatus = new TransactionStatusDialProtocol(this.libp2p);
     }
 
 
@@ -121,6 +160,14 @@ class Protocol extends EventEmitter {
         this.libp2p.pubsub.publish(this.topic, encoded)
     }
 
+    public sendTransaction(transaction: Transaction) {
+        const message = this.protocolMessages.find((m) => m.name === 'TransactionStatus')!
+
+        const encoded = rlp.encode([message.code, message.encode(transaction)]);
+
+        this.libp2p.pubsub.publish(this.topic, encoded)
+    }
+
     async requestSignatures(data: ISignatureRequest, peerIds?: string[]) {
         try {
             peerIds = peerIds || peerPool.activePeerIds;
@@ -133,6 +180,15 @@ class Protocol extends EventEmitter {
             return []
         }
     }
+
+    async requestTransactionStatus(transactionHash: string, peerId: string) {
+        try {
+            return await this.transactionStatus.send(transactionHash, peerId);
+        } catch (error) {
+            console.log(error);
+            return null
+        }
+    }
 }
 
 export const protocol = new Protocol();

package/src/tasks/AutoUpdateTask.ts

@@ -0,0 +1,82 @@
+import { BaseTask } from "./BaseTask";
+import Logger from '@/logger';
+import spawnAsync from 'await-spawn';
+import { spawn } from 'child_process'
+import config from "@/config";
+import wait from "waait";
+import packageJson from "../../package.json";
+
+const currentVersion = packageJson.version;
+const tag = config.staging ? 'dev' : 'latest';
+
+class AutoUpdateTask extends BaseTask {
+    pollIntervalMs: number = 60 * 10 * 1000
+
+    constructor() {
+        super({
+            logger: new Logger("AutoUpdateTask"),
+        })
+    }
+
+    prePollHandler(): boolean {
+        return config.autoUpdate && !config.isLeadNode();
+    }
+
+    async getInstalledVersion() {
+        try {
+            const stdout = await spawnAsync('npm', ['-g', 'ls', '--depth=0', '--json'])
+            return JSON.parse(stdout.toString()).dependencies[packageJson.name].version
+        } catch (error) {
+            this.logger.error(error)
+            return currentVersion
+        }
+    }
+
+    async getLatestVersion() {
+        try {
+            const stdout = await spawnAsync('npm', ['view', `${packageJson.name}@${tag}`, 'version'])
+            return stdout.toString().trim()
+        } catch (error) {
+            this.logger.error(error)
+            return currentVersion
+        }
+    }
+
+    async pollHandler() {
+        const version = await this.getLatestVersion()
+
+        if (version === currentVersion) {
+            return;
+        }
+
+        this.logger.warn(`New version ${version} available.`)
+
+        this.logger.info('Updating...')
+
+        await spawnAsync('npm', ['-g', 'install', `@instadapp/interop-x@${tag}`, '-f']);
+
+        await wait(5000)
+
+        if (version !== await this.getInstalledVersion()) {
+            this.logger.warn(`failed to install ${version}, retrying in 5 minutes`)
+            return;
+        }
+
+        this.logger.warn(`Installed version ${version}`)
+        this.logger.warn(`Restarting...`)
+
+
+        // TODO: its restarting in the bg, but it should be in the fg
+        const subprocess = spawn(process.argv[0], process.argv.slice(1), {
+            cwd: process.cwd(),
+            stdio: "inherit",
+            // shell: process.env.SHELL, 
+        });
+
+        subprocess.unref();
+
+        process.exit()
+    }
+}
+
+export default AutoUpdateTask;

package/src/tasks/BaseTask.ts

@@ -19,6 +19,7 @@ export class BaseTask extends EventEmitter implements IBaseTask {
     started: boolean = false
     pollIntervalMs: number = 10 * 1000
     leadNodeOnly: boolean = false
+    exceptLeadNode: boolean = false
 
     public constructor({ logger }: { logger?: Logger }) {
         super()
@@ -37,7 +38,7 @@ export class BaseTask extends EventEmitter implements IBaseTask {
                     await this.pollHandler()
                 }
             } catch (err) {
-                this.logger.error(`poll check error: ${err.message}\ntrace: ${err.stack}`)
+                this.logger.error(`poll check error:\n${err.message}\ntrace: ${err.stack}`)
             }
 
             await this.postPollHandler()
@@ -45,11 +46,20 @@ export class BaseTask extends EventEmitter implements IBaseTask {
     }
 
     prePollHandler(): boolean {
-        if (!this.leadNodeOnly) {
-            return true
+        if(config.isMaintenanceMode()){
+            this.logger.warn('Maintenance mode is enabled. Skipping task.')
+            return false
         }
 
-        return config.isLeadNode()
+        if (this.exceptLeadNode) {
+            return !config.isLeadNode();
+        }
+
+        if (this.leadNodeOnly) {
+            return config.isLeadNode()
+        }
+
+        return true
     }
 
     async pollHandler() {