feat: be more strict with addresses

catalystdao · Oct 30, 2023 · 395fce1 · 395fce1
1 parent 0c5fa76
commit 395fce1
Show file tree

Hide file tree

Showing 85 changed files with 89 additions and 87 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → evm/script/WrappedGas9.disabled b/evm/script/WrappedGas9.sol → evm/script/WrappedGas9.disabled
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 <mike@makerdao.com>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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";