Yield Delegation

abi/otoken-old.json

@@ -0,0 +1,27 @@
+[
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "totalSupply",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "rebasingCredits",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "rebasingCreditsPerToken",
+        "type": "uint256"
+      }
+    ],
+    "name": "TotalSupplyUpdated",
+    "type": "event"
+  }
+]

schema.graphql

@@ -1082,11 +1082,6 @@ type ExchangeRate @entity {
   rate: BigInt!
 }
 
-enum RebasingOption {
-  OptIn
-  OptOut
-}
-
 enum HistoryType {
   Sent
   Received
@@ -1152,9 +1147,6 @@ type NativeBalance @entity {
 }
 
 type ERC20 @entity {
-  """
-  Format: 'address'
-  """
   id: ID!
   chainId: Int! @index
   address: String! @index
@@ -1164,9 +1156,6 @@ type ERC20 @entity {
 }
 
 type ERC20Holder @entity {
-  """
-  Format: 'address:account'
-  """
   id: ID!
   chainId: Int! @index
   address: String! @index
@@ -1176,9 +1165,6 @@ type ERC20Holder @entity {
 }
 
 type ERC20State @entity {
-  """
-  Format: 'address:blockNumber'
-  """
   id: ID!
   chainId: Int! @index
   timestamp: DateTime! @index
@@ -1190,9 +1176,6 @@ type ERC20State @entity {
 }
 
 type ERC20Balance @entity {
-  """
-  Format: 'address:account:blockNumber'
-  """
   id: ID!
   chainId: Int! @index
   timestamp: DateTime! @index
@@ -1626,6 +1609,7 @@ type OTokenAddress @entity {
   balance: BigInt!
   earned: BigInt!
   credits: BigInt!
+  delegatedTo: String
   lastUpdated: DateTime!
   history: [OTokenHistory!]! @derivedFrom(field: "address")
 }
@@ -1671,6 +1655,7 @@ type OTokenRebaseOption @entity {
   txHash: String! @index
   address: OTokenAddress!
   status: RebasingOption!
+  delegatedTo: String
 }
 
 type OTokenAPY @entity {
@@ -1813,6 +1798,13 @@ type OTokenWithdrawalRequest @entity {
   claimed: Boolean!
   txHash: String! @index
 }
+
+enum RebasingOption {
+  OptIn
+  OptOut
+  YieldDelegationSource
+  YieldDelegationTarget
+}
 type MorphoMarketState @entity {
   id: ID!
   chainId: Int!

schema/general.graphql

@@ -23,11 +23,6 @@ type ExchangeRate @entity {
   rate: BigInt!
 }
 
-enum RebasingOption {
-  OptIn
-  OptOut
-}
-
 enum HistoryType {
   Sent
   Received
@@ -93,9 +88,6 @@ type NativeBalance @entity {
 }
 
 type ERC20 @entity {
-  """
-  Format: 'address'
-  """
   id: ID!
   chainId: Int! @index
   address: String! @index
@@ -105,9 +97,6 @@ type ERC20 @entity {
 }
 
 type ERC20Holder @entity {
-  """
-  Format: 'address:account'
-  """
   id: ID!
   chainId: Int! @index
   address: String! @index
@@ -117,9 +106,6 @@ type ERC20Holder @entity {
 }
 
 type ERC20State @entity {
-  """
-  Format: 'address:blockNumber'
-  """
   id: ID!
   chainId: Int! @index
   timestamp: DateTime! @index
@@ -131,9 +117,6 @@ type ERC20State @entity {
 }
 
 type ERC20Balance @entity {
-  """
-  Format: 'address:account:blockNumber'
-  """
   id: ID!
   chainId: Int! @index
   timestamp: DateTime! @index

schema/otoken.graphql

@@ -27,6 +27,7 @@ type OTokenAddress @entity {
   balance: BigInt!
   earned: BigInt!
   credits: BigInt!
+  delegatedTo: String
   lastUpdated: DateTime!
   history: [OTokenHistory!]! @derivedFrom(field: "address")
 }
@@ -72,6 +73,7 @@ type OTokenRebaseOption @entity {
   txHash: String! @index
   address: OTokenAddress!
   status: RebasingOption!
+  delegatedTo: String
 }
 
 type OTokenAPY @entity {
@@ -214,3 +216,10 @@ type OTokenWithdrawalRequest @entity {
   claimed: Boolean!
   txHash: String! @index
 }
+
+enum RebasingOption {
+  OptIn
+  OptOut
+  YieldDelegationSource
+  YieldDelegationTarget
+}

src/abi/otoken-old.ts

@@ -0,0 +1,13 @@
+import * as p from '@subsquid/evm-codec'
+import { event, fun, viewFun, indexed, ContractBase } from '@subsquid/evm-abi'
+import type { EventParams as EParams, FunctionArguments, FunctionReturn } from '@subsquid/evm-abi'
+
+export const events = {
+    TotalSupplyUpdated: event("0x99e56f783b536ffacf422d59183ea321dd80dcd6d23daa13023e8afea38c3df1", "TotalSupplyUpdated(uint256,uint256,uint256)", {"totalSupply": p.uint256, "rebasingCredits": p.uint256, "rebasingCreditsPerToken": p.uint256}),
+}
+
+export class Contract extends ContractBase {
+}
+
+/// Event types
+export type TotalSupplyUpdatedEventArgs = EParams<typeof events.TotalSupplyUpdated>

src/base/erc20.ts

@@ -1,7 +1,7 @@
 import * as otoken from '@abi/otoken'
 import { createERC20Tracker } from '@templates/erc20'
 import { createERC20SimpleTracker } from '@templates/erc20-simple'
-import { createRebasingERC20Tracker } from '@templates/erc20/erc20-rebasing'
+import { createRebasingERC20Tracker, getErc20RebasingParams } from '@templates/erc20/erc20-rebasing'
 import { OGN_BASE_ADDRESS } from '@utils/addresses'
 import { baseAddresses } from '@utils/addresses-base'
 import { logFilter } from '@utils/logFilter'
@@ -31,6 +31,11 @@ export const baseERC20s = [
         const oToken = new otoken.Contract(ctx, block.header, baseAddresses.tokens.superOETHb)
         return oToken.rebasingCreditsPerTokenHighres()
       },
+      ...getErc20RebasingParams({
+        from: 17819702,
+        yieldDelegationFrom: 23192884,
+        address: baseAddresses.tokens.superOETHb,
+      }),
     },
   }),
   // wsuperOETHb

src/mainnet/processors/erc20s.ts

@@ -1,7 +1,7 @@
 import * as otoken from '@abi/otoken'
 import { createERC20Tracker } from '@templates/erc20'
 import { createERC20SimpleTracker } from '@templates/erc20-simple'
-import { createRebasingERC20Tracker } from '@templates/erc20/erc20-rebasing'
+import { createRebasingERC20Tracker, getErc20RebasingParams } from '@templates/erc20/erc20-rebasing'
 import {
   OETH_ADDRESS,
   OETH_DRIPPER_ADDRESS,
@@ -62,6 +62,7 @@ const rebasingTracks: Record<string, Parameters<typeof createRebasingERC20Tracke
         const oToken = new otoken.Contract(ctx, block.header, tokens.OETH)
         return oToken.rebasingCreditsPerTokenHighres()
       },
+      ...getErc20RebasingParams({ from: 16935276, yieldDelegationFrom: 21325305, address: OETH_ADDRESS }),
     },
   },
 }

src/model/generated/_rebasingOption.ts

@@ -1,4 +1,6 @@
 export enum RebasingOption {
     OptIn = "OptIn",
     OptOut = "OptOut",
+    YieldDelegationSource = "YieldDelegationSource",
+    YieldDelegationTarget = "YieldDelegationTarget",
 }

src/model/generated/erc20.model.ts

@@ -6,9 +6,6 @@ export class ERC20 {
         Object.assign(this, props)
     }
 
-    /**
-     * Format: 'address'
-     */
     @PrimaryColumn_()
     id!: string
 

src/model/generated/erc20Balance.model.ts

@@ -6,9 +6,6 @@ export class ERC20Balance {
         Object.assign(this, props)
     }
 
-    /**
-     * Format: 'address:account:blockNumber'
-     */
     @PrimaryColumn_()
     id!: string
 

src/model/generated/erc20Holder.model.ts

@@ -6,9 +6,6 @@ export class ERC20Holder {
         Object.assign(this, props)
     }
 
-    /**
-     * Format: 'address:account'
-     */
     @PrimaryColumn_()
     id!: string
 

src/model/generated/erc20State.model.ts

@@ -6,9 +6,6 @@ export class ERC20State {
         Object.assign(this, props)
     }
 
-    /**
-     * Format: 'address:blockNumber'
-     */
     @PrimaryColumn_()
     id!: string
 

src/model/generated/oTokenAddress.model.ts

@@ -26,7 +26,7 @@ export class OTokenAddress {
     @BooleanColumn_({nullable: false})
     isContract!: boolean
 
-    @Column_("varchar", {length: 6, nullable: false})
+    @Column_("varchar", {length: 21, nullable: false})
     rebasingOption!: RebasingOption
 
     @BigIntColumn_({nullable: false})
@@ -38,6 +38,9 @@ export class OTokenAddress {
     @BigIntColumn_({nullable: false})
     credits!: bigint
 
+    @StringColumn_({nullable: true})
+    delegatedTo!: string | undefined | null
+
     @DateTimeColumn_({nullable: false})
     lastUpdated!: Date
 

src/model/generated/oTokenRebaseOption.model.ts

@@ -35,6 +35,9 @@ export class OTokenRebaseOption {
     @ManyToOne_(() => OTokenAddress, {nullable: true})
     address!: OTokenAddress
 
-    @Column_("varchar", {length: 6, nullable: false})
+    @Column_("varchar", {length: 21, nullable: false})
     status!: RebasingOption
+
+    @StringColumn_({nullable: true})
+    delegatedTo!: string | undefined | null
 }

src/oeth/processors/ccip.ts

@@ -181,5 +181,5 @@ export const ccip = (params: { chainId: 1 | 42161 }) => {
     await ctx.store.upsert([...result.bridgeTransferStates.values()])
   }
 
-  return { from, setup, process }
+  return { name: `ccip-${params.chainId}`, from, setup, process }
 }

src/oeth/processors/oeth.ts

@@ -92,6 +92,7 @@ const otokenActivityProcessor = createOTokenActivityProcessor({
   },
 })
 
+export const name = 'oeth'
 export const from = Math.min(otokenProcessor.from, otokenActivityProcessor.from)
 export const setup = (processor: EvmBatchProcessor) => {
   otokenProcessor.setup(processor)

src/oeth/processors/strategies.ts

@@ -192,6 +192,7 @@ const eventProcessors = [
   }),
 ]
 
+export const name = 'strategies'
 export const from = Math.min(...strategies.map((s) => s.from))
 
 export const setup = (processor: EvmBatchProcessor) => {

src/ousd/processors/erc20s.ts

@@ -1,6 +1,7 @@
 import * as otoken from '@abi/otoken'
+import * as otokenOld from '@abi/otoken-old'
 import { createERC20Tracker } from '@templates/erc20'
-import { createRebasingERC20Tracker } from '@templates/erc20/erc20-rebasing'
+import { createRebasingERC20Tracker, getErc20RebasingParams } from '@templates/erc20/erc20-rebasing'
 import { OUSD_ADDRESS, OUSD_VAULT_ADDRESS, ousdStrategyArray, tokens } from '@utils/addresses'
 import { logFilter } from '@utils/logFilter'
 
@@ -11,7 +12,7 @@ const rebasingTracks: Record<string, Parameters<typeof createRebasingERC20Tracke
     rebasing: {
       rebaseEventFilter: logFilter({
         address: [OUSD_ADDRESS],
-        topic0: [otoken.events.TotalSupplyUpdatedHighres.topic],
+        topic0: [otokenOld.events.TotalSupplyUpdated.topic, otoken.events.TotalSupplyUpdatedHighres.topic],
         transaction: true,
         range: { from: 11585978 },
       }),
@@ -29,6 +30,7 @@ const rebasingTracks: Record<string, Parameters<typeof createRebasingERC20Tracke
         }
         return oToken.rebasingCreditsPerTokenHighres()
       },
+      ...getErc20RebasingParams({ from: 11585978, yieldDelegationFrom: 21325305, address: OUSD_ADDRESS }),
     },
   },
 }