Merge pull request #562 from ava-labs/p-chain-id

Setting P-Chain blockchain id constant
ava-labs · Sep 19, 2024 · ef2425c · ef2425c
2 parents 4b2e326 + f03a6c8
commit ef2425c
Show file tree

Hide file tree

Showing 12 changed files with 156 additions and 71 deletions.
diff --git a/abi-bindings/go/validator-manager/ERC20TokenStakingManager/ERC20TokenStakingManager.go b/abi-bindings/go/validator-manager/ERC20TokenStakingManager/ERC20TokenStakingManager.go
diff --git a/abi-bindings/go/validator-manager/NativeTokenStakingManager/NativeTokenStakingManager.go b/abi-bindings/go/validator-manager/NativeTokenStakingManager/NativeTokenStakingManager.go
diff --git a/abi-bindings/go/validator-manager/PoAValidatorManager/PoAValidatorManager.go b/abi-bindings/go/validator-manager/PoAValidatorManager/PoAValidatorManager.go
diff --git a/contracts/validator-manager/ValidatorManager.sol b/contracts/validator-manager/ValidatorManager.sol
@@ -32,8 +32,6 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida
     /// @custom:storage-location erc7201:avalanche-icm.storage.ValidatorManager
 
     struct ValidatorManagerStorage {
-        /// @notice The blockchainID of the P-Chain.
-        bytes32 _pChainBlockchainID;
         /// @notice The subnetID associated with this validator manager.
         bytes32 _subnetID;
         /// @notice The number of seconds after which to reset the churn tracker.
@@ -62,6 +60,7 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida
     uint64 public constant MAXIMUM_REGISTRATION_EXPIRY_LENGTH = 2 days;
     uint32 public constant ADDRESS_LENGTH = 20; // This is only used as a packed uint32
     uint8 public constant BLS_PUBLIC_KEY_LENGTH = 48;
+    bytes32 public constant P_CHAIN_BLOCKCHAIN_ID = bytes32(0);
 
     // solhint-disable ordering
     function _getValidatorManagerStorage()
@@ -96,7 +95,6 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida
         onlyInitializing
     {
         ValidatorManagerStorage storage $ = _getValidatorManagerStorage();
-        $._pChainBlockchainID = settings.pChainBlockchainID;
         $._subnetID = settings.subnetID;
 
         require(
@@ -457,12 +455,12 @@ abstract contract ValidatorManager is Initializable, ContextUpgradeable, IValida
         view
         returns (WarpMessage memory)
     {
-        ValidatorManagerStorage storage $ = _getValidatorManagerStorage();
         (WarpMessage memory warpMessage, bool valid) =
             WARP_MESSENGER.getVerifiedWarpMessage(messageIndex);
         require(valid, "ValidatorManager: invalid warp message");
+        // Must match to P-Chain blockchain id, which is 0.
         require(
-            warpMessage.sourceChainID == $._pChainBlockchainID,
+            warpMessage.sourceChainID == P_CHAIN_BLOCKCHAIN_ID,
             "ValidatorManager: invalid source chain ID"
         );
         require(

diff --git a/contracts/validator-manager/interfaces/IValidatorManager.sol b/contracts/validator-manager/interfaces/IValidatorManager.sol
@@ -46,7 +46,6 @@ event ValidatorWeightUpdate(
 );
 
 struct ValidatorManagerSettings {
-    bytes32 pChainBlockchainID;
     bytes32 subnetID;
     uint64 churnPeriodSeconds;
     uint8 maximumChurnPercentage;

diff --git a/contracts/validator-manager/tests/ERC20TokenStakingManagerTests.t.sol b/contracts/validator-manager/tests/ERC20TokenStakingManagerTests.t.sol
@@ -36,7 +36,6 @@ contract ERC20TokenStakingManagerTest is PoSValidatorManagerTest {
         app.initialize(
             PoSValidatorManagerSettings({
                 baseSettings: ValidatorManagerSettings({
-                    pChainBlockchainID: P_CHAIN_BLOCKCHAIN_ID,
                     subnetID: DEFAULT_SUBNET_ID,
                     churnPeriodSeconds: DEFAULT_CHURN_PERIOD,
                     maximumChurnPercentage: DEFAULT_MAXIMUM_CHURN_PERCENTAGE
@@ -63,7 +62,6 @@ contract ERC20TokenStakingManagerTest is PoSValidatorManagerTest {
         app.initialize(
             PoSValidatorManagerSettings({
                 baseSettings: ValidatorManagerSettings({
-                    pChainBlockchainID: P_CHAIN_BLOCKCHAIN_ID,
                     subnetID: DEFAULT_SUBNET_ID,
                     churnPeriodSeconds: DEFAULT_CHURN_PERIOD,
                     maximumChurnPercentage: DEFAULT_MAXIMUM_CHURN_PERCENTAGE
@@ -86,7 +84,6 @@ contract ERC20TokenStakingManagerTest is PoSValidatorManagerTest {
         app.initialize(
             PoSValidatorManagerSettings({
                 baseSettings: ValidatorManagerSettings({
-                    pChainBlockchainID: P_CHAIN_BLOCKCHAIN_ID,
                     subnetID: DEFAULT_SUBNET_ID,
                     churnPeriodSeconds: DEFAULT_CHURN_PERIOD,
                     maximumChurnPercentage: DEFAULT_MAXIMUM_CHURN_PERCENTAGE
@@ -108,7 +105,6 @@ contract ERC20TokenStakingManagerTest is PoSValidatorManagerTest {
         app.initialize(
             PoSValidatorManagerSettings({
                 baseSettings: ValidatorManagerSettings({
-                    pChainBlockchainID: P_CHAIN_BLOCKCHAIN_ID,
                     subnetID: DEFAULT_SUBNET_ID,
                     churnPeriodSeconds: DEFAULT_CHURN_PERIOD,
                     maximumChurnPercentage: DEFAULT_MAXIMUM_CHURN_PERCENTAGE
@@ -130,7 +126,6 @@ contract ERC20TokenStakingManagerTest is PoSValidatorManagerTest {
         app.initialize(
             PoSValidatorManagerSettings({
                 baseSettings: ValidatorManagerSettings({
-                    pChainBlockchainID: P_CHAIN_BLOCKCHAIN_ID,
                     subnetID: DEFAULT_SUBNET_ID,
                     churnPeriodSeconds: DEFAULT_CHURN_PERIOD,
                     maximumChurnPercentage: DEFAULT_MAXIMUM_CHURN_PERCENTAGE
@@ -153,7 +148,6 @@ contract ERC20TokenStakingManagerTest is PoSValidatorManagerTest {
         app.initialize(
             PoSValidatorManagerSettings({
                 baseSettings: ValidatorManagerSettings({
-                    pChainBlockchainID: P_CHAIN_BLOCKCHAIN_ID,
                     subnetID: DEFAULT_SUBNET_ID,
                     churnPeriodSeconds: DEFAULT_CHURN_PERIOD,
                     maximumChurnPercentage: DEFAULT_MAXIMUM_CHURN_PERCENTAGE

diff --git a/contracts/validator-manager/tests/NativeTokenStakingManagerTests.t.sol b/contracts/validator-manager/tests/NativeTokenStakingManagerTests.t.sol
@@ -30,7 +30,6 @@ contract NativeTokenStakingManagerTest is PoSValidatorManagerTest {
         app.initialize(
             PoSValidatorManagerSettings({
                 baseSettings: ValidatorManagerSettings({
-                    pChainBlockchainID: P_CHAIN_BLOCKCHAIN_ID,
                     subnetID: DEFAULT_SUBNET_ID,
                     churnPeriodSeconds: DEFAULT_CHURN_PERIOD,
                     maximumChurnPercentage: DEFAULT_MAXIMUM_CHURN_PERCENTAGE
@@ -56,7 +55,6 @@ contract NativeTokenStakingManagerTest is PoSValidatorManagerTest {
         app.initialize(
             PoSValidatorManagerSettings({
                 baseSettings: ValidatorManagerSettings({
-                    pChainBlockchainID: P_CHAIN_BLOCKCHAIN_ID,
                     subnetID: DEFAULT_SUBNET_ID,
                     churnPeriodSeconds: DEFAULT_CHURN_PERIOD,
                     maximumChurnPercentage: DEFAULT_MAXIMUM_CHURN_PERCENTAGE
@@ -78,7 +76,6 @@ contract NativeTokenStakingManagerTest is PoSValidatorManagerTest {
         app.initialize(
             PoSValidatorManagerSettings({
                 baseSettings: ValidatorManagerSettings({
-                    pChainBlockchainID: P_CHAIN_BLOCKCHAIN_ID,
                     subnetID: DEFAULT_SUBNET_ID,
                     churnPeriodSeconds: DEFAULT_CHURN_PERIOD,
                     maximumChurnPercentage: DEFAULT_MAXIMUM_CHURN_PERCENTAGE
@@ -99,7 +96,6 @@ contract NativeTokenStakingManagerTest is PoSValidatorManagerTest {
         app.initialize(
             PoSValidatorManagerSettings({
                 baseSettings: ValidatorManagerSettings({
-                    pChainBlockchainID: P_CHAIN_BLOCKCHAIN_ID,
                     subnetID: DEFAULT_SUBNET_ID,
                     churnPeriodSeconds: DEFAULT_CHURN_PERIOD,
                     maximumChurnPercentage: DEFAULT_MAXIMUM_CHURN_PERCENTAGE
@@ -120,7 +116,6 @@ contract NativeTokenStakingManagerTest is PoSValidatorManagerTest {
         app.initialize(
             PoSValidatorManagerSettings({
                 baseSettings: ValidatorManagerSettings({
-                    pChainBlockchainID: P_CHAIN_BLOCKCHAIN_ID,
                     subnetID: DEFAULT_SUBNET_ID,
                     churnPeriodSeconds: DEFAULT_CHURN_PERIOD,
                     maximumChurnPercentage: DEFAULT_MAXIMUM_CHURN_PERCENTAGE
@@ -142,7 +137,6 @@ contract NativeTokenStakingManagerTest is PoSValidatorManagerTest {
         app.initialize(
             PoSValidatorManagerSettings({
                 baseSettings: ValidatorManagerSettings({
-                    pChainBlockchainID: P_CHAIN_BLOCKCHAIN_ID,
                     subnetID: DEFAULT_SUBNET_ID,
                     churnPeriodSeconds: DEFAULT_CHURN_PERIOD,
                     maximumChurnPercentage: DEFAULT_MAXIMUM_CHURN_PERCENTAGE

diff --git a/contracts/validator-manager/tests/PoAValidatorManagerTests.t.sol b/contracts/validator-manager/tests/PoAValidatorManagerTests.t.sol
@@ -24,7 +24,6 @@ contract PoAValidatorManagerTest is ValidatorManagerTest {
         app = new PoAValidatorManager(ICMInitializable.Allowed);
         app.initialize(
             ValidatorManagerSettings({
-                pChainBlockchainID: P_CHAIN_BLOCKCHAIN_ID,
                 subnetID: DEFAULT_SUBNET_ID,
                 churnPeriodSeconds: DEFAULT_CHURN_PERIOD,
                 maximumChurnPercentage: DEFAULT_MAXIMUM_CHURN_PERCENTAGE

diff --git a/contracts/validator-manager/tests/PoSValidatorManagerTests.t.sol b/contracts/validator-manager/tests/PoSValidatorManagerTests.t.sol
@@ -174,7 +174,7 @@ abstract contract PoSValidatorManagerTest is ValidatorManagerTest {
             blsPublicKey: DEFAULT_BLS_PUBLIC_KEY,
             registrationTimestamp: DEFAULT_REGISTRATION_TIMESTAMP
         });
-        _mockGetVerifiedWarpMessage(new bytes(0), false);
+        _mockGetUptimeWarpMessage(new bytes(0), false);
         vm.warp(DEFAULT_REGISTRATION_TIMESTAMP + DEFAULT_MINIMUM_STAKE_DURATION);
         vm.expectRevert(_formatErrorMessage("invalid warp message"));
         posValidatorManager.initializeEndValidation(validationID, true, 0);
@@ -190,8 +190,8 @@ abstract contract PoSValidatorManagerTest is ValidatorManagerTest {
             registrationTimestamp: DEFAULT_REGISTRATION_TIMESTAMP
         });
 
-        _mockGetVerifiedWarpMessage(new bytes(0), true);
-        _mockGetBlockchainID();
+        _mockGetUptimeWarpMessage(new bytes(0), true);
+        _mockGetBlockchainID(posValidatorManager.P_CHAIN_BLOCKCHAIN_ID());
         vm.warp(DEFAULT_REGISTRATION_TIMESTAMP + DEFAULT_MINIMUM_STAKE_DURATION);
         vm.expectRevert(_formatErrorMessage("invalid source chain ID"));
         posValidatorManager.initializeEndValidation(validationID, true, 0);
@@ -367,7 +367,7 @@ abstract contract PoSValidatorManagerTest is ValidatorManagerTest {
             .packSubnetValidatorWeightUpdateMessage(
             validationID, 1, DEFAULT_DELEGATOR_WEIGHT + DEFAULT_WEIGHT
         );
-        _mockGetVerifiedWarpMessage(setValidatorWeightPayload, true);
+        _mockGetPChainWarpMessage(setValidatorWeightPayload, true);
 
         vm.warp(DEFAULT_DELEGATOR_COMPLETE_REGISTRATION_TIMESTAMP);
         vm.expectRevert("PoSValidatorManager: nonce does not match");
@@ -650,7 +650,7 @@ abstract contract PoSValidatorManagerTest is ValidatorManagerTest {
             .packSubnetValidatorWeightUpdateMessage(
             validationID, 3, DEFAULT_DELEGATOR_WEIGHT + DEFAULT_WEIGHT
         );
-        _mockGetVerifiedWarpMessage(setValidatorWeightPayload, true);
+        _mockGetPChainWarpMessage(setValidatorWeightPayload, true);
 
         vm.expectRevert("PoSValidatorManager: nonce does not match");
         posValidatorManager.completeEndDelegation(0, delegationID2);
@@ -873,7 +873,7 @@ abstract contract PoSValidatorManagerTest is ValidatorManagerTest {
             .packSubnetValidatorWeightUpdateMessage(
             validationID, expectedNonce, expectedValidatorWeight
         );
-        _mockGetVerifiedWarpMessage(setValidatorWeightPayload, true);
+        _mockGetPChainWarpMessage(setValidatorWeightPayload, true);
 
         vm.warp(completeRegistrationTimestamp);
         vm.expectEmit(true, true, true, true, address(posValidatorManager));
@@ -903,8 +903,8 @@ abstract contract PoSValidatorManagerTest is ValidatorManagerTest {
         bytes memory uptimeMsg = ValidatorMessages.packValidationUptimeMessage(
             validationID, endDelegationTimestamp - startDelegationTimestamp
         );
-        _mockGetVerifiedWarpMessage(uptimeMsg, true);
-        _mockGetBlockchainID(P_CHAIN_BLOCKCHAIN_ID);
+        _mockGetUptimeWarpMessage(uptimeMsg, true);
+        _mockGetBlockchainID();
 
         vm.expectEmit(true, true, true, true, address(posValidatorManager));
         emit ValidatorWeightUpdate({
@@ -934,7 +934,7 @@ abstract contract PoSValidatorManagerTest is ValidatorManagerTest {
         bytes memory subnetValidatorRegistrationMessage =
             ValidatorMessages.packSubnetValidatorRegistrationMessage(validationID, false);
 
-        _mockGetVerifiedWarpMessage(subnetValidatorRegistrationMessage, true);
+        _mockGetPChainWarpMessage(subnetValidatorRegistrationMessage, true);
 
         vm.expectEmit(true, true, true, true, address(posValidatorManager));
         emit ValidationPeriodEnded(validationID, ValidatorStatus.Completed);
@@ -965,7 +965,7 @@ abstract contract PoSValidatorManagerTest is ValidatorManagerTest {
         bytes memory weightUpdateMessage = ValidatorMessages.packSubnetValidatorWeightUpdateMessage(
             validationID, expectedNonce, validatorWeight
         );
-        _mockGetVerifiedWarpMessage(weightUpdateMessage, true);
+        _mockGetPChainWarpMessage(weightUpdateMessage, true);
 
         vm.expectEmit(true, true, true, true, address(posValidatorManager));
         emit DelegationEnded(

diff --git a/contracts/validator-manager/tests/ValidatorManagerTests.t.sol b/contracts/validator-manager/tests/ValidatorManagerTests.t.sol
@@ -17,8 +17,6 @@ import {
 // TODO: Remove this once all unit tests implemented
 // solhint-disable no-empty-blocks
 abstract contract ValidatorManagerTest is Test {
-    bytes32 public constant P_CHAIN_BLOCKCHAIN_ID =
-        bytes32(hex"0000000000000000000000000000000000000000000000000000000000000000");
     bytes32 public constant DEFAULT_SUBNET_ID =
         bytes32(hex"1234567812345678123456781234567812345678123456781234567812345678");
     bytes32 public constant DEFAULT_NODE_ID =
@@ -178,7 +176,7 @@ abstract contract ValidatorManagerTest is Test {
         bytes memory subnetValidatorRegistrationMessage =
             ValidatorMessages.packSubnetValidatorRegistrationMessage(validationID, false);
 
-        _mockGetVerifiedWarpMessage(subnetValidatorRegistrationMessage, true);
+        _mockGetPChainWarpMessage(subnetValidatorRegistrationMessage, true);
 
         vm.expectEmit(true, true, true, true, address(validatorManager));
         emit ValidationPeriodEnded(validationID, ValidatorStatus.Completed);
@@ -197,7 +195,7 @@ abstract contract ValidatorManagerTest is Test {
         bytes memory subnetValidatorRegistrationMessage =
             ValidatorMessages.packSubnetValidatorRegistrationMessage(validationID, false);
 
-        _mockGetVerifiedWarpMessage(subnetValidatorRegistrationMessage, true);
+        _mockGetPChainWarpMessage(subnetValidatorRegistrationMessage, true);
 
         vm.expectEmit(true, true, true, true, address(validatorManager));
         emit ValidationPeriodEnded(validationID, ValidatorStatus.Invalidated);
@@ -326,7 +324,7 @@ abstract contract ValidatorManagerTest is Test {
         bytes memory subnetValidatorRegistrationMessage =
             ValidatorMessages.packSubnetValidatorRegistrationMessage(validationID, true);
 
-        _mockGetVerifiedWarpMessage(subnetValidatorRegistrationMessage, true);
+        _mockGetPChainWarpMessage(subnetValidatorRegistrationMessage, true);
 
         vm.warp(registrationTimestamp);
         vm.expectEmit(true, true, true, true, address(validatorManager));
@@ -383,8 +381,8 @@ abstract contract ValidatorManagerTest is Test {
             bytes memory uptimeMsg = ValidatorMessages.packValidationUptimeMessage(
                 validationID, completionTimestamp - registrationTimestamp
             );
-            _mockGetVerifiedWarpMessage(uptimeMsg, true);
-            _mockGetBlockchainID(P_CHAIN_BLOCKCHAIN_ID);
+            _mockGetUptimeWarpMessage(uptimeMsg, true);
+            _mockGetBlockchainID();
         }
         vm.expectEmit(true, true, true, true, address(validatorManager));
         emit ValidatorRemovalInitialized(validationID, bytes32(0), weight, completionTimestamp);
@@ -403,13 +401,31 @@ abstract contract ValidatorManagerTest is Test {
         );
     }
 
-    function _mockGetVerifiedWarpMessage(bytes memory expectedPayload, bool valid) internal {
+    function _mockGetPChainWarpMessage(bytes memory expectedPayload, bool valid) internal {
         vm.mockCall(
             WARP_PRECOMPILE_ADDRESS,
             abi.encodeWithSelector(IWarpMessenger.getVerifiedWarpMessage.selector, uint32(0)),
             abi.encode(
                 WarpMessage({
-                    sourceChainID: P_CHAIN_BLOCKCHAIN_ID,
+                    sourceChainID: validatorManager.P_CHAIN_BLOCKCHAIN_ID(),
+                    originSenderAddress: address(0),
+                    payload: expectedPayload
+                }),
+                valid
+            )
+        );
+        vm.expectCall(
+            WARP_PRECOMPILE_ADDRESS, abi.encodeCall(IWarpMessenger.getVerifiedWarpMessage, 0)
+        );
+    }
+
+    function _mockGetUptimeWarpMessage(bytes memory expectedPayload, bool valid) internal {
+        vm.mockCall(
+            WARP_PRECOMPILE_ADDRESS,
+            abi.encodeWithSelector(IWarpMessenger.getVerifiedWarpMessage.selector, uint32(0)),
+            abi.encode(
+                WarpMessage({
+                    sourceChainID: DEFAULT_SOURCE_BLOCKCHAIN_ID,
                     originSenderAddress: address(0),
                     payload: expectedPayload
                 }),
@@ -437,7 +453,7 @@ abstract contract ValidatorManagerTest is Test {
     }
 
     function _mockInitializeValidatorSet() internal {
-        _mockGetVerifiedWarpMessage(
+        _mockGetPChainWarpMessage(
             ValidatorMessages.packSubnetConversionMessage(DEFAULT_SUBNET_CONVERSION_TX_ID), true
         );
     }

diff --git a/tests/flows/validator-manager/poa_to_pos.go b/tests/flows/validator-manager/poa_to_pos.go
@@ -88,7 +88,6 @@ func PoAMigrationToPoS(network interfaces.LocalNetwork) {
 	tx, err := poaValidatorManager.Initialize(
 		opts,
 		poavalidatormanager.ValidatorManagerSettings{
-			PChainBlockchainID:     pChainInfo.BlockchainID,
 			SubnetID:               subnetAInfo.SubnetID,
 			ChurnPeriodSeconds:     uint64(0),
 			MaximumChurnPercentage: uint8(20),
@@ -165,7 +164,6 @@ func PoAMigrationToPoS(network interfaces.LocalNetwork) {
 		opts,
 		nativetokenstakingmanager.PoSValidatorManagerSettings{
 			BaseSettings: nativetokenstakingmanager.ValidatorManagerSettings{
-				PChainBlockchainID:     pChainInfo.BlockchainID,
 				SubnetID:               subnetAInfo.SubnetID,
 				ChurnPeriodSeconds:     utils.DefaultChurnPeriodSeconds,
 				MaximumChurnPercentage: utils.DefaultMaxChurnPercentage,

diff --git a/tests/utils/validator_manager.go b/tests/utils/validator_manager.go
@@ -90,7 +90,6 @@ func DeployAndInitializeNativeTokenStakingManager(
 		opts,
 		nativetokenstakingmanager.PoSValidatorManagerSettings{
 			BaseSettings: nativetokenstakingmanager.ValidatorManagerSettings{
-				PChainBlockchainID:     pChainInfo.BlockchainID,
 				SubnetID:               subnet.SubnetID,
 				ChurnPeriodSeconds:     DefaultChurnPeriodSeconds,
 				MaximumChurnPercentage: DefaultMaxChurnPercentage,
@@ -159,7 +158,6 @@ func DeployAndInitializeERC20TokenStakingManager(
 		opts,
 		erc20tokenstakingmanager.PoSValidatorManagerSettings{
 			BaseSettings: erc20tokenstakingmanager.ValidatorManagerSettings{
-				PChainBlockchainID:     pChainInfo.BlockchainID,
 				SubnetID:               subnet.SubnetID,
 				ChurnPeriodSeconds:     DefaultChurnPeriodSeconds,
 				MaximumChurnPercentage: DefaultMaxChurnPercentage,
@@ -216,7 +214,6 @@ func DeployAndInitializePoAValidatorManager(
 	tx, err := validatorManager.Initialize(
 		opts,
 		poavalidatormanager.ValidatorManagerSettings{
-			PChainBlockchainID:     pChainInfo.BlockchainID,
 			SubnetID:               subnet.SubnetID,
 			ChurnPeriodSeconds:     uint64(0),
 			MaximumChurnPercentage: uint8(20),