Upgrade KintoID contract to version 9, update deployment scripts and tests, and add governance role management for KintoID and NioGovernor.

Author: ylv-io

broadcast/135-upgrade_faucet_id.s.sol/7887/run-1733521441.json

@@ -1,36 +1,43 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import {Faucet} from "../../src/Faucet.sol";
 import {KintoID} from "../../src/KintoID.sol";
 import {MigrationHelper} from "@kinto-core-script/utils/MigrationHelper.sol";
+import "@openzeppelin/contracts/access/IAccessControl.sol";
 
-contract UpgradeKintoIDFaucetDeployScript is MigrationHelper {
+contract UpgradeKintoIDScript is MigrationHelper {
     function run() public override {
         super.run();
 
-        // bytes memory bytecode = abi.encodePacked(
-        //     type(KintoID).creationCode,
-        //     abi.encode(
-        //         _getChainDeployment("KintoWalletFactory"),
-        //         _getChainDeployment("Faucet")
-        //     )
-        // );
+        bytes memory bytecode = abi.encodePacked(
+            type(KintoID).creationCode,
+            abi.encode(
+                _getChainDeployment("KintoWalletFactory"),
+                _getChainDeployment("Faucet")
+            )
+        );
 
-        // address impl = _deployImplementationAndUpgrade("KintoID", "V8", bytecode);
-        // saveContractAddress("KintoIDV8-impl", impl);
+        address impl = _deployImplementationAndUpgrade("KintoID", "V9", bytecode);
+        saveContractAddress("KintoIDV9-impl", impl);
 
-        // bytecode = abi.encodePacked(
-        //     type(Faucet).creationCode,
-        //     abi.encode(_getChainDeployment("KintoWalletFactory"))
-        // );
+        KintoID kintoID = KintoID(_getChainDeployment("KintoID"));
+        address nioGovernor = _getChainDeployment("NioGovernor");
+        bytes32 governanceRole = kintoID.GOVERNANCE_ROLE(); 
 
-        // impl = _deployImplementationAndUpgrade("Faucet", "V9", bytecode);
-        // saveContractAddress("FaucetV9-impl", impl);
+        assertFalse(kintoID.hasRole(governanceRole, kintoAdminWallet));
+        assertFalse(kintoID.hasRole(governanceRole, nioGovernor));
 
-        // vm.broadcast(deployerPrivateKey);
-        KintoID kintoID = KintoID(_getChainDeployment("KintoID"));
-        _whitelistApp(address(kintoID));
-        _upgradeTo(address(kintoID), _getChainDeployment("KintoIDV8-impl"), deployerPrivateKey);
+        _handleOps(
+            abi.encodeWithSelector(IAccessControl.grantRole.selector, governanceRole, kintoAdminWallet), address(kintoID)
+        );
+
+        _handleOps(
+            abi.encodeWithSelector(IAccessControl.grantRole.selector, governanceRole, nioGovernor), address(kintoID)
+        );
+
+        assertTrue(kintoID.hasRole(kintoID.GOVERNANCE_ROLE(), kintoAdminWallet));
+        assertTrue(kintoID.hasRole(kintoID.GOVERNANCE_ROLE(), nioGovernor));
+
+        assertTrue(kintoID.isKYC(deployer));
     }
 }

broadcast/135-upgrade_faucet_id.s.sol/7887/run-latest.json

@@ -629,6 +629,6 @@ contract KintoID is
     }
 }
 
-contract KintoIDV8 is KintoID {
+contract KintoIDV9 is KintoID {
     constructor(address _walletFactory, address _faucet) KintoID(_walletFactory, _faucet) {}
 }

script/migrations/135-upgrade_faucet_id.s.sol

@@ -242,5 +242,6 @@
   "cbBTC": "0xCBb7c0F98bb7312b821e78AB76312Cd3950fBFca",
   "AAVE-impl": "0x87a0D1c12f83ce5aB21C88f7459891586C32B875",
   "AAVE": "0xaa0e00F095Eb986CB65FD3FA328782c7Fe4ceFD9",
-  "KintoAppRegistryV22": "0xb9cE6BC89b79c713f34fd15D82a70900fEFD0de1"
-}
+  "KintoAppRegistryV22": "0xb9cE6BC89b79c713f34fd15D82a70900fEFD0de1",
+  "KintoIDV9-impl": "0x7CFe474936fA50181ae7c2C43EeB8806e25bc983"
+}