@aztec/simulator 0.57.0 → 0.58.0

package/dest/public/public_processor.js

@@ -1,10 +1,10 @@
 import { __esDecorate, __runInitializers } from "tslib";
 import { NestedProcessReturnValues, Tx, makeProcessedTx, validateProcessedTx, } from '@aztec/circuit-types';
-import { AztecAddress, ContractClassRegisteredEvent, FEE_JUICE_ADDRESS, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PROTOCOL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PublicDataUpdateRequest, } from '@aztec/circuits.js';
+import { ContractClassRegisteredEvent, MAX_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PROTOCOL_PUBLIC_DATA_UPDATE_REQUESTS_PER_TX, PublicDataUpdateRequest, } from '@aztec/circuits.js';
 import { times } from '@aztec/foundation/collection';
 import { createDebugLogger } from '@aztec/foundation/log';
 import { Timer } from '@aztec/foundation/timer';
-import { ClassRegistererAddress } from '@aztec/protocol-contracts/class-registerer';
+import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { Attributes, trackSpan } from '@aztec/telemetry-client';
 import { EnqueuedCallsProcessor } from './enqueued_calls_processor.js';
 import { PublicExecutor } from './executor.js';
@@ -16,8 +16,7 @@ import { PublicProcessorMetrics } from './public_processor_metrics.js';
  * Creates new instances of PublicProcessor given the provided merkle tree db and contract data source.
  */
 export class PublicProcessorFactory {
-    constructor(merkleTree, contractDataSource, simulator, telemetryClient) {
-        this.merkleTree = merkleTree;
+    constructor(contractDataSource, simulator, telemetryClient) {
         this.contractDataSource = contractDataSource;
         this.simulator = simulator;
         this.telemetryClient = telemetryClient;
@@ -28,17 +27,14 @@ export class PublicProcessorFactory {
      * @param globalVariables - The global variables for the block being processed.
      * @returns A new instance of a PublicProcessor.
      */
-    create(maybeHistoricalHeader, globalVariables) {
-        const { merkleTree, telemetryClient } = this;
+    create(merkleTree, maybeHistoricalHeader, globalVariables) {
+        const { telemetryClient } = this;
         const historicalHeader = maybeHistoricalHeader ?? merkleTree.getInitialHeader();
         const worldStateDB = new WorldStateDB(merkleTree, this.contractDataSource);
         const publicExecutor = new PublicExecutor(worldStateDB, telemetryClient);
         const publicKernelSimulator = new RealPublicKernelCircuitSimulator(this.simulator);
         return PublicProcessor.create(merkleTree, publicExecutor, publicKernelSimulator, globalVariables, historicalHeader, worldStateDB, this.telemetryClient);
     }
-    getInitialHeader() {
-        return this.merkleTree.getInitialHeader();
-    }
 }
 /**
  * Converts Txs lifted from the P2P module into ProcessedTx objects by executing
@@ -144,7 +140,7 @@ let PublicProcessor = (() => {
                 if (feePayer.isZero()) {
                     return finalPublicDataUpdateRequests;
                 }
-                const feeJuiceAddress = AztecAddress.fromBigInt(FEE_JUICE_ADDRESS);
+                const feeJuiceAddress = ProtocolContractAddress.FeeJuice;
                 const balanceSlot = computeFeePayerBalanceStorageSlot(feePayer);
                 const leafSlot = computeFeePayerBalanceLeafSlot(feePayer);
                 const txFee = tx.data.getTransactionFee(this.globalVariables.gasFees);
@@ -176,7 +172,7 @@ let PublicProcessor = (() => {
                         this.metrics.recordPhaseDuration(phase.phase, phase.durationMs);
                     }
                 });
-                this.metrics.recordClassRegistration(...ContractClassRegisteredEvent.fromLogs(tx.unencryptedLogs.unrollLogs(), ClassRegistererAddress));
+                this.metrics.recordClassRegistration(...ContractClassRegisteredEvent.fromLogs(tx.unencryptedLogs.unrollLogs(), ProtocolContractAddress.ContractClassRegisterer));
                 const phaseCount = processedPhases.length;
                 this.metrics.recordTx(phaseCount, timer.ms());
                 const processedTx = makeProcessedTx(tx, tailKernelOutput, provingRequests, revertReason, gasUsed);
@@ -194,4 +190,4 @@ let PublicProcessor = (() => {
         _a;
 })();
 export { PublicProcessor };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_processor.js","sourceRoot":"","sources":["../../src/public/public_processor.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"public_processor.js","sourceRoot":"","sources":["../../src/public/public_processor.ts"],"names":[],"mappings":"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"}

package/dest/public/side_effect_trace.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
-import { Gas } from '@aztec/circuits.js';
+import { type ContractInstanceWithAddress, Gas } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
-import { type ContractInstanceWithAddress } from '@aztec/types/contracts';
 import { type AvmContractCallResult } from '../avm/avm_contract_call_result.js';
 import { type AvmExecutionEnvironment } from '../avm/avm_execution_environment.js';
 import { type PublicExecutionResult } from './execution.js';

package/dest/public/side_effect_trace.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"side_effect_trace.d.ts","sourceRoot":"","sources":["../../src/public/side_effect_trace.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"side_effect_trace.d.ts","sourceRoot":"","sources":["../../src/public/side_effect_trace.ts"],"names":[],"mappings":"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"}

package/dest/public/side_effect_trace.js

@@ -134,7 +134,7 @@ export class PublicSideEffectTrace {
     traceGetContractInstance(instance) {
         this.enforceLimitOnNullifierChecks('(contract address nullifier from GETCONTRACTINSTANCE)');
         // TODO(dbanks12): should emit a nullifier read request
-        this.avmCircuitHints.contractInstances.items.push(new AvmContractInstanceHint(instance.address, new Fr(instance.exists ? 1 : 0), instance.salt, instance.deployer, instance.contractClassId, instance.initializationHash, instance.publicKeysHash));
+        this.avmCircuitHints.contractInstances.items.push(new AvmContractInstanceHint(instance.address, new Fr(instance.exists ? 1 : 0), instance.salt, instance.deployer, instance.contractClassId, instance.initializationHash, instance.publicKeys));
         this.logger.debug(`CONTRACT_INSTANCE cnt: ${this.sideEffectCounter}`);
         this.incrementSideEffectCounter();
     }
@@ -249,4 +249,4 @@ function createPublicExecutionRequest(avmEnvironment) {
     });
     return new PublicExecutionRequest(avmEnvironment.address, callContext, avmEnvironment.calldata);
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"side_effect_trace.js","sourceRoot":"","sources":["../../src/public/side_effect_trace.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"side_effect_trace.js","sourceRoot":"","sources":["../../src/public/side_effect_trace.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/simulator",
-  "version": "0.57.0",
+  "version": "0.58.0",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -59,14 +59,14 @@
     ]
   },
   "dependencies": {
-    "@aztec/circuit-types": "0.57.0",
-    "@aztec/circuits.js": "0.57.0",
-    "@aztec/foundation": "0.57.0",
-    "@aztec/noir-protocol-circuits-types": "0.57.0",
-    "@aztec/protocol-contracts": "0.57.0",
-    "@aztec/telemetry-client": "0.57.0",
-    "@aztec/types": "0.57.0",
-    "@aztec/world-state": "0.57.0",
+    "@aztec/circuit-types": "0.58.0",
+    "@aztec/circuits.js": "0.58.0",
+    "@aztec/foundation": "0.58.0",
+    "@aztec/noir-protocol-circuits-types": "0.58.0",
+    "@aztec/protocol-contracts": "0.58.0",
+    "@aztec/telemetry-client": "0.58.0",
+    "@aztec/types": "0.58.0",
+    "@aztec/world-state": "0.58.0",
     "@noir-lang/acvm_js": "portal:../../noir/packages/acvm_js",
     "@noir-lang/types": "portal:../../noir/packages/types",
     "levelup": "^5.1.1",

package/src/acvm/oracle/oracle.ts

@@ -70,7 +70,7 @@ export class Oracle {
       instance.deployer,
       instance.contractClassId,
       instance.initializationHash,
-      instance.publicKeysHash,
+      ...instance.publicKeys.toFields(),
     ].map(toACVMField);
   }
 

package/src/acvm/oracle/typed_oracle.ts

@@ -8,11 +8,15 @@ import {
   type SiblingPath,
   type UnencryptedL2Log,
 } from '@aztec/circuit-types';
-import { type Header, type KeyValidationRequest, type L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/circuits.js';
+import {
+  type ContractInstance,
+  type Header,
+  type KeyValidationRequest,
+  type L1_TO_L2_MSG_TREE_HEIGHT,
+} from '@aztec/circuits.js';
 import { type FunctionSelector, type NoteSelector } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
-import { type ContractInstance } from '@aztec/types/contracts';
 
 /**
  * Information about a note needed during execution.

package/src/avm/avm_gas.ts

@@ -180,6 +180,7 @@ export function getGasCostForTypeTag(tag: TypeTag, baseCost: Gas) {
 function getGasCostMultiplierFromTypeTag(tag: TypeTag) {
   switch (tag) {
     case TypeTag.UINT1: // same as u8
+      return 1;
     case TypeTag.UINT8:
       return 1;
     case TypeTag.UINT16:
@@ -193,7 +194,6 @@ function getGasCostMultiplierFromTypeTag(tag: TypeTag) {
     case TypeTag.FIELD:
       return 32;
     case TypeTag.INVALID:
-    case TypeTag.UNINITIALIZED:
       throw new InstructionExecutionError(`Invalid tag type for gas cost multiplier: ${TypeTag[tag]}`);
   }
 }

package/src/avm/avm_memory_types.ts

@@ -208,21 +208,19 @@ export class Field extends MemoryValue {
 }
 
 export enum TypeTag {
-  UNINITIALIZED,
+  FIELD = MEM_TAG_FF,
   UINT1 = MEM_TAG_U1,
   UINT8 = MEM_TAG_U8,
   UINT16 = MEM_TAG_U16,
   UINT32 = MEM_TAG_U32,
   UINT64 = MEM_TAG_U64,
   UINT128 = MEM_TAG_U128,
-  FIELD = MEM_TAG_FF,
   INVALID,
 }
 
 // Lazy interface definition for tagged memory
 export type TaggedMemoryInterface = FunctionsOf<TaggedMemory>;
 
-// TODO: Consider automatic conversion when getting undefined values.
 export class TaggedMemory implements TaggedMemoryInterface {
   static readonly log: DebugLogger = createDebugLogger('aztec:avm_simulator:memory');
 
@@ -255,6 +253,7 @@ export class TaggedMemory implements TaggedMemoryInterface {
     TaggedMemory.log.debug(`get(${offset}) = ${word}`);
     if (word === undefined) {
       TaggedMemory.log.debug(`WARNING: Memory at offset ${offset} is undefined!`);
+      return new Field(0) as T;
     }
     return word as T;
   }
@@ -264,7 +263,11 @@ export class TaggedMemory implements TaggedMemoryInterface {
     assert(offset + size < TaggedMemory.MAX_MEMORY_SIZE);
     const value = this._mem.slice(offset, offset + size);
     TaggedMemory.log.debug(`getSlice(${offset}, ${size}) = ${value}`);
-    assert(!value.some(e => e === undefined), 'Memory slice contains undefined values.');
+    for (let i = 0; i < value.length; i++) {
+      if (value[i] === undefined) {
+        value[i] = new Field(0);
+      }
+    }
     assert(value.length === size, `Expected slice of size ${size}, got ${value.length}.`);
     return value;
   }
@@ -332,6 +335,16 @@ export class TaggedMemory implements TaggedMemoryInterface {
     }
   }
 
+  /**
+   * Check that all tags at the given offsets are the same.
+   */
+  public checkTagsAreSame(...offsets: number[]) {
+    const tag = this.getTag(offsets[0]);
+    for (let i = 1; i < offsets.length; i++) {
+      this.checkTag(tag, offsets[i]);
+    }
+  }
+
   /**
    * Check tags for all memory in the specified range.
    */
@@ -347,7 +360,9 @@ export class TaggedMemory implements TaggedMemoryInterface {
     let tag = TypeTag.INVALID;
 
     if (v === undefined) {
-      tag = TypeTag.UNINITIALIZED;
+      tag = TypeTag.FIELD; // uninitialized memory is Field(0)
+    } else if (v instanceof Field) {
+      tag = TypeTag.FIELD;
     } else if (v instanceof Uint1) {
       tag = TypeTag.UINT1;
     } else if (v instanceof Uint8) {
@@ -360,8 +375,6 @@ export class TaggedMemory implements TaggedMemoryInterface {
       tag = TypeTag.UINT64;
     } else if (v instanceof Uint128) {
       tag = TypeTag.UINT128;
-    } else if (v instanceof Field) {
-      tag = TypeTag.FIELD;
     }
 
     return tag;
@@ -371,6 +384,8 @@ export class TaggedMemory implements TaggedMemoryInterface {
   public static buildFromTagTruncating(v: bigint | number, tag: TypeTag): MemoryValue {
     v = BigInt(v);
     switch (tag) {
+      case TypeTag.FIELD:
+        return new Field(v);
       case TypeTag.UINT1:
         return new Uint1(v & 1n);
       case TypeTag.UINT8:
@@ -383,8 +398,6 @@ export class TaggedMemory implements TaggedMemoryInterface {
         return new Uint64(v & ((1n << 64n) - 1n));
       case TypeTag.UINT128:
         return new Uint128(v & ((1n << 128n) - 1n));
-      case TypeTag.FIELD:
-        return new Field(v);
       default:
         throw new Error(`${TypeTag[tag]} is not a valid tag.`);
     }
@@ -393,6 +406,8 @@ export class TaggedMemory implements TaggedMemoryInterface {
   // Does not truncate. Type constructor will check that it fits.
   public static buildFromTagOrDie(v: bigint | number, tag: TypeTag): MemoryValue {
     switch (tag) {
+      case TypeTag.FIELD:
+        return new Field(v);
       case TypeTag.UINT1:
         return new Uint1(v);
       case TypeTag.UINT8:
@@ -405,8 +420,6 @@ export class TaggedMemory implements TaggedMemoryInterface {
         return new Uint64(v);
       case TypeTag.UINT128:
         return new Uint128(v);
-      case TypeTag.FIELD:
-        return new Field(v);
       default:
         throw new Error(`${TypeTag[tag]} is not a valid integral type.`);
     }
@@ -511,6 +524,10 @@ export class MeteredTaggedMemory implements TaggedMemoryInterface {
     this.wrapped.checkTags(tag, ...offsets);
   }
 
+  public checkTagsAreSame(...offsets: number[]): void {
+    this.wrapped.checkTagsAreSame(...offsets);
+  }
+
   public checkTagsRange(tag: TypeTag, startOffset: number, size: number): void {
     this.wrapped.checkTagsRange(tag, startOffset, size);
   }

package/src/avm/avm_simulator.ts

@@ -1,7 +1,9 @@
+import { MAX_L2_GAS_PER_ENQUEUED_CALL } from '@aztec/circuits.js';
 import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log';
 
 import { strict as assert } from 'assert';
 
+import { SideEffectLimitReachedError } from '../public/side_effect_errors.js';
 import type { AvmContext } from './avm_context.js';
 import { AvmContractCallResult } from './avm_contract_call_result.js';
 import { isAvmBytecode } from './bytecode_utils.js';
@@ -20,6 +22,10 @@ export class AvmSimulator {
   private bytecode: Buffer | undefined;
 
   constructor(private context: AvmContext) {
+    assert(
+      context.machineState.gasLeft.l2Gas <= MAX_L2_GAS_PER_ENQUEUED_CALL,
+      `Cannot allocate more than ${MAX_L2_GAS_PER_ENQUEUED_CALL} to the AVM for execution of an enqueued call`,
+    );
     this.log = createDebugLogger(`aztec:avm_simulator:core(f:${context.environment.functionSelector.toString()})`);
   }
 
@@ -98,7 +104,7 @@ export class AvmSimulator {
       return results;
     } catch (err: any) {
       this.log.verbose('Exceptional halt (revert by something other than REVERT opcode)');
-      if (!(err instanceof AvmExecutionError)) {
+      if (!(err instanceof AvmExecutionError || err instanceof SideEffectLimitReachedError)) {
         this.log.verbose(`Unknown error thrown by AVM: ${err}`);
         throw err;
       }

package/src/avm/fixtures/index.ts

@@ -1,5 +1,5 @@
 import { isNoirCallStackUnresolved } from '@aztec/circuit-types';
-import { GasFees, GlobalVariables } from '@aztec/circuits.js';
+import { GasFees, GlobalVariables, MAX_L2_GAS_PER_ENQUEUED_CALL } from '@aztec/circuits.js';
 import { FunctionSelector, getFunctionDebugMetadata } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -91,7 +91,7 @@ export function initGlobalVariables(overrides?: Partial<GlobalVariables>): Globa
  */
 export function initMachineState(overrides?: Partial<AvmMachineState>): AvmMachineState {
   return AvmMachineState.fromState({
-    l2GasLeft: overrides?.l2GasLeft ?? 1e8,
+    l2GasLeft: overrides?.l2GasLeft ?? MAX_L2_GAS_PER_ENQUEUED_CALL,
     daGasLeft: overrides?.daGasLeft ?? 1e8,
   });
 }

package/src/avm/journal/journal.ts

@@ -1,7 +1,6 @@
-import { AztecAddress, type FunctionSelector, type Gas } from '@aztec/circuits.js';
+import { AztecAddress, type FunctionSelector, type Gas, SerializableContractInstance } from '@aztec/circuits.js';
 import { Fr } from '@aztec/foundation/fields';
-import { type DebugLogger, createDebugLogger } from '@aztec/foundation/log';
-import { SerializableContractInstance } from '@aztec/types/contracts';
+import { createDebugLogger } from '@aztec/foundation/log';
 
 import { getPublicFunctionDebugName } from '../../common/debug_fn_name.js';
 import { type WorldStateDB } from '../../public/public_db_sources.js';
@@ -22,7 +21,7 @@ import { PublicStorage } from './public_storage.js';
  * Manages merging of successful/reverted child state into current state.
  */
 export class AvmPersistableStateManager {
-  private readonly log: DebugLogger = createDebugLogger('aztec:avm_simulator:state_manager');
+  private readonly log = createDebugLogger('aztec:avm_simulator:state_manager');
 
   constructor(
     /** Reference to node storage */

package/src/avm/opcodes/accrued_substate.ts

@@ -1,5 +1,5 @@
 import type { AvmContext } from '../avm_context.js';
-import { TypeTag, Uint8 } from '../avm_memory_types.js';
+import { TypeTag, Uint1 } from '../avm_memory_types.js';
 import { InstructionExecutionError, StaticCallAlterationError } from '../errors.js';
 import { NullifierCollisionError } from '../journal/nullifiers.js';
 import { Opcode, OperandType } from '../serialization/instruction_serialization.js';
@@ -13,9 +13,9 @@ export class NoteHashExists extends Instruction {
   static readonly wireFormat = [
     OperandType.UINT8,
     OperandType.UINT8,
-    OperandType.UINT32,
-    OperandType.UINT32,
-    OperandType.UINT32,
+    OperandType.UINT16,
+    OperandType.UINT16,
+    OperandType.UINT16,
   ];
 
   constructor(
@@ -44,7 +44,7 @@ export class NoteHashExists extends Instruction {
       noteHash,
       leafIndex,
     );
-    memory.set(existsOffset, exists ? new Uint8(1) : new Uint8(0));
+    memory.set(existsOffset, exists ? new Uint1(1) : new Uint1(0));
 
     memory.assert({ reads: 2, writes: 1, addressing });
     context.machineState.incrementPc();
@@ -55,7 +55,7 @@ export class EmitNoteHash extends Instruction {
   static type: string = 'EMITNOTEHASH';
   static readonly opcode: Opcode = Opcode.EMITNOTEHASH;
   // Informs (de)serialization. See Instruction.deserialize.
-  static readonly wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT32];
+  static readonly wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT16];
 
   constructor(private indirect: number, private noteHashOffset: number) {
     super();
@@ -89,9 +89,9 @@ export class NullifierExists extends Instruction {
   static readonly wireFormat = [
     OperandType.UINT8,
     OperandType.UINT8,
-    OperandType.UINT32,
-    OperandType.UINT32,
-    OperandType.UINT32,
+    OperandType.UINT16,
+    OperandType.UINT16,
+    OperandType.UINT16,
   ];
 
   constructor(
@@ -116,7 +116,7 @@ export class NullifierExists extends Instruction {
     const address = memory.get(addressOffset).toFr();
     const exists = await context.persistableState.checkNullifierExists(address, nullifier);
 
-    memory.set(existsOffset, exists ? new Uint8(1) : new Uint8(0));
+    memory.set(existsOffset, exists ? new Uint1(1) : new Uint1(0));
 
     memory.assert({ reads: 2, writes: 1, addressing });
     context.machineState.incrementPc();
@@ -127,7 +127,7 @@ export class EmitNullifier extends Instruction {
   static type: string = 'EMITNULLIFIER';
   static readonly opcode: Opcode = Opcode.EMITNULLIFIER;
   // Informs (de)serialization. See Instruction.deserialize.
-  static readonly wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT32];
+  static readonly wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT16];
 
   constructor(private indirect: number, private nullifierOffset: number) {
     super();
@@ -172,9 +172,9 @@ export class L1ToL2MessageExists extends Instruction {
   static readonly wireFormat = [
     OperandType.UINT8,
     OperandType.UINT8,
-    OperandType.UINT32,
-    OperandType.UINT32,
-    OperandType.UINT32,
+    OperandType.UINT16,
+    OperandType.UINT16,
+    OperandType.UINT16,
   ];
 
   constructor(
@@ -202,7 +202,7 @@ export class L1ToL2MessageExists extends Instruction {
       msgHash,
       msgLeafIndex,
     );
-    memory.set(existsOffset, exists ? new Uint8(1) : new Uint8(0));
+    memory.set(existsOffset, exists ? new Uint1(1) : new Uint1(0));
 
     memory.assert({ reads: 2, writes: 1, addressing });
     context.machineState.incrementPc();
@@ -213,7 +213,7 @@ export class EmitUnencryptedLog extends Instruction {
   static type: string = 'EMITUNENCRYPTEDLOG';
   static readonly opcode: Opcode = Opcode.EMITUNENCRYPTEDLOG;
   // Informs (de)serialization. See Instruction.deserialize.
-  static readonly wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT32, OperandType.UINT32];
+  static readonly wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT16, OperandType.UINT16];
 
   constructor(private indirect: number, private logOffset: number, private logSizeOffset: number) {
     super();
@@ -248,7 +248,7 @@ export class SendL2ToL1Message extends Instruction {
   static type: string = 'SENDL2TOL1MSG';
   static readonly opcode: Opcode = Opcode.SENDL2TOL1MSG;
   // Informs (de)serialization. See Instruction.deserialize.
-  static readonly wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT32, OperandType.UINT32];
+  static readonly wireFormat = [OperandType.UINT8, OperandType.UINT8, OperandType.UINT16, OperandType.UINT16];
 
   constructor(private indirect: number, private recipientOffset: number, private contentOffset: number) {
     super();

package/src/avm/opcodes/arithmetic.ts

@@ -12,7 +12,7 @@ export abstract class ThreeOperandArithmeticInstruction extends ThreeOperandInst
     const operands = [this.aOffset, this.bOffset, this.dstOffset];
     const addressing = Addressing.fromWire(this.indirect, operands.length);
     const [aOffset, bOffset, dstOffset] = addressing.resolve(operands, memory);
-    memory.checkTags(this.inTag, aOffset, bOffset);
+    memory.checkTagsAreSame(aOffset, bOffset);
 
     const a = memory.get(aOffset);
     const b = memory.get(bOffset);

package/src/avm/opcodes/bitwise.ts

@@ -13,7 +13,7 @@ abstract class ThreeOperandBitwiseInstruction extends ThreeOperandInstruction {
     const operands = [this.aOffset, this.bOffset, this.dstOffset];
     const addressing = Addressing.fromWire(this.indirect, operands.length);
     const [aOffset, bOffset, dstOffset] = addressing.resolve(operands, memory);
-    this.checkTags(memory, this.inTag, aOffset, bOffset);
+    this.checkTags(memory, aOffset, bOffset);
 
     const a = memory.getAs<IntegralValue>(aOffset);
     const b = memory.getAs<IntegralValue>(bOffset);
@@ -26,8 +26,9 @@ abstract class ThreeOperandBitwiseInstruction extends ThreeOperandInstruction {
   }
 
   protected abstract compute(a: IntegralValue, b: IntegralValue): IntegralValue;
-  protected checkTags(memory: TaggedMemoryInterface, inTag: number, aOffset: number, bOffset: number) {
-    memory.checkTags(inTag, aOffset, bOffset);
+  protected checkTags(memory: TaggedMemoryInterface, aOffset: number, bOffset: number) {
+    TaggedMemory.checkIsIntegralTag(memory.getTag(aOffset));
+    memory.checkTagsAreSame(aOffset, bOffset);
   }
 }
 
@@ -65,8 +66,8 @@ export class Shl extends ThreeOperandBitwiseInstruction {
   protected override compute(a: IntegralValue, b: IntegralValue): IntegralValue {
     return a.shl(b);
   }
-  protected override checkTags(memory: TaggedMemoryInterface, inTag: number, aOffset: number, bOffset: number) {
-    memory.checkTag(inTag, aOffset);
+  protected override checkTags(memory: TaggedMemoryInterface, aOffset: number, bOffset: number) {
+    TaggedMemory.checkIsIntegralTag(memory.getTag(aOffset));
     memory.checkTag(TypeTag.UINT8, bOffset);
   }
 }
@@ -78,8 +79,8 @@ export class Shr extends ThreeOperandBitwiseInstruction {
   protected override compute(a: IntegralValue, b: IntegralValue): IntegralValue {
     return a.shr(b);
   }
-  protected override checkTags(memory: TaggedMemoryInterface, inTag: number, aOffset: number, bOffset: number) {
-    memory.checkTag(inTag, aOffset);
+  protected override checkTags(memory: TaggedMemoryInterface, aOffset: number, bOffset: number) {
+    TaggedMemory.checkIsIntegralTag(memory.getTag(aOffset));
     memory.checkTag(TypeTag.UINT8, bOffset);
   }
 }