bump dep

h20liquidity · Aug 13, 2024 · b43012d · b43012d
1 parent 90043dd
commit b43012d
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 34 deletions.
diff --git a/lib/h20.test-std b/lib/h20.test-std
diff --git a/strategies/dca-orcale-univ3.rain b/strategies/dca-orcale-univ3.rain
@@ -695,3 +695,6 @@ deployments:
     )
     "Partial trade"
   );
+
+#post-add-order
+ :;
diff --git a/strategies/multiple-limit.rain b/strategies/multiple-limit.rain
@@ -389,3 +389,6 @@ deployments:
   trade-count-key: hash(order-hash() count-key), 
   trade-count: get(trade-count-key), 
   :set(trade-count-key add(trade-count 1));
+
+#post-add-order
+ :;
diff --git a/strategies/trireme/dca-oracle-univ2.rain b/strategies/trireme/dca-oracle-univ2.rain
@@ -672,4 +672,7 @@ deployments:
       scale-n-dynamic(output-token-decimals() calculated-max-output())
     )
     "Partial trade"
-  );
+  );
+
+#post-add-order
+ :;
diff --git a/test/StopLimitTest.t.sol b/test/StopLimitTest.t.sol
@@ -12,7 +12,8 @@ import {
     OrderConfigV3,
     TakeOrderConfigV3,
     TakeOrdersConfigV3,
-    ActionV1
+    ActionV1,
+    SignedContextV1
 } from "rain.orderbook.interface/interface/IOrderBookV4.sol"; 
 
 import {IParserV2} from "rain.interpreter.interface/interface/IParserV2.sol";
