Acp 77 updates

.gitignore

@@ -44,3 +44,4 @@ server.log
 
 # Forge documentation
 docs/
+coverage/

contracts/validator-manager/MessageSpec.md

@@ -1,45 +1,115 @@
 ## Warp Message Format Reference
 
+### `SubnetConversionMessage`
+
+- Description: Confirms conversion to a Permissionless Subnet on the P-Chain
+
+- Signed by: P-Chain
+
+- Consumed by: Validator Manager contract
+
+Specification:
+
+```
+SubnetConversionMessage
++--------------------+----------+----------+
+|            codecID :   uint16 |  2 bytes |
++--------------------+----------+----------+
+|             typeID :   uint32 |  4 bytes |
++--------------------+----------+----------+
+| subnetConversionID : [32]byte | 32 bytes |
++--------------------+----------+----------+
+                                | 38 bytes |
+                                +----------+
+```
+
+where `subnetConversionID` is defined as the `sha256` hash of the serialization of the `SubnetConversionData`, defined as follows:
+
+```
+ValidatorData
++--------------+----------+------------------------+
+|       nodeID :   []byte |  4 + len(nodeID) bytes |
++--------------+----------+------------------------+
+| blsPublicKey : [48]byte |               48 bytes |
++--------------+----------+------------------------+
+|       weight :   uint64 |                8 bytes |
++--------------+----------+------------------------+
+                          | 60 + len(nodeID) bytes |
+                          +------------------------+
+
+SubnetConversionData
++----------------+-----------------+--------------------------------------------------------+
+|       codecID  :          uint16 |                                                2 bytes |
++----------------+-----------------+--------------------------------------------------------+
+|       subnetID :        [32]byte |                                               32 bytes |
++----------------+-----------------+--------------------------------------------------------+
+| managerChainID :        [32]byte |                                               32 bytes |
++----------------+-----------------+--------------------------------------------------------+
+| managerAddress :          []byte |                          4 + len(managerAddress) bytes |
++----------------+-----------------+--------------------------------------------------------+
+|     validators : []ValidatorData |                        4 + sum(validatorLengths) bytes |
++----------------+-----------------+--------------------------------------------------------+
+                                   | 74 + len(managerAddress) + len(validatorLengths) bytes |
+                                   +--------------------------------------------------------+                          
+```
+
 ### `RegisterSubnetValidatorMessage`
 
-Description: Register a Subnet Validator on the P-Chain
+- Description: Registers a Subnet Validator on the P-Chain
 
-Signed by: Subnet
-Consumed by: P-Chain
+- Signed by: Subnet
+
+- Consumed by: P-Chain
 
 Specification:
 
 ```
-+--------------+----------+-----------+
-|      codecID :   uint16 |   2 bytes |
-+--------------+----------+-----------+
-|       typeID :   uint32 |   4 bytes |
-+--------------+----------+-----------+
-|     subnetID : [32]byte |  32 bytes |
-+--------------+----------+-----------+
-|       nodeID : [32]byte |  32 bytes |
-+--------------+----------+-----------+
-|       weight :   uint64 |   8 bytes |
-+--------------+----------+-----------+
-| blsPublicKey : [48]byte |  48 bytes |
-+--------------+----------+-----------+
-|       expiry :   uint64 |   8 bytes |
-+--------------+----------+-----------+
-                          | 134 bytes |
-                          +-----------+
+PChainOwner
++-----------+------------+-------------------------------+
+| threshold :     uint32 |                       4 bytes |
++-----------+------------+-------------------------------+
+| addresses : [][20]byte | 4 + len(addresses) * 20 bytes |
++-----------+------------+-------------------------------+
+                         | 8 + len(addresses) * 20 bytes |
+                         +-------------------------------+
+
+RegisterSubnetValidatorMessage
++-----------------------+-------------+--------------------------------------------------------------------+
+|               codecID :      uint16 |                                                            2 bytes |
++-----------------------+-------------+--------------------------------------------------------------------+
+|                typeID :      uint32 |                                                            4 bytes |
++-----------------------+-------------+-------------------------------------------------------------------+
+|              subnetID :    [32]byte |                                                           32 bytes |
++-----------------------+-------------+--------------------------------------------------------------------+
+|                nodeID :      []byte |                                              4 + len(nodeID) bytes |
++-----------------------+-------------+--------------------------------------------------------------------+
+|          blsPublicKey :    [48]byte |                                                           48 bytes |
++-----------------------+-------------+--------------------------------------------------------------------+
+|                expiry :      uint64 |                                                            8 bytes |
++-----------------------+-------------+--------------------------------------------------------------------+
+| remainingBalanceOwner : PChainOwner |                                      4 + len(addresses) * 20 bytes |
++-----------------------+-------------+--------------------------------------------------------------------+
+|          disableOwner : PChainOwner |                                      4 + len(addresses) * 20 bytes |
++-----------------------+-------------+--------------------------------------------------------------------+
+|                weight :      uint64 |                                                            8 bytes |
++-----------------------+-------------+--------------------------------------------------------------------+
+                                      | 114 + len(nodeID) + (len(addresses1) + len(addresses2)) * 20 bytes |
+                                      +--------------------------------------------------------------------+
 
 ```
 
 ### `SubnetValidatorRegistrationMessage`
 
