Skip to content

Commit 92d11e6

Browse files
apexearthapexearth
committed
changes for ousd withdrawals
1 parent c316460 commit 92d11e6

5 files changed

Lines changed: 61 additions & 29 deletions

File tree

‎src/main-oeth.ts‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
1-
import 'tsconfig-paths/register'
1+
import 'tsconfig-paths/register';
22

3-
import { defineSquidProcessor } from '@originprotocol/squid-utils'
4-
import * as exchangeRatesPostProcessor from '@shared/post-processors/exchange-rates'
5-
import { processStatus } from '@templates/processor-status'
6-
import { addresses } from '@utils/addresses'
7-
import { DEFAULT_FIELDS } from '@utils/batch-proccesor-fields'
8-
import { initProcessorFromDump } from '@utils/dumps'
93

10-
import { oethProcessor } from './oeth/processors'
11-
import { oethExchangeRatesProcessor } from './oeth/processors/exchange-rates'
12-
import { oethStrategiesProcessor } from './oeth/processors/strategies'
13-
import { createOTokenWithdrawalsProcessor } from './templates/withdrawals'
4+
5+
import { defineSquidProcessor } from '@originprotocol/squid-utils';
6+
import * as exchangeRatesPostProcessor from '@shared/post-processors/exchange-rates';
7+
import { processStatus } from '@templates/processor-status';
8+
import { addresses } from '@utils/addresses';
9+
import { DEFAULT_FIELDS } from '@utils/batch-proccesor-fields';
10+
import { initProcessorFromDump } from '@utils/dumps';
11+
12+
13+
14+
import { oethProcessor } from './oeth/processors';
15+
import { oethExchangeRatesProcessor } from './oeth/processors/exchange-rates';
16+
import { oethStrategiesProcessor } from './oeth/processors/strategies';
17+
import { createOTokenWithdrawalsProcessor } from './templates/withdrawals';
18+
1419

