Merge origin/main into 2026-10-26-raindex-v7

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

Author: thedavidmeister

.github/workflows/vercel-prod.yaml

@@ -1,7 +1,7 @@
 ##
 ## SECURITY MODEL FOR VERCEL PRODUCTION DEPLOYS (READ BEFORE EDITING)
 ##
-## This workflow runs on main pushes in this repository:
+## This workflow runs only on manual dispatch against main in this repository:
 ##  - The wrapper (checkout, nix, caches, build, Vercel pull + deploy, security
 ##    hardening) lives in the rainix `rainix-vercel.yaml` reusable workflow; this
 ##    file is a thin caller that selects the production environment and maps
@@ -10,28 +10,16 @@
 ##    workflow, never to the build step.
 ##
 ## WARNING: Changing any of the following may break the security model:
-##  - Triggers (the main push + webapp paths).
+##  - Triggers (manual dispatch only, main ref only).
 ##  - The reusable workflow ref / inputs.
 ## If you modify this file, re-validate these invariants (and those in rainix).
 name: GitHub Actions Vercel Production Deployment
+# Manual so front-end changes ship only once the contracts they call are deployed.
 on:
-  push:
-    branches:
-      - main
-    # Only redeploy prod when something webapp-relevant changed (see
-    # vercel-preview.yaml for the rationale) — a sol-only main merge shouldn't
-    # rebuild + redeploy the webapp.
-    paths:
-      - 'packages/**'
-      - 'crates/**'
-      - 'package.json'
-      - 'package-lock.json'
-      - 'flake.nix'
-      - 'flake.lock'
-      - 'script/vercel-build.sh'
-      - '.github/workflows/vercel-prod.yaml'
+  workflow_dispatch:
 jobs:
   production:
+    if: github.ref == 'refs/heads/main'
     uses: rainlanguage/rainix/.github/workflows/rainix-vercel.yaml@main
     with:
       environment: production

crates/test_fixtures/abis/RaindexV6.json

