Renable node deposits on upgrade execution

Author: kanewallmann

contracts/contract/upgrade/RocketUpgradeOneDotFour.sol

@@ -162,6 +162,9 @@ contract RocketUpgradeOneDotFour is RocketBase {
             // Delete removed parameters
             deleteUint(keccak256(abi.encodePacked(settingNameSpace, "node.per.minipool.stake.minimum")));
             deleteUint(keccak256(abi.encodePacked(settingNameSpace, "node.per.minipool.stake.maximum")));
+
+            // Renable node deposits on upgrade execution
+            setBool(keccak256(abi.encodePacked(settingNameSpace, "node.deposit.enabled")), true);
         }
 
         // Minipool settings
@@ -239,7 +242,6 @@ contract RocketUpgradeOneDotFour is RocketBase {
     /// @dev Adds a new ABI to the protocol
     function _addABI(string memory _name, string memory _contractAbi) internal {
         // Check ABI name
-        bytes32 nameHash = keccak256(abi.encodePacked(_name));
         require(bytes(_name).length > 0, "Invalid ABI name");
         // Sanity check
         require(bytes(_contractAbi).length > 0, "Empty ABI is invalid");

test-upgrade/tests/misc-tests.js

@@ -19,6 +19,7 @@ import { registerNode } from '../../test/_helpers/node';
 import { userDeposit } from '../../test/_helpers/deposit';
 import { deployMegapool, getMegapoolForNode, getValidatorInfo, nodeDeposit } from '../../test/_helpers/megapool';
 import { decompressABI } from '../../test/_utils/contract';
+import { setDAOProtocolBootstrapSetting } from '../../test/dao/scenario-dao-protocol-bootstrap';
 
 const helpers = require('@nomicfoundation/hardhat-network-helpers');
 const hre = require('hardhat');
@@ -57,6 +58,9 @@ export default function() {
         });
 
         it(printTitle('upgrade', 'updates expected settings'), async () => {
+            // Disable node deposits ahead of upgrade
+            await setDAOProtocolBootstrapSetting(RocketDAOProtocolSettingsNode, 'node.deposit.enabled', false, { from: owner })
+
             await executeUpgrade(owner, upgradeContract, rocketStorageAddress);
             const upgradeTime = await helpers.time.latest();
 
@@ -130,6 +134,9 @@ export default function() {
             // Check rocketMegapool ABI exists
             const rocketMegapoolAbi = await rocketStorage.getString(ethers.solidityPackedKeccak256(['string', 'string'], ['contract.abi', 'rocketMegapool']));
             assert.notEqual(rocketMegapoolAbi.length, 0);
+
+            // Check node deposits are enabled
+            assert.equal(await rocketDAOProtocolSettingsNode.getDepositEnabled(), true);
         });
 
         it(printTitle('node', 'can create megapool and deposit from a node registered before upgrade'), async () => {