M02: per-entrypoint context word columns (WIP phase 3)

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

Author: thedavidmeister

crates/test_fixtures/abis/RaindexV6.json

@@ -14,6 +14,8 @@ import {LibUint256Matrix} from "rain-solmem-0.1.28/src/lib/LibUint256Matrix.sol"
 import {
     LibRaindexSubParser,
     SUB_PARSER_WORD_PARSERS_LENGTH,
+    BASE_WORD_RAINDEX,
+    BASE_WORDS_LENGTH,
     DEPOSIT_WORD_VAULT_ID,
     DEPOSIT_WORD_TOKEN,
     DEPOSIT_WORD_DEPOSITOR,
@@ -30,12 +32,7 @@ import {
     WITHDRAW_WORD_TOKEN_DECIMALS,
     WITHDRAW_WORDS_LENGTH
 } from "../../lib/LibRaindexSubParser.sol";
-import {
-    CONTEXT_BASE_COLUMN,
-    CONTEXT_BASE_ROW_SENDER,
-    CONTEXT_BASE_ROW_CALLING_CONTRACT,
-    CONTEXT_BASE_ROWS
-} from "rainlang-interface-0.2.13/src/lib/caller/LibContext.sol";
+import {CONTEXT_BASE_COLUMN} from "rainlang-interface-0.2.13/src/lib/caller/LibContext.sol";
 import {
     CONTEXT_COLUMNS_EXTENDED,
     CONTEXT_VAULT_OUTPUTS_COLUMN,
@@ -51,6 +48,9 @@ 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,
     CONTEXT_CALLING_CONTEXT_ROW_ORDER_HASH,
     CONTEXT_CALLING_CONTEXT_ROWS,
@@ -72,8 +72,8 @@ import {IDescribedByMetaV1} from "rain-metadata-0.1.43/src/interface/IDescribedB
 import {ISubParserToolingV1} from "rain-sol-codegen-0.1.39/src/interface/ISubParserToolingV1.sol";
 
 /// @title RaindexV6SubParser
-/// @notice Sub-parser that provides raindex-specific context words (sender,
-/// order hash, vault IO, deposit/withdraw, signed context, etc.) to the
+/// @notice Sub-parser that provides raindex-specific context words (raindex,
+/// order hash, clearer, vault IO, deposit/withdraw, signed context, etc.) to the
 /// Rain interpreter.
 contract RaindexV6SubParser is BaseRainlangSubParser {
     using LibUint256Matrix for uint256[][];
@@ -109,16 +109,17 @@ contract RaindexV6SubParser is BaseRainlangSubParser {
             new function(bytes32[] memory) internal pure returns (OperandV2)[][](CONTEXT_COLUMNS_EXTENDED);
 
         function(bytes32[] memory) internal pure returns (OperandV2)[] memory contextBaseHandlers =
-            new function(bytes32[] memory) internal pure returns (OperandV2)[](CONTEXT_BASE_ROWS);
-        contextBaseHandlers[CONTEXT_BASE_ROW_SENDER] = LibParseOperand.handleOperandDisallowed;
-        contextBaseHandlers[CONTEXT_BASE_ROW_CALLING_CONTRACT] = LibParseOperand.handleOperandDisallowed;
+            new function(bytes32[] memory) internal pure returns (OperandV2)[](BASE_WORDS_LENGTH);
+        contextBaseHandlers[BASE_WORD_RAINDEX] = LibParseOperand.handleOperandDisallowed;
 
         function(bytes32[] memory) internal pure returns (OperandV2)[] memory contextCallingContextHandlers =
             new function(bytes32[] memory) internal pure returns (OperandV2)[](CONTEXT_CALLING_CONTEXT_ROWS);
         contextCallingContextHandlers[CONTEXT_CALLING_CONTEXT_ROW_ORDER_HASH] = LibParseOperand.handleOperandDisallowed;
         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);
@@ -167,7 +168,7 @@ contract RaindexV6SubParser is BaseRainlangSubParser {
         contextDepositContextHandlers[DEPOSIT_WORD_VAULT_AFTER] = LibParseOperand.handleOperandDisallowed;
         contextDepositContextHandlers[DEPOSIT_WORD_TOKEN_DECIMALS] = LibParseOperand.handleOperandDisallowed;
 
-        handlers[CONTEXT_SIGNED_CONTEXT_START_COLUMN + 1] = contextDepositContextHandlers;
+        handlers[CONTEXT_DEPOSIT_COLUMN] = contextDepositContextHandlers;
 
         function(bytes32[] memory) internal pure returns (OperandV2)[] memory contextWithdrawContextHandlers =
             new function(bytes32[] memory) internal pure returns (OperandV2)[](WITHDRAW_WORDS_LENGTH);
@@ -179,7 +180,7 @@ contract RaindexV6SubParser is BaseRainlangSubParser {
         contextWithdrawContextHandlers[WITHDRAW_WORD_TARGET_AMOUNT] = LibParseOperand.handleOperandDisallowed;
         contextWithdrawContextHandlers[WITHDRAW_WORD_TOKEN_DECIMALS] = LibParseOperand.handleOperandDisallowed;
 
-        handlers[CONTEXT_SIGNED_CONTEXT_START_COLUMN + 2] = contextWithdrawContextHandlers;
+        handlers[CONTEXT_WITHDRAW_COLUMN] = contextWithdrawContextHandlers;
 
         uint256[][] memory handlersUint256;
         assembly ("memory-safe") {
@@ -201,9 +202,8 @@ contract RaindexV6SubParser is BaseRainlangSubParser {
             contextBaseParsers =
             new function(uint256, uint256, OperandV2)
             internal
-            view returns (bool, bytes memory, bytes32[] memory)[](CONTEXT_BASE_ROWS);
-        contextBaseParsers[CONTEXT_BASE_ROW_SENDER] = LibRaindexSubParser.subParserSender;
-        contextBaseParsers[CONTEXT_BASE_ROW_CALLING_CONTRACT] = LibRaindexSubParser.subParserCallingContract;
+            view returns (bool, bytes memory, bytes32[] memory)[](BASE_WORDS_LENGTH);
+        contextBaseParsers[BASE_WORD_RAINDEX] = LibRaindexSubParser.subParserCallingContract;
 
         function(uint256, uint256, OperandV2) internal view returns (bool, bytes memory, bytes32[] memory)[] memory
             contextCallingContextParsers =
@@ -214,6 +214,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 =
@@ -275,14 +277,14 @@ contract RaindexV6SubParser is BaseRainlangSubParser {
             internal
             view returns (bool, bytes memory, bytes32[] memory)[](DEPOSIT_WORDS_LENGTH);
 
-        depositParsers[DEPOSIT_WORD_DEPOSITOR] = LibRaindexSubParser.subParserSender;
+        depositParsers[DEPOSIT_WORD_DEPOSITOR] = LibRaindexSubParser.subParserDepositor;
         depositParsers[DEPOSIT_WORD_TOKEN] = LibRaindexSubParser.subParserDepositToken;
         depositParsers[DEPOSIT_WORD_VAULT_ID] = LibRaindexSubParser.subParserDepositVaultId;
         depositParsers[DEPOSIT_WORD_VAULT_BEFORE] = LibRaindexSubParser.subParserDepositVaultBalanceBefore;
         depositParsers[DEPOSIT_WORD_VAULT_AFTER] = LibRaindexSubParser.subParserDepositVaultBalanceAfter;
         depositParsers[DEPOSIT_WORD_TOKEN_DECIMALS] = LibRaindexSubParser.subParserDepositTokenDecimals;
 
-        parsers[CONTEXT_SIGNED_CONTEXT_START_COLUMN + 1] = depositParsers;
+        parsers[CONTEXT_DEPOSIT_COLUMN] = depositParsers;
 
         // Withdraws
 
@@ -292,15 +294,15 @@ contract RaindexV6SubParser is BaseRainlangSubParser {
             internal
             view returns (bool, bytes memory, bytes32[] memory)[](WITHDRAW_WORDS_LENGTH);
 
-        withdrawParsers[WITHDRAW_WORD_WITHDRAWER] = LibRaindexSubParser.subParserSender;
+        withdrawParsers[WITHDRAW_WORD_WITHDRAWER] = LibRaindexSubParser.subParserWithdrawer;
         withdrawParsers[WITHDRAW_WORD_TOKEN] = LibRaindexSubParser.subParserWithdrawToken;
         withdrawParsers[WITHDRAW_WORD_VAULT_ID] = LibRaindexSubParser.subParserWithdrawVaultId;
         withdrawParsers[WITHDRAW_WORD_VAULT_BEFORE] = LibRaindexSubParser.subParserWithdrawVaultBalanceBefore;
         withdrawParsers[WITHDRAW_WORD_VAULT_AFTER] = LibRaindexSubParser.subParserWithdrawVaultBalanceAfter;
         withdrawParsers[WITHDRAW_WORD_TARGET_AMOUNT] = LibRaindexSubParser.subParserWithdrawTargetAmount;
         withdrawParsers[WITHDRAW_WORD_TOKEN_DECIMALS] = LibRaindexSubParser.subParserWithdrawTokenDecimals;
 
-        parsers[CONTEXT_SIGNED_CONTEXT_START_COLUMN + 2] = withdrawParsers;
+        parsers[CONTEXT_WITHDRAW_COLUMN] = withdrawParsers;
 
         uint256[][] memory parsersUint256;
         assembly ("memory-safe") {

crates/test_fixtures/abis/RaindexV6SubParser.json

@@ -314,7 +314,8 @@ contract RaindexV6 is IRaindexV6, IMetaV1_2, ReentrancyGuard, Multicall, Raindex
     function _doOrderPost(bytes32 orderHash, TaskV2[] calldata post) internal {
         LibRaindex.doPost(
             LibRaindex.callingContextColumn(
-                CONTEXT_CALLING_CONTEXT_COLUMN, LibBytes32Array.arrayFrom(orderHash, bytes32(uint256(uint160(msg.sender))))
+                CONTEXT_CALLING_CONTEXT_COLUMN,
+                LibBytes32Array.arrayFrom(orderHash, bytes32(uint256(uint160(msg.sender))))
             ),
             post
         );

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(0xb5f18596862c369ecb1bc3cf69399785a578427214d9372d94d0fde2ed0ecaeb);
+bytes32 constant BYTECODE_HASH = bytes32(0xb1b4649132a7ad03265562c1a423ea9c47c1c19d24882c98827e8f5c9b3fd439);
 
 /// @dev The hash of the meta that describes the contract.
-bytes32 constant DESCRIBED_BY_META_HASH = bytes32(0xf2d0eca454c544ab10f9991c019349475a416e38494f112a50807174c3000d0b);
+bytes32 constant DESCRIBED_BY_META_HASH = bytes32(0xe43208b51e17b3d887e8f3535d75526c0744eee6a200dac603462c6b3ca46511);
 
 /// @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(0xf2d0eca454c544ab10f9991c0193
 /// 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"0101180010800082000100010480300038412a001810000010020004200004002038038ff54900cc66c61ff3dcab0616592209895f0b16fec9301b02e0920c5bfe561d21609201e959460b1974270f844db208bcd3bf1e989376111049db13b934301a0ae9a00af82a7805c138f40d28083f0742ef2104d561fd1415a13317716a6119d260cc107b9bfc0eec7ade15cba2891c6b14a512792bdb02e0f14718565589";
+    hex"0101180010800082000100010480300038412a001810000010020004200004002038028ff54904cc66c61df3dcab0616592209895f0b14fec9301902e0920c5bfe561b21609200e959460b1974270f844db208bcd3bf1c9893761e1049db11b93430180ae9a00af82a7805c138f40d28083f0742ef2103d561fd1215a13315716a6117d260cc107b9bfc0eec7ade13cba2891a6b14a51f792bdb01e0f14716565589";
 
 /// @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"16cc16e916f8170717161726173517451754176417741783179317a217b217c217d217e117f016cc16f8170717161825183516cc16f817071716182518351845";
+    hex"168216a016af16be16ce16de16ed16fd170c171c172c173b174b175a176a177a178a17da17e917f81808181818281838184718561866187618861896179917a8";
 
 /// @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"1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1c151cb11bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec1bec";
+    hex"1c3d1c3d1c3d1c3d1c3d1c3d1c3d1c3d1c3d1c3d1c3d1c3d1c3d1c3d1c3d1c3d1c3d1c3d1c3d1c3d1c3d1c3d1c3d1c3d1c3d1c3d1c3d1c3d1c3d1c3d1c661d02";
 
 /// @dev Every two bytes is a function pointer for a literal parser.
 /// Literal dispatches are determined by the first byte(s) of the literal