1520
export const processor = defineSquidProcessor({
1621
stateSchema: 'oeth-processor',
@@ -19,6 +24,7 @@ export const processor = defineSquidProcessor({
1924
oethStrategiesProcessor,
2025
oethExchangeRatesProcessor,
2126
createOTokenWithdrawalsProcessor({
27+
name: 'OETH',
2228
oTokenAddress: addresses.oeth.address,
2329
oTokenVaultAddress: addresses.oeth.vault,
2430
from: 20428558,
@@ -34,4 +40,4 @@ if (require.main === module) {
3440
initProcessorFromDump(processor).catch((error) => {
3541
throw error
3642
})
37-
}
43+
}

‎src/main-ousd.ts‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
import { ousdProcessor } from 'ousd/processors/ousd'
2-
import 'tsconfig-paths/register'
1+
import { ousdProcessor } from 'ousd/processors/ousd';
2+
import 'tsconfig-paths/register';
33

4-
import { defineSquidProcessor } from '@originprotocol/squid-utils'
5-
import * as exchangeRatesPostProcessor from '@shared/post-processors/exchange-rates'
4+
5+
6+
import { defineSquidProcessor } from '@originprotocol/squid-utils';
7+
import * as exchangeRatesPostProcessor from '@shared/post-processors/exchange-rates';
68
import { processStatus } from '@templates/processor-status'
9+
import { createOTokenWithdrawalsProcessor } from '@templates/withdrawals'
10+
import { addresses } from '@utils/addresses'
711
import { DEFAULT_FIELDS } from '@utils/batch-proccesor-fields'
812
import { initProcessorFromDump } from '@utils/dumps'
913

@@ -14,7 +18,19 @@ import { ousdStrategiesProcessor } from './ousd/processors/strategies/strategies
1418

1519
export const processor = defineSquidProcessor({
1620
stateSchema: 'ousd-processor',
17-
processors: [ousdProcessor, ousdStrategiesProcessor, ousdCurveProcessor, morphoMarketStatesProcessor, ...erc20s()],
21+
processors: [
22+
ousdProcessor,
23+
ousdStrategiesProcessor,
24+
createOTokenWithdrawalsProcessor({
25+
name: 'OUSD',
26+
oTokenAddress: addresses.ousd.address,
27+
oTokenVaultAddress: addresses.ousd.vault,
28+
from: 24426857,
29+
}),
30+
ousdCurveProcessor,
31+
morphoMarketStatesProcessor,
32+
...erc20s(),
33+
],
1834
postProcessors: [exchangeRatesPostProcessor, processStatus('ousd')],
1935
validators: [],
2036
fields: DEFAULT_FIELDS,
@@ -25,4 +41,4 @@ if (require.main === module) {
2541
initProcessorFromDump(processor).catch((error) => {
2642
throw error
2743
})
28-
}
44+
}

‎src/oethb/super-oeth-b.ts‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
1-
import { parseEther } from 'viem'
2-
import { base } from 'viem/chains'
1+
import { parseEther } from 'viem';
2+
import { base } from 'viem/chains';
33

4-
import * as erc20Abi from '@abi/erc20'
5-
import { getPositions } from '@templates/aerodrome/lp'
6-
import { createOTokenActivityProcessor } from '@templates/otoken/activity-processor/activity-processor'
7-
import { createOTokenProcessor2 } from '@templates/otoken/otoken-2'
8-
import { createOTokenWithdrawalsProcessor } from '@templates/withdrawals'
9-
import { aerodromePools, baseAddresses } from '@utils/addresses-base'
10-
import { tokensByChain } from '@utils/tokensByChain'
114

12-
import { baseCurveAMO } from '../base/strategies'
5+
6+
import * as erc20Abi from '@abi/erc20';
7+
import { getPositions } from '@templates/aerodrome/lp';
8+
import { createOTokenActivityProcessor } from '@templates/otoken/activity-processor/activity-processor';
9+
import { createOTokenProcessor2 } from '@templates/otoken/otoken-2';
10+
import { createOTokenWithdrawalsProcessor } from '@templates/withdrawals';
11+
import { aerodromePools, baseAddresses } from '@utils/addresses-base';
12+
import { tokensByChain } from '@utils/tokensByChain';
13+
14+
15+
16+
import { baseCurveAMO } from '../base/strategies';
17+
1318

1419
const otokenProcessor = createOTokenProcessor2({
1520
name: 'Super OETHb',
@@ -113,9 +118,10 @@ const otokenActivityProcessor = createOTokenActivityProcessor({
113118
})
114119

115120
const otokenWithdrawalsProcessor = createOTokenWithdrawalsProcessor({
121+
name: 'Super OETHb',
116122
oTokenAddress: baseAddresses.superOETHb.address,
117123
oTokenVaultAddress: baseAddresses.superOETHb.vault,
118124
from: 21544908,
119125
})
120126

121-
export const superOETHb = [otokenProcessor, otokenActivityProcessor, otokenWithdrawalsProcessor]
127+
export const superOETHb = [otokenProcessor, otokenActivityProcessor, otokenWithdrawalsProcessor]

‎src/sonic/os.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ const otokenActivityProcessor = createOTokenActivityProcessor({
7777
})
7878

7979
const otokenWithdrawalsProcessor = createOTokenWithdrawalsProcessor({
80+
name: 'OS',
8081
oTokenAddress: sonicAddresses.OS.address,
8182
oTokenVaultAddress: sonicAddresses.OS.vault,
8283
from: sonicAddresses.OS.initializeBlock,

‎src/templates/withdrawals.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ interface ProcessResult {
99
}
1010

1111
export const createOTokenWithdrawalsProcessor = ({
12+
name,
1213
oTokenAddress,
1314
oTokenVaultAddress,
1415
from,
1516
}: {
17+
name: string
1618
oTokenAddress: string
1719
oTokenVaultAddress: string
1820
from: number
@@ -106,6 +108,7 @@ export const createOTokenWithdrawalsProcessor = ({
106108
}
107109

108110
return {
111+
name: `${name} withdrawals`,
109112
from,
110113
setup,
111114
process,

0 commit comments

Comments
 (0)