Feat/gov

.env.example

@@ -8,7 +8,7 @@ ETHERSCAN_API_KEY=
 ## Params
 TESTNET_ADMIN_ADDRESS=
 TESTNET_MAINTAINER_ADDRESS=
-TESTNET_TREASURE_MANAGER_ADDRESS=
+TESTNET_PROTOCOL_MANAGER_ADDRESS=
 TESTNET_SECURITY_COUNCIL_ADDRESS=
 TESTNET_DONOR_ADDRESS=
 

.github/workflows/quality-gate.yml

@@ -30,7 +30,7 @@ jobs:
         with:
           foundry: true
       - run: npm run compile
-      - run: npm run deploy:initial hardhat
+      - run: npm run deploy:init hardhat
 
   integration-test:
     needs: lint

hardhat.config.ts

@@ -77,8 +77,11 @@ export default {
   networks: {
     hardhat: {
       params: {
+        admin: config?.parsed?.TESTNET_ADMIN_ADDRESS,
+        maintainer: config?.parsed?.TESTNET_MAINTAINER_ADDRESS,
+        manager: config?.parsed?.TESTNET_PROTOCOL_MANAGER_ADDRESS,
+        securityCouncil: config?.parsed?.TESTNET_SECURITY_COUNCIL_ADDRESS,
         dropMerkleRoot: loadDropRoot(".drop.json"),
-        donor: config?.parsed?.TESTNET_DONOR_ADDRESS,
       },
       mining: {
         auto: true,
@@ -90,7 +93,7 @@ export default {
       params: {
         admin: config?.parsed?.TESTNET_ADMIN_ADDRESS,
         maintainer: config?.parsed?.TESTNET_MAINTAINER_ADDRESS,
-        treasureManager: config?.parsed?.TESTNET_TREASURE_MANAGER_ADDRESS,
+        manager: config?.parsed?.TESTNET_PROTOCOL_MANAGER_ADDRESS,
         securityCouncil: config?.parsed?.TESTNET_SECURITY_COUNCIL_ADDRESS,
         dropMerkleRoot: loadDropRoot(".drop.json"),
       },
@@ -100,7 +103,7 @@ export default {
       params: {
         admin: config?.parsed?.TESTNET_ADMIN_ADDRESS,
         maintainer: config?.parsed?.TESTNET_MAINTAINER_ADDRESS,
-        treasureManager: config?.parsed?.TESTNET_TREASURE_MANAGER_ADDRESS,
+        manager: config?.parsed?.TESTNET_PROTOCOL_MANAGER_ADDRESS,
         securityCouncil: config?.parsed?.TESTNET_SECURITY_COUNCIL_ADDRESS,
         dropMerkleRoot: loadDropRoot(".drop.json"),
         token: AaveV3Base.ASSETS.USDC.UNDERLYING,
@@ -114,7 +117,7 @@ export default {
       params: {
         admin: config?.parsed?.TESTNET_ADMIN_ADDRESS,
         maintainer: config?.parsed?.TESTNET_MAINTAINER_ADDRESS,
-        treasureManager: config?.parsed?.TESTNET_TREASURE_MANAGER_ADDRESS,
+        manager: config?.parsed?.TESTNET_PROTOCOL_MANAGER_ADDRESS,
         securityCouncil: config?.parsed?.TESTNET_SECURITY_COUNCIL_ADDRESS,
         dropMerkleRoot: loadDropRoot(".drop.json"),
       },
@@ -125,7 +128,7 @@ export default {
       params: {
         admin: config?.parsed?.TESTNET_ADMIN_ADDRESS,
         maintainer: config?.parsed?.TESTNET_MAINTAINER_ADDRESS,
-        treasureManager: config?.parsed?.TESTNET_TREASURE_MANAGER_ADDRESS,
+        manager: config?.parsed?.TESTNET_PROTOCOL_MANAGER_ADDRESS,
         securityCouncil: config?.parsed?.TESTNET_SECURITY_COUNCIL_ADDRESS,
         token: AaveV3Base.ASSETS.USDC.UNDERLYING,
         aavePool: AaveV3Base.POOL,
@@ -136,7 +139,7 @@ export default {
       // params: {
       //   admin: config?.parsed?.ADMIN_ADDRESS,
       //   maintainer: config?.parsed?.MAINTAINER_ADDRESS,
-      //   treasureManager: config?.parsed?.TREASURE_MANAGER_ADDRESS,
+      //   manager: config?.parsed?.TREASURE_MANAGER_ADDRESS,
       //   securityCouncil: config?.parsed?.SECURITY_COUNCIL_ADDRESS,
       //   token: AaveV3Base.ASSETS.USDC.UNDERLYING,
       //   aavePool: AaveV3Base.POOL,

ignition/deployments/chain-84532/deployed_addresses.json

@@ -1,42 +1,34 @@
 {
-  "Mocks#MockERC20": "0xD08a11a3C4c505E7Cb43903d8b7baD14920322bA",
-  "Mocks#MockAavePool": "0x9D39E06BBCA0980ec1E347670e6ee370a4938a9c",
-  "Administrator#Administrator_0": "0xFaADa5A99963Cb7f52224B2FAD0a4422450F5B33",
-  "Forwarder#Forwarder_0": "0x3d19CFB53AbF526068B128cd0fd66D15939a51E0",
-  "InvoiceFactory#InvoiceFactory_0": "0xaB1Dad5f51b19fcF4305f7E584568D734161Ff93",
-  "Vault#TokenDistributorDeployLib_0": "0x029b4CEe371a7b2f1969905251C05D2A2844b01a",
-  "Verifiers#DepositVerifier": "0x43ef743B6dbf4B83016899Ee57376B09F47D7C76",
-  "Vault#InterestLib_0": "0xC4170be7d4b47596C67d9B837DF6dF57e2c3AC7f",
-  "Verifiers#Spend11Verifier": "0xdc33DfD3977D619Ba0366828e2C0C8e272cB79D9",
-  "Vault#VaultMathLib_0": "0x2F5F2A16e066B6c95583Ae7ae35C45285D801Ef9",
-  "Verifiers#Spend12Verifier": "0x12A9090182442FF399F5E17A85476232DCd93454",
-  "Vault#InputsLib_0": "0x106cF9585353B694C6b42F48671e448Cf46D2D4d",
-  "Verifiers#Spend13Verifier": "0xB4D2E831322660d60150410Cf38F30AC76A7B604",
-  "Vault#InvestmentVaultLib_0": "0xaDd7464a5eD3468D39071B38274baBAC8619F47a",
-  "Verifiers#Spend21Verifier": "0x5c39BB4Fc96dCe11ea849074C9a12829b9eBD075",
-  "Vault#AaveVaultDeployerLib_0": "0xde9F845Af031E7e3E90F3717097Bb2C041caB5Ae",
-  "Verifiers#Spend22Verifier": "0x7577EA451156b4ad0B5bb3D177bC78f643cBc20C",
-  "Vault#InputModifierLib_0": "0x08EaA55f2Ea37d06ad005A21E6fAf186C9822f19",
-  "Verifiers#Spend23Verifier": "0xFfceC36Bbd7d5726855E90c4B4F0183022d8F56b",
-  "Vault#VaultInitLib_0": "0xA87d49eF5c6505f602F936F42dBb09D3d425D37E",
-  "Verifiers#Spend31Verifier": "0xdBd83BE0F07711882a7ec88BFC263296baEcf21D",
-  "Vault#VaultDepositLib_0": "0x9080f5F0dC5aa42852AC3Cd8b995870A0Aa52940",
-  "Verifiers#Spend32Verifier": "0xA64783643669600AeCCDC0f4bA5834deD6986dFC",
-  "Vault#VaultSpendLib_0": "0xf6Eae53A578cf09920387C2228340DF3Ff2C81C9",
-  "Verifiers#Spend33Verifier": "0x16289558FF1311267119660C38E125F8f6510eC9",
-  "Vault#Vault_0": "0xDb49697357c950cCcdCF544e68c71028Fd2746C3",
-  "Verifiers#Spend61Verifier": "0x0ED70125d4253F94502BA1e3159179E8989E7931",
-  "Verifiers#Spend121Verifier": "0x8A9a1db2530D7440997e4304345F11829764EcD3",
-  "Verifiers#Verifiers": "0x763d4D82B030ad03e368F46F401151549cc0884c",
-  "Main#VaultProxy": "0x651556bDE06F0c4749ff88d56Cd025050Ec0F194",
-  "Main#Vault": "0x651556bDE06F0c4749ff88d56Cd025050Ec0F194",
-  "Main#ProtocolManager": "0x080E7168a396d4e658fa0c1DCCbec134825200AC",
-  "VaultUpgrade#InterestLib_0": "0x3aFAAA9fc66874023A61981C18671a264493E9B3",
-  "VaultUpgrade#VaultMathLib_0": "0x22f38E86798F217CC79Ded05D021C092A9B96d33",
-  "VaultUpgrade#InputsLib_0": "0x4Ec56F008F9f1C626720A8426F9A8eB59d3e57fC",
-  "VaultUpgrade#InvestmentVaultLib_0": "0xc651b7C70E85d4fB0790B1b12A1E6948F7DAdd8e",
-  "VaultUpgrade#InputModifierLib_0": "0x37C09a71056fa40C0bb73e11Be0A59d0c43C40E9",
-  "VaultUpgrade#VaultDepositLib_0": "0x1fA3FE37e906Fec15b28fbc3750F93E53D5e0815",
-  "VaultUpgrade#VaultSpendLib_0": "0x6Ecf38A16F90F6694971FF7383A52DDc34B7706C",
-  "VaultUpgrade#Vault_0": "0x25f47B87880649Edf067D655e21CB0E2Ac82995B"
+  "Mocks#MockERC20": "0x86b427D282967a4E6bE8aAc881fC8f5332cc07c4",
+  "Mocks#MockAavePool": "0xf040D84549427524b2126e62119D06686990a9cE",
+  "Main#DepositVerifier": "0x278f8A147B17043A2d4B5B03c10d7F03236A659d",
+  "Main#Spend11Verifier": "0x150c21a06944c9654C0c9C8268ea8D79DBD6089F",
+  "Main#Spend12Verifier": "0x645D5E73F06DA5C99EF5f25C2080cf03934333C9",
+  "Main#Spend13Verifier": "0xe07b87b94541B2f7B8C73018093ba92b50603dC7",
+  "Main#Spend21Verifier": "0x57EBbd87D73c6C55750b933Af5aF7BA97d513E89",
+  "Main#Spend22Verifier": "0xd01310A02b2089631FCCb7E6E67566B674e5ea46",
+  "Main#Spend23Verifier": "0xc0fCc97165043144058E327Ab453b8AB75d95d27",
+  "Main#Spend31Verifier": "0x34AbB27f2caD00a43ae0E26871c3b856866022F8",
+  "Main#Spend32Verifier": "0x033DbEA9784cF725d52A1320EF6223776262f560",
+  "Main#Spend33Verifier": "0x6433Bd3Fd0F13420FA811B94692Cf81cdC6A4ac4",
+  "Main#Spend61Verifier": "0xc42bDdCbD709c477e89edbf431CFF1b7E21bb4d8",
+  "Main#Spend121Verifier": "0xC12bbe244848177dd20F7636c0Fb73E9B464D029",
+  "Main#Verifiers": "0xf0274a464587d51162e2813199edc0c907580F5C",
+  "Main#Administrator_0": "0x0F4E9efAe56Aea54E69E7710674E630B8a81ba30",
+  "Main#Forwarder_0": "0x9C8FD2734D125871d7cE97b607Ba1c3d64C670CA",
+  "Main#InvoiceFactory_0": "0x4D59822db7C5fFD7fd108dB8d05eEA3e7C59f7e6",
+  "Main#TokenDistributorDeployLib_0": "0xb2BB51656F497ffaF4B0996d9aA09241BC1679Cc",
+  "Main#InterestLib_0": "0x3b4CA0789E9975723F62668A0D870f18b355299F",
+  "Main#VaultMathLib_0": "0xC925e889FBC32D18F6ac878A5DAf2Aa47Cf79d48",
+  "Main#InputsLib_0": "0xe745971305d281B58F0224fF39EC72E91cB04Db5",
+  "Main#InvestmentVaultLib_0": "0x9020ee6A78884B30916fA8b94CC10676984dc550",
+  "Main#AaveVaultDeployerLib_0": "0x2e782cD1276E6a5370c6F4216edCe6aCCd63Ab9b",
+  "Main#InputModifierLib_0": "0xf9785323B45D75f642b5F43c22DA00e04572D3Ad",
+  "Main#VaultInitLib_0": "0x4E98229EA16aDEA38A58938aa1900D45360D03ee",
+  "Main#VaultDepositLib_0": "0xCabD9354E1ff4Be8d6466c2f54AC39179E15Ee12",
+  "Main#VaultSpendLib_0": "0xe4d76fF306C36b192af11e9c33c435d8256468fF",
+  "Main#Vault_0": "0x5f8fB1D8249F3d648f4c513abaA838cAaDadf572",
+  "Main#VaultProxy": "0xA9084f27569694a98b096d21A0537d179795Cc86",
+  "Main#Vault": "0xA9084f27569694a98b096d21A0537d179795Cc86",
+  "Main#ProtocolManager": "0xFeFEdAc1eD5D5611689c9974CbE8545d11aF3e92"
 }

ignition/modules/Main.module.ts

@@ -1,25 +1,125 @@
 import { buildModule } from "@nomicfoundation/hardhat-ignition/modules";
-import VerifiersModule from "./Verifiers.module";
-import VaultModule from "./Vault.module";
-import ForwarderModule from "./Forwarder.module";
-import AdministratorModule from "./Administrator.module";
-import InvoiceFactoryModule from "./InvoiceFactory.module";
 
 export default buildModule("Main", (m) => {
-  const { verifiers, ...circuitVerifiers } = m.useModule(VerifiersModule);
-  const { administrator } = m.useModule(AdministratorModule);
+  const depositVerifier = m.contract("DepositVerifier");
+  const spend11Verifier = m.contract("Spend11Verifier", [], { after: [depositVerifier] });
+  const spend12Verifier = m.contract("Spend12Verifier", [], { after: [spend11Verifier] });
+  const spend13Verifier = m.contract("Spend13Verifier", [], { after: [spend12Verifier] });
+  const spend21Verifier = m.contract("Spend21Verifier", [], { after: [spend13Verifier] });
+  const spend22Verifier = m.contract("Spend22Verifier", [], { after: [spend21Verifier] });
+  const spend23Verifier = m.contract("Spend23Verifier", [], { after: [spend22Verifier] });
+  const spend31Verifier = m.contract("Spend31Verifier", [], { after: [spend23Verifier] });
+  const spend32Verifier = m.contract("Spend32Verifier", [], { after: [spend31Verifier] });
+  const spend33Verifier = m.contract("Spend33Verifier", [], { after: [spend32Verifier] });
+  const spend61Verifier = m.contract("Spend61Verifier", [], { after: [spend33Verifier] });
+  const spend121Verifier = m.contract("Spend121Verifier", [], { after: [spend61Verifier] });
 
-  const {
-    vault: vaultImplementation,
-    inputsLib,
-    tokenDistributorDeployLib,
-    interestLib,
-    vaultMathLib,
-    investmentVaultLib,
-    aaveVaultDeployerLib,
-  } = m.useModule(VaultModule);
-  const { forwarder } = m.useModule(ForwarderModule);
-  const { invoiceFactory } = m.useModule(InvoiceFactoryModule);
+  // Deploy Verifiers contract with the deployed verifier addresses
+  const verifiers = m.contract("Verifiers", [
+    depositVerifier,
+    spend11Verifier,
+    spend12Verifier,
+    spend13Verifier,
+    spend21Verifier,
+    spend22Verifier,
+    spend23Verifier,
+    spend31Verifier,
+    spend32Verifier,
+    spend33Verifier,
+    spend61Verifier,
+    spend121Verifier,
+  ]);
+
+  const administrator = m.contract("Administrator", [m.getParameter("initialAdmin")], {
+    id: `Administrator_${process.env.VERSION_TAG ?? 0}`,
+    after: [verifiers],
+  });
+
+  const forwarder = m.contract("Forwarder", [], {
+    id: `Forwarder_${process.env.VERSION_TAG ?? 0}`,
+    after: [administrator],
+  });
+  const invoiceFactory = m.contract("InvoiceFactory", [], {
+    id: `InvoiceFactory_${process.env.VERSION_TAG ?? 0}`,
+    after: [forwarder],
+  });
+
+  const tokenDistributorDeployLib = m.library("TokenDistributorDeployLib", {
+    id: `TokenDistributorDeployLib_${process.env.VERSION_TAG ?? 0}`,
+    after: [invoiceFactory],
+  });
+  const interestLib = m.library("InterestLib", {
+    id: `InterestLib_${process.env.VERSION_TAG ?? 0}`,
+    after: [tokenDistributorDeployLib],
+  });
+  const vaultMathLib = m.library("VaultMathLib", {
+    id: `VaultMathLib_${process.env.VERSION_TAG ?? 0}`,
+    after: [interestLib],
+  });
+
+  const inputsLib = m.library("InputsLib", {
+    id: `InputsLib_${process.env.VERSION_TAG ?? 0}`,
+    after: [vaultMathLib],
+  });
+
+  const investmentVaultLib = m.library("InvestmentVaultLib", {
+    id: `InvestmentVaultLib_${process.env.VERSION_TAG ?? 0}`,
+    after: [inputsLib],
+  });
+  const aaveVaultDeployerLib = m.library("AaveVaultDeployerLib", {
+    id: `AaveVaultDeployerLib_${process.env.VERSION_TAG ?? 0}`,
+    after: [investmentVaultLib],
+  });
+
+  const inputModifierLib = m.library("InputModifierLib", {
+    id: `InputModifierLib_${process.env.VERSION_TAG ?? 0}`,
+    libraries: { VaultMathLib: vaultMathLib, InterestLib: interestLib, InvestmentVaultLib: investmentVaultLib },
+    after: [aaveVaultDeployerLib],
+  });
+
+  const vaultInitLib = m.library("VaultInitLib", {
+    id: `VaultInitLib_${process.env.VERSION_TAG ?? 0}`,
+    libraries: {
+      TokenDistributorDeployLib: tokenDistributorDeployLib,
+      AaveVaultDeployerLib: aaveVaultDeployerLib,
+      InvestmentVaultLib: investmentVaultLib,
+    },
+    after: [inputModifierLib],
+  });
+
+  const vaultDepositLib = m.library("VaultDepositLib", {
+    id: `VaultDepositLib_${process.env.VERSION_TAG ?? 0}`,
+    libraries: {
+      VaultMathLib: vaultMathLib,
+      InterestLib: interestLib,
+      InvestmentVaultLib: investmentVaultLib,
+      InputsLib: inputsLib,
+    },
+    after: [vaultInitLib],
+  });
+
+  const vaultSpendLib = m.library("VaultSpendLib", {
+    id: `VaultSpendLib_${process.env.VERSION_TAG ?? 0}`,
+    libraries: {
+      VaultMathLib: vaultMathLib,
+      InterestLib: interestLib,
+      InvestmentVaultLib: investmentVaultLib,
+      InputsLib: inputsLib,
+    },
+    after: [vaultDepositLib],
+  });
+  const vaultImplementation = m.contract("Vault", [], {
+    libraries: {
+      InvestmentVaultLib: investmentVaultLib,
+      InputModifierLib: inputModifierLib,
+      VaultInitLib: vaultInitLib,
+      VaultDepositLib: vaultDepositLib,
+      VaultSpendLib: vaultSpendLib,
+      InterestLib: interestLib,
+    },
+    id: `Vault_${process.env.VERSION_TAG ?? 0}`,
+    after: [vaultSpendLib],
+  });
 
   const token = m.getParameter<string>("token");
   const aavePool = m.getParameter<string>("aavePool");
@@ -50,16 +150,25 @@ export default buildModule("Main", (m) => {
   );
   const vault = m.contractAt("Vault", vaultProxy);
 
-  m.call(vault, "initialize", [
-    verifiers,
-    forwarder,
-    protocolManager,
+  const contractInitialize = m.call(
+    vault,
+    "initialize",
+    [verifiers, forwarder, protocolManager, administrator, dropMerkleRoot, token, aavePool, aToken],
+    { after: [protocolManager] },
+  );
+
+  const admin = m.getParameter("admin");
+  const maintainer = m.getParameter("maintainer");
+  const manager = m.getParameter("manager");
+  const securityCouncil = m.getParameter("securityCouncil");
+  const upgradeDelay = m.getParameter("upgradeDelay");
+  const adminDelay = m.getParameter("adminDelay");
+  m.call(
     administrator,
-    dropMerkleRoot,
-    token,
-    aavePool,
-    aToken,
-  ]);
+    "setupGovernance",
+    [admin, vault, maintainer, securityCouncil, manager, upgradeDelay, adminDelay],
+    { after: [contractInitialize] },
+  );
 
   return {
     verifiers,
@@ -75,6 +184,5 @@ export default buildModule("Main", (m) => {
     investmentVaultLib,
     aaveVaultDeployerLib,
     invoiceFactory,
-    ...circuitVerifiers,
   };
 });