From 55094f4aa9afbde4b43be9af3fa87bfde448b0b0 Mon Sep 17 00:00:00 2001 From: Siddharth2207 Date: Mon, 12 Aug 2024 19:18:29 +0530 Subject: [PATCH] bump dep --- flake.lock | 24 ++++++++++++------------ lib/h20.test-std | 2 +- test/StopLimitTest.t.sol | 17 +++++++---------- test/Trireme/DcaUniV2Test.t.sol | 12 ++++++------ test/WlthTrancheInitTest.t.sol | 12 ++++++------ 5 files changed, 32 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index cacb66b..6ba133d 100644 --- a/flake.lock +++ b/flake.lock @@ -75,11 +75,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1719997877, - "narHash": "sha256-/Edw+w0PiGgxwnCeJycM0VgH4HtlCi91v1d8xbi+REE=", + "lastModified": 1722676286, + "narHash": "sha256-wEDJdvwRZF2ErQ33nQ0Lqn/48XrPbaadv56/bM2MSZU=", "owner": "shazow", "repo": "foundry.nix", - "rev": "02febba4f1cf0606d790acdb24adcf7a64afb4e1", + "rev": "d84c83b1c1722c8742b3d2d84c9386814d75384e", "type": "github" }, "original": { @@ -105,11 +105,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1720771713, - "narHash": "sha256-bfsLhD3deWYECwvo3b8AQPQkdx0Pqu3Qyds5UP6a2x0=", + "lastModified": 1723043047, + "narHash": "sha256-s6LBVajxwWulSiFYRmxfGFHTlyiy1+lHGbW0nCOTPRk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2977213b607671ed2d9b8a935eb55ae998dbb964", + "rev": "4e8f8f13e64d2795384ed17679bf193987a1f731", "type": "github" }, "original": { @@ -159,11 +159,11 @@ "solc": "solc" }, "locked": { - "lastModified": 1720772500, - "narHash": "sha256-UFqI1xkg01ZddqOqJmUz3rG2jE4DusR9IwFcAbiCQ6M=", + "lastModified": 1723043648, + "narHash": "sha256-DZCGdrjDRjjKF2BuPCqGb7H8guYA7uWsCeOT30tUWrk=", "owner": "rainprotocol", "repo": "rainix", - "rev": "eeb91c191c4b94b0a1716b3dd9956372a092474c", + "rev": "6baf112368cb17b44233b5fce6848aa0cc2d36d6", "type": "github" }, "original": { @@ -183,11 +183,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1720750737, - "narHash": "sha256-hPXe9Pr3s2EKRdDki3UkCKoPGlNkOhplCooNoC/L7Qc=", + "lastModified": 1722997267, + "narHash": "sha256-8Pncp8IKd0f0N711CRrCGTC4iLfBE+/5kaMqyWxnYic=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a17c5d38c6fe47880eb8c6bede15d943ac2c4d17", + "rev": "d720bf3cebac38c2426d77ee2e59943012854cb8", "type": "github" }, "original": { diff --git a/lib/h20.test-std b/lib/h20.test-std index fb87717..b5a5adf 160000 --- a/lib/h20.test-std +++ b/lib/h20.test-std @@ -1 +1 @@ -Subproject commit fb87717bf959ad73b4438518c83d75da4ecbcea8 +Subproject commit b5a5adf82427051a8f4876477c1442722b5c2586 diff --git a/test/StopLimitTest.t.sol b/test/StopLimitTest.t.sol index d1ad6d8..c9d72b5 100644 --- a/test/StopLimitTest.t.sol +++ b/test/StopLimitTest.t.sol @@ -5,7 +5,7 @@ import {console2, Test} from "forge-std/Test.sol"; import { IOrderBookV3, IO -} from "rain.orderbook.interface/interface/IOrderBookV3.sol"; +} from "rain.orderbook.interface/interface/deprecated/v3/IOrderBookV3.sol"; import { IOrderBookV4, OrderV3, @@ -13,16 +13,13 @@ import { TakeOrderConfigV3, TakeOrdersConfigV3, ActionV1 -} from "rain.orderbook.interface/interface/unstable/IOrderBookV4.sol"; +} from "rain.orderbook.interface/interface/IOrderBookV4.sol"; -import {IParserV2} from "rain.interpreter.interface/interface/unstable/IParserV2.sol"; -import {IOrderBookV4ArbOrderTaker} from "rain.orderbook.interface/interface/unstable/IOrderBookV4ArbOrderTaker.sol"; +import {IParserV2} from "rain.interpreter.interface/interface/IParserV2.sol"; +import {IOrderBookV4ArbOrderTaker} from "rain.orderbook.interface/interface/IOrderBookV4ArbOrderTaker.sol"; -// import {IOrderBookV3ArbOrderTaker} from "rain.orderbook.interface/interface/IOrderBookV3ArbOrderTaker.sol"; -// import {IParserV1} from "rain.interpreter.interface/interface/IParserV1.sol"; -import {IExpressionDeployerV3} from "rain.interpreter.interface/interface/IExpressionDeployerV3.sol"; -// import {IInterpreterV2} from "rain.interpreter.interface/interface/IInterpreterV2.sol"; -import {IInterpreterV3} from "rain.interpreter.interface/interface/unstable/IInterpreterV3.sol"; +import {IExpressionDeployerV3} from "rain.interpreter.interface/interface/deprecated/IExpressionDeployerV3.sol"; +import {IInterpreterV3} from "rain.interpreter.interface/interface/IInterpreterV3.sol"; import {IInterpreterStoreV2} from "rain.interpreter.interface/interface/IInterpreterStoreV2.sol"; import {StrategyTests, IRouteProcessor, LibStrategyDeployment, LibComposeOrders,IInterpreterV3} from "h20.test-std/StrategyTests.sol"; import {Strings} from "openzeppelin-contracts/contracts/utils/Strings.sol"; @@ -51,7 +48,7 @@ contract StopLimitTest is StrategyTests { using SafeERC20 for IERC20; using Strings for address; - uint256 constant FORK_BLOCK_NUMBER = 17308087; + uint256 constant FORK_BLOCK_NUMBER = 18339410; function selectFork() internal { uint256 fork = vm.createFork(vm.envString("RPC_URL_BASE")); diff --git a/test/Trireme/DcaUniV2Test.t.sol b/test/Trireme/DcaUniV2Test.t.sol index 39ca52c..4fcda20 100644 --- a/test/Trireme/DcaUniV2Test.t.sol +++ b/test/Trireme/DcaUniV2Test.t.sol @@ -5,7 +5,7 @@ import {console2, Test} from "forge-std/Test.sol"; import { IOrderBookV3, IO -} from "rain.orderbook.interface/interface/IOrderBookV3.sol"; +} from "rain.orderbook.interface/interface/deprecated/v3/IOrderBookV3.sol"; import { IOrderBookV4, OrderV3, @@ -13,11 +13,11 @@ import { TakeOrderConfigV3, TakeOrdersConfigV3, ActionV1 -} from "rain.orderbook.interface/interface/unstable/IOrderBookV4.sol"; -import {IParserV2} from "rain.interpreter.interface/interface/unstable/IParserV2.sol"; -import {IOrderBookV4ArbOrderTaker} from "rain.orderbook.interface/interface/unstable/IOrderBookV4ArbOrderTaker.sol"; -import {IExpressionDeployerV3} from "rain.interpreter.interface/interface/IExpressionDeployerV3.sol"; -import {IInterpreterV3} from "rain.interpreter.interface/interface/unstable/IInterpreterV3.sol"; +} from "rain.orderbook.interface/interface/IOrderBookV4.sol"; +import {IParserV2} from "rain.interpreter.interface/interface/IParserV2.sol"; +import {IOrderBookV4ArbOrderTaker} from "rain.orderbook.interface/interface/IOrderBookV4ArbOrderTaker.sol"; +import {IExpressionDeployerV3} from "rain.interpreter.interface/interface/deprecated/IExpressionDeployerV3.sol"; +import {IInterpreterV3} from "rain.interpreter.interface/interface/IInterpreterV3.sol"; import {IInterpreterStoreV2} from "rain.interpreter.interface/interface/IInterpreterStoreV2.sol"; import {StrategyTests, IRouteProcessor, LibStrategyDeployment, LibComposeOrders,IInterpreterV3} from "h20.test-std/StrategyTests.sol"; import {Strings} from "openzeppelin-contracts/contracts/utils/Strings.sol"; diff --git a/test/WlthTrancheInitTest.t.sol b/test/WlthTrancheInitTest.t.sol index 2be746d..d6c76cb 100644 --- a/test/WlthTrancheInitTest.t.sol +++ b/test/WlthTrancheInitTest.t.sol @@ -5,7 +5,7 @@ import {console2, Test} from "forge-std/Test.sol"; import { IOrderBookV3, IO -} from "rain.orderbook.interface/interface/IOrderBookV3.sol"; +} from "rain.orderbook.interface/interface/deprecated/v3/IOrderBookV3.sol"; import { IOrderBookV4, OrderV3, @@ -15,11 +15,11 @@ import { ActionV1, EvaluableV3, SignedContextV1 -} from "rain.orderbook.interface/interface/unstable/IOrderBookV4.sol"; -import {IParserV2} from "rain.interpreter.interface/interface/unstable/IParserV2.sol"; -import {IOrderBookV4ArbOrderTaker} from "rain.orderbook.interface/interface/unstable/IOrderBookV4ArbOrderTaker.sol"; -import {IExpressionDeployerV3} from "rain.interpreter.interface/interface/IExpressionDeployerV3.sol"; -import {IInterpreterV3} from "rain.interpreter.interface/interface/unstable/IInterpreterV3.sol"; +} from "rain.orderbook.interface/interface/IOrderBookV4.sol"; +import {IParserV2} from "rain.interpreter.interface/interface/IParserV2.sol"; +import {IOrderBookV4ArbOrderTaker} from "rain.orderbook.interface/interface/IOrderBookV4ArbOrderTaker.sol"; +import {IExpressionDeployerV3} from "rain.interpreter.interface/interface/deprecated/IExpressionDeployerV3.sol"; +import {IInterpreterV3} from "rain.interpreter.interface/interface/IInterpreterV3.sol"; import {IInterpreterStoreV2} from "rain.interpreter.interface/interface/IInterpreterStoreV2.sol"; import {StrategyTests, IRouteProcessor, LibStrategyDeployment, LibComposeOrders,IInterpreterV3} from "h20.test-std/StrategyTests.sol"; import {Strings} from "openzeppelin-contracts/contracts/utils/Strings.sol";