@aztec/simulator 0.0.1-commit.96bb3f7 → 0.0.1-commit.96dac018d

package/dest/public/fixtures/opcode_spammer.js

@@ -143,7 +143,7 @@
  * - `EMITNOTEHASH`: max 64 per TX
  * - `EMITNULLIFIER`: max 63 per TX (one reserved for TX nullifier)
  * - `SENDL2TOL1MSG`: max 8 per TX
- * - `EMITUNENCRYPTEDLOG`: limited by total log payload size
+ * - `EMITPUBLICLOG`: limited by total log payload size
  *
  * By having the inner contract REVERT after emitting side effects, those effects are discarded, allowing the outer contract to call it again. This enables thousands of opcode executions per TX instead of just the limit.
  *
@@ -152,12 +152,11 @@ import { Grumpkin } from '@aztec/foundation/crypto/grumpkin';
 import { randomBigInt } from '@aztec/foundation/crypto/random';
 import { Fr } from '@aztec/foundation/curves/bn254';
 import { PublicDataWrite } from '@aztec/stdlib/avm';
-import { AztecAddress } from '@aztec/stdlib/aztec-address';
-import { computePublicDataTreeLeafSlot, siloNullifier } from '@aztec/stdlib/hash';
+import { computePublicDataTreeLeafSlot } from '@aztec/stdlib/hash';
 import { MerkleTreeId } from '@aztec/stdlib/trees';
 import assert from 'assert';
 import { Field, TaggedMemory, TypeTag, Uint1, Uint32, Uint64 } from '../avm/avm_memory_types.js';
-import { Add, And, Call, CalldataCopy, Cast, DebugLog, Div, EcAdd, EmitNoteHash, EmitNullifier, EmitUnencryptedLog, Eq, FieldDiv, GetContractInstance, GetEnvVar, InternalCall, InternalReturn, Jump, JumpI, KeccakF1600, L1ToL2MessageExists, Lt, Lte, Mov, Mul, Not, NoteHashExists, NullifierExists, Or, Poseidon2, Return, ReturndataCopy, ReturndataSize, Revert, SLoad, SStore, SendL2ToL1Message, Set, Sha256Compression, Shl, Shr, StaticCall, Sub, SuccessCopy, ToRadixBE, Xor } from '../avm/opcodes/index.js';
+import { Add, And, Call, CalldataCopy, Cast, DebugLog, Div, EcAdd, EmitNoteHash, EmitNullifier, EmitPublicLog, Eq, FieldDiv, GetContractInstance, GetEnvVar, InternalCall, InternalReturn, Jump, JumpI, KeccakF1600, L1ToL2MessageExists, Lt, Lte, Mov, Mul, Not, NoteHashExists, NullifierExists, Or, Poseidon2, Return, ReturndataCopy, ReturndataSize, Revert, SLoad, SStore, SendL2ToL1Message, Set, Sha256Compression, Shl, Shr, StaticCall, Sub, SuccessCopy, ToRadixBE, Xor } from '../avm/opcodes/index.js';
 import { encodeToBytecode } from '../avm/serialization/bytecode_serialization.js';
 import { Opcode } from '../avm/serialization/instruction_serialization.js';
 import { deployCustomBytecode, executeCustomBytecode } from './custom_bytecode_tester.js';
@@ -169,8 +168,7 @@ import { deployCustomBytecode, executeCustomBytecode } from './custom_bytecode_t
  * before running the spammer so that existence checks can find them.
  */ export const WARM_NOTE_HASH = new Fr(0xdeadbeefn);
 export const WARM_L1_TO_L2_MSG = new Fr(0xcafebabedeadbeefn);
