rollback solidity version

concero · Feb 3, 2025 · 37937c0 · 37937c0
1 parent 4dfbee4
commit 37937c0
Show file tree

Hide file tree

Showing 46 changed files with 1,183 additions and 303 deletions.
diff --git a/contracts/ChildPool.sol b/contracts/ChildPool.sol
@@ -4,7 +4,7 @@
  * @notice If you discover any security vulnerabilities, please report them responsibly.
  * @contact email: security@concero.io
  */
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {IConceroBridge} from "./Interfaces/IConceroBridge.sol";
 import {CCIPReceiver} from "@chainlink/contracts-ccip/src/v0.8/ccip/applications/CCIPReceiver.sol";

diff --git a/contracts/ConceroBridge.sol b/contracts/ConceroBridge.sol
@@ -4,7 +4,7 @@
  * @notice If you discover any security vulnerabilities, please report them responsibly.
  * @contact email: security@concero.io
  */
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";

diff --git a/contracts/Constants.sol b/contracts/Constants.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 address constant USDC_ARBITRUM = 0xaf88d065e77c8cC2239327C5EDb3A432268e5831;
 address constant USDC_BASE = 0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913;

diff --git a/contracts/DexSwap.sol b/contracts/DexSwap.sol
@@ -4,7 +4,7 @@
  * @notice If you discover any security vulnerabilities, please report them responsibly.
  * @contact email: security@concero.io
  */
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {IDexSwap} from "./Interfaces/IDexSwap.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";

diff --git a/contracts/InfraCCIP.sol b/contracts/InfraCCIP.sol
@@ -4,7 +4,7 @@
  * @notice If you discover any security vulnerabilities, please report them responsibly.
  * @contact email: security@concero.io
  */
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {IConceroBridge} from "./Interfaces/IConceroBridge.sol";
 import {Client} from "@chainlink/contracts-ccip/src/v0.8/ccip/libraries/Client.sol";

diff --git a/contracts/InfraCLF.sol b/contracts/InfraCLF.sol
@@ -4,7 +4,7 @@
  * @notice If you discover any security vulnerabilities, please report them responsibly.
  * @contact email: security@concero.io
  */
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {InfraCommon} from "./InfraCommon.sol";
 import {IDexSwap} from "./Interfaces/IDexSwap.sol";

diff --git a/contracts/InfraCommon.sol b/contracts/InfraCommon.sol
@@ -4,7 +4,7 @@
  * @notice If you discover any security vulnerabilities, please report them responsibly.
  * @contact email: security@concero.io
  */
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {USDC_ARBITRUM, USDC_BASE, USDC_OPTIMISM, USDC_POLYGON, USDC_POLYGON_AMOY, USDC_ARBITRUM_SEPOLIA, USDC_BASE_SEPOLIA, USDC_OPTIMISM_SEPOLIA, USDC_AVALANCHE, USDC_ETHEREUM, USDC_OPTIMISM, USDC_SEPOLIA, USDC_FUJI} from "./Constants.sol";
 import {CHAIN_ID_AVALANCHE, WRAPPED_NATIVE_AVALANCHE, CHAIN_ID_ETHEREUM, WRAPPED_NATIVE_ETHEREUM, CHAIN_ID_ARBITRUM, WRAPPED_NATIVE_ARBITRUM, CHAIN_ID_BASE, WRAPPED_NATIVE_BASE, CHAIN_ID_POLYGON, WRAPPED_NATIVE_POLYGON, WRAPPED_NATIVE_OPTIMISM, CHAIN_ID_OPTIMISM} from "./Constants.sol";

diff --git a/contracts/InfraOrchestrator.sol b/contracts/InfraOrchestrator.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {CHAIN_SELECTOR_ARBITRUM, CHAIN_SELECTOR_BASE, CHAIN_SELECTOR_OPTIMISM, CHAIN_SELECTOR_POLYGON, CHAIN_SELECTOR_AVALANCHE, CHAIN_SELECTOR_ETHEREUM} from "./Constants.sol";
 import {InfraCommon} from "./InfraCommon.sol";

