Merge pull request #258 from sprintertech/chore/deploy-stashdex-prod

Deploy StashStablecoinDex Ethereum Prod

Author: mpetrunic

deployments/deploy-base.log

@@ -159,4 +159,20 @@ Success.
 To finalize upgrade send the following transaction from ProxyAdmin owner: 0x4eA9E682BA79bC403523c9e8D98A05EaF3810636
 To: 0x2B5D04eF6b3279bCdA4B219b02FAF627dA1664CB
 Value: 0
-Data: 0x9623609d00000000000000000000000036364acc7b9c67692ca215af09a41cbd1043951100000000000000000000000097611394ffc80228d8422ddd19cdf759a3d099ab00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000
+Data: 0x9623609d00000000000000000000000036364acc7b9c67692ca215af09a41cbd1043951100000000000000000000000097611394ffc80228d8422ddd19cdf759a3d099ab00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000
+
+update-routes-rebalancer
+Using config for: BASE
+To allow missing routes execute the following transaction.
+To: 0xA85Cf46c150db2600b1D03E437bedD5513869888
+Function: setRoute
+Params:
+isAllowed: true
+┌─────────┬──────────────────────────────────────────────┬────────────────┬───────────────┐
+│ (index) │ pools                                        │ domains        │ providers     │
+├─────────┼──────────────────────────────────────────────┼────────────────┼───────────────┤
+│ 0       │ '0x63Ff95c79bF61486c600Eb8aF4CcE4c0a9a4068B' │ '0 (ETHEREUM)' │ '1 (CCTP)'    │
+│ 1       │ '0x63Ff95c79bF61486c600Eb8aF4CcE4c0a9a4068B' │ '0 (ETHEREUM)' │ '9 (CCTP_V2)' │
+└─────────┴──────────────────────────────────────────────┴────────────────┴───────────────┘
+Raw data: 0xee108544000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000001400000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000063ff95c79bf61486c600eb8af4cce4c0a9a4068b00000000000000000000000063ff95c79bf61486c600eb8af4cce4c0a9a4068b000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000009
+There are no excess routes to deny.

deployments/deploy-ethereum.log

@@ -50,11 +50,22 @@ eip155:1:
   LiquidityPoolAaveUSDCLongTerm_v2: "0x52D0EE7a870824FC683Ea19C714c7Bd110257788"
   LiquidityPoolUSDC: "0xB58Bb9643884abbbad64FA7eBc874c5481E5c032"
   LiquidityPoolUSDC_v2: "0x0E16326e6921395edA2575740374E754b22810eb"
+  LiquidityPoolAaveUSDCProxy: "0x63Ff95c79bF61486c600Eb8aF4CcE4c0a9a4068B"
   CensoredTransferFromMulticall: "0x7C472EBa1945E970a23C903FC8812D469a29B6bb"
   USDC: "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
   Rebalancer: "0xA85Cf46c150db2600b1D03E437bedD5513869888"
   Repayer: "0x36364Acc7B9c67692CA215af09A41CBd10439511"
   ProcessorUSDC: "0xFFDB380C79D9BF412a61d63060388d761D16286D"
+  PaxosOracle: "0xBbbDdf4B6029A61FCcF82d78eFcBedCF223ac4fc"
+  StashStablecoinDex: "0x77C8093B4AA70f614f95A490246bD7C40C47dCF2"
+  StashDexProcessorUSDC: "0x59f457A8BeAf36bB66241475FfAC79F8B5338C85"
+  StashDexProcessorUSDG: "0x213a86C3CAa954A0343e24686CDEB6D7d0FB16cb"
+  StashDexProcessorUSDT: "0x987203Be4450932F9C0d6cFED8383A894c70E391"
+  StashDexProcessorPYUSD: "0x8Cb72081E1eEF579c62d0C3d642CCeB7B355c457"
+  StashDexSubProcessorUSDC: "0x3A60342cb0307cC4DD5112d6c07983E7C7c90f8d"
+  StashDexSubProcessorUSDG: "0x5e0f446317f9C544F55a0FD23E27FF95C8bb6bA8"
+  StashDexSubProcessorUSDT: "0xf9b7639Ca2A899be04ef94730711Aa866474449f"
+  StashDexSubProcessorPYUSD: "0x9e6C9A5EF86BBe1594982289eC182DD355D0835E"
 
 eip155:137:
   deployment id: MVP

deployments/deployments.yml

