add superoethb withdrawals

Author: apexearth

abi/otoken.json

@@ -1568,28 +1568,6 @@ type OETHCollateralDailyStat @entity {
   price: BigInt!
   value: BigInt!
 }
-
-type OETHRewardTokenCollected @entity {
-  id: ID!
-  timestamp: DateTime! @index
-  blockNumber: Int! @index
-  strategy: String!
-  recipient: String!
-  rewardToken: String!
-  amount: BigInt!
-}
-
-type OETHWithdrawalRequest @entity {
-  id: ID!
-  timestamp: DateTime! @index
-  blockNumber: Int! @index
-  requestId: BigInt!
-  withdrawer: String!
-  amount: BigInt!
-  queued: BigInt!
-  claimed: Boolean!
-  txHash: String! @index
-}
 type OGNDailyStat @entity {
   id: ID!
   blockNumber: Int! @index
@@ -1911,6 +1889,32 @@ type OTokenHarvesterYieldSent @entity {
   yield: BigInt!
   fee: BigInt!
 }
+
+type OTokenRewardTokenCollected @entity {
+  id: ID!
+  chainId: Int! @index
+  blockNumber: Int! @index
+  timestamp: DateTime! @index
+  otoken: String! @index
+  strategy: String!
+  recipient: String!
+  rewardToken: String!
+  amount: BigInt!
+}
+
+type OTokenWithdrawalRequest @entity {
+  id: ID!
+  chainId: Int! @index
+  blockNumber: Int! @index
+  timestamp: DateTime! @index
+  otoken: String! @index
+  requestId: BigInt!
+  withdrawer: String!
+  amount: BigInt!
+  queued: BigInt!
+  claimed: Boolean!
+  txHash: String! @index
+}
 """
 The Vault entity tracks the OUSD vault balance over time.
 """

db/migrations/1729704740947-Data.js renamed to db/migrations/1729880820715-Data.js

@@ -160,25 +160,3 @@ type OETHCollateralDailyStat @entity {
   price: BigInt!
   value: BigInt!
 }
-
-type OETHRewardTokenCollected @entity {
-  id: ID!
-  timestamp: DateTime! @index
-  blockNumber: Int! @index
-  strategy: String!
-  recipient: String!
-  rewardToken: String!
-  amount: BigInt!
-}
-
-type OETHWithdrawalRequest @entity {
-  id: ID!
-  timestamp: DateTime! @index
-  blockNumber: Int! @index
-  requestId: BigInt!
-  withdrawer: String!
-  amount: BigInt!
-  queued: BigInt!
-  claimed: Boolean!
-  txHash: String! @index
-}

schema.graphql

@@ -188,3 +188,29 @@ type OTokenHarvesterYieldSent @entity {
   yield: BigInt!
   fee: BigInt!
 }
+
+type OTokenRewardTokenCollected @entity {
+  id: ID!
+  chainId: Int! @index
+  blockNumber: Int! @index
+  timestamp: DateTime! @index
+  otoken: String! @index
+  strategy: String!
+  recipient: String!
+  rewardToken: String!
+  amount: BigInt!
+}
+
+type OTokenWithdrawalRequest @entity {
+  id: ID!
+  chainId: Int! @index
+  blockNumber: Int! @index
+  timestamp: DateTime! @index
+  otoken: String! @index
+  requestId: BigInt!
+  withdrawer: String!
+  amount: BigInt!
+  queued: BigInt!
+  claimed: Boolean!
+  txHash: String! @index
+}

schema/oeth.graphql

@@ -28,6 +28,7 @@ export const functions = {
     governor: viewFun("0x0c340a24", "governor()", {}, p.address),
     increaseAllowance: fun("0x39509351", "increaseAllowance(address,uint256)", {"_spender": p.address, "_addedValue": p.uint256}, p.bool),
     initialize: fun("0xf542033f", "initialize(string,string,address,uint256)", {"_nameArg": p.string, "_symbolArg": p.string, "_vaultAddress": p.address, "_initialCreditsPerToken": p.uint256}, ),
+    initialize2: fun("0x472abf68", "initialize2()", {}, ),
     isGovernor: viewFun("0xc7af3352", "isGovernor()", {}, p.bool),
     isUpgraded: viewFun("0x95ef84b9", "isUpgraded(address)", {"_0": p.address}, p.uint256),
     mint: fun("0x40c10f19", "mint(address,uint256)", {"_account": p.address, "_amount": p.uint256}, ),
@@ -187,6 +188,9 @@ export type IncreaseAllowanceReturn = FunctionReturn<typeof functions.increaseAl
 export type InitializeParams = FunctionArguments<typeof functions.initialize>
 export type InitializeReturn = FunctionReturn<typeof functions.initialize>
 
+export type Initialize2Params = FunctionArguments<typeof functions.initialize2>
+export type Initialize2Return = FunctionReturn<typeof functions.initialize2>
+
 export type IsGovernorParams = FunctionArguments<typeof functions.isGovernor>
 export type IsGovernorReturn = FunctionReturn<typeof functions.isGovernor>
 

schema/otoken.graphql

@@ -1,4 +1,3 @@
-import { OETHRewardTokenCollected } from '@model'
 import { Context } from '@processor'
 import { EvmBatchProcessor } from '@subsquid/evm-processor'
 import { IStrategyData, createStrategyProcessor, createStrategySetup } from '@templates/strategy'
@@ -36,14 +35,7 @@ const strategies = oethbStrategies
 
 const processors = [
   ...strategies.map(createStrategyProcessor),
-  ...strategies
-    .filter((s) => s.kind !== 'Vault')
-    .map((strategy) =>
-      createStrategyRewardProcessor({
-        ...strategy,
-        OTokenRewardTokenCollected: OETHRewardTokenCollected,
-      }),
-    ),
+  ...strategies.filter((s) => s.kind !== 'Vault').map((strategy) => createStrategyRewardProcessor(strategy)),
 ]
 
 export const baseStrategies = {

src/abi/otoken.ts

@@ -5,6 +5,7 @@ import { EvmBatchProcessor } from '@subsquid/evm-processor'
 import { getPositions } from '@templates/aerodrome/lp'
 import { createOTokenProcessor } from '@templates/otoken'
 import { createOTokenActivityProcessor } from '@templates/otoken/activity-processor/activity-processor'
+import { createOTokenWithdrawalsProcessor } from '@templates/withdrawals'
 import { aerodromePools, baseAddresses } from '@utils/addresses-base'
 
 const otokenProcessor = createOTokenProcessor({
@@ -55,13 +56,23 @@ const otokenActivityProcessor = createOTokenActivityProcessor({
   cowSwap: false,
 })
 
+const otokenWithdrawalsProcessor = createOTokenWithdrawalsProcessor({
+  oTokenAddress: baseAddresses.superOETHb.address,
+  from: 21544908,
+})
+
 export const superOETHb = {
   from: Math.min(otokenProcessor.from, otokenActivityProcessor.from),
   setup: (processor: EvmBatchProcessor) => {
     otokenProcessor.setup(processor)
     otokenActivityProcessor.setup(processor)
+    otokenWithdrawalsProcessor.setup(processor)
   },
   process: async (ctx: Context) => {
-    await Promise.all([otokenProcessor.process(ctx), otokenActivityProcessor.process(ctx)])
+    await Promise.all([
+      otokenProcessor.process(ctx),
+      otokenActivityProcessor.process(ctx),
+      otokenWithdrawalsProcessor.process(ctx),
+    ])
   },
 }

src/base/strategies.ts

@@ -3,6 +3,7 @@ import 'tsconfig-paths/register'
 import { run } from '@processor'
 import * as exchangeRatesPostProcessor from '@shared/post-processors/exchange-rates'
 import { processStatus } from '@templates/processor-status'
+import { addresses } from '@utils/addresses'
 
 import * as dailyStats from './oeth/post-processors/daily-stats'
 import * as oeth from './oeth/processors'
@@ -15,8 +16,8 @@ import * as fraxStaking from './oeth/processors/frax-staking'
 import * as morphoAave from './oeth/processors/morpho-aave'
 import * as strategies from './oeth/processors/strategies'
 import * as vault from './oeth/processors/vault'
-import * as withdrawals from './oeth/processors/withdrawals'
 import * as validateOeth from './oeth/validators/validate-oeth'
+import { createOTokenWithdrawalsProcessor } from './templates/withdrawals'
 
 export const processor = {
   stateSchema: 'oeth-processor',
@@ -31,7 +32,7 @@ export const processor = {
     balancerMetaPoolStrategy,
     strategies,
     exchangeRates,
-    withdrawals,
+    createOTokenWithdrawalsProcessor({ oTokenAddress: addresses.oeth.address, from: 20428558 }),
   ],
   postProcessors: [exchangeRatesPostProcessor, dailyStats, processStatus('oeth')],
   validators: [validateOeth],

src/base/super-oeth-b.ts

@@ -118,8 +118,6 @@ export * from "./oethDailyStat.model"
 export * from "./oethStrategyDailyStat.model"
 export * from "./oethStrategyHoldingDailyStat.model"
 export * from "./oethCollateralDailyStat.model"
-export * from "./oethRewardTokenCollected.model"
-export * from "./oethWithdrawalRequest.model"
 export * from "./ognDailyStat.model"
 export * from "./ogv.model"
 export * from "./ogvAddress.model"
@@ -148,6 +146,8 @@ export * from "./_oTokenActivityType"
 export * from "./oTokenDailyStat.model"
 export * from "./oTokenDripperState.model"
 export * from "./oTokenHarvesterYieldSent.model"
+export * from "./oTokenRewardTokenCollected.model"
+export * from "./oTokenWithdrawalRequest.model"
 export * from "./ousdVault.model"
 export * from "./ousdDailyStat.model"
 export * from "./ousdStrategyDailyStat.model"