Add retryable fields to notion (#79)

* add feeRefundAddress, beneficiary and l2CallValue to retryable report

* add feeRefundAddress, beneficiary, retryTo and retryData to failed retryable sync

* update notion sync to add new retryable fields and drop TotalRetryableDeposit

* use L2CallValue and TokensDeposited for total deposit in alerts

* truncate long Notion rich_text fields

Author: mahsamoosavi

packages/retryable-monitor/core/reportGenerator.ts

@@ -54,6 +54,9 @@ export const getChildChainRetryableReport = async ({
     retryData: retryableMessage.messageData.data,
     gasFeeCap: (childChainTx.maxFeePerGas ?? BigNumber.from(0)).toNumber(),
     gasLimit: childChainTx.gasLimit.toNumber(),
+    feeRefundAddress: retryableMessage.messageData.excessFeeRefundAddress,
+    beneficiary: retryableMessage.messageData.callValueRefundAddress,
+    l2CallValue: retryableMessage.messageData.l2CallValue.toString(),
   }
 
   return childChainTicketReport

packages/retryable-monitor/core/types.ts

@@ -47,6 +47,9 @@ export interface ChildChainTicketReport {
   retryData: string
   gasFeeCap: number
   gasLimit: number
+  l2CallValue?: string       
+  feeRefundAddress?: string  
+  beneficiary?: string 
 }
 
 export interface TokenDepositData {
@@ -75,9 +78,11 @@ export interface OnRetryableFoundParams {
     gasPriceProvided: string
     gasPriceAtCreation?: string
     gasPriceNow: string
-    l2CallValue: string
-    createdAt?: number
-    decision?: string
+    l2CallValue?: string 
+    feeRefundAddress?: string
+    beneficiary?: string
+    retryTo?: string
+    retryData?: string
     botRedemptionStatus?: string
 
   }

packages/retryable-monitor/handlers/handleFailedRetryablesFound.ts

@@ -85,13 +85,17 @@ export const handleFailedRetryablesFound = async (
       status: childChainRetryableReport.status,
       chainId: childChain.chainId,
       chain: childChain.name,
+      decision: 'Triage',
       metadata: {
         tokensDeposited: formattedTokenString,
         gasPriceProvided,
         gasPriceAtCreation,
         gasPriceNow,
         l2CallValue: l2CallValueFormatted,
-        decision: 'Triage',
+        feeRefundAddress: childChainRetryableReport.feeRefundAddress,
+        beneficiary: childChainRetryableReport.beneficiary,
+        retryTo: childChainRetryableReport.retryTo,
+        retryData: childChainRetryableReport.retryData,
       },
     })
   }

packages/retryable-monitor/handlers/notion/alertUntriagedRetraybles.ts

@@ -69,12 +69,12 @@ export const alertUntriagedNotionRetryables = async (
     const parentTx =
       props?.ParentTx?.rich_text?.[0]?.text?.content || '(unknown)'
 
-    const ethDeposit =
-      props?.TotalRetryableDeposit?.rich_text?.[0]?.text?.content || ''
+    const l2CallValue = props?.L2CallValue?.rich_text?.[0]?.text?.content || ''
     const tokenDeposit =
       props?.TokensDeposited?.rich_text?.[0]?.text?.content || ''
+
     const deposit =
-      [ethDeposit, tokenDeposit]
+      [l2CallValue, tokenDeposit]
         .filter(s => s && s !== '0.0 ETH ($0.00)')
         .join(' and ') || '(unknown)'
 

packages/retryable-monitor/handlers/notion/syncRetryableToNotion.ts

@@ -7,6 +7,16 @@ import { getTokenPrice } from '../slack/slackMessageFormattingUtils'
 import { parseAmount } from '../../../utils/amountUtils'
 
 const databaseId = process.env.RETRYABLE_MONITORING_NOTION_DB_ID!
+const NOTION_RICH_TEXT_MAX = 2000
+function truncateForNotion(
+  s: string,
+  max = NOTION_RICH_TEXT_MAX,
+  suffix = '...[truncated]'
+) {
+  if (!s) return s
+  const hard = max - suffix.length
+  return s.length > hard ? s.slice(0, hard) + suffix : s
+}
 
 async function buildTokensDepositedDisplay(metadata: any): Promise<string> {
   if (
@@ -61,7 +71,7 @@ export async function syncRetryableToNotion(
 
     const isRetryableFoundInNotion = search.results.length > 0
 
-    const rawCreatedAt = metadata?.createdAt ?? createdAt
+    const rawCreatedAt = createdAt
     const createdAtMs =
       rawCreatedAt > 1e14
         ? Math.floor(rawCreatedAt / 1000)
@@ -99,8 +109,34 @@ export async function syncRetryableToNotion(
       notionProps['GasPriceNow'] = {
         rich_text: [{ text: { content: metadata.gasPriceNow } }],
       }
-      notionProps['TotalRetryableDeposit'] = {
-        rich_text: [{ text: { content: metadata.l2CallValue } }],
+
+      if (metadata.l2CallValue) {
+        notionProps['L2CallValue'] = {
+          rich_text: [{ text: { content: metadata.l2CallValue } }],
+        }
+      }
+
+      if (metadata.feeRefundAddress) {
+        notionProps['FeeRefundAddress'] = {
+          rich_text: [{ text: { content: metadata.feeRefundAddress } }],
+        }
+      }
+      if (metadata.beneficiary) {
+        notionProps['Beneficiary'] = {
+          rich_text: [{ text: { content: metadata.beneficiary } }],
+        }
+      }
+      if (metadata.retryTo) {
+        notionProps['RetryTo'] = {
+          rich_text: [{ text: { content: metadata.retryTo } }],
+        }
+      }
+      if (metadata.retryData) {
+        notionProps['RetryData'] = {
+          rich_text: [
+            { text: { content: truncateForNotion(metadata.retryData, 1950) } },
+          ],
+        }
       }
 
       const tokensDepositedDisplay = await buildTokensDepositedDisplay(metadata)
@@ -151,9 +187,9 @@ export async function syncRetryableToNotion(
           }
         }
 
-        if (!currentDecision && metadata?.decision) {
+        if (!currentDecision && input.decision) {
           executedProps['Decision'] = {
-            select: { name: metadata.decision },
+            select: { name: input.decision },
           }
         }
 
@@ -175,9 +211,9 @@ export async function syncRetryableToNotion(
       notionProps['Status'] = { select: { name: status } }
 
       // Only set Decision if it's missing
-      if (!currentDecision && metadata?.decision) {
+      if (!currentDecision && input.decision) {
         notionProps['Decision'] = {
-          select: { name: metadata.decision },
+          select: { name: input.decision },
         }
       }
 
@@ -199,8 +235,8 @@ export async function syncRetryableToNotion(
       properties: {
         ChildTx: { title: [{ text: { content: ChildTx } }] },
         Status: { select: { name: status } },
-        ...(metadata?.decision
-          ? { Decision: { select: { name: metadata.decision } } }
+        ...(input.decision
+          ? { Decision: { select: { name: input.decision } } }
           : {}),
         ...(metadata?.botRedemptionStatus
           ? {