@@ -84,6 +84,7 @@ export const PYUSDStashDexProcessorProxy = DEFAULT_PROXY_TYPE + "StashDexProcess
 export const USDCStashDexProcessorProxy = DEFAULT_PROXY_TYPE + "StashDexProcessorUSDC";
 export const USDGStashDexProcessorProxy = DEFAULT_PROXY_TYPE + "StashDexProcessorUSDG";
 export const USDTStashDexProcessorProxy = DEFAULT_PROXY_TYPE + "StashDexProcessorUSDT";
+export const StashStablecoinDexProxy = DEFAULT_PROXY_TYPE + "StashStablecoinDex";
 const SUPPORTS_ONLY_USDC = false;
 
 export enum Network {
@@ -171,6 +172,7 @@ interface AavePoolConfig {
   TokenLTVs?: {
     [token: string]: number;
   };
+  DirectBorrowCaller?: string;
 }
 
 interface AavePoolLongTermConfig extends AavePoolConfig {
@@ -430,6 +432,21 @@ export const networkConfig: NetworksConfig = {
       BorrowLongTermAdmin: "0x83B8D2eAda788943c3e80892f37f9c102271C1D6",
       RepayCaller: "0x9A5B33bd11329116A55F764c604a5152eE8Ca292",
     },
+    AavePool: {
+      AaveAddressesProvider: AAVEPools.AaveV3Ethereum.POOL_ADDRESSES_PROVIDER,
+      MinHealthFactor: 150,
+      DefaultLTV: 0,
+      TokenLTVs: {
+        "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599": 100, // WBTC
+        "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2": 100, // WETH
+        "0x6b175474e89094c44da98b954eedeac495271d0f": 100, // DAI
+        "0x6c3ea9036406852006290770BEdFcAbA0e23A0e8": 100, // PYUSD
+        "0xe343167631d89B6Ffc58B88d6b7fB0228795491D": 100, // USDG
+        "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48": 100, // USDC
+        "0xdAC17F958D2ee523a2206206994597C13D831ec7": 100, // USDT
+      },
+      DirectBorrowCaller: StashStablecoinDexProxy,
+    },
     USDCPool: true,
     StashDex: {
       Oracle: "PaxosOracle",
@@ -1478,6 +1495,9 @@ export const networkConfig: NetworksConfig = {
       [LiquidityPoolAaveUSDCLongTermV3]: {
         [Network.ETHEREUM]: [Provider.CCTP, Provider.CCTP_V2],
       },
+      [LiquidityPoolAaveUSDCProxy]: {
+        [Network.ETHEREUM]: [Provider.CCTP, Provider.CCTP_V2],
+      },
     },
     RepayerRoutes: {
       [LiquidityPoolAaveUSDCV4]: {

network.config.ts

@@ -35,6 +35,7 @@
     "deploy-usdcpoolaave-base": "hardhat run ./scripts/deployUSDCPoolAave.ts --network BASE",
     "deploy-usdcpoolaave-opmainnet": "hardhat run ./scripts/deployUSDCPoolAave.ts --network OP_MAINNET",
     "deploy-usdcpoolaave-arbitrumone": "hardhat run ./scripts/deployUSDCPoolAave.ts --network ARBITRUM_ONE",
+    "deploy-usdcpoolaave-ethereum": "hardhat run ./scripts/deployUSDCPoolAave.ts --network ETHEREUM",
     "deploy-usdcpoolstablecoin-ethereum": "hardhat run ./scripts/deployUSDCStablecoinPool.ts --network ETHEREUM",
     "deploy-usdcpoolstablecoin-unichain": "hardhat run ./scripts/deployUSDCStablecoinPool.ts --network UNICHAIN",
     "deploy-usdcpublicpool-arbitrumone": "hardhat run ./scripts/deployUSDCPublicPool.ts --network ARBITRUM_ONE",
@@ -80,6 +81,8 @@
     "deploy-usdt-stashdex-processor-ethereum-stage": "PROCESSOR_TOKEN=USDT DEPLOY_TYPE=STAGE hardhat run ./scripts/deployStashDexProcessor.ts --network ETHEREUM",
     "deploy-pyusd-stashdex-processor-ethereum": "PROCESSOR_TOKEN=PYUSD hardhat run ./scripts/deployStashDexProcessor.ts --network ETHEREUM",
     "deploy-pyusd-stashdex-processor-ethereum-stage": "PROCESSOR_TOKEN=PYUSD DEPLOY_TYPE=STAGE hardhat run ./scripts/deployStashDexProcessor.ts --network ETHEREUM",
+    "deploy-stashdex-ethereum": "hardhat run ./scripts/deployStashDex.ts --network ETHEREUM",
+    "deploy-stashdex-ethereum-stage": "DEPLOY_TYPE=STAGE hardhat run ./scripts/deployStashDex.ts --network ETHEREUM",
     "deploy-paxosoracle-ethereum": "hardhat run ./scripts/deployPaxosOracle.ts --network ETHEREUM",
     "deploy-paxosoracle-ethereum-stage": "DEPLOY_TYPE=STAGE hardhat run ./scripts/deployPaxosOracle.ts --network ETHEREUM",
     "upgrade-liquidityhub-basesepolia": "hardhat run ./scripts/upgradeLiquidityHub.ts --network BASE_SEPOLIA",
@@ -204,6 +207,7 @@
     "dry:deploy-usdcpoolaave-opmainnet": "DRY_RUN=OP_MAINNET VERIFY=false ts-node --files ./scripts/deployUSDCPoolAave.ts",
     "dry:deploy-usdcpoolaave-arbitrumone": "DRY_RUN=ARBITRUM_ONE VERIFY=false ts-node --files ./scripts/deployUSDCPoolAave.ts",
     "dry:deploy-usdcpoolaave-polygon": "DRY_RUN=POLYGON_MAINNET VERIFY=false ts-node --files ./scripts/deployUSDCPoolAave.ts",
+    "dry:deploy-usdcpoolaave-ethereum": "DRY_RUN=ETHEREUM VERIFY=false ts-node --files ./scripts/deployUSDCPoolAave.ts",
     "dry:deploy-usdcpoolstablecoin-ethereum": "DRY_RUN=ETHEREUM VERIFY=false ts-node --files ./scripts/deployUSDCStablecoinPool.ts",
     "dry:deploy-usdcpoolstablecoin-unichain": "DRY_RUN=UNICHAIN VERIFY=false ts-node --files ./scripts/deployUSDCStablecoinPool.ts",
     "dry:deploy-usdcpublicpool-arbitrumone": "DRY_RUN=ARBITRUM_ONE VERIFY=false ts-node --files ./scripts/deployUSDCPublicPool.ts",
@@ -251,6 +255,8 @@
     "dry:deploy-usdt-stashdex-processor-ethereum": "DRY_RUN=ETHEREUM VERIFY=false PROCESSOR_TOKEN=USDT ts-node --files ./scripts/deployStashDexProcessor.ts",
     "dry:deploy-pyusd-stashdex-processor-ethereum-stage": "DRY_RUN=ETHEREUM VERIFY=false DEPLOY_TYPE=STAGE PROCESSOR_TOKEN=PYUSD ts-node --files ./scripts/deployStashDexProcessor.ts",
     "dry:deploy-pyusd-stashdex-processor-ethereum": "DRY_RUN=ETHEREUM VERIFY=false PROCESSOR_TOKEN=PYUSD ts-node --files ./scripts/deployStashDexProcessor.ts",
+    "dry:deploy-stashdex-ethereum": "DRY_RUN=ETHEREUM VERIFY=false ts-node --files ./scripts/deployStashDex.ts",
+    "dry:deploy-stashdex-ethereum-stage": "DRY_RUN=ETHEREUM DEPLOY_TYPE=STAGE VERIFY=false ts-node --files ./scripts/deployStashDex.ts",
     "dry:upgrade-liquidityhub-basesepolia": "DRY_RUN=BASE_SEPOLIA VERIFY=false ts-node --files ./scripts/upgradeLiquidityHub.ts",
     "dry:upgrade-liquidityhub-base": "DRY_RUN=BASE VERIFY=false ts-node --files ./scripts/upgradeLiquidityHub.ts",
     "dry:upgrade-liquidityhub-base-stage": "DRY_RUN=BASE DEPLOY_TYPE=STAGE VERIFY=false ts-node --files ./scripts/upgradeLiquidityHub.ts",

package.json

@@ -105,14 +105,26 @@ export async function main() {
 
   if (initialPools.length > 0) {
     const DIRECT_BORROW_ROLE = hre.ethers.encodeBytes32String("DIRECT_BORROW_ROLE");
-    const calldata = (await stashDex.grantRole.populateTransaction(DIRECT_BORROW_ROLE, stashDex.target)).data;
+    const calldata = (await stashDex.grantRole.populateTransaction(DIRECT_BORROW_ROLE, stashDex)).data;
     const poolTokenNames = Object.keys(stashDexConfig.Pools) as Token[];
-    console.log("NEXT STEPS — grant DIRECT_BORROW_ROLE on each pool so StashDex can borrow:");
-    console.log(`Calldata: ${calldata}`);
-    console.table(initialPools.map(({pool}, i) => ({
-      token: poolTokenNames[i],
-      to: pool,
-    })));
+
+    const grouped = new Map<string, string[]>();
+    for (let i = 0; i < initialPools.length; i++) {
+      const {pool} = initialPools[i];
+      const poolContract = await hre.ethers.getContractAt("AccessControlUpgradeable", pool);
+      if (await poolContract.hasRole(DIRECT_BORROW_ROLE, stashDex)) continue;
+      const tokens = grouped.get(pool) ?? [];
+      tokens.push(poolTokenNames[i]);
+      grouped.set(pool, tokens);
+    }
+
+    if (grouped.size > 0) {
+      console.log("NEXT STEPS — grant DIRECT_BORROW_ROLE on each pool so StashDex can borrow:");
+      console.log(`Calldata: ${calldata}`);
+      console.table([...grouped.entries()].map(([pool, tokens]) => ({tokens: tokens.join(", "), to: pool})));
+    } else {
+      console.log("DIRECT_BORROW_ROLE already granted on all pools — no action needed.");
+    }
   }
 
   await verifier.verify(process.env.VERIFY === "true");

scripts/deployStashDex.ts

@@ -37,6 +37,7 @@ export async function main() {
   assertAddress(tokenInfo.Address, `${targetAsset}.Address must be an address`);
   assertAddress(config.Admin, "Admin must be an address");
   assertAddress(config.RepayerCaller, "RepayerCaller must be an address");
+  assertAddress(config.SignerAddress, "SignerAddress must be an address");
   assert(config.StashDex, "StashDex must be in config");
 
   const id = `StashDexProcessor${targetAsset}`;

scripts/deployStashDexProcessor.ts

@@ -5,7 +5,7 @@ import {NonceManager} from "ethers";
 import {
   getVerifier, getHardhatNetworkConfig, getNetworkConfig, percentsToBps, logDeployers, deployProxyX,
 } from "./helpers";
-import {resolveProxyXAddress, toBytes32} from "../test/helpers";
+import {resolveProxyXAddress, resolveXAddress, toBytes32} from "../test/helpers";
 import {isSet, assert, assertAddress, DEFAULT_ADMIN_ROLE, sameAddress} from "./common";
 import {LiquidityPoolAave, ProxyAdmin} from "../typechain-types";
 import {Network, NetworkConfig, LiquidityPoolAaveUSDCVersions} from "../network.config";
@@ -16,6 +16,7 @@ export async function main() {
 
   const LIQUIDITY_ADMIN_ROLE = toBytes32("LIQUIDITY_ADMIN_ROLE");
   const WITHDRAW_PROFIT_ROLE = toBytes32("WITHDRAW_PROFIT_ROLE");
+  const DIRECT_BORROW_ROLE = toBytes32("DIRECT_BORROW_ROLE");
   const PAUSER_ROLE = toBytes32("PAUSER_ROLE");
 
   assert(isSet(process.env.DEPLOY_ID), "DEPLOY_ID must be set");
@@ -43,6 +44,10 @@ export async function main() {
   assertAddress(config.MpcAddress, "MpcAddress must be an address");
   assertAddress(config.WrappedNativeToken, "WrappedNativeToken must be an address");
   assertAddress(config.SignerAddress, "SignerAddress must be an address");
+  let directBorrowCaller = "";
+  if (config.AavePool.DirectBorrowCaller) {
+    directBorrowCaller = await resolveXAddress(config.AavePool.DirectBorrowCaller, false);
+  }
 
   const rebalancer = await resolveProxyXAddress("Rebalancer");
   console.log(`Rebalancer: ${rebalancer}`);
@@ -75,6 +80,9 @@ export async function main() {
 
   await aavePool.grantRole(LIQUIDITY_ADMIN_ROLE, rebalancer);
   await aavePool.grantRole(WITHDRAW_PROFIT_ROLE, config.WithdrawProfit);
+  if (directBorrowCaller !== "") {
+    await aavePool.grantRole(DIRECT_BORROW_ROLE, directBorrowCaller);
+  }
   let lastTx = await aavePool.grantRole(PAUSER_ROLE, config.Pauser);
 
   if (!sameAddress(deployer.address, config.Admin)) {