-/** Warm nullifier constants - uses a fixed address since NULLIFIEREXISTS takes address as parameter */ export const WARM_NULLIFIER = new Fr(0xdeadbeef0001n);
-export const WARM_NULLIFIER_ADDRESS = AztecAddress.fromNumber(0xbeef);
+/** Warm nullifier constant - a pre-siloed nullifier value inserted directly into the tree */ export const WARM_SILOED_NULLIFIER = new Fr(0xdeadbeef0001n);
 /** Warm storage constants - storage is inserted for the deployed contract's address */ export const WARM_STORAGE_SLOT = new Fr(0xdeadbeef0002n);
 export const WARM_STORAGE_VALUE = new Fr(0xcafebabe0003n);
 /**
@@ -197,10 +195,9 @@ export const WARM_L1_TO_L2_MSG_LEAF_INDEX = 0n;
     await merkleTrees.appendLeaves(MerkleTreeId.L1_TO_L2_MESSAGE_TREE, [
         WARM_L1_TO_L2_MSG
     ]);
-    // Insert siloed nullifier into nullifier tree
-    const siloedNullifier = await siloNullifier(WARM_NULLIFIER_ADDRESS, WARM_NULLIFIER);
+    // Insert siloed nullifier into nullifier tree (already siloed - used directly by NULLIFIEREXISTS)
     await merkleTrees.sequentialInsert(MerkleTreeId.NULLIFIER_TREE, [
-        siloedNullifier.toBuffer()
+        WARM_SILOED_NULLIFIER.toBuffer()
     ]);
     // Insert storage value into public data tree
     const leafSlot = await computePublicDataTreeLeafSlot(contractAddress, WARM_STORAGE_SLOT);
@@ -316,11 +313,11 @@ const MAX_U32 = 0xffffffffn;
             value: new Uint32(MAX_U32)
         },
         ()=>[
-                new CalldataCopy(/*indirect=*/ 0, /*copySizeOffset=*/ CALL_COPY_SIZE_OFFSET, /*cdStartOffset=*/ CALL_CALLDATA_INDEX_OFFSET, /*dstOffset=*/ CALL_ADDR_OFFSET)
+                new CalldataCopy(/*addressing_mode=*/ 0, /*copySizeOffset=*/ CALL_COPY_SIZE_OFFSET, /*cdStartOffset=*/ CALL_CALLDATA_INDEX_OFFSET, /*dstOffset=*/ CALL_ADDR_OFFSET)
             ]
     ],
     targetInstructions: ()=>[
-            new Call(/*indirect=*/ 0, /*l2GasOffset=*/ CALL_L2_GAS_OFFSET, /*daGasOffset=*/ CALL_DA_GAS_OFFSET, /*addrOffset=*/ CALL_ADDR_OFFSET, /*argsSizeOffset=*/ CALL_ARGS_SIZE_OFFSET, /*argsOffset=*/ CALL_ARGS_OFFSET)
+            new Call(/*addressing_mode=*/ 0, /*l2GasOffset=*/ CALL_L2_GAS_OFFSET, /*daGasOffset=*/ CALL_DA_GAS_OFFSET, /*addrOffset=*/ CALL_ADDR_OFFSET, /*argsSizeOffset=*/ CALL_ARGS_SIZE_OFFSET, /*argsOffset=*/ CALL_ARGS_OFFSET)
         ],
     addressAsCalldata: true
 };
@@ -340,11 +337,11 @@ const STATIC_CALL_CONFIG = {
             value: new Uint32(MAX_U32)
         },
         ()=>[
-                new CalldataCopy(/*indirect=*/ 0, /*copySizeOffset=*/ CALL_COPY_SIZE_OFFSET, /*cdStartOffset=*/ CALL_CALLDATA_INDEX_OFFSET, /*dstOffset=*/ CALL_ADDR_OFFSET)
+                new CalldataCopy(/*addressing_mode=*/ 0, /*copySizeOffset=*/ CALL_COPY_SIZE_OFFSET, /*cdStartOffset=*/ CALL_CALLDATA_INDEX_OFFSET, /*dstOffset=*/ CALL_ADDR_OFFSET)
             ]
     ],
     targetInstructions: ()=>[
-            new StaticCall(/*indirect=*/ 0, /*l2GasOffset=*/ CALL_L2_GAS_OFFSET, /*daGasOffset=*/ CALL_DA_GAS_OFFSET, /*addrOffset=*/ CALL_ADDR_OFFSET, /*argsSizeOffset=*/ CALL_ARGS_SIZE_OFFSET, /*argsOffset=*/ CALL_ARGS_OFFSET)
+            new StaticCall(/*addressing_mode=*/ 0, /*l2GasOffset=*/ CALL_L2_GAS_OFFSET, /*daGasOffset=*/ CALL_DA_GAS_OFFSET, /*addrOffset=*/ CALL_ADDR_OFFSET, /*argsSizeOffset=*/ CALL_ARGS_SIZE_OFFSET, /*argsOffset=*/ CALL_ARGS_OFFSET)
         ],
     addressAsCalldata: true
 };
