Skip to content

L-05 Missing Check for Duplicate Addresses in _validatePChainOwner #765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 14, 2025
Merged

L-05 Missing Check for Duplicate Addresses in _validatePChainOwner #765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c2ebd0f
L-05 Missing Check for Duplicate Addresses in _validatePChainOwner
geoff-vball Apr 11, 2025
cf29985
Update contracts/validator-manager/ValidatorManager.sol
geoff-vball Apr 11, 2025
c4f5fda
Merge branch 'main' into L-05-duplicate-addresses
geoff-vball Apr 14, 2025
e1067e3
Merge branch 'main' into L-05-duplicate-addresses
geoff-vball Apr 14, 2025
a1408fc
Merge branch 'main' into L-05-duplicate-addresses
geoff-vball Apr 14, 2025
fafcc7d
Merge branch 'main' into L-05-duplicate-addresses
geoff-vball Apr 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion abi-bindings/go/validator-manager/ERC20TokenStakingManager/ERC20TokenStakingManager.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion abi-bindings/go/validator-manager/NativeTokenStakingManager/NativeTokenStakingManager.go
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions abi-bindings/go/validator-manager/ValidatorManager/ValidatorManager.go
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions contracts/validator-manager/ValidatorManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ contract ValidatorManager is Initializable, OwnableUpgradeable, ACP99Manager {
error NodeAlreadyRegistered(bytes nodeID);
error UnexpectedRegistrationStatus(bool validRegistration);
error InvalidPChainOwnerThreshold(uint256 threshold, uint256 addressesLength);
error PChainOwnerAddressesNotSorted();
error InvalidPChainOwnerAddresses();
error ZeroAddress();

// solhint-disable ordering
Expand Down Expand Up @@ -308,11 +308,11 @@ contract ValidatorManager is Initializable, OwnableUpgradeable, ACP99Manager {
if (pChainOwner.addresses.length > 0 && pChainOwner.addresses[0] == address(0)) {
revert ZeroAddress();
}
// Addresses must be sorted in ascending order
// Addresses must be unique and sorted in ascending order
for (uint256 i = 1; i < pChainOwner.addresses.length; i++) {
// Compare current address with the previous one
if (pChainOwner.addresses[i] < pChainOwner.addresses[i - 1]) {
revert PChainOwnerAddressesNotSorted();
if (pChainOwner.addresses[i] <= pChainOwner.addresses[i - 1]) {
revert InvalidPChainOwnerAddresses();
}
}
}
Expand Down
23 changes: 22 additions & 1 deletion contracts/validator-manager/tests/ValidatorManagerTests.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,28 @@ abstract contract ValidatorManagerTest is Test {

_beforeSend(_weightToValue(DEFAULT_WEIGHT), address(this));
vm.expectRevert(
abi.encodeWithSelector(ValidatorManager.PChainOwnerAddressesNotSorted.selector)
abi.encodeWithSelector(ValidatorManager.InvalidPChainOwnerAddresses.selector)
);
_initiateValidatorRegistration({
nodeID: DEFAULT_NODE_ID,
blsPublicKey: DEFAULT_BLS_PUBLIC_KEY,
remainingBalanceOwner: invalidPChainOwner1,
disableOwner: DEFAULT_P_CHAIN_OWNER,
registrationExpiry: DEFAULT_EXPIRY,
weight: DEFAULT_WEIGHT
});
}

function testInitiateValidatorRegistrationDuplicatePChainOwnerAddress() public {
// Addresses not sorted
address[] memory addresses = new address[](2);
addresses[0] = 0x1234567812345678123456781234567812345678;
addresses[1] = 0x1234567812345678123456781234567812345678;
PChainOwner memory invalidPChainOwner1 = PChainOwner({threshold: 1, addresses: addresses});

_beforeSend(_weightToValue(DEFAULT_WEIGHT), address(this));
vm.expectRevert(
abi.encodeWithSelector(ValidatorManager.InvalidPChainOwnerAddresses.selector)
);
_initiateValidatorRegistration({
nodeID: DEFAULT_NODE_ID,
Expand Down