added add-risk-admin to v1 data

Author: mpsc0x

Deployment.md

@@ -53,12 +53,6 @@ be triggered by a second transaction that executes the approved proposal.
 ./deploy.py testnet --deployer "<deployer_profile_name>" setup-configure-reserves
 ./deploy.py testnet --deployer "<deployer_profile_name>" setup-configure-interest-rates
 ./deploy.py testnet --deployer "<deployer_profile_name>" setup-configure-price-feeds
-
-(optional if gho reserve is to be configured too)
-./deploy.py testnet --deployer "<deployer_profile_name>" setup-gho-reserve
-
-(optional if changes to the data values are being made one needs to reset too)
-./deploy.py testnet --deployer "<deployer_profile_name>" admin-reset-data
 ```
 
 ### Transfer Package Ownerships
@@ -117,3 +111,23 @@ or reusing an existing one.
 After that, package publishing and the setup steps will be executed by
 themselves. Setup also goes through a multisig account on localnet, but no
 additional approval is needed and the proposal execution is automated as well.
+
+### GHO reserve deployment
+
+If the protocol is already deployed, one has to first run to re-initialize the initial deployer config for the gho configuration to be made available for the `setup-gho-reserve` method
+
+```bash
+./deploy.py testnet --deployer "<deployer_profile_name>" admin-reset-data
+```
+
+Then, adding the gho reserve to the protocol is simply a matter of running:
+
+```bash
+./deploy.py testnet --deployer "<deployer_profile_name>" setup-gho-reserve
+```
+
+Finally, the direct minter address (whether it is an object or account) has to be given the risk admin role via:
+
+```bash
+./deploy.py testnet --deployer "<deployer_profile_name>" --gho-direct-minter "<gho_direct_minter_address>" add-risk-admin
+```

aave-core/aave-data/sources/v1_deployment.move

@@ -1165,4 +1165,16 @@ module aave_data::v1_deployment {
             )
         );
     }
+
+    /// @notice Method to add a new risk admin to the Aave protocol
+    /// @param account The signer account executing the method (must be a default admin)
+    /// @param risk_admin The address of the new risk admin to be added
+    public entry fun add_risk_admin(account: &signer, risk_admin: address) {
+        // Verify the script is executed by someone who has the default admin role
+        assert!(acl_manage::is_default_admin(signer::address_of(account)));
+        if (!acl_manage::is_risk_admin(risk_admin)) {
+            acl_manage::add_risk_admin(account, risk_admin);
+            assert!(acl_manage::is_risk_admin(risk_admin), DEPLOYMENT_SUCCESS);
+        }
+    }
 }

deploy.py

@@ -1232,6 +1232,22 @@ def setup_gho_reserve(
         [f"string:{network}"],
     )
 
+
+def add_risk_admin(
+    deployer: str, fullnode: str, multisig_aave_acl: str, new_risk_admin: str
+) -> int:
+    logging.info("Setup: add new risk admin")
+
+    aave_data_address = _get_deployed_address("aave_data")
+    return _create_multisig_transaction(
+        deployer,
+        fullnode,
+        multisig_aave_acl,
+        f"{aave_data_address}::v1_deployment::add_risk_admin",
+        [f"address:{new_risk_admin}"],
+    )
+
+
 def setup_all_localnet(
     deployer: str, fullnode: str, multisig_pool_admin: str, network: str
 ) -> None:
@@ -1667,6 +1683,11 @@ def main() -> None:
         default="0x108e14107cfe3d6d706fd208654e26ecc8b7a7f06ee82c4535477ba13aa03b52",
         help="Multisig account AaveData address",
     )
+    parser_testnet.add_argument(
+        "--gho-direct-minter",
+        default="0x0",
+        help="Multisig account GhoDirectMinter address",
+    )
 
     parser_testnet_command = parser_testnet.add_subparsers(dest="testnet_command")
 
@@ -1741,6 +1762,10 @@ def main() -> None:
         "setup-gho-reserve",
         help="add GHO reserve for the initial launch",
     )
+    parser_testnet_command.add_parser(
+        "add-risk-admin",
+        help="add a new risk admin",
+    )
 
     parser_testnet_command.add_parser(
         "change-owner-config",
@@ -1871,6 +1896,11 @@ def main() -> None:
         default="0xd68e3dbbc1295081bffce9a530ac5e17c37707e818512131f7e5078b9a59e6cb",
         help="Multisig account AaveData address",
     )
+    parser_mainnet.add_argument(
+        "--gho-direct-minter",
+        default="0x0",
+        help="Multisig account GhoDirectMinter address",
+    )
 
     parser_mainnet_command = parser_mainnet.add_subparsers(dest="mainnet_command")
 
@@ -1945,6 +1975,10 @@ def main() -> None:
         "setup-gho-reserve",
         help="add GHO reserve for the initial launch",
     )
+    parser_mainnet_command.add_parser(
+        "add-risk-admin",
+        help="add a new risk admin",
+    )
 
     parser_mainnet_command.add_parser(
         "change-owner-config",
@@ -2144,6 +2178,13 @@ def main() -> None:
                 args.multisig_pool_admin,
                 "testnet",
             )
+        elif args.testnet_command == "add-risk-admin":
+            add_risk_admin(
+                args.deployer,
+                args.fullnode,
+                args.multisig_aave_acl,
+                args.gho_direct_minter,
+            )
 
         # handle ownership commands
         elif args.testnet_command == "change-owner-config":
@@ -2341,6 +2382,13 @@ def main() -> None:
                 args.multisig_pool_admin,
                 "mainnet",
             )
+        elif args.mainnet_command == "add-risk-admin":
+            add_risk_admin(
+                args.deployer,
+                args.fullnode,
+                args.multisig_aave_acl,
+                args.gho_direct_minter,
+            )
 
         # handle ownership commands
         elif args.mainnet_command == "change-owner-config":