Skip to content
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
1 change: 0 additions & 1 deletion contracts/account/extensions/draft-AccountERC7579.sol
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import {ERC7579Utils, Mode, CallType, ExecType} from "../../account/utils/draft-
import {EnumerableSet} from "../../utils/structs/EnumerableSet.sol";
import {Bytes} from "../../utils/Bytes.sol";
import {Packing} from "../../utils/Packing.sol";
import {Address} from "../../utils/Address.sol";
import {Calldata} from "../../utils/Calldata.sol";
import {Account} from "../Account.sol";

Expand Down
2 changes: 1 addition & 1 deletion contracts/governance/Governor.sol
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@ abstract contract Governor is Context, ERC165, EIP712, Nonces, IGovernor, IERC72

/// @inheritdoc IERC6372
// solhint-disable-next-line func-name-mixedcase
function CLOCK_MODE() public view virtual returns (string memory);
function CLOCK_MODE() public view virtual returns (string memory); // slippy-disable-line naming-convention

/// @inheritdoc IGovernor
function votingDelay() public view virtual returns (uint256);
Expand Down
2 changes: 1 addition & 1 deletion contracts/governance/IGovernor.sol
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ interface IGovernor is IERC165, IERC6372 {
* JavaScript class.
*/
// solhint-disable-next-line func-name-mixedcase
function COUNTING_MODE() external view returns (string memory);
function COUNTING_MODE() external view returns (string memory); // slippy-disable-line naming-convention

/**
* @notice module:core
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ abstract contract GovernorCountingFractional is Governor {
/// @inheritdoc IGovernor
// solhint-disable-next-line func-name-mixedcase
function COUNTING_MODE() public pure virtual override returns (string memory) {
// slippy-disable-previous-line naming-convention
return "support=bravo,fractional&quorum=for,abstain&params=fractional";
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ abstract contract GovernorCountingOverridable is GovernorVotes {
/// @inheritdoc IGovernor
// solhint-disable-next-line func-name-mixedcase
function COUNTING_MODE() public pure virtual override returns (string memory) {
// slippy-disable-previous-line naming-convention
return "support=bravo,override&quorum=for,abstain&overridable=true";
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ abstract contract GovernorCountingSimple is Governor {
/// @inheritdoc IGovernor
// solhint-disable-next-line func-name-mixedcase
function COUNTING_MODE() public pure virtual override returns (string memory) {
// slippy-disable-previous-line naming-convention
return "support=bravo&quorum=for,abstain";
}

Expand Down
1 change: 1 addition & 0 deletions contracts/governance/extensions/GovernorVotes.sol
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ abstract contract GovernorVotes is Governor {
*/
// solhint-disable-next-line func-name-mixedcase
function CLOCK_MODE() public view virtual override returns (string memory) {
// slippy-disable-previous-line naming-convention
try token().CLOCK_MODE() returns (string memory clockmode) {
return clockmode;
} catch {
Expand Down
1 change: 1 addition & 0 deletions contracts/governance/utils/Votes.sol
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ abstract contract Votes is Context, EIP712, Nonces, IERC5805 {
*/
// solhint-disable-next-line func-name-mixedcase
function CLOCK_MODE() public view virtual returns (string memory) {
// slippy-disable-previous-line naming-convention
// Check that the clock was not modified
if (clock() != Time.blockNumber()) {
revert ERC6372InconsistentClock();
Expand Down
2 changes: 1 addition & 1 deletion contracts/interfaces/IERC6372.sol
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ interface IERC6372 {
* @dev Description of the clock
*/
// solhint-disable-next-line func-name-mixedcase
function CLOCK_MODE() external view returns (string memory);
function CLOCK_MODE() external view returns (string memory); // slippy-disable-line naming-convention
}
10 changes: 10 additions & 0 deletions contracts/mocks/MultipleInheritanceInitializableMocks.sol
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,13 @@ contract SampleHuman is Initializable {

// solhint-disable-next-line func-name-mixedcase
function __SampleHuman_init() internal onlyInitializing {
// slippy-disable-previous-line naming-convention
__SampleHuman_init_unchained();
}

// solhint-disable-next-line func-name-mixedcase
function __SampleHuman_init_unchained() internal onlyInitializing {
// slippy-disable-previous-line naming-convention
isHuman = true;
}
}
Expand All @@ -48,12 +50,14 @@ contract SampleMother is Initializable, SampleHuman {

// solhint-disable-next-line func-name-mixedcase
function __SampleMother_init(uint256 value) internal onlyInitializing {
// slippy-disable-previous-line naming-convention
__SampleHuman_init();
__SampleMother_init_unchained(value);
}

// solhint-disable-next-line func-name-mixedcase
function __SampleMother_init_unchained(uint256 value) internal onlyInitializing {
// slippy-disable-previous-line naming-convention
mother = value;
}
}
Expand All @@ -70,12 +74,14 @@ contract SampleGramps is Initializable, SampleHuman {

// solhint-disable-next-line func-name-mixedcase
function __SampleGramps_init(string memory value) internal onlyInitializing {
// slippy-disable-previous-line naming-convention
__SampleHuman_init();
__SampleGramps_init_unchained(value);
}

// solhint-disable-next-line func-name-mixedcase
function __SampleGramps_init_unchained(string memory value) internal onlyInitializing {
// slippy-disable-previous-line naming-convention
gramps = value;
}
}
Expand All @@ -92,12 +98,14 @@ contract SampleFather is Initializable, SampleGramps {

// solhint-disable-next-line func-name-mixedcase
function __SampleFather_init(string memory _gramps, uint256 _father) internal onlyInitializing {
// slippy-disable-previous-line naming-convention
__SampleGramps_init(_gramps);
__SampleFather_init_unchained(_father);
}

// solhint-disable-next-line func-name-mixedcase
function __SampleFather_init_unchained(uint256 _father) internal onlyInitializing {
// slippy-disable-previous-line naming-convention
father = _father;
}
}
Expand All @@ -114,6 +122,7 @@ contract SampleChild is Initializable, SampleMother, SampleFather {

// solhint-disable-next-line func-name-mixedcase
function __SampleChild_init(
// slippy-disable-previous-line naming-convention
uint256 _mother,
string memory _gramps,
uint256 _father,
Expand All @@ -126,6 +135,7 @@ contract SampleChild is Initializable, SampleMother, SampleFather {

// solhint-disable-next-line func-name-mixedcase
function __SampleChild_init_unchained(uint256 _child) internal onlyInitializing {
// slippy-disable-previous-line naming-convention
child = _child;
}
}
1 change: 1 addition & 0 deletions contracts/mocks/Stateless.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

pragma solidity ^0.8.26;

// slippy-disable no-unused-vars
// We keep these imports and a dummy contract just to we can run the test suite after transpilation.

import {Address} from "../utils/Address.sol";
Expand Down
1 change: 1 addition & 0 deletions contracts/mocks/VotesExtendedMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ abstract contract VotesExtendedTimestampMock is VotesExtendedMock {

// solhint-disable-next-line func-name-mixedcase
function CLOCK_MODE() public view virtual override returns (string memory) {
// slippy-disable-previous-line naming-convention
return "mode=timestamp";
}
}
1 change: 1 addition & 0 deletions contracts/mocks/VotesMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ abstract contract VotesTimestampMock is VotesMock {

// solhint-disable-next-line func-name-mixedcase
function CLOCK_MODE() public view virtual override returns (string memory) {
// slippy-disable-previous-line naming-convention
return "mode=timestamp";
}
}
1 change: 0 additions & 1 deletion contracts/mocks/account/AccountMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import {AccountERC7579} from "../../account/extensions/draft-AccountERC7579.sol"
import {AccountERC7579Hooked} from "../../account/extensions/draft-AccountERC7579Hooked.sol";
import {ERC721Holder} from "../../token/ERC721/utils/ERC721Holder.sol";
import {ERC1155Holder} from "../../token/ERC1155/utils/ERC1155Holder.sol";
import {ERC4337Utils} from "../../account/utils/draft-ERC4337Utils.sol";
import {ERC7739} from "../../utils/cryptography/signers/draft-ERC7739.sol";
import {ERC7821} from "../../account/extensions/draft-ERC7821.sol";
import {MODULE_TYPE_VALIDATOR} from "../../interfaces/draft-IERC7579.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/account/modules/ERC7579Mock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ abstract contract ERC7579FallbackHandlerMock is ERC7579ModuleMock(MODULE_TYPE_FA
emit ERC7579FallbackHandlerMockCalled(_msgAccount(), _msgSender(), msg.value, _msgData());
}

function callView() public view returns (address, address) {
function callView() public view returns (address account, address sender) {
return (_msgAccount(), _msgSender());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ contract MyTokenTimestampBased is ERC20, ERC20Permit, ERC20Votes {

// solhint-disable-next-line func-name-mixedcase
function CLOCK_MODE() public pure override returns (string memory) {
// slippy-disable-previous-line naming-convention
return "mode=timestamp";
}

Expand Down
1 change: 0 additions & 1 deletion contracts/mocks/governance/GovernorNoncesKeyedMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import {Governor, Nonces} from "../../governance/Governor.sol";
import {GovernorSettings} from "../../governance/extensions/GovernorSettings.sol";
import {GovernorCountingSimple} from "../../governance/extensions/GovernorCountingSimple.sol";
import {GovernorVotesQuorumFraction} from "../../governance/extensions/GovernorVotesQuorumFraction.sol";
import {GovernorProposalGuardian} from "../../governance/extensions/GovernorProposalGuardian.sol";
import {GovernorNoncesKeyed} from "../../governance/extensions/GovernorNoncesKeyed.sol";

abstract contract GovernorNoncesKeyedMock is
Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/token/ERC20BridgeableMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pragma solidity ^0.8.20;

import {ERC20, ERC20Bridgeable} from "../../token/ERC20/extensions/draft-ERC20Bridgeable.sol";
import {ERC20Bridgeable} from "../../token/ERC20/extensions/draft-ERC20Bridgeable.sol";

abstract contract ERC20BridgeableMock is ERC20Bridgeable {
address private _bridge;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ abstract contract ERC20VotesExtendedTimestampMock is ERC20VotesExtendedMock {

// solhint-disable-next-line func-name-mixedcase
function CLOCK_MODE() public view virtual override returns (string memory) {
// slippy-disable-previous-line naming-convention
return "mode=timestamp";
}
}
2 changes: 2 additions & 0 deletions contracts/mocks/token/ERC20VotesTimestampMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ abstract contract ERC20VotesTimestampMock is ERC20Votes {

// solhint-disable-next-line func-name-mixedcase
function CLOCK_MODE() public view virtual override returns (string memory) {
// slippy-disable-previous-line naming-convention
return "mode=timestamp";
}
}
Expand All @@ -24,6 +25,7 @@ abstract contract ERC721VotesTimestampMock is ERC721Votes {

// solhint-disable-next-line func-name-mixedcase
function CLOCK_MODE() public view virtual override returns (string memory) {
// slippy-disable-previous-line naming-convention
return "mode=timestamp";
}
}
1 change: 0 additions & 1 deletion contracts/mocks/utils/cryptography/ERC7739Mock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

pragma solidity ^0.8.24;

import {ECDSA} from "../../../utils/cryptography/ECDSA.sol";
import {ERC7739} from "../../../utils/cryptography/signers/draft-ERC7739.sol";
import {SignerECDSA} from "../../../utils/cryptography/signers/SignerECDSA.sol";
import {SignerP256} from "../../../utils/cryptography/signers/SignerP256.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/proxy/utils/UUPSUpgradeable.sol
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {ERC1967Utils} from "../ERC1967/ERC1967Utils.sol";
*/
abstract contract UUPSUpgradeable is IERC1822Proxiable {
/// @custom:oz-upgrades-unsafe-allow state-variable-immutable
address private immutable __self = address(this);
address private immutable __self = address(this); // slippy-disable-line naming-convention

/**
* @dev The version of the upgrade interface of the contract. If this getter is missing, both `upgradeTo(address)`
Expand Down
1 change: 1 addition & 0 deletions contracts/token/ERC20/extensions/ERC20Permit.sol
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ abstract contract ERC20Permit is ERC20, IERC20Permit, EIP712, Nonces {
/// @inheritdoc IERC20Permit
// solhint-disable-next-line func-name-mixedcase
function DOMAIN_SEPARATOR() external view virtual returns (bytes32) {
// slippy-disable-previous-line naming-convention
return _domainSeparatorV4();
}
}
2 changes: 1 addition & 1 deletion contracts/token/ERC20/extensions/IERC20Permit.sol
Original file line number Diff line number Diff line change
Expand Up @@ -86,5 +86,5 @@ interface IERC20Permit {
* @dev Returns the domain separator used in the encoding of the signature for {permit}, as defined by {EIP712}.
*/
// solhint-disable-next-line func-name-mixedcase
function DOMAIN_SEPARATOR() external view returns (bytes32);
function DOMAIN_SEPARATOR() external view returns (bytes32); // slippy-disable-line naming-convention
}
1 change: 1 addition & 0 deletions contracts/utils/Packing.sol
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ pragma solidity ^0.8.20;
* _Available since v5.1._
*/
// solhint-disable func-name-mixedcase
// slippy-disable naming-convention
library Packing {
error OutOfRangeAccess();

Expand Down
2 changes: 2 additions & 0 deletions contracts/utils/cryptography/EIP712.sol
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ abstract contract EIP712 is IERC5267 {
*/
// solhint-disable-next-line func-name-mixedcase
function _EIP712Name() internal view returns (string memory) {
// slippy-disable-previous-line naming-convention
return _name.toStringWithFallback(_nameFallback);
}

Expand All @@ -155,6 +156,7 @@ abstract contract EIP712 is IERC5267 {
*/
// solhint-disable-next-line func-name-mixedcase
function _EIP712Version() internal view returns (string memory) {
// slippy-disable-previous-line naming-convention
return _version.toStringWithFallback(_versionFallback);
}
}
1 change: 0 additions & 1 deletion contracts/utils/cryptography/signers/draft-ERC7739.sol
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {EIP712} from "../EIP712.sol";
import {ERC7739Utils} from "../draft-ERC7739Utils.sol";
import {IERC1271} from "../../../interfaces/IERC1271.sol";
import {MessageHashUtils} from "../MessageHashUtils.sol";
import {ShortStrings} from "../../ShortStrings.sol";

/**
* @dev Validates signatures wrapping the message hash in a nested EIP712 type. See {ERC7739Utils}.
Expand Down
6 changes: 3 additions & 3 deletions contracts/vendor/compound/ICompoundTimelock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ interface ICompoundTimelock {
receive() external payable;

// solhint-disable-next-line func-name-mixedcase
function GRACE_PERIOD() external view returns (uint256);
function GRACE_PERIOD() external view returns (uint256); // slippy-disable-line naming-convention

// solhint-disable-next-line func-name-mixedcase
function MINIMUM_DELAY() external view returns (uint256);
function MINIMUM_DELAY() external view returns (uint256); // slippy-disable-line naming-convention

// solhint-disable-next-line func-name-mixedcase
function MAXIMUM_DELAY() external view returns (uint256);
function MAXIMUM_DELAY() external view returns (uint256); // slippy-disable-line naming-convention

function admin() external view returns (address);

Expand Down
Loading
Loading