Add Hub config

Author: lastperson

.env.example

@@ -1,34 +1,3 @@
-# Contracts admin.
-ADMIN=
-
-# Address that can increase/decerease LP conversion rate.
-ADJUSTER=
-
-# Deposits to Liquidity Hub are only allowed till this limit is reached.
-ASSETS_LIMIT=
-
-# Liquidity mining tiers. Multiplier will be divided by 1000,000,000. So 1750000000 will result in 1.75x.
-# There is no limit to the number of tiers, but has to be atleast one.
-TIER_1_SECONDS=7776000
-TIER_1_MULTIPLIER=300000000
-TIER_2_SECONDS=15552000
-TIER_2_MULTIPLIER=800000000
-TIER_3_SECONDS=31104000
-TIER_3_MULTIPLIER=1666666667
-
-# Rebalance caller.
-REBALANCE_CALLER=
-
-# Liquidity Pool parameters.
-# Value 500 will result in health factor 5.
-MIN_HEALTH_FACTOR=500
-
-# Value 20 will result in LTV 20%.
-DEFAULT_LTV=20
-MPC_ADDRESS=
-WITHDRAW_PROFIT=
-PAUSER=
-
 # General deployment parameters.
 # Deploy id + the deployer address acts as a key to determine deployed contract addresses.
 # It should only be set once and never change, unless you are planning to redeploy everything.

contracts/LiquidityPoolAave.sol

@@ -33,7 +33,7 @@ contract LiquidityPoolAave is LiquidityPool {
     uint256 public minHealthFactor;
     uint256 public defaultLTV;
 
-    mapping(address token => uint256 ltv) public _borrowTokenLTV;
+    mapping(address token => uint256 ltv) public borrowTokenLTV;
 
     error TokenLtvExceeded();
     error NoCollateral();
@@ -92,8 +92,8 @@ contract LiquidityPoolAave is LiquidityPool {
         for (uint256 i = 0; i < tokens.length; ++i) {
             address token = tokens[i];
             uint256 ltv = ltvs[i];
-            uint256 oldLTV = _borrowTokenLTV[token];
-            _borrowTokenLTV[token] = ltv;
+            uint256 oldLTV = borrowTokenLTV[token];
+            borrowTokenLTV[token] = ltv;
             emit BorrowTokenLTVSet(token, oldLTV, ltv);
         }
     }
@@ -113,7 +113,7 @@ contract LiquidityPoolAave is LiquidityPool {
     // Internal functions
 
     function _checkTokenLTV(address borrowToken) private view {
-        uint256 ltv = _borrowTokenLTV[borrowToken];
+        uint256 ltv = borrowTokenLTV[borrowToken];
         if (ltv == 0) ltv = defaultLTV;
 
         uint256 totalCollateral = ATOKEN.balanceOf(address(this));

network.config.ts

@@ -32,34 +32,47 @@ interface RoutesConfig {
   Pools: string[];
   Domains: Network[];
   Providers: Provider[];
-}
+};
 
 interface TokenLtvConfig {
   Tokens: string[];
   LTVs: number[];
-}
+};
 
 interface AavePoolConfig {
   AaveAddressesProvider: string;
-  minHealthFactor: number;
-  defaultLTV: number;
+  minHealthFactor: number; // Value 500 will result in health factor 5.
+  defaultLTV: number; // Value 20 will result in LTV 20%.
   tokenLTVs?: TokenLtvConfig;
-}
+};
+
+// Liquidity mining tiers.
+// Period is in seconds.
+// Multiplier will be divided by 1000,000,000. So 1750000000 will result in 1.75x.
+// There is no limit to the number of tiers, but has to be atleast one.
+interface Tier {
+  period: bigint;
+  multiplier: bigint;
+};
+
+interface HubConfig {
+  AssetsAdjuster: string; // Address that can increase/decerease LP conversion rate.
+  AssetsLimit: number; // Deposits to Liquidity Hub are only allowed till this limit is reached.
+  Tiers: Tier[];
+};
 
 export interface NetworkConfig {
   chainId?: number;
   CCTP: CCTPConfig;
   USDC: string;
   Routes?: RoutesConfig;
   IsTest: boolean;
-  IsHub: boolean;
-  AssetsLimit?: number;
-  Admin: string;
-  AssetsAdjuster: string;
+  Admin: string; // Every contracts admin/owner.
   WithdrawProfit: string;
   Pauser: string;
-  RebalanceCaller: string;
+  RebalanceCaller: string; // Address that can trigger funds movement between pools.
   MpcAddress: string;
+  Hub?: HubConfig;
   AavePool?: AavePoolConfig;
   USDCPool?: boolean;
 };
@@ -77,9 +90,7 @@ export const networkConfig: NetworksConfig = {
     },
     USDC: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
     IsTest: false,
-    IsHub: false,
     Admin: "",
-    AssetsAdjuster: "",
     WithdrawProfit: "",
     Pauser: "",
     RebalanceCaller: "",
@@ -103,9 +114,7 @@ export const networkConfig: NetworksConfig = {
     },
     USDC: "0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E",
     IsTest: false,
-    IsHub: false,
     Admin: "",
-    AssetsAdjuster: "",
     WithdrawProfit: "",
     Pauser: "",
     RebalanceCaller: "",
@@ -124,9 +133,7 @@ export const networkConfig: NetworksConfig = {
     },
     USDC: "0x0b2c639c533813f4aa9d7837caf62653d097ff85",
     IsTest: false,
-    IsHub: false,
     Admin: "",
-    AssetsAdjuster: "",
     WithdrawProfit: "",
     Pauser: "",
     RebalanceCaller: "",
@@ -145,9 +152,7 @@ export const networkConfig: NetworksConfig = {
     },
     USDC: "0xaf88d065e77c8cC2239327C5EDb3A432268e5831",
     IsTest: false,
-    IsHub: false,
     Admin: "",
-    AssetsAdjuster: "",
     WithdrawProfit: "",
     Pauser: "",
     RebalanceCaller: "",
@@ -166,13 +171,20 @@ export const networkConfig: NetworksConfig = {
     },
     USDC: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
     IsTest: false,
-    IsHub: true,
     Admin: "",
-    AssetsAdjuster: "",
     WithdrawProfit: "",
     Pauser: "",
     RebalanceCaller: "",
     MpcAddress: "",
