diff --git a/.gas-snapshot b/.gas-snapshot index ae0be3b..18dd8ef 100644 --- a/.gas-snapshot +++ b/.gas-snapshot @@ -1,76 +1,76 @@ -EscrowFactoryTest:test_MultipleFillsInvalidKey() (gas: 474076) -EscrowFactoryTest:test_MultipleFillsInvalidSecretsAmount() (gas: 473718) -EscrowFactoryTest:test_NoDeploymentForNotResolver() (gas: 190780) -EscrowFactoryTest:test_NoInsufficientBalanceDeploymentForMaker() (gas: 128460) -EscrowFactoryTest:test_NoInsufficientBalanceDeploymentForTaker() (gas: 27118) -EscrowFactoryTest:test_NoInsufficientBalanceNativeDeploymentForMaker() (gas: 121696) -EscrowFactoryTest:test_NoInsufficientBalanceNativeDeploymentForTaker() (gas: 27377) -EscrowFactoryTest:test_NoUnsafeDeploymentForTaker() (gas: 34495) -EscrowTest:test_CancelDst() (gas: 116126) -EscrowTest:test_CancelDstDifferentTarget() (gas: 143384) -EscrowTest:test_CancelDstWithNativeToken() (gas: 93710) -EscrowTest:test_CancelPublicSrc() (gas: 165464) -EscrowTest:test_CancelResolverSrc() (gas: 168607) -EscrowTest:test_CancelResolverSrcReceiver() (gas: 179361) -EscrowTest:test_NoAnyoneCancelDuringResolverCancelSrc() (gas: 163856) -EscrowTest:test_NoCallsWithInvalidImmutables() (gas: 286518) -EscrowTest:test_NoCancelByAnyoneDst() (gas: 121726) -EscrowTest:test_NoCancelDuringWithdrawalDst() (gas: 121486) -EscrowTest:test_NoCancelDuringWithdrawalSrc() (gas: 164001) -EscrowTest:test_NoFailedNativeTokenTransferCancelSrc() (gas: 179339) -EscrowTest:test_NoFailedNativeTokenTransferWithdrawalDst() (gas: 154544) -EscrowTest:test_NoFailedNativeTokenTransferWithdrawalSrc() (gas: 312329) -EscrowTest:test_NoPublicCancelDuringPrivateCancellationSrc() (gas: 163166) -EscrowTest:test_NoPublicWithdrawOutsideOfAllowedPeriodDst() (gas: 126910) -EscrowTest:test_NoPublicWithdrawalOutsideOfAllowedPeriodSrc() (gas: 169085) -EscrowTest:test_NoRescueFundsByAnyoneDst() (gas: 176370) -EscrowTest:test_NoRescueFundsByAnyoneSrc() (gas: 209064) -EscrowTest:test_NoRescueFundsEarlierDst() (gas: 175780) -EscrowTest:test_NoRescueFundsEarlierSrc() (gas: 209041) -EscrowTest:test_NoRevertFailedNativeTokenTransferWithdrawalDstNative() (gas: 91111) -EscrowTest:test_NoWithdrawalByAnyoneSrc() (gas: 160873) -EscrowTest:test_NoWithdrawalByNonResolverDst() (gas: 121439) -EscrowTest:test_NoWithdrawalOutsideOfAllowedPeriodDst() (gas: 126326) -EscrowTest:test_NoWithdrawalOutsideOfAllowedPeriodSrc() (gas: 169636) -EscrowTest:test_NoWithdrawalWithWrongSecretDst() (gas: 122776) -EscrowTest:test_NoWithdrawalWithWrongSecretSrc() (gas: 164478) -EscrowTest:test_PublicWithdrawSrc() (gas: 181745) -EscrowTest:test_RescueFundsDst() (gas: 158304) -EscrowTest:test_RescueFundsDstNative() (gas: 186735) -EscrowTest:test_RescueFundsSrc() (gas: 195445) -EscrowTest:test_RescueFundsSrcNative() (gas: 197742) -EscrowTest:test_WithdrawByAnyoneDst() (gas: 141326) -EscrowTest:test_WithdrawByResolverDst() (gas: 142389) -EscrowTest:test_WithdrawByResolverDstNative() (gas: 97831) -EscrowTest:test_WithdrawByResolverPublicDst() (gas: 141757) -EscrowTest:test_WithdrawSrc() (gas: 186505) -EscrowTest:test_WithdrawSrcTo() (gas: 191335) -IntegrationEscrowFactoryTest:test_DeployCloneForMakerNonWhitelistedResolverInt() (gas: 473542) -IntegrationEscrowFactoryTest:test_NoInsufficientBalanceDeploymentForMakerInt() (gas: 341264) -IntegrationEscrowFactoryTest:test_NoResolverReentrancy() (gas: 2065187) -IntegrationResolverMockTest:test_MockCancelDst() (gas: 157184) -IntegrationResolverMockTest:test_MockCancelSrc() (gas: 353957) -IntegrationResolverMockTest:test_MockDeployDst() (gas: 151470) -IntegrationResolverMockTest:test_MockDeploySrc() (gas: 364921) -IntegrationResolverMockTest:test_MockPublicCancelSrc() (gas: 392459) -IntegrationResolverMockTest:test_MockPublicWithdrawDst() (gas: 164841) -IntegrationResolverMockTest:test_MockRescueFundsDst() (gas: 161103) -IntegrationResolverMockTest:test_MockRescueFundsSrc() (gas: 382583) -IntegrationResolverMockTest:test_MockWithdrawDst() (gas: 182912) -IntegrationResolverMockTest:test_MockWithdrawToSrc() (gas: 354839) -MerkleStorageInvalidatorIntTest:test_MultipleFillsFillAllExtra() (gas: 923576) -MerkleStorageInvalidatorIntTest:test_MultipleFillsFillAllFromLast() (gas: 922329) -MerkleStorageInvalidatorIntTest:test_MultipleFillsFillAllTwoFills() (gas: 922136) -MerkleStorageInvalidatorIntTest:test_MultipleFillsFillFirst() (gas: 707638) -MerkleStorageInvalidatorIntTest:test_MultipleFillsFillFirstTwoFills() (gas: 932969) -MerkleStorageInvalidatorIntTest:test_MultipleFillsFillLast() (gas: 707297) -MerkleStorageInvalidatorIntTest:test_MultipleFillsNoDeploymentWithoutValidation() (gas: 301343) -MerkleStorageInvalidatorIntTest:test_MultipleFillsNoReuseOfSecrets() (gas: 1069228) -MerkleStorageInvalidatorIntTest:test_MultipleFillsNoSecondDeploymentWithTheSameIndex() (gas: 786011) -MerkleStorageInvalidatorIntTest:test_MultipleFillsOddDivision() (gas: 444783) -MerkleStorageInvalidatorIntTest:test_MultipleFillsOneFill() (gas: 707674) -MerkleStorageInvalidatorIntTest:test_MultipleFillsTwoFills() (gas: 921440) -MerkleStorageInvalidatorTest:test_ShortenedProofIsNotValid() (gas: 230605) -TimelocksLibTest:test_NoTimelocksOverflow() (gas: 156200) -TimelocksLibTest:test_getStartTimestamps() (gas: 16207) -TimelocksLibTest:test_setDeployedAt() (gas: 5741) \ No newline at end of file +EscrowFactoryTest:test_MultipleFillsInvalidKey() (gas: 473796) +EscrowFactoryTest:test_MultipleFillsInvalidSecretsAmount() (gas: 473443) +EscrowFactoryTest:test_NoDeploymentForNotResolver() (gas: 190928) +EscrowFactoryTest:test_NoInsufficientBalanceDeploymentForMaker() (gas: 128646) +EscrowFactoryTest:test_NoInsufficientBalanceDeploymentForTaker() (gas: 27300) +EscrowFactoryTest:test_NoInsufficientBalanceNativeDeploymentForMaker() (gas: 121868) +EscrowFactoryTest:test_NoInsufficientBalanceNativeDeploymentForTaker() (gas: 27584) +EscrowFactoryTest:test_NoUnsafeDeploymentForTaker() (gas: 34715) +EscrowTest:test_CancelDst() (gas: 116189) +EscrowTest:test_CancelDstDifferentTarget() (gas: 143467) +EscrowTest:test_CancelDstWithNativeToken() (gas: 93925) +EscrowTest:test_CancelPublicSrc() (gas: 165620) +EscrowTest:test_CancelResolverSrc() (gas: 168809) +EscrowTest:test_CancelResolverSrcReceiver() (gas: 179666) +EscrowTest:test_NoAnyoneCancelDuringResolverCancelSrc() (gas: 164021) +EscrowTest:test_NoCallsWithInvalidImmutables() (gas: 286953) +EscrowTest:test_NoCancelByAnyoneDst() (gas: 121872) +EscrowTest:test_NoCancelDuringWithdrawalDst() (gas: 121638) +EscrowTest:test_NoCancelDuringWithdrawalSrc() (gas: 164184) +EscrowTest:test_NoFailedNativeTokenTransferCancelSrc() (gas: 179533) +EscrowTest:test_NoFailedNativeTokenTransferWithdrawalDst() (gas: 154705) +EscrowTest:test_NoFailedNativeTokenTransferWithdrawalSrc() (gas: 316325) +EscrowTest:test_NoPublicCancelDuringPrivateCancellationSrc() (gas: 163352) +EscrowTest:test_NoPublicWithdrawOutsideOfAllowedPeriodDst() (gas: 127149) +EscrowTest:test_NoPublicWithdrawalOutsideOfAllowedPeriodSrc() (gas: 169300) +EscrowTest:test_NoRescueFundsByAnyoneDst() (gas: 176500) +EscrowTest:test_NoRescueFundsByAnyoneSrc() (gas: 209242) +EscrowTest:test_NoRescueFundsEarlierDst() (gas: 175831) +EscrowTest:test_NoRescueFundsEarlierSrc() (gas: 209130) +EscrowTest:test_NoRevertFailedNativeTokenTransferWithdrawalDstNative() (gas: 91213) +EscrowTest:test_NoWithdrawalByAnyoneSrc() (gas: 161034) +EscrowTest:test_NoWithdrawalByNonResolverDst() (gas: 121582) +EscrowTest:test_NoWithdrawalOutsideOfAllowedPeriodDst() (gas: 126503) +EscrowTest:test_NoWithdrawalOutsideOfAllowedPeriodSrc() (gas: 169879) +EscrowTest:test_NoWithdrawalWithWrongSecretDst() (gas: 122907) +EscrowTest:test_NoWithdrawalWithWrongSecretSrc() (gas: 164694) +EscrowTest:test_PublicWithdrawSrc() (gas: 181873) +EscrowTest:test_RescueFundsDst() (gas: 158322) +EscrowTest:test_RescueFundsDstNative() (gas: 186831) +EscrowTest:test_RescueFundsSrc() (gas: 195582) +EscrowTest:test_RescueFundsSrcNative() (gas: 197954) +EscrowTest:test_WithdrawByAnyoneDst() (gas: 141408) +EscrowTest:test_WithdrawByResolverDst() (gas: 142466) +EscrowTest:test_WithdrawByResolverDstNative() (gas: 97997) +EscrowTest:test_WithdrawByResolverPublicDst() (gas: 141834) +EscrowTest:test_WithdrawSrc() (gas: 186740) +EscrowTest:test_WithdrawSrcTo() (gas: 191491) +IntegrationEscrowFactoryTest:test_DeployCloneForMakerNonWhitelistedResolverInt() (gas: 473910) +IntegrationEscrowFactoryTest:test_NoInsufficientBalanceDeploymentForMakerInt() (gas: 341734) +IntegrationEscrowFactoryTest:test_NoResolverReentrancy() (gas: 2086431) +IntegrationResolverMockTest:test_MockCancelDst() (gas: 157289) +IntegrationResolverMockTest:test_MockCancelSrc() (gas: 354064) +IntegrationResolverMockTest:test_MockDeployDst() (gas: 151629) +IntegrationResolverMockTest:test_MockDeploySrc() (gas: 365146) +IntegrationResolverMockTest:test_MockPublicCancelSrc() (gas: 393216) +IntegrationResolverMockTest:test_MockPublicWithdrawDst() (gas: 165004) +IntegrationResolverMockTest:test_MockRescueFundsDst() (gas: 161196) +IntegrationResolverMockTest:test_MockRescueFundsSrc() (gas: 382676) +IntegrationResolverMockTest:test_MockWithdrawDst() (gas: 183052) +IntegrationResolverMockTest:test_MockWithdrawToSrc() (gas: 354992) +MerkleStorageInvalidatorIntTest:test_MultipleFillsFillAllExtra() (gas: 922908) +MerkleStorageInvalidatorIntTest:test_MultipleFillsFillAllFromLast() (gas: 921583) +MerkleStorageInvalidatorIntTest:test_MultipleFillsFillAllTwoFills() (gas: 921484) +MerkleStorageInvalidatorIntTest:test_MultipleFillsFillFirst() (gas: 707400) +MerkleStorageInvalidatorIntTest:test_MultipleFillsFillFirstTwoFills() (gas: 932260) +MerkleStorageInvalidatorIntTest:test_MultipleFillsFillLast() (gas: 707022) +MerkleStorageInvalidatorIntTest:test_MultipleFillsNoDeploymentWithoutValidation() (gas: 302166) +MerkleStorageInvalidatorIntTest:test_MultipleFillsNoReuseOfSecrets() (gas: 1071882) +MerkleStorageInvalidatorIntTest:test_MultipleFillsNoSecondDeploymentWithTheSameIndex() (gas: 786338) +MerkleStorageInvalidatorIntTest:test_MultipleFillsOddDivision() (gas: 445732) +MerkleStorageInvalidatorIntTest:test_MultipleFillsOneFill() (gas: 707661) +MerkleStorageInvalidatorIntTest:test_MultipleFillsTwoFills() (gas: 921371) +MerkleStorageInvalidatorTest:test_ShortenedProofIsNotValid() (gas: 231215) +TimelocksLibTest:test_NoTimelocksOverflow() (gas: 156354) +TimelocksLibTest:test_getStartTimestamps() (gas: 15888) +TimelocksLibTest:test_setDeployedAt() (gas: 5711) \ No newline at end of file diff --git a/contracts/BaseEscrow.sol b/contracts/BaseEscrow.sol index 6333f6b..248756b 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/contracts/token/ERC20/IERC20.sol"; import { AddressLib, Address } from "solidity-utils/contracts/libraries/AddressLib.sol"; diff --git a/contracts/BaseEscrowFactory.sol b/contracts/BaseEscrowFactory.sol index aed6835..81fc1df 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/contracts/proxy/Clones.sol"; import { IERC20 } from "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol"; diff --git a/contracts/Escrow.sol b/contracts/Escrow.sol index a018c9d..02f8790 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/contracts/utils/Create2.sol"; diff --git a/contracts/EscrowDst.sol b/contracts/EscrowDst.sol index ba6f178..6e29a73 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/contracts/token/ERC20/IERC20.sol"; import { SafeERC20 } from "solidity-utils/contracts/libraries/SafeERC20.sol"; diff --git a/contracts/EscrowFactory.sol b/contracts/EscrowFactory.sol index 7cd04ce..b095379 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/contracts/token/ERC20/IERC20.sol"; diff --git a/contracts/EscrowFactoryContext.sol b/contracts/EscrowFactoryContext.sol index 23e17af..a9ea0aa 100644 --- a/contracts/EscrowFactoryContext.sol +++ b/contracts/EscrowFactoryContext.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; uint256 constant SRC_IMMUTABLES_LENGTH = 160; diff --git a/contracts/EscrowSrc.sol b/contracts/EscrowSrc.sol index 3dbc7fd..8a8ad03 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/contracts/token/ERC20/IERC20.sol"; import { SafeERC20 } from "solidity-utils/contracts/libraries/SafeERC20.sol"; diff --git a/contracts/MerkleStorageInvalidator.sol b/contracts/MerkleStorageInvalidator.sol index 1fe24e0..90547eb 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/contracts/interfaces/IOrderMixin.sol"; import { ExtensionLib } from "limit-order-protocol/contracts/libraries/ExtensionLib.sol"; diff --git a/contracts/interfaces/IMerkleStorageInvalidator.sol b/contracts/interfaces/IMerkleStorageInvalidator.sol index 5b6a075..31f02a5 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/IResolverExample.sol b/contracts/interfaces/IResolverExample.sol index ad03888..9f8e799 100644 --- a/contracts/interfaces/IResolverExample.sol +++ b/contracts/interfaces/IResolverExample.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/contracts/interfaces/IOrderMixin.sol"; import { TakerTraits } from "limit-order-protocol/contracts/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 6e7aa85..f2e2380 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/contracts/libraries/RevertReasonForwarder.sol"; diff --git a/contracts/mocks/ResolverExample.sol b/contracts/mocks/ResolverExample.sol index ef851ce..c69db4c 100644 --- a/contracts/mocks/ResolverExample.sol +++ b/contracts/mocks/ResolverExample.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { Ownable } from "openzeppelin-contracts/contracts/access/Ownable.sol"; diff --git a/contracts/zkSync/EscrowDstZkSync.sol b/contracts/zkSync/EscrowDstZkSync.sol index c075be2..fbf411d 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 "../EscrowDst.sol"; import { EscrowZkSync } from "./EscrowZkSync.sol"; diff --git a/contracts/zkSync/EscrowFactoryZkSync.sol b/contracts/zkSync/EscrowFactoryZkSync.sol index 5bb7fca..6210d1a 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/contracts/token/ERC20/IERC20.sol"; import { BaseExtension } from "limit-order-settlement/contracts/extensions/BaseExtension.sol"; diff --git a/contracts/zkSync/EscrowSrcZkSync.sol b/contracts/zkSync/EscrowSrcZkSync.sol index 1723679..f9feddf 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 "../EscrowSrc.sol"; import { EscrowZkSync } from "./EscrowZkSync.sol"; diff --git a/contracts/zkSync/EscrowZkSync.sol b/contracts/zkSync/EscrowZkSync.sol index 38e62c4..10601b9 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 "../BaseEscrow.sol"; diff --git a/contracts/zkSync/MinimalProxyZkSync.sol b/contracts/zkSync/MinimalProxyZkSync.sol index 7f29bd7..241ff5c 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; /// @custom:security-contact security@1inch.io contract MinimalProxyZkSync { 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 20d7bdd..2fc697a 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 { TakerTraits } from "limit-order-protocol/contracts/libraries/TakerTraitsLib.sol"; import { Merkle } from "murky/src/Merkle.sol"; diff --git a/test/integration/MerkleStorageInvalidator.t.sol b/test/integration/MerkleStorageInvalidator.t.sol index a11913a..6b28198 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 { TakerTraits } from "limit-order-protocol/contracts/libraries/TakerTraitsLib.sol"; import { Merkle } from "murky/src/Merkle.sol"; diff --git a/test/integration/ResolverMock.t.sol b/test/integration/ResolverMock.t.sol index 357c284..d6e9d50 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 { TakerTraits } from "limit-order-protocol/contracts/libraries/TakerTraitsLib.sol"; import { IBaseEscrow } from "contracts/interfaces/IBaseEscrow.sol"; diff --git a/test/libraries/TimelocksLib.t.sol b/test/libraries/TimelocksLib.t.sol index 592cc99..1f43879 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 { IBaseEscrow } from "contracts/interfaces/IBaseEscrow.sol"; import { IEscrowDst } from "contracts/interfaces/IEscrowDst.sol"; diff --git a/test/unit/Escrow.t.sol b/test/unit/Escrow.t.sol index da778d3..bfb42ff 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/contracts/libraries/AddressLib.sol"; diff --git a/test/unit/EscrowFactory.t.sol b/test/unit/EscrowFactory.t.sol index 93a92f2..d39cc5a 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/contracts/extensions/ResolverValidationExtension.sol"; import { Address } from "solidity-utils/contracts/libraries/AddressLib.sol"; diff --git a/test/unit/MerkleStorageInvalidator.t.sol b/test/unit/MerkleStorageInvalidator.t.sol index 27bd99a..cec797e 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 434e844..b536801 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/Utils.sol b/test/utils/Utils.sol index c7101e6..197f5fa 100644 --- a/test/utils/Utils.sol +++ b/test/utils/Utils.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { CommonBase } from "forge-std/Base.sol"; diff --git a/test/utils/libraries/CrossChainTestLib.sol b/test/utils/libraries/CrossChainTestLib.sol index 6da903c..b628a73 100644 --- a/test/utils/libraries/CrossChainTestLib.sol +++ b/test/utils/libraries/CrossChainTestLib.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { BaseEscrowFactory } from "../../../contracts/BaseEscrowFactory.sol"; import { EscrowSrc } from "../../../contracts/EscrowSrc.sol"; diff --git a/test/utils/libraries/TimelocksSettersLib.sol b/test/utils/libraries/TimelocksSettersLib.sol index 807f1a9..e3f8b65 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/ResolverReentrancy.sol b/test/utils/mocks/ResolverReentrancy.sol index 2b2626c..91049b0 100644 --- a/test/utils/mocks/ResolverReentrancy.sol +++ b/test/utils/mocks/ResolverReentrancy.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.23; +pragma solidity 0.8.26; import { Ownable } from "openzeppelin-contracts/contracts/access/Ownable.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";