@@ -372,7 +369,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new Add(/*indirect=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 0).as(Opcode.ADD_8, Add.wireFormat8)
+                    new Add(/*addressing_mode=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 0).as(Opcode.ADD_8, Add.wireFormat8)
                 ]
         })),
     [Opcode.SUB_8]: ALL_TAGS.map((tag)=>({
@@ -388,7 +385,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new Sub(/*indirect=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 0).as(Opcode.SUB_8, Sub.wireFormat8)
+                    new Sub(/*addressing_mode=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 0).as(Opcode.SUB_8, Sub.wireFormat8)
                 ]
         })),
     [Opcode.MUL_8]: ALL_TAGS.map((tag)=>({
@@ -404,7 +401,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new Mul(/*indirect=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 0).as(Opcode.MUL_8, Mul.wireFormat8)
+                    new Mul(/*addressing_mode=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 0).as(Opcode.MUL_8, Mul.wireFormat8)
                 ]
         })),
     // DIV doesn't support FIELD type
@@ -421,7 +418,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new Div(/*indirect=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 0).as(Opcode.DIV_8, Div.wireFormat8)
+                    new Div(/*addressing_mode=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 0).as(Opcode.DIV_8, Div.wireFormat8)
                 ]
         })),
     // Field-only
@@ -438,7 +435,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new FieldDiv(/*indirect=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 0).as(Opcode.FDIV_8, FieldDiv.wireFormat8)
+                    new FieldDiv(/*addressing_mode=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 0).as(Opcode.FDIV_8, FieldDiv.wireFormat8)
                 ]
         }
     ],
@@ -458,7 +455,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new Eq(/*indirect=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 2).as(Opcode.EQ_8, Eq.wireFormat8)
+                    new Eq(/*addressing_mode=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 2).as(Opcode.EQ_8, Eq.wireFormat8)
                 ]
         })),
     [Opcode.LT_8]: ALL_TAGS.map((tag)=>({
@@ -474,7 +471,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new Lt(/*indirect=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 2).as(Opcode.LT_8, Lt.wireFormat8)
+                    new Lt(/*addressing_mode=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 2).as(Opcode.LT_8, Lt.wireFormat8)
                 ]
         })),
     [Opcode.LTE_8]: ALL_TAGS.map((tag)=>({
@@ -490,7 +487,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new Lte(/*indirect=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 2).as(Opcode.LTE_8, Lte.wireFormat8)
+                    new Lte(/*addressing_mode=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 2).as(Opcode.LTE_8, Lte.wireFormat8)
                 ]
         })),
     // ═══════════════════════════════════════════════════════════════════════════
@@ -509,7 +506,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new And(/*indirect=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 0).as(Opcode.AND_8, And.wireFormat8)
+                    new And(/*addressing_mode=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 0).as(Opcode.AND_8, And.wireFormat8)
                 ]
         })),
     [Opcode.OR_8]: INT_TAGS.map((tag)=>({
@@ -525,7 +522,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new Or(/*indirect=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 0).as(Opcode.OR_8, Or.wireFormat8)
+                    new Or(/*addressing_mode=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 0).as(Opcode.OR_8, Or.wireFormat8)
                 ]
         })),
     [Opcode.XOR_8]: INT_TAGS.map((tag)=>({
@@ -541,7 +538,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new Xor(/*indirect=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 0).as(Opcode.XOR_8, Xor.wireFormat8)
+                    new Xor(/*addressing_mode=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 0).as(Opcode.XOR_8, Xor.wireFormat8)
                 ]
         })),
     [Opcode.NOT_8]: INT_TAGS.map((tag)=>({
@@ -553,7 +550,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new Not(/*indirect=*/ 0, /*srcOffset=*/ 0, /*dstOffset=*/ 0).as(Opcode.NOT_8, Not.wireFormat8)
+                    new Not(/*addressing_mode=*/ 0, /*srcOffset=*/ 0, /*dstOffset=*/ 0).as(Opcode.NOT_8, Not.wireFormat8)
                 ]
         })),
     [Opcode.SHL_8]: INT_TAGS.map((tag)=>({
@@ -569,7 +566,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new Shl(/*indirect=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 0).as(Opcode.SHL_8, Shl.wireFormat8)
+                    new Shl(/*addressing_mode=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 0).as(Opcode.SHL_8, Shl.wireFormat8)
                 ]
         })),
     [Opcode.SHR_8]: INT_TAGS.map((tag)=>({
@@ -585,7 +582,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new Shr(/*indirect=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 0).as(Opcode.SHR_8, Shr.wireFormat8)
+                    new Shr(/*addressing_mode=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 0).as(Opcode.SHR_8, Shr.wireFormat8)
                 ]
         })),
     // ═══════════════════════════════════════════════════════════════════════════
@@ -600,7 +597,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new Cast(/*indirect=*/ 0, /*srcOffset=*/ 0, /*dstOffset=*/ 1, /*dstTag=*/ TypeTag.UINT32).as(Opcode.CAST_8, Cast.wireFormat8)
+                    new Cast(/*addressing_mode=*/ 0, /*srcOffset=*/ 0, /*dstOffset=*/ 1, /*dstTag=*/ TypeTag.UINT32).as(Opcode.CAST_8, Cast.wireFormat8)
                 ]
         })),
     [Opcode.MOV_8]: ALL_TAGS.map((tag)=>({
@@ -612,7 +609,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new Mov(/*indirect=*/ 0, /*srcOffset=*/ 0, /*dstOffset=*/ 1).as(Opcode.MOV_8, Mov.wireFormat8)
+                    new Mov(/*addressing_mode=*/ 0, /*srcOffset=*/ 0, /*dstOffset=*/ 1).as(Opcode.MOV_8, Mov.wireFormat8)
                 ]
         })),
     // ═══════════════════════════════════════════════════════════════════════════
@@ -648,7 +645,7 @@ const STATIC_CALL_CONFIG = {
         {
             setup: [],
             targetInstructions: ()=>[
-                    new Set(/*indirect=*/ 0, /*dstOffset=*/ 0, /*inTag=*/ TypeTag.UINT128, /*value=*/ 4242424242424242n).as(Opcode.SET_128, Set.wireFormat128)
+                    new Set(/*addressing_mode=*/ 0, /*dstOffset=*/ 0, /*inTag=*/ TypeTag.UINT128, /*value=*/ 4242424242424242n).as(Opcode.SET_128, Set.wireFormat128)
                 ]
         }
     ],
@@ -679,7 +676,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new JumpI(/*indirect=*/ 0, /*condOffset=*/ 0, /*loc=*/ 0)
+                    new JumpI(/*addressing_mode=*/ 0, /*condOffset=*/ 0, /*loc=*/ 0)
                 ]
         }
     ],
@@ -725,7 +722,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new Return(/*indirect=*/ 0, /*returnSizeOffset=*/ 0, /*returnOffset=*/ 0)
+                    new Return(/*addressing_mode=*/ 0, /*returnSizeOffset=*/ 0, /*returnOffset=*/ 0)
                 ],
             // Use the side-effect-limit pattern (even though it's not a side-effect) as it fits
             // this case (we want to CALL, RETURN, then CALL again back in parent). We omit "cleanup"
