diff --git a/foundry.toml b/foundry.toml index dab6e97..96a61de 100644 --- a/foundry.toml +++ b/foundry.toml @@ -5,8 +5,7 @@ libs = ["lib"] evm_version = "shanghai" optimizer = true optimizer-runs = 10_000_000 -solc = "0.8.17" - +solc="0.8.17" [rpc_endpoints] sepolia = "${SEPOLIA_RPC_URL}" diff --git a/src/EmergencyMultisig.sol b/src/EmergencyMultisig.sol index 9765ef8..3fa966b 100644 --- a/src/EmergencyMultisig.sol +++ b/src/EmergencyMultisig.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: AGPL-3.0-or-later -pragma solidity 0.8.17; +pragma solidity ^0.8.17; import {SafeCastUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/math/SafeCastUpgradeable.sol"; diff --git a/src/Multisig.sol b/src/Multisig.sol index 7cd9ab6..2273f4b 100644 --- a/src/Multisig.sol +++ b/src/Multisig.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: AGPL-3.0-or-later -pragma solidity 0.8.17; +pragma solidity ^0.8.17; import {SafeCastUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/math/SafeCastUpgradeable.sol"; diff --git a/src/PublicKeyRegistry.sol b/src/PublicKeyRegistry.sol index bdf544a..f9df687 100644 --- a/src/PublicKeyRegistry.sol +++ b/src/PublicKeyRegistry.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: AGPL-3.0-or-later -pragma solidity 0.8.17; +pragma solidity ^0.8.17; /// @title PublicKeyRegistry - Release 1, Build 1 /// @author Aragon Association - 2024 diff --git a/src/interfaces/IEmergencyMultisig.sol b/src/interfaces/IEmergencyMultisig.sol index c880cc8..90709cf 100644 --- a/src/interfaces/IEmergencyMultisig.sol +++ b/src/interfaces/IEmergencyMultisig.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: AGPL-3.0-or-later -pragma solidity 0.8.17; +pragma solidity ^0.8.17; import {IDAO} from "@aragon/osx/core/dao/IDAO.sol"; diff --git a/src/interfaces/IMultisig.sol b/src/interfaces/IMultisig.sol index 9ca5dcb..ba73eff 100644 --- a/src/interfaces/IMultisig.sol +++ b/src/interfaces/IMultisig.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: AGPL-3.0-or-later -pragma solidity 0.8.17; +pragma solidity ^0.8.17; import {IDAO} from "@aragon/osx/core/dao/IDAO.sol"; @@ -28,10 +28,7 @@ interface IMultisig { /// @param _account The address of the user to check. /// @return Returns true if the account is allowed to vote. /// @dev The function assumes the queried proposal exists. - function canApprove( - uint256 _proposalId, - address _account - ) external view returns (bool); + function canApprove(uint256 _proposalId, address _account) external view returns (bool); /// @notice Checks if a proposal can be executed. /// @param _proposalId The ID of the proposal to be checked. @@ -42,10 +39,7 @@ interface IMultisig { /// @param _proposalId The ID of the proposal. /// @param _account The account address to be checked. /// @return The vote option cast by a voter for a certain proposal. - function hasApproved( - uint256 _proposalId, - address _account - ) external view returns (bool); + function hasApproved(uint256 _proposalId, address _account) external view returns (bool); /// @notice Executes a proposal. /// @param _proposalId The ID of the proposal to be executed. diff --git a/src/interfaces/ITaikoEssentialContract.sol b/src/interfaces/ITaikoEssentialContract.sol new file mode 100644 index 0000000..3890642 --- /dev/null +++ b/src/interfaces/ITaikoEssentialContract.sol @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.8.17; + +interface IEssentialContract { + /// @notice Pauses the contract. + function pause() external; + + /// @notice Unpauses the contract. + function unpause() external; + + function impl() external view returns (address); + + /// @notice Returns true if the contract is paused, and false otherwise. + /// @return true if paused, false otherwise. + function paused() external view returns (bool); + + function inNonReentrant() external view returns (bool); +} diff --git a/test/base/AragonTest.sol b/test/base/AragonTest.sol index 0c86f1b..75e7efb 100644 --- a/test/base/AragonTest.sol +++ b/test/base/AragonTest.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity 0.8.17; +pragma solidity ^0.8.17; import {IPluginSetup, PluginSetup} from "@aragon/osx/framework/plugin/setup/PluginSetup.sol"; import {DAO} from "@aragon/osx/core/dao/DAO.sol";