Skip to content

Commit

Permalink
chore: more permissive solidity pragma
Browse files Browse the repository at this point in the history
  • Loading branch information
jhuntbach-bc committed Dec 31, 2024
1 parent 4cde560 commit 222aa33
Show file tree
Hide file tree
Showing 80 changed files with 80 additions and 80 deletions.
2 changes: 1 addition & 1 deletion v1/contracts/evm/ERC20Custody.sol
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: MIT
// v1.0, 2023-01-10
pragma solidity 0.8.7;
pragma solidity ^0.8.7;

import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion v1/contracts/evm/Zeta.eth.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;
pragma solidity ^0.8.7;

import "@openzeppelin/contracts/token/ERC20/ERC20.sol";

Expand Down
2 changes: 1 addition & 1 deletion v1/contracts/evm/ZetaConnector.base.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;
pragma solidity ^0.8.7;

import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import "@openzeppelin/contracts/security/Pausable.sol";
Expand Down
2 changes: 1 addition & 1 deletion v1/contracts/evm/ZetaConnector.eth.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;
pragma solidity ^0.8.7;

import "@openzeppelin/contracts/token/ERC20/IERC20.sol";

Expand Down
2 changes: 1 addition & 1 deletion v1/contracts/evm/ZetaConnector.non-eth.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;
pragma solidity ^0.8.7;

import "@openzeppelin/contracts/token/ERC20/IERC20.sol";

Expand Down
2 changes: 1 addition & 1 deletion v1/contracts/evm/interfaces/ConnectorErrors.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;
pragma solidity ^0.8.7;