@@ -51,6 +51,7 @@ import {
     CONTEXT_CALCULATIONS_ROW_MAX_OUTPUT,
     CONTEXT_CALCULATIONS_ROWS,
     CONTEXT_CALLING_CONTEXT_ROW_ORDER_COUNTERPARTY,
+    CONTEXT_CALLING_CONTEXT_ROW_ORDER_CLEARER,
     CONTEXT_DEPOSIT_COLUMN,
     CONTEXT_WITHDRAW_COLUMN,
     CONTEXT_CALLING_CONTEXT_ROW_ORDER_OWNER,
@@ -124,6 +125,8 @@ contract RaindexV6SubParser is BaseRainlangSubParser {
         contextCallingContextHandlers[CONTEXT_CALLING_CONTEXT_ROW_ORDER_OWNER] = LibParseOperand.handleOperandDisallowed;
         contextCallingContextHandlers[CONTEXT_CALLING_CONTEXT_ROW_ORDER_COUNTERPARTY] =
         LibParseOperand.handleOperandDisallowed;
+        contextCallingContextHandlers[CONTEXT_CALLING_CONTEXT_ROW_ORDER_CLEARER] =
+        LibParseOperand.handleOperandDisallowed;
 
         function(bytes32[] memory) internal pure returns (OperandV2)[] memory contextCalculationsHandlers =
             new function(bytes32[] memory) internal pure returns (OperandV2)[](CONTEXT_CALCULATIONS_ROWS);
@@ -225,6 +228,8 @@ contract RaindexV6SubParser is BaseRainlangSubParser {
         contextCallingContextParsers[CONTEXT_CALLING_CONTEXT_ROW_ORDER_OWNER] = LibRaindexSubParser.subParserOrderOwner;
         contextCallingContextParsers[CONTEXT_CALLING_CONTEXT_ROW_ORDER_COUNTERPARTY] =
         LibRaindexSubParser.subParserOrderCounterparty;
+        contextCallingContextParsers[CONTEXT_CALLING_CONTEXT_ROW_ORDER_CLEARER] =
+        LibRaindexSubParser.subParserOrderClearer;
 
         function(uint256, uint256, OperandV2) internal view returns (bool, bytes memory, bytes32[] memory)[] memory
             contextCalculationsParsers =

crates/test_fixtures/abis/RaindexV6SubParser.json

@@ -64,7 +64,6 @@ import {
 } from "../../lib/LibRaindex.sol";
 import {RaindexV6FlashLender} from "../../abstract/RaindexV6FlashLender.sol";
 import {LibBytes32Array} from "rain-solmem-0.1.28/src/lib/LibBytes32Array.sol";
-import {LibBytes32Matrix} from "rain-solmem-0.1.28/src/lib/LibBytes32Matrix.sol";
 
 import {LibFormatDecimalFloat} from "rain-math-float-0.3.10/src/lib/format/LibFormatDecimalFloat.sol";
 import {
@@ -314,7 +313,10 @@ contract RaindexV6 is IRaindexV7, IMetaV1_2, ReentrancyGuard, Multicall, Raindex
     /// with a context of the order hash and the caller.
     function _doOrderPost(bytes32 orderHash, TaskV3[] calldata post) internal {
         LibRaindex.doPost(
-            LibBytes32Matrix.matrixFrom(LibBytes32Array.arrayFrom(orderHash, bytes32(uint256(uint160(msg.sender))))),
+            LibRaindex.callingContextColumn(
+                CONTEXT_CALLING_CONTEXT_COLUMN,
+                LibBytes32Array.arrayFrom(orderHash, bytes32(uint256(uint160(msg.sender))))
+            ),
             post
         );
     }
@@ -346,6 +348,7 @@ contract RaindexV6 is IRaindexV7, IMetaV1_2, ReentrancyGuard, Multicall, Raindex
             msg.sender,
             quoteConfig.signedContext,
             new bytes32[](0),
+            false,
             false
         );
         // true is quote3's "order is live" result required by IRaindexV7.
@@ -436,7 +439,8 @@ contract RaindexV6 is IRaindexV7, IMetaV1_2, ReentrancyGuard, Multicall, Raindex
                         msg.sender,
                         takeOrderConfig.signedContext,
                         new bytes32[](0),
-                        true
+                        true,
+                        false
                     );
 
                     // Skip orders that are too expensive rather than revert as we have
@@ -630,7 +634,8 @@ contract RaindexV6 is IRaindexV7, IMetaV1_2, ReentrancyGuard, Multicall, Raindex
             bobOrder.owner,
             bobSignedContext,
             new bytes32[](0),
-            false
+            false,
+            true
         );
         (, OrderIOCalculationV4 memory bobOrderIOCalculation) = calculateOrderIO(
             bobOrder,
@@ -639,7 +644,8 @@ contract RaindexV6 is IRaindexV7, IMetaV1_2, ReentrancyGuard, Multicall, Raindex
             aliceOrder.owner,
             aliceSignedContext,
             new bytes32[](0),
-            false
+            false,
+            true
         );
 
         // Each side must be one `takeOrders5` would take. Given this, each
@@ -715,6 +721,8 @@ contract RaindexV6 is IRaindexV7, IMetaV1_2, ReentrancyGuard, Multicall, Raindex
     /// single-order callers (`quote`, `clear4`).
     /// @param skipFailure If true, a reverting calculate eval or a stack shorter
     /// than `CALCULATE_ORDER_MIN_OUTPUTS` returns false instead of reverting.
+    /// @param clearing Whether the order column includes the clearer row; true
+    /// only for `clear4`.
     /// @return False if `skipFailure` caught a failure, in which case the
     /// calculation is zeroed and MUST NOT be used.
     /// @return The order IO calculation.
@@ -725,15 +733,23 @@ contract RaindexV6 is IRaindexV7, IMetaV1_2, ReentrancyGuard, Multicall, Raindex
         address counterparty,
         SignedContextV2[] memory signedContext,
         bytes32[] memory stateOverlay,
-        bool skipFailure
+        bool skipFailure,
+        bool clearing
     ) internal view returns (bool, OrderIOCalculationV4 memory) {
         unchecked {
             bytes32[][] memory context;
             {
                 bytes32[][] memory callingContext = new bytes32[][](CALLING_CONTEXT_COLUMNS);
-                callingContext[CONTEXT_CALLING_CONTEXT_COLUMN - 1] = LibBytes32Array.arrayFrom(
-                    order.hash(), bytes32(uint256(uint160(order.owner))), bytes32(uint256(uint160(counterparty)))
-                );
+                callingContext[CONTEXT_CALLING_CONTEXT_COLUMN - 1] = clearing
+                    ? LibBytes32Array.arrayFrom(
+                        order.hash(),
+                        bytes32(uint256(uint160(order.owner))),
+                        bytes32(uint256(uint160(counterparty))),
+                        bytes32(uint256(uint160(msg.sender)))
+                    )
+                    : LibBytes32Array.arrayFrom(
+                        order.hash(), bytes32(uint256(uint160(order.owner))), bytes32(uint256(uint160(counterparty)))
+                    );
 
                 // The calculations column holds the calculated max output and IO
                 // ratio, which only become known after the calculate eval below.

meta/RaindexV6SubParser.rain.meta

@@ -5,10 +5,10 @@ pragma solidity ^0.8.25;
 // THIS FILE IS AUTOGENERATED BY THE BUILD SCRIPT. DO NOT EDIT BY HAND.
 
 /// @dev Hash of the known bytecode.
-bytes32 constant BYTECODE_HASH = bytes32(0x2bafaa417c2e9542a78321c186f293f581bb2a075bcdbfb03b2cf22fb4ecdabb);
+bytes32 constant BYTECODE_HASH = bytes32(0x303da2f6de1eaef16d1fe3f763e23b0b846f5c5aae1f8b26b2d54b71908e9859);
 
 /// @dev The hash of the meta that describes the contract.
-bytes32 constant DESCRIBED_BY_META_HASH = bytes32(0xe5f5c8b20782dd193ccec19353560b4bba9e69c36c2e6dbf45ef331a38d96dc9);
+bytes32 constant DESCRIBED_BY_META_HASH = bytes32(0x0368780942430ca285c5ae9332c68bbd7953a56ce02e6cc518a9bcc142046cff);
 
 /// @dev The parse meta that is used to lookup word definitions.
 /// The structure of the parse meta is:
@@ -27,7 +27,7 @@ bytes32 constant DESCRIBED_BY_META_HASH = bytes32(0xe5f5c8b20782dd193ccec1935356
 /// bit count of the previous bloom filter. If we reach the end of the bloom
 /// filters then we have a miss.
 bytes constant PARSE_META =
-    hex"0101180010800082000100010480300038412a001810000010020004200005002038038ff54900cc66c61df3dcab061659221fc9ec8109895f0b14fec9301902e0920c5bfe561b21609201e959460b1974270f844db208bcd3bf1c9893761e1049db11b93430180ae9a00af82a7805c138f40d28083f0742ef2104d561fd1215a13315716a6117d260cc107b9bfc0eec7ade13cba2891a6b14a520792bdb02e0f14716565589";
+    hex"0101180010a00082000100010480300038412a001810000010020004200005002038038ff54905cc66c61ef3dcab0716592220c9ec810a895f0b15fec9301a02e0920d5bfe561c21609201e959460c19742710844db209bcd3bf1d9893761f1049db12b93430190ae9a00bf82a7806c138f40e28083f0842ef2104d561fd1315a13316716a6118d260cc117b9bfc0fec7ade14cba28900a422961b6b14a521792bdb02e0f14717565589";
 
 /// @dev The build depth of the parser meta.
 
@@ -39,13 +39,13 @@ uint8 constant PARSE_META_BUILD_DEPTH = 1;
 /// to things that happen entirely on the interpreter such as well known
 /// constants and references to the context grid.
 bytes constant SUB_PARSER_WORD_PARSERS =
-    hex"183b1858186718761885189518a418b418c318d318e318f21902191119211931194119de19ed19fc1a0c1a1c1a2c1a3c1a4b1a5a1a6a1a7a1a8a1a9a195019691987";
+    hex"18a718c418d318e218f11901191119201930193f194f195f196e197e198d199d19ad19bd1a571a661a751a851a951aa51ab51ac41ad31ae31af31b031b1319cc19e51a03";
 
 /// @dev Every two bytes is a function pointer for an operand handler.
 /// These positional indexes all map to the same indexes looked up in the parse
 /// meta.
 bytes constant OPERAND_HANDLER_FUNCTION_POINTERS =
-    hex"1e411e411e411e411e411e411e411e411e411e411e411e411e411e411e411e411e411e411e411e411e411e411e411e411e411e411e411e411e411e411e6a1e6a1f06";
+    hex"1eba1eba1eba1eba1eba1eba1eba1eba1eba1eba1eba1eba1eba1eba1eba1eba1eba1eba1eba1eba1eba1eba1eba1eba1eba1eba1eba1eba1eba1eba1eba1ee31ee31f7f";
 
 /// @dev Every two bytes is a function pointer for a literal parser.
 /// Literal dispatches are determined by the first byte(s) of the literal