Merge branch 'main' into use-official-foundry

Author: geoff-vball

abi-bindings/go/validator-manager/ERC20TokenStakingManager/ERC20TokenStakingManager.go

@@ -0,0 +1,20 @@
+# Migrating From V1 Validator Manager Contracts
+
+The V1 Validator Manager contracts are implemented as a single deployed contract consisting of multiple contracts related through inheritance. The V2 Validator Manager, on the other hand, may be consist of multiple deployed contracts that interact via external function calls. 
+
+## Migrating Proof-of-Authority
+
+In the V2 contracts, Proof-of-Authority validator management is implemented fully in `ValidatorManager`, so there is no need to deploy a separate contract (contrast with the Proof-of-Stake case, which requires a standalone `StakingManager` deployment). Additionally, both the V1 `PoAValidatorManager` and the V2 `ValidatorManager` are `Ownable`, meaning that the V1 `PoAValidatorManager` owner will persist after upgrading to a V2 `ValidatorManager`. Migrating from a V1 to V2 therefore only requires migrating the state variables that track validators. The helper method `migrateFromV1` is provided for this purpose. The general steps are as follows:
+
+1. Upgrade the proxy contract's implementation to a newly deployed V2 `ValidatorManager` using standard methods
+2. For each validator (active or expired), call `migrateFromV1` with its `validationID`. The `receivedNonce` argument can be set to 0, since V1 `PoAValidatorManager`s do not support weight changes.
+
+Some notes on this process:
+- `migrateFromV1` may only be called once per `validationID`. Any active validators will not be able to be removed until they are migrated.
+- It is up to the contract owner to track all of the `validationID`s to be migrated. This is because Solidity mappings are not iterable, so there is no getter to retreive all `validationID`s as a batch.
+
+## Migrating Proof-of-Stake
+
+**Migrating from a V1 `PoSValidatorManager` deployment to a V2 Proof-of-Stake Validator Manager is not supported.**
+
+V2 Proof-of-Stake Validator Managers consist of two deployed contracts: an instance of a concrete implementation of `StakingManager`, and an instance of a `ValidatorManager`. Because `StakingManager` is a standalone contract that does not share state with `ValidatorManager`, migrating from a V1 `PoSValidatorManager` to a V2 `StakingManager` would require replicating state from one contract to another. 

abi-bindings/go/validator-manager/NativeTokenStakingManager/NativeTokenStakingManager.go

@@ -48,6 +48,17 @@ struct ValidatorManagerSettings {
     uint8 maximumChurnPercentage;
 }
 
