more work on imports, prettier sort order

Author: apexearth

.prettierrc

@@ -3,9 +3,17 @@
   "trailingComma": "all",
   "tabWidth": 2,
   "semi": false,
-  "importOrder": ["^@core/(.*)$", "^@server/(.*)$", "^@ui/(.*)$", "^[./]"],
+  "importOrder": [
+    "<THIRD_PARTY_MODULES>",
+    "^@",
+    "^[./]"
+  ],
   "importOrderSeparation": true,
   "importOrderSortSpecifiers": true,
-  "importOrderParserPlugins": ["typescript", "decorators-legacy"],
-  "plugins": ["@trivago/prettier-plugin-sort-imports"]
+  "importOrderParserPlugins": [
+    "typescript"
+  ],
+  "plugins": [
+    "@trivago/prettier-plugin-sort-imports"
+  ]
 }

dev.env

@@ -1,3 +1,4 @@
+TS_NODE_BASEURL=./lib
 DB_NAME=squid
 DB_PORT=23798
 GQL_PORT=4350

package-lock.json

@@ -18,7 +18,10 @@ deploy:
       cmd: [ "sqd", "process:ousd:prod" ]
       env:
         RPC_ENV: RPC_ENDPOINT_RETH
+        TS_NODE_BASEURL: './lib'
   api:
+    env:
+      TS_NODE_BASEURL: './lib'
     cmd:
       - npx
       - squid-graphql-server

squid-ousd.yaml

@@ -22,19 +22,25 @@ deploy:
       cmd: [ "sqd", "process:arbitrum:prod" ]
       env:
         RPC_ENV: RPC_ENDPOINT_RETH
+        TS_NODE_BASEURL: './lib'
     - name: oeth-processor
       cmd: [ "sqd", "process:oeth:prod" ]
       env:
         RPC_ENV: RPC_ENDPOINT_RETH
+        TS_NODE_BASEURL: './lib'
     - name: ogv-processor
       cmd: [ "sqd", "process:ogv:prod" ]
       env:
         RPC_ENV: RPC_ENDPOINT_RETH
+        TS_NODE_BASEURL: './lib'
     - name: other-processor
       cmd: [ "sqd", "process:mainnet:prod" ]
       env:
         RPC_ENV: RPC_ENDPOINT_RETH
+        TS_NODE_BASEURL: './lib'
   api:
+    env:
+      TS_NODE_BASEURL: './lib'
     cmd:
       - npx
       - squid-graphql-server

squid.yaml

@@ -1,8 +1,10 @@
+import 'tsconfig-paths/register'
 import { arbitrum } from 'viem/chains'
+ 
+import { run } from '@processor'
 
 import { erc20 } from './arbitrum'
 import { ccip } from './oeth/processors/ccip'