/**
* @dev Interface with connector custom errors
Expand Down
2 changes: 1 addition & 1 deletion v1/contracts/evm/interfaces/ZetaInteractorErrors.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;
pragma solidity ^0.8.7;

/**
* @dev Interface with Zeta Interactor errors
Expand Down
2 changes: 1 addition & 1 deletion v1/contracts/evm/testing/ERC20Mock.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;
pragma solidity ^0.8.7;

import "@openzeppelin/contracts/token/ERC20/ERC20.sol";

Expand Down
2 changes: 1 addition & 1 deletion v1/contracts/evm/testing/ZetaInteractorMock.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;
pragma solidity ^0.8.7;

import "@openzeppelin/contracts/access/Ownable2Step.sol";
import "../tools/ZetaInteractor.sol";
Expand Down
2 changes: 1 addition & 1 deletion v1/contracts/evm/testing/ZetaReceiverMock.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;
pragma solidity ^0.8.7;

import "../interfaces/ZetaInterfaces.sol";

Expand Down
2 changes: 1 addition & 1 deletion v1/contracts/evm/tools/ZetaInteractor.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;
pragma solidity ^0.8.7;

import "@openzeppelin/contracts/access/Ownable2Step.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;
pragma solidity ^0.8.7;

import "@openzeppelin/contracts/interfaces/IERC20.sol";
import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;
pragma solidity ^0.8.7;

import "@openzeppelin/contracts/interfaces/IERC20.sol";
import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion v1/contracts/evm/tools/ZetaTokenConsumerUniV2.strategy.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;
pragma solidity ^0.8.7;

import "@openzeppelin/contracts/interfaces/IERC20.sol";
import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion v1/contracts/evm/tools/ZetaTokenConsumerUniV3.strategy.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;
pragma solidity ^0.8.7;

import "@openzeppelin/contracts/interfaces/IERC20.sol";
import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion v1/contracts/evm/tools/ZetaTokenConsumerZEVM.strategy.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;
pragma solidity ^0.8.7;

import "@openzeppelin/contracts/interfaces/IERC20.sol";
import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion v1/contracts/zevm/SystemContract.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;
pragma solidity ^0.8.7;

import "./interfaces/zContract.sol";
import "./interfaces/IZRC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion v1/contracts/zevm/ZRC20.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;
pragma solidity ^0.8.7;
import "./interfaces/IZRC20.sol";
import "./interfaces/ISystem.sol";

Expand Down
2 changes: 1 addition & 1 deletion v1/contracts/zevm/ZetaConnectorZEVM.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;
pragma solidity ^0.8.7;
import "./interfaces/IWZETA.sol";

interface ZetaInterfaces {
Expand Down
2 changes: 1 addition & 1 deletion v1/contracts/zevm/interfaces/ISystem.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;
pragma solidity ^0.8.7;

/**
* @dev Interfaces of SystemContract and ZRC20 to make easier to import.
Expand Down
2 changes: 1 addition & 1 deletion v1/contracts/zevm/interfaces/IUniswapV2Router01.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;
pragma solidity ^0.8.7;

interface IUniswapV2Router01 {
function factory() external pure returns (address);
Expand Down
2 changes: 1 addition & 1 deletion v1/contracts/zevm/interfaces/IUniswapV2Router02.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;
pragma solidity ^0.8.7;

import "./IUniswapV2Router01.sol";

Expand Down
2 changes: 1 addition & 1 deletion v1/contracts/zevm/interfaces/IWZETA.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;
pragma solidity ^0.8.7;

interface IWETH9 {
event Approval(address indexed owner, address indexed spender, uint value);
Expand Down
2 changes: 1 addition & 1 deletion v1/contracts/zevm/interfaces/IZRC20.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;
pragma solidity ^0.8.7;

interface IZRC20 {
function totalSupply() external view returns (uint256);
Expand Down
2 changes: 1 addition & 1 deletion v1/contracts/zevm/interfaces/zContract.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;
pragma solidity ^0.8.7;

struct zContext {
bytes origin;
Expand Down
2 changes: 1 addition & 1 deletion v1/contracts/zevm/testing/SystemContractMock.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.7;
pragma solidity ^0.8.7;

import "../interfaces/zContract.sol";
import "../interfaces/IZRC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion v2/contracts/Errors.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

/// @title INotSupportedMethods
/// @notice Interface for contracts that with non supported methods.
Expand Down
2 changes: 1 addition & 1 deletion v2/contracts/Revert.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

/// @notice Struct containing revert options
/// @param revertAddress Address to receive revert.
Expand Down
2 changes: 1 addition & 1 deletion v2/contracts/evm/ERC20Custody.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import { IERC20Custody } from "./interfaces/IERC20Custody.sol";
import { IGatewayEVM, MessageContext } from "./interfaces/IGatewayEVM.sol";
Expand Down
2 changes: 1 addition & 1 deletion v2/contracts/evm/GatewayEVM.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import { INotSupportedMethods } from "../../contracts/Errors.sol";
import { RevertContext, RevertOptions, Revertable } from "../../contracts/Revert.sol";
Expand Down
2 changes: 1 addition & 1 deletion v2/contracts/evm/ZetaConnectorBase.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";
import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
Expand Down
2 changes: 1 addition & 1 deletion v2/contracts/evm/ZetaConnectorNative.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import "./ZetaConnectorBase.sol";
import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion v2/contracts/evm/ZetaConnectorNonNative.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import "./ZetaConnectorBase.sol";
import "./interfaces/IZetaNonEthNew.sol";
Expand Down
2 changes: 1 addition & 1 deletion v2/contracts/evm/interfaces/IERC20Custody.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import { RevertContext } from "../../../contracts/Revert.sol";

Expand Down
2 changes: 1 addition & 1 deletion v2/contracts/evm/interfaces/IGatewayEVM.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import "../../../contracts/Revert.sol";

Expand Down
2 changes: 1 addition & 1 deletion v2/contracts/evm/interfaces/IZetaConnector.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import { RevertContext } from "../../../contracts/Revert.sol";

Expand Down
2 changes: 1 addition & 1 deletion v2/contracts/evm/interfaces/IZetaNonEthNew.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import "@openzeppelin/contracts/token/ERC20/IERC20.sol";

Expand Down
2 changes: 1 addition & 1 deletion v2/contracts/zevm/GatewayZEVM.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import { CallOptions, IGatewayZEVM } from "./interfaces/IGatewayZEVM.sol";

Expand Down
2 changes: 1 addition & 1 deletion v2/contracts/zevm/SystemContract.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import "./interfaces/IZRC20.sol";
import "./interfaces/UniversalContract.sol";
Expand Down
2 changes: 1 addition & 1 deletion v2/contracts/zevm/ZRC20.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import "../../contracts/zevm/interfaces/ISystem.sol";
import "../../contracts/zevm/interfaces/IZRC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion v2/contracts/zevm/interfaces/IGatewayZEVM.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import "../../../contracts/Revert.sol";
import "./UniversalContract.sol";
Expand Down
2 changes: 1 addition & 1 deletion v2/contracts/zevm/interfaces/ISystem.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

/// @title ISystem
/// @notice Interface for the System contract.
Expand Down
2 changes: 1 addition & 1 deletion v2/contracts/zevm/interfaces/IWZETA.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

/// @title IWETH9
/// @notice Interface for the Weth9 contract.
Expand Down
2 changes: 1 addition & 1 deletion v2/contracts/zevm/interfaces/IZRC20.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

/// @title IZRC20
/// @notice Interface for the ZRC20 token contract.
Expand Down
2 changes: 1 addition & 1 deletion v2/contracts/zevm/interfaces/UniversalContract.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import { RevertContext } from "../../../contracts/Revert.sol";

Expand Down
2 changes: 1 addition & 1 deletion v2/scripts/deploy/DeployZRC20.s.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import "forge-std/Script.sol";
import "../../contracts/zevm/ZRC20.sol";
Expand Down
2 changes: 1 addition & 1 deletion v2/scripts/deploy/deterministic/DeployERC20Custody.s.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import "forge-std/Script.sol";
import "contracts/evm/ERC20Custody.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import "forge-std/Script.sol";
import "contracts/evm/ERC20Custody.sol";
Expand Down
2 changes: 1 addition & 1 deletion v2/scripts/deploy/deterministic/DeployGatewayEVM.s.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import "forge-std/Script.sol";
import "contracts/evm/GatewayEVM.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import "forge-std/Script.sol";
import "contracts/evm/GatewayEVM.sol";
Expand Down
2 changes: 1 addition & 1 deletion v2/scripts/deploy/deterministic/DeployGatewayZEVM.s.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import "forge-std/Script.sol";
import "contracts/zevm/GatewayZEVM.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import "forge-std/Script.sol";
import "contracts/zevm/GatewayZEVM.sol";
Expand Down
2 changes: 1 addition & 1 deletion v2/scripts/deploy/deterministic/DeployTestERC20.s.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import "forge-std/Script.sol";
import "test/utils/TestERC20.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import "forge-std/Script.sol";
import "contracts/evm/ZetaConnectorNonNative.sol";
Expand Down
2 changes: 1 addition & 1 deletion v2/scripts/deploy/deterministic/UpgradeGatewayEVM.s.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import "forge-std/Script.sol";
import "contracts/evm/GatewayEVM.sol";
Expand Down
2 changes: 1 addition & 1 deletion v2/scripts/upgrade/SimulateERC20CustodyUpgrade.s.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import "forge-std/console.sol";
import "forge-std/Script.sol";
Expand Down
2 changes: 1 addition & 1 deletion v2/scripts/upgrade/SimulateGatewayEVMUpgrade.s.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.26;
pragma solidity ^0.8.26;

import "forge-std/console.sol";
import "forge-std/Script.sol";
Expand Down
Loading

0 comments on commit 222aa33

Please sign in to comment.