chore: merge feat/sopolia

helper-hardhat-config.ts

@@ -93,7 +93,7 @@ export const NETWORKS_RPC_URL: iParamsPerNetwork<string> = {
   [eEthereumNetwork.paraxDev]:
     L2_RPC_URL ||
     RPC_URL ||
-    `https://nitrorpc-compact-lime-moose-5r7g6fkl78.t.conduit.xyz`,
+    `https://rpc-surprised-harlequin-bonobo-fvcy2k9oqh.t.conduit.xyz`,
   [eEthereumNetwork.polygon]:
     RPC_URL || `https://polygon-mainnet.g.alchemy.com/v2/${ALCHEMY_KEY}`,
   [eEthereumNetwork.polygonMumbai]:

helpers/hardhat-constants.ts

@@ -26,7 +26,7 @@ export const SEPOLIA_CHAINID = 11155111;
 export const FORK_CHAINID = 522;
 export const MAINNET_CHAINID = 1;
 export const PARALLEL_CHAINID = 1592;
-export const PARAX_DEV_CHAINID = 3163830386846714;
+export const PARAX_DEV_CHAINID = 2982896226593698;
 export const MOONBEAM_CHAINID = 1284;
 export const MOONBASE_CHAINID = 1287;
 export const ARBITRUM_ONE_CHAINID = 42161;
@@ -136,7 +136,7 @@ export const ETHERSCAN_APIS = {
   arbitrumGoerli: "https://api-goerli.arbiscan.io/api",
   arbitrumSepolia: "https://api-sepolia.arbiscan.io/api",
   paraxDev:
-    "https://explorerl2new-widespread-brown-mosquito-de4v5k1jm5.t.conduit.xyz/api",
+    "https://explorerl2new-surprised-harlequin-bonobo-fvcy2k9oqh.t.conduit.xyz/api",
   polygon: "https://api.polygonscan.com/api",
   matic: "https://api.polygonscan.com/api",
   polygonMumbai: "https://api-mumbai.polygonscan.com/api",
@@ -160,7 +160,7 @@ export const BROWSER_URLS = {
   polygonZkevm: "https://zkevm.polygonscan.com",
   polygonZkevmGoerli: "https://testnet-zkevm.polygonscan.com",
   paraxDev:
-    "https://explorerl2new-widespread-brown-mosquito-de4v5k1jm5.t.conduit.xyz",
+    "https://explorerl2new-surprised-harlequin-bonobo-fvcy2k9oqh.t.conduit.xyz",
   polygon: "https://polygonscan.com",
   matic: "https://polygonscan.com",
   polygonMumbai: "https://mumbai.polygonscan.com",

helpers/init-helpers.ts

@@ -420,7 +420,8 @@ export const initReservesByHelper = async (
           variableDebtTokenToUse = stKSMVariableDebtTokenImplementationAddress;
         } else if (
           reserveSymbol === ERC20TokenContractId.aWETH ||
-          reserveSymbol === ERC20TokenContractId.awstETH
+          reserveSymbol === ERC20TokenContractId.awstETH ||
+          reserveSymbol === ERC20TokenContractId.aUSDC
         ) {
           if (!pTokenATokenImplementationAddress) {
             pTokenATokenImplementationAddress = (

helpers/misc-utils.ts

@@ -72,6 +72,7 @@ export const isPublicTestnet = (): boolean => {
     ].includes(DRE.network.config.chainId!) ||
     [
       eEthereumNetwork.goerli,
+      eEthereumNetwork.sepolia,
       eEthereumNetwork.arbitrumGoerli,
       eEthereumNetwork.arbitrumSepolia,
       eEthereumNetwork.paraxDev,

helpers/types.ts

@@ -459,6 +459,7 @@ export interface iAssetBase<T> {
   DAI: T;
   WETH: T;
   USDC: T;
+  aUSDC: T;
   USDT: T;
   FRAX: T;
   WBTC: T;
@@ -592,6 +593,7 @@ export enum ERC20TokenContractId {
   DAI = "DAI",
   WETH = "WETH",
   USDC = "USDC",
+  aUSDC = "aUSDC",
   USDT = "USDT",
   FRAX = "FRAX",
   WBTC = "WBTC",

market-config/index.ts

@@ -78,6 +78,7 @@ import {
   strategyEXRP,
   strategyuBAYC,
   strategyuPPG,
+  strategyAUSDC,
 } from "./reservesConfigs";
 
 export const CommonConfig: Pick<
@@ -667,9 +668,15 @@ export const ParaxDevConfig: IParaSpaceConfiguration = {
   ...CommonConfig,
   ParaSpaceTeam: "0x018281853eCC543Aa251732e8FDaa7323247eBeB",
   Treasury: "0x018281853eCC543Aa251732e8FDaa7323247eBeB",
+  ParaSpaceAdmin: "0x28abAC3E3F1fbC8Aa4Ded74C1589026038f889d8",
+  EmergencyAdmins: ["0x28abAC3E3F1fbC8Aa4Ded74C1589026038f889d8"],
+  RiskAdmin: "0x28abAC3E3F1fbC8Aa4Ded74C1589026038f889d8",
+  GatewayAdmin: "0x28abAC3E3F1fbC8Aa4Ded74C1589026038f889d8",
   YogaLabs: {},
   Uniswap: {},
-  Tokens: {},
+  Tokens: {
+    aUSDC: "0x259CdA67f5a3836aEBb207b94f0b57f548921631",
+  },
   Marketplace: {},
   Chainlink: {},
   BendDAO: {},
@@ -694,6 +701,7 @@ export const ParaxDevConfig: IParaSpaceConfiguration = {
     BLOCKS: strategyBLOCKS,
     SEWER: strategySEWER,
     PPG: strategyPudgyPenguins,
+    aUSDC: strategyAUSDC,
   },
 };
 

market-config/mocks.ts

@@ -6,6 +6,7 @@ export const MOCK_CHAINLINK_AGGREGATORS_PRICES = {
   // ERC20
   DAI: parseEther("0.000908578801039414").toString(),
   USDC: parseEther("0.000915952223931999").toString(),
+  aUSDC: parseEther("0.000477910115122588").toString(),
   USDT: parseEther("0.000915952223931999").toString(),
   FRAX: parseEther("0.000915952223931999").toString(),
   WETH: parseEther("1").toString(),
@@ -72,6 +73,7 @@ export const MOCK_CHAINLINK_AGGREGATORS_USD_PRICES = {
   // ERC20
   DAI: parseUnits("1", 8).toString(),
   USDC: parseUnits("1", 8).toString(),
+  aUSDC: parseUnits("1", 8).toString(),
   USDT: parseUnits("1", 8).toString(),
   FRAX: parseUnits("1", 8).toString(),
   WETH: parseUnits("1896", 8).toString(),

market-config/rateStrategies.ts

@@ -17,6 +17,14 @@ export const rateStrategyUSDC: IInterestRateStrategyParams = {
   variableRateSlope2: utils.parseUnits("0.60", 27).toString(),
 };
 
+export const rateStrategyaUSDC: IInterestRateStrategyParams = {
+  name: "rateStrategyaUSDC",
+  optimalUsageRatio: utils.parseUnits("0.9", 27).toString(),
+  baseVariableBorrowRate: utils.parseUnits("0", 27).toString(),
+  variableRateSlope1: utils.parseUnits("0.04", 27).toString(),
+  variableRateSlope2: utils.parseUnits("0.60", 27).toString(),
+};
+
 export const rateStrategyUSDT: IInterestRateStrategyParams = {
   name: "rateStrategyUSDT",
   optimalUsageRatio: utils.parseUnits("0.9", 27).toString(),

market-config/reservesConfigs.ts

@@ -28,6 +28,7 @@ import {
   rateStrategyAAVE,
   rateStrategyAPE,
   rateStrategyARB,
+  rateStrategyaUSDC,
   rateStrategyBAL,
   rateStrategyBLUR,
   rateStrategyCRV,
@@ -114,6 +115,7 @@ import {
   timeLockStrategyEXRP,
   timeLockStrategyuPPG,
   timeLockStrategyuBAYC,
+  timeLockStrategyaUSDC,
 } from "./timeLockStrategies";
 
 export const strategyDAI: IReserveParams = {
@@ -148,6 +150,22 @@ export const strategyUSDC: IReserveParams = {
   supplyCap: "0",
 };
 
+export const strategyAUSDC: IReserveParams = {
+  strategy: rateStrategyaUSDC,
+  auctionStrategy: auctionStrategyZero,
+  timeLockStrategy: timeLockStrategyaUSDC,
+  baseLTVAsCollateral: "8700",
+  liquidationThreshold: "8900",
+  liquidationProtocolFeePercentage: "0",
+  liquidationBonus: "10450",
+  borrowingEnabled: true,
+  reserveDecimals: "6",
+  xTokenImpl: eContractid.PTokenATokenImpl,
+  reserveFactor: "1000",
+  borrowCap: "0",
+  supplyCap: "0",
+};
+
 export const strategyUSDT: IReserveParams = {
   strategy: rateStrategyUSDT,
   auctionStrategy: auctionStrategyZero,

market-config/timeLockStrategies.ts

@@ -13,6 +13,18 @@ export const timeLockStrategyUSDC: ITimeLockStrategyParams = {
   period: "86400",
 };
 
+export const timeLockStrategyaUSDC: ITimeLockStrategyParams = {
+  name: "timeLockStrategyaUSDC",
+  minThreshold: parseUnits("105000", 6).toString(),
+  midThreshold: parseUnits("400000", 6).toString(),
+  minWaitTime: "12",
+  midWaitTime: "7200",
+  maxWaitTime: "21600",
+  poolPeriodWaitTime: "600",
+  poolPeriodLimit: parseUnits("1875000", 6).toString(),
+  period: "86400",
+};
+
 export const timeLockStrategyUSDT: ITimeLockStrategyParams = {
   name: "timeLockStrategyUSDT",
   minThreshold: parseUnits("105000", 6).toString(),

scripts/upgrade/accountAbstraction.ts

@@ -4,17 +4,19 @@ import {getAccountRegistry} from "../../helpers/contracts-getters";
 import {dryRunEncodedData} from "../../helpers/contracts-helpers";
 import {DRY_RUN, GLOBAL_OVERRIDES} from "../../helpers/hardhat-constants";
 import {getParaSpaceConfig, waitForTx} from "../../helpers/misc-utils";
+import {ZERO_ADDRESS} from "../../helpers/constants";
 
 export const upgradeAccountAbstraction = async (verify = false) => {
   console.time("deploy AccountAbstraction");
   const paraSpaceConfig = getParaSpaceConfig();
-  const client = Client.init(paraSpaceConfig.AccountAbstraction.rpcUrl);
   const accountRegistry = await getAccountRegistry();
 
   const account = await deployAccount(
-    (
-      await client
-    ).entryPoint.address,
+    paraSpaceConfig.AccountAbstraction?.rpcUrl
+      ? (
+          await Client.init(paraSpaceConfig.AccountAbstraction.rpcUrl)
+        ).entryPoint.address
+      : ZERO_ADDRESS,
     verify
   );