YB tokens refactor, new Maker on Gnosis source (#489)

* simplified yb tokens apr handler * adding maker gnosis self-config handler * pass configuration to services * ignore debug scripts * removing leftover console.log * adding maker apr type * dep info
beethovenxfi · Oct 19, 2023 · d634405 · d634405
1 parent c177c31
commit d634405
Show file tree

Hide file tree

Showing 36 changed files with 324 additions and 214 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,9 +9,9 @@ node_modules/
 *-error.log
 **/generated/*
 
+debug
 debug.ts
 schema.ts
-debug.ts
 graphql_schema_generated*.ts
 i18n/*
 google-service-account.json

diff --git a/modules/network/arbitrum.ts b/modules/network/arbitrum.ts
@@ -225,8 +225,13 @@ export const arbitrumNetworkConfig: NetworkConfig = {
     contentService: new GithubContentService(),
     provider: new ethers.providers.JsonRpcProvider({ url: arbitrumNetworkData.rpcUrl, timeout: 60000 }),
     poolAprServices: [
-        new IbTokensAprService(arbitrumNetworkData.ibAprConfig),
-        new PhantomStableAprService(),
+        new IbTokensAprService(
+            arbitrumNetworkData.ibAprConfig,
+            arbitrumNetworkData.chain.prismaId,
+            arbitrumNetworkData.balancer.yieldProtocolFeePercentage,
+            arbitrumNetworkData.balancer.swapProtocolFeePercentage
+        ),
+        new PhantomStableAprService(arbitrumNetworkData.chain.prismaId, arbitrumNetworkData.balancer.yieldProtocolFeePercentage),
         new BoostedPoolAprService(),
         new SwapFeeAprService(arbitrumNetworkData.balancer.swapProtocolFeePercentage),
         new GaugeAprService(tokenService, [arbitrumNetworkData.bal!.address]),

diff --git a/modules/network/avalanche.ts b/modules/network/avalanche.ts
@@ -217,8 +217,13 @@ export const avalancheNetworkConfig: NetworkConfig = {
     contentService: new GithubContentService(),
     provider: new ethers.providers.JsonRpcProvider({ url: avalancheNetworkData.rpcUrl, timeout: 60000 }),
     poolAprServices: [
-        new IbTokensAprService(avalancheNetworkData.ibAprConfig),
-        new PhantomStableAprService(),
+        new IbTokensAprService(
+            avalancheNetworkData.ibAprConfig,
+            avalancheNetworkData.chain.prismaId,
+            avalancheNetworkData.balancer.yieldProtocolFeePercentage,
+            avalancheNetworkData.balancer.swapProtocolFeePercentage
+        ),
+        new PhantomStableAprService(avalancheNetworkData.chain.prismaId, avalancheNetworkData.balancer.yieldProtocolFeePercentage),
         new BoostedPoolAprService(),
         new SwapFeeAprService(avalancheNetworkData.balancer.swapProtocolFeePercentage),
         new GaugeAprService(tokenService, [avalancheNetworkData.bal!.address]),

diff --git a/modules/network/base.ts b/modules/network/base.ts
@@ -119,7 +119,12 @@ export const baseNetworkConfig: NetworkConfig = {
     contentService: new GithubContentService(),
     provider: new ethers.providers.JsonRpcProvider({ url: baseNetworkData.rpcUrl, timeout: 60000 }),
     poolAprServices: [
-        new IbTokensAprService(baseNetworkData.ibAprConfig),
+        new IbTokensAprService(
+            baseNetworkData.ibAprConfig,
+            baseNetworkData.chain.prismaId,
+            baseNetworkData.balancer.yieldProtocolFeePercentage,
+            baseNetworkData.balancer.swapProtocolFeePercentage
+        ),
         new BoostedPoolAprService(),
         new SwapFeeAprService(baseNetworkData.balancer.swapProtocolFeePercentage),
         new GaugeAprService(tokenService, [baseNetworkData.bal!.address]),

diff --git a/modules/network/fantom.ts b/modules/network/fantom.ts
@@ -300,9 +300,14 @@ export const fantomNetworkConfig: NetworkConfig = {
     contentService: new SanityContentService(),
     provider: new ethers.providers.JsonRpcProvider({ url: fantomNetworkData.rpcUrl, timeout: 60000 }),
     poolAprServices: [
-        new IbTokensAprService(fantomNetworkData.ibAprConfig),
+        new IbTokensAprService(
+            fantomNetworkData.ibAprConfig,
+            fantomNetworkData.chain.prismaId,
+            fantomNetworkData.balancer.yieldProtocolFeePercentage,
+            fantomNetworkData.balancer.swapProtocolFeePercentage
+        ),
         // new SpookySwapAprService(tokenService, fantomNetworkData.spooky!.xBooContract),
-        new PhantomStableAprService(),
+        new PhantomStableAprService(fantomNetworkData.chain.prismaId, fantomNetworkData.balancer.yieldProtocolFeePercentage),
         new BoostedPoolAprService(),
         new SwapFeeAprService(fantomNetworkData.balancer.swapProtocolFeePercentage),
         new MasterchefFarmAprService(fantomNetworkData.beets!.address),

diff --git a/modules/network/gnosis.ts b/modules/network/gnosis.ts
@@ -143,8 +143,13 @@ export const gnosisNetworkConfig: NetworkConfig = {
     contentService: new GithubContentService(),
     provider: new ethers.providers.JsonRpcProvider({ url: gnosisNetworkData.rpcUrl, timeout: 60000 }),
     poolAprServices: [
-        new IbTokensAprService(gnosisNetworkData.ibAprConfig),
-        new PhantomStableAprService(),
+        new IbTokensAprService(
+            gnosisNetworkData.ibAprConfig,
+            gnosisNetworkData.chain.prismaId,
+            gnosisNetworkData.balancer.yieldProtocolFeePercentage,
+            gnosisNetworkData.balancer.swapProtocolFeePercentage,
+        ),
+        new PhantomStableAprService(gnosisNetworkData.chain.prismaId, gnosisNetworkData.balancer.yieldProtocolFeePercentage),
         new BoostedPoolAprService(),
         new SwapFeeAprService(gnosisNetworkData.balancer.swapProtocolFeePercentage),
         new GaugeAprService(tokenService, [gnosisNetworkData.bal!.address]),

diff --git a/modules/network/mainnet.ts b/modules/network/mainnet.ts
@@ -364,8 +364,13 @@ export const mainnetNetworkConfig: NetworkConfig = {
     contentService: new GithubContentService(),
     provider: new ethers.providers.JsonRpcProvider({ url: mainnetNetworkData.rpcUrl, timeout: 60000 }),
     poolAprServices: [
-        new IbTokensAprService(mainnetNetworkData.ibAprConfig),
-        new PhantomStableAprService(),
+        new IbTokensAprService(
+            mainnetNetworkData.ibAprConfig,
+            mainnetNetworkData.chain.prismaId,
+            mainnetNetworkData.balancer.yieldProtocolFeePercentage,
+            mainnetNetworkData.balancer.swapProtocolFeePercentage
+        ),
+        new PhantomStableAprService(mainnetNetworkData.chain.prismaId, mainnetNetworkData.balancer.yieldProtocolFeePercentage),
         new BoostedPoolAprService(),
         new SwapFeeAprService(mainnetNetworkData.balancer.swapProtocolFeePercentage),
         new GaugeAprService(tokenService, [mainnetNetworkData.bal!.address]),

diff --git a/modules/network/optimism.ts b/modules/network/optimism.ts
@@ -258,8 +258,13 @@ export const optimismNetworkConfig: NetworkConfig = {
     contentService: new SanityContentService(),
     provider: new ethers.providers.JsonRpcProvider({ url: optimismNetworkData.rpcUrl, timeout: 60000 }),
     poolAprServices: [
-        new IbTokensAprService(optimismNetworkData.ibAprConfig),
-        new PhantomStableAprService(),
+        new IbTokensAprService(
+            optimismNetworkData.ibAprConfig,
+            optimismNetworkData.chain.prismaId,
+            optimismNetworkData.balancer.yieldProtocolFeePercentage,
+            optimismNetworkData.balancer.swapProtocolFeePercentage,
+        ),
+        new PhantomStableAprService(optimismNetworkData.chain.prismaId, optimismNetworkData.balancer.yieldProtocolFeePercentage),
         new BoostedPoolAprService(),
         new SwapFeeAprService(optimismNetworkData.balancer.swapProtocolFeePercentage),
         new GaugeAprService(tokenService, [

diff --git a/modules/network/polygon.ts b/modules/network/polygon.ts
@@ -262,8 +262,13 @@ export const polygonNetworkConfig: NetworkConfig = {
     contentService: new GithubContentService(),
     provider: new ethers.providers.JsonRpcProvider({ url: polygonNetworkData.rpcUrl, timeout: 60000 }),
     poolAprServices: [
-        new IbTokensAprService(polygonNetworkData.ibAprConfig),
-        new PhantomStableAprService(),
+        new IbTokensAprService(
+            polygonNetworkData.ibAprConfig,
+            polygonNetworkData.chain.prismaId,
+            polygonNetworkData.balancer.yieldProtocolFeePercentage,
+            polygonNetworkData.balancer.swapProtocolFeePercentage
+        ),
+        new PhantomStableAprService(polygonNetworkData.chain.prismaId, polygonNetworkData.balancer.yieldProtocolFeePercentage),
         new BoostedPoolAprService(),
         new SwapFeeAprService(polygonNetworkData.balancer.swapProtocolFeePercentage),
         new GaugeAprService(tokenService, [polygonNetworkData.bal!.address]),

diff --git a/modules/network/zkevm.ts b/modules/network/zkevm.ts
@@ -162,8 +162,13 @@ export const zkevmNetworkConfig: NetworkConfig = {
     contentService: new GithubContentService(),
     provider: new ethers.providers.JsonRpcProvider({ url: zkevmNetworkData.rpcUrl, timeout: 60000 }),
     poolAprServices: [
-        new IbTokensAprService(zkevmNetworkData.ibAprConfig),
-        new PhantomStableAprService(),
+        new IbTokensAprService(
+            zkevmNetworkData.ibAprConfig,
+            zkevmNetworkData.chain.prismaId,
+            zkevmNetworkData.balancer.yieldProtocolFeePercentage,
+            zkevmNetworkData.balancer.swapProtocolFeePercentage,
+        ),
+        new PhantomStableAprService(zkevmNetworkData.chain.prismaId, zkevmNetworkData.balancer.yieldProtocolFeePercentage),
         new BoostedPoolAprService(),
         new SwapFeeAprService(zkevmNetworkData.balancer.swapProtocolFeePercentage),
         new GaugeAprService(tokenService, [zkevmNetworkData.bal!.address]),