add etherfi arm

Author: apexearth

abi/origin-etherfi-arm.json

@@ -1,6 +1,6 @@
-import type { EventParams as EParams, FunctionArguments, FunctionReturn } from '@subsquid/evm-abi'
-import { ContractBase, event, fun, indexed, viewFun } from '@subsquid/evm-abi'
 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 = {
     BalancesSnapped: event("0xb7523e03ed4a74718427c422a01fee1138835adb5bd592240f30bd8b5e1b929a", "BalancesSnapped(bytes32,uint256)", {"blockRoot": indexed(p.bytes32), "ethBalance": p.uint256}),

abi/origin-arm.json abi/origin-os-arm.jsonabi/origin-arm.json renamed to abi/origin-os-arm.json

@@ -1,7 +1,7 @@
 import { coingeckoProcessor } from 'mainnet/processors/coingecko'
 import { notionProcessor } from 'mainnet/processors/notion'
 import { ognBuybacks } from 'mainnet/processors/ogn-buybacks'
-import { originArmProcessors } from 'mainnet/processors/origin-arm'
+import { originArmProcessors } from 'mainnet/processors/origin-arms'
 import { protocolSqlSimpleProcessor } from 'mainnet/processors/protocol/protocol-sql-simple'
 import 'tsconfig-paths/register'
 import { mainnet } from 'viem/chains'

src/abi/compound-staking-ssv-strategy.ts

@@ -0,0 +1,26 @@
+import { createOriginARMProcessors } from '@templates/origin-arm'
+import { addresses } from '@utils/addresses'
+
+export const originArmProcessors = [
+  // Lido ARM
+  ...createOriginARMProcessors({
+    name: 'ARM-WETH-stETH',
+    from: 20987226,
+    armAddress: addresses.arms['ARM-WETH-stETH'].address,
+    underlyingToken: 'WETH',
+    capManagerAddress: addresses.arms['ARM-WETH-stETH'].capManager,
+    armType: 'lido',
+    marketFrom: 23130294,
+  }),
+
+  // Ether.fi ARM
+  ...createOriginARMProcessors({
+    name: 'ARM-WETH-eETH',
+    from: 23689028,
+    armAddress: addresses.arms['ARM-WETH-eETH'].address,
+    underlyingToken: 'WETH',
+    capManagerAddress: addresses.arms['ARM-WETH-eETH'].capManager,
+    armType: 'etherfi',
+    marketFrom: 23689033,
+  }),
+]

src/abi/origin-etherfi-arm.ts

@@ -8,5 +8,5 @@ export const sonicArmProcessors = createOriginARMProcessors({
   underlyingToken: 'S',
   capManagerAddress: sonicAddresses.armOS.capManager,
   marketFrom: 37481525,
-  lidoArm: false,
+  armType: 'os',
 })

src/abi/origin-os-arm.ts

@@ -4,7 +4,8 @@ import { LessThan } from 'typeorm'
 import { formatUnits } from 'viem'
 
 import * as erc20Abi from '@abi/erc20'
-import * as originArmAbi from '@abi/origin-arm'
+import * as originOsArmAbi from '@abi/origin-arm'
+import * as originEtherfiArmAbi from '@abi/origin-etherfi-arm'
 import * as originLidoArmAbi from '@abi/origin-lido-arm'
 import * as originLidoArmCapManagerAbi from '@abi/origin-lido-arm-cap-manager'
 import { Arm, ArmDailyStat, ArmState, ArmSwap, ArmWithdrawalRequest, TraderateChanged } from '@model'
@@ -30,15 +31,15 @@ export const createOriginARMProcessors = ({
   underlyingToken,
   capManagerAddress,
   marketFrom,
-  lidoArm,
+  armType,
 }: {
   name: string
   from: number
   armAddress: string
   underlyingToken: Currency
   capManagerAddress: string
   marketFrom?: number
-  lidoArm: boolean
+  armType: 'lido' | 'etherfi' | 'os'
 }): Processor[] => {
   const redeemRequestedFilter = logFilter({
     address: [armAddress],
@@ -110,7 +111,7 @@ export const createOriginARMProcessors = ({
     if (entity) {
       armEntity = entity
     } else {
-      const armContract = new originArmAbi.Contract(ctx, ctx.blocks[0].header, armAddress)
+      const armContract = new originOsArmAbi.Contract(ctx, ctx.blocks[0].header, armAddress)
       const [name, symbol, decimals, token0, token1] = await Promise.all([
         armContract.name(),
         armContract.symbol(),
@@ -184,8 +185,10 @@ export const createOriginARMProcessors = ({
             return armStateEntity
           }
           const previousState = await getPreviousState(block)
+          const armContract = new originOsArmAbi.Contract(ctx, block.header, armAddress)
           const lidoArmContract = new originLidoArmAbi.Contract(ctx, block.header, armAddress)
-          const armContract = new originArmAbi.Contract(ctx, block.header, armAddress)
+          const osArmContract = new originOsArmAbi.Contract(ctx, block.header, armAddress)
+          const etherfiArmContract = new originEtherfiArmAbi.Contract(ctx, block.header, armAddress)
           const controllerContract = new originLidoArmCapManagerAbi.Contract(ctx, block.header, capManagerAddress)
           const [
             assets0,
@@ -198,9 +201,13 @@ export const createOriginARMProcessors = ({
             assetsPerShare,
             activeMarket,
           ] = await Promise.all([
-            new erc20Abi.Contract(ctx, block.header, armEntity.token0).balanceOf(armAddress),
-            new erc20Abi.Contract(ctx, block.header, armEntity.token1).balanceOf(armAddress),
-            lidoArm ? lidoArmContract.lidoWithdrawalQueueAmount() : armContract.vaultWithdrawalAmount(),
+            armContract.balanceOf(armAddress),
+            armContract.balanceOf(armAddress),
+            {
+              lido: lidoArmContract.lidoWithdrawalQueueAmount.bind(lidoArmContract),
+              os: osArmContract.vaultWithdrawalAmount.bind(osArmContract),
+              etherfi: etherfiArmContract.etherfiWithdrawalQueueAmount.bind(etherfiArmContract),
+            }[armType](),
             armContract.feesAccrued(),
             armContract.totalAssets(),
             controllerContract.totalAssetsCap(),
@@ -212,9 +219,7 @@ export const createOriginARMProcessors = ({
             ? await new erc20Abi.Contract(ctx, block.header, activeMarket).balanceOf(armAddress)
             : 0n
           const marketAssets =
-            activeMarket && marketBalanceOf > 0n
-              ? await new originArmAbi.Contract(ctx, block.header, activeMarket).previewRedeem(marketBalanceOf)
-              : 0n
+            activeMarket && marketBalanceOf > 0n ? await armContract.previewRedeem(marketBalanceOf) : 0n
           const date = new Date(block.header.timestamp)
           armStateEntity = new ArmState({
             id: stateId,
@@ -321,17 +326,17 @@ export const createOriginARMProcessors = ({
                     data.from.toLowerCase() === armAddress
                       ? acc - data.value
                       : data.to.toLowerCase() === armAddress
-                      ? acc + data.value
-                      : acc,
+                        ? acc + data.value
+                        : acc,
                   0n,
                 )
                 const assets1 = transfers1.reduce(
                   (acc, data) =>
                     data.from.toLowerCase() === armAddress
                       ? acc - data.value
                       : data.to.toLowerCase() === armAddress
-                      ? acc + data.value
-                      : acc,
+                        ? acc + data.value
+                        : acc,
                   0n,
                 )
 

src/main-mainnet.ts

@@ -193,10 +193,17 @@ export const ogv = {
   governance: OGV_GOVERNANCE_ADDRESS,
 }
 
-export const arm = {
-  address: '0x85b78aca6deae198fbf201c82daf6ca21942acc6',
-  capManager: '0xf54ebff575f699d281645c6f14fe427dffe629cf',
-  zapper: '0x01f30b7358ba51f637d1aa05d9b4a60f76dad680',
+export const arms: Record<string, { address: string; capManager: string; zapper: string }> = {
+  ['ARM-WETH-eETH']: {
+    address: '0xfb0a3cf9b019bfd8827443d131b235b3e0fc58d2',
+    capManager: '0xf2a18f7330141ec737eb73a0a5ea8e4d7e9be7ec',
+    zapper: '0xe11edbd5ae4fa434af7f8d7f03da1742996e7ab2',
+  },
+  ['ARM-WETH-stETH']: {
+    address: '0x85b78aca6deae198fbf201c82daf6ca21942acc6',
+    capManager: '0xf54ebff575f699d281645c6f14fe427dffe629cf',
+    zapper: '0x01f30b7358ba51f637d1aa05d9b4a60f76dad680',
+  },
 }
 
 export const multisig = {
@@ -210,5 +217,5 @@ export const addresses = {
   oeth,
   ousd,
   ogv,
-  arm,
+  arms,
 }