Rust/JS: migrate to IRaindexV7 SignedContextV2 names; oracle responses carry the EIP-712 domainSeparator

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: thedavidmeister

crates/bindings/ARCHITECTURE.md

@@ -57,9 +57,9 @@ Generated Solidity Bindings (Alloy `sol!`)
 - Practical result of the `sol!(… rpc)` attribute:
   - For `IRaindexV5` and `IERC20`, you can construct an instance bound to a
     provider and call methods with strong typing, for example:
-    `let ob = IRaindexV5Instance::new(address, provider.clone()); ob.quote2(config).await?`.
+    `let ob = IRaindexV5Instance::new(address, provider.clone()); ob.quote3(config).await?`.
   - For all bindings, you can still directly use generated call structs, e.g.,
-    `IRaindexV5::removeOrder3Call { ... }.abi_encode()` or
+    `IRaindexV5::removeOrder4Call { ... }.abi_encode()` or
     `Raindex::multicallCall { ... }`.
 
 - Derives and defaults:
@@ -118,17 +118,17 @@ WASM and JS Interop
 
 - Exposed interfaces (hand‑written TS definitions):
   - `IOV2`: `{ token: string; vaultId: string; }`
-  - `QuoteV2`:
-    `{ order: OrderV4; inputIOIndex: string; outputIOIndex: string; signedContext: SignedContextV1[]; }`
+  - `QuoteV3`:
+    `{ order: OrderV4; inputIOIndex: string; outputIOIndex: string; signedContext: SignedContextV2[]; }`
   - `OrderV4`:
     `{ owner: string; evaluable: EvaluableV4; validInputs: IOV2[]; validOutputs: IOV2[]; nonce: string; }`
   - `EvaluableV4`: `{ interpreter: string; store: string; bytecode: string; }`
-  - `SignedContextV1`:
-    `{ signer: string; context: string[]; signature: string; }`
-  - `TakeOrderConfigV4`:
-    `{ order: OrderV4; inputIOIndex: string; outputIOIndex: string; signedContext: SignedContextV1[]; }`
-  - `TakeOrdersConfigV5`:
-    `{ minimumIO: string; maximumIO: string; maximumIORatio: string; IOIsInput: string; orders: TakeOrderConfigV4[]; data: string; }`
+  - `SignedContextV2`:
+    `{ signer: string; domainSeparator: string; context: string[]; signature: string; }`
+  - `TakeOrderConfigV5`:
+    `{ order: OrderV4; inputIOIndex: string; outputIOIndex: string; signedContext: SignedContextV2[]; }`
+  - `TakeOrdersConfigV6`:
+    `{ minimumIO: string; maximumIO: string; maximumIORatio: string; IOIsInput: string; orders: TakeOrderConfigV5[]; data: string; }`
 
 - Why many fields are `string` in TS
   - Large numeric values (e.g., `U256`) are represented as strings to avoid
@@ -157,11 +157,11 @@ How This Crate Is Used Elsewhere
 
 - Quote engine (`crates/quote`):
   - Imports `IRaindexV5::IRaindexV5Instance` and `mk_read_provider`.
-  - Binds the instance to a provider and calls `quote2` for many orders via
+  - Binds the instance to a provider and calls `quote3` for many orders via
     Alloy’s multicall helper.
 - Common utilities (`crates/common`):
   - Uses ABI‑generated call structs (e.g., `deposit3Call`, `withdraw3Call`,
-    `removeOrder3Call`, `IERC20::approveCall`) to build calldata for
+    `removeOrder4Call`, `IERC20::approveCall`) to build calldata for
     transactions.
 - JS API (`crates/js_api`):
   - Builds order builder calldata for approvals/deposits/add‑order and uses call
@@ -209,12 +209,12 @@ Examples
     `let provider = mk_read_provider(&rpcs)?;`
   - Bind to a raindex:
     `let ob = IRaindexV5Instance::new(raindex_addr, provider.clone());`
-  - Call a view: `let quote = ob.quote2(config).await?;`
+  - Call a view: `let quote = ob.quote3(config).await?;`
 
 - Building calldata without an instance:
-  - `use raindex_bindings::IRaindexV5::removeOrder3Call;`
+  - `use raindex_bindings::IRaindexV5::removeOrder4Call;`
   - Construct the struct and encode:
-    `let bytes = removeOrder3Call { order, tasks }.abi_encode();`
+    `let bytes = removeOrder4Call { order, tasks }.abi_encode();`
 
 Limitations and Notes
 

crates/bindings/src/js_api.rs