diff --git a/contracts/Interfaces/ICCIP.sol b/contracts/Interfaces/ICCIP.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: UNLICENSED
 
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 interface ICCIP {
     ///@notice CCIP transaction types

diff --git a/contracts/Interfaces/IConceroBridge.sol b/contracts/Interfaces/IConceroBridge.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {IInfraStorage} from "./IInfraStorage.sol";
 

diff --git a/contracts/Interfaces/IDexSwap.sol b/contracts/Interfaces/IDexSwap.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 interface IDexSwap {
     /// @notice Concero Struct to track DEX Data

diff --git a/contracts/Interfaces/IInfraCLF.sol b/contracts/Interfaces/IInfraCLF.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {IInfraStorage} from "./IInfraStorage.sol";
 

diff --git a/contracts/Interfaces/IInfraOrchestrator.sol b/contracts/Interfaces/IInfraOrchestrator.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {IInfraStorage} from "./IInfraStorage.sol";
 

diff --git a/contracts/Interfaces/IInfraStorage.sol b/contracts/Interfaces/IInfraStorage.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 interface IInfraStorage {
     ///@notice Chainlink Functions Request Type

diff --git a/contracts/Interfaces/IParentPool.sol b/contracts/Interfaces/IParentPool.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {IPool} from "./IPool.sol";
 

diff --git a/contracts/Interfaces/IParentPoolCLFCLA.sol b/contracts/Interfaces/IParentPoolCLFCLA.sol
@@ -5,7 +5,7 @@
  * @contact email: security@concero.io
  */
 
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 interface IParentPoolCLFCLA {
     event WithdrawalRequestInitiated(

diff --git a/contracts/Interfaces/IParentPoolViewViaDelegate.sol b/contracts/Interfaces/IParentPoolViewViaDelegate.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 interface IParentPoolViewViaDelegate {
     function calculateLpAmountViaDelegate(

diff --git a/contracts/Interfaces/IPool.sol b/contracts/Interfaces/IPool.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 interface IPool {
     /* FUNCTIONS */

diff --git a/contracts/Interfaces/IWETH.sol b/contracts/Interfaces/IWETH.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 

diff --git a/contracts/LPToken.sol b/contracts/LPToken.sol
@@ -5,7 +5,7 @@
  * @notice If you discover any security vulnerabilities, please report them responsibly.
  * @contact email: security@concero.io
  */
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import {ERC20Burnable} from "@openzeppelin/contracts/token/ERC20/extensions/ERC20Burnable.sol";

diff --git a/contracts/Libraries/ChildPoolStorage.sol b/contracts/Libraries/ChildPoolStorage.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 contract ChildPoolStorage {
     /* STATE VARIABLES */

diff --git a/contracts/Libraries/InfraStorage.sol b/contracts/Libraries/InfraStorage.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {IInfraStorage} from "../Interfaces/IInfraStorage.sol";
 import {ReentrancyGuard} from "@openzeppelin/contracts/utils/ReentrancyGuard.sol";

diff --git a/contracts/Libraries/InfraStorageSetters.sol b/contracts/Libraries/InfraStorageSetters.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {InfraStorage} from "./InfraStorage.sol";
 

diff --git a/contracts/Libraries/LibConcero.sol b/contracts/Libraries/LibConcero.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";

diff --git a/contracts/Libraries/ParentPoolStorage.sol b/contracts/Libraries/ParentPoolStorage.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {IParentPool} from "../Interfaces/IParentPool.sol";
 

diff --git a/contracts/ParentPool.sol b/contracts/ParentPool.sol
@@ -4,7 +4,7 @@
  * @notice If you discover any security vulnerabilities, please report them responsibly.
  * @contact email: security@concero.io
  */
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {IConceroBridge} from "./Interfaces/IConceroBridge.sol";
 import {AutomationCompatibleInterface} from "@chainlink/contracts/src/v0.8/automation/interfaces/AutomationCompatibleInterface.sol";

diff --git a/contracts/ParentPoolCommon.sol b/contracts/ParentPoolCommon.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {LPToken} from "./LPToken.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";

diff --git a/contracts/PauseDummy.sol b/contracts/PauseDummy.sol
@@ -1,6 +1,6 @@
 // deployed with salt: 0xdddd5f804b9d293dce8819d232e8d76381605a62f2d34c122b9ca6815a0000c8
 // to address: 0x00c4d25487297C4fc1341aa840a4F56e474f6A0d
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 error Paused();
 

diff --git a/contracts/Proxy/ConceroProxyAdmin.sol b/contracts/Proxy/ConceroProxyAdmin.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v5.0.0) (proxy/transparent/ProxyAdmin.sol)
 
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {ITransparentUpgradeableProxy} from "./TransparentUpgradeableProxy.sol";
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";

diff --git a/contracts/Proxy/TransparentUpgradeableProxy.sol b/contracts/Proxy/TransparentUpgradeableProxy.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // OpenZeppelin Contracts (last updated v5.0.0) (proxy/transparent/TransparentUpgradeableProxy.sol)
 
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {ERC1967Utils} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Utils.sol";
 import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";

diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -40,7 +40,7 @@ const config: HardhatUserConfig = {
     tests: "test/hardhat",
   },
   solidity: {
-    version: "0.8.22",
+    version: "0.8.20",
     settings: {
       // evmVersion: "paris",
       optimizer: {

diff --git a/test/foundry/Bridge/BridgeBaseTest.t.sol b/test/foundry/Bridge/BridgeBaseTest.t.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {BaseTest, console} from "../utils/BaseTest.t.sol";
 import {InfraOrchestratorWrapper} from "./wrappers/InfraOrchestratorWrapper.sol";

diff --git a/test/foundry/Bridge/BridgeCompression.t.sol b/test/foundry/Bridge/BridgeCompression.t.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {console, Vm} from "forge-std/src/Test.sol";
 import {BridgeBaseTest} from "./BridgeBaseTest.t.sol";

diff --git a/test/foundry/Bridge/StartBridge.t.sol b/test/foundry/Bridge/StartBridge.t.sol
@@ -1,6 +1,6 @@
 //// SPDX-License-Identifier: MIT
 //
-//pragma solidity ^0.8.22;
+//pragma solidity 0.8.20;
 //
 //import {ConceroBridge} from "contracts/ConceroBridge.sol";
 //import {BaseTest, console, Vm} from "../utils/BaseTest.t.sol";

diff --git a/test/foundry/Bridge/wrappers/InfraOrchestratorWrapper.sol b/test/foundry/Bridge/wrappers/InfraOrchestratorWrapper.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {IInfraStorage} from "contracts/Interfaces/IInfraStorage.sol";
 import {IDexSwap} from "contracts/Interfaces/IDexSwap.sol";

diff --git a/test/foundry/Mocks/ConceroMock.sol b/test/foundry/Mocks/ConceroMock.sol
@@ -1,5 +1,5 @@
 //// SPDX-License-Identifier: SEE LICENSE IN LICENSE
-//pragma solidity ^0.8.22;
+//pragma solidity 0.8.20;
 //
 //import {ConceroBridge} from "contracts/ConceroBridge.sol";
 //import {Storage} from "contracts/Libraries/Storage.sol";

diff --git a/test/foundry/ParentPool/BaseTest.t.sol b/test/foundry/ParentPool/BaseTest.t.sol
@@ -1,5 +1,5 @@
 //// SPDX-License-Identifier: UNLICENSED
-//pragma solidity ^0.8.22;
+//pragma solidity 0.8.20;
 //
 //import {Test, console, Vm} from "forge-std/Test.sol";
 //import {ParentPool} from "contracts/ParentPool.sol";

diff --git a/test/foundry/ParentPool/Withdraw.t.sol b/test/foundry/ParentPool/Withdraw.t.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {VmSafe} from "forge-std/src/Vm.sol";
 import {BaseTest, console} from "../utils/BaseTest.t.sol";

diff --git a/test/foundry/ParentPool/unitTests/CalculateLpTokensToMint.t.sol b/test/foundry/ParentPool/unitTests/CalculateLpTokensToMint.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {BaseTest} from "../../utils/BaseTest.t.sol";
 import {Test, console, Vm} from "forge-std/src/Test.sol";

diff --git a/test/foundry/ParentPool/unitTests/DepositOnTheWayRequest.t.sol b/test/foundry/ParentPool/unitTests/DepositOnTheWayRequest.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-//pragma solidity ^0.8.22;
+//pragma solidity 0.8.20;
 //
 //import {Test, console} from "forge-std/Test.sol";
 //import {ParentPoolDeploy} from "../../../script/ParentPoolDeploy.s.sol";

diff --git a/test/foundry/ParentPool/wrappers/ParentPoolWrapper.sol b/test/foundry/ParentPool/wrappers/ParentPoolWrapper.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {ParentPool} from "contracts/ParentPool.sol";
 import {IParentPool} from "contracts/Interfaces/IParentPool.sol";

diff --git a/test/foundry/scripts/DeployInfra.s.sol b/test/foundry/scripts/DeployInfra.s.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {DeployHelper} from "../utils/DeployHelper.sol";
 import {ConceroBridge} from "contracts/ConceroBridge.sol";

diff --git a/test/foundry/utils/BaseTest.t.sol b/test/foundry/utils/BaseTest.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {console, Vm, Test} from "forge-std/src/Test.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";

diff --git a/test/foundry/utils/DeployHelper.sol b/test/foundry/utils/DeployHelper.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: SEE LICENSE IN LICENSE
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import {Script} from "forge-std/src/Script.sol";
 

diff --git a/test/foundry/utils/InfraBaseTest.t.sol b/test/foundry/utils/InfraBaseTest.t.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.22;
+pragma solidity 0.8.20;
 
 import "forge-std/src/Test.sol";
 import {DexSwap} from "contracts/DexSwap.sol";