From 22a6a225a31aab82d5ffcedffedd092c20cb46a5 Mon Sep 17 00:00:00 2001 From: byshape Date: Fri, 28 Jun 2024 16:39:34 +0100 Subject: [PATCH] Update Solidity version to 0.8.26 --- .gas-snapshot | 144 +++++++++--------- contracts/BaseEscrow.sol | 2 +- contracts/BaseEscrowFactory.sol | 2 +- contracts/Escrow.sol | 2 +- contracts/EscrowDst.sol | 2 +- contracts/EscrowFactory.sol | 2 +- contracts/EscrowSrc.sol | 2 +- contracts/MerkleStorageInvalidator.sol | 2 +- .../interfaces/IMerkleStorageInvalidator.sol | 2 +- contracts/interfaces/IResolverMock.sol | 2 +- contracts/mocks/ERC20True.sol | 2 +- contracts/mocks/NoReceiveCaller.sol | 2 +- contracts/mocks/ResolverMock.sol | 2 +- contracts/zkSync/EscrowDstZkSync.sol | 2 +- contracts/zkSync/EscrowFactoryZkSync.sol | 2 +- contracts/zkSync/EscrowSrcZkSync.sol | 2 +- contracts/zkSync/EscrowZkSync.sol | 2 +- contracts/zkSync/MinimalProxyZkSync.sol | 2 +- lib/limit-order-protocol | 2 +- lib/limit-order-settlement | 2 +- test/integration/EscrowFactory.t.sol | 2 +- .../MerkleStorageInvalidator.t.sol | 2 +- test/integration/ResolverMock.t.sol | 2 +- test/libraries/TimelocksLib.t.sol | 2 +- test/unit/Escrow.t.sol | 2 +- test/unit/EscrowFactory.t.sol | 2 +- test/unit/MerkleStorageInvalidator.t.sol | 2 +- test/utils/BaseSetup.sol | 2 +- test/utils/libraries/TimelocksSettersLib.sol | 2 +- test/utils/mocks/TimelocksLibMock.sol | 2 +- 30 files changed, 101 insertions(+), 101 deletions(-) diff --git a/.gas-snapshot b/.gas-snapshot index 85ec894..c32da77 100644 --- a/.gas-snapshot +++ b/.gas-snapshot @@ -1,72 +1,72 @@ -EscrowFactoryTest:test_MultipleFillsInvalidKey() (gas: 477392) -EscrowFactoryTest:test_MultipleFillsInvalidSecretsAmount() (gas: 472722) -EscrowFactoryTest:test_NoDeploymentForNotResolver() (gas: 183965) -EscrowFactoryTest:test_NoInsufficientBalanceDeploymentForMaker() (gas: 119657) -EscrowFactoryTest:test_NoInsufficientBalanceDeploymentForTaker() (gas: 22658) -EscrowFactoryTest:test_NoInsufficientBalanceNativeDeploymentForMaker() (gas: 112896) -EscrowFactoryTest:test_NoInsufficientBalanceNativeDeploymentForTaker() (gas: 27394) -EscrowFactoryTest:test_NoUnsafeDeploymentForTaker() (gas: 30108) -EscrowTest:test_CancelDst() (gas: 111454) -EscrowTest:test_CancelDstDifferentTarget() (gas: 143281) -EscrowTest:test_CancelDstWithNativeToken() (gas: 93611) -EscrowTest:test_CancelPublicSrc() (gas: 156600) -EscrowTest:test_CancelResolverSrc() (gas: 159757) -EscrowTest:test_CancelResolverSrcReceiver() (gas: 170942) -EscrowTest:test_NoAnyoneCancelDuringResolverCancelSrc() (gas: 154958) -EscrowTest:test_NoCallsWithInvalidImmutables() (gas: 277046) -EscrowTest:test_NoCancelByAnyoneDst() (gas: 117101) -EscrowTest:test_NoCancelDuringWithdrawalDst() (gas: 116861) -EscrowTest:test_NoCancelDuringWithdrawalSrc() (gas: 155092) -EscrowTest:test_NoFailedNativeTokenTransferCancelSrc() (gas: 170449) -EscrowTest:test_NoFailedNativeTokenTransferWithdrawalDst() (gas: 149884) -EscrowTest:test_NoFailedNativeTokenTransferWithdrawalDstNative() (gas: 83354) -EscrowTest:test_NoFailedNativeTokenTransferWithdrawalSrc() (gas: 303443) -EscrowTest:test_NoPublicCancelDuringPrivateCancellationSrc() (gas: 154273) -EscrowTest:test_NoPublicWithdrawOutsideOfAllowedPeriodDst() (gas: 122285) -EscrowTest:test_NoPublicWithdrawalOutsideOfAllowedPeriodSrc() (gas: 160156) -EscrowTest:test_NoRescueFundsByAnyoneDst() (gas: 171804) -EscrowTest:test_NoRescueFundsByAnyoneSrc() (gas: 200175) -EscrowTest:test_NoRescueFundsEarlierDst() (gas: 171247) -EscrowTest:test_NoRescueFundsEarlierSrc() (gas: 200092) -EscrowTest:test_NoWithdrawalByAnyoneSrc() (gas: 151984) -EscrowTest:test_NoWithdrawalByNonResolverDst() (gas: 116801) -EscrowTest:test_NoWithdrawalOutsideOfAllowedPeriodDst() (gas: 121701) -EscrowTest:test_NoWithdrawalOutsideOfAllowedPeriodSrc() (gas: 160717) -EscrowTest:test_NoWithdrawalWithWrongSecretDst() (gas: 118166) -EscrowTest:test_NoWithdrawalWithWrongSecretSrc() (gas: 155589) -EscrowTest:test_PublicWithdrawSrc() (gas: 172891) -EscrowTest:test_RescueFundsDst() (gas: 153614) -EscrowTest:test_RescueFundsDstNative() (gas: 182171) -EscrowTest:test_RescueFundsSrc() (gas: 186570) -EscrowTest:test_RescueFundsSrcNative() (gas: 188836) -EscrowTest:test_WithdrawByAnyoneDst() (gas: 136666) -EscrowTest:test_WithdrawByResolverDst() (gas: 137751) -EscrowTest:test_WithdrawByResolverDstNative() (gas: 97799) -EscrowTest:test_WithdrawByResolverPublicDst() (gas: 137097) -EscrowTest:test_WithdrawSrc() (gas: 177670) -EscrowTest:test_WithdrawSrcTo() (gas: 182509) -IntegrationEscrowFactoryTest:test_DeployCloneForMakerNonWhitelistedResolverInt() (gas: 470984) -IntegrationEscrowFactoryTest:test_NoInsufficientBalanceDeploymentForMakerInt() (gas: 338739) -IntegrationResolverMockTest:test_MockCancelDst() (gas: 152609) -IntegrationResolverMockTest:test_MockCancelSrc() (gas: 351046) -IntegrationResolverMockTest:test_MockDeployDst() (gas: 146974) -IntegrationResolverMockTest:test_MockDeploySrc() (gas: 361519) -IntegrationResolverMockTest:test_MockPublicCancelSrc() (gas: 360087) -IntegrationResolverMockTest:test_MockPublicWithdrawDst() (gas: 156924) -IntegrationResolverMockTest:test_MockRescueFundsDst() (gas: 156496) -IntegrationResolverMockTest:test_MockRescueFundsSrc() (gas: 379602) -IntegrationResolverMockTest:test_MockWithdrawDst() (gas: 178381) -IntegrationResolverMockTest:test_MockWithdrawToSrc() (gas: 352052) -MerkleStorageInvalidatorIntTest:test_MultipleFillsFillAllExtra() (gas: 921352) -MerkleStorageInvalidatorIntTest:test_MultipleFillsFillAllTwoFills() (gas: 920021) -MerkleStorageInvalidatorIntTest:test_MultipleFillsFillFirst() (gas: 704348) -MerkleStorageInvalidatorIntTest:test_MultipleFillsFillFirstTwoFills() (gas: 930370) -MerkleStorageInvalidatorIntTest:test_MultipleFillsFillLast() (gas: 704074) -MerkleStorageInvalidatorIntTest:test_MultipleFillsNoDeploymentWithoutValidation() (gas: 298889) -MerkleStorageInvalidatorIntTest:test_MultipleFillsNoSecondDeploymentWithTheSameIndex() (gas: 776093) -MerkleStorageInvalidatorIntTest:test_MultipleFillsOddDivision() (gas: 437424) -MerkleStorageInvalidatorIntTest:test_MultipleFillsOneFill() (gas: 704326) -MerkleStorageInvalidatorIntTest:test_MultipleFillsTwoFills() (gas: 918929) -TimelocksLibTest:test_NoTimelocksOverflow() (gas: 128740) -TimelocksLibTest:test_getStartTimestamps() (gas: 16180) -TimelocksLibTest:test_setDeployedAt() (gas: 5731) \ No newline at end of file +EscrowFactoryTest:test_MultipleFillsInvalidKey() (gas: 477987) +EscrowFactoryTest:test_MultipleFillsInvalidSecretsAmount() (gas: 473199) +EscrowFactoryTest:test_NoDeploymentForNotResolver() (gas: 184423) +EscrowFactoryTest:test_NoInsufficientBalanceDeploymentForMaker() (gas: 120016) +EscrowFactoryTest:test_NoInsufficientBalanceDeploymentForTaker() (gas: 22817) +EscrowFactoryTest:test_NoInsufficientBalanceNativeDeploymentForMaker() (gas: 113364) +EscrowFactoryTest:test_NoInsufficientBalanceNativeDeploymentForTaker() (gas: 27587) +EscrowFactoryTest:test_NoUnsafeDeploymentForTaker() (gas: 30293) +EscrowTest:test_CancelDst() (gas: 111448) +EscrowTest:test_CancelDstDifferentTarget() (gas: 143288) +EscrowTest:test_CancelDstWithNativeToken() (gas: 93755) +EscrowTest:test_CancelPublicSrc() (gas: 156973) +EscrowTest:test_CancelResolverSrc() (gas: 160162) +EscrowTest:test_CancelResolverSrcReceiver() (gas: 171590) +EscrowTest:test_NoAnyoneCancelDuringResolverCancelSrc() (gas: 155389) +EscrowTest:test_NoCallsWithInvalidImmutables() (gas: 277753) +EscrowTest:test_NoCancelByAnyoneDst() (gas: 117173) +EscrowTest:test_NoCancelDuringWithdrawalDst() (gas: 116936) +EscrowTest:test_NoCancelDuringWithdrawalSrc() (gas: 155555) +EscrowTest:test_NoFailedNativeTokenTransferCancelSrc() (gas: 170904) +EscrowTest:test_NoFailedNativeTokenTransferWithdrawalDst() (gas: 149978) +EscrowTest:test_NoFailedNativeTokenTransferWithdrawalDstNative() (gas: 83463) +EscrowTest:test_NoFailedNativeTokenTransferWithdrawalSrc() (gas: 307698) +EscrowTest:test_NoPublicCancelDuringPrivateCancellationSrc() (gas: 154723) +EscrowTest:test_NoPublicWithdrawOutsideOfAllowedPeriodDst() (gas: 122464) +EscrowTest:test_NoPublicWithdrawalOutsideOfAllowedPeriodSrc() (gas: 160668) +EscrowTest:test_NoRescueFundsByAnyoneDst() (gas: 171883) +EscrowTest:test_NoRescueFundsByAnyoneSrc() (gas: 200581) +EscrowTest:test_NoRescueFundsEarlierDst() (gas: 171214) +EscrowTest:test_NoRescueFundsEarlierSrc() (gas: 200447) +EscrowTest:test_NoWithdrawalByAnyoneSrc() (gas: 152400) +EscrowTest:test_NoWithdrawalByNonResolverDst() (gas: 116895) +EscrowTest:test_NoWithdrawalOutsideOfAllowedPeriodDst() (gas: 121818) +EscrowTest:test_NoWithdrawalOutsideOfAllowedPeriodSrc() (gas: 161248) +EscrowTest:test_NoWithdrawalWithWrongSecretDst() (gas: 118242) +EscrowTest:test_NoWithdrawalWithWrongSecretSrc() (gas: 156072) +EscrowTest:test_PublicWithdrawSrc() (gas: 173226) +EscrowTest:test_RescueFundsDst() (gas: 153567) +EscrowTest:test_RescueFundsDstNative() (gas: 182217) +EscrowTest:test_RescueFundsSrc() (gas: 186924) +EscrowTest:test_RescueFundsSrcNative() (gas: 189279) +EscrowTest:test_WithdrawByAnyoneDst() (gas: 136680) +EscrowTest:test_WithdrawByResolverDst() (gas: 137760) +EscrowTest:test_WithdrawByResolverDstNative() (gas: 97895) +EscrowTest:test_WithdrawByResolverPublicDst() (gas: 137106) +EscrowTest:test_WithdrawSrc() (gas: 178105) +EscrowTest:test_WithdrawSrcTo() (gas: 182856) +IntegrationEscrowFactoryTest:test_DeployCloneForMakerNonWhitelistedResolverInt() (gas: 472325) +IntegrationEscrowFactoryTest:test_NoInsufficientBalanceDeploymentForMakerInt() (gas: 340022) +IntegrationResolverMockTest:test_MockCancelDst() (gas: 152716) +IntegrationResolverMockTest:test_MockCancelSrc() (gas: 351474) +IntegrationResolverMockTest:test_MockDeployDst() (gas: 147100) +IntegrationResolverMockTest:test_MockDeploySrc() (gas: 362535) +IntegrationResolverMockTest:test_MockPublicCancelSrc() (gas: 360957) +IntegrationResolverMockTest:test_MockPublicWithdrawDst() (gas: 157094) +IntegrationResolverMockTest:test_MockRescueFundsDst() (gas: 156617) +IntegrationResolverMockTest:test_MockRescueFundsSrc() (gas: 380078) +IntegrationResolverMockTest:test_MockWithdrawDst() (gas: 178486) +IntegrationResolverMockTest:test_MockWithdrawToSrc() (gas: 352403) +MerkleStorageInvalidatorIntTest:test_MultipleFillsFillAllExtra() (gas: 921261) +MerkleStorageInvalidatorIntTest:test_MultipleFillsFillAllTwoFills() (gas: 919780) +MerkleStorageInvalidatorIntTest:test_MultipleFillsFillFirst() (gas: 704890) +MerkleStorageInvalidatorIntTest:test_MultipleFillsFillFirstTwoFills() (gas: 930520) +MerkleStorageInvalidatorIntTest:test_MultipleFillsFillLast() (gas: 704816) +MerkleStorageInvalidatorIntTest:test_MultipleFillsNoDeploymentWithoutValidation() (gas: 300669) +MerkleStorageInvalidatorIntTest:test_MultipleFillsNoSecondDeploymentWithTheSameIndex() (gas: 777040) +MerkleStorageInvalidatorIntTest:test_MultipleFillsOddDivision() (gas: 439290) +MerkleStorageInvalidatorIntTest:test_MultipleFillsOneFill() (gas: 705052) +MerkleStorageInvalidatorIntTest:test_MultipleFillsTwoFills() (gas: 919519) +TimelocksLibTest:test_NoTimelocksOverflow() (gas: 128900) +TimelocksLibTest:test_getStartTimestamps() (gas: 15909) +TimelocksLibTest:test_setDeployedAt() (gas: 5705) \ No newline at end of file diff --git a/contracts/BaseEscrow.sol b/contracts/BaseEscrow.sol index fe5a142..37cbe79 100644 --- a/contracts/BaseEscrow.sol +++ b/contracts/BaseEscrow.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { IERC20 } from "openzeppelin-contracts/token/ERC20/IERC20.sol"; import { AddressLib, Address } from "solidity-utils/libraries/AddressLib.sol"; diff --git a/contracts/BaseEscrowFactory.sol b/contracts/BaseEscrowFactory.sol index fc87487..4121074 100644 --- a/contracts/BaseEscrowFactory.sol +++ b/contracts/BaseEscrowFactory.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { Clones } from "openzeppelin-contracts/proxy/Clones.sol"; import { IERC20 } from "openzeppelin-contracts/token/ERC20/IERC20.sol"; diff --git a/contracts/Escrow.sol b/contracts/Escrow.sol index 6fa7809..e004b63 100644 --- a/contracts/Escrow.sol +++ b/contracts/Escrow.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { Create2 } from "openzeppelin-contracts/utils/Create2.sol"; diff --git a/contracts/EscrowDst.sol b/contracts/EscrowDst.sol index 5174703..d75b377 100644 --- a/contracts/EscrowDst.sol +++ b/contracts/EscrowDst.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { IERC20 } from "openzeppelin-contracts/token/ERC20/IERC20.sol"; import { SafeERC20 } from "solidity-utils/libraries/SafeERC20.sol"; diff --git a/contracts/EscrowFactory.sol b/contracts/EscrowFactory.sol index 055d0c5..43484ef 100644 --- a/contracts/EscrowFactory.sol +++ b/contracts/EscrowFactory.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { IERC20 } from "openzeppelin-contracts/token/ERC20/IERC20.sol"; diff --git a/contracts/EscrowSrc.sol b/contracts/EscrowSrc.sol index 5b00e06..22bc662 100644 --- a/contracts/EscrowSrc.sol +++ b/contracts/EscrowSrc.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { IERC20 } from "openzeppelin-contracts/token/ERC20/IERC20.sol"; import { SafeERC20 } from "solidity-utils/libraries/SafeERC20.sol"; diff --git a/contracts/MerkleStorageInvalidator.sol b/contracts/MerkleStorageInvalidator.sol index d9868c2..5955f77 100644 --- a/contracts/MerkleStorageInvalidator.sol +++ b/contracts/MerkleStorageInvalidator.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { IOrderMixin } from "limit-order-protocol/interfaces/IOrderMixin.sol"; import { ITakerInteraction } from "limit-order-protocol/interfaces/ITakerInteraction.sol"; diff --git a/contracts/interfaces/IMerkleStorageInvalidator.sol b/contracts/interfaces/IMerkleStorageInvalidator.sol index 39c36a4..a591ada 100644 --- a/contracts/interfaces/IMerkleStorageInvalidator.sol +++ b/contracts/interfaces/IMerkleStorageInvalidator.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; /** * @title Merkle Storage Invalidator interface diff --git a/contracts/interfaces/IResolverMock.sol b/contracts/interfaces/IResolverMock.sol index 03897cf..174284e 100644 --- a/contracts/interfaces/IResolverMock.sol +++ b/contracts/interfaces/IResolverMock.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { IOrderMixin } from "limit-order-protocol/interfaces/IOrderMixin.sol"; import { TakerTraits } from "limit-order-protocol/libraries/TakerTraitsLib.sol"; diff --git a/contracts/mocks/ERC20True.sol b/contracts/mocks/ERC20True.sol index 449febe..e52dcfa 100644 --- a/contracts/mocks/ERC20True.sol +++ b/contracts/mocks/ERC20True.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; contract ERC20True { function transfer(address, uint256) public pure returns (bool) { diff --git a/contracts/mocks/NoReceiveCaller.sol b/contracts/mocks/NoReceiveCaller.sol index 44c2a97..2104daa 100644 --- a/contracts/mocks/NoReceiveCaller.sol +++ b/contracts/mocks/NoReceiveCaller.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { RevertReasonForwarder } from "solidity-utils/libraries/RevertReasonForwarder.sol"; diff --git a/contracts/mocks/ResolverMock.sol b/contracts/mocks/ResolverMock.sol index 5430237..04b8218 100644 --- a/contracts/mocks/ResolverMock.sol +++ b/contracts/mocks/ResolverMock.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { IERC20 } from "openzeppelin-contracts/token/ERC20/IERC20.sol"; import { Ownable } from "openzeppelin-contracts/access/Ownable.sol"; diff --git a/contracts/zkSync/EscrowDstZkSync.sol b/contracts/zkSync/EscrowDstZkSync.sol index 04b4624..4275f6c 100644 --- a/contracts/zkSync/EscrowDstZkSync.sol +++ b/contracts/zkSync/EscrowDstZkSync.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { Escrow, EscrowDst } from "contracts/EscrowDst.sol"; import { EscrowZkSync } from "contracts/zkSync/EscrowZkSync.sol"; diff --git a/contracts/zkSync/EscrowFactoryZkSync.sol b/contracts/zkSync/EscrowFactoryZkSync.sol index 62d6781..9335136 100644 --- a/contracts/zkSync/EscrowFactoryZkSync.sol +++ b/contracts/zkSync/EscrowFactoryZkSync.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { IERC20 } from "openzeppelin-contracts/token/ERC20/IERC20.sol"; import { BaseExtension } from "limit-order-settlement/extensions/BaseExtension.sol"; diff --git a/contracts/zkSync/EscrowSrcZkSync.sol b/contracts/zkSync/EscrowSrcZkSync.sol index 947f136..c0d80ee 100644 --- a/contracts/zkSync/EscrowSrcZkSync.sol +++ b/contracts/zkSync/EscrowSrcZkSync.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { Escrow, EscrowSrc } from "contracts/EscrowSrc.sol"; import { EscrowZkSync } from "contracts/zkSync/EscrowZkSync.sol"; diff --git a/contracts/zkSync/EscrowZkSync.sol b/contracts/zkSync/EscrowZkSync.sol index b88d77e..2ca889b 100644 --- a/contracts/zkSync/EscrowZkSync.sol +++ b/contracts/zkSync/EscrowZkSync.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { BaseEscrow } from "contracts/BaseEscrow.sol"; diff --git a/contracts/zkSync/MinimalProxyZkSync.sol b/contracts/zkSync/MinimalProxyZkSync.sol index efb9115..8035dda 100644 --- a/contracts/zkSync/MinimalProxyZkSync.sol +++ b/contracts/zkSync/MinimalProxyZkSync.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; contract MinimalProxyZkSync { address private immutable _IMPLEMENTATION; diff --git a/lib/limit-order-protocol b/lib/limit-order-protocol index 91ad5df..05e3c14 160000 --- a/lib/limit-order-protocol +++ b/lib/limit-order-protocol @@ -1 +1 @@ -Subproject commit 91ad5df63fbcf6154ed409558b0a207edd7826c7 +Subproject commit 05e3c14a9dd015e6b6dcf692ec9a11cd1c0d92ce diff --git a/lib/limit-order-settlement b/lib/limit-order-settlement index cb66919..3e7d524 160000 --- a/lib/limit-order-settlement +++ b/lib/limit-order-settlement @@ -1 +1 @@ -Subproject commit cb66919fa3bdb54631b22265c2fa77501e480b54 +Subproject commit 3e7d524fcf7c6235f3f3abdcc27eb61acb640d62 diff --git a/test/integration/EscrowFactory.t.sol b/test/integration/EscrowFactory.t.sol index aaf7b39..2f5c9aa 100644 --- a/test/integration/EscrowFactory.t.sol +++ b/test/integration/EscrowFactory.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { IEscrowFactory } from "contracts/interfaces/IEscrowFactory.sol"; import { IBaseEscrow } from "contracts/interfaces/IBaseEscrow.sol"; diff --git a/test/integration/MerkleStorageInvalidator.t.sol b/test/integration/MerkleStorageInvalidator.t.sol index dad8305..4307888 100644 --- a/test/integration/MerkleStorageInvalidator.t.sol +++ b/test/integration/MerkleStorageInvalidator.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { Merkle } from "murky/src/Merkle.sol"; diff --git a/test/integration/ResolverMock.t.sol b/test/integration/ResolverMock.t.sol index 5cc39d7..aef1b4d 100644 --- a/test/integration/ResolverMock.t.sol +++ b/test/integration/ResolverMock.t.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { IBaseEscrow } from "contracts/interfaces/IBaseEscrow.sol"; import { IEscrowDst } from "contracts/interfaces/IEscrowDst.sol"; diff --git a/test/libraries/TimelocksLib.t.sol b/test/libraries/TimelocksLib.t.sol index 8d593da..d8f504a 100644 --- a/test/libraries/TimelocksLib.t.sol +++ b/test/libraries/TimelocksLib.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { stdError } from "forge-std/StdError.sol"; diff --git a/test/unit/Escrow.t.sol b/test/unit/Escrow.t.sol index d09aa60..50a2a80 100644 --- a/test/unit/Escrow.t.sol +++ b/test/unit/Escrow.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { Address } from "solidity-utils/libraries/AddressLib.sol"; diff --git a/test/unit/EscrowFactory.t.sol b/test/unit/EscrowFactory.t.sol index 709415b..ffd4d74 100644 --- a/test/unit/EscrowFactory.t.sol +++ b/test/unit/EscrowFactory.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { ResolverValidationExtension } from "limit-order-settlement/extensions/ResolverValidationExtension.sol"; import { Merkle } from "murky/src/Merkle.sol"; diff --git a/test/unit/MerkleStorageInvalidator.t.sol b/test/unit/MerkleStorageInvalidator.t.sol index 91ec84e..c92562f 100644 --- a/test/unit/MerkleStorageInvalidator.t.sol +++ b/test/unit/MerkleStorageInvalidator.t.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { Merkle } from "murky/src/Merkle.sol"; diff --git a/test/utils/BaseSetup.sol b/test/utils/BaseSetup.sol index 55a2db3..fddab80 100644 --- a/test/utils/BaseSetup.sol +++ b/test/utils/BaseSetup.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { Test } from "forge-std/Test.sol"; diff --git a/test/utils/libraries/TimelocksSettersLib.sol b/test/utils/libraries/TimelocksSettersLib.sol index 1a3e204..d4dae9f 100644 --- a/test/utils/libraries/TimelocksSettersLib.sol +++ b/test/utils/libraries/TimelocksSettersLib.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { Timelocks, TimelocksLib } from "contracts/libraries/TimelocksLib.sol"; diff --git a/test/utils/mocks/TimelocksLibMock.sol b/test/utils/mocks/TimelocksLibMock.sol index e80b2f7..94d1e55 100644 --- a/test/utils/mocks/TimelocksLibMock.sol +++ b/test/utils/mocks/TimelocksLibMock.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { Timelocks, TimelocksLib } from "contracts/libraries/TimelocksLib.sol";