Merge pull request #1080 from TempleDAO/stage

stage -> main

.github/workflows/dapp-tests.yaml

@@ -11,18 +11,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
         with:
           node-version: '20'
-          cache: 'yarn'
-      - uses: actions/cache@v3
-        with:
-          path: './node_modules'
-          key: ${{ runner.os }}-modules-${{ hashFiles('yarn.lock') }}
-      - uses: actions/cache@v3
+      - name: Cache Dependencies
+        uses: actions/cache@v3
         with:
           path: 'apps/dapp/node_modules'
           key: ${{ runner.os }}-modules-${{ hashFiles('apps/dapp/yarn.lock') }}
-      - run: yarn install
-      - run: NODE_OPTIONS="--max_old_space_size=4096" yarn build
+      - name: Install Dependencies
+        run: yarn install
+        working-directory: apps/dapp
+      - name: Build
+        run: NODE_OPTIONS="--max_old_space_size=4096" yarn build
         working-directory: apps/dapp

apps/automation-v2/package.json

@@ -15,7 +15,7 @@
     "local-fork:mainnet-test:tlc": "(cd ../../protocol && forge script --fork-url http://127.0.0.1:8545 scripts/deploys/localhost/v2/999-localhost-tlc-mainnet-test.s.sol)"
   },
   "dependencies": {
-    "@mountainpath9/overlord": "^0.8.1",
+    "@mountainpath9/overlord": "0.13.1",
     "axios": "^1.5.1",
     "date-fns": "^2.30.0",
     "discord.js": "^14.13.0",

apps/automation-v2/src/common/discord.ts

@@ -1,4 +1,5 @@
-import { Logger, TaskContext, TaskException } from '@mountainpath9/overlord';
+import { ERROR_INTERFACES } from '@/utils/ethers-exceptions';
+import { Logger, TaskContext, TaskException, logTaskException, mapParsedEthersException } from '@mountainpath9/overlord';
 import { WebhookClient, MessageCreateOptions } from 'discord.js';
 
 interface DiscordChannel {
@@ -32,12 +33,19 @@ export function decodeWebhookUrl(url: string): { id: string; token: string } {
   return { id: m[1], token: m[2] };
 }
 
-export async function discordNotifyTaskException(ctx: TaskContext, te: TaskException) {
+export async function discordNotifyTaskException(ctx: TaskContext, te0: TaskException) {
+  // Map custom errors for our contracts to be human readable
+  const te = { ...te0, exception: mapParsedEthersException(te0.exception, ERROR_INTERFACES) };
+
+  // Log failure to overlord
+  await logTaskException(ctx, te);
+
+  const tsyOpsRoleId = await ctx.config.getString(DISCORD_TSY_OPS_ROLE_ID_KEY);
   const content = [
+    `<@&${tsyOpsRoleId}>`, // discord role id to be tagged
     `**TEMPLE Task Failed**`,
     `task label: ${te.label}`,
     `task id: ${te.taskId}`,
-    `task phase: ${te.phase}`,
   ];
 
   if (te.exception instanceof Error) {
@@ -63,3 +71,4 @@ const DISCORD_URL_RE = new RegExp(
 
 export const DISCORD_WEBHOOK_URL_KEY = 'temple_tlc_discord_webhook_url';
 export const DISCORD_WEBHOOK_ERROR_URL_KEY = 'temple_tlc_discord_error_webhook_url';
+export const DISCORD_TSY_OPS_ROLE_ID_KEY = 'temple_tlc_discord_tsy_ops_role_id';

apps/automation-v2/src/config/prodnets.ts

@@ -9,8 +9,8 @@ const TLC_BATCH_LIQUIDATE_CONFIG: TlcBatchLiquidateConfig = {
   ACC_LIQ_MAX_CHUNK_NO: 100,
   MIN_ETH_BALANCE_WARNING: parseEther('0.1'),
   GAS_LIMIT: 1_000_000n,
-  SUBGRAPH_URL: 'https://api.thegraph.com/subgraphs/name/templedao/templedao-tlc-liquidations',
-  SUBGRAPH_ALCHEMY_URL: 'https://subgraph.satsuma-prod.com/a912521dd162/templedao/tlc-liquidations-mainnet/api',
+  SUBGRAPH_URL:
+    'https://subgraph.satsuma-prod.com/a912521dd162/templedao/tlc-liquidations-mainnet/api',
   SUBGRAPH_RETRY_LIMIT: 3,
 };
 

apps/automation-v2/src/config/testnets.ts

@@ -10,7 +10,6 @@ const TLC_BATCH_LIQUIDATE_CONFIG: TlcBatchLiquidateConfig = {
   MIN_ETH_BALANCE_WARNING: parseEther('0.1'),
   GAS_LIMIT: 1_000_000n,
   SUBGRAPH_URL: 'https://thegraph.com/hosted-service/subgraph/medariox/tlc-liquidations-sepolia',
-  SUBGRAPH_ALCHEMY_URL: '',
   SUBGRAPH_RETRY_LIMIT: 3,
 };
 

apps/automation-v2/src/tlc/batch-liquidate.ts

@@ -19,7 +19,6 @@ import { subgraphRequest } from '@/subgraph/subgraph-request';
 import { GetUserResponse } from '@/subgraph/types';
 import { matchAndDecodeEvent } from '@/common/filters';
 import { backOff } from 'exponential-backoff';
-import { AxiosResponse } from 'axios';
 
 export interface TlcBatchLiquidateConfig {
   CHAIN: Chain;
@@ -29,7 +28,6 @@ export interface TlcBatchLiquidateConfig {
   MIN_ETH_BALANCE_WARNING: bigint;
   GAS_LIMIT: bigint;
   SUBGRAPH_URL: string;
-  SUBGRAPH_ALCHEMY_URL: string;
   SUBGRAPH_RETRY_LIMIT: number;
 }
 
@@ -64,23 +62,12 @@ export async function batchLiquidate(
     return chunk;
   };
 
-  let res: AxiosResponse<GetUserResponse> | undefined = undefined;
-  const randomUrlFirstAlchemyApi = Math.random() < 0.5;
-  try {
-    // try first random subgraph api endpoint
-    res = await getTlcUsers(
-      ctx,
-      randomUrlFirstAlchemyApi ? config.SUBGRAPH_ALCHEMY_URL : config.SUBGRAPH_URL,
-      config.SUBGRAPH_RETRY_LIMIT
-    );
-  } catch (e) {
-    // if first fails, try the second endpoint option
-    res = await getTlcUsers(
-      ctx,
-      randomUrlFirstAlchemyApi ? config.SUBGRAPH_URL : config.SUBGRAPH_ALCHEMY_URL,
-      config.SUBGRAPH_RETRY_LIMIT
-    );
-  }
+  // try first random subgraph api endpoint
+  const res = await getTlcUsers(
+    ctx,
+    config.SUBGRAPH_URL,
+    config.SUBGRAPH_RETRY_LIMIT
+  );
 
   const tlcUsers = res.data.data?.tlcUsers;
   ctx.logger.info(`tlcUsers to check: ${JSON.stringify(tlcUsers)}`);

apps/automation-v2/src/utils/ethers-exceptions.ts

@@ -0,0 +1,42 @@
+import { CallExceptionError, EthersError, Interface } from "ethers";
+import { ITempleLineOfCredit__factory } from "../typechain";
+
+/// Given evm custom errors as per the specified interfaces, attempt to parse
+/// an ethers CallException, if successful throw a new error that decodes the custom
+/// error.
+///
+/// Otherwise, just rethrow the original exception
+///
+/// TODO: once stablised, bake this into the overlord TransactionManager
+
+export async function throwParsedEthersError(e: unknown, errorInterfaces: Interface[]): Promise<never> {
+  throw mapParsedEthersException(e, errorInterfaces);
+}
+
+export function mapParsedEthersException(e: unknown, errorInterfaces: Interface[]): unknown {
+  if ((e as EthersError).code !== "CALL_EXCEPTION") {
+    // Rethrow anything that is not an ethers call exception
+    return e;
+  }
+  const callExceptionError = e as CallExceptionError;
+  const data = callExceptionError.data;
+  if (data === null || data.length === 0 || data === '0x') {
+    return e;
+  }
+
+  for (const ei of errorInterfaces) {
+    const err = ei.parseError(data);
+    if (err) {
+      const args = err.args.toArray().map(v => v.toString());
+      return new Error(`CALL_EXCEPTION: ${err.signature} ${args}\nCause: ${e}`);
+    }
+  }
+  return e;
+}
+
+
+export const ERROR_INTERFACES: Interface[] = [
+  ITempleLineOfCredit__factory.createInterface(),
+];
+
+

apps/automation-v2/tsconfig.json

@@ -12,7 +12,8 @@
       "forceConsistentCasingInFileNames": true,
       "paths": {
         "@/*": ["./src/*"]
-      }
+      },
+      "skipLibCheck": true,
     },
     "include": ["./src"]
 }