@@ -79,7 +80,7 @@ contract StopLimitTest is StrategyTests {
         IO[] memory outputVaults = new IO[](1);
         outputVaults[0] = baseWlthIo();
 
-        LibStrategyDeployment.StrategyDeploymentV3 memory strategy = LibStrategyDeployment.StrategyDeploymentV3(
+        LibStrategyDeployment.StrategyDeploymentV4 memory strategy = LibStrategyDeployment.StrategyDeploymentV4(
             getEncodedBuyWlthRoute(),
             getEncodedSellWlthRoute(),
             0,
@@ -94,7 +95,7 @@ contract StopLimitTest is StrategyTests {
             "./lib/h20.test-std/lib/rain.orderbook/Cargo.toml",
             inputVaults,
             outputVaults,
-            new ActionV1[](0)
+            new SignedContextV1[](0)
         );
 
         OrderV3 memory order = addOrderDepositOutputTokens(strategy);
@@ -138,7 +139,7 @@ contract StopLimitTest is StrategyTests {
         IO[] memory outputVaults = new IO[](1);
         outputVaults[0] = baseUsdcIo();
 
-        LibStrategyDeployment.StrategyDeploymentV3 memory strategy = LibStrategyDeployment.StrategyDeploymentV3(
+        LibStrategyDeployment.StrategyDeploymentV4 memory strategy = LibStrategyDeployment.StrategyDeploymentV4(
             getEncodedSellWlthRoute(),
             getEncodedBuyWlthRoute(),
             0,
@@ -153,7 +154,7 @@ contract StopLimitTest is StrategyTests {
             "./lib/h20.test-std/lib/rain.orderbook/Cargo.toml",
             inputVaults,
             outputVaults,
-            new ActionV1[](0)
+            new SignedContextV1[](0)
         );
 
         OrderV3 memory order = addOrderDepositOutputTokens(strategy);

diff --git a/test/Trireme/DcaUniV2Test.t.sol b/test/Trireme/DcaUniV2Test.t.sol
@@ -12,7 +12,8 @@ import {
     OrderConfigV3,
     TakeOrderConfigV3,
     TakeOrdersConfigV3,
-    ActionV1
+    ActionV1,
+    SignedContextV1
 } 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";
@@ -79,7 +80,7 @@ contract DcaUniV2Test is StrategyTests {
         uint256 expectedRatio = 7.546679062155744054e18;
         uint256 expectedAmount = 1.448940071037488020e18;
 
-        LibStrategyDeployment.StrategyDeploymentV3 memory strategy = LibStrategyDeployment.StrategyDeploymentV3(
+        LibStrategyDeployment.StrategyDeploymentV4 memory strategy = LibStrategyDeployment.StrategyDeploymentV4(
             getEncodedSellZercRoute(),
             getEncodedBuyZercRoute(),
             0,
@@ -94,7 +95,7 @@ contract DcaUniV2Test is StrategyTests {
             "./lib/h20.test-std/lib/rain.orderbook/Cargo.toml",
             inputVaults,
             outputVaults,
-            new ActionV1[](0)
+            new SignedContextV1[](0)
         );
 
         OrderV3 memory order = addOrderDepositOutputTokens(strategy);
@@ -124,7 +125,7 @@ contract DcaUniV2Test is StrategyTests {
         uint256 expectedRatio = 0.107731681330498142e18;
         uint256 expectedAmount = 11.591520568299904160e18;
 
-        LibStrategyDeployment.StrategyDeploymentV3 memory strategy = LibStrategyDeployment.StrategyDeploymentV3(
+        LibStrategyDeployment.StrategyDeploymentV4 memory strategy = LibStrategyDeployment.StrategyDeploymentV4(
             getEncodedBuyZercRoute(),
             getEncodedSellZercRoute(),
             0,
@@ -139,7 +140,7 @@ contract DcaUniV2Test is StrategyTests {
             "./lib/h20.test-std/lib/rain.orderbook/Cargo.toml",
             inputVaults,
             outputVaults,
-            new ActionV1[](0)
+            new SignedContextV1[](0)
         );
 
         OrderV3 memory order = addOrderDepositOutputTokens(strategy);
@@ -165,7 +166,7 @@ contract DcaUniV2Test is StrategyTests {
         IO[] memory outputVaults = new IO[](1);
         outputVaults[0] = polygonUsdcIo();
 
-        LibStrategyDeployment.StrategyDeploymentV3 memory strategy = LibStrategyDeployment.StrategyDeploymentV3(
+        LibStrategyDeployment.StrategyDeploymentV4 memory strategy = LibStrategyDeployment.StrategyDeploymentV4(
             getEncodedSellZercRoute(),
             getEncodedBuyZercRoute(),
             0,
@@ -180,7 +181,7 @@ contract DcaUniV2Test is StrategyTests {
             "./lib/h20.test-std/lib/rain.orderbook/Cargo.toml",
             inputVaults,
             outputVaults,
-            new ActionV1[](0)
+            new SignedContextV1[](0)
         );
 
         OrderV3 memory order = addOrderDepositOutputTokens(strategy);
@@ -214,7 +215,7 @@ contract DcaUniV2Test is StrategyTests {
         IO[] memory outputVaults = new IO[](1);
         outputVaults[0] = polygonUsdcIo();
 
-        LibStrategyDeployment.StrategyDeploymentV3 memory strategy = LibStrategyDeployment.StrategyDeploymentV3(
+        LibStrategyDeployment.StrategyDeploymentV4 memory strategy = LibStrategyDeployment.StrategyDeploymentV4(
             getEncodedSellZercRoute(),
             getEncodedBuyZercRoute(),
             0,
@@ -229,7 +230,7 @@ contract DcaUniV2Test is StrategyTests {
             "./lib/h20.test-std/lib/rain.orderbook/Cargo.toml",
             inputVaults,
             outputVaults,
-            new ActionV1[](0)
+            new SignedContextV1[](0)
         );
 
         OrderV3 memory order = addOrderDepositOutputTokens(strategy);

diff --git a/test/WlthTrancheInitTest.t.sol b/test/WlthTrancheInitTest.t.sol
@@ -83,7 +83,7 @@ contract StopLimitTest is StrategyTests {
         uint256 expectedOrderAmount = 5.3e18;
 
 
-        LibStrategyDeployment.StrategyDeploymentV3 memory strategy = LibStrategyDeployment.StrategyDeploymentV3(
+        LibStrategyDeployment.StrategyDeploymentV4 memory strategy = LibStrategyDeployment.StrategyDeploymentV4(
             getEncodedSellWlthRoute(),
             getEncodedBuyWlthRoute(),
             0,
@@ -98,24 +98,8 @@ contract StopLimitTest is StrategyTests {
             "./lib/h20.test-std/lib/rain.orderbook/Cargo.toml",
             inputVaults,
             outputVaults,
-            new ActionV1[](0)
+            new SignedContextV1[](0)
         );
-        ActionV1[] memory postOrderActions;
-
-        {
-            bytes memory postOrderCompose = iParser.parse2(
-                LibComposeOrders.getComposedPostAddOrder(
-                    vm, strategy.strategyFile, strategy.strategyScenario, strategy.buildPath, strategy.manifestPath
-                )
-            )
-            ;
-            EvaluableV3 memory postOrderEvaluable = EvaluableV3(iInterpreter, iStore, postOrderCompose);
-
-            ActionV1 memory postOrderAction = ActionV1(postOrderEvaluable,new SignedContextV1[](0));
-            postOrderActions = new ActionV1[](1);
-            postOrderActions[0] = postOrderAction;
-        }
-        strategy.postActions = postOrderActions;
 
         checkStrategyCalculationsArbOrder(strategy);
+2 −13		foundry.toml
+1 −1		lib/rain.orderbook
+19 −6		src/StrategyTests.sol
+1 −1		src/lib/LibProcessStream.sol
+3 −3		src/lib/LibStrategyDeployment.sol
+30 −16		test/DeployedStrategyTest.t.sol
+1 −1		test/ProcessRouteTest.t.sol
+20 −6		test/strategies/base-order.rain
-Original file line number
+Diff line change
@@ Expand Up / @@ -695,3 +695,6 @@ deployments: @@
         )
         "Partial trade"
       );
+    #post-add-order
+     :;