@@ -1,15 +1,15 @@
 use crate::IRaindexV7::{
-    EvaluableV4, OrderV4, QuoteV2, SignedContextV1, TakeOrderConfigV4, TakeOrdersConfigV5, IOV2,
+    EvaluableV4, OrderV4, QuoteV3, SignedContextV2, TakeOrderConfigV5, TakeOrdersConfigV6, IOV2,
 };
 use wasm_bindgen_utils::{impl_custom_tsify, impl_wasm_traits, prelude::*};
 
 impl_wasm_traits!(IOV2);
-impl_wasm_traits!(QuoteV2);
+impl_wasm_traits!(QuoteV3);
 impl_wasm_traits!(OrderV4);
 impl_wasm_traits!(EvaluableV4);
-impl_wasm_traits!(SignedContextV1);
-impl_wasm_traits!(TakeOrderConfigV4);
-impl_wasm_traits!(TakeOrdersConfigV5);
+impl_wasm_traits!(SignedContextV2);
+impl_wasm_traits!(TakeOrderConfigV5);
+impl_wasm_traits!(TakeOrdersConfigV6);
 
 impl_custom_tsify!(
     IOV2,
@@ -19,12 +19,12 @@ impl_custom_tsify!(
 }"
 );
 impl_custom_tsify!(
-    QuoteV2,
-    "export interface QuoteV2 {
+    QuoteV3,
+    "export interface QuoteV3 {
     order: OrderV4;
     inputIOIndex: string;
     outputIOIndex: string;
-    signedContext: SignedContextV1[];
+    signedContext: SignedContextV2[];
 }"
 );
 impl_custom_tsify!(
@@ -46,30 +46,31 @@ impl_custom_tsify!(
 }"
 );
 impl_custom_tsify!(
-    SignedContextV1,
-    "export interface SignedContextV1 {
+    SignedContextV2,
+    "export interface SignedContextV2 {
     signer: string;
+    domainSeparator: string;
     context: string[];
     signature: string;
 }"
 );
 impl_custom_tsify!(
-    TakeOrderConfigV4,
-    "export interface TakeOrderConfigV4 {
+    TakeOrderConfigV5,
+    "export interface TakeOrderConfigV5 {
     order: OrderV4;
     inputIOIndex: string;
     outputIOIndex: string;
-    signedContext: SignedContextV1[];
+    signedContext: SignedContextV2[];
 }"
 );
 impl_custom_tsify!(
-    TakeOrdersConfigV5,
-    "export interface TakeOrdersConfigV5 {
+    TakeOrdersConfigV6,
+    "export interface TakeOrdersConfigV6 {
     minimumIO: string;
     maximumIO: string;
     maximumIORatio: string;
     IOIsInput: string;
-    orders: TakeOrderConfigV4[];
+    orders: TakeOrderConfigV5[];
     data: string;
 }"
 );