+/// @dev Legacy struct used to migrate from V1 contracts
+struct ValidatorLegacy {
+    ValidatorStatus status;
+    bytes nodeID;
+    uint64 startingWeight;
+    uint64 messageNonce;
+    uint64 weight;
+    uint64 startedAt;
+    uint64 endedAt;
+}
+
 /**
  * @dev Implementation of the {ACP99Manager} abstract contract.
  *
@@ -67,12 +78,14 @@ contract ValidatorManager is Initializable, OwnableUpgradeable, ACP99Manager {
         ValidatorChurnPeriod _churnTracker;
         /// @notice Maps the validationID to the registration message such that the message can be re-sent if needed.
         mapping(bytes32 => bytes) _pendingRegisterValidationMessages;
-        /// @notice Maps the validationID to the validator information.
-        mapping(bytes32 => Validator) _validationPeriods;
+        /// @notice Legacy storage for V1 validators.
+        mapping(bytes32 => ValidatorLegacy) _validationPeriodsLegacy;
         /// @notice Maps the nodeID to the validationID for validation periods that have not ended.
         mapping(bytes => bytes32) _registeredValidators;
         /// @notice Boolean that indicates if the initial validator set has been set.
         bool _initializedValidatorSet;
+        /// @notice Maps the validationID to the validator information.
+        mapping(bytes32 => Validator) _validationPeriods;
     }
     // solhint-enable private-vars-leading-underscore
 
@@ -140,6 +153,36 @@ contract ValidatorManager is Initializable, OwnableUpgradeable, ACP99Manager {
         }
     }
 
+    /**
+     * @notice Migrates a validator from the V1 contract to the V2 contract.
+     * @param validationID The ID of the validation period to migrate.
+     * @param receivedNonce The latest nonce received from the P-Chain.
+     */
+    function migrateFromV1(bytes32 validationID, uint32 receivedNonce) external {
+        ValidatorManagerStorage storage $ = _getValidatorManagerStorage();
+        ValidatorLegacy storage legacy = $._validationPeriodsLegacy[validationID];
+        if (legacy.status == ValidatorStatus.Unknown) {
+            revert InvalidValidationID(validationID);
+        }
+        if (receivedNonce > legacy.messageNonce) {
+            revert InvalidNonce(receivedNonce);
+        }
+
+        $._validationPeriods[validationID] = Validator({
+            status: legacy.status,
+            nodeID: legacy.nodeID,
+            startingWeight: legacy.startingWeight,
+            sentNonce: legacy.messageNonce,
+            receivedNonce: receivedNonce,
+            weight: legacy.weight,
+            startTime: legacy.startedAt,
+            endTime: legacy.endedAt
+        });
+
+        // Set the legacy status to unknown to disallow future migrations.
+        $._validationPeriodsLegacy[validationID].status = ValidatorStatus.Unknown;
+    }
+
     function initialize(
         ValidatorManagerSettings calldata settings
     ) external initializer {

abi-bindings/go/validator-manager/ValidatorManager/ValidatorManager.go

@@ -3,12 +3,12 @@ module github.com/ava-labs/icm-contracts
 go 1.23.6
 
 require (
-	github.com/ava-labs/avalanchego v1.12.2
+	github.com/ava-labs/avalanchego v1.12.3-0.20250302035717-8bd7a2c4cc81
 	github.com/supranational/blst v0.3.13 // indirect
 )
 
 require (
-	github.com/ava-labs/subnet-evm v0.7.1
+	github.com/ava-labs/subnet-evm v0.7.2
 	github.com/ethereum/go-ethereum v1.13.14
 	github.com/onsi/ginkgo/v2 v2.23.0
 	github.com/onsi/gomega v1.36.2
@@ -24,7 +24,7 @@ require (
 	github.com/DataDog/zstd v1.5.2 // indirect
 	github.com/NYTimes/gziphandler v1.1.1 // indirect
 	github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
-	github.com/ava-labs/coreth v0.14.1-rc.1 // indirect
+	github.com/ava-labs/coreth v0.14.1-rc.1.0.20250219185827-6a9db205a450 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bits-and-blooms/bitset v1.10.0 // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect

contracts/validator-manager/MigratingFromV1.md

@@ -58,12 +58,12 @@ github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
-github.com/ava-labs/avalanchego v1.12.2 h1:vZroUgB5xMMczDQnw9etDD1XhZsejFlKky+ZZv8wOKc=
-github.com/ava-labs/avalanchego v1.12.2/go.mod h1:uEDLbAUPcGCfDWW680rVfysEofUe/jWte5qQk0j5hMs=
-github.com/ava-labs/coreth v0.14.1-rc.1 h1:U72XlRm/fKyASmjThsWzfO/ZRvu1kaONFaX+KdJNxIc=
-github.com/ava-labs/coreth v0.14.1-rc.1/go.mod h1:lxDSXLcrszMo0N/PVJzfZ//H+bRwXF/KQWtpEYgXZqM=
-github.com/ava-labs/subnet-evm v0.7.1 h1:wXau+6Aj24hqqlN3wY14OKB4GJobWFhM3MzqFhg3WeU=
-github.com/ava-labs/subnet-evm v0.7.1/go.mod h1:jpAX6cNfMuUyoeP2/l9Z0ojDy2K/XbZq5y+E0jPXy38=
+github.com/ava-labs/avalanchego v1.12.3-0.20250302035717-8bd7a2c4cc81 h1:ZEmNsuAIIICSu1aUCOk1/iSwDaz9d9AhmpcozQrSXcU=
+github.com/ava-labs/avalanchego v1.12.3-0.20250302035717-8bd7a2c4cc81/go.mod h1:DfZ1/FHFxr1XnpDMfbMmex8bKxAtIISCGASdMUNFXtY=
+github.com/ava-labs/coreth v0.14.1-rc.1.0.20250219185827-6a9db205a450 h1:xSoL6plkPrb2w21v4JRnQg3BIJSg2svBHXyil09RMAg=
+github.com/ava-labs/coreth v0.14.1-rc.1.0.20250219185827-6a9db205a450/go.mod h1:AEQcF8MWrKH0sS114wEZlkSfeGF5F66xTbQYqqimNLI=
+github.com/ava-labs/subnet-evm v0.7.2 h1:AxmXT9tmuxmUi+hDqtoS0OVi0zi8fPqPcoQ7yjZ6FZQ=
+github.com/ava-labs/subnet-evm v0.7.2/go.mod h1:4ZWBSj9JALAtaUOPrI1P78C6vBMUpK0iiD6zaA9K2VA=
 github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=

contracts/validator-manager/ValidatorManager.sol

@@ -40,7 +40,7 @@ SUBNET_EVM_VERSION=${SUBNET_EVM_VERSION:-$(extract_commit "$(getDepVersion githu
 
 
 # Set golangci-lint version
-GOLANGCI_LINT_VERSION=${GOLANGCI_LINT_VERSION:-'v1.64'}
+GOLANGCI_LINT_VERSION=${GOLANGCI_LINT_VERSION:-'v1.64.5'}
 
 # Extract the Solidity version from foundry.toml
 SOLIDITY_VERSION=$(awk -F"'" '/^solc_version/ {print $2}' $ICM_CONTRACTS_PATH/foundry.toml)

go.mod

@@ -433,7 +433,10 @@ func (n *LocalNetwork) GetL1Info(subnetID ids.ID) interfaces.L1TestInfo {
 		if l1.SubnetID == subnetID {
 			var nodeURIs []string
 			for _, nodeID := range l1.ValidatorIDs {
-				uri, err := n.Network.GetURIForNodeID(nodeID)
+				node, err := n.Network.GetNode(nodeID)
+				Expect(err).Should(BeNil())
+
+				uri, _, err := node.GetLocalURI(context.Background())
 				Expect(err).Should(BeNil())
 
 				nodeURIs = append(nodeURIs, uri)
@@ -468,7 +471,10 @@ func (n *LocalNetwork) GetL1Infos() []interfaces.L1TestInfo {
 	for i, l1 := range n.Network.Subnets {
 		var nodeURIs []string
 		for _, nodeID := range l1.ValidatorIDs {
-			uri, err := n.Network.GetURIForNodeID(nodeID)
+			node, err := n.Network.GetNode(nodeID)
+			Expect(err).Should(BeNil())
+
+			uri, _, err := node.GetLocalURI(context.Background())
 			Expect(err).Should(BeNil())
 
 			nodeURIs = append(nodeURIs, uri)

go.sum

@@ -652,7 +652,9 @@ func SetupProposerVM(ctx context.Context, fundedKey *ecdsa.PrivateKey, network *
 
 	chainID := l1Details.Chains[0].ChainID
 
-	nodeURI, err := network.GetURIForNodeID(l1Details.ValidatorIDs[0])
+	node, err := network.GetNode(l1Details.ValidatorIDs[0])
+	Expect(err).Should(BeNil())
+	nodeURI, _, err := node.GetLocalURI(context.Background())
 	Expect(err).Should(BeNil())
 	uri := HttpToWebsocketURI(nodeURI, chainID.String())