@@ -744,7 +741,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new Revert(/*indirect=*/ 0, /*retSizeOffset=*/ 0, /*returnOffset=*/ 1).as(Opcode.REVERT_8, Revert.wireFormat8)
+                    new Revert(/*addressing_mode=*/ 0, /*retSizeOffset=*/ 0, /*returnOffset=*/ 1).as(Opcode.REVERT_8, Revert.wireFormat8)
                 ],
             limit: 1
         }
@@ -756,7 +753,7 @@ const STATIC_CALL_CONFIG = {
         {
             setup: [],
             targetInstructions: ()=>[
-                    new GetEnvVar(/*indirect=*/ 0, /*dstOffset=*/ 0, /*varEnum=*/ 0).as(Opcode.GETENVVAR_16, GetEnvVar.wireFormat16)
+                    new GetEnvVar(/*addressing_mode=*/ 0, /*dstOffset=*/ 0, /*varEnum=*/ 0).as(Opcode.GETENVVAR_16, GetEnvVar.wireFormat16)
                 ]
         }
     ],
@@ -776,7 +773,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new CalldataCopy(/*indirect=*/ 0, /*copySizeOffset=*/ 0, /*cdStartOffset=*/ 1, /*dstOffset=*/ 2)
+                    new CalldataCopy(/*addressing_mode=*/ 0, /*copySizeOffset=*/ 0, /*cdStartOffset=*/ 1, /*dstOffset=*/ 2)
                 ]
         },
         {
@@ -795,7 +792,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new CalldataCopy(/*indirect=*/ 0, /*copySizeOffset=*/ 0, /*cdStartOffset=*/ 1, /*dstOffset=*/ 2)
+                    new CalldataCopy(/*addressing_mode=*/ 0, /*copySizeOffset=*/ 0, /*cdStartOffset=*/ 1, /*dstOffset=*/ 2)
                 ]
         },
         {
@@ -812,7 +809,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new CalldataCopy(/*indirect=*/ 0, /*copySizeOffset=*/ 0, /*cdStartOffset=*/ 1, /*dstOffset=*/ 2)
+                    new CalldataCopy(/*addressing_mode=*/ 0, /*copySizeOffset=*/ 0, /*cdStartOffset=*/ 1, /*dstOffset=*/ 2)
                 ]
         }
     ],
@@ -820,7 +817,7 @@ const STATIC_CALL_CONFIG = {
         {
             setup: [],
             targetInstructions: ()=>[
-                    new SuccessCopy(/*indirect=*/ 0, /*dstOffset=*/ 0)
+                    new SuccessCopy(/*addressing_mode=*/ 0, /*dstOffset=*/ 0)
                 ]
         }
     ],
@@ -828,7 +825,7 @@ const STATIC_CALL_CONFIG = {
         {
             setup: [],
             targetInstructions: ()=>[
-                    new ReturndataSize(/*indirect=*/ 0, /*dstOffset=*/ 0)
+                    new ReturndataSize(/*addressing_mode=*/ 0, /*dstOffset=*/ 0)
                 ]
         }
     ],
@@ -847,7 +844,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new ReturndataCopy(/*indirect=*/ 0, /*copySizeOffset=*/ 0, /*rdStartOffset=*/ 1, /*dstOffset=*/ 2)
+                    new ReturndataCopy(/*addressing_mode=*/ 0, /*copySizeOffset=*/ 0, /*rdStartOffset=*/ 1, /*dstOffset=*/ 2)
                 ]
         },
         {
@@ -866,7 +863,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new ReturndataCopy(/*indirect=*/ 0, /*copySizeOffset=*/ 0, /*rdStartOffset=*/ 1, /*dstOffset=*/ 2)
+                    new ReturndataCopy(/*addressing_mode=*/ 0, /*copySizeOffset=*/ 0, /*rdStartOffset=*/ 1, /*dstOffset=*/ 2)
                 ]
         },
         {
@@ -883,7 +880,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new ReturndataCopy(/*indirect=*/ 0, /*copySizeOffset=*/ 0, /*rdStartOffset=*/ 1, /*dstOffset=*/ 2)
+                    new ReturndataCopy(/*addressing_mode=*/ 0, /*copySizeOffset=*/ 0, /*rdStartOffset=*/ 1, /*dstOffset=*/ 2)
                 ]
         }
     ],
