feat: enhance oToken configuration and event handling with OTokenVault support

toniocodo · toniocodo · commit 5cfb92079390 · 2025-12-17T00:01:48.000+01:00
diff --git a/src/indexers/oToken/EventHandlers.ts b/src/indexers/oToken/EventHandlers.ts
@@ -5,15 +5,12 @@ import {
   generateOTokenHistoryId,
   generateOTokenId,
   generateOTokenRebaseId,
+  generateOTokenWithdrawalRequestId,
 } from '../../utils/compositeIds';
 import { getTokenByAddress } from '../../utils/getToken';
-import { OToken } from './generated';
+import { OToken, OTokenVault } from './generated';
 import { calculateRebase } from './oTokenRebase';
 
-/**
- * Handle Transfer events
- * Updates OTokenAddress balances and creates history/activity records
- */
 OToken.Transfer.handler(async ({ event, context }) => {
   const chainId = event.chainId;
   const tokenAddress = event.srcAddress.toLowerCase();
@@ -129,7 +126,7 @@ OToken.Transfer.handler(async ({ event, context }) => {
       generateOTokenAddressId(chainId, tokenAddress, from),
     );
 
-    context.OTokenHistory.set({
+    context.History.set({
       id: fromHistoryId,
       chainId,
       otoken: tokenAddress,
@@ -156,7 +153,7 @@ OToken.Transfer.handler(async ({ event, context }) => {
       generateOTokenAddressId(chainId, tokenAddress, to),
     );
 
-    context.OTokenHistory.set({
+    context.History.set({
       id: toHistoryId,
       chainId,
       otoken: tokenAddress,
@@ -179,7 +176,7 @@ OToken.Transfer.handler(async ({ event, context }) => {
     event.logIndex,
   );
 
-  context.OTokenActivity.set({
+  context.Activity.set({
     id: activityId,
     chainId,
     otoken: tokenAddress,
@@ -194,10 +191,6 @@ OToken.Transfer.handler(async ({ event, context }) => {
   });
 });
 
-/**
- * Handle Rebase events
- * Updates OToken supply and creates rebase records
- */
 OToken.Rebase.handler(async ({ event, context }) => {
   const chainId = event.chainId;
   const tokenAddress = event.srcAddress.toLowerCase();
@@ -254,7 +247,7 @@ OToken.Rebase.handler(async ({ event, context }) => {
     event.logIndex,
   );
 
-  context.OTokenRebase.set({
+  context.Rebase.set({
     id: rebaseId,
     chainId,
     otoken: tokenAddress,
@@ -271,3 +264,54 @@ OToken.Rebase.handler(async ({ event, context }) => {
     logIndex: event.logIndex,
   });
 });
+
+OTokenVault.WithdrawalRequested.handler(async ({ event, context }) => {
+  const chainId = event.chainId;
+  const otoken = event.srcAddress.toLowerCase();
+  const withdrawer = event.params.withdrawer.toLowerCase();
+  const requestId = BigInt(event.params.requestId);
+  const amount = BigInt(event.params.amount);
+  const queued = BigInt(event.params.queued);
+  const timestamp = BigInt(event.block.timestamp);
+  const hash = event.transaction.hash;
+
+  const extraBytes = event.transaction.input.slice(74);
+  let queueWait: bigint | undefined;
+  if (extraBytes.length > 0) {
+    queueWait = BigInt('0x' + extraBytes);
+  }
+
+  context.WithdrawalRequest.set({
+    id: generateOTokenWithdrawalRequestId(chainId, otoken, requestId),
+    chainId,
+    otoken,
+    withdrawer,
+    requestId,
+    amount,
+    queued,
+    claimed: false,
+    queueWait,
+    createdAt: timestamp,
+    updatedAt: timestamp,
+    hash,
+  });
+});
+
+OTokenVault.WithdrawalClaimed.handler(async ({ event, context }) => {
+  const chainId = event.chainId;
+  const otoken = event.srcAddress.toLowerCase();
+  const requestId = BigInt(event.params.requestId);
+
+  const request = await context.WithdrawalRequest.get(
+    generateOTokenWithdrawalRequestId(chainId, otoken, requestId),
+  );
+  if (!request) {
+    return;
+  }
+
+  context.WithdrawalRequest.set({
+    ...request,
+    claimed: true,
+    updatedAt: BigInt(event.block.timestamp),
+  });
+});
diff --git a/src/indexers/oToken/config.yaml b/src/indexers/oToken/config.yaml
@@ -1,42 +1,62 @@
 # yaml-language-server: $schema=../../../node_modules/envio/evm.schema.json
 name: oToken
-output: "./generated"
+output: './generated'
 contracts:
   - name: OToken
     handler: ./EventHandlers.ts
     events:
       - event: Transfer(address indexed from, address indexed to, uint256 value)
-        field_selection:
-          transaction_fields:
-            - hash
       - event: Rebase(uint256 indexed epoch, uint256 totalSupply, uint256 rebasingSupply, uint256 nonRebasingSupply)
-        field_selection:
-          transaction_fields:
-            - hash
+  - name: OTokenVault
+    handler: ./EventHandlers.ts
+    events:
+      - event: WithdrawalRequested(address indexed withdrawer, uint256 indexed requestId, uint256 amount, uint256 queued)
+      - event: WithdrawalClaimed(address indexed withdrawer, uint256 indexed requestId, uint256 amount)
+
+field_selection:
+  transaction_fields:
+    - from
+    - hash
+    - to
+    - input
 
 networks:
-  - id: 1  # Mainnet
-    start_block: 11590995  # OUSD Reset (earliest OToken)
+  - id: 1
+    start_block: 11590995
     contracts:
       - name: OToken
         address:
-          - 0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3  # OETH
-          - 0x2a8e1e676ec238d8a992307b495b45b3feaa5e86  # OUSD
-  
-  - id: 8453  # Base
-    start_block: 12000000
+          - 0x856c4efb76c1d1ae02e20ceb03a2a6a08b0b8dc3 # OETH
+          - 0x2a8e1e676ec238d8a992307b495b45b3feaa5e86 # OUSD
+      - name: OTokenVault
+        address: 0x39254033945aa2e4809cc2977e7087bee48bd7ab # OETH Vault
+        start_block: 20428558
+
+  - id: 8453
+    start_block: 17819702
     contracts:
       - name: OToken
-        address:
-          - 0xdbfefd2e8460a6ee4955a68582f85708baea60a3  # superOETHb
-  
-  - id: 146  # Sonic
-    start_block: 12000000
+        address: 0xdbfefd2e8460a6ee4955a68582f85708baea60a3 # superOETHb
+      - name: OTokenVault
+        address: 0x98a0cbef61bd2d21435f433be4cd42b56b38cc93 # superOETHb Vault
+        start_block: 21544908
+
+  - id: 146
+    start_block: 37447070
     contracts:
       - name: OToken
-        address:
-          - 0xb1e25689d55734fd3fffc939c4c3eb52dff8a794  # OS
+        address: 0xb1e25689d55734fd3fffc939c4c3eb52dff8a794 # OS
+      - name: OTokenVault
+        address: 0xa3c0eca00d2b76b4d1f170b0ab3fdea16c180186 # OS Vault
+
+  - id: 98866
+    start_block: 535166
+    contracts:
+      - name: OToken
+        address: 0xfcbe50dbe43bf7e5c88c6f6fb9ef432d4165406e # superOETHp
+      - name: OTokenVault
+        address: 0xc8c8f8bea5631a8af26440af32a55002138cb76a # superOETHp Vault
+        start_block: 878332
 
 unordered_multichain_mode: true
 preload_handlers: true
-
diff --git a/src/indexers/oToken/schema.graphql b/src/indexers/oToken/schema.graphql
@@ -1,7 +1,7 @@
 # OToken Core Entities
 
 type OToken {
-  id: String! # chainId:address
+  id: ID! # chainId:address
   chainId: Int!
   address: String!
   symbol: String
@@ -16,7 +16,7 @@ type OToken {
 }
 
 type OTokenAddress {
-  id: String! # chainId:otoken:address
+  id: ID! # chainId:otoken:address
   chainId: Int!
   otoken: String!
   address: String!
@@ -29,8 +29,8 @@ type OTokenAddress {
   updatedAt: BigInt!
 }
 
-type OTokenRebase {
-  id: String! # chainId:blockNumber:logIndex
+type Rebase {
+  id: ID! # chainId:blockNumber:logIndex
   chainId: Int!
   otoken: String!
   epoch: BigInt!
@@ -46,8 +46,8 @@ type OTokenRebase {
   logIndex: Int!
 }
 
-type OTokenHistory {
-  id: String! # chainId:transactionHash:logIndex
+type History {
+  id: ID! # chainId:transactionHash:logIndex
   chainId: Int!
   otoken: String!
   address: String!
@@ -61,8 +61,8 @@ type OTokenHistory {
   logIndex: Int!
 }
 
-type OTokenAPY {
-  id: String! # chainId:otoken:date
+type Apy {
+  id: ID! # chainId:otoken:date
   chainId: Int!
   otoken: String!
   date: String!
@@ -74,8 +74,8 @@ type OTokenAPY {
   updatedAt: BigInt!
 }
 
-type OTokenDailyStat {
-  id: String! # chainId:otoken:date
+type DailyStat {
+  id: ID! # chainId:otoken:date
   chainId: Int!
   otoken: String!
   date: String!
@@ -91,8 +91,8 @@ type OTokenDailyStat {
   updatedAt: BigInt!
 }
 
-type OTokenActivity {
-  id: String! # chainId:transactionHash:logIndex
+type Activity {
+  id: ID! # chainId:transactionHash:logIndex
   chainId: Int!
   otoken: String!
   transactionHash: String!
@@ -105,20 +105,23 @@ type OTokenActivity {
   logIndex: Int!
 }
 
-type OTokenWithdrawalRequest {
-  id: String! # chainId:otoken:requestId
+type WithdrawalRequest {
+  id: ID! # chainId:otoken:requestId
   chainId: Int!
   otoken: String!
+  withdrawer: String!
   requestId: BigInt!
-  account: String!
   amount: BigInt!
   claimed: Boolean!
   createdAt: BigInt!
   updatedAt: BigInt!
+  queued: BigInt!
+  queueWait: BigInt
+  hash: String!
 }
 
 type WOToken {
-  id: String! # chainId:address
+  id: ID! # chainId:address
   chainId: Int!
   address: String!
   otoken: String!
@@ -127,8 +130,8 @@ type WOToken {
   updatedAt: BigInt!
 }
 
-type OTokenVault {
-  id: String! # chainId:otoken:blockNumber
+type Vault {
+  id: ID! # chainId:otoken:blockNumber
   chainId: Int!
   otoken: String!
   blockNumber: BigInt!
@@ -139,8 +142,8 @@ type OTokenVault {
   createdAt: BigInt!
 }
 
-type OTokenDripperState {
-  id: String! # chainId:otoken:dripperAddress:blockNumber
+type DripperState {
+  id: ID! # chainId:otoken:dripperAddress:blockNumber
   chainId: Int!
   otoken: String!
   dripperAddress: String!
@@ -150,4 +153,3 @@ type OTokenDripperState {
   dripAmount: BigInt!
   createdAt: BigInt!
 }
-
