Merge pull request #2463 from balancer/refactor-modules

franzns · web-flow · commit e200cf7940ad · 2025-12-15T13:46:07.000+01:00
sts and sftmx module refactor
diff --git a/.changeset/beige-seas-accept.md b/.changeset/beige-seas-accept.md
@@ -0,0 +1,5 @@
+---
+'backend': patch
+---
+
+refactor sts and sftmx module
diff --git a/apps/api/gql/resolvers/sftmx.resolvers.ts b/apps/api/gql/resolvers/sftmx.resolvers.ts
@@ -1,5 +1,5 @@
+import { SftmxController } from '../../../../modules/sftmx/sftmx-controller';
 import { Resolvers } from '../generated-schema';
-import { SftmxController } from '../../../../modules/controllers';
 
 const resolvers: Resolvers = {
     Query: {
diff --git a/apps/api/gql/resolvers/sts.resolvers.ts b/apps/api/gql/resolvers/sts.resolvers.ts
@@ -1,5 +1,5 @@
+import { StakedSonicController } from '../../../../modules/sts/sts-controller';
 import { Resolvers } from '../generated-schema';
-import { StakedSonicController } from '../../../../modules/controllers';
 
 const resolvers: Resolvers = {
     Query: {
diff --git a/apps/api/gql/resolvers/token.resolvers.ts b/apps/api/gql/resolvers/token.resolvers.ts
@@ -9,7 +9,7 @@ import { TokenController } from '../../../../modules/controllers/token-controlle
 import config from '../../../../config';
 import { GraphQLError } from 'graphql';
 import { PricingService } from '../../../../modules/pricing';
-import { ContentController } from '../../../../modules/controllers';
+import { ContentController } from '../../../../modules/content/content-controller';
 
 const resolvers: Resolvers = {
     Query: {
diff --git a/apps/worker/job-handlers.ts b/apps/worker/job-handlers.ts
@@ -15,14 +15,11 @@ import { syncLatestFXPrices } from '../../modules/token/latest-fx-price';
 import { chainIdToChain } from '../../modules/network/chain-id-to-chain';
 import { Chain } from '@prisma/client';
 import {
-    SftmxController,
     CowAmmController,
     SnapshotsController,
-    ContentController,
     PoolController,
     EventController,
     StakingController,
-    StakedSonicController,
     UserBalancesController,
     QuantAmmController,
     TokenYieldsController,
@@ -34,11 +31,12 @@ import config from '../../config';
 import { LBPController } from '../../modules/controllers/lbp-controller';
 import { AprsController } from '../../modules/controllers/aprs-controller';
 import { LoopsService } from '../../modules/loops/service';
+import { ContentController } from '../../modules/content/content-controller';
+import { StakedSonicController } from '../../modules/sts/sts-controller';
+import { SftmxController } from '../../modules/sftmx/sftmx-controller';
 
 const runningJobs: Set<string> = new Set();
 
-const sftmxController = SftmxController();
-
 async function runIfNotAlreadyRunning(
     id: string,
     chainId: string,
@@ -256,13 +254,19 @@ const setupJobHandlers = async (name: string, chainId: string, res: any, next: N
             );
             break;
         case 'sync-sftmx-staking-data':
-            await runIfNotAlreadyRunning(name, chainId, () => sftmxController.syncSftmxStakingData(chainId), res, next);
+            await runIfNotAlreadyRunning(
+                name,
+                chainId,
+                () => SftmxController().syncSftmxStakingData(chainId),
+                res,
+                next,
+            );
             break;
         case 'sync-sftmx-withdrawal-requests':
             await runIfNotAlreadyRunning(
                 name,
                 chainId,
-                () => sftmxController.syncSftmxWithdrawalrequests(chainId),
+                () => SftmxController().syncSftmxWithdrawalrequests(chainId),
                 res,
                 next,
             );
diff --git a/modules/actions/sftmx/sync-staking.service.test.ts b/modules/actions/sftmx/sync-staking.service.test.ts
diff --git a/modules/actions/snapshots/v2-snapshot-query.ts b/modules/actions/snapshots/v2-snapshot-query.ts
diff --git a/modules/actions/sts/sync-staking.service.test.ts b/modules/actions/sts/sync-staking.service.test.ts
diff --git a/modules/controllers/cow-amm-controller.ts b/modules/controllers/cow-amm-controller.ts
@@ -7,7 +7,6 @@ import { syncSnapshots } from '../actions/pool/sync-snapshots';
 import { Chain, PrismaLastBlockSyncedCategory } from '@prisma/client';
 import { syncBptBalancesFromSubgraph } from '../actions/user/bpt-balances/helpers/sync-bpt-balances-from-subgraph';
 import { getLastSyncedBlock, upsertLastSyncedBlock } from '../actions/last-synced-block';
-import { updateLifetimeValues } from '../actions/pool/update-liftetime-values';
 import { syncTokenPairs } from '../actions/pool/v3/sync-tokenpairs';
 
 export function CowAmmController(tracer?: any) {
diff --git a/modules/controllers/index.ts b/modules/controllers/index.ts
@@ -1,11 +1,8 @@
-export * from './sftmx-controller';
-export * from './sts-controller';
 export * from './snapshots-controller';
 export * from './pool-mutation-controller';
 export * from './user-balances-controller';
 export * from './cow-amm-controller';
 export * from './event-query-controller';
-export * from '../content/content-controller';
 export * from './fx-pools-controller';
 export * from './pool-controller';
 export * from './event-controller';
diff --git a/modules/pool/lib/pool-gql-loader.service.ts b/modules/pool/lib/pool-gql-loader.service.ts
@@ -46,7 +46,7 @@ import { addressesMatch } from '../../web3/addresses';
 import { getWeightSnapshots } from '../../actions/quant-amm/get-weight-snapshots';
 import { mapPoolToken, enrichWithErc4626Data, mapAprItems } from './pool-gql-mapper-helper';
 import { AllNetworkConfigsKeyedOnChain } from '../../network/network-config';
-import { ContentController } from '../../controllers';
+import { ContentController } from '../../content/content-controller';
 
 const isToken = (text: string) => text.match(/^0x[0-9a-fA-F]{40}$/);
 const isPoolId = (text: string) => isToken(text) || text.match(/^0x[0-9a-fA-F]{64}$/);
diff --git a/modules/sftmx/lib/fetch-sftmx-staking-data.ts b/modules/sftmx/lib/fetch-sftmx-staking-data.ts
@@ -1,9 +1,9 @@
 import { Address, formatEther } from 'viem';
-import FTMStaking from './abis/FTMStaking';
-import SftmxVault from './abis/SftmxVault';
-import SFC from './abis/SFC';
-import { ViemClient } from '../types';
+import FTMStaking from '../../sources/contracts/abis/FTMStaking';
+import SftmxVault from '../../sources/contracts/abis/SftmxVault';
+import SFC from '../../sources/contracts/abis/SFC';
 import { ZERO_ADDRESS } from '@balancer/sdk';
+import { ViemClient } from '../../sources/viem-client';
 
 export interface OnchainSftmxStakingData {
     totalFtmStaked: bigint;
diff --git a/modules/sftmx/lib/sync-staking-data.ts b/modules/sftmx/lib/sync-staking-data.ts
@@ -1,7 +1,7 @@
-import { prisma } from '../../../prisma/prisma-client';
-import { fetchSftmxStakingData } from '../../sources/contracts/fetch-sftmx-staking-data';
 import { Address, formatEther } from 'viem';
 import { ViemClient } from '../../sources/viem-client';
+import { prisma } from '../../../prisma/prisma-client';
+import { fetchSftmxStakingData } from './fetch-sftmx-staking-data';
 
 export async function syncStakingData(stakingContractAddress: Address, viemClient: ViemClient) {
     const stakingData = await fetchSftmxStakingData(stakingContractAddress, viemClient);
diff --git a/modules/sftmx/lib/sync-staking-snapshots.ts b/modules/sftmx/lib/sync-staking-snapshots.ts
diff --git a/modules/sftmx/lib/sync-withdrawal-requests.ts b/modules/sftmx/lib/sync-withdrawal-requests.ts
diff --git a/modules/sftmx/sftmx-controller.ts b/modules/sftmx/sftmx-controller.ts
@@ -1,11 +1,11 @@
 import config from '../../config';
 import { chainIdToChain } from '../network/chain-id-to-chain';
 import { getViemClient } from '../sources/viem-client';
-import { syncStakingData as syncSftmxStakingData } from '../actions/sftmx/sync-staking-data';
+import { syncStakingData as syncSftmxStakingData } from './lib/sync-staking-data';
 import { Address } from 'viem';
-import { syncWithdrawalRequests as syncSftmxWithdrawalRequests } from '../actions/sftmx/sync-withdrawal-requests';
+import { syncWithdrawalRequests as syncSftmxWithdrawalRequests } from './lib/sync-withdrawal-requests';
 import { SftmxSubgraphService } from '../sources/subgraphs/sftmx-subgraph/sftmx.service';
-import { syncSftmxStakingSnapshots } from '../actions/sftmx/sync-staking-snapshots';
+import { syncSftmxStakingSnapshots } from './lib/sync-staking-snapshots';
 import moment from 'moment';
 import { prisma } from '../../prisma/prisma-client';
 import {
diff --git a/modules/sftmx/sync-staking.service.test.ts b/modules/sftmx/sync-staking.service.test.ts
@@ -0,0 +1,15 @@
+import { SftmxController } from './sftmx-controller';
+
+describe('SFTMX syncing service', () => {
+    test('sync withdrawal data', async () => {
+        await SftmxController().syncSftmxWithdrawalrequests('250');
+    }, 50000);
+
+    test('sync staking data via job', async () => {
+        await SftmxController().syncSftmxStakingData('250');
+    }, 50000000);
+
+    test('sync staking snapshot data via job', async () => {
+        await SftmxController().syncSftmxStakingSnapshots('250');
+    }, 50000);
+});
diff --git a/modules/sts/lib/fetch-sts-staking-data.ts b/modules/sts/lib/fetch-sts-staking-data.ts
@@ -1,6 +1,6 @@
 import { Address, formatEther, formatUnits } from 'viem';
-import SonicStaking from './abis/SonicStaking';
-import { ViemClient } from '../types';
+import SonicStaking from '../../sources/contracts/abis/SonicStaking';
+import { ViemClient } from '../../sources/types';
 
 export interface OnchainSonicStakingData {
     totalAssets: string;
diff --git a/modules/sts/lib/sync-staking-data.ts b/modules/sts/lib/sync-staking-data.ts
@@ -1,5 +1,5 @@
 import { prisma } from '../../../prisma/prisma-client';
-import { fetchSonicStakingData } from '../../sources/contracts/fetch-sts-staking-data';
+import { fetchSonicStakingData } from './fetch-sts-staking-data';
 import { StsSubgraphService } from '../../sources/subgraphs/sts-subgraph/sts.service';
 import { Address } from 'viem';
 import { ViemClient } from '../../sources/viem-client';
diff --git a/modules/sts/lib/sync-staking-snapshots.ts b/modules/sts/lib/sync-staking-snapshots.ts
diff --git a/modules/sts/sts-controller.ts b/modules/sts/sts-controller.ts
@@ -7,9 +7,9 @@ import {
     GqlStakedSonicSnapshot,
     GqlStakedSonicSnapshotDataRange,
 } from '../../apps/api/gql/generated-schema';
-import { syncStakingData } from '../actions/sts/sync-staking-data';
+import { syncStakingData } from './lib/sync-staking-data';
 import { StsSubgraphService } from '../sources/subgraphs/sts-subgraph/sts.service';
-import { syncSonicStakingSnapshots } from '../actions/sts/sync-staking-snapshots';
+import { syncSonicStakingSnapshots } from './lib/sync-staking-snapshots';
 import moment from 'moment';
 
 const getTimestampForRange = (range: GqlStakedSonicSnapshotDataRange): number => {
diff --git a/modules/sts/sts-debug.test.ts b/modules/sts/sts-debug.test.ts
@@ -2,6 +2,7 @@ import { StakedSonicController } from './sts-controller';
 import { protocolService } from '../protocol/protocol.service';
 import { poolService } from '../pool/pool.service';
 import { initRequestScopedContext, setRequestScopedContextValue } from '../context/request-scoped-context';
+import { AprService } from '../aprs';
 
 describe('sts controller debugging', () => {
     it('sync and get sts data', async () => {
@@ -21,7 +22,7 @@ describe('sts controller debugging', () => {
     it('sync and get sts apr', async () => {
         initRequestScopedContext();
         setRequestScopedContextValue('chainId', '146');
-        await poolService.updatePoolAprs('SONIC');
+        await new AprService().updateAprs('SONIC');
         let pools = await poolService.getGqlPools({ where: { chainIn: ['SONIC'] } });
 
         console.log(pools.length);
diff --git a/tasks/index.ts b/tasks/index.ts
@@ -1,20 +1,16 @@
 import {
-    SftmxController,
     SnapshotsController,
     UserBalancesController,
     CowAmmController,
-    ContentController,
     FXPoolsController,
     PoolController,
     EventController,
     StakingController,
-    StakedSonicController,
     TokenController,
     QuantAmmController,
     TokenYieldsController,
 } from '../modules/controllers';
 import { chainIdToChain } from '../modules/network/chain-id-to-chain';
-import { tokenService } from '../modules/token/token.service';
 import { VeBalVotingListService } from '../modules/vebal/vebal-voting-list.service';
 import { Chain, PrismaLastBlockSyncedCategory } from '@prisma/client';
 import { upsertLastSyncedBlock } from '../modules/actions/last-synced-block';
@@ -27,6 +23,9 @@ import { PricingService } from '../modules/pricing';
 import { LoopsService } from '../modules/loops/service';
 import { userService } from '../modules/user/user.service';
 import { veBalService } from '../modules/vebal/vebal.service';
+import { ContentController } from '../modules/content/content-controller';
+import { SftmxController } from '../modules/sftmx/sftmx-controller';
+import { StakedSonicController } from '../modules/sts/sts-controller';
 
 /**
  * Used to run jobs or mutations locally from the command line

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'backend': patch
 +---
++
 +refactor sts and sftmx module