-Description: Confirms a Subnet Validator's registration validity on the P-Chain
+- Description: Confirms a Subnet Validator's registration validity on the P-Chain
+
+- Signed by: P-Chain
 
-Signed by: P-Chain
-Consumed by: Validator Manager contract
+- Consumed by: Validator Manager contract
 
 Specification:
 
 ```
+SubnetValidatorRegistrationMessage
 +--------------+----------+----------+
 |      codecID :   uint16 |  2 bytes |
 +--------------+----------+----------+
@@ -53,39 +123,27 @@ Specification:
                           +----------+
 ```
 
-### `ValidationUptimeMessage`
+### `SubnetValidatorWeightMessage`
 
-Description: Provides a Validator's uptime for calculating staking rewards
+- Description: Used to set and acknowledge a Validator's stake weight on another chain
 
-Signed by: Subnet
-Consumed by: Validator Manager contract
+- To effect a weight change:
 
-Specification:
+    - Signed by: Subnet
 
-```
-+--------------+----------+----------+
-|      codecID :   uint16 |  2 bytes |
-+--------------+----------+----------+
-|       typeID :   uint32 |  4 bytes |
-+--------------+----------+----------+
-| validationID : [32]byte | 32 bytes |
-+--------------+----------+----------+
-|       uptime :   uint64 |  8 bytes |
-+--------------+----------+----------+
-                          | 46 bytes |
-                          +----------+
-```
+    - Consumed by: P-Chain
 
-### `SetSubnetValidatorWeightMessage`
+- To acknowledge the weight change:
 
-Description: Used to set a Validator's stake weight on another chain
+    - Signed by P-Chain
 
-Signed by: Subnet
-Consumed by: P-Chain
+
+    - Consumed by Subnet
 
 Specification:
 
 ```
+SubnetValidatorWeightMessage
 +--------------+----------+----------+
 |      codecID :   uint16 |  2 bytes |
 +--------------+----------+----------+
@@ -101,27 +159,27 @@ Specification:
                           +----------+
 ```
 
-### `SubnetValidatorWeightUpdateMessage`
+### `ValidationUptimeMessage`
+
+- Description: Provides a Validator's uptime for calculating staking rewards
 
-Description: Acknowledges a Validator weight update
+- Signed by: Subnet
 
-Signed by: P-Chain
-Consumed by: Validator Manager contract
+- Consumed by: Validator Manager contract
 
 Specification:
 
 ```
+ValidationUptimeMessage
 +--------------+----------+----------+
 |      codecID :   uint16 |  2 bytes |
 +--------------+----------+----------+
 |       typeID :   uint32 |  4 bytes |
 +--------------+----------+----------+
 | validationID : [32]byte | 32 bytes |
 +--------------+----------+----------+
-|        nonce :   uint64 |  8 bytes |
-+--------------+----------+----------+
-|       weight :   uint64 |  8 bytes |
+|       uptime :   uint64 |  8 bytes |
 +--------------+----------+----------+
-                          | 54 bytes |
+                          | 46 bytes |
                           +----------+
 ```

contracts/validator-manager/PoSValidatorManager.sol

@@ -429,7 +429,7 @@ abstract contract PoSValidatorManager is
 
         // Unpack the Warp message
         (bytes32 messageValidationID, uint64 nonce,) = ValidatorMessages