@@ -897,10 +894,14 @@ const STATIC_CALL_CONFIG = {
                 {
                     offset: 0,
                     value: new Field(Fr.random())
-                }
+                },
+                ()=>[
+                        // Get current contract address into offset 1
+                        new GetEnvVar(/*addressing_mode=*/ 0, /*dstOffset=*/ 1, /*varEnum=*/ 0).as(Opcode.GETENVVAR_16, GetEnvVar.wireFormat16)
+                    ]
             ],
             targetInstructions: ()=>[
-                    new SLoad(/*indirect=*/ 0, /*slotOffset=*/ 0, /*dstOffset=*/ 1)
+                    new SLoad(/*addressing_mode=*/ 0, /*slotOffset=*/ 0, /*contractAddressOffset=*/ 1, /*dstOffset=*/ 2)
                 ]
         },
         {
@@ -910,15 +911,19 @@ const STATIC_CALL_CONFIG = {
                 {
                     offset: 0,
                     value: new Field(WARM_STORAGE_SLOT)
-                }
+                },
+                ()=>[
+                        // Get current contract address into offset 1
+                        new GetEnvVar(/*addressing_mode=*/ 0, /*dstOffset=*/ 1, /*varEnum=*/ 0).as(Opcode.GETENVVAR_16, GetEnvVar.wireFormat16)
+                    ]
             ],
             targetInstructions: ()=>[
-                    new SLoad(/*indirect=*/ 0, /*slotOffset=*/ 0, /*dstOffset=*/ 1)
+                    new SLoad(/*addressing_mode=*/ 0, /*slotOffset=*/ 0, /*contractAddressOffset=*/ 1, /*dstOffset=*/ 2)
                 ]
         },
         {
             label: 'Warm read (SSTORE first, unique slot per SLOAD)',
-            // Memory layout: slot (incremented), value, constant 1, revertSize, loaded value
+            // Memory layout: slot (incremented), value, constant 1, contract address (from GETENVVAR), revertSize, loaded value
             setup: [
                 {
                     offset: 0,
@@ -932,18 +937,22 @@ const STATIC_CALL_CONFIG = {
                     offset: 2,
                     value: new Field(1n)
                 },
+                ()=>[
+                        // Get current contract address into offset 3
+                        new GetEnvVar(/*addressing_mode=*/ 0, /*dstOffset=*/ 3, /*varEnum=*/ 0).as(Opcode.GETENVVAR_16, GetEnvVar.wireFormat16)
+                    ],
                 {
-                    offset: 3,
+                    offset: 4,
                     value: new Uint32(0n)
                 }
             ],
             targetInstructions: ()=>[
-                    new SStore(/*indirect=*/ 0, /*srcOffset=*/ 1, /*slotOffset=*/ 0),
-                    new SLoad(/*indirect=*/ 0, /*slotOffset=*/ 0, /*dstOffset=*/ 4),
-                    new Add(/*indirect=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 2, /*dstOffset=*/ 0).as(Opcode.ADD_8, Add.wireFormat8)
+                    new SStore(/*addressing_mode=*/ 0, /*srcOffset=*/ 1, /*slotOffset=*/ 0),
+                    new SLoad(/*addressing_mode=*/ 0, /*slotOffset=*/ 0, /*contractAddressOffset=*/ 3, /*dstOffset=*/ 5),
+                    new Add(/*addressing_mode=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 2, /*dstOffset=*/ 0).as(Opcode.ADD_8, Add.wireFormat8)
                 ],
             cleanupInstructions: ()=>[
-                    new Revert(/*indirect=*/ 0, /*retSizeOffset=*/ 3, /*returnOffset=*/ 0).as(Opcode.REVERT_8, Revert.wireFormat8)
+                    new Revert(/*addressing_mode=*/ 0, /*retSizeOffset=*/ 4, /*returnOffset=*/ 0).as(Opcode.REVERT_8, Revert.wireFormat8)
                 ],
             limit: MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
         }
@@ -964,7 +973,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new NoteHashExists(/*indirect=*/ 0, /*noteHashOffset=*/ 0, /*leafIndexOffset=*/ 1, /*existsOffset=*/ 2)
+                    new NoteHashExists(/*addressing_mode=*/ 0, /*noteHashOffset=*/ 0, /*leafIndexOffset=*/ 1, /*existsOffset=*/ 2)
                 ]
         },
         {
@@ -981,74 +990,37 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new NoteHashExists(/*indirect=*/ 0, /*noteHashOffset=*/ 0, /*leafIndexOffset=*/ 1, /*existsOffset=*/ 2)
+                    new NoteHashExists(/*addressing_mode=*/ 0, /*noteHashOffset=*/ 0, /*leafIndexOffset=*/ 1, /*existsOffset=*/ 2)
                 ]
         }
     ],
     [Opcode.NULLIFIEREXISTS]: [
         {
             label: 'Non-existent nullifier',
+            // NULLIFIEREXISTS now takes a siloed nullifier directly (no address parameter)
             setup: [
                 {
                     offset: 0,
                     value: new Field(Fr.random())
-                },
-                {
-                    offset: 1,
-                    value: new Field(Fr.random())
                 }
             ],
             targetInstructions: ()=>[
-                    new NullifierExists(/*indirect=*/ 0, /*nullifierOffset=*/ 0, /*addressOffset=*/ 1, /*existsOffset=*/ 2)
+                    new NullifierExists(/*addressing_mode=*/ 0, /*siloedNullifierOffset=*/ 0, /*existsOffset=*/ 1)
                 ]
         },
         {
             label: 'Existing nullifier (warm - from tree)',
-            // Uses pre-inserted nullifier from insertWarmTreeEntries()
+            // Uses pre-inserted siloed nullifier from insertWarmTreeEntries()
+            // NULLIFIEREXISTS now takes a siloed nullifier directly
             setup: [
                 {
                     offset: 0,
-                    value: new Field(WARM_NULLIFIER)
-                },
-                {
-                    offset: 1,
-                    value: new Field(WARM_NULLIFIER_ADDRESS.toField())
+                    value: new Field(WARM_SILOED_NULLIFIER)
                 }
             ],
             targetInstructions: ()=>[
-                    new NullifierExists(/*indirect=*/ 0, /*nullifierOffset=*/ 0, /*addressOffset=*/ 1, /*existsOffset=*/ 2)
+                    new NullifierExists(/*addressing_mode=*/ 0, /*siloedNullifierOffset=*/ 0, /*existsOffset=*/ 1)
                 ]
-        },
-        {
-            label: 'Existing nullifier (warm - EMITNULLIFIER first)',
-            // Memory layout: nullifier (incremented), constant 1, current address (from GETENVVAR), revertSize, exists result
-            setup: [
-                {
-                    offset: 0,
-                    value: new Field(Fr.random())
-                },
-                {
-                    offset: 1,
-                    value: new Field(1n)
-                },
-                ()=>[
-                        // Get current contract address into offset 2
-                        new GetEnvVar(/*indirect=*/ 0, /*dstOffset=*/ 2, /*varEnum=*/ 0).as(Opcode.GETENVVAR_16, GetEnvVar.wireFormat16)
-                    ],
-                {
-                    offset: 3,
-                    value: new Uint32(0n)
-                }
-            ],
-            targetInstructions: ()=>[
-                    new EmitNullifier(/*indirect=*/ 0, /*nullifierOffset=*/ 0),
-                    new NullifierExists(/*indirect=*/ 0, /*nullifierOffset=*/ 0, /*addressOffset=*/ 2, /*existsOffset=*/ 4),
-                    new Add(/*indirect=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 0).as(Opcode.ADD_8, Add.wireFormat8)
-                ],
-            cleanupInstructions: ()=>[
-                    new Revert(/*indirect=*/ 0, /*retSizeOffset=*/ 3, /*returnOffset=*/ 0).as(Opcode.REVERT_8, Revert.wireFormat8)
-                ],
-            limit: MAX_NULLIFIERS_PER_TX - 1
         }
     ],
     [Opcode.L1TOL2MSGEXISTS]: [
@@ -1065,7 +1037,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new L1ToL2MessageExists(/*indirect=*/ 0, /*msgHashOffset=*/ 0, /*msgLeafIndexOffset=*/ 1, /*existsOffset=*/ 2)
+                    new L1ToL2MessageExists(/*addressing_mode=*/ 0, /*msgHashOffset=*/ 0, /*msgLeafIndexOffset=*/ 1, /*existsOffset=*/ 2)
                 ]
         },
         {
@@ -1082,7 +1054,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new L1ToL2MessageExists(/*indirect=*/ 0, /*msgHashOffset=*/ 0, /*msgLeafIndexOffset=*/ 1, /*existsOffset=*/ 2)
+                    new L1ToL2MessageExists(/*addressing_mode=*/ 0, /*msgHashOffset=*/ 0, /*msgLeafIndexOffset=*/ 1, /*existsOffset=*/ 2)
                 ]
         }
     ],