-import { run } from './processor'
 
 export const processor = {
   chainId: arbitrum.id,

src/main-arbitrum.ts

@@ -1,9 +1,11 @@
+import 'tsconfig-paths/register'
+
+import { run } from '@processor'
 import * as exchangeRates from '@shared/post-processors/exchange-rates'
 import { processStatus } from '@templates/processor-status'
 
 import { erc20s } from './mainnet/processors/erc20s'
 import * as validate from './mainnet/validators/validate-shared'
-import { run } from './processor'
 
 export const processor = {
   stateSchema: 'mainnet-processor',

src/main-mainnet.ts

@@ -1,3 +1,6 @@
+import 'tsconfig-paths/register'
+
+import { run } from '@processor'
 import * as exchangeRatesPostProcessor from '@shared/post-processors/exchange-rates'
 import { processStatus } from '@templates/processor-status'
 
@@ -13,7 +16,6 @@ import * as morphoAave from './oeth/processors/morpho-aave'
 import * as strategies from './oeth/processors/strategies'
 import * as vault from './oeth/processors/vault'
 import * as validateOeth from './oeth/validators/validate-oeth'
-import { run } from './processor'
 
 export const processor = {
   stateSchema: 'oeth-processor',

src/main-oeth.ts

@@ -1,10 +1,12 @@
+import 'tsconfig-paths/register'
+
+import { run } from '@processor'
 import { processStatus } from '@templates/processor-status'
 
 import * as dailyStats from './ogv/post-processors/daily-stats'
 import * as governance from './ogv/post-processors/governance'
 import * as ogv from './ogv/processors/ogv'
 import * as ogvSupply from './ogv/processors/ogv-supply'
-import { run } from './processor'
 
 export const processor = {
   stateSchema: 'ogv-processor',

src/main-ogv.ts

@@ -1,3 +1,6 @@
+import 'tsconfig-paths/register'
+
+import { run } from '@processor'
 import * as exchangeRates from '@shared/post-processors/exchange-rates'
 import { processStatus } from '@templates/processor-status'
 
@@ -7,7 +10,6 @@ import { erc20s } from './ousd/processors/erc20s'
 import * as ousd from './ousd/processors/ousd'
 import * as strategies from './ousd/processors/strategies/strategies'
 import * as validateOusd from './ousd/validators/validate-ousd'
-import { run } from './processor'
 
 export const processor = {
   stateSchema: 'ousd-processor',

src/main-ousd.ts

@@ -1,12 +1,16 @@
+import 'tsconfig-paths/register'
+
+import { run } from '@processor'
+
 import arbitrum from './main-arbitrum'
 import mainnet from './main-mainnet'
 import oeth from './main-oeth'
 import ogv from './main-ogv'
-import ousd from './main-ousd'
-import { run } from './processor'
+
+// import ousd from './main-ousd'
 
 run(mainnet)
 run(arbitrum)
 run(oeth)
-// run(ogv)
+run(ogv)
 // run(ousd)

src/main.ts

@@ -5,9 +5,8 @@ import {
   createBalancerProcessor,
   createBalancerSetup,
 } from '@templates/balancer'
-import { tokens } from '@utils/addresses'
 
-import { Context } from '../../../processor'
+import { Context } from '@processor'
 
 const ousdResetFrom = 11585978
 const oethDeployFrom = 16933090

src/mainnet/processors/balancer/balancer.ts

@@ -5,7 +5,7 @@ import {
   createCurveSetup,
 } from '@templates/curve'
 
-import { Context } from '../../../processor'
+import { Context } from '@processor'
 
 const ousdResetFrom = 11585978
 const oethDeployFrom = 16933090

src/mainnet/processors/curve/curve.ts

@@ -1,6 +1,6 @@
 import { LiquiditySource, LiquiditySourceType } from '@model'
 
-import { Context } from '../../processor'
+import { Context } from '@processor'
 
 const sources = new Map<string, LiquiditySource>()
 

src/mainnet/processors/liquidity-sources.ts

@@ -4,9 +4,8 @@ import {
   createMaverickProcessor,
   createMaverickSetup,
 } from '@templates/maverick'
-import { tokens } from '@utils/addresses'
 
-import { Context } from '../../processor'
+import { Context } from '@processor'
 
 const oethDeployFrom = 16933090
 

src/mainnet/processors/maverick.ts

@@ -1,16 +1,10 @@
 import { NativeBalance } from '@model'
 import { EvmBatchProcessor } from '@subsquid/evm-processor'
-import {
-  OETH_VAULT_ADDRESS,
-  OUSD_VAULT_ADDRESS,
-  oethStrategyArray,
-  ousdStrategyArray,
-} from '@utils/addresses'
 import { blockFrequencyUpdater } from '@utils/blockFrequencyUpdater'
 import { getNativeBalances } from '@utils/nativeBalance'
 import { minBy } from 'lodash'
 
-import { Context } from '../../processor'
+import { Context } from '@processor'
 
 /**
  * We end up with a lot of initial 0 balance entities.

src/mainnet/processors/native.ts

@@ -5,7 +5,7 @@ import { jsonify } from '@utils/jsonify'
 import assert from 'assert'
 import { sortBy } from 'lodash'
 
-import { Block, Context } from '../../processor'
+import { Block, Context } from '@processor'
 
 export const name = 'validate-shared'
 

src/mainnet/validators/validate-shared.ts

@@ -26,7 +26,7 @@ import {
   MoreThanOrEqual,
 } from 'typeorm'
 
-import { Context } from '../../../processor'
+import { Context } from '@processor'
 
 dayjs.extend(utc)
 

src/oeth/post-processors/daily-stats/daily-stats.ts

@@ -2,13 +2,13 @@ import * as balancerMetaPoolStrategy from '@abi/balancer-meta-pool-strategy'
 import * as metaStablePool from '@abi/balancer-meta-stable-pool'
 import * as baseRewardPool4626 from '@abi/base-reward-pool-4626'
 import { OETHBalancerMetaPoolStrategy } from '@model'
+import { Context } from '@processor'
 import { ensureExchangeRates } from '@shared/post-processors/exchange-rates'
 import { EvmBatchProcessor } from '@subsquid/evm-processor'
 import { getBalancerStrategyHoldings } from '@templates/strategy/strategy-balancer'
 import { RETH_ADDRESS, WETH_ADDRESS } from '@utils/addresses'
 import { getLatestEntity } from '@utils/utils'
 
-import { Context } from '../../processor'
 import { oethStrategies } from './strategies'
 
 const strategyDeployBlock = 18156219

src/oeth/processors/balancer-meta-pool.ts

@@ -6,7 +6,7 @@ import { BridgeTransfer, BridgeTransferState } from '@model'
 import { EvmBatchProcessor } from '@subsquid/evm-processor'
 import { logFilter } from '@utils/logFilter'
 
-import { Context } from '../../processor'
+import { Context } from '@processor'
 
 // Code Reference: https://github.com/smartcontractkit/smart-contract-examples/tree/main/ccip-offchain
 // https://github.com/smartcontractkit/smart-contract-examples/blob/main/ccip-offchain/typescript/src/get-status.ts

src/oeth/processors/ccip.ts

@@ -10,7 +10,7 @@ import {
 import { getLatestEntity } from '@utils/utils'
 import { pad } from 'viem'
 
-import { Context } from '../../processor'
+import { Context } from '@processor'
 
 interface ProcessResult {
   curveLPs: OETHCurveLP[]

src/oeth/processors/curve-lp.ts

@@ -7,7 +7,7 @@ import { OETH_DRIPPER_ADDRESS, WETH_ADDRESS } from '@utils/addresses'
 import { getLatestEntity, trackAddressBalances } from '@utils/utils'
 import { pad } from 'viem'
 
-import { Context } from '../../processor'
+import { Context } from '@processor'
 
 interface ProcessResult {
   drippers: OETHDripper[]

src/oeth/processors/dripper.ts

@@ -2,7 +2,7 @@ import { ensureExchangeRates } from '@shared/post-processors/exchange-rates'
 import { EvmBatchProcessor } from '@subsquid/evm-processor'
 import { blockFrequencyUpdater } from '@utils/blockFrequencyUpdater'
 
-import { Context } from '../../processor'
+import { Context } from '@processor'
 
 export const from = 16933090 // OETH Deploy
 

src/oeth/processors/exchange-rates.ts

@@ -5,7 +5,7 @@ import { EvmBatchProcessor } from '@subsquid/evm-processor'
 import { OETH_FRAX_STAKING_ADDRESS, SFRXETH_ADDRESS } from '@utils/addresses'
 import { pad } from 'viem'
 
-import { Context } from '../../processor'
+import { Context } from '@processor'
 
 interface ProcessResult {
   fraxStakings: OETHFraxStaking[]

src/oeth/processors/frax-staking.ts

@@ -6,7 +6,7 @@ import { EvmBatchProcessor } from '@subsquid/evm-processor'
 import { OETH_MORPHO_AAVE_ADDRESS, WETH_ADDRESS } from '@utils/addresses'
 import { pad } from 'viem'
 
-import { Context } from '../../processor'
+import { Context } from '@processor'
 
 interface ProcessResult {
   morphoAaves: OETHMorphoAave[]

src/oeth/processors/morpho-aave.ts

@@ -21,7 +21,7 @@ import {
   addresses,
 } from '@utils/addresses'
 
-import { Context } from '../../../processor'
+import { Context } from '@processor'
 
 export const oethStrategies: readonly IStrategyData[] = [
   {

src/oeth/processors/strategies/strategies.ts

@@ -14,7 +14,7 @@ import {
 import { getLatestEntity, trackAddressBalances } from '@utils/utils'
 import { pad } from 'viem'
 
-import { Context } from '../../processor'
+import { Context } from '@processor'
 
 interface ProcessResult {
   vaults: OETHVault[]

src/oeth/processors/vault.ts

@@ -12,7 +12,7 @@ import { jsonify } from '@utils/jsonify'
 import assert from 'assert'
 import { sortBy } from 'lodash'
 
-import { Block, Context } from '../../../processor'
+import { Block, Context } from '@processor'
 
 export const name = 'validate-oeth'
 

src/oeth/validators/validate-oeth/validate-oeth.ts

@@ -9,7 +9,7 @@ import {
   MoreThanOrEqual,
 } from 'typeorm'
 
-import { Context } from '../../processor'
+import { Context } from '@processor'
 
 dayjs.extend(utc)
 

src/ogv/post-processors/daily-stats.ts

@@ -13,7 +13,7 @@ import { GOVERNANCE_ADDRESS } from '@utils/addresses'
 import { env } from '@utils/env'
 import { formatEther } from 'viem'
 
-import { Block, Context, Log } from '../../processor'
+import { Block, Context, Log } from '@processor'
 
 export const from = 15491391 // https://etherscan.io/tx/0x0e04e429248c384e6b36229edf8eb5a77bec7023c58808c21b702edfcbc0e0d6
 

src/ogv/post-processors/governance.ts

@@ -4,7 +4,7 @@ import { EvmBatchProcessor } from '@subsquid/evm-processor'
 import { OGV_ADDRESS, VEOGV_ADDRESS } from '@utils/addresses'
 import { blockFrequencyUpdater } from '@utils/blockFrequencyUpdater'
 
-import { Context } from '../../processor'
+import { Context } from '@processor'
 
 export const from = 14439231 // https://etherscan.io/tx/0x9295cac246169f06a3d4ec33fdbd87fced7a9e19ea61177cae75034e45ae66f4
 

src/ogv/processors/ogv-supply.ts

@@ -9,7 +9,7 @@ import {
 import { EvmBatchProcessor } from '@subsquid/evm-processor'
 import { ADDRESS_ZERO, OGV_ADDRESS, VEOGV_ADDRESS } from '@utils/addresses'
 
-import { Block, Context, Log } from '../../processor'
+import { Block, Context, Log } from '@processor'
 
 export const from = 14439231 // https://etherscan.io/tx/0x9295cac246169f06a3d4ec33fdbd87fced7a9e19ea61177cae75034e45ae66f4
 export const veogvFrom = 15089597 // https://etherscan.io/tx/0x70c582e56ea1c49b7e9df70a0b40ddbfac9362b8b172cb527c329c2302d7d48a

src/ogv/processors/ogv.ts

@@ -21,7 +21,7 @@ import {
   MoreThanOrEqual,
 } from 'typeorm'
 
-import { Context } from '../../../processor'
+import { Context } from '@processor'
 
 dayjs.extend(utc)
 

src/ousd/post-processors/daily-stats/daily-stats.ts

@@ -6,7 +6,7 @@ import {
 } from '@templates/curve'
 import { tokens } from '@utils/addresses'
 
-import { Context } from '../../../processor'
+import { Context } from '@processor'
 
 const ousdResetFrom = 11585978
 const oethDeployFrom = 16933090

src/ousd/processors/curve/curve.ts

@@ -10,7 +10,7 @@ import {
   createStrategyRewardSetup,
 } from '@templates/strategy-rewards'
 
-import { Context } from '../../../processor'
+import { Context } from '@processor'
 import { aaveStrategy } from './aave-strategy'
 import { convexMetaStrategy } from './convex-meta-strategy'
 import { fluxStrategy } from './flux-strategy'

src/ousd/processors/strategies/strategies.ts

@@ -11,7 +11,7 @@ import {
 import { getLatestEntity, trackAddressBalances } from '@utils/utils'
 import { pad } from 'viem'
 
-import { Context } from '../../processor'
+import { Context } from '@processor'
 
 interface ProcessResult {
   vaults: OUSDVault[]