Skip to content

Commit 0b9edd4

Browse files
authored
Merge branch 'master' into typo-fixes
2 parents 659d4b2 + cc94ea4 commit 0b9edd4

File tree

9 files changed

+465
-69
lines changed

9 files changed

+465
-69
lines changed

contracts/mocks/DummyImplementation.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: MIT
22

3-
pragma solidity ^0.8.22;
3+
pragma solidity ^0.8.21;
44

55
import {ERC1967Utils} from "../proxy/ERC1967/ERC1967Utils.sol";
66
import {StorageSlot} from "../utils/StorageSlot.sol";

contracts/mocks/account/AccountMock.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: MIT
22

3-
pragma solidity ^0.8.27;
3+
pragma solidity ^0.8.26;
44

55
import {Account} from "../../account/Account.sol";
66
import {AccountERC7579} from "../../account/extensions/draft-AccountERC7579.sol";

contracts/utils/cryptography/signers/MultiSignerERC7913.sol

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ abstract contract MultiSignerERC7913 is AbstractSigner {
6666
/// @dev The `signer` is less than 20 bytes long.
6767
error MultiSignerERC7913InvalidSigner(bytes signer);
6868

69+
/// @dev The `threshold` is zero.
70+
error MultiSignerERC7913ZeroThreshold();
71+
6972
/// @dev The `threshold` is unreachable given the number of `signers`.
7073
error MultiSignerERC7913UnreachableThreshold(uint64 signers, uint64 threshold);
7174

@@ -146,6 +149,7 @@ abstract contract MultiSignerERC7913 is AbstractSigner {
146149
* * See {_validateReachableThreshold} for the threshold validation.
147150
*/
148151
function _setThreshold(uint64 newThreshold) internal virtual {
152+
require(newThreshold > 0, MultiSignerERC7913ZeroThreshold());
149153
_threshold = newThreshold;
150154
_validateReachableThreshold();
151155
emit ERC7913ThresholdSet(newThreshold);

fv-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
certora-cli==4.13.1
22
# File uses a custom name (fv-requirements.txt) so that it isn't picked by Netlify's build
33
# whose latest Python version is 0.3.8, incompatible with most recent versions of Halmos
4-
halmos==0.2.6
4+
halmos==0.3.0

0 commit comments

Comments
 (0)