Skip to content

Commit 5446378

Browse files
apexearthapexearth
committed
prettier
1 parent 733b08a commit 5446378

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+131
-137
lines changed

‎.prettierignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
src/abi
2+
src/model
3+

‎.prettierrc

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"importOrderSeparation": true,
1212
"importOrderSortSpecifiers": true,
1313
"importOrderParserPlugins": [
14-
"typescript"
14+
"typescript",
15+
"decorators-legacy"
1516
],
1617
"plugins": [
1718
"@trivago/prettier-plugin-sort-imports"

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"migration:generate": "sqd down && sqd up && sqd migration:generate && git add db/migrations/*",
77
"generate": "npm-run-all codegen migration:generate",
88
"build": "rm -rf lib && tsc",
9-
"prettier-check": "prettier --check **/*.ts **/*.json",
10-
"prettier-fix": "prettier --write **/*.ts **/*.json",
9+
"prettier-check": "prettier --check src",
10+
"prettier-fix": "prettier --write src",
1111
"setup": "sqd down && sqd up && sleep 2 && sqd migration:apply",
1212
"serve": "sqd serve",
1313
"process:arbitrum": "sqd process:arbitrum",

‎src/main-arbitrum.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'tsconfig-paths/register'
22
import { arbitrum } from 'viem/chains'
3-
3+
44
import { run } from '@processor'
55

66
import { erc20 } from './arbitrum'

‎src/mainnet/processors/balancer/balancer.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { Context } from '@processor'
12
import { CurrencyAddress } from '@shared/post-processors/exchange-rates/currencies'
23
import { EvmBatchProcessor } from '@subsquid/evm-processor'
34
import {
@@ -6,8 +7,6 @@ import {
67
createBalancerSetup,
78
} from '@templates/balancer'
89

9-
import { Context } from '@processor'
10-
1110
const ousdResetFrom = 11585978
1211
const oethDeployFrom = 16933090
1312

‎src/mainnet/processors/curve/curve.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1+
import { Context } from '@processor'
12
import { EvmBatchProcessor } from '@subsquid/evm-processor'
23
import {
34
createCurveInitializer,
45
createCurveProcessor,
56
createCurveSetup,
67
} from '@templates/curve'
78

8-
import { Context } from '@processor'
9-
109
const ousdResetFrom = 11585978
1110
const oethDeployFrom = 16933090
1211

‎src/mainnet/processors/liquidity-sources.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { LiquiditySource, LiquiditySourceType } from '@model'
2-
32
import { Context } from '@processor'
43

54
const sources = new Map<string, LiquiditySource>()

‎src/mainnet/processors/maverick.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1+
import { Context } from '@processor'
12
import { EvmBatchProcessor } from '@subsquid/evm-processor'
23
import {
34
createMaverickInitializer,
45
createMaverickProcessor,
56
createMaverickSetup,
67
} from '@templates/maverick'
78

8-
import { Context } from '@processor'
9-
109
const oethDeployFrom = 16933090
1110

1211
export const from = Math.min(oethDeployFrom)

‎src/mainnet/processors/native.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
import { minBy } from 'lodash'
2+
13
import { NativeBalance } from '@model'
4+
import { Context } from '@processor'
25
import { EvmBatchProcessor } from '@subsquid/evm-processor'
36
import { blockFrequencyUpdater } from '@utils/blockFrequencyUpdater'
47
import { getNativeBalances } from '@utils/nativeBalance'
5-
import { minBy } from 'lodash'
6-
7-
import { Context } from '@processor'
88

99
/**
1010
* We end up with a lot of initial 0 balance entities.

‎src/mainnet/validators/validate-shared.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { ERC20Balance, ERC20State } from '@model'
2-
import { Entity, EntityClass } from '@subsquid/typeorm-store'
3-
import { env } from '@utils/env'
4-
import { jsonify } from '@utils/jsonify'
51
import assert from 'assert'
62
import { sortBy } from 'lodash'
73

4+
import { ERC20Balance, ERC20State } from '@model'
85
import { Block, Context } from '@processor'
6+
import { Entity, EntityClass } from '@subsquid/typeorm-store'
7+
import { env } from '@utils/env'
8+
import { jsonify } from '@utils/jsonify'
99

1010
export const name = 'validate-shared'
1111

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
import dayjs from 'dayjs'
2+
import utc from 'dayjs/plugin/utc'
3+
import {
4+
EntityManager,
5+
FindOptionsOrderValue,
6+
LessThanOrEqual,
7+
MoreThanOrEqual,
8+
} from 'typeorm'
9+
110
import {
211
ExchangeRate,
312
OETH,
@@ -15,18 +24,9 @@ import {
1524
OETHStrategyHoldingDailyStat,
1625
OETHVault,
1726
} from '@model'
27+
import { Context } from '@processor'
1828
import { EvmBatchProcessor } from '@subsquid/evm-processor'
1929
import { applyCoingeckoData } from '@utils/coingecko'
20-
import dayjs from 'dayjs'
21-
import utc from 'dayjs/plugin/utc'
22-
import {
23-
EntityManager,
24-
FindOptionsOrderValue,
25-
LessThanOrEqual,
26-
MoreThanOrEqual,
27-
} from 'typeorm'
28-
29-
import { Context } from '@processor'
3030

3131
dayjs.extend(utc)
3232

‎src/oeth/processors/ccip.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ import * as ccipOnRampAbi from '@abi/ccip-evm2evmonramp'
33
import * as ccipRouter from '@abi/ccip-router'
44
import * as erc20Abi from '@abi/erc20'
55
import { BridgeTransfer, BridgeTransferState } from '@model'
6+
import { Context } from '@processor'
67
import { EvmBatchProcessor } from '@subsquid/evm-processor'
78
import { logFilter } from '@utils/logFilter'
89

9-
import { Context } from '@processor'
10-
1110
// Code Reference: https://github.com/smartcontractkit/smart-contract-examples/tree/main/ccip-offchain
1211
// https://github.com/smartcontractkit/smart-contract-examples/blob/main/ccip-offchain/typescript/src/get-status.ts
1312
// Detect state changes on the off-ramp:

‎src/oeth/processors/curve-lp.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1+
import { pad } from 'viem'
2+
13
import * as baseRewardPool from '@abi/base-reward-pool'
24
import * as curveLpToken from '@abi/curve-lp-token'
35
import { OETHCurveLP } from '@model'
6+
import { Context } from '@processor'
47
import { EvmBatchProcessor } from '@subsquid/evm-processor'
58
import {
69
OETH_CONVEX_ADDRESS,
710
OETH_CURVE_LP_ADDRESS,
811
OETH_CURVE_REWARD_LP_ADDRESS,
912
} from '@utils/addresses'
1013
import { getLatestEntity } from '@utils/utils'
11-
import { pad } from 'viem'
12-
13-
import { Context } from '@processor'
1414

1515
interface ProcessResult {
1616
curveLPs: OETHCurveLP[]

‎src/oeth/processors/dripper.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1+
import { pad } from 'viem'
2+
13
import * as dripperAbi from '@abi/dripper'
24
import * as erc20 from '@abi/erc20'
35
import { OETHDripper } from '@model'
6+
import { Context } from '@processor'
47
import { ensureExchangeRate } from '@shared/post-processors/exchange-rates'
58
import { EvmBatchProcessor } from '@subsquid/evm-processor'
69
import { OETH_DRIPPER_ADDRESS, WETH_ADDRESS } from '@utils/addresses'
710
import { getLatestEntity, trackAddressBalances } from '@utils/utils'
8-
import { pad } from 'viem'
9-
10-
import { Context } from '@processor'
1111

1212
interface ProcessResult {
1313
drippers: OETHDripper[]

‎src/oeth/processors/exchange-rates.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1+
import { Context } from '@processor'
12
import { ensureExchangeRates } from '@shared/post-processors/exchange-rates'
23
import { EvmBatchProcessor } from '@subsquid/evm-processor'
34
import { blockFrequencyUpdater } from '@utils/blockFrequencyUpdater'
45

5-
import { Context } from '@processor'
6-
76
export const from = 16933090 // OETH Deploy
87

98
export const setup = (processor: EvmBatchProcessor) => {

‎src/oeth/processors/frax-staking.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
import { pad } from 'viem'
2+
13
import * as sfrxETH from '@abi/sfrx-eth'
24
import { OETHFraxStaking } from '@model'
5+
import { Context } from '@processor'
36
import { ensureExchangeRate } from '@shared/post-processors/exchange-rates'
47
import { EvmBatchProcessor } from '@subsquid/evm-processor'
58
import { OETH_FRAX_STAKING_ADDRESS, SFRXETH_ADDRESS } from '@utils/addresses'
6-
import { pad } from 'viem'
7-
8-
import { Context } from '@processor'
99

1010
interface ProcessResult {
1111
fraxStakings: OETHFraxStaking[]

‎src/oeth/processors/morpho-aave.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1+
import { pad } from 'viem'
2+
13
import * as erc20 from '@abi/erc20'
24
import * as initializableAbstractStrategy from '@abi/initializable-abstract-strategy'
35
import { OETHMorphoAave } from '@model'
6+
import { Context } from '@processor'
47
import { ensureExchangeRate } from '@shared/post-processors/exchange-rates'
58
import { EvmBatchProcessor } from '@subsquid/evm-processor'
69
import { OETH_MORPHO_AAVE_ADDRESS, WETH_ADDRESS } from '@utils/addresses'
7-
import { pad } from 'viem'
8-
9-
import { Context } from '@processor'
1010

1111
interface ProcessResult {
1212
morphoAaves: OETHMorphoAave[]

‎src/oeth/processors/strategies/strategies.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { OETHRewardTokenCollected } from '@model'
2+
import { Context } from '@processor'
23
import { currencies } from '@shared/post-processors/exchange-rates/currencies'
34
import { EvmBatchProcessor } from '@subsquid/evm-processor'
45
import {
@@ -21,8 +22,6 @@ import {
2122
addresses,
2223
} from '@utils/addresses'
2324

24-
import { Context } from '@processor'
25-
2625
export const oethStrategies: readonly IStrategyData[] = [
2726
{
2827
from: 17249899,

‎src/oeth/processors/vault.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1+
import { pad } from 'viem'
2+
13
import * as erc20 from '@abi/erc20'
24
import * as lido from '@abi/lido'
35
import { OETHVault } from '@model'
6+
import { Context } from '@processor'
47
import { ensureExchangeRates } from '@shared/post-processors/exchange-rates'
58
import { EvmBatchProcessor } from '@subsquid/evm-processor'
69
import {
@@ -12,9 +15,6 @@ import {
1215
WETH_ADDRESS,
1316
} from '@utils/addresses'
1417
import { getLatestEntity, trackAddressBalances } from '@utils/utils'
15-
import { pad } from 'viem'
16-
17-
import { Context } from '@processor'
1818

1919
interface ProcessResult {
2020
vaults: OETHVault[]

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
import assert from 'assert'
2+
import { sortBy } from 'lodash'
3+
14
import {
25
OETHAPY,
36
OETHHistory,
@@ -6,13 +9,10 @@ import {
69
OETHVault,
710
StrategyBalance,
811
} from '@model'
12+
import { Block, Context } from '@processor'
913
import { Entity, EntityClass } from '@subsquid/typeorm-store'
1014
import { env } from '@utils/env'
1115
import { jsonify } from '@utils/jsonify'
12-
import assert from 'assert'
13-
import { sortBy } from 'lodash'
14-
15-
import { Block, Context } from '@processor'
1616

1717
export const name = 'validate-oeth'
1818

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import { OGV, OGVAddress, OGVDailyStat } from '@model'
2-
import { EvmBatchProcessor } from '@subsquid/evm-processor'
3-
import { applyCoingeckoData } from '@utils/coingecko'
41
import dayjs from 'dayjs'
52
import utc from 'dayjs/plugin/utc'
63
import {
@@ -9,7 +6,10 @@ import {
96
MoreThanOrEqual,
107
} from 'typeorm'
118

9+
import { OGV, OGVAddress, OGVDailyStat } from '@model'
1210
import { Context } from '@processor'
11+
import { EvmBatchProcessor } from '@subsquid/evm-processor'
12+
import { applyCoingeckoData } from '@utils/coingecko'
1313

1414
dayjs.extend(utc)
1515

‎src/ogv/post-processors/governance.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { formatEther } from 'viem'
2+
13
import * as governanceAbi from '@abi/governance'
24
import {
35
OGVAddress,
@@ -8,12 +10,10 @@ import {
810
OGVProposalVote,
911
OGVVoteType,
1012
} from '@model'
13+
import { Block, Context, Log } from '@processor'
1114
import { EvmBatchProcessor } from '@subsquid/evm-processor'
1215
import { GOVERNANCE_ADDRESS } from '@utils/addresses'
1316
import { env } from '@utils/env'
14-
import { formatEther } from 'viem'
15-
16-
import { Block, Context, Log } from '@processor'
1717

1818
export const from = 15491391 // https://etherscan.io/tx/0x0e04e429248c384e6b36229edf8eb5a77bec7023c58808c21b702edfcbc0e0d6
1919

‎src/ogv/processors/ogv-supply.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import * as erc20Abi from '@abi/erc20'
22
import { OGV } from '@model'
3+
import { Context } from '@processor'
34
import { EvmBatchProcessor } from '@subsquid/evm-processor'
45
import { OGV_ADDRESS, VEOGV_ADDRESS } from '@utils/addresses'
56
import { blockFrequencyUpdater } from '@utils/blockFrequencyUpdater'
67

7-
import { Context } from '@processor'
8-
98
export const from = 14439231 // https://etherscan.io/tx/0x9295cac246169f06a3d4ec33fdbd87fced7a9e19ea61177cae75034e45ae66f4
109

1110
export const setup = (processor: EvmBatchProcessor) => {

‎src/ogv/processors/ogv.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@ import {
66
OGVLockupEventType,
77
OGVLockupTxLog,
88
} from '@model'
9+
import { Block, Context, Log } from '@processor'
910
import { EvmBatchProcessor } from '@subsquid/evm-processor'
1011
import { ADDRESS_ZERO, OGV_ADDRESS, VEOGV_ADDRESS } from '@utils/addresses'
1112

12-
import { Block, Context, Log } from '@processor'
13-
1413
export const from = 14439231 // https://etherscan.io/tx/0x9295cac246169f06a3d4ec33fdbd87fced7a9e19ea61177cae75034e45ae66f4
1514
export const veogvFrom = 15089597 // https://etherscan.io/tx/0x70c582e56ea1c49b7e9df70a0b40ddbfac9362b8b172cb527c329c2302d7d48a
1615

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

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
import dayjs from 'dayjs'
2+
import utc from 'dayjs/plugin/utc'
3+
import {
4+
EntityManager,
5+
FindOptionsOrderValue,
6+
LessThanOrEqual,
7+
MoreThanOrEqual,
8+
} from 'typeorm'
9+
110
import {
211
OUSD,
312
OUSDAPY,
@@ -10,18 +19,9 @@ import {
1019
OUSDStrategyHoldingDailyStat,
1120
OUSDVault,
1221
} from '@model'
22+
import { Context } from '@processor'
1323
import { EvmBatchProcessor } from '@subsquid/evm-processor'
1424
import { applyCoingeckoData } from '@utils/coingecko'
15-
import dayjs from 'dayjs'
16-
import utc from 'dayjs/plugin/utc'
17-
import {
18-
EntityManager,
19-
FindOptionsOrderValue,
20-
LessThanOrEqual,
21-
MoreThanOrEqual,
22-
} from 'typeorm'
23-
24-
import { Context } from '@processor'
2525

2626
dayjs.extend(utc)
2727

0 commit comments

Comments
 (0)