From c5b7c826ea96cef80858e0c9fba36f278b1b81f9 Mon Sep 17 00:00:00 2001 From: Maurelian Date: Thu, 21 Jul 2022 11:44:44 -0400 Subject: [PATCH] chore(ctp): Bump solidity version to 0.8.15 --- .changeset/fresh-peaches-remain.md | 5 +++++ packages/contracts-periphery/contracts/L1/L1ERC721Bridge.sol | 2 +- .../contracts-periphery/contracts/L1/TeleportrDeposit.sol | 2 +- .../contracts-periphery/contracts/L1/TeleportrWithdrawer.sol | 2 +- packages/contracts-periphery/contracts/L2/L2ERC721Bridge.sol | 2 +- .../contracts-periphery/contracts/L2/TeleportrDisburser.sol | 2 +- .../contracts/foundry-tests/AssetReceiver.t.sol | 2 +- .../contracts/foundry-tests/TeleportrWithdrawer.t.sol | 2 +- .../contracts/foundry-tests/Transactor.t.sol | 2 +- .../contracts/testing/helpers/CallRecorder.sol | 2 +- .../contracts/testing/helpers/ExternalContractCompiler.sol | 2 +- .../contracts/testing/helpers/FailingReceiver.sol | 2 +- .../contracts/testing/helpers/MockTeleportr.sol | 2 +- .../contracts/testing/helpers/Reverter.sol | 2 +- .../contracts/testing/helpers/SimpleStorage.sol | 2 +- .../contracts/testing/helpers/TestERC20.sol | 2 +- .../contracts/testing/helpers/TestERC721.sol | 2 +- .../contracts/universal/AssetReceiver.sol | 2 +- .../contracts-periphery/contracts/universal/Transactor.sol | 2 +- .../contracts/universal/drippie/Drippie.sol | 2 +- .../contracts/universal/drippie/IDripCheck.sol | 2 +- .../universal/drippie/dripchecks/CheckBalanceHigh.sol | 2 +- .../universal/drippie/dripchecks/CheckBalanceLow.sol | 2 +- .../universal/drippie/dripchecks/CheckGelatoLow.sol | 2 +- .../contracts/universal/drippie/dripchecks/CheckTrue.sol | 2 +- .../universal/op-erc721/IOptimismMintableERC721.sol | 2 +- .../contracts/universal/op-erc721/OptimismMintableERC721.sol | 2 +- .../universal/op-erc721/OptimismMintableERC721Factory.sol | 2 +- 28 files changed, 32 insertions(+), 27 deletions(-) create mode 100644 .changeset/fresh-peaches-remain.md diff --git a/.changeset/fresh-peaches-remain.md b/.changeset/fresh-peaches-remain.md new file mode 100644 index 0000000000000..9916e8f420597 --- /dev/null +++ b/.changeset/fresh-peaches-remain.md @@ -0,0 +1,5 @@ +--- +'@eth-optimism/contracts-periphery': patch +--- + +Update compiler version to 0.8.15 diff --git a/packages/contracts-periphery/contracts/L1/L1ERC721Bridge.sol b/packages/contracts-periphery/contracts/L1/L1ERC721Bridge.sol index 531a169de82e2..0ee2d260ae709 100644 --- a/packages/contracts-periphery/contracts/L1/L1ERC721Bridge.sol +++ b/packages/contracts-periphery/contracts/L1/L1ERC721Bridge.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.9; +pragma solidity 0.8.15; import { CrossDomainEnabled diff --git a/packages/contracts-periphery/contracts/L1/TeleportrDeposit.sol b/packages/contracts-periphery/contracts/L1/TeleportrDeposit.sol index 4ae09b42a5a99..d4c4fa83b0f80 100644 --- a/packages/contracts-periphery/contracts/L1/TeleportrDeposit.sol +++ b/packages/contracts-periphery/contracts/L1/TeleportrDeposit.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity >=0.8.9; +pragma solidity 0.8.15; import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol"; diff --git a/packages/contracts-periphery/contracts/L1/TeleportrWithdrawer.sol b/packages/contracts-periphery/contracts/L1/TeleportrWithdrawer.sol index 5f34ae04884dc..21241dc877ee1 100644 --- a/packages/contracts-periphery/contracts/L1/TeleportrWithdrawer.sol +++ b/packages/contracts-periphery/contracts/L1/TeleportrWithdrawer.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.9; +pragma solidity 0.8.15; import { AssetReceiver } from "../universal/AssetReceiver.sol"; diff --git a/packages/contracts-periphery/contracts/L2/L2ERC721Bridge.sol b/packages/contracts-periphery/contracts/L2/L2ERC721Bridge.sol index 0262fdac5d192..05b8ddc06ee2c 100644 --- a/packages/contracts-periphery/contracts/L2/L2ERC721Bridge.sol +++ b/packages/contracts-periphery/contracts/L2/L2ERC721Bridge.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.9; +pragma solidity 0.8.15; import { CrossDomainEnabled diff --git a/packages/contracts-periphery/contracts/L2/TeleportrDisburser.sol b/packages/contracts-periphery/contracts/L2/TeleportrDisburser.sol index 17eb557f720c3..02f574e69e3ed 100644 --- a/packages/contracts-periphery/contracts/L2/TeleportrDisburser.sol +++ b/packages/contracts-periphery/contracts/L2/TeleportrDisburser.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity >=0.8.9; +pragma solidity 0.8.15; import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol"; diff --git a/packages/contracts-periphery/contracts/foundry-tests/AssetReceiver.t.sol b/packages/contracts-periphery/contracts/foundry-tests/AssetReceiver.t.sol index fa73b7c7bf2f1..70df31c2f1647 100644 --- a/packages/contracts-periphery/contracts/foundry-tests/AssetReceiver.t.sol +++ b/packages/contracts-periphery/contracts/foundry-tests/AssetReceiver.t.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.15; /* Testing utilities */ import { Test } from "forge-std/Test.sol"; diff --git a/packages/contracts-periphery/contracts/foundry-tests/TeleportrWithdrawer.t.sol b/packages/contracts-periphery/contracts/foundry-tests/TeleportrWithdrawer.t.sol index a229b8101bb1e..c2a7e9ca24325 100644 --- a/packages/contracts-periphery/contracts/foundry-tests/TeleportrWithdrawer.t.sol +++ b/packages/contracts-periphery/contracts/foundry-tests/TeleportrWithdrawer.t.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.15; /* Testing utilities */ import { Test } from "forge-std/Test.sol"; diff --git a/packages/contracts-periphery/contracts/foundry-tests/Transactor.t.sol b/packages/contracts-periphery/contracts/foundry-tests/Transactor.t.sol index 8410d77b2bc24..f78468da13f65 100644 --- a/packages/contracts-periphery/contracts/foundry-tests/Transactor.t.sol +++ b/packages/contracts-periphery/contracts/foundry-tests/Transactor.t.sol @@ -1,5 +1,5 @@ //SPDX-License-Identifier: MIT -pragma solidity 0.8.10; +pragma solidity 0.8.15; /* Testing utilities */ import { Test } from "forge-std/Test.sol"; diff --git a/packages/contracts-periphery/contracts/testing/helpers/CallRecorder.sol b/packages/contracts-periphery/contracts/testing/helpers/CallRecorder.sol index b57228d43bf92..eb9c41714d2af 100644 --- a/packages/contracts-periphery/contracts/testing/helpers/CallRecorder.sol +++ b/packages/contracts-periphery/contracts/testing/helpers/CallRecorder.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.9; +pragma solidity 0.8.15; contract CallRecorder { struct CallInfo { diff --git a/packages/contracts-periphery/contracts/testing/helpers/ExternalContractCompiler.sol b/packages/contracts-periphery/contracts/testing/helpers/ExternalContractCompiler.sol index 04eaa3fa92ab5..67c3f84436aea 100644 --- a/packages/contracts-periphery/contracts/testing/helpers/ExternalContractCompiler.sol +++ b/packages/contracts-periphery/contracts/testing/helpers/ExternalContractCompiler.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.9; +pragma solidity 0.8.15; import { ProxyAdmin } from "@eth-optimism/contracts-bedrock/contracts/universal/ProxyAdmin.sol"; import { Proxy } from "@eth-optimism/contracts-bedrock/contracts/universal/Proxy.sol"; diff --git a/packages/contracts-periphery/contracts/testing/helpers/FailingReceiver.sol b/packages/contracts-periphery/contracts/testing/helpers/FailingReceiver.sol index 4f7fdc047d88b..ebc8d2501dcf7 100644 --- a/packages/contracts-periphery/contracts/testing/helpers/FailingReceiver.sol +++ b/packages/contracts-periphery/contracts/testing/helpers/FailingReceiver.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.9; +pragma solidity 0.8.15; contract FailingReceiver { receive() external payable { diff --git a/packages/contracts-periphery/contracts/testing/helpers/MockTeleportr.sol b/packages/contracts-periphery/contracts/testing/helpers/MockTeleportr.sol index 16a329711b0d1..9d9fbe6b51028 100644 --- a/packages/contracts-periphery/contracts/testing/helpers/MockTeleportr.sol +++ b/packages/contracts-periphery/contracts/testing/helpers/MockTeleportr.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.9; +pragma solidity 0.8.15; contract MockTeleportr { function withdrawBalance() external { diff --git a/packages/contracts-periphery/contracts/testing/helpers/Reverter.sol b/packages/contracts-periphery/contracts/testing/helpers/Reverter.sol index 75f83cf75aac3..eeaed478563c0 100644 --- a/packages/contracts-periphery/contracts/testing/helpers/Reverter.sol +++ b/packages/contracts-periphery/contracts/testing/helpers/Reverter.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.9; +pragma solidity 0.8.15; contract Reverter { function doRevert() public pure { diff --git a/packages/contracts-periphery/contracts/testing/helpers/SimpleStorage.sol b/packages/contracts-periphery/contracts/testing/helpers/SimpleStorage.sol index 68554dcacf377..47c59eb7c40da 100644 --- a/packages/contracts-periphery/contracts/testing/helpers/SimpleStorage.sol +++ b/packages/contracts-periphery/contracts/testing/helpers/SimpleStorage.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.9; +pragma solidity 0.8.15; contract SimpleStorage { mapping(bytes32 => bytes32) public db; diff --git a/packages/contracts-periphery/contracts/testing/helpers/TestERC20.sol b/packages/contracts-periphery/contracts/testing/helpers/TestERC20.sol index f66d870a51716..03e3052fc94dc 100644 --- a/packages/contracts-periphery/contracts/testing/helpers/TestERC20.sol +++ b/packages/contracts-periphery/contracts/testing/helpers/TestERC20.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.9; +pragma solidity 0.8.15; import { ERC20 } from "@rari-capital/solmate/src/tokens/ERC20.sol"; diff --git a/packages/contracts-periphery/contracts/testing/helpers/TestERC721.sol b/packages/contracts-periphery/contracts/testing/helpers/TestERC721.sol index a9c37b38805e5..81fb3810d7c3e 100644 --- a/packages/contracts-periphery/contracts/testing/helpers/TestERC721.sol +++ b/packages/contracts-periphery/contracts/testing/helpers/TestERC721.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.9; +pragma solidity 0.8.15; import { ERC721 } from "@rari-capital/solmate/src/tokens/ERC721.sol"; diff --git a/packages/contracts-periphery/contracts/universal/AssetReceiver.sol b/packages/contracts-periphery/contracts/universal/AssetReceiver.sol index 2b05aa8e90854..2fae8eda67568 100644 --- a/packages/contracts-periphery/contracts/universal/AssetReceiver.sol +++ b/packages/contracts-periphery/contracts/universal/AssetReceiver.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.9; +pragma solidity ^0.8.0; import { ERC20 } from "@rari-capital/solmate/src/tokens/ERC20.sol"; import { ERC721 } from "@rari-capital/solmate/src/tokens/ERC721.sol"; diff --git a/packages/contracts-periphery/contracts/universal/Transactor.sol b/packages/contracts-periphery/contracts/universal/Transactor.sol index bb8455f398e2a..d128b89fa8a02 100644 --- a/packages/contracts-periphery/contracts/universal/Transactor.sol +++ b/packages/contracts-periphery/contracts/universal/Transactor.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.9; +pragma solidity ^0.8.0; import { Owned } from "@rari-capital/solmate/src/auth/Owned.sol"; diff --git a/packages/contracts-periphery/contracts/universal/drippie/Drippie.sol b/packages/contracts-periphery/contracts/universal/drippie/Drippie.sol index 81709d82356c2..502180d564523 100644 --- a/packages/contracts-periphery/contracts/universal/drippie/Drippie.sol +++ b/packages/contracts-periphery/contracts/universal/drippie/Drippie.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.9; +pragma solidity 0.8.15; import { AssetReceiver } from "../AssetReceiver.sol"; import { IDripCheck } from "./IDripCheck.sol"; diff --git a/packages/contracts-periphery/contracts/universal/drippie/IDripCheck.sol b/packages/contracts-periphery/contracts/universal/drippie/IDripCheck.sol index 5c7655588be92..fbb691780a0a2 100644 --- a/packages/contracts-periphery/contracts/universal/drippie/IDripCheck.sol +++ b/packages/contracts-periphery/contracts/universal/drippie/IDripCheck.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.9; +pragma solidity ^0.8.0; interface IDripCheck { // DripCheck contracts that want to take parameters as inputs MUST expose a struct called diff --git a/packages/contracts-periphery/contracts/universal/drippie/dripchecks/CheckBalanceHigh.sol b/packages/contracts-periphery/contracts/universal/drippie/dripchecks/CheckBalanceHigh.sol index 846352842f0ba..4ce8bf46a7c3f 100644 --- a/packages/contracts-periphery/contracts/universal/drippie/dripchecks/CheckBalanceHigh.sol +++ b/packages/contracts-periphery/contracts/universal/drippie/dripchecks/CheckBalanceHigh.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.9; +pragma solidity 0.8.15; import { IDripCheck } from "../IDripCheck.sol"; diff --git a/packages/contracts-periphery/contracts/universal/drippie/dripchecks/CheckBalanceLow.sol b/packages/contracts-periphery/contracts/universal/drippie/dripchecks/CheckBalanceLow.sol index 9920e972db1f4..8ccb099bdf1dd 100644 --- a/packages/contracts-periphery/contracts/universal/drippie/dripchecks/CheckBalanceLow.sol +++ b/packages/contracts-periphery/contracts/universal/drippie/dripchecks/CheckBalanceLow.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.9; +pragma solidity 0.8.15; import { IDripCheck } from "../IDripCheck.sol"; diff --git a/packages/contracts-periphery/contracts/universal/drippie/dripchecks/CheckGelatoLow.sol b/packages/contracts-periphery/contracts/universal/drippie/dripchecks/CheckGelatoLow.sol index 00e986d4fe243..30773d1801d95 100644 --- a/packages/contracts-periphery/contracts/universal/drippie/dripchecks/CheckGelatoLow.sol +++ b/packages/contracts-periphery/contracts/universal/drippie/dripchecks/CheckGelatoLow.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.9; +pragma solidity 0.8.15; import { IDripCheck } from "../IDripCheck.sol"; diff --git a/packages/contracts-periphery/contracts/universal/drippie/dripchecks/CheckTrue.sol b/packages/contracts-periphery/contracts/universal/drippie/dripchecks/CheckTrue.sol index 3fc8b8b240edc..32015d5f10b2a 100644 --- a/packages/contracts-periphery/contracts/universal/drippie/dripchecks/CheckTrue.sol +++ b/packages/contracts-periphery/contracts/universal/drippie/dripchecks/CheckTrue.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.9; +pragma solidity 0.8.15; import { IDripCheck } from "../IDripCheck.sol"; diff --git a/packages/contracts-periphery/contracts/universal/op-erc721/IOptimismMintableERC721.sol b/packages/contracts-periphery/contracts/universal/op-erc721/IOptimismMintableERC721.sol index 0c2174261fad4..c801cc79b272d 100644 --- a/packages/contracts-periphery/contracts/universal/op-erc721/IOptimismMintableERC721.sol +++ b/packages/contracts-periphery/contracts/universal/op-erc721/IOptimismMintableERC721.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.9; +pragma solidity ^0.8.0; import { IERC721Enumerable diff --git a/packages/contracts-periphery/contracts/universal/op-erc721/OptimismMintableERC721.sol b/packages/contracts-periphery/contracts/universal/op-erc721/OptimismMintableERC721.sol index 9a0a56badfffe..de8d1cc7de266 100644 --- a/packages/contracts-periphery/contracts/universal/op-erc721/OptimismMintableERC721.sol +++ b/packages/contracts-periphery/contracts/universal/op-erc721/OptimismMintableERC721.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.9; +pragma solidity ^0.8.0; import { ERC721Enumerable diff --git a/packages/contracts-periphery/contracts/universal/op-erc721/OptimismMintableERC721Factory.sol b/packages/contracts-periphery/contracts/universal/op-erc721/OptimismMintableERC721Factory.sol index 77830cf5a334c..ea5315dc41db3 100644 --- a/packages/contracts-periphery/contracts/universal/op-erc721/OptimismMintableERC721Factory.sol +++ b/packages/contracts-periphery/contracts/universal/op-erc721/OptimismMintableERC721Factory.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity ^0.8.9; +pragma solidity 0.8.15; import { OwnableUpgradeable