Merge branch 'main' into 2026-06-13-issue-951

Author: thedavidmeister

crates/common/src/allowance.rs

@@ -18,7 +18,7 @@ pub async fn read_allowance(
     read_call(rpcs, token, allowanceCall { owner, spender }).await
 }
 
-#[cfg(test)]
+#[cfg(all(test, not(target_family = "wasm")))]
 mod tests {
     use super::*;
     use alloy::hex::encode_prefixed;

crates/common/src/raindex_client/vaults.rs

@@ -453,10 +453,7 @@ impl RaindexVault {
     /// Used by [`RaindexVault::get_calldatas`] so the on-chain allowance is only read once.
     /// It reads the allowance via [`Self::read_allowance`] (deposit-free), so it takes no
     /// [`DepositArgs`].
-    async fn build_approval_calldata(
-        &self,
-        amount: &Float,
-    ) -> Result<Option<Bytes>, RaindexError> {
+    async fn build_approval_calldata(&self, amount: &Float) -> Result<Option<Bytes>, RaindexError> {
         let allowance = self.read_allowance().await?;
         let allowance_float = Float::from_fixed_decimal(allowance, self.token.decimals)?;
 

src/lib/deploy/LibRaindexDeploy.sol

@@ -105,6 +105,24 @@ library LibRaindexDeploy {
     bytes32 constant RAINDEX_DEPLOYED_CODEHASH_0_1_7 =
         0x774ca4c194abf0720bca6c033580762029a80291feefd0a4b7855b16bcbbf7a9;
 
+    /// The deployed address of the `RaindexV6` contract at the published `0.1.8`
+    /// tag. (Unchanged from `0.1.7`.)
+    address constant RAINDEX_DEPLOYED_ADDRESS_0_1_8 = 0x86594ac4319230870C6E587f4ACa48FAb575619e;
+
+    /// The runtime code hash of the `RaindexV6` contract at the published `0.1.8`
+    /// tag.
+    bytes32 constant RAINDEX_DEPLOYED_CODEHASH_0_1_8 =
+        0x774ca4c194abf0720bca6c033580762029a80291feefd0a4b7855b16bcbbf7a9;
+
+    /// The deployed address of the `RaindexV6` contract at the published `0.1.9`
+    /// tag. (Unchanged from `0.1.7`.)
+    address constant RAINDEX_DEPLOYED_ADDRESS_0_1_9 = 0x86594ac4319230870C6E587f4ACa48FAb575619e;
+
+    /// The runtime code hash of the `RaindexV6` contract at the published `0.1.9`
+    /// tag.
+    bytes32 constant RAINDEX_DEPLOYED_CODEHASH_0_1_9 =
+        0x774ca4c194abf0720bca6c033580762029a80291feefd0a4b7855b16bcbbf7a9;
+
     /// The address of the `RaindexV6SubParser` contract when deployed with
     /// the rain standard zoltu deployer.
     address constant SUB_PARSER_DEPLOYED_ADDRESS = SUB_PARSER_ADDR;
@@ -176,6 +194,24 @@ library LibRaindexDeploy {
     bytes32 constant SUB_PARSER_DEPLOYED_CODEHASH_0_1_7 =
         0x704aadc1ed56f63ff918ab219e6681a5d2851d774e2ee136bbe7904ea3b2fdcd;
 
+    /// The deployed address of the `RaindexV6SubParser` contract at the
+    /// published `0.1.8` tag. (Unchanged from `0.1.2`.)
+    address constant SUB_PARSER_DEPLOYED_ADDRESS_0_1_8 = 0x09Bc7AF266012F44fb41D8Bd682da931666605e1;
+
+    /// The runtime code hash of the `RaindexV6SubParser` contract at the
+    /// published `0.1.8` tag.
+    bytes32 constant SUB_PARSER_DEPLOYED_CODEHASH_0_1_8 =
+        0x704aadc1ed56f63ff918ab219e6681a5d2851d774e2ee136bbe7904ea3b2fdcd;
+
+    /// The deployed address of the `RaindexV6SubParser` contract at the
+    /// published `0.1.9` tag. (Unchanged from `0.1.2`.)
+    address constant SUB_PARSER_DEPLOYED_ADDRESS_0_1_9 = 0x09Bc7AF266012F44fb41D8Bd682da931666605e1;
+
+    /// The runtime code hash of the `RaindexV6SubParser` contract at the
+    /// published `0.1.9` tag.
+    bytes32 constant SUB_PARSER_DEPLOYED_CODEHASH_0_1_9 =
+        0x704aadc1ed56f63ff918ab219e6681a5d2851d774e2ee136bbe7904ea3b2fdcd;
+
     /// The address of the `RouteProcessor4` contract when deployed with the
     /// rain standard zoltu deployer.
     address constant ROUTE_PROCESSOR_DEPLOYED_ADDRESS = ROUTE_PROCESSOR_ADDR;
@@ -247,6 +283,24 @@ library LibRaindexDeploy {
     bytes32 constant ROUTE_PROCESSOR_DEPLOYED_CODEHASH_0_1_7 =
         0xeb3745a79c6ba48e8767b9c355b8e7b79f9d6edeca004e4bb91be4de515a7eeb;
 
+    /// The deployed address of the `RouteProcessor4` contract at the published
+    /// `0.1.8` tag. (Unchanged from `0.1.7`.)
+    address constant ROUTE_PROCESSOR_DEPLOYED_ADDRESS_0_1_8 = 0x6E2d0e71d900474b262E545Bc4C98b71ab368d21;
+
+    /// The runtime code hash of the `RouteProcessor4` contract at the published
+    /// `0.1.8` tag.
+    bytes32 constant ROUTE_PROCESSOR_DEPLOYED_CODEHASH_0_1_8 =
+        0xeb3745a79c6ba48e8767b9c355b8e7b79f9d6edeca004e4bb91be4de515a7eeb;
+
+    /// The deployed address of the `RouteProcessor4` contract at the published
+    /// `0.1.9` tag. (Unchanged from `0.1.7`.)
+    address constant ROUTE_PROCESSOR_DEPLOYED_ADDRESS_0_1_9 = 0x6E2d0e71d900474b262E545Bc4C98b71ab368d21;
+
+    /// The runtime code hash of the `RouteProcessor4` contract at the published
+    /// `0.1.9` tag.
+    bytes32 constant ROUTE_PROCESSOR_DEPLOYED_CODEHASH_0_1_9 =
+        0xeb3745a79c6ba48e8767b9c355b8e7b79f9d6edeca004e4bb91be4de515a7eeb;
+
     /// The address of the `GenericPoolRaindexV6ArbOrderTaker` contract when
     /// deployed with the rain standard zoltu deployer.
     address constant GENERIC_POOL_ARB_ORDER_TAKER_DEPLOYED_ADDRESS = GENERIC_POOL_ARB_OT_ADDR;
@@ -321,6 +375,24 @@ library LibRaindexDeploy {
     bytes32 constant GENERIC_POOL_ARB_ORDER_TAKER_DEPLOYED_CODEHASH_0_1_7 =
         0xc4492cb22d918a3f0d41f13e533744ef03a2e7f744ec0a43b79d97a04c537544;
 
+    /// The deployed address of the `GenericPoolRaindexV6ArbOrderTaker` contract
+    /// at the published `0.1.8` tag. (Unchanged from `0.1.7`.)
+    address constant GENERIC_POOL_ARB_ORDER_TAKER_DEPLOYED_ADDRESS_0_1_8 = 0xc0c17e58018C80A5420dF7756acd2B2dcf37e380;
+
+    /// The runtime code hash of the `GenericPoolRaindexV6ArbOrderTaker` contract
+    /// at the published `0.1.8` tag.
+    bytes32 constant GENERIC_POOL_ARB_ORDER_TAKER_DEPLOYED_CODEHASH_0_1_8 =
+        0xc4492cb22d918a3f0d41f13e533744ef03a2e7f744ec0a43b79d97a04c537544;
+
+    /// The deployed address of the `GenericPoolRaindexV6ArbOrderTaker` contract
+    /// at the published `0.1.9` tag. (Unchanged from `0.1.7`.)
+    address constant GENERIC_POOL_ARB_ORDER_TAKER_DEPLOYED_ADDRESS_0_1_9 = 0xc0c17e58018C80A5420dF7756acd2B2dcf37e380;
+
+    /// The runtime code hash of the `GenericPoolRaindexV6ArbOrderTaker` contract
+    /// at the published `0.1.9` tag.
+    bytes32 constant GENERIC_POOL_ARB_ORDER_TAKER_DEPLOYED_CODEHASH_0_1_9 =
+        0xc4492cb22d918a3f0d41f13e533744ef03a2e7f744ec0a43b79d97a04c537544;
+
     /// The address of the `RouteProcessorRaindexV6ArbOrderTaker` contract
     /// when deployed with the rain standard zoltu deployer.
     address constant ROUTE_PROCESSOR_ARB_ORDER_TAKER_DEPLOYED_ADDRESS = RP_ARB_OT_ADDR;
@@ -402,6 +474,26 @@ library LibRaindexDeploy {
     bytes32 constant ROUTE_PROCESSOR_ARB_ORDER_TAKER_DEPLOYED_CODEHASH_0_1_7 =
         0xc3fb3bb0355fee22e54cade57f5ff828478d59f34fdd8057bc0bc6a11b3d48fc;
 
+    /// The deployed address of the `RouteProcessorRaindexV6ArbOrderTaker`
+    /// contract at the published `0.1.8` tag. (Unchanged from `0.1.7`.)
+    address constant ROUTE_PROCESSOR_ARB_ORDER_TAKER_DEPLOYED_ADDRESS_0_1_8 =
+        0x5Ec2625ee7c73c85fAb2bc4cf527E1434F0dcC5d;
+
+    /// The runtime code hash of the `RouteProcessorRaindexV6ArbOrderTaker`
+    /// contract at the published `0.1.8` tag.
+    bytes32 constant ROUTE_PROCESSOR_ARB_ORDER_TAKER_DEPLOYED_CODEHASH_0_1_8 =
+        0xc3fb3bb0355fee22e54cade57f5ff828478d59f34fdd8057bc0bc6a11b3d48fc;
+
+    /// The deployed address of the `RouteProcessorRaindexV6ArbOrderTaker`
+    /// contract at the published `0.1.9` tag. (Unchanged from `0.1.7`.)
+    address constant ROUTE_PROCESSOR_ARB_ORDER_TAKER_DEPLOYED_ADDRESS_0_1_9 =
+        0x5Ec2625ee7c73c85fAb2bc4cf527E1434F0dcC5d;
+
+    /// The runtime code hash of the `RouteProcessorRaindexV6ArbOrderTaker`
+    /// contract at the published `0.1.9` tag.
+    bytes32 constant ROUTE_PROCESSOR_ARB_ORDER_TAKER_DEPLOYED_CODEHASH_0_1_9 =
+        0xc3fb3bb0355fee22e54cade57f5ff828478d59f34fdd8057bc0bc6a11b3d48fc;
+
     /// The address of the `GenericPoolRaindexV6FlashBorrower` contract when
     /// deployed with the rain standard zoltu deployer.
     address constant GENERIC_POOL_FLASH_BORROWER_DEPLOYED_ADDRESS = GENERIC_POOL_FB_ADDR;
@@ -476,6 +568,24 @@ library LibRaindexDeploy {
     bytes32 constant GENERIC_POOL_FLASH_BORROWER_DEPLOYED_CODEHASH_0_1_7 =
         0xed618063fd6ffc7558e4588ea6357356e781d660fa22caa292a2f9aeaa21996f;
 
+    /// The deployed address of the `GenericPoolRaindexV6FlashBorrower` contract
+    /// at the published `0.1.8` tag. (Unchanged from `0.1.7`.)
+    address constant GENERIC_POOL_FLASH_BORROWER_DEPLOYED_ADDRESS_0_1_8 = 0xAd8af7f90a06659E9bBFD457c6C642fB60B1F46b;
+
+    /// The runtime code hash of the `GenericPoolRaindexV6FlashBorrower` contract
+    /// at the published `0.1.8` tag.
+    bytes32 constant GENERIC_POOL_FLASH_BORROWER_DEPLOYED_CODEHASH_0_1_8 =
+        0xed618063fd6ffc7558e4588ea6357356e781d660fa22caa292a2f9aeaa21996f;
+
+    /// The deployed address of the `GenericPoolRaindexV6FlashBorrower` contract
+    /// at the published `0.1.9` tag. (Unchanged from `0.1.7`.)
+    address constant GENERIC_POOL_FLASH_BORROWER_DEPLOYED_ADDRESS_0_1_9 = 0xAd8af7f90a06659E9bBFD457c6C642fB60B1F46b;
+
+    /// The runtime code hash of the `GenericPoolRaindexV6FlashBorrower` contract
+    /// at the published `0.1.9` tag.
+    bytes32 constant GENERIC_POOL_FLASH_BORROWER_DEPLOYED_CODEHASH_0_1_9 =
+        0xed618063fd6ffc7558e4588ea6357356e781d660fa22caa292a2f9aeaa21996f;
+
     uint256 constant RAINDEX_START_BLOCK_ARBITRUM = 473030678;
     uint256 constant RAINDEX_START_BLOCK_BASE = 47278140;
     uint256 constant RAINDEX_START_BLOCK_FLARE = 62835540;

test/concrete/arb/RouteProcessorRaindexV6ArbOrderTaker.noEthForward.t.sol

@@ -6,28 +6,11 @@ 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 {IRouteProcessor} from "src/interface/IRouteProcessor.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";
 import {MockToken} from "test/util/concrete/MockToken.sol";
-
-/// @dev Route processor mock that records the `msg.value` it was called with in
-/// storage slot 0, so a test can assert how much native ETH the arb forwarded.
-contract ValueRecordingRouteProcessor is IRouteProcessor {
-    function processRoute(address, uint256, address, uint256, address, bytes memory)
-        external
-        payable
-        returns (uint256)
-    {
-        // Slot 0 holds the last `msg.value` seen, readable via `vm.load` from
-        // the etched address.
-        assembly ("memory-safe") {
-            sstore(0, callvalue())
-        }
-        return 0;
-    }
-}
+import {ValueRecordingRouteProcessor} from "test/util/concrete/ValueRecordingRouteProcessor.sol";
 
 /// @title RouteProcessorRaindexV6ArbOrderTakerNoEthForwardTest
 /// @notice Locks the documented divergence from `LibGenericPoolExchange` (#2699):

test/util/concrete/ValueRecordingRouteProcessor.sol

@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: LicenseRef-DCL-1.0
+// SPDX-FileCopyrightText: Copyright (c) 2020 Rain Open Source Software Ltd
+pragma solidity =0.8.25;
+
+import {IRouteProcessor} from "src/interface/IRouteProcessor.sol";
+
+/// @dev Route processor mock that records the `msg.value` it was called with in
+/// storage slot 0, so a test can assert how much native ETH the arb forwarded.
+contract ValueRecordingRouteProcessor is IRouteProcessor {
+    function processRoute(address, uint256, address, uint256, address, bytes memory)
+        external
+        payable
+        returns (uint256)
+    {
+        // Slot 0 holds the last `msg.value` seen, readable via `vm.load` from
+        // the etched address.
+        assembly ("memory-safe") {
+            sstore(0, callvalue())
+        }
+        return 0;
+    }
+}