-            .unpackSubnetValidatorWeightUpdateMessage(_getPChainWarpMessage(messageIndex).payload);
+            .unpackSubnetValidatorWeightMessage(_getPChainWarpMessage(messageIndex).payload);
 
         if (validationID != messageValidationID) {
             revert InvalidValidationID(delegator.validationID);
@@ -589,7 +589,7 @@ abstract contract PoSValidatorManager is
 
         // Submit the message to the Warp precompile.
         WARP_MESSENGER.sendWarpMessage(
-            ValidatorMessages.packSetSubnetValidatorWeightMessage(
+            ValidatorMessages.packSubnetValidatorWeightMessage(
                 delegator.validationID, validator.messageNonce, validator.weight
             )
         );
@@ -613,7 +613,7 @@ abstract contract PoSValidatorManager is
             // Unpack the Warp message
             WarpMessage memory warpMessage = _getPChainWarpMessage(messageIndex);
             (bytes32 validationID, uint64 nonce,) =
-                ValidatorMessages.unpackSubnetValidatorWeightUpdateMessage(warpMessage.payload);
+                ValidatorMessages.unpackSubnetValidatorWeightMessage(warpMessage.payload);
 
             if (delegator.validationID != validationID) {
                 revert InvalidValidationID(validationID);

contracts/validator-manager/ValidatorManager.sol

@@ -49,7 +49,7 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida
         /// @notice Maps the validationID to the validator information.
         mapping(bytes32 => Validator) _validationPeriods;
         /// @notice Maps the nodeID to the validationID for validation periods that have not ended.
-        mapping(bytes32 => bytes32) _registeredValidators;
+        mapping(bytes => bytes32) _registeredValidators;
         /// @notice Boolean that indicates if the initial validator set has been set.
         bool _initializedValidatorSet;
     }
@@ -73,15 +73,15 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida
     error InvalidInitializationStatus();
     error InvalidMaximumChurnPercentage(uint8 maximumChurnPercentage);
     error InvalidBLSKeyLength(uint256 length);
-    error InvalidNodeID(bytes32 nodeID);
+    error InvalidNodeID(bytes nodeID);
     error InvalidSubnetConversionID(
         bytes32 encodedSubnetConversionID, bytes32 expectedSubnetConversionID
     );
     error InvalidValidationID(bytes32 validationID);
     error InvalidValidatorStatus(ValidatorStatus status);
     error InvalidWarpMessage();
     error MaxChurnRateExceeded(uint64 churnAmount);
-    error NodeAlreadyRegistered(bytes32 nodeID);
+    error NodeAlreadyRegistered(bytes nodeID);
     error UnexpectedRegistrationStatus(bool validRegistration);
 
     // solhint-disable ordering
@@ -166,20 +166,17 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida
         uint256 totalWeight;
         for (uint32 i; i < numInitialValidators; ++i) {
             InitialValidator memory initialValidator = subnetConversionData.initialValidators[i];
-            bytes32 nodeID = initialValidator.nodeID;
-
-            if ($._registeredValidators[nodeID] != bytes32(0)) {
-                revert NodeAlreadyRegistered(nodeID);
+            if ($._registeredValidators[initialValidator.nodeID] != bytes32(0)) {
+                revert NodeAlreadyRegistered(initialValidator.nodeID);
             }
 
             // Validation ID of the initial validators is the sha256 hash of the
             // convert Subnet tx ID and the index of the initial validator.
-            bytes32 validationID =
-                sha256(abi.encodePacked(subnetConversionData.convertSubnetTxID, i));
+            bytes32 validationID = sha256(abi.encodePacked(subnetConversionData.subnetID, i));
 
             // Save the initial validator as an active validator.
 
-            $._registeredValidators[nodeID] = validationID;
+            $._registeredValidators[initialValidator.nodeID] = validationID;
             $._validationPeriods[validationID] = Validator({
                 status: ValidatorStatus.Active,
                 nodeID: initialValidator.nodeID,
@@ -236,7 +233,7 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida
         if (input.blsPublicKey.length != BLS_PUBLIC_KEY_LENGTH) {
             revert InvalidBLSKeyLength(input.blsPublicKey.length);
         }
-        if (input.nodeID == bytes32(0)) {
+        if (input.nodeID.length == 0) {
             revert InvalidNodeID(input.nodeID);
         }
         if ($._registeredValidators[input.nodeID] != bytes32(0)) {
@@ -251,9 +248,11 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida
             ValidatorMessages.ValidationPeriod({
                 subnetID: $._subnetID,
                 nodeID: input.nodeID,
-                weight: weight,
                 blsPublicKey: input.blsPublicKey,
-                registrationExpiry: input.registrationExpiry
+                remainingBalanceOwner: input.remainingBalanceOwner,
+                disableOwner: input.disableOwner,
+                registrationExpiry: input.registrationExpiry,
+                weight: weight
             })
         );
         $._pendingRegisterValidationMessages[validationID] = registerSubnetValidatorMessage;
@@ -325,7 +324,7 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida
         );
     }
 
-    function registeredValidators(bytes32 nodeID) public view returns (bytes32) {
+    function registeredValidators(bytes calldata nodeID) public view returns (bytes32) {
         ValidatorManagerStorage storage $ = _getValidatorManagerStorage();
         return $._registeredValidators[nodeID];
     }
@@ -390,7 +389,7 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida
         }
 
         WARP_MESSENGER.sendWarpMessage(
-            ValidatorMessages.packSetSubnetValidatorWeightMessage(
+            ValidatorMessages.packSubnetValidatorWeightMessage(
                 validationID, validator.messageNonce, 0
             )
         );
@@ -496,7 +495,7 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida
 
         // Submit the message to the Warp precompile.
         bytes32 messageID = WARP_MESSENGER.sendWarpMessage(
-            ValidatorMessages.packSetSubnetValidatorWeightMessage(validationID, nonce, newWeight)
+            ValidatorMessages.packSubnetValidatorWeightMessage(validationID, nonce, newWeight)
         );
 
         emit ValidatorWeightUpdate({