@@ -1092,12 +1064,12 @@ const STATIC_CALL_CONFIG = {
             // This ensures we're querying a valid deployed contract
             setup: [
                 ()=>[
-                        new GetEnvVar(/*indirect=*/ 0, /*dstOffset=*/ 0, /*varEnum=*/ 0).as(Opcode.GETENVVAR_16, GetEnvVar.wireFormat16)
+                        new GetEnvVar(/*addressing_mode=*/ 0, /*dstOffset=*/ 0, /*varEnum=*/ 0).as(Opcode.GETENVVAR_16, GetEnvVar.wireFormat16)
                     ]
             ],
             // memberEnum 0 = DEPLOYER
             targetInstructions: ()=>[
-                    new GetContractInstance(/*indirect=*/ 0, /*addressOffset=*/ 0, /*dstOffset=*/ 1, /*memberEnum=*/ 0)
+                    new GetContractInstance(/*addressing_mode=*/ 0, /*addressOffset=*/ 0, /*dstOffset=*/ 1, /*memberEnum=*/ 0)
                 ]
         }
     ],
@@ -1117,10 +1089,10 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new EmitNoteHash(/*indirect=*/ 0, /*noteHashOffset=*/ 0)
+                    new EmitNoteHash(/*addressing_mode=*/ 0, /*noteHashOffset=*/ 0)
                 ],
             cleanupInstructions: ()=>[
-                    new Revert(/*indirect=*/ 0, /*retSizeOffset=*/ 1, /*returnOffset=*/ 0).as(Opcode.REVERT_8, Revert.wireFormat8)
+                    new Revert(/*addressing_mode=*/ 0, /*retSizeOffset=*/ 1, /*returnOffset=*/ 0).as(Opcode.REVERT_8, Revert.wireFormat8)
                 ],
             limit: MAX_NOTE_HASHES_PER_TX
         }
