diff --git a/crates/bindings/abis/IRaindexV6.json b/crates/bindings/abis/IRaindexV6.json
index 7cd8e47c5f..b682da7f35 100644
--- a/crates/bindings/abis/IRaindexV6.json
+++ b/crates/bindings/abis/IRaindexV6.json
@@ -1904,6 +1904,11 @@
       "name": "OrderNoSources",
       "inputs": []
     },
+    {
+      "type": "error",
+      "name": "TokenSelfTrade",
+      "inputs": []
+    },
     {
       "type": "error",
       "name": "ZeroDepositAmount",
diff --git a/foundry.toml b/foundry.toml
index a2f49ea125..172fda74ee 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -53,7 +53,7 @@ rainlang = "0.1.5"
 rain-interpreter-interface = "0.1.0"
 # rainlanguage/rain.raindex.interface was renamed to
 # rainlanguage/raindex.interface; Soldeer registry name follows.
-raindex-interface = "0.1.1"
+raindex-interface = "0.1.3"
 rain-metadata = "0.1.0"
 rain-intorastring = "0.1.0"
 rain-sol-codegen = "0.1.0"
diff --git a/remappings.txt b/remappings.txt
index 604ce637e5..5e3d8ff1fd 100644
--- a/remappings.txt
+++ b/remappings.txt
@@ -13,5 +13,5 @@ rain-sol-codegen-0.1.0/=dependencies/rain-sol-codegen-0.1.0/
 rain-solmem-0.1.3/=dependencies/rain-solmem-0.1.3/
 rain-string-0.2.0/=dependencies/rain-string-0.2.0/
 rain-tofu-erc20-decimals-0.1.1/=dependencies/rain-tofu-erc20-decimals-0.1.1/
-raindex-interface-0.1.1/=dependencies/raindex-interface-0.1.1/
+raindex-interface-0.1.3/=dependencies/raindex-interface-0.1.3/
 rainlang-0.1.5/=dependencies/rainlang-0.1.5/
diff --git a/soldeer.lock b/soldeer.lock
index 91a3c5f9cd..7ff1b055dc 100644
--- a/soldeer.lock
+++ b/soldeer.lock
@@ -105,10 +105,10 @@ integrity = "9e1fccf893dd0d90aeb445c78f9eee3904bc50287ff1da30b954508f18412cd2"
 
 [[dependencies]]
 name = "raindex-interface"
-version = "0.1.1"
-url = "https://soldeer-revisions.s3.amazonaws.com/raindex-interface/0_1_1_21-05-2026_18:36:45_raindex.zip"
-checksum = "d744aec8e9dc1bcce58de546d1a419f7eb87610e1541ce5459a140fd45626c99"
-integrity = "df40e42221d1ecd4e6e6ae6a3511b00fc182e1a46f99401f564d94f299d63730"
+version = "0.1.3"
+url = "https://soldeer-revisions.s3.amazonaws.com/raindex-interface/0_1_3_03-07-2026_11:20:58_raindex.zip"
+checksum = "5c4149dc0898b5db4036f5cac04614b98f204c062c694477fecc0f870a96907c"
+integrity = "5f69dc4e1234d15f27d74be29e287c8619c08cb354de9d8a3d30f42df13a0269"
 
 [[dependencies]]
 name = "rainlang"
diff --git a/src/abstract/RaindexV6ArbCommon.sol b/src/abstract/RaindexV6ArbCommon.sol
index 991f75ee99..f1850bacef 100644
--- a/src/abstract/RaindexV6ArbCommon.sol
+++ b/src/abstract/RaindexV6ArbCommon.sol
@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity ^0.8.19;
 
-import {TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 
 /// @param task The task to run as post for each arb.
 struct RaindexV6ArbConfig {
diff --git a/src/abstract/RaindexV6ArbOrderTaker.sol b/src/abstract/RaindexV6ArbOrderTaker.sol
index 3109c94a34..b84a2a923b 100644
--- a/src/abstract/RaindexV6ArbOrderTaker.sol
+++ b/src/abstract/RaindexV6ArbOrderTaker.sol
@@ -5,13 +5,13 @@ pragma solidity ^0.8.19;
 import {ERC165, IERC165} from "@openzeppelin-contracts-5.6.1/utils/introspection/ERC165.sol";
 import {ReentrancyGuard} from "@openzeppelin-contracts-5.6.1/utils/ReentrancyGuard.sol";
 import {IERC20, SafeERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/utils/SafeERC20.sol";
-import {IRaindexV6} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
-import {IRaindexV6ArbOrderTaker, TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6ArbOrderTaker.sol";
-import {TakeOrdersConfigV5, Float} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {IRaindexV6} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
+import {IRaindexV6ArbOrderTaker, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6ArbOrderTaker.sol";
+import {TakeOrdersConfigV5, Float} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {RaindexV6ArbCommon} from "./RaindexV6ArbCommon.sol";
 import {LibRaindexArb} from "../lib/LibRaindexArb.sol";
 import {LibRaindexDeploy} from "../lib/deploy/LibRaindexDeploy.sol";
-import {IRaindexV6OrderTaker} from "raindex-interface-0.1.1/src/interface/IRaindexV6OrderTaker.sol";
+import {IRaindexV6OrderTaker} from "raindex-interface-0.1.3/src/interface/IRaindexV6OrderTaker.sol";
 import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol";
 
 /// Thrown when `arb5` is called with a `raindex` that is not the trusted
diff --git a/src/abstract/RaindexV6ArbTaskGated.sol b/src/abstract/RaindexV6ArbTaskGated.sol
index b6c123cd50..5d404fb1d1 100644
--- a/src/abstract/RaindexV6ArbTaskGated.sol
+++ b/src/abstract/RaindexV6ArbTaskGated.sol
@@ -3,7 +3,7 @@
 pragma solidity ^0.8.19;
 
 import {RaindexV6ArbCommon, RaindexV6ArbConfig, WrongTask} from "./RaindexV6ArbCommon.sol";
-import {TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 
 /// @title RaindexV6ArbTaskGated
 /// @notice Mixin that adds task-hash gating to arb contracts. Stores a task
diff --git a/src/abstract/RaindexV6FlashBorrower.sol b/src/abstract/RaindexV6FlashBorrower.sol
index 7fe7458e06..7039772953 100644
--- a/src/abstract/RaindexV6FlashBorrower.sol
+++ b/src/abstract/RaindexV6FlashBorrower.sol
@@ -6,9 +6,9 @@ import {ERC165, IERC165} from "@openzeppelin-contracts-5.6.1/utils/introspection
 import {SafeERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/utils/SafeERC20.sol";
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 import {ReentrancyGuard} from "@openzeppelin-contracts-5.6.1/utils/ReentrancyGuard.sol";
-import {ON_FLASH_LOAN_CALLBACK_SUCCESS} from "raindex-interface-0.1.1/src/interface/ierc3156/IERC3156FlashBorrower.sol";
-import {IRaindexV6, TakeOrdersConfigV5, TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
-import {IERC3156FlashBorrower} from "raindex-interface-0.1.1/src/interface/ierc3156/IERC3156FlashBorrower.sol";
+import {ON_FLASH_LOAN_CALLBACK_SUCCESS} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol";
+import {IRaindexV6, TakeOrdersConfigV5, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
+import {IERC3156FlashBorrower} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol";
 import {RaindexV6ArbCommon} from "./RaindexV6ArbCommon.sol";
 import {LibRaindexArb} from "../lib/LibRaindexArb.sol";
 import {LibRaindexDeploy} from "../lib/deploy/LibRaindexDeploy.sol";
diff --git a/src/abstract/RaindexV6FlashLender.sol b/src/abstract/RaindexV6FlashLender.sol
index 4eb691840e..d31ad6992d 100644
--- a/src/abstract/RaindexV6FlashLender.sol
+++ b/src/abstract/RaindexV6FlashLender.sol
@@ -9,8 +9,8 @@ import {SafeERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/utils/SafeERC
 import {
     IERC3156FlashBorrower,
     ON_FLASH_LOAN_CALLBACK_SUCCESS
-} from "raindex-interface-0.1.1/src/interface/ierc3156/IERC3156FlashBorrower.sol";
-import {IERC3156FlashLender} from "raindex-interface-0.1.1/src/interface/ierc3156/IERC3156FlashLender.sol";
+} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol";
+import {IERC3156FlashLender} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashLender.sol";
 
 /// Thrown when the `onFlashLoan` callback returns anything other than
 /// ON_FLASH_LOAN_CALLBACK_SUCCESS.
diff --git a/src/concrete/raindex/RaindexV6.sol b/src/concrete/raindex/RaindexV6.sol
index 0691b16e2e..4bc93e2225 100644
--- a/src/concrete/raindex/RaindexV6.sol
+++ b/src/concrete/raindex/RaindexV6.sol
@@ -46,8 +46,8 @@ import {
     QuoteV2,
     Float,
     IOV2
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
-import {IRaindexV6OrderTaker} from "raindex-interface-0.1.1/src/interface/IRaindexV6OrderTaker.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
+import {IRaindexV6OrderTaker} from "raindex-interface-0.1.3/src/interface/IRaindexV6OrderTaker.sol";
 import {LibOrder} from "../../lib/LibOrder.sol";
 import {
     CALLING_CONTEXT_COLUMNS,
@@ -77,9 +77,6 @@ error NotOrderOwner(address owner);
 /// Thrown when the input and output tokens don't match, in either direction.
 error TokenMismatch();
 
-/// Thrown when the input token is the output token.
-error TokenSelfTrade();
-
 /// Thrown when the minimum input is not met.
 /// @param minimumIO The minimum io required.
 /// @param actualIO The io that was achieved.
diff --git a/src/lib/LibOrder.sol b/src/lib/LibOrder.sol
index c3a1119c3f..67afa32db8 100644
--- a/src/lib/LibOrder.sol
+++ b/src/lib/LibOrder.sol
@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity ^0.8.19;
 
-import {OrderV4} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {OrderV4} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 
 /// @title LibOrder
 /// @notice Consistent handling of `OrderV4` for where it matters w.r.t.
diff --git a/src/lib/LibRaindex.sol b/src/lib/LibRaindex.sol
index ba3c7e19ad..91a0a238bb 100644
--- a/src/lib/LibRaindex.sol
+++ b/src/lib/LibRaindex.sol
@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity ^0.8.19;
 
-import {TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {
     SourceIndexV2,
     StateNamespace,
diff --git a/src/lib/LibRaindexArb.sol b/src/lib/LibRaindexArb.sol
index 79edf5d64d..c6932678c2 100644
--- a/src/lib/LibRaindexArb.sol
+++ b/src/lib/LibRaindexArb.sol
@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity ^0.8.19;
 
-import {TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 import {LibRaindex} from "./LibRaindex.sol";
 import {Address} from "@openzeppelin-contracts-5.6.1/utils/Address.sol";
diff --git a/test/abstract/RaindexV6ArbOrderTaker.badRaindex.t.sol b/test/abstract/RaindexV6ArbOrderTaker.badRaindex.t.sol
index 75635097ff..3ed9649f5e 100644
--- a/test/abstract/RaindexV6ArbOrderTaker.badRaindex.t.sol
+++ b/test/abstract/RaindexV6ArbOrderTaker.badRaindex.t.sol
@@ -17,7 +17,7 @@ import {
     IInterpreterStoreV3,
     TaskV2,
     SignedContextV1
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol";
 
diff --git a/test/abstract/RaindexV6ArbOrderTaker.beforeArbOrder.t.sol b/test/abstract/RaindexV6ArbOrderTaker.beforeArbOrder.t.sol
index 25578faac4..766a0f2372 100644
--- a/test/abstract/RaindexV6ArbOrderTaker.beforeArbOrder.t.sol
+++ b/test/abstract/RaindexV6ArbOrderTaker.beforeArbOrder.t.sol
@@ -12,7 +12,7 @@ import {
     TaskV2,
     EvaluableV4,
     SignedContextV1
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
diff --git a/test/abstract/RaindexV6ArbOrderTaker.context.t.sol b/test/abstract/RaindexV6ArbOrderTaker.context.t.sol
index 4a8ae98a42..65dc97cbf6 100644
--- a/test/abstract/RaindexV6ArbOrderTaker.context.t.sol
+++ b/test/abstract/RaindexV6ArbOrderTaker.context.t.sol
@@ -3,7 +3,7 @@
 pragma solidity =0.8.25;
 
 import {ChildRaindexV6ArbOrderTaker} from "../util/concrete/ChildRaindexV6ArbOrderTaker.sol";
-import {TaskV2, SignedContextV1, EvaluableV4} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TaskV2, SignedContextV1, EvaluableV4} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {RaindexV6ExternalRealTest} from "../util/abstract/RaindexV6ExternalRealTest.sol";
 import {
     TakeOrdersConfigV5,
@@ -12,7 +12,7 @@ import {
     OrderConfigV4,
     OrderV4,
     IInterpreterV4
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol";
 import {StateNamespace, LibNamespace} from "../../src/concrete/raindex/RaindexV6.sol";
diff --git a/test/abstract/RaindexV6ArbOrderTaker.finalizeDecimals.t.sol b/test/abstract/RaindexV6ArbOrderTaker.finalizeDecimals.t.sol
index 2843610866..7d240cbaab 100644
--- a/test/abstract/RaindexV6ArbOrderTaker.finalizeDecimals.t.sol
+++ b/test/abstract/RaindexV6ArbOrderTaker.finalizeDecimals.t.sol
@@ -3,7 +3,7 @@
 pragma solidity =0.8.25;
 
 import {ChildRaindexV6ArbOrderTaker} from "../util/concrete/ChildRaindexV6ArbOrderTaker.sol";
-import {TaskV2, SignedContextV1, EvaluableV4} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TaskV2, SignedContextV1, EvaluableV4} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {RaindexV6ExternalRealTest} from "../util/abstract/RaindexV6ExternalRealTest.sol";
 import {
     TakeOrdersConfigV5,
@@ -12,7 +12,7 @@ import {
     OrderConfigV4,
     OrderV4,
     IInterpreterV4
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
diff --git a/test/abstract/RaindexV6ArbOrderTaker.finalizeTaskArg.t.sol b/test/abstract/RaindexV6ArbOrderTaker.finalizeTaskArg.t.sol
index ae89f6a627..1069dfc726 100644
--- a/test/abstract/RaindexV6ArbOrderTaker.finalizeTaskArg.t.sol
+++ b/test/abstract/RaindexV6ArbOrderTaker.finalizeTaskArg.t.sol
@@ -3,7 +3,7 @@
 pragma solidity =0.8.25;
 
 import {ChildRaindexV6ArbOrderTaker} from "../util/concrete/ChildRaindexV6ArbOrderTaker.sol";
-import {TaskV2, SignedContextV1, EvaluableV4} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TaskV2, SignedContextV1, EvaluableV4} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {RaindexV6ExternalRealTest} from "../util/abstract/RaindexV6ExternalRealTest.sol";
 import {
     TakeOrdersConfigV5,
@@ -12,7 +12,7 @@ import {
     OrderConfigV4,
     OrderV4,
     IInterpreterV4
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
diff --git a/test/abstract/RaindexV6ArbOrderTaker.ierc165.t.sol b/test/abstract/RaindexV6ArbOrderTaker.ierc165.t.sol
index 42f0e12062..16f01ff40e 100644
--- a/test/abstract/RaindexV6ArbOrderTaker.ierc165.t.sol
+++ b/test/abstract/RaindexV6ArbOrderTaker.ierc165.t.sol
@@ -4,8 +4,8 @@ pragma solidity =0.8.25;
 
 import {Test} from "forge-std-1.16.1/src/Test.sol";
 import {IERC165} from "@openzeppelin-contracts-5.6.1/utils/introspection/IERC165.sol";
-import {IRaindexV6ArbOrderTaker} from "raindex-interface-0.1.1/src/interface/IRaindexV6ArbOrderTaker.sol";
-import {IRaindexV6OrderTaker} from "raindex-interface-0.1.1/src/interface/IRaindexV6OrderTaker.sol";
+import {IRaindexV6ArbOrderTaker} from "raindex-interface-0.1.3/src/interface/IRaindexV6ArbOrderTaker.sol";
+import {IRaindexV6OrderTaker} from "raindex-interface-0.1.3/src/interface/IRaindexV6OrderTaker.sol";
 import {ChildRaindexV6ArbOrderTaker} from "../util/concrete/ChildRaindexV6ArbOrderTaker.sol";
 
 contract RaindexV6ArbOrderTakerIERC165Test is Test {
diff --git a/test/abstract/RaindexV6ArbOrderTaker.ioIndexSelection.t.sol b/test/abstract/RaindexV6ArbOrderTaker.ioIndexSelection.t.sol
index 91b71d973f..ce79620f8b 100644
--- a/test/abstract/RaindexV6ArbOrderTaker.ioIndexSelection.t.sol
+++ b/test/abstract/RaindexV6ArbOrderTaker.ioIndexSelection.t.sol
@@ -15,7 +15,7 @@ import {
     EvaluableV4,
     SignedContextV1,
     TaskV2
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
diff --git a/test/abstract/RaindexV6ArbOrderTaker.noOrders.t.sol b/test/abstract/RaindexV6ArbOrderTaker.noOrders.t.sol
index 0253ef7eb9..29f2b5d62c 100644
--- a/test/abstract/RaindexV6ArbOrderTaker.noOrders.t.sol
+++ b/test/abstract/RaindexV6ArbOrderTaker.noOrders.t.sol
@@ -14,7 +14,7 @@ import {
     IInterpreterStoreV3,
     TaskV2,
     SignedContextV1
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol";
 
diff --git a/test/abstract/RaindexV6ArbOrderTaker.onTakeOrders2.t.sol b/test/abstract/RaindexV6ArbOrderTaker.onTakeOrders2.t.sol
index e8e650b2ce..6c02db0c9a 100644
--- a/test/abstract/RaindexV6ArbOrderTaker.onTakeOrders2.t.sol
+++ b/test/abstract/RaindexV6ArbOrderTaker.onTakeOrders2.t.sol
@@ -16,7 +16,7 @@ import {
     SignedContextV1,
     TaskV2,
     Float
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
diff --git a/test/abstract/RaindexV6ArbOrderTaker.onTakeOrders2Base.t.sol b/test/abstract/RaindexV6ArbOrderTaker.onTakeOrders2Base.t.sol
index 3790b97915..cab0765d22 100644
--- a/test/abstract/RaindexV6ArbOrderTaker.onTakeOrders2Base.t.sol
+++ b/test/abstract/RaindexV6ArbOrderTaker.onTakeOrders2Base.t.sol
@@ -6,7 +6,7 @@ import {Test} from "forge-std-1.16.1/src/Test.sol";
 
 import {ChildRaindexV6ArbOrderTaker} from "test/util/concrete/ChildRaindexV6ArbOrderTaker.sol";
 import {GenericPoolRaindexV6ArbOrderTaker} from "../../src/concrete/arb/GenericPoolRaindexV6ArbOrderTaker.sol";
-import {Float} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {Float} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol";
 import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol";
 import {MockToken} from "test/util/concrete/MockToken.sol";
diff --git a/test/abstract/RaindexV6ArbOrderTaker.onTakeOrders2Direct.t.sol b/test/abstract/RaindexV6ArbOrderTaker.onTakeOrders2Direct.t.sol
index b6abfa6612..b5c778e876 100644
--- a/test/abstract/RaindexV6ArbOrderTaker.onTakeOrders2Direct.t.sol
+++ b/test/abstract/RaindexV6ArbOrderTaker.onTakeOrders2Direct.t.sol
@@ -5,7 +5,7 @@ pragma solidity =0.8.25;
 import {Test} from "forge-std-1.16.1/src/Test.sol";
 
 import {GenericPoolRaindexV6ArbOrderTaker} from "../../src/concrete/arb/GenericPoolRaindexV6ArbOrderTaker.sol";
-import {Float} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {Float} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol";
 import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol";
 import {MockToken} from "test/util/concrete/MockToken.sol";
diff --git a/test/abstract/RaindexV6ArbOrderTaker.reentrancy.t.sol b/test/abstract/RaindexV6ArbOrderTaker.reentrancy.t.sol
index 4a07cd9121..263ccf7b8e 100644
--- a/test/abstract/RaindexV6ArbOrderTaker.reentrancy.t.sol
+++ b/test/abstract/RaindexV6ArbOrderTaker.reentrancy.t.sol
@@ -14,7 +14,7 @@ import {
     EvaluableV4,
     SignedContextV1,
     TaskV2
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
diff --git a/test/abstract/RaindexV6ArbTaskGated.checkTaskHashPassMatch.t.sol b/test/abstract/RaindexV6ArbTaskGated.checkTaskHashPassMatch.t.sol
index c8baf12888..d5b3971ca7 100644
--- a/test/abstract/RaindexV6ArbTaskGated.checkTaskHashPassMatch.t.sol
+++ b/test/abstract/RaindexV6ArbTaskGated.checkTaskHashPassMatch.t.sol
@@ -5,7 +5,7 @@ pragma solidity =0.8.25;
 import {Test} from "forge-std-1.16.1/src/Test.sol";
 import {ChildRaindexV6ArbTaskGated} from "test/util/concrete/ChildRaindexV6ArbTaskGated.sol";
 import {RaindexV6ArbConfig} from "../../src/abstract/RaindexV6ArbCommon.sol";
-import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol";
diff --git a/test/abstract/RaindexV6ArbTaskGated.checkTaskHashPassZero.t.sol b/test/abstract/RaindexV6ArbTaskGated.checkTaskHashPassZero.t.sol
index 2c59f74c40..f593391b67 100644
--- a/test/abstract/RaindexV6ArbTaskGated.checkTaskHashPassZero.t.sol
+++ b/test/abstract/RaindexV6ArbTaskGated.checkTaskHashPassZero.t.sol
@@ -5,7 +5,7 @@ pragma solidity =0.8.25;
 import {Test} from "forge-std-1.16.1/src/Test.sol";
 import {ChildRaindexV6ArbTaskGated} from "test/util/concrete/ChildRaindexV6ArbTaskGated.sol";
 import {RaindexV6ArbConfig} from "../../src/abstract/RaindexV6ArbCommon.sol";
-import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol";
diff --git a/test/abstract/RaindexV6ArbTaskGated.checkTaskHashWrongTask.t.sol b/test/abstract/RaindexV6ArbTaskGated.checkTaskHashWrongTask.t.sol
index b6a83cbf8d..0d6693cf33 100644
--- a/test/abstract/RaindexV6ArbTaskGated.checkTaskHashWrongTask.t.sol
+++ b/test/abstract/RaindexV6ArbTaskGated.checkTaskHashWrongTask.t.sol
@@ -5,7 +5,7 @@ pragma solidity =0.8.25;
 import {Test} from "forge-std-1.16.1/src/Test.sol";
 import {ChildRaindexV6ArbTaskGated} from "test/util/concrete/ChildRaindexV6ArbTaskGated.sol";
 import {RaindexV6ArbConfig, WrongTask} from "../../src/abstract/RaindexV6ArbCommon.sol";
-import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol";
diff --git a/test/abstract/RaindexV6ArbTaskGated.construct.t.sol b/test/abstract/RaindexV6ArbTaskGated.construct.t.sol
index d2f2744a21..74d5f4b4c1 100644
--- a/test/abstract/RaindexV6ArbTaskGated.construct.t.sol
+++ b/test/abstract/RaindexV6ArbTaskGated.construct.t.sol
@@ -5,7 +5,7 @@ pragma solidity =0.8.25;
 import {Test} from "forge-std-1.16.1/src/Test.sol";
 import {ChildRaindexV6ArbTaskGated} from "test/util/concrete/ChildRaindexV6ArbTaskGated.sol";
 import {RaindexV6ArbConfig, RaindexV6ArbCommon} from "../../src/abstract/RaindexV6ArbCommon.sol";
-import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol";
diff --git a/test/abstract/RaindexV6ArbTaskGated.iTaskHashBoundary.t.sol b/test/abstract/RaindexV6ArbTaskGated.iTaskHashBoundary.t.sol
index b6cea4f50a..59c091527a 100644
--- a/test/abstract/RaindexV6ArbTaskGated.iTaskHashBoundary.t.sol
+++ b/test/abstract/RaindexV6ArbTaskGated.iTaskHashBoundary.t.sol
@@ -5,7 +5,7 @@ pragma solidity =0.8.25;
 import {Test} from "forge-std-1.16.1/src/Test.sol";
 import {ChildRaindexV6ArbTaskGated} from "test/util/concrete/ChildRaindexV6ArbTaskGated.sol";
 import {RaindexV6ArbConfig} from "../../src/abstract/RaindexV6ArbCommon.sol";
-import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol";
diff --git a/test/abstract/RaindexV6ArbTaskGated.iTaskHashNonzero.t.sol b/test/abstract/RaindexV6ArbTaskGated.iTaskHashNonzero.t.sol
index c5af96fd1d..9dee088d98 100644
--- a/test/abstract/RaindexV6ArbTaskGated.iTaskHashNonzero.t.sol
+++ b/test/abstract/RaindexV6ArbTaskGated.iTaskHashNonzero.t.sol
@@ -5,7 +5,7 @@ pragma solidity =0.8.25;
 import {Test} from "forge-std-1.16.1/src/Test.sol";
 import {ChildRaindexV6ArbTaskGated} from "test/util/concrete/ChildRaindexV6ArbTaskGated.sol";
 import {RaindexV6ArbConfig} from "../../src/abstract/RaindexV6ArbCommon.sol";
-import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol";
diff --git a/test/abstract/RaindexV6ArbTaskGated.iTaskHashZero.t.sol b/test/abstract/RaindexV6ArbTaskGated.iTaskHashZero.t.sol
index e3038397be..441d2366cc 100644
--- a/test/abstract/RaindexV6ArbTaskGated.iTaskHashZero.t.sol
+++ b/test/abstract/RaindexV6ArbTaskGated.iTaskHashZero.t.sol
@@ -5,7 +5,7 @@ pragma solidity =0.8.25;
 import {Test} from "forge-std-1.16.1/src/Test.sol";
 import {ChildRaindexV6ArbTaskGated} from "test/util/concrete/ChildRaindexV6ArbTaskGated.sol";
 import {RaindexV6ArbConfig} from "../../src/abstract/RaindexV6ArbCommon.sol";
-import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TaskV2, EvaluableV4, SignedContextV1} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol";
diff --git a/test/abstract/RaindexV6FlashBorrower.badLenderApproval.t.sol b/test/abstract/RaindexV6FlashBorrower.badLenderApproval.t.sol
index b4b84d69de..09df8c1f24 100644
--- a/test/abstract/RaindexV6FlashBorrower.badLenderApproval.t.sol
+++ b/test/abstract/RaindexV6FlashBorrower.badLenderApproval.t.sol
@@ -16,7 +16,7 @@ import {
     EvaluableV4,
     SignedContextV1,
     TaskV2
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
diff --git a/test/abstract/RaindexV6FlashBorrower.beforeArbOrder.t.sol b/test/abstract/RaindexV6FlashBorrower.beforeArbOrder.t.sol
index 1e931724d7..560bd1ca9c 100644
--- a/test/abstract/RaindexV6FlashBorrower.beforeArbOrder.t.sol
+++ b/test/abstract/RaindexV6FlashBorrower.beforeArbOrder.t.sol
@@ -12,7 +12,7 @@ import {
     TaskV2,
     EvaluableV4,
     SignedContextV1
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
diff --git a/test/abstract/RaindexV6FlashBorrower.finalizeDecimals.t.sol b/test/abstract/RaindexV6FlashBorrower.finalizeDecimals.t.sol
index 699be6c05d..4acc62d1b1 100644
--- a/test/abstract/RaindexV6FlashBorrower.finalizeDecimals.t.sol
+++ b/test/abstract/RaindexV6FlashBorrower.finalizeDecimals.t.sol
@@ -17,7 +17,7 @@ import {
     SignedContextV1,
     TaskV2,
     IInterpreterV4
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 
diff --git a/test/abstract/RaindexV6FlashBorrower.flashLoanAmountLossless.t.sol b/test/abstract/RaindexV6FlashBorrower.flashLoanAmountLossless.t.sol
index 7f7280f0f5..0fcca5cc54 100644
--- a/test/abstract/RaindexV6FlashBorrower.flashLoanAmountLossless.t.sol
+++ b/test/abstract/RaindexV6FlashBorrower.flashLoanAmountLossless.t.sol
@@ -16,7 +16,7 @@ import {
     SignedContextV1,
     TaskV2,
     Float
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
diff --git a/test/abstract/RaindexV6FlashBorrower.flashLoanAmountValue.t.sol b/test/abstract/RaindexV6FlashBorrower.flashLoanAmountValue.t.sol
index b1c4466c31..a509c63484 100644
--- a/test/abstract/RaindexV6FlashBorrower.flashLoanAmountValue.t.sol
+++ b/test/abstract/RaindexV6FlashBorrower.flashLoanAmountValue.t.sol
@@ -16,7 +16,7 @@ import {
     SignedContextV1,
     TaskV2,
     Float
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
diff --git a/test/abstract/RaindexV6FlashBorrower.flashLoanFailed.t.sol b/test/abstract/RaindexV6FlashBorrower.flashLoanFailed.t.sol
index e3a37467d9..438a81912f 100644
--- a/test/abstract/RaindexV6FlashBorrower.flashLoanFailed.t.sol
+++ b/test/abstract/RaindexV6FlashBorrower.flashLoanFailed.t.sol
@@ -17,7 +17,7 @@ import {
     SignedContextV1,
     TaskV2,
     Float
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
diff --git a/test/abstract/RaindexV6FlashBorrower.inputIoIndexSelection.t.sol b/test/abstract/RaindexV6FlashBorrower.inputIoIndexSelection.t.sol
index 5d7e6a8448..b525627b14 100644
--- a/test/abstract/RaindexV6FlashBorrower.inputIoIndexSelection.t.sol
+++ b/test/abstract/RaindexV6FlashBorrower.inputIoIndexSelection.t.sol
@@ -15,7 +15,7 @@ import {
     EvaluableV4,
     SignedContextV1,
     TaskV2
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
diff --git a/test/abstract/RaindexV6FlashBorrower.ioIsInput.t.sol b/test/abstract/RaindexV6FlashBorrower.ioIsInput.t.sol
index b824a4124d..6cf0c861e5 100644
--- a/test/abstract/RaindexV6FlashBorrower.ioIsInput.t.sol
+++ b/test/abstract/RaindexV6FlashBorrower.ioIsInput.t.sol
@@ -15,7 +15,7 @@ import {
     IInterpreterStoreV3,
     TaskV2,
     SignedContextV1
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol";
 
diff --git a/test/abstract/RaindexV6FlashBorrower.mixedDecimals.t.sol b/test/abstract/RaindexV6FlashBorrower.mixedDecimals.t.sol
index 5eb252d4a4..6c9d1ee48d 100644
--- a/test/abstract/RaindexV6FlashBorrower.mixedDecimals.t.sol
+++ b/test/abstract/RaindexV6FlashBorrower.mixedDecimals.t.sol
@@ -16,7 +16,7 @@ import {
     SignedContextV1,
     TaskV2,
     Float
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
diff --git a/test/abstract/RaindexV6FlashBorrower.noOrders.t.sol b/test/abstract/RaindexV6FlashBorrower.noOrders.t.sol
index 25ae04b9f9..26b2b3928f 100644
--- a/test/abstract/RaindexV6FlashBorrower.noOrders.t.sol
+++ b/test/abstract/RaindexV6FlashBorrower.noOrders.t.sol
@@ -14,7 +14,7 @@ import {
     IInterpreterStoreV3,
     TaskV2,
     SignedContextV1
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol";
 
diff --git a/test/abstract/RaindexV6FlashBorrower.orders0Selection.t.sol b/test/abstract/RaindexV6FlashBorrower.orders0Selection.t.sol
index 483f1bfb35..e4f99e4fc9 100644
--- a/test/abstract/RaindexV6FlashBorrower.orders0Selection.t.sol
+++ b/test/abstract/RaindexV6FlashBorrower.orders0Selection.t.sol
@@ -16,7 +16,7 @@ import {
     SignedContextV1,
     TaskV2,
     Float
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
diff --git a/test/abstract/RaindexV6FlashBorrower.realTokenTransfers.t.sol b/test/abstract/RaindexV6FlashBorrower.realTokenTransfers.t.sol
index c13ed8cacb..8d82648bca 100644
--- a/test/abstract/RaindexV6FlashBorrower.realTokenTransfers.t.sol
+++ b/test/abstract/RaindexV6FlashBorrower.realTokenTransfers.t.sol
@@ -16,7 +16,7 @@ import {
     SignedContextV1,
     TaskV2,
     Float
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
diff --git a/test/abstract/RaindexV6FlashBorrower.reentrancy.t.sol b/test/abstract/RaindexV6FlashBorrower.reentrancy.t.sol
index 4d4e0f510e..8f406d7136 100644
--- a/test/abstract/RaindexV6FlashBorrower.reentrancy.t.sol
+++ b/test/abstract/RaindexV6FlashBorrower.reentrancy.t.sol
@@ -14,7 +14,7 @@ import {
     EvaluableV4,
     SignedContextV1,
     TaskV2
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
diff --git a/test/abstract/RaindexV6FlashLender.griefRecipient.t.sol b/test/abstract/RaindexV6FlashLender.griefRecipient.t.sol
index ed600c2e3e..8ce11291b5 100644
--- a/test/abstract/RaindexV6FlashLender.griefRecipient.t.sol
+++ b/test/abstract/RaindexV6FlashLender.griefRecipient.t.sol
@@ -6,7 +6,7 @@ import {RaindexV6ExternalMockTest} from "test/util/abstract/RaindexV6ExternalMoc
 import {
     IERC3156FlashBorrower,
     ON_FLASH_LOAN_CALLBACK_SUCCESS
-} from "raindex-interface-0.1.1/src/interface/ierc3156/IERC3156FlashBorrower.sol";
+} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol";
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 import {FlashLenderCallbackFailed} from "../../src/abstract/RaindexV6FlashLender.sol";
 
diff --git a/test/abstract/RaindexV6FlashLender.mockSuccess.t.sol b/test/abstract/RaindexV6FlashLender.mockSuccess.t.sol
index 44d617f715..b9a6787a45 100644
--- a/test/abstract/RaindexV6FlashLender.mockSuccess.t.sol
+++ b/test/abstract/RaindexV6FlashLender.mockSuccess.t.sol
@@ -6,7 +6,7 @@ import {RaindexV6ExternalMockTest} from "test/util/abstract/RaindexV6ExternalMoc
 import {
     IERC3156FlashBorrower,
     ON_FLASH_LOAN_CALLBACK_SUCCESS
-} from "raindex-interface-0.1.1/src/interface/ierc3156/IERC3156FlashBorrower.sol";
+} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol";
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 
 /// @title RaindexV6FlashLenderMockSuccessTest
diff --git a/test/abstract/RaindexV6FlashLender.reentrant.t.sol b/test/abstract/RaindexV6FlashLender.reentrant.t.sol
index 1b5fc7e501..beed62b569 100644
--- a/test/abstract/RaindexV6FlashLender.reentrant.t.sol
+++ b/test/abstract/RaindexV6FlashLender.reentrant.t.sol
@@ -11,8 +11,8 @@ import {
     TakeOrdersConfigV5,
     ClearConfigV2,
     TaskV2
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
-import {IERC3156FlashBorrower} from "raindex-interface-0.1.1/src/interface/ierc3156/IERC3156FlashBorrower.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
+import {IERC3156FlashBorrower} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol";
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol";
 import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol";
diff --git a/test/abstract/RaindexV6FlashLender.transfers.t.sol b/test/abstract/RaindexV6FlashLender.transfers.t.sol
index 918e8403c0..fee4891ff3 100644
--- a/test/abstract/RaindexV6FlashLender.transfers.t.sol
+++ b/test/abstract/RaindexV6FlashLender.transfers.t.sol
@@ -5,7 +5,7 @@ pragma solidity =0.8.25;
 import {RaindexV6ExternalMockTest} from "test/util/abstract/RaindexV6ExternalMockTest.sol";
 import {IERC20Errors} from "@openzeppelin-contracts-5.6.1/token/ERC20/ERC20.sol";
 
-import {IERC3156FlashBorrower} from "raindex-interface-0.1.1/src/interface/ierc3156/IERC3156FlashBorrower.sol";
+import {IERC3156FlashBorrower} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol";
 import {FlashLenderCallbackFailed} from "../../src/abstract/RaindexV6FlashLender.sol";
 import {TKN} from "test/util/concrete/TKN.sol";
 import {IPull} from "test/util/concrete/IPull.sol";
diff --git a/test/concrete/arb/GenericPoolRaindexV6ArbOrderTaker.sender.t.sol b/test/concrete/arb/GenericPoolRaindexV6ArbOrderTaker.sender.t.sol
index 5777dfb6c5..465b548bc0 100644
--- a/test/concrete/arb/GenericPoolRaindexV6ArbOrderTaker.sender.t.sol
+++ b/test/concrete/arb/GenericPoolRaindexV6ArbOrderTaker.sender.t.sol
@@ -14,7 +14,7 @@ import {
     IInterpreterStoreV3,
     TaskV2,
     SignedContextV1
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol";
 
diff --git a/test/concrete/arb/GenericPoolRaindexV6FlashBorrower.exchangeTokenSelection.t.sol b/test/concrete/arb/GenericPoolRaindexV6FlashBorrower.exchangeTokenSelection.t.sol
index b2ed11f739..d2a0b751c3 100644
--- a/test/concrete/arb/GenericPoolRaindexV6FlashBorrower.exchangeTokenSelection.t.sol
+++ b/test/concrete/arb/GenericPoolRaindexV6FlashBorrower.exchangeTokenSelection.t.sol
@@ -15,7 +15,7 @@ import {
     EvaluableV4,
     SignedContextV1,
     TaskV2
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
diff --git a/test/concrete/arb/GenericPoolRaindexV6FlashBorrower.sender.t.sol b/test/concrete/arb/GenericPoolRaindexV6FlashBorrower.sender.t.sol
index 6e6a5824cc..266bcec684 100644
--- a/test/concrete/arb/GenericPoolRaindexV6FlashBorrower.sender.t.sol
+++ b/test/concrete/arb/GenericPoolRaindexV6FlashBorrower.sender.t.sol
@@ -14,7 +14,7 @@ import {
     IInterpreterStoreV3,
     TaskV2,
     SignedContextV1
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibDecimalFloat, Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol";
 
diff --git a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.lossyRounding.t.sol b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.lossyRounding.t.sol
index 1cc23d12a8..61909c8339 100644
--- a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.lossyRounding.t.sol
+++ b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.lossyRounding.t.sol
@@ -6,7 +6,7 @@ import {Test} from "forge-std-1.16.1/src/Test.sol";
 import {IRouteProcessor} from "src/interface/IRouteProcessor.sol";
 
 import {RouteProcessorRaindexV6ArbOrderTaker} from "../../../src/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.sol";
-import {Float} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {Float} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol";
 import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol";
diff --git a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.noEthForward.t.sol b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.noEthForward.t.sol
index 20a6dce096..9069f96ed4 100644
--- a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.noEthForward.t.sol
+++ b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.noEthForward.t.sol
@@ -5,7 +5,7 @@ pragma solidity =0.8.25;
 import {Test} from "forge-std-1.16.1/src/Test.sol";
 
 import {RouteProcessorRaindexV6ArbOrderTaker} from "../../../src/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.sol";
-import {Float} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {Float} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol";
 import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol";
 import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol";
diff --git a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.nonStandardDecimals.t.sol b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.nonStandardDecimals.t.sol
index ca52443651..375dfb591b 100644
--- a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.nonStandardDecimals.t.sol
+++ b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.nonStandardDecimals.t.sol
@@ -16,7 +16,7 @@ import {
     SignedContextV1,
     TaskV2,
     Float
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
diff --git a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.onTakeOrders2.t.sol b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.onTakeOrders2.t.sol
index 541bd73e31..b1eb17a7db 100644
--- a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.onTakeOrders2.t.sol
+++ b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.onTakeOrders2.t.sol
@@ -16,7 +16,7 @@ import {
     SignedContextV1,
     TaskV2,
     Float
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
diff --git a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.onTakeOrders2Direct.t.sol b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.onTakeOrders2Direct.t.sol
index b9055f0e3b..b677a1a76f 100644
--- a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.onTakeOrders2Direct.t.sol
+++ b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.onTakeOrders2Direct.t.sol
@@ -5,7 +5,7 @@ pragma solidity =0.8.25;
 import {Test} from "forge-std-1.16.1/src/Test.sol";
 
 import {RouteProcessorRaindexV6ArbOrderTaker} from "../../../src/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.sol";
-import {Float} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {Float} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol";
 import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol";
 import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol";
diff --git a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.onTakeOrders2Fuzz.t.sol b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.onTakeOrders2Fuzz.t.sol
index 76039666c4..fe906e6f4c 100644
--- a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.onTakeOrders2Fuzz.t.sol
+++ b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.onTakeOrders2Fuzz.t.sol
@@ -5,7 +5,7 @@ pragma solidity =0.8.25;
 import {Test} from "forge-std-1.16.1/src/Test.sol";
 import {IRouteProcessor} from "src/interface/IRouteProcessor.sol";
 import {RouteProcessorRaindexV6ArbOrderTaker} from "../../../src/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.sol";
-import {Float} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {Float} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol";
 import {MockToken} from "test/util/concrete/MockToken.sol";
diff --git a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.sender.t.sol b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.sender.t.sol
index 8f526a4369..9793f3198e 100644
--- a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.sender.t.sol
+++ b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.sender.t.sol
@@ -14,7 +14,7 @@ import {
     IInterpreterStoreV3,
     TaskV2,
     SignedContextV1
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {RouteProcessorRaindexV6ArbOrderTaker} from "../../../src/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.sol";
 import {LibDecimalFloat, Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 import {LibInterpreterDeploy} from "rainlang-0.1.5/src/lib/deploy/LibInterpreterDeploy.sol";
diff --git a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.tofuDecimals.t.sol b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.tofuDecimals.t.sol
index 87f416d9de..62a0a8c6f7 100644
--- a/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.tofuDecimals.t.sol
+++ b/test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.tofuDecimals.t.sol
@@ -5,7 +5,7 @@ pragma solidity =0.8.25;
 import {Test} from "forge-std-1.16.1/src/Test.sol";
 
 import {RouteProcessorRaindexV6ArbOrderTaker} from "../../../src/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.sol";
-import {Float} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {Float} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol";
 import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol";
 import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol";
diff --git a/test/concrete/raindex/RaindexV6.addOrder.entask.t.sol b/test/concrete/raindex/RaindexV6.addOrder.entask.t.sol
index 8bac05aa73..85bd77bfee 100644
--- a/test/concrete/raindex/RaindexV6.addOrder.entask.t.sol
+++ b/test/concrete/raindex/RaindexV6.addOrder.entask.t.sol
@@ -9,7 +9,7 @@ import {
     TaskV2,
     OrderV4,
     SignedContextV1
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol";
 import {LibOrder} from "../../../src/lib/LibOrder.sol";
 
diff --git a/test/concrete/raindex/RaindexV6.addOrder.mock.t.sol b/test/concrete/raindex/RaindexV6.addOrder.mock.t.sol
index 54f1711bf3..a9ef713954 100644
--- a/test/concrete/raindex/RaindexV6.addOrder.mock.t.sol
+++ b/test/concrete/raindex/RaindexV6.addOrder.mock.t.sol
@@ -3,7 +3,7 @@
 pragma solidity =0.8.25;
 
 import {RaindexV6ExternalMockTest} from "test/util/abstract/RaindexV6ExternalMockTest.sol";
-import {OrderConfigV4, OrderV4, IOV2, EvaluableV4, TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {OrderConfigV4, OrderV4, IOV2, EvaluableV4, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol";
 import {NotRainMetaV1, META_MAGIC_NUMBER_V1} from "rain-metadata-0.1.0/src/interface/unstable/IMetaV1_2.sol";
 import {LibMeta} from "rain-metadata-0.1.0/src/lib/LibMeta.sol";
diff --git a/test/concrete/raindex/RaindexV6.addOrder.nonce.t.sol b/test/concrete/raindex/RaindexV6.addOrder.nonce.t.sol
index 54f4dfdb08..b1aa4d06bd 100644
--- a/test/concrete/raindex/RaindexV6.addOrder.nonce.t.sol
+++ b/test/concrete/raindex/RaindexV6.addOrder.nonce.t.sol
@@ -3,7 +3,7 @@
 pragma solidity =0.8.25;
 
 import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol";
-import {OrderConfigV4, OrderV4, EvaluableV4, TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {OrderConfigV4, OrderV4, EvaluableV4, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol";
 import {LibOrder} from "../../../src/lib/LibOrder.sol";
 
diff --git a/test/concrete/raindex/RaindexV6.addOrder.owner.t.sol b/test/concrete/raindex/RaindexV6.addOrder.owner.t.sol
index da0257f7aa..54518ff825 100644
--- a/test/concrete/raindex/RaindexV6.addOrder.owner.t.sol
+++ b/test/concrete/raindex/RaindexV6.addOrder.owner.t.sol
@@ -3,7 +3,7 @@
 pragma solidity =0.8.25;
 
 import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol";
-import {OrderConfigV4, OrderV4, EvaluableV4, TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {OrderConfigV4, OrderV4, EvaluableV4, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol";
 import {LibOrder} from "../../../src/lib/LibOrder.sol";
 
diff --git a/test/concrete/raindex/RaindexV6.addOrder.t.sol b/test/concrete/raindex/RaindexV6.addOrder.t.sol
index df1502103f..e6f3397920 100644
--- a/test/concrete/raindex/RaindexV6.addOrder.t.sol
+++ b/test/concrete/raindex/RaindexV6.addOrder.t.sol
@@ -4,7 +4,7 @@ pragma solidity =0.8.25;
 
 import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol";
 import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol";
-import {OrderConfigV4, EvaluableV4, TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {OrderConfigV4, EvaluableV4, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IParserV2} from "rain-interpreter-interface-0.1.0/src/interface/IParserV2.sol";
 import {UnsupportedCalculateOutputs} from "../../../src/concrete/raindex/RaindexV6.sol";
 
diff --git a/test/concrete/raindex/RaindexV6.calculateOrderIOHarness.t.sol b/test/concrete/raindex/RaindexV6.calculateOrderIOHarness.t.sol
index 5e7f9f33a9..1f33c39fdd 100644
--- a/test/concrete/raindex/RaindexV6.calculateOrderIOHarness.t.sol
+++ b/test/concrete/raindex/RaindexV6.calculateOrderIOHarness.t.sol
@@ -3,12 +3,7 @@
 pragma solidity =0.8.25;
 
 import {Test} from "forge-std-1.16.1/src/Test.sol";
-import {
-    RaindexV6,
-    OrderIOCalculationV4,
-    UnsupportedCalculateOutputs,
-    TokenSelfTrade
-} from "src/concrete/raindex/RaindexV6.sol";
+import {RaindexV6, OrderIOCalculationV4, UnsupportedCalculateOutputs} from "src/concrete/raindex/RaindexV6.sol";
 import {
     CONTEXT_CALLING_CONTEXT_COLUMN,
     CONTEXT_CALLING_CONTEXT_ROW_ORDER_HASH,
@@ -35,7 +30,7 @@ import {
     EvaluableV4,
     SignedContextV1,
     TaskV2
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4, EvalV4, StackItem} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {ITOFUTokenDecimals, TOFUOutcome} from "rain-tofu-erc20-decimals-0.1.1/src/interface/ITOFUTokenDecimals.sol";
@@ -555,7 +550,7 @@ contract RaindexV6CalculateOrderIOHarnessTest is Test {
 
         QuoteV2 memory quoteConfig =
             QuoteV2({order: order, inputIOIndex: 0, outputIOIndex: 0, signedContext: new SignedContextV1[](0)});
-        vm.expectRevert(abi.encodeWithSelector(TokenSelfTrade.selector));
+        vm.expectRevert(abi.encodeWithSelector(IRaindexV6.TokenSelfTrade.selector));
         IRaindexV6(address(harness)).quote2(quoteConfig);
     }
 }
diff --git a/test/concrete/raindex/RaindexV6.clear.badStack.t.sol b/test/concrete/raindex/RaindexV6.clear.badStack.t.sol
index 328949d627..dc7df3bd64 100644
--- a/test/concrete/raindex/RaindexV6.clear.badStack.t.sol
+++ b/test/concrete/raindex/RaindexV6.clear.badStack.t.sol
@@ -11,7 +11,7 @@ import {
     ClearConfigV2,
     SignedContextV1,
     TaskV2
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {UnsupportedCalculateOutputs} from "../../../src/concrete/raindex/RaindexV6.sol";
 import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol";
 
diff --git a/test/concrete/raindex/RaindexV6.clear.calculateStateChange.t.sol b/test/concrete/raindex/RaindexV6.clear.calculateStateChange.t.sol
index 0419f0cf0e..00e844cc12 100644
--- a/test/concrete/raindex/RaindexV6.clear.calculateStateChange.t.sol
+++ b/test/concrete/raindex/RaindexV6.clear.calculateStateChange.t.sol
@@ -4,8 +4,8 @@ pragma solidity =0.8.25;
 
 import {Test} from "forge-std-1.16.1/src/Test.sol";
 import {OrderIOCalculationV4} from "src/concrete/raindex/RaindexV6.sol";
-import {ClearStateChangeV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
-import {OrderV4} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {ClearStateChangeV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
+import {OrderV4} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 import {StateNamespace} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {RaindexV6ClearStateChangeHarness} from "test/util/concrete/RaindexV6ClearStateChangeHarness.sol";
diff --git a/test/concrete/raindex/RaindexV6.clear.context.t.sol b/test/concrete/raindex/RaindexV6.clear.context.t.sol
index 0e36e3f790..0e9c297eb4 100644
--- a/test/concrete/raindex/RaindexV6.clear.context.t.sol
+++ b/test/concrete/raindex/RaindexV6.clear.context.t.sol
@@ -12,7 +12,7 @@ import {
     SignedContextV1,
     IOV2,
     EvaluableV4
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {REVERTING_MOCK_BYTECODE} from "test/util/lib/LibTestConstants.sol";
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 
diff --git a/test/concrete/raindex/RaindexV6.clear.deadOrder.t.sol b/test/concrete/raindex/RaindexV6.clear.deadOrder.t.sol
index 24e32c5946..7091bf4ff6 100644
--- a/test/concrete/raindex/RaindexV6.clear.deadOrder.t.sol
+++ b/test/concrete/raindex/RaindexV6.clear.deadOrder.t.sol
@@ -7,7 +7,7 @@ import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRea
 import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol";
 import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol";
 import {LibOrder} from "../../../src/lib/LibOrder.sol";
-import {OrderConfigV4, OrderV4, ClearConfigV2, TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {OrderConfigV4, OrderV4, ClearConfigV2, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {SignedContextV1} from "rain-interpreter-interface-0.1.0/src/interface/deprecated/v1/IInterpreterCallerV2.sol";
 
 /// @title RaindexV6ClearDeadOrderTest
diff --git a/test/concrete/raindex/RaindexV6.clear.freshDriver.t.sol b/test/concrete/raindex/RaindexV6.clear.freshDriver.t.sol
index f726e6caa6..59e1c0cb45 100644
--- a/test/concrete/raindex/RaindexV6.clear.freshDriver.t.sol
+++ b/test/concrete/raindex/RaindexV6.clear.freshDriver.t.sol
@@ -15,7 +15,7 @@ import {
     IInterpreterV4,
     IInterpreterStoreV3,
     TaskV2
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol";
 import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol";
diff --git a/test/concrete/raindex/RaindexV6.clear.handleIO.revert.t.sol b/test/concrete/raindex/RaindexV6.clear.handleIO.revert.t.sol
index 997e853c16..21b1aaf31f 100644
--- a/test/concrete/raindex/RaindexV6.clear.handleIO.revert.t.sol
+++ b/test/concrete/raindex/RaindexV6.clear.handleIO.revert.t.sol
@@ -13,7 +13,7 @@ import {
     SignedContextV1,
     TaskV2,
     Float
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol";
 
diff --git a/test/concrete/raindex/RaindexV6.clear.mock.t.sol b/test/concrete/raindex/RaindexV6.clear.mock.t.sol
index a8f2616912..a8865a12a0 100644
--- a/test/concrete/raindex/RaindexV6.clear.mock.t.sol
+++ b/test/concrete/raindex/RaindexV6.clear.mock.t.sol
@@ -16,7 +16,7 @@ import {
     IInterpreterV4,
     TaskV2,
     Float
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol";
 import {NotOrderOwner, StackItem, NegativeBounty, ClearZeroAmount} from "../../../src/concrete/raindex/RaindexV6.sol";
 import {LibNamespace} from "rain-interpreter-interface-0.1.0/src/lib/ns/LibNamespace.sol";
diff --git a/test/concrete/raindex/RaindexV6.clear.sameOwner.t.sol b/test/concrete/raindex/RaindexV6.clear.sameOwner.t.sol
index 1d15a95058..ed9de13095 100644
--- a/test/concrete/raindex/RaindexV6.clear.sameOwner.t.sol
+++ b/test/concrete/raindex/RaindexV6.clear.sameOwner.t.sol
@@ -5,7 +5,7 @@ pragma solidity =0.8.25;
 import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol";
 import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol";
 import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol";
-import {OrderConfigV4, OrderV4, ClearConfigV2, TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {OrderConfigV4, OrderV4, ClearConfigV2, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {SignedContextV1} from "rain-interpreter-interface-0.1.0/src/interface/deprecated/v1/IInterpreterCallerV2.sol";
 import {SameOwner} from "../../../src/concrete/raindex/RaindexV6.sol";
 
diff --git a/test/concrete/raindex/RaindexV6.clear.sameToken.t.sol b/test/concrete/raindex/RaindexV6.clear.sameToken.t.sol
index df59bdf890..4db8e5df4e 100644
--- a/test/concrete/raindex/RaindexV6.clear.sameToken.t.sol
+++ b/test/concrete/raindex/RaindexV6.clear.sameToken.t.sol
@@ -4,15 +4,15 @@ pragma solidity =0.8.25;
 
 import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol";
 import {
+    IRaindexV6,
     OrderConfigV4,
     OrderV4,
     EvaluableV4,
     ClearConfigV2,
     SignedContextV1,
     TaskV2
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol";
-import {TokenSelfTrade} from "../../../src/concrete/raindex/RaindexV6.sol";
 
 contract RaindexV6ClearSameTokenTest is RaindexV6ExternalRealTest {
     /// forge-config: default.fuzz.runs = 10
@@ -42,7 +42,7 @@ contract RaindexV6ClearSameTokenTest is RaindexV6ExternalRealTest {
         vm.prank(bob);
         iRaindex.addOrder4(configBob, new TaskV2[](0));
 
-        vm.expectRevert(abi.encodeWithSelector(TokenSelfTrade.selector));
+        vm.expectRevert(abi.encodeWithSelector(IRaindexV6.TokenSelfTrade.selector));
         iRaindex.clear3(
             orderAlice, orderBob, ClearConfigV2(0, 0, 0, 0, 0, 0), new SignedContextV1[](0), new SignedContextV1[](0)
         );
diff --git a/test/concrete/raindex/RaindexV6.clear.zeroAmount.t.sol b/test/concrete/raindex/RaindexV6.clear.zeroAmount.t.sol
index 4f1920979d..c27bbbfa95 100644
--- a/test/concrete/raindex/RaindexV6.clear.zeroAmount.t.sol
+++ b/test/concrete/raindex/RaindexV6.clear.zeroAmount.t.sol
@@ -9,7 +9,7 @@ import {
     TaskV2,
     SignedContextV1,
     ClearConfigV2
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol";
 import {ClearZeroAmount} from "../../../src/concrete/raindex/RaindexV6.sol";
 
diff --git a/test/concrete/raindex/RaindexV6.deposit.entask.t.sol b/test/concrete/raindex/RaindexV6.deposit.entask.t.sol
index b398fb3457..539e8c3ad5 100644
--- a/test/concrete/raindex/RaindexV6.deposit.entask.t.sol
+++ b/test/concrete/raindex/RaindexV6.deposit.entask.t.sol
@@ -8,7 +8,7 @@ import {
     EvaluableV4,
     TaskV2,
     SignedContextV1
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol";
 import {LibFormatDecimalFloat} from "rain-math-float-0.1.1/src/lib/format/LibFormatDecimalFloat.sol";
diff --git a/test/concrete/raindex/RaindexV6.deposit.t.sol b/test/concrete/raindex/RaindexV6.deposit.t.sol
index 2d450ec2a6..d7d99dc4c3 100644
--- a/test/concrete/raindex/RaindexV6.deposit.t.sol
+++ b/test/concrete/raindex/RaindexV6.deposit.t.sol
@@ -5,7 +5,7 @@ pragma solidity =0.8.25;
 import {stdError} from "forge-std-1.16.1/src/Test.sol";
 import {REVERTING_MOCK_BYTECODE, CONSOLE_ADDRESS} from "test/util/lib/LibTestConstants.sol";
 import {RaindexV6ExternalMockTest} from "test/util/abstract/RaindexV6ExternalMockTest.sol";
-import {TaskV2, EvaluableV4, IRaindexV6} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TaskV2, EvaluableV4, IRaindexV6} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {Reenteroor} from "test/util/concrete/Reenteroor.sol";
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 import {LibDecimalFloat, Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
diff --git a/test/concrete/raindex/RaindexV6.depositWithdrawHarness.t.sol b/test/concrete/raindex/RaindexV6.depositWithdrawHarness.t.sol
index a90169b720..5957c8f52c 100644
--- a/test/concrete/raindex/RaindexV6.depositWithdrawHarness.t.sol
+++ b/test/concrete/raindex/RaindexV6.depositWithdrawHarness.t.sol
@@ -8,7 +8,7 @@ import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 import {MockToken} from "test/util/concrete/MockToken.sol";
 import {LibRainDeploy} from "rain-deploy-0.1.2/src/lib/LibRainDeploy.sol";
 import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol";
-import {TaskV2, IRaindexV6} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TaskV2, IRaindexV6} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IRaindexV6Stub} from "test/util/abstract/IRaindexV6Stub.sol";
 import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol";
 import {TOFUOutcome} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol";
diff --git a/test/concrete/raindex/RaindexV6.doPost.fresh.t.sol b/test/concrete/raindex/RaindexV6.doPost.fresh.t.sol
index cbdcd8c51f..e7078d2029 100644
--- a/test/concrete/raindex/RaindexV6.doPost.fresh.t.sol
+++ b/test/concrete/raindex/RaindexV6.doPost.fresh.t.sol
@@ -9,7 +9,7 @@ import {
     EvaluableV4,
     TaskV2,
     SignedContextV1
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol";
 import {LibOrder} from "../../../src/lib/LibOrder.sol";
 
diff --git a/test/concrete/raindex/RaindexV6.entask.t.sol b/test/concrete/raindex/RaindexV6.entask.t.sol
index c60c46e42e..e4298cfcdd 100644
--- a/test/concrete/raindex/RaindexV6.entask.t.sol
+++ b/test/concrete/raindex/RaindexV6.entask.t.sol
@@ -8,7 +8,7 @@ import {
     EvaluableV4,
     TaskV2,
     SignedContextV1
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 
 contract RaindexV6EnactTest is RaindexV6ExternalRealTest {
     function checkReentrancyRW() internal view {
diff --git a/test/concrete/raindex/RaindexV6.multicall.t.sol b/test/concrete/raindex/RaindexV6.multicall.t.sol
index 40bc7d067d..850314a682 100644
--- a/test/concrete/raindex/RaindexV6.multicall.t.sol
+++ b/test/concrete/raindex/RaindexV6.multicall.t.sol
@@ -4,7 +4,7 @@ pragma solidity =0.8.25;
 
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol";
-import {IRaindexV6, TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {IRaindexV6, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 
 /// `multicall` is inherited from OpenZeppelin and not declared on the Raindex
diff --git a/test/concrete/raindex/RaindexV6.orderMgmt.fresh.t.sol b/test/concrete/raindex/RaindexV6.orderMgmt.fresh.t.sol
index bd763ab386..47b3e6f15f 100644
--- a/test/concrete/raindex/RaindexV6.orderMgmt.fresh.t.sol
+++ b/test/concrete/raindex/RaindexV6.orderMgmt.fresh.t.sol
@@ -10,7 +10,7 @@ import {
     EvaluableV4,
     TaskV2,
     SignedContextV1
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IMetaV1_2} from "rain-metadata-0.1.0/src/interface/unstable/IMetaV1_2.sol";
 import {META_MAGIC_NUMBER_V1} from "rain-metadata-0.1.0/src/lib/LibMeta.sol";
 import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol";
diff --git a/test/concrete/raindex/RaindexV6.quote.sameToken.t.sol b/test/concrete/raindex/RaindexV6.quote.sameToken.t.sol
index dbd3f3fe0c..e0de1234e8 100644
--- a/test/concrete/raindex/RaindexV6.quote.sameToken.t.sol
+++ b/test/concrete/raindex/RaindexV6.quote.sameToken.t.sol
@@ -4,14 +4,14 @@ pragma solidity =0.8.25;
 
 import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol";
 import {
+    IRaindexV6,
     QuoteV2,
     OrderConfigV4,
     OrderV4,
     IOV2,
     SignedContextV1,
     TaskV2
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
-import {TokenSelfTrade} from "../../../src/concrete/raindex/RaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol";
 
@@ -42,7 +42,7 @@ contract RaindexV6QuoteSameTokenTest is RaindexV6ExternalRealTest {
             }),
             new TaskV2[](0)
         );
-        vm.expectRevert(abi.encodeWithSelector(TokenSelfTrade.selector));
+        vm.expectRevert(abi.encodeWithSelector(IRaindexV6.TokenSelfTrade.selector));
         (bool success, Float maxOutput, Float ioRatio) = iRaindex.quote2(quoteConfig);
         (success, maxOutput, ioRatio);
     }
@@ -88,7 +88,7 @@ contract RaindexV6QuoteSameTokenTest is RaindexV6ExternalRealTest {
             QuoteV2({order: order, inputIOIndex: 0, outputIOIndex: 1, signedContext: new SignedContextV1[](0)});
 
         // validInputs[0] (tokenA) == validOutputs[1] (tokenA): self-trade.
-        vm.expectRevert(abi.encodeWithSelector(TokenSelfTrade.selector));
+        vm.expectRevert(abi.encodeWithSelector(IRaindexV6.TokenSelfTrade.selector));
         (bool success, Float maxOutput, Float ioRatio) = iRaindex.quote2(quoteConfig);
         (success, maxOutput, ioRatio);
     }
diff --git a/test/concrete/raindex/RaindexV6.quote.t.sol b/test/concrete/raindex/RaindexV6.quote.t.sol
index 0fc06d9d45..580750cb8a 100644
--- a/test/concrete/raindex/RaindexV6.quote.t.sol
+++ b/test/concrete/raindex/RaindexV6.quote.t.sol
@@ -11,11 +11,10 @@ import {
     TaskV2,
     OrderV4,
     SignedContextV1
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol";
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol";
-import {TokenSelfTrade} from "../../../src/concrete/raindex/RaindexV6.sol";
 import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 import {Strings} from "@openzeppelin-contracts-5.6.1/utils/Strings.sol";
 
diff --git a/test/concrete/raindex/RaindexV6.removeOrder.entask.t.sol b/test/concrete/raindex/RaindexV6.removeOrder.entask.t.sol
index 73f0d9699d..395874bcbd 100644
--- a/test/concrete/raindex/RaindexV6.removeOrder.entask.t.sol
+++ b/test/concrete/raindex/RaindexV6.removeOrder.entask.t.sol
@@ -9,7 +9,7 @@ import {
     OrderV4,
     TaskV2,
     SignedContextV1
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol";
 import {LibOrder} from "../../../src/lib/LibOrder.sol";
 
diff --git a/test/concrete/raindex/RaindexV6.removeOrder.mock.t.sol b/test/concrete/raindex/RaindexV6.removeOrder.mock.t.sol
index 74ab223a6d..215755e683 100644
--- a/test/concrete/raindex/RaindexV6.removeOrder.mock.t.sol
+++ b/test/concrete/raindex/RaindexV6.removeOrder.mock.t.sol
@@ -3,7 +3,7 @@
 pragma solidity =0.8.25;
 
 import {RaindexV6ExternalMockTest} from "test/util/abstract/RaindexV6ExternalMockTest.sol";
-import {OrderConfigV4, OrderV4, EvaluableV4, TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {OrderConfigV4, OrderV4, EvaluableV4, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol";
 import {NotOrderOwner} from "../../../src/concrete/raindex/RaindexV6.sol";
 
diff --git a/test/concrete/raindex/RaindexV6.removeOrder.owner.t.sol b/test/concrete/raindex/RaindexV6.removeOrder.owner.t.sol
index ee801705ba..68def23b5d 100644
--- a/test/concrete/raindex/RaindexV6.removeOrder.owner.t.sol
+++ b/test/concrete/raindex/RaindexV6.removeOrder.owner.t.sol
@@ -3,7 +3,7 @@
 pragma solidity =0.8.25;
 
 import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol";
-import {OrderConfigV4, OrderV4, EvaluableV4, TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {OrderConfigV4, OrderV4, EvaluableV4, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol";
 import {LibOrder} from "../../../src/lib/LibOrder.sol";
 import {NotOrderOwner} from "../../../src/concrete/raindex/RaindexV6.sol";
diff --git a/test/concrete/raindex/RaindexV6.takeOrder.badStack.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.badStack.t.sol
index c009319168..b5f0194c09 100644
--- a/test/concrete/raindex/RaindexV6.takeOrder.badStack.t.sol
+++ b/test/concrete/raindex/RaindexV6.takeOrder.badStack.t.sol
@@ -5,7 +5,7 @@ pragma solidity =0.8.25;
 import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol";
 import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol";
 import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol";
-import {OrderConfigV4, OrderV4, TaskV2, TakeOrdersConfigV5} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {OrderConfigV4, OrderV4, TaskV2, TakeOrdersConfigV5} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {UnsupportedCalculateOutputs} from "../../../src/concrete/raindex/RaindexV6.sol";
 
 contract RaindexV6TakeOrderBadStackTest is RaindexV6ExternalRealTest {
diff --git a/test/concrete/raindex/RaindexV6.takeOrder.batchEvalConsistency.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.batchEvalConsistency.t.sol
index 9f860a3ee8..7a667285c1 100644
--- a/test/concrete/raindex/RaindexV6.takeOrder.batchEvalConsistency.t.sol
+++ b/test/concrete/raindex/RaindexV6.takeOrder.batchEvalConsistency.t.sol
@@ -14,7 +14,7 @@ import {
     TakeOrdersConfigV5,
     SignedContextV1,
     TaskV2
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 
 /// @title RaindexV6TakeOrderBatchEvalConsistencyTest
diff --git a/test/concrete/raindex/RaindexV6.takeOrder.batchStateAdversarial.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.batchStateAdversarial.t.sol
index e345d87868..b2d8146558 100644
--- a/test/concrete/raindex/RaindexV6.takeOrder.batchStateAdversarial.t.sol
+++ b/test/concrete/raindex/RaindexV6.takeOrder.batchStateAdversarial.t.sol
@@ -12,7 +12,7 @@ import {
     TakeOrdersConfigV5,
     SignedContextV1,
     TaskV2
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 
 /// @title RaindexV6TakeOrderBatchStateAdversarialTest
diff --git a/test/concrete/raindex/RaindexV6.takeOrder.batchStateBypass.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.batchStateBypass.t.sol
index 9e7b5d4806..e782d075f0 100644
--- a/test/concrete/raindex/RaindexV6.takeOrder.batchStateBypass.t.sol
+++ b/test/concrete/raindex/RaindexV6.takeOrder.batchStateBypass.t.sol
@@ -11,7 +11,7 @@ import {
     TakeOrdersConfigV5,
     SignedContextV1,
     TaskV2
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 
 /// @title RaindexV6TakeOrderBatchStateBypassTest
diff --git a/test/concrete/raindex/RaindexV6.takeOrder.calculationsContext.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.calculationsContext.t.sol
index 6b55943f2f..b8bbde46b2 100644
--- a/test/concrete/raindex/RaindexV6.takeOrder.calculationsContext.t.sol
+++ b/test/concrete/raindex/RaindexV6.takeOrder.calculationsContext.t.sol
@@ -4,7 +4,7 @@ pragma solidity =0.8.25;
 
 import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol";
 import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol";
-import {OrderV4, TakeOrdersConfigV5, IRaindexV6} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {OrderV4, TakeOrdersConfigV5, IRaindexV6} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 import {Strings} from "@openzeppelin-contracts-5.6.1/utils/Strings.sol";
 import {LibOrder} from "../../../src/lib/LibOrder.sol";
diff --git a/test/concrete/raindex/RaindexV6.takeOrder.exceedsMaxRatio.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.exceedsMaxRatio.t.sol
index 637e0eb6a6..c3730c03da 100644
--- a/test/concrete/raindex/RaindexV6.takeOrder.exceedsMaxRatio.t.sol
+++ b/test/concrete/raindex/RaindexV6.takeOrder.exceedsMaxRatio.t.sol
@@ -5,7 +5,7 @@ pragma solidity =0.8.25;
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol";
 import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol";
-import {OrderV4, TakeOrdersConfigV5, TaskV2, IRaindexV6} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {OrderV4, TakeOrdersConfigV5, TaskV2, IRaindexV6} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 import {LibOrder} from "../../../src/lib/LibOrder.sol";
 
diff --git a/test/concrete/raindex/RaindexV6.takeOrder.freshMutation.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.freshMutation.t.sol
index e732e93c56..e14e0839bc 100644
--- a/test/concrete/raindex/RaindexV6.takeOrder.freshMutation.t.sol
+++ b/test/concrete/raindex/RaindexV6.takeOrder.freshMutation.t.sol
@@ -13,7 +13,7 @@ import {
     TakeOrdersConfigV5,
     TaskV2,
     IRaindexV6
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {SignedContextV1} from "rain-interpreter-interface-0.1.0/src/interface/deprecated/v1/IInterpreterCallerV2.sol";
 import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 import {LibOrder} from "../../../src/lib/LibOrder.sol";
@@ -328,7 +328,7 @@ contract RaindexV6TakeOrderFreshMutationTest is RaindexV6FreshTakeOrderTest {
         config.maximumIO = LibDecimalFloat.packLossless(5, 0);
 
         vm.prank(bob);
-        // selector for TokenSelfTrade() is the src-level error.
+        // selector for TokenSelfTrade() as declared on IRaindexV6.
         vm.expectRevert(bytes4(keccak256("TokenSelfTrade()")));
         iRaindex.takeOrders4(config);
     }
diff --git a/test/concrete/raindex/RaindexV6.takeOrder.freshVaultZero.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.freshVaultZero.t.sol
index 8847231964..db680c9c57 100644
--- a/test/concrete/raindex/RaindexV6.takeOrder.freshVaultZero.t.sol
+++ b/test/concrete/raindex/RaindexV6.takeOrder.freshVaultZero.t.sol
@@ -13,7 +13,7 @@ import {
     TakeOrdersConfigV5,
     SignedContextV1,
     TaskV2
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 
 /// @title RaindexV6TakeOrderFreshVaultZeroTest
diff --git a/test/concrete/raindex/RaindexV6.takeOrder.handleIO.revert.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.handleIO.revert.t.sol
index fbca22f9c3..80adcfd11b 100644
--- a/test/concrete/raindex/RaindexV6.takeOrder.handleIO.revert.t.sol
+++ b/test/concrete/raindex/RaindexV6.takeOrder.handleIO.revert.t.sol
@@ -12,7 +12,7 @@ import {
     TakeOrdersConfigV5,
     EvaluableV4,
     TaskV2
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol";
 import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol";
diff --git a/test/concrete/raindex/RaindexV6.takeOrder.maximumInput.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.maximumInput.t.sol
index e5193bf570..64deb41871 100644
--- a/test/concrete/raindex/RaindexV6.takeOrder.maximumInput.t.sol
+++ b/test/concrete/raindex/RaindexV6.takeOrder.maximumInput.t.sol
@@ -13,7 +13,7 @@ import {
     OrderConfigV4,
     TaskV2,
     IRaindexV6
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {SignedContextV1} from "rain-interpreter-interface-0.1.0/src/interface/deprecated/v1/IInterpreterCallerV2.sol";
 import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol";
 
diff --git a/test/concrete/raindex/RaindexV6.takeOrder.maximumOutput.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.maximumOutput.t.sol
index 8d3061975e..ceede19639 100644
--- a/test/concrete/raindex/RaindexV6.takeOrder.maximumOutput.t.sol
+++ b/test/concrete/raindex/RaindexV6.takeOrder.maximumOutput.t.sol
@@ -14,7 +14,7 @@ import {
     IOV2,
     EvaluableV4,
     TaskV2
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol";
 import {LibDecimalFloat, Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 
diff --git a/test/concrete/raindex/RaindexV6.takeOrder.minimumIO.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.minimumIO.t.sol
index 79d713fb79..a4c2476122 100644
--- a/test/concrete/raindex/RaindexV6.takeOrder.minimumIO.t.sol
+++ b/test/concrete/raindex/RaindexV6.takeOrder.minimumIO.t.sol
@@ -5,7 +5,7 @@ pragma solidity =0.8.25;
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol";
 import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol";
-import {OrderV4, TakeOrdersConfigV5, TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {OrderV4, TakeOrdersConfigV5, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 import {MinimumIO} from "../../../src/concrete/raindex/RaindexV6.sol";
 
diff --git a/test/concrete/raindex/RaindexV6.takeOrder.minimumIOOutput.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.minimumIOOutput.t.sol
index a9082c2192..8f18df4f5f 100644
--- a/test/concrete/raindex/RaindexV6.takeOrder.minimumIOOutput.t.sol
+++ b/test/concrete/raindex/RaindexV6.takeOrder.minimumIOOutput.t.sol
@@ -5,7 +5,7 @@ pragma solidity =0.8.25;
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol";
 import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol";
-import {OrderV4, TakeOrdersConfigV5, TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {OrderV4, TakeOrdersConfigV5, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 import {MinimumIO} from "../../../src/concrete/raindex/RaindexV6.sol";
 
diff --git a/test/concrete/raindex/RaindexV6.takeOrder.noop.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.noop.t.sol
index 6cae97d72f..20c0884420 100644
--- a/test/concrete/raindex/RaindexV6.takeOrder.noop.t.sol
+++ b/test/concrete/raindex/RaindexV6.takeOrder.noop.t.sol
@@ -12,7 +12,7 @@ import {
     TakeOrdersConfigV5,
     TakeOrderConfigV4,
     SignedContextV1
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol";
 
diff --git a/test/concrete/raindex/RaindexV6.takeOrder.precision.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.precision.t.sol
index 19b3f543b2..f12f33d8bb 100644
--- a/test/concrete/raindex/RaindexV6.takeOrder.precision.t.sol
+++ b/test/concrete/raindex/RaindexV6.takeOrder.precision.t.sol
@@ -12,7 +12,7 @@ import {
     OrderConfigV4,
     EvaluableV4,
     TaskV2
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol";
 import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol";
diff --git a/test/concrete/raindex/RaindexV6.takeOrder.sameToken.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.sameToken.t.sol
index 1a91ef9cea..d4218a1894 100644
--- a/test/concrete/raindex/RaindexV6.takeOrder.sameToken.t.sol
+++ b/test/concrete/raindex/RaindexV6.takeOrder.sameToken.t.sol
@@ -4,15 +4,15 @@ pragma solidity =0.8.25;
 
 import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol";
 import {
+    IRaindexV6,
     OrderConfigV4,
     OrderV4,
     TaskV2,
     TakeOrderConfigV4,
     SignedContextV1,
     TakeOrdersConfigV5
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol";
-import {TokenSelfTrade} from "../../../src/concrete/raindex/RaindexV6.sol";
 import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 
 contract RaindexV6TakeOrderSameTokenTest is RaindexV6ExternalRealTest {
@@ -42,7 +42,7 @@ contract RaindexV6TakeOrderSameTokenTest is RaindexV6ExternalRealTest {
             data: ""
         });
 
-        vm.expectRevert(abi.encodeWithSelector(TokenSelfTrade.selector));
+        vm.expectRevert(abi.encodeWithSelector(IRaindexV6.TokenSelfTrade.selector));
         iRaindex.takeOrders4(takeOrdersConfig);
     }
 }
diff --git a/test/concrete/raindex/RaindexV6.takeOrder.takenFlag.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.takenFlag.t.sol
index 90ddcd4854..9fcb0352d8 100644
--- a/test/concrete/raindex/RaindexV6.takeOrder.takenFlag.t.sol
+++ b/test/concrete/raindex/RaindexV6.takeOrder.takenFlag.t.sol
@@ -5,7 +5,7 @@ pragma solidity =0.8.25;
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol";
 import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol";
-import {OrderV4, TakeOrdersConfigV5, TaskV2, IRaindexV6} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {OrderV4, TakeOrdersConfigV5, TaskV2, IRaindexV6} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 import {LibOrder} from "../../../src/lib/LibOrder.sol";
 import {RecordingOrderTaker} from "test/util/concrete/RecordingOrderTaker.sol";
diff --git a/test/concrete/raindex/RaindexV6.takeOrder.tokenMismatch.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.tokenMismatch.t.sol
index 0c144c626f..cdffd6bc22 100644
--- a/test/concrete/raindex/RaindexV6.takeOrder.tokenMismatch.t.sol
+++ b/test/concrete/raindex/RaindexV6.takeOrder.tokenMismatch.t.sol
@@ -10,7 +10,7 @@ import {
     TakeOrdersConfigV5,
     EvaluableV4,
     SignedContextV1
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {TokenMismatch} from "../../../src/concrete/raindex/RaindexV6.sol";
 import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 
diff --git a/test/concrete/raindex/RaindexV6.takeOrder.vaultZeroInput.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.vaultZeroInput.t.sol
index b36babf64d..e41fe4e19a 100644
--- a/test/concrete/raindex/RaindexV6.takeOrder.vaultZeroInput.t.sol
+++ b/test/concrete/raindex/RaindexV6.takeOrder.vaultZeroInput.t.sol
@@ -15,7 +15,7 @@ import {
     ClearConfigV2,
     SignedContextV1,
     TaskV2
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 import {NegativeBounty} from "../../../src/concrete/raindex/RaindexV6.sol";
 
diff --git a/test/concrete/raindex/RaindexV6.takeOrder.zeroAmount.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.zeroAmount.t.sol
index a3be70f716..139599427b 100644
--- a/test/concrete/raindex/RaindexV6.takeOrder.zeroAmount.t.sol
+++ b/test/concrete/raindex/RaindexV6.takeOrder.zeroAmount.t.sol
@@ -6,7 +6,7 @@ import {Vm} from "forge-std-1.16.1/src/Test.sol";
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 import {RaindexV6ExternalRealTest} from "test/util/abstract/RaindexV6ExternalRealTest.sol";
 import {LibTestTakeOrder} from "test/util/lib/LibTestTakeOrder.sol";
-import {OrderV4, TakeOrdersConfigV5, TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {OrderV4, TakeOrdersConfigV5, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 import {LibOrder} from "../../../src/lib/LibOrder.sol";
 
diff --git a/test/concrete/raindex/RaindexV6.takeOrder.zeroMaxOOBIndex.t.sol b/test/concrete/raindex/RaindexV6.takeOrder.zeroMaxOOBIndex.t.sol
index b78cf70aba..274bd4deca 100644
--- a/test/concrete/raindex/RaindexV6.takeOrder.zeroMaxOOBIndex.t.sol
+++ b/test/concrete/raindex/RaindexV6.takeOrder.zeroMaxOOBIndex.t.sol
@@ -9,7 +9,7 @@ import {
     TakeOrderConfigV4,
     TakeOrdersConfigV5,
     IRaindexV6
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {SignedContextV1} from "rain-interpreter-interface-0.1.0/src/interface/deprecated/v1/IInterpreterCallerV2.sol";
 import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 
diff --git a/test/concrete/raindex/RaindexV6.vaultBalance.t.sol b/test/concrete/raindex/RaindexV6.vaultBalance.t.sol
index 9eda5a22f0..4b99361dd3 100644
--- a/test/concrete/raindex/RaindexV6.vaultBalance.t.sol
+++ b/test/concrete/raindex/RaindexV6.vaultBalance.t.sol
@@ -4,7 +4,7 @@ pragma solidity =0.8.25;
 
 import {RaindexV6ExternalMockTest} from "test/util/abstract/RaindexV6ExternalMockTest.sol";
 import {LibDecimalFloat, Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
-import {IRaindexV6} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {IRaindexV6} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 
 /// @title RaindexV6VaultBalanceTest
 /// Tests the basic functionality of reading from the vault balance.
diff --git a/test/concrete/raindex/RaindexV6.vaultBalanceVault0.t.sol b/test/concrete/raindex/RaindexV6.vaultBalanceVault0.t.sol
index b60f1ee89b..1eb44f6cb5 100644
--- a/test/concrete/raindex/RaindexV6.vaultBalanceVault0.t.sol
+++ b/test/concrete/raindex/RaindexV6.vaultBalanceVault0.t.sol
@@ -6,7 +6,7 @@ import {RaindexV6ExternalMockTest} from "test/util/abstract/RaindexV6ExternalMoc
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol";
 import {LibDecimalFloat, Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
-import {TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {TOFUOutcome} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol";
 import {ITOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/interface/ITOFUTokenDecimals.sol";
 
diff --git a/test/concrete/raindex/RaindexV6.withdraw.entask.t.sol b/test/concrete/raindex/RaindexV6.withdraw.entask.t.sol
index aa2536e577..e5049f4bc1 100644
--- a/test/concrete/raindex/RaindexV6.withdraw.entask.t.sol
+++ b/test/concrete/raindex/RaindexV6.withdraw.entask.t.sol
@@ -8,7 +8,7 @@ import {
     EvaluableV4,
     TaskV2,
     SignedContextV1
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol";
 
diff --git a/test/concrete/raindex/RaindexV6.withdraw.t.sol b/test/concrete/raindex/RaindexV6.withdraw.t.sol
index c093e2ab8d..dcaf3c940b 100644
--- a/test/concrete/raindex/RaindexV6.withdraw.t.sol
+++ b/test/concrete/raindex/RaindexV6.withdraw.t.sol
@@ -8,7 +8,7 @@ import {Math} from "@openzeppelin-contracts-5.6.1/utils/math/Math.sol";
 
 import {RaindexV6ExternalMockTest, REVERTING_MOCK_BYTECODE} from "test/util/abstract/RaindexV6ExternalMockTest.sol";
 import {Reenteroor, IERC20} from "test/util/concrete/Reenteroor.sol";
-import {TaskV2, IRaindexV6} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TaskV2, IRaindexV6} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol";
 
 import {Float, LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
diff --git a/test/lib/LibOrder.t.sol b/test/lib/LibOrder.t.sol
index 021ef24331..dc7e284899 100644
--- a/test/lib/LibOrder.t.sol
+++ b/test/lib/LibOrder.t.sol
@@ -6,7 +6,7 @@ import {Test} from "forge-std-1.16.1/src/Test.sol";
 
 import {LibOrder, OrderV4} from "../../src/lib/LibOrder.sol";
 import {EvaluableV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterCallerV4.sol";
-import {IOV2} from "raindex-interface-0.1.1/src/interface/deprecated/v5/IOrderBookV5.sol";
+import {IOV2} from "raindex-interface-0.1.3/src/interface/deprecated/v5/IOrderBookV5.sol";
 
 /// @title LibOrderTest
 /// Exercises the LibOrder library.
diff --git a/test/lib/LibRaindex.doPost.t.sol b/test/lib/LibRaindex.doPost.t.sol
index c13283bd92..7ded58bbb4 100644
--- a/test/lib/LibRaindex.doPost.t.sol
+++ b/test/lib/LibRaindex.doPost.t.sol
@@ -4,7 +4,7 @@ pragma solidity =0.8.25;
 
 import {Test} from "forge-std-1.16.1/src/Test.sol";
 import {LibRaindexDoPostHarness} from "test/util/concrete/LibRaindexDoPostHarness.sol";
-import {TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4, StackItem} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {StateNamespace} from "rain-interpreter-interface-0.1.0/src/interface/deprecated/v2/IInterpreterStoreV2.sol";
diff --git a/test/lib/LibRaindexArb.finalizeArbTaskContext.t.sol b/test/lib/LibRaindexArb.finalizeArbTaskContext.t.sol
index 123c0a07c2..75eb40621a 100644
--- a/test/lib/LibRaindexArb.finalizeArbTaskContext.t.sol
+++ b/test/lib/LibRaindexArb.finalizeArbTaskContext.t.sol
@@ -3,7 +3,7 @@
 pragma solidity =0.8.25;
 
 import {Test} from "forge-std-1.16.1/src/Test.sol";
-import {EvaluableV4, SignedContextV1, TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {EvaluableV4, SignedContextV1, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {IParserV2} from "rain-interpreter-interface-0.1.0/src/interface/IParserV2.sol";
diff --git a/test/util/abstract/IRaindexV6Stub.sol b/test/util/abstract/IRaindexV6Stub.sol
index 472353660a..a3a2f089f7 100644
--- a/test/util/abstract/IRaindexV6Stub.sol
+++ b/test/util/abstract/IRaindexV6Stub.sol
@@ -13,9 +13,9 @@ import {
     TaskV2,
     QuoteV2,
     Float
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
-import {IERC3156FlashLender} from "raindex-interface-0.1.1/src/interface/ierc3156/IERC3156FlashLender.sol";
-import {IERC3156FlashBorrower} from "raindex-interface-0.1.1/src/interface/ierc3156/IERC3156FlashBorrower.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
+import {IERC3156FlashLender} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashLender.sol";
+import {IERC3156FlashBorrower} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol";
 
 abstract contract IRaindexV6Stub is IRaindexV6 {
     /// @inheritdoc IRaindexV6
diff --git a/test/util/abstract/MockRaindexBase.sol b/test/util/abstract/MockRaindexBase.sol
index 46a4e85f2e..a21614973b 100644
--- a/test/util/abstract/MockRaindexBase.sol
+++ b/test/util/abstract/MockRaindexBase.sol
@@ -14,8 +14,8 @@ import {
     TaskV2,
     QuoteV2,
     Float
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
-import {IERC3156FlashBorrower} from "raindex-interface-0.1.1/src/interface/ierc3156/IERC3156FlashBorrower.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
+import {IERC3156FlashBorrower} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol";
 
 /// @dev Base for mock raindex contracts that stub all IRaindexV6 functions.
 /// Inheritors override flashLoan and/or takeOrders4 with real token transfers.
diff --git a/test/util/abstract/RaindexV6ExternalMockTest.sol b/test/util/abstract/RaindexV6ExternalMockTest.sol
index 2abec798fc..0f16b28252 100644
--- a/test/util/abstract/RaindexV6ExternalMockTest.sol
+++ b/test/util/abstract/RaindexV6ExternalMockTest.sol
@@ -11,7 +11,7 @@ import {IRaindexV6Stub} from "test/util/abstract/IRaindexV6Stub.sol";
 import {LibTestAddOrder} from "test/util/lib/LibTestAddOrder.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
-import {IRaindexV6, OrderConfigV4, OrderV4, TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {IRaindexV6, OrderConfigV4, OrderV4, TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 import {LibOrder} from "../../../src/lib/LibOrder.sol";
 import {LibRaindexDeploy} from "../../../src/lib/deploy/LibRaindexDeploy.sol";
diff --git a/test/util/abstract/RaindexV6ExternalRealTest.sol b/test/util/abstract/RaindexV6ExternalRealTest.sol
index c372732ed8..10fecc9ee2 100644
--- a/test/util/abstract/RaindexV6ExternalRealTest.sol
+++ b/test/util/abstract/RaindexV6ExternalRealTest.sol
@@ -13,7 +13,7 @@ import {
     TaskV2,
     EvaluableV4,
     SignedContextV1
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 import {RaindexV6SubParser} from "../../../src/concrete/parser/RaindexV6SubParser.sol";
 import {IERC20Metadata} from "@openzeppelin-contracts-5.6.1/token/ERC20/extensions/IERC20Metadata.sol";
diff --git a/test/util/concrete/Alice.sol b/test/util/concrete/Alice.sol
index c92fb39384..fec9acf1a8 100644
--- a/test/util/concrete/Alice.sol
+++ b/test/util/concrete/Alice.sol
@@ -6,7 +6,7 @@ import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 import {
     IERC3156FlashBorrower,
     ON_FLASH_LOAN_CALLBACK_SUCCESS
-} from "raindex-interface-0.1.1/src/interface/ierc3156/IERC3156FlashBorrower.sol";
+} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol";
 import {IPull} from "test/util/concrete/IPull.sol";
 
 /// Alice has some daisy contract pull tokens from her.
diff --git a/test/util/concrete/ChildGatedRaindexV6ArbOrderTaker.sol b/test/util/concrete/ChildGatedRaindexV6ArbOrderTaker.sol
index 9191011747..345268955f 100644
--- a/test/util/concrete/ChildGatedRaindexV6ArbOrderTaker.sol
+++ b/test/util/concrete/ChildGatedRaindexV6ArbOrderTaker.sol
@@ -4,7 +4,7 @@ pragma solidity =0.8.25;
 
 import {RaindexV6ArbOrderTaker} from "../../../src/abstract/RaindexV6ArbOrderTaker.sol";
 import {RaindexV6ArbTaskGated, RaindexV6ArbConfig} from "../../../src/abstract/RaindexV6ArbTaskGated.sol";
-import {TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 
 /// @dev A task-gated arb order taker: combines the `arb5` entrypoint from
 /// `RaindexV6ArbOrderTaker` with the task-hash gating mixin
diff --git a/test/util/concrete/ChildGatedRaindexV6FlashBorrower.sol b/test/util/concrete/ChildGatedRaindexV6FlashBorrower.sol
index f75f6208eb..49934cb0b0 100644
--- a/test/util/concrete/ChildGatedRaindexV6FlashBorrower.sol
+++ b/test/util/concrete/ChildGatedRaindexV6FlashBorrower.sol
@@ -4,7 +4,7 @@ pragma solidity =0.8.25;
 
 import {RaindexV6FlashBorrower} from "../../../src/abstract/RaindexV6FlashBorrower.sol";
 import {RaindexV6ArbTaskGated, RaindexV6ArbConfig} from "../../../src/abstract/RaindexV6ArbTaskGated.sol";
-import {TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 
 /// @dev A task-gated flash borrower arb: combines the `arb4` entrypoint from
 /// `RaindexV6FlashBorrower` with the task-hash gating mixin
diff --git a/test/util/concrete/ChildRaindexV6ArbTaskGated.sol b/test/util/concrete/ChildRaindexV6ArbTaskGated.sol
index 0d5dd0679d..bf26669cf3 100644
--- a/test/util/concrete/ChildRaindexV6ArbTaskGated.sol
+++ b/test/util/concrete/ChildRaindexV6ArbTaskGated.sol
@@ -3,7 +3,7 @@
 pragma solidity =0.8.25;
 
 import {RaindexV6ArbTaskGated, RaindexV6ArbConfig} from "../../../src/abstract/RaindexV6ArbTaskGated.sol";
-import {TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 
 /// @dev We need a contract that is deployable in order to test the abstract
 /// base contract. Exposes `_checkTaskHash` as an external function.
diff --git a/test/util/concrete/FlashLendingMockRaindex.sol b/test/util/concrete/FlashLendingMockRaindex.sol
index b9c659dbd5..fb9613306f 100644
--- a/test/util/concrete/FlashLendingMockRaindex.sol
+++ b/test/util/concrete/FlashLendingMockRaindex.sol
@@ -15,8 +15,8 @@ import {
     TaskV2,
     QuoteV2,
     Float
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
-import {IERC3156FlashBorrower} from "raindex-interface-0.1.1/src/interface/ierc3156/IERC3156FlashBorrower.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
+import {IERC3156FlashBorrower} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol";
 
 contract FlashLendingMockRaindex is IRaindexV6 {
     function flashLoan(IERC3156FlashBorrower receiver, address token, uint256 amount, bytes calldata data)
diff --git a/test/util/concrete/LeftoverFlashLendingMockRaindex.sol b/test/util/concrete/LeftoverFlashLendingMockRaindex.sol
index f09449ffdc..92dfc7c490 100644
--- a/test/util/concrete/LeftoverFlashLendingMockRaindex.sol
+++ b/test/util/concrete/LeftoverFlashLendingMockRaindex.sol
@@ -7,7 +7,7 @@ import {SafeERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/utils/SafeERC
 import {
     IERC3156FlashBorrower,
     ON_FLASH_LOAN_CALLBACK_SUCCESS
-} from "raindex-interface-0.1.1/src/interface/ierc3156/IERC3156FlashBorrower.sol";
+} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol";
 import {MockRaindexBase} from "test/util/abstract/MockRaindexBase.sol";
 
 /// @dev Mock raindex whose `flashLoan` performs a real net-neutral ERC3156
diff --git a/test/util/concrete/LibRaindexArbFinalizeHarness.sol b/test/util/concrete/LibRaindexArbFinalizeHarness.sol
index 593b6893f3..95e99eb9d1 100644
--- a/test/util/concrete/LibRaindexArbFinalizeHarness.sol
+++ b/test/util/concrete/LibRaindexArbFinalizeHarness.sol
@@ -3,7 +3,7 @@
 pragma solidity =0.8.25;
 
 import {LibRaindexArb} from "src/lib/LibRaindexArb.sol";
-import {TaskV2, SignedContextV1, EvaluableV4} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TaskV2, SignedContextV1, EvaluableV4} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 
diff --git a/test/util/concrete/LibRaindexDoPostHarness.sol b/test/util/concrete/LibRaindexDoPostHarness.sol
index 611c6c8372..a26645df2a 100644
--- a/test/util/concrete/LibRaindexDoPostHarness.sol
+++ b/test/util/concrete/LibRaindexDoPostHarness.sol
@@ -3,7 +3,7 @@
 pragma solidity =0.8.25;
 
 import {LibRaindex} from "src/lib/LibRaindex.sol";
-import {TaskV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TaskV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 
 /// @dev Exposes the internal `LibRaindex.doPost` for direct testing.
 contract LibRaindexDoPostHarness {
diff --git a/test/util/concrete/MaliciousRaindex.sol b/test/util/concrete/MaliciousRaindex.sol
index d75d43942f..4824002de9 100644
--- a/test/util/concrete/MaliciousRaindex.sol
+++ b/test/util/concrete/MaliciousRaindex.sol
@@ -3,7 +3,7 @@
 pragma solidity =0.8.25;
 
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
-import {IERC3156FlashBorrower} from "raindex-interface-0.1.1/src/interface/ierc3156/IERC3156FlashBorrower.sol";
+import {IERC3156FlashBorrower} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol";
 import {MockRaindexBase} from "test/util/abstract/MockRaindexBase.sol";
 
 /// @dev Malicious raindex that records the token allowances it has from the
diff --git a/test/util/concrete/RaindexV6CalculateOrderIOHarness.sol b/test/util/concrete/RaindexV6CalculateOrderIOHarness.sol
index 76dfbd579d..625b9dff86 100644
--- a/test/util/concrete/RaindexV6CalculateOrderIOHarness.sol
+++ b/test/util/concrete/RaindexV6CalculateOrderIOHarness.sol
@@ -4,7 +4,7 @@ pragma solidity =0.8.25;
 
 import {RaindexV6, OrderIOCalculationV4} from "src/concrete/raindex/RaindexV6.sol";
 import {Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
-import {OrderV4, SignedContextV1} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {OrderV4, SignedContextV1} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {TOFUOutcome} from "rain-tofu-erc20-decimals-0.1.1/src/interface/ITOFUTokenDecimals.sol";
 import {LibTOFUTokenDecimals} from "rain-tofu-erc20-decimals-0.1.1/src/lib/LibTOFUTokenDecimals.sol";
 
diff --git a/test/util/concrete/RaindexV6ClearStateChangeHarness.sol b/test/util/concrete/RaindexV6ClearStateChangeHarness.sol
index b0676b338d..4f37b24d33 100644
--- a/test/util/concrete/RaindexV6ClearStateChangeHarness.sol
+++ b/test/util/concrete/RaindexV6ClearStateChangeHarness.sol
@@ -3,7 +3,7 @@
 pragma solidity =0.8.25;
 
 import {RaindexV6, OrderIOCalculationV4} from "src/concrete/raindex/RaindexV6.sol";
-import {ClearStateChangeV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {ClearStateChangeV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 
 /// @dev Exposes RaindexV6's internal pure clear-state-change math so it can be
diff --git a/test/util/concrete/RealisticFlashLendingMockRaindex.sol b/test/util/concrete/RealisticFlashLendingMockRaindex.sol
index c04c8f716f..665b47924e 100644
--- a/test/util/concrete/RealisticFlashLendingMockRaindex.sol
+++ b/test/util/concrete/RealisticFlashLendingMockRaindex.sol
@@ -4,11 +4,11 @@ pragma solidity =0.8.25;
 
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 import {SafeERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/utils/SafeERC20.sol";
-import {TakeOrdersConfigV5, Float} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TakeOrdersConfigV5, Float} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {
     IERC3156FlashBorrower,
     ON_FLASH_LOAN_CALLBACK_SUCCESS
-} from "raindex-interface-0.1.1/src/interface/ierc3156/IERC3156FlashBorrower.sol";
+} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol";
 import {MockRaindexBase} from "test/util/abstract/MockRaindexBase.sol";
 
 /// @dev Mock raindex with real ERC3156 flash loan transfers and real
diff --git a/test/util/concrete/RealisticOrderTakerMockRaindex.sol b/test/util/concrete/RealisticOrderTakerMockRaindex.sol
index 93259d2efd..543948c1b6 100644
--- a/test/util/concrete/RealisticOrderTakerMockRaindex.sol
+++ b/test/util/concrete/RealisticOrderTakerMockRaindex.sol
@@ -4,8 +4,8 @@ pragma solidity =0.8.25;
 
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 import {SafeERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/utils/SafeERC20.sol";
-import {TakeOrdersConfigV5, Float} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
-import {IRaindexV6OrderTaker} from "raindex-interface-0.1.1/src/interface/IRaindexV6OrderTaker.sol";
+import {TakeOrdersConfigV5, Float} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
+import {IRaindexV6OrderTaker} from "raindex-interface-0.1.3/src/interface/IRaindexV6OrderTaker.sol";
 import {MockRaindexBase} from "test/util/abstract/MockRaindexBase.sol";
 
 /// @dev Mock raindex with real takeOrders4 transfers and onTakeOrders2
diff --git a/test/util/concrete/RecordingFlashLendingMockRaindex.sol b/test/util/concrete/RecordingFlashLendingMockRaindex.sol
index 6924695eab..a823c84438 100644
--- a/test/util/concrete/RecordingFlashLendingMockRaindex.sol
+++ b/test/util/concrete/RecordingFlashLendingMockRaindex.sol
@@ -4,11 +4,11 @@ pragma solidity =0.8.25;
 
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 import {SafeERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/utils/SafeERC20.sol";
-import {TakeOrdersConfigV5, Float} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {TakeOrdersConfigV5, Float} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {
     IERC3156FlashBorrower,
     ON_FLASH_LOAN_CALLBACK_SUCCESS
-} from "raindex-interface-0.1.1/src/interface/ierc3156/IERC3156FlashBorrower.sol";
+} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol";
 import {MockRaindexBase} from "test/util/abstract/MockRaindexBase.sol";
 
 /// @dev Mock raindex identical to `RealisticFlashLendingMockRaindex` (real
diff --git a/test/util/concrete/RecordingOrderTaker.sol b/test/util/concrete/RecordingOrderTaker.sol
index e4189a9ebc..71cadaf7bb 100644
--- a/test/util/concrete/RecordingOrderTaker.sol
+++ b/test/util/concrete/RecordingOrderTaker.sol
@@ -2,8 +2,8 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity =0.8.25;
 
-import {TakeOrdersConfigV5, IRaindexV6} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
-import {IRaindexV6OrderTaker} from "raindex-interface-0.1.1/src/interface/IRaindexV6OrderTaker.sol";
+import {TakeOrdersConfigV5, IRaindexV6} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
+import {IRaindexV6OrderTaker} from "raindex-interface-0.1.3/src/interface/IRaindexV6OrderTaker.sol";
 import {Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 
 /// Records whether `onTakeOrders2` was invoked, so a test can assert the
diff --git a/test/util/concrete/RecordingTaker.sol b/test/util/concrete/RecordingTaker.sol
index 721f5362d6..6ae4f5731f 100644
--- a/test/util/concrete/RecordingTaker.sol
+++ b/test/util/concrete/RecordingTaker.sol
@@ -2,8 +2,8 @@
 // SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
 pragma solidity =0.8.25;
 
-import {TakeOrdersConfigV5, IRaindexV6} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
-import {IRaindexV6OrderTaker} from "raindex-interface-0.1.1/src/interface/IRaindexV6OrderTaker.sol";
+import {TakeOrdersConfigV5, IRaindexV6} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
+import {IRaindexV6OrderTaker} from "raindex-interface-0.1.3/src/interface/IRaindexV6OrderTaker.sol";
 import {Float} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
 
 /// Records onTakeOrders2 invocation + the args it was called with so a test can
diff --git a/test/util/concrete/Reenteroor.sol b/test/util/concrete/Reenteroor.sol
index 3c05b4ea4d..1dfb2cfe7c 100644
--- a/test/util/concrete/Reenteroor.sol
+++ b/test/util/concrete/Reenteroor.sol
@@ -6,7 +6,7 @@ import {Address} from "@openzeppelin-contracts-5.6.1/utils/Address.sol";
 import {
     IERC3156FlashBorrower,
     ON_FLASH_LOAN_CALLBACK_SUCCESS
-} from "raindex-interface-0.1.1/src/interface/ierc3156/IERC3156FlashBorrower.sol";
+} from "raindex-interface-0.1.3/src/interface/ierc3156/IERC3156FlashBorrower.sol";
 import {IERC20} from "@openzeppelin-contracts-5.6.1/token/ERC20/IERC20.sol";
 
 /// @title Reenteroor
diff --git a/test/util/concrete/ReentrantExchange.sol b/test/util/concrete/ReentrantExchange.sol
index 79685114f5..5457891512 100644
--- a/test/util/concrete/ReentrantExchange.sol
+++ b/test/util/concrete/ReentrantExchange.sol
@@ -12,7 +12,7 @@ import {
     EvaluableV4,
     SignedContextV1,
     TaskV2
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
diff --git a/test/util/concrete/ReentrantMockRaindex.sol b/test/util/concrete/ReentrantMockRaindex.sol
index ab9d2e3754..ed58d9e8c6 100644
--- a/test/util/concrete/ReentrantMockRaindex.sol
+++ b/test/util/concrete/ReentrantMockRaindex.sol
@@ -12,7 +12,7 @@ import {
     EvaluableV4,
     SignedContextV1,
     Float
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {MockRaindexBase} from "test/util/abstract/MockRaindexBase.sol";
diff --git a/test/util/lib/LibTestAddOrder.sol b/test/util/lib/LibTestAddOrder.sol
index c1da494c78..c21795a71c 100644
--- a/test/util/lib/LibTestAddOrder.sol
+++ b/test/util/lib/LibTestAddOrder.sol
@@ -4,7 +4,7 @@ pragma solidity ^0.8.19;
 
 import {META_MAGIC_NUMBER_V1} from "rain-metadata-0.1.0/src/lib/LibMeta.sol";
 import {LibOrder} from "../../../src/lib/LibOrder.sol";
-import {OrderConfigV4, OrderV4, IOV2} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+import {OrderConfigV4, OrderV4, IOV2} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4, SourceIndexV2} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {EvaluableV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterCallerV4.sol";
diff --git a/test/util/lib/LibTestArb.sol b/test/util/lib/LibTestArb.sol
index f93d9d746c..6d975c605e 100644
--- a/test/util/lib/LibTestArb.sol
+++ b/test/util/lib/LibTestArb.sol
@@ -13,7 +13,7 @@ import {
     EvaluableV4,
     SignedContextV1,
     TaskV2
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
diff --git a/test/util/lib/LibTestFlashBorrowerArb.sol b/test/util/lib/LibTestFlashBorrowerArb.sol
index cbf172ad3a..a64e6832f2 100644
--- a/test/util/lib/LibTestFlashBorrowerArb.sol
+++ b/test/util/lib/LibTestFlashBorrowerArb.sol
@@ -12,7 +12,7 @@ import {
     IOV2,
     EvaluableV4,
     SignedContextV1
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {LibDecimalFloat} from "rain-math-float-0.1.1/src/lib/LibDecimalFloat.sol";
diff --git a/test/util/lib/LibTestTakeOrder.sol b/test/util/lib/LibTestTakeOrder.sol
index 22bbfe09ee..6dbed16029 100644
--- a/test/util/lib/LibTestTakeOrder.sol
+++ b/test/util/lib/LibTestTakeOrder.sol
@@ -12,7 +12,7 @@ import {
     OrderConfigV4,
     TaskV2,
     IRaindexV6
-} from "raindex-interface-0.1.1/src/interface/IRaindexV6.sol";
+} from "raindex-interface-0.1.3/src/interface/IRaindexV6.sol";
 import {IInterpreterV4} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterV4.sol";
 import {IInterpreterStoreV3} from "rain-interpreter-interface-0.1.0/src/interface/IInterpreterStoreV3.sol";
 import {IParserV2} from "rain-interpreter-interface-0.1.0/src/interface/IParserV2.sol";