Merge pull request #2796 from rainlanguage/chore/use-interface-token-self-trade

Use IRaindexV6.TokenSelfTrade from raindex-interface 0.1.3

Author: thedavidmeister

crates/bindings/abis/IRaindexV6.json

@@ -1904,6 +1904,11 @@
       "name": "OrderNoSources",
       "inputs": []
     },
+    {
+      "type": "error",
+      "name": "TokenSelfTrade",
+      "inputs": []
+    },
     {
       "type": "error",
       "name": "ZeroDepositAmount",

foundry.toml

@@ -55,7 +55,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"

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/

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"

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 {

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

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

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";

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.

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.