@@ -1144,11 +1116,11 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new EmitNullifier(/*indirect=*/ 0, /*nullifierOffset=*/ 0),
-                    new Add(/*indirect=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 0).as(Opcode.ADD_8, Add.wireFormat8)
+                    new EmitNullifier(/*addressing_mode=*/ 0, /*nullifierOffset=*/ 0),
+                    new Add(/*addressing_mode=*/ 0, /*aOffset=*/ 0, /*bOffset=*/ 1, /*dstOffset=*/ 0).as(Opcode.ADD_8, Add.wireFormat8)
                 ],
             cleanupInstructions: ()=>[
-                    new Revert(/*indirect=*/ 0, /*retSizeOffset=*/ 2, /*returnOffset=*/ 0).as(Opcode.REVERT_8, Revert.wireFormat8)
+                    new Revert(/*addressing_mode=*/ 0, /*retSizeOffset=*/ 2, /*returnOffset=*/ 0).as(Opcode.REVERT_8, Revert.wireFormat8)
                 ],
             limit: MAX_NULLIFIERS_PER_TX - 1
         }
@@ -1170,10 +1142,10 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new SendL2ToL1Message(/*indirect=*/ 0, /*recipientOffset=*/ 0, /*contentOffset=*/ 1)
+                    new SendL2ToL1Message(/*addressing_mode=*/ 0, /*recipientOffset=*/ 0, /*contentOffset=*/ 1)
                 ],
             cleanupInstructions: ()=>[
-                    new Revert(/*indirect=*/ 0, /*retSizeOffset=*/ 2, /*returnOffset=*/ 0).as(Opcode.REVERT_8, Revert.wireFormat8)
+                    new Revert(/*addressing_mode=*/ 0, /*retSizeOffset=*/ 2, /*returnOffset=*/ 0).as(Opcode.REVERT_8, Revert.wireFormat8)
                 ],
             limit: MAX_L2_TO_L1_MSGS_PER_TX
         }
@@ -1199,10 +1171,10 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new SStore(/*indirect=*/ 0, /*srcOffset=*/ 0, /*slotOffset=*/ 1)
+                    new SStore(/*addressing_mode=*/ 0, /*srcOffset=*/ 0, /*slotOffset=*/ 1)
                 ],
             cleanupInstructions: ()=>[
-                    new Revert(/*indirect=*/ 0, /*retSizeOffset=*/ 2, /*returnOffset=*/ 0).as(Opcode.REVERT_8, Revert.wireFormat8)
+                    new Revert(/*addressing_mode=*/ 0, /*retSizeOffset=*/ 2, /*returnOffset=*/ 0).as(Opcode.REVERT_8, Revert.wireFormat8)
                 ]
         },
         {
@@ -1226,17 +1198,17 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new SStore(/*indirect=*/ 0, /*srcOffset=*/ 0, /*slotOffset=*/ 1),
-                    new Add(/*indirect=*/ 0, /*aOffset=*/ 1, /*bOffset=*/ 2, /*dstOffset=*/ 1).as(Opcode.ADD_8, Add.wireFormat8)
+                    new SStore(/*addressing_mode=*/ 0, /*srcOffset=*/ 0, /*slotOffset=*/ 1),
+                    new Add(/*addressing_mode=*/ 0, /*aOffset=*/ 1, /*bOffset=*/ 2, /*dstOffset=*/ 1).as(Opcode.ADD_8, Add.wireFormat8)
                 ],
             cleanupInstructions: ()=>[
-                    new Revert(/*indirect=*/ 0, /*retSizeOffset=*/ 3, /*returnOffset=*/ 0).as(Opcode.REVERT_8, Revert.wireFormat8)
+                    new Revert(/*addressing_mode=*/ 0, /*retSizeOffset=*/ 3, /*returnOffset=*/ 0).as(Opcode.REVERT_8, Revert.wireFormat8)
                 ],
             limit: MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX
         }
     ],
-    // EMITUNENCRYPTEDLOG - two configs: minimal (many small logs) and max-size (one large log)
-    [Opcode.EMITUNENCRYPTEDLOG]: [
+    // EMITPUBLICLOG - two configs: minimal (many small logs) and max-size (one large log)
+    [Opcode.EMITPUBLICLOG]: [
         {
             label: 'Many empty logs, revert, repeat',
             setup: [
@@ -1250,10 +1222,10 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new EmitUnencryptedLog(/*indirect=*/ 0, /*logSizeOffset=*/ 0, /*logOffset=*/ 1)
+                    new EmitPublicLog(/*addressing_mode=*/ 0, /*logSizeOffset=*/ 0, /*logOffset=*/ 1)
                 ],
             cleanupInstructions: ()=>[
-                    new Revert(/*indirect=*/ 0, /*retSizeOffset=*/ 1, /*returnOffset=*/ 0).as(Opcode.REVERT_8, Revert.wireFormat8)
+                    new Revert(/*addressing_mode=*/ 0, /*retSizeOffset=*/ 1, /*returnOffset=*/ 0).as(Opcode.REVERT_8, Revert.wireFormat8)
                 ],
             // Max logs with 0-field content: floor(4096 / 2) = 2048
             limit: Math.floor(FLAT_PUBLIC_LOGS_PAYLOAD_LENGTH / PUBLIC_LOG_HEADER_LENGTH)
@@ -1272,10 +1244,10 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new EmitUnencryptedLog(/*indirect=*/ 0, /*logSizeOffset=*/ 0, /*logOffset=*/ 2)
+                    new EmitPublicLog(/*addressing_mode=*/ 0, /*logSizeOffset=*/ 0, /*logOffset=*/ 2)
                 ],
             cleanupInstructions: ()=>[
-                    new Revert(/*indirect=*/ 0, /*retSizeOffset=*/ 1, /*returnOffset=*/ 0).as(Opcode.REVERT_8, Revert.wireFormat8)
+                    new Revert(/*addressing_mode=*/ 0, /*retSizeOffset=*/ 1, /*returnOffset=*/ 0).as(Opcode.REVERT_8, Revert.wireFormat8)
                 ],
             limit: 1
         }
@@ -1294,7 +1266,7 @@ const STATIC_CALL_CONFIG = {
                 })),
             // Poseidon hash data at M[0..3], write result to M[0:3] (reuse results as next inputs)
             targetInstructions: ()=>[
-                    new Poseidon2(/*indirect=*/ 0, /*inputStateOffset=*/ 0, /*outputStateOffset=*/ 0)
+                    new Poseidon2(/*addressing_mode=*/ 0, /*inputStateOffset=*/ 0, /*outputStateOffset=*/ 0)
                 ]
         }
     ],
