From 1b2770385bec826bc5673f13a93a1fae8e87847d Mon Sep 17 00:00:00 2001 From: ahramy Date: Thu, 31 Oct 2024 14:10:28 -0700 Subject: [PATCH 1/2] chore: reuse time since rotation function --- contracts/governance/BaseWeightedMultisig.sol | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/contracts/governance/BaseWeightedMultisig.sol b/contracts/governance/BaseWeightedMultisig.sol index 25548ea6..5b16c357 100644 --- a/contracts/governance/BaseWeightedMultisig.sol +++ b/contracts/governance/BaseWeightedMultisig.sol @@ -85,7 +85,7 @@ abstract contract BaseWeightedMultisig is IBaseWeightedMultisig { * @notice This function returns the timestamp for the last signer rotation * @return uint256 The last rotation timestamp */ - function lastRotationTimestamp() external view returns (uint256) { + function lastRotationTimestamp() public view returns (uint256) { return _baseWeightedMultisigStorage().lastRotationTimestamp; } @@ -93,8 +93,8 @@ abstract contract BaseWeightedMultisig is IBaseWeightedMultisig { * @notice This function returns the time elapsed (in secs) since the last rotation * @return uint256 The time since the last rotation */ - function timeSinceRotation() external view returns (uint256) { - return block.timestamp - _baseWeightedMultisigStorage().lastRotationTimestamp; + function timeSinceRotation() public view returns (uint256) { + return block.timestamp - lastRotationTimestamp(); } /*************************\ @@ -168,18 +168,13 @@ abstract contract BaseWeightedMultisig is IBaseWeightedMultisig { * @dev Updates the last rotation timestamp, and enforces the minimum rotation delay if specified */ function _updateRotationTimestamp(bool enforceRotationDelay) internal { - uint256 lastRotationTimestamp_ = _baseWeightedMultisigStorage().lastRotationTimestamp; - uint256 currentTimestamp = block.timestamp; - - if (enforceRotationDelay && (currentTimestamp - lastRotationTimestamp_) < minimumRotationDelay) { - revert InsufficientRotationDelay( - minimumRotationDelay, - lastRotationTimestamp_, - currentTimestamp - lastRotationTimestamp_ - ); + uint256 timeSinceRotation_ = timeSinceRotation(); + + if (enforceRotationDelay && timeSinceRotation_ < minimumRotationDelay) { + revert InsufficientRotationDelay(minimumRotationDelay, lastRotationTimestamp(), timeSinceRotation_); } - _baseWeightedMultisigStorage().lastRotationTimestamp = currentTimestamp; + _baseWeightedMultisigStorage().lastRotationTimestamp = block.timestamp; } /** From 59d71d119dc2ecc7d864ea4cd87f5cb82edd5b84 Mon Sep 17 00:00:00 2001 From: ahramy Date: Thu, 31 Oct 2024 14:10:53 -0700 Subject: [PATCH 2/2] Update package-lock.json --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7f6a4dfb..66b9bb38 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@axelar-network/axelar-gmp-sdk-solidity", - "version": "6.0.0", + "version": "6.0.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@axelar-network/axelar-gmp-sdk-solidity", - "version": "6.0.0", + "version": "6.0.3", "license": "MIT", "devDependencies": { "@axelar-network/axelar-chains-config": "^1.2.0",