diff --git a/evm/foundry.toml b/evm/foundry.toml index bbd5d5af..7df2ea4f 100644 --- a/evm/foundry.toml +++ b/evm/foundry.toml @@ -6,5 +6,7 @@ via_ir = true optimizer = true optimizer_runs = 10000 fs_permissions = [{ access = "read-write", path = "./script/config" }] +evm_version = "paris" +solc_version = "0.8.21" # See more config options https://github.com/foundry-rs/foundry/tree/master/config diff --git a/evm/script/BaseMultiChainDeployer.s.sol b/evm/script/BaseMultiChainDeployer.s.sol index 83176272..ab64129b 100644 --- a/evm/script/BaseMultiChainDeployer.s.sol +++ b/evm/script/BaseMultiChainDeployer.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Script.sol"; diff --git a/evm/script/DeployCatalyst.s.sol b/evm/script/DeployCatalyst.s.sol index 2a4aabbd..d8855fb8 100644 --- a/evm/script/DeployCatalyst.s.sol +++ b/evm/script/DeployCatalyst.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Script.sol"; import {stdJson} from "forge-std/StdJson.sol"; diff --git a/evm/script/DeployContracts.s.sol b/evm/script/DeployContracts.s.sol index 3b330922..25abaf34 100644 --- a/evm/script/DeployContracts.s.sol +++ b/evm/script/DeployContracts.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Script.sol"; import {stdJson} from "forge-std/StdJson.sol"; diff --git a/evm/script/DeployInterfaces.s.sol b/evm/script/DeployInterfaces.s.sol index 9361ed3d..9aac1103 100644 --- a/evm/script/DeployInterfaces.s.sol +++ b/evm/script/DeployInterfaces.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Script.sol"; import {stdJson} from "forge-std/StdJson.sol"; diff --git a/evm/script/DeployRouter.s.sol b/evm/script/DeployRouter.s.sol index 9e5a2e02..6c27c04f 100644 --- a/evm/script/DeployRouter.s.sol +++ b/evm/script/DeployRouter.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Script.sol"; import {stdJson} from "forge-std/StdJson.sol"; diff --git a/evm/script/DeployVaults.s.sol b/evm/script/DeployVaults.s.sol index 3d6467f6..c6909817 100644 --- a/evm/script/DeployVaults.s.sol +++ b/evm/script/DeployVaults.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Script.sol"; import {stdJson} from "forge-std/StdJson.sol"; diff --git a/evm/script/Registry.s.sol b/evm/script/Registry.s.sol index 99bfb4bb..6ba04460 100644 --- a/evm/script/Registry.s.sol +++ b/evm/script/Registry.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Script.sol"; import {stdJson} from "forge-std/StdJson.sol"; diff --git a/evm/script/Swap.s.sol b/evm/script/Swap.s.sol index 000ba4ea..32a52bc2 100644 --- a/evm/script/Swap.s.sol +++ b/evm/script/Swap.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Script.sol"; import {stdJson} from "forge-std/StdJson.sol"; diff --git a/evm/script/WrappedGas9.sol b/evm/script/WrappedGas9.disabled similarity index 100% rename from evm/script/WrappedGas9.sol rename to evm/script/WrappedGas9.disabled diff --git a/evm/script/config/config_contracts.json b/evm/script/config/config_contracts.json index bbbcc38e..daeb8d32 100644 --- a/evm/script/config/config_contracts.json +++ b/evm/script/config/config_contracts.json @@ -1,10 +1,10 @@ { "contracts": { - "amplified_mathlib": "0x2579847E318F5863dfC19cE73765E0bE5F84cF03", - "amplified_template": "0x8301BAe7b86e56c0299063ce3e8bD4AAB1C70A5C", - "factory": "0xDdBFb629c024dD100063576aB942eb08b6830d29", - "volatile_mathlib": "0x7Bc32ff41D4AF11C54D0b9fb87187a9AeaaDDfC1", - "volatile_template": "0x7B2D4Dff51fD55e09A46D65324c086377e689b02" + "amplified_mathlib": "0x178Be9A292A70CAE208FCAeeD2E75b78200F17d3", + "amplified_template": "0x9cB0427CA71905515a715f615872415Ae45693b5", + "factory": "0x5Fc5b61d6B3decF71c7c23E4b80C75F696117d2a", + "volatile_mathlib": "0x3614f9a19F544E5345B933F014ce38c9162BC644", + "volatile_template": "0xd2716Ed8882d820be37dD5A47353f2cDF5D0228F" }, "registry": { "describer": "0xA9C609b79d62b9E27CDefA685CB795982f852d3c", diff --git a/evm/script/mocks/DeployMock.sol b/evm/script/mocks/DeployMock.sol index 07783b54..efefae50 100644 --- a/evm/script/mocks/DeployMock.sol +++ b/evm/script/mocks/DeployMock.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Script.sol"; import {stdJson} from "forge-std/StdJson.sol"; diff --git a/evm/script/mocks/MockApplication.sol b/evm/script/mocks/MockApplication.sol index 60e9438b..b14a1ad8 100644 --- a/evm/script/mocks/MockApplication.sol +++ b/evm/script/mocks/MockApplication.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import { IIncentivizedMessageEscrow } from "GeneralisedIncentives/src/interfaces/IIncentivizedMessageEscrow.sol"; import { ICrossChainReceiver } from "GeneralisedIncentives/src/interfaces/ICrossChainReceiver.sol"; diff --git a/evm/src/CatalystChainInterface.sol b/evm/src/CatalystChainInterface.sol index 6cb532a3..414c58d0 100644 --- a/evm/src/CatalystChainInterface.sol +++ b/evm/src/CatalystChainInterface.sol @@ -1,6 +1,6 @@ //SPDX-License-Identifier: MIT -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import {ERC20} from 'solmate/tokens/ERC20.sol'; import {SafeTransferLib} from 'solmate/utils/SafeTransferLib.sol'; diff --git a/evm/src/CatalystFactory.sol b/evm/src/CatalystFactory.sol index d8b9a346..76142ae3 100644 --- a/evm/src/CatalystFactory.sol +++ b/evm/src/CatalystFactory.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import { Ownable } from "openzeppelin-contracts/contracts/access/Ownable.sol"; import { ERC20 } from 'solmate/tokens/ERC20.sol'; diff --git a/evm/src/CatalystPayload.sol b/evm/src/CatalystPayload.sol index bf842799..008773fa 100644 --- a/evm/src/CatalystPayload.sol +++ b/evm/src/CatalystPayload.sol @@ -1,6 +1,6 @@ //SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; // Catalyst IBC payload structure *********************************************************************************************** // Note: Addresses have 65 bytes reserved, however, the first byte should only be used for the address size. diff --git a/evm/src/CatalystVaultAmplified.sol b/evm/src/CatalystVaultAmplified.sol index c9aba70b..a8c11ad5 100644 --- a/evm/src/CatalystVaultAmplified.sol +++ b/evm/src/CatalystVaultAmplified.sol @@ -1,6 +1,6 @@ //SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import { ERC20 } from 'solmate/tokens/ERC20.sol'; import { SafeTransferLib } from 'solmate/utils/SafeTransferLib.sol'; diff --git a/evm/src/CatalystVaultCommon.sol b/evm/src/CatalystVaultCommon.sol index c1ff87ec..3bb8be29 100644 --- a/evm/src/CatalystVaultCommon.sol +++ b/evm/src/CatalystVaultCommon.sol @@ -1,6 +1,6 @@ //SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import {ERC20} from 'solmate/tokens/ERC20.sol'; import {SafeTransferLib} from 'solmate/utils/SafeTransferLib.sol'; diff --git a/evm/src/CatalystVaultVolatile.sol b/evm/src/CatalystVaultVolatile.sol index 94b2f73c..4c606bb5 100644 --- a/evm/src/CatalystVaultVolatile.sol +++ b/evm/src/CatalystVaultVolatile.sol @@ -1,6 +1,6 @@ //SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import { ERC20 } from 'solmate/tokens/ERC20.sol'; import { SafeTransferLib } from 'solmate/utils/SafeTransferLib.sol'; diff --git a/evm/src/ICatalystV1Vault.sol b/evm/src/ICatalystV1Vault.sol index 98a7e1a9..53a01d9f 100644 --- a/evm/src/ICatalystV1Vault.sol +++ b/evm/src/ICatalystV1Vault.sol @@ -1,6 +1,6 @@ //SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "./interfaces/ICatalystV1VaultSuccessFailure.sol"; import "./interfaces/ICatalystV1VaultAdministration.sol"; diff --git a/evm/src/IntegralsAmplified.sol b/evm/src/IntegralsAmplified.sol index 95f5d250..d3fada0c 100644 --- a/evm/src/IntegralsAmplified.sol +++ b/evm/src/IntegralsAmplified.sol @@ -1,6 +1,6 @@ //SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import { FixedPointMathLib } from "./utils/FixedPointMathLib.sol"; diff --git a/evm/src/IntegralsVolatile.sol b/evm/src/IntegralsVolatile.sol index 0291e92f..69bbd055 100644 --- a/evm/src/IntegralsVolatile.sol +++ b/evm/src/IntegralsVolatile.sol @@ -1,6 +1,6 @@ //SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import { FixedPointMathLib } from "./utils/FixedPointMathLib.sol"; diff --git a/evm/src/archive/CatalystVaultAmplified.update.sol b/evm/src/archive/CatalystVaultAmplified.update.sol index 9f58131d..5c1a2401 100644 --- a/evm/src/archive/CatalystVaultAmplified.update.sol +++ b/evm/src/archive/CatalystVaultAmplified.update.sol @@ -1,6 +1,6 @@ //SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import { CatalystVaultAmplified } from "../CatalystVaultAmplified.sol"; import { FixedPointMathLib } from "../utils/FixedPointMathLib.sol"; diff --git a/evm/src/registry/CatalystDescriber.sol b/evm/src/registry/CatalystDescriber.sol index d783e8d8..743e0697 100644 --- a/evm/src/registry/CatalystDescriber.sol +++ b/evm/src/registry/CatalystDescriber.sol @@ -1,6 +1,6 @@ //SPDX-License-Identifier: MIT -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "openzeppelin-contracts/contracts/access/Ownable.sol"; import "../interfaces/ICatalystV1VaultImmutables.sol"; diff --git a/evm/src/registry/CatalystDescriberRegistry.sol b/evm/src/registry/CatalystDescriberRegistry.sol index 3addd673..aa549392 100644 --- a/evm/src/registry/CatalystDescriberRegistry.sol +++ b/evm/src/registry/CatalystDescriberRegistry.sol @@ -1,6 +1,6 @@ //SPDX-License-Identifier: MIT -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "openzeppelin-contracts/contracts/access/Ownable.sol"; import { Contains } from "./lib/Contains.sol"; diff --git a/evm/src/registry/CatalystMathAmp.sol b/evm/src/registry/CatalystMathAmp.sol index d2123c92..08c5d093 100644 --- a/evm/src/registry/CatalystMathAmp.sol +++ b/evm/src/registry/CatalystMathAmp.sol @@ -1,6 +1,6 @@ //SPDX-License-Identifier: MIT -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import {ERC20} from 'solmate/tokens/ERC20.sol'; import {ICatalystMathLibAmp} from "./interfaces/ICatalystMathLibAmp.sol"; diff --git a/evm/src/registry/CatalystMathVol.sol b/evm/src/registry/CatalystMathVol.sol index 605484a4..053e1d24 100644 --- a/evm/src/registry/CatalystMathVol.sol +++ b/evm/src/registry/CatalystMathVol.sol @@ -1,6 +1,6 @@ //SPDX-License-Identifier: MIT -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import {ERC20} from 'solmate/tokens/ERC20.sol'; import {ICatalystMathLibVol} from "./interfaces/ICatalystMathLibVol.sol"; diff --git a/evm/src/registry/lib/Contains.sol b/evm/src/registry/lib/Contains.sol index 81e4f0bb..a006d243 100644 --- a/evm/src/registry/lib/Contains.sol +++ b/evm/src/registry/lib/Contains.sol @@ -1,6 +1,6 @@ //SPDX-License-Identifier: MIT -pragma solidity =0.8.19; +pragma solidity ^0.8.19; /** * @title Catalyst: Catalyst Describer diff --git a/evm/src/router/CatalystRouter.sol b/evm/src/router/CatalystRouter.sol index 6c3315dd..206c3cf1 100644 --- a/evm/src/router/CatalystRouter.sol +++ b/evm/src/router/CatalystRouter.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: GPL-3.0-or-later -pragma solidity =0.8.19; +pragma solidity ^0.8.19; // Command implementations import {Dispatcher} from './base/Dispatcher.sol'; diff --git a/evm/src/token-lens/CatalystLens.sol b/evm/src/token-lens/CatalystLens.sol index 2dd26338..d14e7ad0 100644 --- a/evm/src/token-lens/CatalystLens.sol +++ b/evm/src/token-lens/CatalystLens.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import {Multicall2} from "./Multicall2.sol"; import {TokenLens} from "./TokenLens.sol"; diff --git a/evm/src/token-lens/Multicall2.sol b/evm/src/token-lens/Multicall2.sol index 7ae768d6..659e2535 100644 --- a/evm/src/token-lens/Multicall2.sol +++ b/evm/src/token-lens/Multicall2.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity =0.8.19; +pragma solidity ^0.8.19; /// @title Multicall2 - Aggregate results from multiple read-only function calls /// @author Michael Elliot diff --git a/evm/src/token-lens/TokenLens.sol b/evm/src/token-lens/TokenLens.sol index bdd87cfa..65ccd3ef 100644 --- a/evm/src/token-lens/TokenLens.sol +++ b/evm/src/token-lens/TokenLens.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import {ERC20} from "solmate/tokens/ERC20.sol"; diff --git a/evm/test/CatalystFactory/DeployVault.t.sol b/evm/test/CatalystFactory/DeployVault.t.sol index e82f74ae..a710c5c7 100644 --- a/evm/test/CatalystFactory/DeployVault.t.sol +++ b/evm/test/CatalystFactory/DeployVault.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import { TestCommon } from "../TestCommon.t.sol"; diff --git a/evm/test/CatalystFactory/SetDefaultGovernanceFee.t.sol b/evm/test/CatalystFactory/SetDefaultGovernanceFee.t.sol index 94170b28..c0519b50 100644 --- a/evm/test/CatalystFactory/SetDefaultGovernanceFee.t.sol +++ b/evm/test/CatalystFactory/SetDefaultGovernanceFee.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import { TestCommon } from "../TestCommon.t.sol"; diff --git a/evm/test/CatalystInterface/ConnectNewChain.t.sol b/evm/test/CatalystInterface/ConnectNewChain.t.sol index d07fc45e..d8795041 100644 --- a/evm/test/CatalystInterface/ConnectNewChain.t.sol +++ b/evm/test/CatalystInterface/ConnectNewChain.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import { TestCommon } from "../TestCommon.t.sol"; diff --git a/evm/test/CatalystInterface/_handleError/HandleError.m.sol b/evm/test/CatalystInterface/_handleError/HandleError.m.sol index 9acb361f..e78ccac7 100644 --- a/evm/test/CatalystInterface/_handleError/HandleError.m.sol +++ b/evm/test/CatalystInterface/_handleError/HandleError.m.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "src/CatalystChainInterface.sol"; diff --git a/evm/test/CatalystInterface/_handleError/_HandleError.t.sol b/evm/test/CatalystInterface/_handleError/_HandleError.t.sol index 455ddf3e..3ebf3f77 100644 --- a/evm/test/CatalystInterface/_handleError/_HandleError.t.sol +++ b/evm/test/CatalystInterface/_handleError/_HandleError.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "./HandleError.m.sol"; diff --git a/evm/test/CatalystInterface/setMinGasFor.t.sol b/evm/test/CatalystInterface/setMinGasFor.t.sol index 547bf11f..7207c1d8 100644 --- a/evm/test/CatalystInterface/setMinGasFor.t.sol +++ b/evm/test/CatalystInterface/setMinGasFor.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import { TestCommon } from "../TestCommon.t.sol"; diff --git a/evm/test/CatalystRouter/GasProfiling/localswap.gas.t.sol b/evm/test/CatalystRouter/GasProfiling/localswap.gas.t.sol index 8d7059ba..349a4c82 100644 --- a/evm/test/CatalystRouter/GasProfiling/localswap.gas.t.sol +++ b/evm/test/CatalystRouter/GasProfiling/localswap.gas.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "src/ICatalystV1Vault.sol"; diff --git a/evm/test/CatalystRouter/GasProfiling/overhead.gas.t.sol b/evm/test/CatalystRouter/GasProfiling/overhead.gas.t.sol index d504b06f..5ecb8284 100644 --- a/evm/test/CatalystRouter/GasProfiling/overhead.gas.t.sol +++ b/evm/test/CatalystRouter/GasProfiling/overhead.gas.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "src/ICatalystV1Vault.sol"; diff --git a/evm/test/CatalystRouter/GasProfiling/sendasset.fail.t.sol b/evm/test/CatalystRouter/GasProfiling/sendasset.fail.t.sol index c44b2283..59631dab 100644 --- a/evm/test/CatalystRouter/GasProfiling/sendasset.fail.t.sol +++ b/evm/test/CatalystRouter/GasProfiling/sendasset.fail.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "src/ICatalystV1Vault.sol"; diff --git a/evm/test/CatalystRouter/GasProfiling/sendasset.gas.t.sol b/evm/test/CatalystRouter/GasProfiling/sendasset.gas.t.sol index e87e83c6..18468fae 100644 --- a/evm/test/CatalystRouter/GasProfiling/sendasset.gas.t.sol +++ b/evm/test/CatalystRouter/GasProfiling/sendasset.gas.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "src/ICatalystV1Vault.sol"; diff --git a/evm/test/CatalystRouter/GasProfiling/sweep.gas.t.sol b/evm/test/CatalystRouter/GasProfiling/sweep.gas.t.sol index 919e7a39..97ec6ee9 100644 --- a/evm/test/CatalystRouter/GasProfiling/sweep.gas.t.sol +++ b/evm/test/CatalystRouter/GasProfiling/sweep.gas.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "src/ICatalystV1Vault.sol"; diff --git a/evm/test/CatalystRouter/GasProfiling/transfer_from.gas.t.sol b/evm/test/CatalystRouter/GasProfiling/transfer_from.gas.t.sol index 85ceb45c..6e63f77f 100644 --- a/evm/test/CatalystRouter/GasProfiling/transfer_from.gas.t.sol +++ b/evm/test/CatalystRouter/GasProfiling/transfer_from.gas.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "src/ICatalystV1Vault.sol"; diff --git a/evm/test/CatalystRouter/GasProfiling/unwrapgas.gas.t.sol b/evm/test/CatalystRouter/GasProfiling/unwrapgas.gas.t.sol index 90a9314a..0723caec 100644 --- a/evm/test/CatalystRouter/GasProfiling/unwrapgas.gas.t.sol +++ b/evm/test/CatalystRouter/GasProfiling/unwrapgas.gas.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "src/ICatalystV1Vault.sol"; diff --git a/evm/test/CatalystRouter/GasProfiling/wrapgas.gas.t.sol b/evm/test/CatalystRouter/GasProfiling/wrapgas.gas.t.sol index 1a701513..7eb55c74 100644 --- a/evm/test/CatalystRouter/GasProfiling/wrapgas.gas.t.sol +++ b/evm/test/CatalystRouter/GasProfiling/wrapgas.gas.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "src/ICatalystV1Vault.sol"; diff --git a/evm/test/CatalystVault/1Amplified/AmplifiedOneVault.t.sol b/evm/test/CatalystVault/1Amplified/AmplifiedOneVault.t.sol index a1c7b8c1..77b67c9b 100644 --- a/evm/test/CatalystVault/1Amplified/AmplifiedOneVault.t.sol +++ b/evm/test/CatalystVault/1Amplified/AmplifiedOneVault.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "../../../src/ICatalystV1Vault.sol"; import "../../../src/CatalystVaultAmplified.sol"; diff --git a/evm/test/CatalystVault/1Amplified/AmplifiedTwoVaults.t.sol b/evm/test/CatalystVault/1Amplified/AmplifiedTwoVaults.t.sol index 312882ad..4e4ea7a8 100644 --- a/evm/test/CatalystVault/1Amplified/AmplifiedTwoVaults.t.sol +++ b/evm/test/CatalystVault/1Amplified/AmplifiedTwoVaults.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "../../../src/ICatalystV1Vault.sol"; import "../../../src/CatalystVaultAmplified.sol"; diff --git a/evm/test/CatalystVault/1Volatile/VolatileOneVault.t.sol b/evm/test/CatalystVault/1Volatile/VolatileOneVault.t.sol index b8fd363b..7f50642b 100644 --- a/evm/test/CatalystVault/1Volatile/VolatileOneVault.t.sol +++ b/evm/test/CatalystVault/1Volatile/VolatileOneVault.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "../../../src/ICatalystV1Vault.sol"; import "../../../src/utils/FixedPointMathLib.sol"; diff --git a/evm/test/CatalystVault/1Volatile/VolatileTwoVaults.t.sol b/evm/test/CatalystVault/1Volatile/VolatileTwoVaults.t.sol index bd9a3950..5aa1255a 100644 --- a/evm/test/CatalystVault/1Volatile/VolatileTwoVaults.t.sol +++ b/evm/test/CatalystVault/1Volatile/VolatileTwoVaults.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "../../../src/ICatalystV1Vault.sol"; diff --git a/evm/test/CatalystVault/AVaultInterfaces.t.sol b/evm/test/CatalystVault/AVaultInterfaces.t.sol index d18f24b7..aa873e34 100644 --- a/evm/test/CatalystVault/AVaultInterfaces.t.sol +++ b/evm/test/CatalystVault/AVaultInterfaces.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; abstract contract AVaultInterfaces { diff --git a/evm/test/CatalystVault/CrossChainInterfaceOnly.t.sol b/evm/test/CatalystVault/CrossChainInterfaceOnly.t.sol index b3e04deb..bf60ed34 100644 --- a/evm/test/CatalystVault/CrossChainInterfaceOnly.t.sol +++ b/evm/test/CatalystVault/CrossChainInterfaceOnly.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "../TestCommon.t.sol"; diff --git a/evm/test/CatalystVault/Deposit/DepositWithdrawCompare.t.sol b/evm/test/CatalystVault/Deposit/DepositWithdrawCompare.t.sol index 664b9b96..bb5fb215 100644 --- a/evm/test/CatalystVault/Deposit/DepositWithdrawCompare.t.sol +++ b/evm/test/CatalystVault/Deposit/DepositWithdrawCompare.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "../../TestCommon.t.sol"; diff --git a/evm/test/CatalystVault/Escrow.t.sol b/evm/test/CatalystVault/Escrow.t.sol index 13ff449e..eefad250 100644 --- a/evm/test/CatalystVault/Escrow.t.sol +++ b/evm/test/CatalystVault/Escrow.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "../TestCommon.t.sol"; import "src/ICatalystV1Vault.sol"; diff --git a/evm/test/CatalystVault/Invariant.t.sol b/evm/test/CatalystVault/Invariant.t.sol index 204385e9..bcef5718 100644 --- a/evm/test/CatalystVault/Invariant.t.sol +++ b/evm/test/CatalystVault/Invariant.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "../TestCommon.t.sol"; import "src/ICatalystV1Vault.sol"; diff --git a/evm/test/CatalystVault/LocalSwap/LocalSwap.fees.t.sol b/evm/test/CatalystVault/LocalSwap/LocalSwap.fees.t.sol index d09aa677..90137606 100644 --- a/evm/test/CatalystVault/LocalSwap/LocalSwap.fees.t.sol +++ b/evm/test/CatalystVault/LocalSwap/LocalSwap.fees.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "src/ICatalystV1Vault.sol"; diff --git a/evm/test/CatalystVault/LocalSwap/LocalSwap.minout.t.sol b/evm/test/CatalystVault/LocalSwap/LocalSwap.minout.t.sol index efe4bf85..766025ca 100644 --- a/evm/test/CatalystVault/LocalSwap/LocalSwap.minout.t.sol +++ b/evm/test/CatalystVault/LocalSwap/LocalSwap.minout.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "src/ICatalystV1Vault.sol"; diff --git a/evm/test/CatalystVault/LocalSwap/LocalSwap.t.sol b/evm/test/CatalystVault/LocalSwap/LocalSwap.t.sol index 56eae4e3..e0cae029 100644 --- a/evm/test/CatalystVault/LocalSwap/LocalSwap.t.sol +++ b/evm/test/CatalystVault/LocalSwap/LocalSwap.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "src/ICatalystV1Vault.sol"; diff --git a/evm/test/CatalystVault/ReceiveAsset.t.sol b/evm/test/CatalystVault/ReceiveAsset.t.sol index 9037738a..cc420944 100644 --- a/evm/test/CatalystVault/ReceiveAsset.t.sol +++ b/evm/test/CatalystVault/ReceiveAsset.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "../TestCommon.t.sol"; diff --git a/evm/test/CatalystVault/ReceiveLiquidity.t.sol b/evm/test/CatalystVault/ReceiveLiquidity.t.sol index ce38c09b..040ecb63 100644 --- a/evm/test/CatalystVault/ReceiveLiquidity.t.sol +++ b/evm/test/CatalystVault/ReceiveLiquidity.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "../TestCommon.t.sol"; diff --git a/evm/test/CatalystVault/SelfSwap.t.sol b/evm/test/CatalystVault/SelfSwap.t.sol index a4e59593..32083302 100644 --- a/evm/test/CatalystVault/SelfSwap.t.sol +++ b/evm/test/CatalystVault/SelfSwap.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "../TestCommon.t.sol"; diff --git a/evm/test/CatalystVault/SendAsset.t.sol b/evm/test/CatalystVault/SendAsset.t.sol index 44e1b060..451944fb 100644 --- a/evm/test/CatalystVault/SendAsset.t.sol +++ b/evm/test/CatalystVault/SendAsset.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "../TestCommon.t.sol"; diff --git a/evm/test/CatalystVault/SendLiquidity.t.sol b/evm/test/CatalystVault/SendLiquidity.t.sol index 796485bb..4d5160c8 100644 --- a/evm/test/CatalystVault/SendLiquidity.t.sol +++ b/evm/test/CatalystVault/SendLiquidity.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "../TestCommon.t.sol"; diff --git a/evm/test/CatalystVault/Set/SetGovernanceFee.t.sol b/evm/test/CatalystVault/Set/SetGovernanceFee.t.sol index 090129ec..8c53b01c 100644 --- a/evm/test/CatalystVault/Set/SetGovernanceFee.t.sol +++ b/evm/test/CatalystVault/Set/SetGovernanceFee.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "src/ICatalystV1Vault.sol"; diff --git a/evm/test/CatalystVault/Set/SetVaultFee.t.sol b/evm/test/CatalystVault/Set/SetVaultFee.t.sol index 1abb28fb..593418ae 100644 --- a/evm/test/CatalystVault/Set/SetVaultFee.t.sol +++ b/evm/test/CatalystVault/Set/SetVaultFee.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "src/ICatalystV1Vault.sol"; diff --git a/evm/test/CatalystVault/Setup/Setup.t.sol b/evm/test/CatalystVault/Setup/Setup.t.sol index 249df6d5..fb5fc9b3 100644 --- a/evm/test/CatalystVault/Setup/Setup.t.sol +++ b/evm/test/CatalystVault/Setup/Setup.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "../../TestCommon.t.sol"; diff --git a/evm/test/CatalystVault/Setup/SetupFinish.t.sol b/evm/test/CatalystVault/Setup/SetupFinish.t.sol index e373691e..f711961b 100644 --- a/evm/test/CatalystVault/Setup/SetupFinish.t.sol +++ b/evm/test/CatalystVault/Setup/SetupFinish.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "../../TestCommon.t.sol"; diff --git a/evm/test/CatalystVault/TokenInterface.t.sol b/evm/test/CatalystVault/TokenInterface.t.sol index 9070f054..13acc7dd 100644 --- a/evm/test/CatalystVault/TokenInterface.t.sol +++ b/evm/test/CatalystVault/TokenInterface.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "../TestCommon.t.sol"; diff --git a/evm/test/CatalystVault/Withdraw/WithdrawCompare.sol b/evm/test/CatalystVault/Withdraw/WithdrawCompare.sol index 40b75eba..b247656e 100644 --- a/evm/test/CatalystVault/Withdraw/WithdrawCompare.sol +++ b/evm/test/CatalystVault/Withdraw/WithdrawCompare.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "../../TestCommon.t.sol"; diff --git a/evm/test/CatalystVault/Withdraw/WithdrawInvariant.sol b/evm/test/CatalystVault/Withdraw/WithdrawInvariant.sol index 9df65dbf..d55bb93e 100644 --- a/evm/test/CatalystVault/Withdraw/WithdrawInvariant.sol +++ b/evm/test/CatalystVault/Withdraw/WithdrawInvariant.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "../../TestCommon.t.sol"; diff --git a/evm/test/CatalystVault/non-exploits/CrossSwap.SwapWorthlessToken.t.sol b/evm/test/CatalystVault/non-exploits/CrossSwap.SwapWorthlessToken.t.sol index 23070cd1..504f7c2c 100644 --- a/evm/test/CatalystVault/non-exploits/CrossSwap.SwapWorthlessToken.t.sol +++ b/evm/test/CatalystVault/non-exploits/CrossSwap.SwapWorthlessToken.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "../../TestCommon.t.sol"; diff --git a/evm/test/CatalystVault/non-exploits/LocalSwap.SwapWorthlessToken.t.sol b/evm/test/CatalystVault/non-exploits/LocalSwap.SwapWorthlessToken.t.sol index 1e58a59a..92a0a50a 100644 --- a/evm/test/CatalystVault/non-exploits/LocalSwap.SwapWorthlessToken.t.sol +++ b/evm/test/CatalystVault/non-exploits/LocalSwap.SwapWorthlessToken.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "src/ICatalystV1Vault.sol"; diff --git a/evm/test/CommonTokenFunctions.t.sol b/evm/test/CommonTokenFunctions.t.sol index 86d90d14..d3f4e79c 100644 --- a/evm/test/CommonTokenFunctions.t.sol +++ b/evm/test/CommonTokenFunctions.t.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import {Token} from "./mocks/token.sol"; diff --git a/evm/test/Integration/Swap.t.sol b/evm/test/Integration/Swap.t.sol index f0f8042d..4538d3a6 100644 --- a/evm/test/Integration/Swap.t.sol +++ b/evm/test/Integration/Swap.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import { TestCommon } from "../TestCommon.t.sol"; diff --git a/evm/test/TestCommon.t.sol b/evm/test/TestCommon.t.sol index 818f8cd0..c3fba4c9 100644 --- a/evm/test/TestCommon.t.sol +++ b/evm/test/TestCommon.t.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import "../src/CatalystFactory.sol"; diff --git a/evm/test/TestDeployAddresses.t.sol b/evm/test/TestDeployAddresses.t.sol index 05878b01..d5ae70b3 100644 --- a/evm/test/TestDeployAddresses.t.sol +++ b/evm/test/TestDeployAddresses.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; diff --git a/evm/test/mocks/dummyTargetContract.sol b/evm/test/mocks/dummyTargetContract.sol index 82dc63e2..37eb60aa 100644 --- a/evm/test/mocks/dummyTargetContract.sol +++ b/evm/test/mocks/dummyTargetContract.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "./../../src/interfaces/IOnCatalyst.sol"; diff --git a/evm/test/mocks/token.sol b/evm/test/mocks/token.sol index f22449ff..c54e9b28 100644 --- a/evm/test/mocks/token.sol +++ b/evm/test/mocks/token.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "openzeppelin-contracts/contracts/token/ERC20/extensions/ERC20Burnable.sol"; import "openzeppelin-contracts/contracts/access/Ownable.sol"; diff --git a/evm/test/mocks/weth9.sol b/evm/test/mocks/weth9.sol index 70ff8502..858f235d 100644 --- a/evm/test/mocks/weth9.sol +++ b/evm/test/mocks/weth9.sol @@ -13,7 +13,7 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -pragma solidity =0.8.19; +pragma solidity ^0.8.19; contract WETH9 { string public name = "Wrapped Ether"; diff --git a/evm/test/underwriting/expireUnderwrite.t.sol b/evm/test/underwriting/expireUnderwrite.t.sol index e8b8d6f2..f74bc249 100644 --- a/evm/test/underwriting/expireUnderwrite.t.sol +++ b/evm/test/underwriting/expireUnderwrite.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import { TestCommon } from "../TestCommon.t.sol"; diff --git a/evm/test/underwriting/sendAssetUnderwrite.NoConnection.t.sol b/evm/test/underwriting/sendAssetUnderwrite.NoConnection.t.sol index c2e10f08..2d5ac456 100644 --- a/evm/test/underwriting/sendAssetUnderwrite.NoConnection.t.sol +++ b/evm/test/underwriting/sendAssetUnderwrite.NoConnection.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import { TestCommon } from "../TestCommon.t.sol"; diff --git a/evm/test/underwriting/sendAssetUnderwrite.t.sol b/evm/test/underwriting/sendAssetUnderwrite.t.sol index 37fd6b4c..738f1a96 100644 --- a/evm/test/underwriting/sendAssetUnderwrite.t.sol +++ b/evm/test/underwriting/sendAssetUnderwrite.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import { TestCommon } from "../TestCommon.t.sol"; diff --git a/evm/test/underwriting/sendAssetUnderwritePurpose.t.sol b/evm/test/underwriting/sendAssetUnderwritePurpose.t.sol index bd990e96..cc5d1032 100644 --- a/evm/test/underwriting/sendAssetUnderwritePurpose.t.sol +++ b/evm/test/underwriting/sendAssetUnderwritePurpose.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import { TestCommon } from "../TestCommon.t.sol"; diff --git a/evm/test/underwriting/underwrite.t.sol b/evm/test/underwriting/underwrite.t.sol index 1790d65b..4cc20fad 100644 --- a/evm/test/underwriting/underwrite.t.sol +++ b/evm/test/underwriting/underwrite.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import { TestCommon } from "../TestCommon.t.sol"; diff --git a/evm/test/underwriting/underwriteAndCheckConnection.t.sol b/evm/test/underwriting/underwriteAndCheckConnection.t.sol index ebe6493b..66498adf 100644 --- a/evm/test/underwriting/underwriteAndCheckConnection.t.sol +++ b/evm/test/underwriting/underwriteAndCheckConnection.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity =0.8.19; +pragma solidity ^0.8.19; import "forge-std/Test.sol"; import { TestCommon } from "../TestCommon.t.sol";