@@ -1317,7 +1289,7 @@ const STATIC_CALL_CONFIG = {
                     }))
             ],
             targetInstructions: ()=>[
-                    new Sha256Compression(/*indirect=*/ 0, /*outputOffset=*/ 0, /*stateOffset=*/ 0, /*inputsOffset=*/ 8)
+                    new Sha256Compression(/*addressing_mode=*/ 0, /*outputOffset=*/ 0, /*stateOffset=*/ 0, /*inputsOffset=*/ 8)
                 ]
         }
     ],
@@ -1331,7 +1303,7 @@ const STATIC_CALL_CONFIG = {
                     value: randomWithTag(TypeTag.UINT64)
                 })),
             targetInstructions: ()=>[
-                    new KeccakF1600(/*indirect=*/ 0, /*dstOffset=*/ 0, /*inputOffset=*/ 0)
+                    new KeccakF1600(/*addressing_mode=*/ 0, /*dstOffset=*/ 0, /*inputOffset=*/ 0)
                 ]
         }
     ],
@@ -1365,7 +1337,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new EcAdd(/*indirect=*/ 0, /*p1XOffset=*/ 0, /*p1YOffset=*/ 1, /*p1IsInfiniteOffset=*/ 2, /*p2XOffset=*/ 3, /*p2YOffset=*/ 4, /*p2IsInfiniteOffset=*/ 5, /*dstOffset=*/ 0)
+                    new EcAdd(/*addressing_mode=*/ 0, /*p1XOffset=*/ 0, /*p1YOffset=*/ 1, /*p1IsInfiniteOffset=*/ 2, /*p2XOffset=*/ 3, /*p2YOffset=*/ 4, /*p2IsInfiniteOffset=*/ 5, /*dstOffset=*/ 0)
                 ]
         }
     ],
@@ -1392,7 +1364,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new ToRadixBE(/*indirect=*/ 0, /*srcOffset=*/ 0, /*radixOffset=*/ 1, /*numLimbsOffset=*/ 2, /*outputBitsOffset=*/ 3, /*dstOffset=*/ 4)
+                    new ToRadixBE(/*addressing_mode=*/ 0, /*srcOffset=*/ 0, /*radixOffset=*/ 1, /*numLimbsOffset=*/ 2, /*outputBitsOffset=*/ 3, /*dstOffset=*/ 4)
                 ]
         },
         {
@@ -1416,7 +1388,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new ToRadixBE(/*indirect=*/ 0, /*srcOffset=*/ 0, /*radixOffset=*/ 1, /*numLimbsOffset=*/ 2, /*outputBitsOffset=*/ 3, /*dstOffset=*/ 4)
+                    new ToRadixBE(/*addressing_mode=*/ 0, /*srcOffset=*/ 0, /*radixOffset=*/ 1, /*numLimbsOffset=*/ 2, /*outputBitsOffset=*/ 3, /*dstOffset=*/ 4)
                 ]
         },
         {
@@ -1442,7 +1414,7 @@ const STATIC_CALL_CONFIG = {
                 }
             ],
             targetInstructions: ()=>[
-                    new ToRadixBE(/*indirect=*/ 0, /*srcOffset=*/ 0, /*radixOffset=*/ 1, /*numLimbsOffset=*/ 2, /*outputBitsOffset=*/ 3, /*dstOffset=*/ 4)
+                    new ToRadixBE(/*addressing_mode=*/ 0, /*srcOffset=*/ 0, /*radixOffset=*/ 1, /*numLimbsOffset=*/ 2, /*outputBitsOffset=*/ 3, /*dstOffset=*/ 4)
                 ]
         }
     ],
@@ -1473,7 +1445,7 @@ const STATIC_CALL_CONFIG = {
             ],
             // messageSize = 0
             targetInstructions: ()=>[
-                    new DebugLog(/*indirect=*/ 0, /*levelOffset=*/ 0, /*messageOffset=*/ 1, /*fieldsOffset=*/ 2, /*fieldsSizeOffset=*/ 3, /*messageSize=*/ 0)
+                    new DebugLog(/*addressing_mode=*/ 0, /*levelOffset=*/ 0, /*messageOffset=*/ 1, /*fieldsOffset=*/ 2, /*fieldsSizeOffset=*/ 3, /*messageSize=*/ 0)
                 ]
         }
     ]