log blacklisted jobs to explorer

powerpool-finance · Nov 3, 2023 · 16b744f · 16b744f
1 parent 1c19ee6
commit 16b744f
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 13 deletions.
diff --git a/app/Types.ts b/app/Types.ts
@@ -231,6 +231,7 @@ export interface Executor {
   push(key: string, tx: TxEnvelope);
   sendBlockDelayLog(agent: IAgent, delay, blockNumber);
   sendNewBlockDelayLog(agent: IAgent, delay, blockNumber);
+  sendAddBlacklistedJob(agent: IAgent, jobKey, errMessage);
 }
 
 export interface ClientWrapper {
@@ -400,7 +401,7 @@ export interface IAgent {
 
   exitIfStrictTopic(topic): void;
 
-  addJobToBlacklist(jobKey);
+  addJobToBlacklist(jobKey, errMessage);
 
   getIsAgentUp(): boolean;
 

diff --git a/app/agents/AbstractAgent.ts b/app/agents/AbstractAgent.ts
@@ -305,9 +305,10 @@ export abstract class AbstractAgent implements IAgent {
     this.network.exitIfStrictTopic(topic);
   }
 
-  public addJobToBlacklist(jobKey) {
-    this.clog('info', `addJobToBlacklist: ${jobKey}`);
+  public addJobToBlacklist(jobKey, errMessage) {
+    this.clog('info', `addJobToBlacklist: ${jobKey}, errMessage ${errMessage}`);
     this.blacklistedJobs.add(jobKey);
+    this.executor.sendAddBlacklistedJob(this, jobKey, errMessage);
   }
 
   public getJobOwnerBalance(address: string): BigNumber {

diff --git a/app/executors/AbstractExecutor.ts b/app/executors/AbstractExecutor.ts
@@ -142,22 +142,22 @@ export abstract class AbstractExecutor {
     }
     this.lastDelaySentAtMs = this.network.nowMs();
 
-    return this.logBlockDelay(agent, delay, blockNumber);
+    return this.logBlockDelay(agent, delay, blockNumber, false);
   }
 
   async sendNewBlockDelayLog(agent: IAgent, delay, blockNumber) {
-    return this.logBlockDelay(agent, delay, blockNumber);
+    return this.logBlockDelay(agent, delay, blockNumber, true);
   }
 
-  async logBlockDelay(agent: IAgent, delay, blockNumber) {
+  async logBlockDelay(agent: IAgent, delay, blockNumber, isNotEmitted) {
     const types = {
       Mail: [{ name: 'metadataJson', type: 'string' }],
     };
     const networkStatusObj = this.network.getStatusObjectForApi();
     const blockData = {
       metadataJson: JSON.stringify({
         delay,
-        isNotEmitted: true,
+        isNotEmitted,
         keeperId: agent.keeperId,
         rpc: networkStatusObj['rpc'],
         rpcClient: await this.network.getClientVersion(),
@@ -172,4 +172,28 @@ export abstract class AbstractExecutor {
     const txLogEndpoint = process.env.TX_LOG_ENDPOINT || 'https://tx-log.powerpool.finance';
     return axios.post(`${txLogEndpoint}/log-block-delay`, { blockData, signature, signatureVersion: 1 });
   }
+
+  async sendAddBlacklistedJob(agent: IAgent, jobKey, errorMessage) {
+    const types = {
+      Mail: [{ name: 'metadataJson', type: 'string' }],
+    };
+    const networkStatusObj = this.network.getStatusObjectForApi();
+    const blockData = {
+      metadataJson: JSON.stringify({
+        jobKey,
+        errorMessage,
+        keeperId: agent.keeperId,
+        rpc: networkStatusObj['rpc'],
+        rpcClient: await this.network.getClientVersion(),
+        blockNumber: networkStatusObj.latestBlockNumber,
+        agent: agent.address.toLowerCase(),
+        chainId: networkStatusObj['chainId'],
+        appVersion: this.network.getAppVersion(),
+        appEnv: process.env.APP_ENV,
+      }),
+    };
+    const signature = await this.workerSigner._signTypedData({}, types, blockData);
+    const txLogEndpoint = process.env.TX_LOG_ENDPOINT || 'https://tx-log.powerpool.finance';
+    return axios.post(`${txLogEndpoint}/log-blacklist-job`, { blockData, signature, signatureVersion: 1 });
+  }
 }
diff --git a/app/executors/FlashbotsExecutor.ts b/app/executors/FlashbotsExecutor.ts
@@ -69,7 +69,12 @@ export class FlashbotsExecutor extends AbstractExecutor implements Executor {
       let txSimulation;
       try {
         txSimulation = await this.genericProvider.call(prepareTx(tx));
-        printSolidityCustomError(this.clog.bind(this), this.agentContract.decodeError.bind(this.agentContract), txSimulation, tx.data as string);
+        printSolidityCustomError(
+          this.clog.bind(this),
+          this.agentContract.decodeError.bind(this.agentContract),
+          txSimulation,
+          tx.data as string,
+        );
       } catch (e) {
         this.clog('error', 'TX node simulation error', e);
       }

diff --git a/app/executors/PGAExecutor.ts b/app/executors/PGAExecutor.ts
@@ -62,7 +62,12 @@ export class PGAExecutor extends AbstractExecutor implements Executor {
         envelope.executorCallbacks.txEstimationFailed(e, tx.data as string);
         return callback(this.err(`gasLimitEstimation failed with error: ${e.message}`));
       }
-      printSolidityCustomError(this.clog.bind(this), this.agentContract.decodeError.bind(this.agentContract), txSimulation, tx.data as string);
+      printSolidityCustomError(
+        this.clog.bind(this),
+        this.agentContract.decodeError.bind(this.agentContract),
+        txSimulation,
+        tx.data as string,
+      );
 
       envelope.executorCallbacks.txEstimationFailed(e, tx.data as string);
 
@@ -190,25 +195,26 @@ export class PGAExecutor extends AbstractExecutor implements Executor {
         confirmedAtBlockDateTime: new Date(parseInt(this.network.getLatestBlockTimestamp().toString()) * 1000),
       };
     }
+    const chainId = networkStatusObj['chainId'];
     const txData = {
       transactionJson: JSON.stringify(prepareTx(transaction)),
       metadataJson: JSON.stringify({
         appEnv: process.env.APP_ENV,
         appVersion: this.network.getAppVersion(),
         baseFeeGwei: weiValueToGwei(networkStatusObj['baseFee']),
         maxPriorityFeeGwei: weiValueToGwei(BigInt(await this.network.getMaxPriorityFeePerGas().catch(() => 0))),
-        chainId: networkStatusObj['chainId'],
         keeperId: agent ? agent.keeperId : null,
         rpc: networkStatusObj['rpc'],
         rpcClient: await this.network.getClientVersion(),
         resendCount,
+        chainId,
         txHash,
         prevTxHash,
         ...timeData,
       }),
     };
     const signature = await this.workerSigner._signTypedData({}, types, txData);
-    const txLogEndpoint = process.env.TX_LOG_ENDPOINT || 'https://tx-log.powerpool.finance';
+    const txLogEndpoint = process.env.TX_LOG_ENDPOINT || 'https://tx-log.powerpool.finance'; // TODO: add ${chainId}.
     return axios.post(`${txLogEndpoint}/log-transaction`, { txData, signature, signatureVersion: 1 });
   }
 }
diff --git a/app/jobs/RandaoJob.ts b/app/jobs/RandaoJob.ts
@@ -182,7 +182,7 @@ export class RandaoJob extends AbstractJob {
 
       if (this.failedInitiateSlashingEstimationsInARow > this.BLACKLIST_ESTIMATIONS_LIMIT) {
         this.applyClearResolverTimeouts();
-        this.agent.addJobToBlacklist(this.key);
+        this.agent.addJobToBlacklist(this.key, err.message);
         this.failedInitiateSlashingEstimationsInARow = 0;
       } else {
         this._unlockInitiateSlashing();
@@ -311,7 +311,7 @@ export class RandaoJob extends AbstractJob {
       // Assume that a failed execution behaviour is equal to a failed estimation
       this.failedExecuteEstimationsInARow += 1;
       if (this.failedExecuteEstimationsInARow > this.BLACKLIST_ESTIMATIONS_LIMIT) {
-        this.agent.addJobToBlacklist(this.key);
+        this.agent.addJobToBlacklist(this.key, err.message);
         this.failedExecuteEstimationsInARow = 0;
       }
     }