NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MultiSignerERC7913: prevent setting the threshold to zero (#5772)

Browse Source
This commit is contained in:
Hadrien Croubois
2025-06-27 13:29:40 +02:00
committed by GitHub
parent 1a87de9326
commit cc94ea4930
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/utils/cryptography/signers/MultiSignerERC7913.sol
View File

@ -66,6 +66,9 @@ abstract contract MultiSignerERC7913 is AbstractSigner {
/// @dev The `signer` is less than 20 bytes long. /// @dev The `signer` is less than 20 bytes long.
error MultiSignerERC7913InvalidSigner(bytes signer); error MultiSignerERC7913InvalidSigner(bytes signer);
/// @dev The `threshold` is zero.
error MultiSignerERC7913ZeroThreshold();
/// @dev The `threshold` is unreachable given the number of `signers`. /// @dev The `threshold` is unreachable given the number of `signers`.
error MultiSignerERC7913UnreachableThreshold(uint64 signers, uint64 threshold); error MultiSignerERC7913UnreachableThreshold(uint64 signers, uint64 threshold);
@ -146,6 +149,7 @@ abstract contract MultiSignerERC7913 is AbstractSigner {
* * See {_validateReachableThreshold} for the threshold validation. * * See {_validateReachableThreshold} for the threshold validation.
*/ */
function _setThreshold(uint64 newThreshold) internal virtual { function _setThreshold(uint64 newThreshold) internal virtual {
require(newThreshold > 0, MultiSignerERC7913ZeroThreshold());
_threshold = newThreshold; _threshold = newThreshold;
_validateReachableThreshold(); _validateReachableThreshold();
emit ERC7913ThresholdSet(newThreshold); emit ERC7913ThresholdSet(newThreshold);

9
test/account/AccountMultiSigner.test.js
View File

@ -176,9 +176,14 @@ describe('AccountMultiSigner', function () {
await expect(this.mock.$_setThreshold(2)).to.emit(this.mock, 'ERC7913ThresholdSet'); await expect(this.mock.$_setThreshold(2)).to.emit(this.mock, 'ERC7913ThresholdSet');
// Unreachable threshold reverts // Unreachable threshold reverts
await expect(this.mock.$_setThreshold(3)).to.revertedWithCustomError( await expect(this.mock.$_setThreshold(3))
.to.revertedWithCustomError(this.mock, 'MultiSignerERC7913UnreachableThreshold')
.withArgs(2, 3);
// Zero threshold reverts
await expect(this.mock.$_setThreshold(0)).to.revertedWithCustomError(
this.mock, this.mock,
'MultiSignerERC7913UnreachableThreshold', 'MultiSignerERC7913ZeroThreshold',
); );
}); });