+    Hub: {
+      AssetsAdjuster: "",
+      AssetsLimit: 10_000_000,
+      Tiers: [
+        {period: 7776000n, multiplier: 300000000n},
+        {period: 15552000n, multiplier: 800000000n},
+        {period: 31104000n, multiplier: 1666666667n},
+      ]
+    },
     Routes: {
       Pools: [LiquidityPoolAaveUSDC],
       Domains: [Network.ETHEREUM],
@@ -192,9 +204,7 @@ export const networkConfig: NetworksConfig = {
     },
     USDC: "0x3c499c542cef5e3811e1192ce70d8cc03d5c3359",
     IsTest: false,
-    IsHub: false,
     Admin: "",
-    AssetsAdjuster: "",
     WithdrawProfit: "",
     Pauser: "",
     RebalanceCaller: "",
@@ -213,9 +223,7 @@ export const networkConfig: NetworksConfig = {
     },
     USDC: "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238",
     IsTest: true,
-    IsHub: false,
     Admin: "0xcf2d403c75ba3481ae7b190b1cd3246b5afe9120",
-    AssetsAdjuster: "0x6c663396827e68d10c58691f9c4bb58ae9ec85e3",
     WithdrawProfit: "0xed24c1ca7c8d01c4ba862c6792ad6144f01566f2",
     Pauser: "0xcc5dd1eec29dbe028e61e91db5da4d453be48d90",
     RebalanceCaller: "0x20ad9b208767e98dba19346f88b2686f00dbcf58",
@@ -235,9 +243,7 @@ export const networkConfig: NetworksConfig = {
     },
     USDC: "0x5425890298aed601595a70ab815c96711a31bc65",
     IsTest: true,
-    IsHub: false,
     Admin: "0xcf2d403c75ba3481ae7b190b1cd3246b5afe9120",
-    AssetsAdjuster: "0x6c663396827e68d10c58691f9c4bb58ae9ec85e3",
     WithdrawProfit: "0xed24c1ca7c8d01c4ba862c6792ad6144f01566f2",
     Pauser: "0xcc5dd1eec29dbe028e61e91db5da4d453be48d90",
     RebalanceCaller: "0x20ad9b208767e98dba19346f88b2686f00dbcf58",
@@ -256,9 +262,7 @@ export const networkConfig: NetworksConfig = {
     },
     USDC: "0x5fd84259d66Cd46123540766Be93DFE6D43130D7",
     IsTest: true,
-    IsHub: false,
     Admin: "0xcf2d403c75ba3481ae7b190b1cd3246b5afe9120",
-    AssetsAdjuster: "0x6c663396827e68d10c58691f9c4bb58ae9ec85e3",
     WithdrawProfit: "0xed24c1ca7c8d01c4ba862c6792ad6144f01566f2",
     Pauser: "0xcc5dd1eec29dbe028e61e91db5da4d453be48d90",
     RebalanceCaller: "0x20ad9b208767e98dba19346f88b2686f00dbcf58",
@@ -277,9 +281,7 @@ export const networkConfig: NetworksConfig = {
     },
     USDC: "0x75faf114eafb1BDbe2F0316DF893fd58CE46AA4d",
     IsTest: true,
-    IsHub: false,
     Admin: "0xcf2d403c75ba3481ae7b190b1cd3246b5afe9120",
-    AssetsAdjuster: "0x6c663396827e68d10c58691f9c4bb58ae9ec85e3",
     WithdrawProfit: "0xed24c1ca7c8d01c4ba862c6792ad6144f01566f2",
     Pauser: "0xcc5dd1eec29dbe028e61e91db5da4d453be48d90",
     RebalanceCaller: "0x20ad9b208767e98dba19346f88b2686f00dbcf58",
@@ -303,13 +305,20 @@ export const networkConfig: NetworksConfig = {
     },
     USDC: "0x036CbD53842c5426634e7929541eC2318f3dCF7e",
     IsTest: true,
-    IsHub: true,
     Admin: "0xcf2d403c75ba3481ae7b190b1cd3246b5afe9120",
-    AssetsAdjuster: "0x6c663396827e68d10c58691f9c4bb58ae9ec85e3",
     WithdrawProfit: "0xed24c1ca7c8d01c4ba862c6792ad6144f01566f2",
     Pauser: "0xcc5dd1eec29dbe028e61e91db5da4d453be48d90",
     RebalanceCaller: "0x20ad9b208767e98dba19346f88b2686f00dbcf58",
     MpcAddress: "0xc731bac6c62ecb49dba1393700218d03beaa0359",
+    Hub: {
+      AssetsAdjuster: "0x6c663396827e68d10c58691f9c4bb58ae9ec85e3",
+      AssetsLimit: 1000,
+      Tiers: [
+        {period: 600n, multiplier: 300000000n},
+        {period: 1200n, multiplier: 800000000n},
+        {period: 2400n, multiplier: 1666666667n},
+      ]
+    },
     Routes: {
       Pools: [LiquidityPoolUSDC, LiquidityPoolAaveUSDC],
       Domains: [Network.ETHEREUM_SEPOLIA, Network.ARBITRUM_SEPOLIA],
@@ -330,9 +339,7 @@ export const networkConfig: NetworksConfig = {
     },
     USDC: "0x41e94eb019c0762f9bfcf9fb1e58725bfb0e7582",
     IsTest: true,
-    IsHub: false,
     Admin: "0xcf2d403c75ba3481ae7b190b1cd3246b5afe9120",
-    AssetsAdjuster: "0x6c663396827e68d10c58691f9c4bb58ae9ec85e3",
     WithdrawProfit: "0xed24c1ca7c8d01c4ba862c6792ad6144f01566f2",
     Pauser: "0xcc5dd1eec29dbe028e61e91db5da4d453be48d90",
     RebalanceCaller: "0x20ad9b208767e98dba19346f88b2686f00dbcf58",