fix: tests

Author: Jean-Grimal

README.md

@@ -132,21 +132,4 @@ Unfortunately, Ponder doesn't allow the same schema to be used with different co
 In this project, the config changes only if you add, remove, or modify a chain.
 
 So, if you try to run the bot with a set of chains that's different from the one used in your initial run, indexing will fail.
-There are two ways to handle this:
-
-### Reset the postgres database
-
-This is the easiest and most direct solution, but you will lose the indexed data for the previous chains.
-
-If you're using Docker to run the local Postgres database, you can simply stop and remove the container and its volume:
-
-```bash
-docker compose down -v
-```
-
-### Use a new database
-
-This way you can have different containers storing different indexing data for different sets of chains.
-
-- If you're using Docker to run the local Postgres database, just change the port both in the postgres url given to ponder (in `apps/ponder/ponder.config.ts`) and in `docker-compose.yml`.
-- If you are using an external postgres database, you just need to change the `POSTGRES_DATABASE_URL`.
+You should use another schema (this handled in `apps/client/src/script.ts`).

apps/client/src/script.ts

@@ -30,7 +30,7 @@ async function run() {
 
   const ponder = spawn(
     "pnpm",
-    ["ponder", "start", "--schema", "ponder.schema.ts", "--config", "ponder.config.ts"],
+    ["ponder", "start", "--schema", "public", "--config", "ponder.config.ts"],
     { stdio: "inherit", cwd: "apps/ponder" },
   );
 

apps/client/src/strategies/apyRange/index.ts

@@ -80,7 +80,7 @@ export class ApyRange implements Strategy {
     let idleDeposit = 0n;
 
     if (idleMarket) {
-      if (totalWithdrawableAmount > totalDepositableAmount && ALLOW_IDLE_REALLOCATION) {
+      if (totalWithdrawableAmount > totalDepositableAmount && this.allowIdleReallocation()) {
         idleDeposit = min(
           totalWithdrawableAmount - totalDepositableAmount,
           idleMarket.cap - idleMarket.vaultAssets,
@@ -153,7 +153,7 @@ export class ApyRange implements Strategy {
         });
       }
 
-      if (idleDeposit > 0n && ALLOW_IDLE_REALLOCATION) {
+      if (idleDeposit > 0n && this.allowIdleReallocation()) {
         deposits.push({
           marketParams: idleMarket.params,
           assets: maxUint256,
@@ -163,6 +163,10 @@ export class ApyRange implements Strategy {
     return [...withdrawals, ...deposits];
   }
 
+  protected allowIdleReallocation() {
+    return ALLOW_IDLE_REALLOCATION;
+  }
+
   protected getApyRange(chainId: number, vaultAddress: Address, marketId: Hex) {
     let apyRange = DEFAULT_APY_RANGE;
 

apps/client/src/utils/maths.ts

@@ -110,15 +110,15 @@ export const utilizationToRate = (utilization: bigint, rateAtTarget: bigint): bi
 
   if (utilization >= WAD) {
     rate = maxRate;
-  } else if (utilization >= rateAtTarget) {
+  } else if (utilization >= TARGET_UTILIZATION) {
     rate =
       rateAtTarget +
       mulDivDown(
         maxRate - rateAtTarget,
         utilization - TARGET_UTILIZATION,
         WAD - TARGET_UTILIZATION,
       );
-  } else if (utilization > minRate) {
+  } else if (utilization > 0n) {
     rate = minRate + mulDivDown(rateAtTarget - minRate, utilization, TARGET_UTILIZATION);
   }
   return rate;

apps/client/test/vitest/strategies/apyRange.test.ts

@@ -56,6 +56,10 @@ class MinRatesTest extends ApyRange {
     this.config = testConfig;
   }
 
+  allowIdleReallocation() {
+    return this.config.ALLOW_IDLE_REALLOCATION;
+  }
+
   getApyRange(chainId: number, vaultAddress: Address, marketId: Hex) {
     let apyRange = this.config.DEFAULT_APY_RANGE;
 

package.json

@@ -18,7 +18,7 @@
     ]
   },
   "dependencies": {
-    "ponder": "^0.10.13",
+    "ponder": "^0.10.30",
     "tsx": "^4.19.3",
     "viem": "^2.23.2"
   },