Commit 7f474593 authored by Maurelian's avatar Maurelian

chore(ctb): Rename lib to SafeSigners

parent 2103d61d
...@@ -4,7 +4,7 @@ pragma solidity 0.8.15; ...@@ -4,7 +4,7 @@ pragma solidity 0.8.15;
import { Safe } from "safe-contracts/Safe.sol"; import { Safe } from "safe-contracts/Safe.sol";
import { BaseGuard, GuardManager } from "safe-contracts/base/GuardManager.sol"; import { BaseGuard, GuardManager } from "safe-contracts/base/GuardManager.sol";
import { ModuleManager } from "safe-contracts/base/ModuleManager.sol"; import { ModuleManager } from "safe-contracts/base/ModuleManager.sol";
import { GetSigners } from "src/Safe/GetSigners.sol"; import { SafeSigners } from "src/Safe/SafeSigners.sol";
import { Enum } from "safe-contracts/common/Enum.sol"; import { Enum } from "safe-contracts/common/Enum.sol";
import { ISemver } from "src/universal/ISemver.sol"; import { ISemver } from "src/universal/ISemver.sol";
import { EnumerableSet } from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; import { EnumerableSet } from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
...@@ -110,7 +110,7 @@ contract LivenessGuard is ISemver, BaseGuard { ...@@ -110,7 +110,7 @@ contract LivenessGuard is ISemver, BaseGuard {
uint256 threshold = safe.getThreshold(); uint256 threshold = safe.getThreshold();
address[] memory signers = address[] memory signers =
GetSigners.getNSigners({ dataHash: txHash, signatures: signatures, requiredSignatures: threshold }); SafeSigners.getNSigners({ dataHash: txHash, signatures: signatures, requiredSignatures: threshold });
for (uint256 i = 0; i < signers.length; i++) { for (uint256 i = 0; i < signers.length; i++) {
lastLive[signers[i]] = block.timestamp; lastLive[signers[i]] = block.timestamp;
......
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
pragma solidity 0.8.15; pragma solidity ^0.8.0;
library GetSigners { library SafeSigners {
/// @notice Splits signature bytes into `uint8 v, bytes32 r, bytes32 s`. /// @notice Splits signature bytes into `uint8 v, bytes32 r, bytes32 s`.
/// Copied directly from /// Copied directly from
/// https://github.com/safe-global/safe-contracts/blob/e870f514ad34cd9654c72174d6d4a839e3c6639f/contracts/common/SignatureDecoder.sol /// https://github.com/safe-global/safe-contracts/blob/e870f514ad34cd9654c72174d6d4a839e3c6639f/contracts/common/SignatureDecoder.sol
...@@ -41,6 +41,7 @@ library GetSigners { ...@@ -41,6 +41,7 @@ library GetSigners {
/// @param dataHash Hash of the data. /// @param dataHash Hash of the data.
/// @param signatures Signature data for identifying signers. /// @param signatures Signature data for identifying signers.
/// @param requiredSignatures Amount of required valid signatures. /// @param requiredSignatures Amount of required valid signatures.
/// @return _owners List of unique signers.
function getNSigners( function getNSigners(
bytes32 dataHash, bytes32 dataHash,
bytes memory signatures, bytes memory signatures,
......
...@@ -3,12 +3,12 @@ pragma solidity 0.8.15; ...@@ -3,12 +3,12 @@ pragma solidity 0.8.15;
import { Test } from "forge-std/Test.sol"; import { Test } from "forge-std/Test.sol";
import { Safe } from "safe-contracts/Safe.sol"; import { Safe } from "safe-contracts/Safe.sol";
import { GetSigners } from "src/Safe/GetSigners.sol"; import { SafeSigners } from "src/Safe/SafeSigners.sol";
import "test/safe-tools/SafeTestTools.sol"; import "test/safe-tools/SafeTestTools.sol";
import { SignatureDecoder } from "safe-contracts/common/SignatureDecoder.sol"; import { SignatureDecoder } from "safe-contracts/common/SignatureDecoder.sol";
contract GetSigners_Test is Test, SafeTestTools { contract SafeSigners_Test is Test, SafeTestTools {
bytes4 internal constant EIP1271_MAGIC_VALUE = 0x20c13b0b; bytes4 internal constant EIP1271_MAGIC_VALUE = 0x20c13b0b;
enum SigTypes { enum SigTypes {
...@@ -98,7 +98,7 @@ contract GetSigners_Test is Test, SafeTestTools { ...@@ -98,7 +98,7 @@ contract GetSigners_Test is Test, SafeTestTools {
// Recover the signatures using the _getNSigners() method. // Recover the signatures using the _getNSigners() method.
address[] memory gotSigners = address[] memory gotSigners =
GetSigners.getNSigners({ dataHash: digest, signatures: signatures, requiredSignatures: numSigs }); SafeSigners.getNSigners({ dataHash: digest, signatures: signatures, requiredSignatures: numSigs });
// Compare the list of recovered signers to the expected signers. // Compare the list of recovered signers to the expected signers.
assertEq(gotSigners.length, numSigs); assertEq(gotSigners.length, numSigs);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment