diff --git a/packages/assertion-monitor/blockchain.ts b/packages/assertion-monitor/blockchain.ts index 6e47f280..fab55117 100644 --- a/packages/assertion-monitor/blockchain.ts +++ b/packages/assertion-monitor/blockchain.ts @@ -8,7 +8,7 @@ import { type Block, type Log, } from 'viem' -import { ChildNetwork as ChainInfo, sleep } from '../utils' +import { ChildNetwork as ChainInfo, sleep } from 'utils' import { ASSERTION_CONFIRMED_EVENT, ASSERTION_CREATED_EVENT, diff --git a/packages/assertion-monitor/index.ts b/packages/assertion-monitor/index.ts index ce5dfab4..0f0c93d6 100644 --- a/packages/assertion-monitor/index.ts +++ b/packages/assertion-monitor/index.ts @@ -4,7 +4,7 @@ import { ChildNetwork as ChainInfo, DEFAULT_CONFIG_PATH, getConfig, -} from '../utils' +} from 'utils' import { createChildChainClient, fetchChainState, diff --git a/packages/assertion-monitor/monitoring.ts b/packages/assertion-monitor/monitoring.ts index 0c56ef2f..6fe51e0e 100644 --- a/packages/assertion-monitor/monitoring.ts +++ b/packages/assertion-monitor/monitoring.ts @@ -1,4 +1,4 @@ -import { ChildNetwork as ChainInfo } from '../utils' +import { ChildNetwork as ChainInfo } from 'utils' import { BOLD_LOW_BASE_STAKE_ALERT, CHAIN_ACTIVITY_WITHOUT_ASSERTIONS_ALERT, diff --git a/packages/assertion-monitor/package.json b/packages/assertion-monitor/package.json index 7ed6c99c..5c7458cb 100644 --- a/packages/assertion-monitor/package.json +++ b/packages/assertion-monitor/package.json @@ -17,9 +17,9 @@ }, "scripts": { "lint": "eslint .", - "build": "rm -rf ./dist && tsc", + "build": "yarn workspace utils build && rm -rf ./dist && tsc", "format": "prettier './**/*.{js,json,md,yml,sol,ts}' --write && yarn run lint --fix", - "dev": "yarn build && node ./dist/assertion-monitor/main.js", + "dev": "yarn build && node ./dist/main.js", "test": "vitest run __test__/*.test.ts", "test:watch": "vitest watch __test__/*.test.ts" } diff --git a/packages/batch-poster-monitor/index.ts b/packages/batch-poster-monitor/index.ts index 782cea1c..e23d7116 100644 --- a/packages/batch-poster-monitor/index.ts +++ b/packages/batch-poster-monitor/index.ts @@ -34,7 +34,7 @@ import { DEFAULT_CONFIG_PATH, getConfig, getExplorerUrlPrefixes, -} from '../utils' +} from 'utils' import { shouldIgnoreFunctionSelector, isIgnoredSelectorError, @@ -464,7 +464,9 @@ const isAnyTrust = async ( }) } catch (e: any) { console.warn( - `Warning: Failed to check AnyTrust status for chain [${childChainInformation.name}]: ${e?.message || e}` + `Warning: Failed to check AnyTrust status for chain [${ + childChainInformation.name + }]: ${e?.message || e}` ) return false } diff --git a/packages/batch-poster-monitor/package.json b/packages/batch-poster-monitor/package.json index fe210d26..8c8e689f 100644 --- a/packages/batch-poster-monitor/package.json +++ b/packages/batch-poster-monitor/package.json @@ -1,12 +1,12 @@ { "name": "batch-poster-monitor", "version": "1.0.0", - "main": "index.ts", + "main": "dist/index.js", "scripts": { "lint": "eslint .", - "build": "rm -rf ./dist && tsc", + "build": "yarn workspace utils build && rm -rf ./dist && tsc", "format": "prettier './**/*.{js,json,md,yml,sol,ts}' --write && yarn run lint --fix", - "dev": "yarn build && node ./dist/batch-poster-monitor/index.js", + "dev": "yarn build && node ./dist/index.js", "test": "vitest" }, "dependencies": { diff --git a/packages/retryable-monitor/core/redeemRetryable.ts b/packages/retryable-monitor/core/redeemRetryable.ts index 7f170fa8..cb2e723a 100644 --- a/packages/retryable-monitor/core/redeemRetryable.ts +++ b/packages/retryable-monitor/core/redeemRetryable.ts @@ -3,7 +3,7 @@ import { ParentTransactionReceipt, ParentToChildMessageStatus, } from '@arbitrum/sdk' -import { getConfig, DEFAULT_CONFIG_PATH } from '../../utils' +import { getConfig, DEFAULT_CONFIG_PATH } from 'utils' import dotenv from 'dotenv' dotenv.config() diff --git a/packages/retryable-monitor/core/retryableChecker.ts b/packages/retryable-monitor/core/retryableChecker.ts index 26b164b9..27075504 100644 --- a/packages/retryable-monitor/core/retryableChecker.ts +++ b/packages/retryable-monitor/core/retryableChecker.ts @@ -7,7 +7,7 @@ import { ParentTransactionReceipt, ParentToChildMessageStatus, } from '@arbitrum/sdk' -import { ChildNetwork } from '../../utils' +import { ChildNetwork } from 'utils' import { getMessageDeliveredEventData, getDepositInitiatedLogs, diff --git a/packages/retryable-monitor/core/types.ts b/packages/retryable-monitor/core/types.ts index d7043fbe..88c402e2 100644 --- a/packages/retryable-monitor/core/types.ts +++ b/packages/retryable-monitor/core/types.ts @@ -1,4 +1,4 @@ -import { ChildNetwork } from '../../utils' +import { ChildNetwork } from 'utils' import { providers } from 'ethers' // Type for options passed to findRetryables function diff --git a/packages/retryable-monitor/handlers/handleFailedRetryablesFound.ts b/packages/retryable-monitor/handlers/handleFailedRetryablesFound.ts index b51daf31..19ce8e52 100644 --- a/packages/retryable-monitor/handlers/handleFailedRetryablesFound.ts +++ b/packages/retryable-monitor/handlers/handleFailedRetryablesFound.ts @@ -1,5 +1,5 @@ import { BigNumber, ethers, providers } from 'ethers' -import { getExplorerUrlPrefixes } from '../../utils' +import { getExplorerUrlPrefixes } from 'utils' import { OnFailedRetryableFoundParams } from '../core/types' import { reportFailedRetryables } from './reportFailedRetryables' import { syncRetryableToNotion } from './notion/syncRetryableToNotion' diff --git a/packages/retryable-monitor/handlers/notion/alertUntriagedRetraybles.ts b/packages/retryable-monitor/handlers/notion/alertUntriagedRetraybles.ts index 48e82eb7..86ba8909 100644 --- a/packages/retryable-monitor/handlers/notion/alertUntriagedRetraybles.ts +++ b/packages/retryable-monitor/handlers/notion/alertUntriagedRetraybles.ts @@ -1,7 +1,7 @@ import { notionClient, databaseId } from './createNotionClient' import { postSlackMessage } from '../slack/postSlackMessage' import { redeemRetryable } from '../../core/redeemRetryable' -import type { ChildNetwork } from '../../../utils' +import type { ChildNetwork } from 'utils' const formatDate = (iso: string | undefined) => { if (!iso) return '(unknown)' diff --git a/packages/retryable-monitor/handlers/slack/slackMessageFormattingUtils.ts b/packages/retryable-monitor/handlers/slack/slackMessageFormattingUtils.ts index fba50d37..1066432d 100644 --- a/packages/retryable-monitor/handlers/slack/slackMessageFormattingUtils.ts +++ b/packages/retryable-monitor/handlers/slack/slackMessageFormattingUtils.ts @@ -14,8 +14,7 @@ import { ParentChainTicketReport, TokenDepositData, } from '../../core/types' -import { ChildNetwork, getExplorerUrlPrefixes } from '../../../utils' -import { parseAmount } from '../../../utils/amountUtils' +import { ChildNetwork, getExplorerUrlPrefixes, parseAmount } from 'utils' /** * diff --git a/packages/retryable-monitor/index.ts b/packages/retryable-monitor/index.ts index 3932aeea..fddaa246 100644 --- a/packages/retryable-monitor/index.ts +++ b/packages/retryable-monitor/index.ts @@ -7,7 +7,7 @@ import { registerCustomArbitrumNetwork, } from '@arbitrum/sdk' import { FindRetryablesOptions } from './core/types' -import { ChildNetwork, DEFAULT_CONFIG_PATH, getConfig } from '../utils' +import { ChildNetwork, DEFAULT_CONFIG_PATH, getConfig } from 'utils' import { checkRetryablesOneOff, checkRetryablesContinuous, diff --git a/packages/retryable-monitor/package.json b/packages/retryable-monitor/package.json index 4f4c2ca6..f8ecb81f 100644 --- a/packages/retryable-monitor/package.json +++ b/packages/retryable-monitor/package.json @@ -1,7 +1,7 @@ { "name": "retryable-monitor", "version": "1.0.0", - "main": "index.ts", + "main": "dist/retryable-monitor/index.js", "dependencies": { "@arbitrum/nitro-contracts": "v1.1.0-beta.1", "@arbitrum/sdk": "^4.0.0", @@ -17,7 +17,7 @@ }, "scripts": { "lint": "eslint .", - "build": "rm -rf ./dist && tsc", + "build": "yarn workspace utils build && rm -rf ./dist && tsc && find ./dist -name '*.js' -type f -exec sed -i '' \"s/require(['\\\"]\\.\\.\\/\\.\\.\\/utils['\\\"])/require('utils')/g\" {} \\;", "format": "prettier './**/*.{js,json,md,yml,sol,ts}' --write && yarn run lint --fix", "dev": "yarn build && node ./dist/retryable-monitor/index.js" } diff --git a/packages/retryable-monitor/tsconfig.json b/packages/retryable-monitor/tsconfig.json index 1cd2419d..81d14fc1 100644 --- a/packages/retryable-monitor/tsconfig.json +++ b/packages/retryable-monitor/tsconfig.json @@ -1,7 +1,10 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "outDir": "./dist" + "outDir": "./dist", + "paths": { + "utils": ["../utils"] + } }, "include": ["./**/*.ts", "./**/*.d.ts", "packages/*.ts"], "exclude": ["node_modules", "dist/"] diff --git a/packages/utils/index.ts b/packages/utils/index.ts index 3b60136c..770d04f7 100644 --- a/packages/utils/index.ts +++ b/packages/utils/index.ts @@ -3,6 +3,7 @@ export * from './config' export { getExplorerUrlPrefixes } from './getExplorerUrlPrefixes' export { postSlackMessage } from './postSlackMessage' export { createSlackPoster } from './createSlackPoster' +export { parseAmount } from './amountUtils' export const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms)) diff --git a/packages/utils/package.json b/packages/utils/package.json index cde057f3..f354a3c9 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,11 +1,12 @@ { "name": "utils", "version": "1.0.0", - "main": "index.ts", + "main": "dist/index.js", "dependencies": { "@slack/web-api": "^7.0.4" }, "scripts": { - "lint": "eslint ." + "lint": "eslint .", + "build": "rm -rf ./dist && tsc" } -} \ No newline at end of file +}