@@ -91,7 +92,7 @@ mod tests {
 
     #[wasm_bindgen_test]
     fn test_quote_tsify() {
-        let js_quote = to_js_value(&QuoteV2::default()).unwrap();
+        let js_quote = to_js_value(&QuoteV3::default()).unwrap();
         // validate serialized props match the tsify definition
         assert!(JsString::from_str("order").unwrap().js_in(&js_quote));
         assert!(JsString::from_str("inputIOIndex").unwrap().js_in(&js_quote));
@@ -126,12 +127,15 @@ mod tests {
     }
 
     #[wasm_bindgen_test]
-    fn test_signed_contextv1_tsify() {
-        let js_signed_context = to_js_value(&SignedContextV1::default()).unwrap();
+    fn test_signed_contextv2_tsify() {
+        let js_signed_context = to_js_value(&SignedContextV2::default()).unwrap();
         // validate serialized props match the tsify definition
         assert!(JsString::from_str("signer")
             .unwrap()
             .js_in(&js_signed_context));
+        assert!(JsString::from_str("domainSeparator")
+            .unwrap()
+            .js_in(&js_signed_context));
         assert!(JsString::from_str("context")
             .unwrap()
             .js_in(&js_signed_context));
@@ -142,7 +146,7 @@ mod tests {
 
     #[wasm_bindgen_test]
     fn test_take_order_config_v4_tsify() {
-        let js_take_order_config = to_js_value(&TakeOrderConfigV4::default()).unwrap();
+        let js_take_order_config = to_js_value(&TakeOrderConfigV5::default()).unwrap();
         // validate serialized props match the tsify definition
         assert!(JsString::from_str("order")
             .unwrap()
@@ -160,7 +164,7 @@ mod tests {
 
     #[wasm_bindgen_test]
     fn test_take_orders_config_v4_tsify() {
-        let js_take_orders_config = to_js_value(&TakeOrdersConfigV5::default()).unwrap();
+        let js_take_orders_config = to_js_value(&TakeOrdersConfigV6::default()).unwrap();
         // validate serialized props match the tsify definition
         assert!(JsString::from_str("minimumIO")
             .unwrap()

crates/bindings/src/lib.rs

@@ -58,15 +58,15 @@ pub mod topics {
     use crate::{
         IInterpreterStoreV3::Set,
         IRaindexV7::{
-            AddOrderV3, AfterClearV2, ClearV3, DepositV2, RemoveOrderV3, TakeOrderV3, WithdrawV2,
+            AddOrderV3, AfterClearV2, ClearV3, DepositV2, RemoveOrderV3, TakeOrderV4, WithdrawV2,
         },
         Raindex::MetaV1_2,
     };
     use alloy::{primitives::B256, sol_types::SolEvent};
 
     pub const RAINDEX_EVENT_TOPICS: [B256; 8] = [
         AddOrderV3::SIGNATURE_HASH,
-        TakeOrderV3::SIGNATURE_HASH,
+        TakeOrderV4::SIGNATURE_HASH,
         WithdrawV2::SIGNATURE_HASH,
         DepositV2::SIGNATURE_HASH,
         RemoveOrderV3::SIGNATURE_HASH,

crates/common/ARCHITECTURE.md

@@ -23,7 +23,7 @@ require its `COMMIT_SHA` env var.
 
 - `add_order` — Compose Rainlang from DOTRAIN, parse to bytecode via on‑chain
   Parser, generate `addOrder3` call parameters, execute or simulate on a fork.
-- `remove_order` — Convert subgraph `SgOrder` to `removeOrder3` call, execute or
+- `remove_order` — Convert subgraph `SgOrder` to `removeOrder4` call, execute or
   return calldata.
 - `deposit` — ERC20 allowance check/approve and `deposit3` call
   builder/executor.
@@ -94,7 +94,7 @@ Target gating is used extensively:
 
 ### 2) Remove Order
 
-- `RemoveOrderArgs` converts `SgOrder` to `removeOrder3Call` via subgraph
+- `RemoveOrderArgs` converts `SgOrder` to `removeOrder4Call` via subgraph
   traits.
 - Native execution mirrors `add_order` (Ledger provider + `WriteTransaction`),
   or return calldata only.
@@ -356,7 +356,7 @@ are provided so frontends can submit via their own providers.
 ## Notable Dependencies (workspace crates)
 
 - `raindex_bindings` — Strongly‑typed ABI for Raindex and ERC20 contracts
-  (`addOrder3`, `removeOrder3`, `deposit3`, `withdraw3`, multicall).
+  (`addOrder3`, `removeOrder4`, `deposit3`, `withdraw3`, multicall).
 - `raindex_subgraph_client` — GraphQL types and clients for raindex data;
   provides `Sg*` models and helpers.
 - `raindex_app_settings` — DOTRAIN/raindex YAML structures, validation, and spec
@@ -384,7 +384,7 @@ are provided so frontends can submit via their own providers.
      submit via external provider (WASM).
 
 - Remove an order:
-  1. Fetch `SgOrder` from subgraph; convert to `removeOrder3Call` and execute or
+  1. Fetch `SgOrder` from subgraph; convert to `removeOrder4Call` and execute or
      export calldata.
 
 - Deposit/Withdraw:

crates/common/src/add_order.rs

@@ -31,7 +31,7 @@ use rain_metadata::{
 use rain_metadata_bindings::MetaBoard::emitMetaCall;
 use raindex_app_settings::deployment::DeploymentCfg;
 use raindex_bindings::provider::{mk_read_provider, ReadProviderError};
-use raindex_bindings::IRaindexV7::{addOrder4Call, EvaluableV4, OrderConfigV4, TaskV2, IOV2};
+use raindex_bindings::IRaindexV7::{addOrder5Call, EvaluableV4, OrderConfigV4, TaskV3, IOV2};
 use serde::{Deserialize, Serialize};
 use serde_bytes::ByteBuf;
 use std::collections::HashMap;
@@ -251,7 +251,7 @@ impl AddOrderArgs {
     pub async fn try_into_call(
         &self,
         rpcs: Vec<String>,
-    ) -> Result<addOrder4Call, AddOrderArgsError> {
+    ) -> Result<addOrder5Call, AddOrderArgsError> {
         let rainlang = self.compose_to_rainlang()?;
         let bytecode = self
             .try_parse_rainlang(rpcs.clone(), rainlang.clone())
@@ -273,12 +273,12 @@ impl AddOrderArgs {
             bytecode: post_bytecode.into(),
         };
 
-        let post_task = TaskV2 {
+        let post_task = TaskV3 {
             evaluable: post_evaluable,
             signedContext: vec![],
         };
 
-        Ok(addOrder4Call {
+        Ok(addOrder5Call {
             config: OrderConfigV4 {
                 validInputs: self.inputs.clone(),
                 validOutputs: self.outputs.clone(),
@@ -1656,7 +1656,7 @@ _ _: 0 0;
             additional_meta: None,
         };
 
-        let add_order_call = addOrder4Call {
+        let add_order_call = addOrder5Call {
             config: OrderConfigV4 {
                 evaluable: EvaluableV4 {
                     interpreter: *local_evm.interpreter.address(),
@@ -1679,7 +1679,7 @@ _ _: 0 0;
                 meta: Bytes::from_str("0xff0a89c674ee7874a30058382f2a20302e2063616c63756c6174652d696f202a2f200a5f205f3a203020303b0a0a2f2a20312e2068616e646c652d696f202a2f200a3a3b011bff13109e41336ff20278186170706c69636174696f6e2f6f637465742d73747265616d").unwrap(),
             },
             tasks: vec![
-                TaskV2 {
+                TaskV3 {
                     evaluable: EvaluableV4 {
                         interpreter: *local_evm.interpreter.address(),
                         store: *local_evm.store.address(),
@@ -1702,7 +1702,7 @@ _ _: 0 0;
             .unwrap();
 
         let input = res.input.input.expect("tx request has no input");
-        let decoded = addOrder4Call::abi_decode(&input).unwrap();
+        let decoded = addOrder5Call::abi_decode(&input).unwrap();
 
         assert_eq!(decoded.config.evaluable, add_order_call.config.evaluable);
         assert_eq!(
@@ -1749,7 +1749,7 @@ _ _: 0 0;
             .unwrap()
             .into();
 
-        let expected_bytes: Bytes = addOrder4Call {
+        let expected_bytes: Bytes = addOrder5Call {
             config: OrderConfigV4 {
                 evaluable: EvaluableV4 {
                     interpreter: *local_evm.interpreter.address(),
@@ -1774,7 +1774,7 @@ _ _: 0 0;
                 secret: U256::from(0).into(),
                 meta: Bytes::from_str("0xff0a89c674ee7874a30058382f2a20302e2063616c63756c6174652d696f202a2f200a5f205f3a203020303b0a0a2f2a20312e2068616e646c652d696f202a2f200a3a3b011bff13109e41336ff20278186170706c69636174696f6e2f6f637465742d73747265616d").unwrap(),
             },
-            tasks: vec![TaskV2 {
+            tasks: vec![TaskV3 {
                 evaluable: EvaluableV4 {
                     interpreter: *local_evm.interpreter.address(),
                     store: *local_evm.store.address(),

crates/common/src/deposit.rs

@@ -2,7 +2,7 @@ use crate::allowance::read_allowance;
 use crate::transaction::{TransactionArgs, TransactionArgsError, WritableTransactionExecuteError};
 use alloy::primitives::{Address, B256, U256};
 use rain_math_float::{Float, FloatError};
-use raindex_bindings::IRaindexV7::deposit4Call;
+use raindex_bindings::IRaindexV7::deposit5Call;
 #[cfg(not(target_family = "wasm"))]
 use raindex_bindings::IERC20::approveCall;
 use serde::{Deserialize, Serialize};
@@ -35,11 +35,11 @@ pub struct DepositArgs {
     pub decimals: u8,
 }
 
-impl TryFrom<DepositArgs> for deposit4Call {
+impl TryFrom<DepositArgs> for deposit5Call {
     type Error = FloatError;
 
     fn try_from(val: DepositArgs) -> Result<Self, Self::Error> {
-        Ok(deposit4Call {
+        Ok(deposit5Call {
             token: val.token,
             vaultId: val.vault_id,
             depositAmount: val.amount.get_inner(),
@@ -99,7 +99,7 @@ impl DepositArgs {
     ) -> Result<(), DepositError> {
         let (ledger_client, _) = transaction_args.clone().try_into_ledger_client().await?;
 
-        let deposit_call: deposit4Call = self.clone().try_into()?;
+        let deposit_call: deposit5Call = self.clone().try_into()?;
         let tx_request = transaction_args
             .try_into_transaction_request(deposit_call, transaction_args.raindex_address)?;