@aztec/simulator 0.35.0 → 0.36.0

package/src/avm/avm_machine_state.ts

@@ -9,7 +9,6 @@ import { OutOfGasError } from './errors.js';
  * A few fields of machine state are initialized from AVM session inputs or call instruction arguments
  */
 export type InitialAvmMachineState = {
-  l1GasLeft: number;
   l2GasLeft: number;
   daGasLeft: number;
 };
@@ -18,7 +17,6 @@ export type InitialAvmMachineState = {
  * Avm state modified on an instruction-per-instruction basis.
  */
 export class AvmMachineState {
-  public l1GasLeft: number;
   /** gas remaining of the gas allocated for a contract call */
   public l2GasLeft: number;
   public daGasLeft: number;
@@ -45,23 +43,22 @@ export class AvmMachineState {
   private output: Fr[] = [];
 
   constructor(gasLeft: Gas);
-  constructor(l1GasLeft: number, l2GasLeft: number, daGasLeft: number);
-  constructor(gasLeftOrL1GasLeft: Gas | number, l2GasLeft?: number, daGasLeft?: number) {
-    if (typeof gasLeftOrL1GasLeft === 'object') {
-      ({ l1Gas: this.l1GasLeft, l2Gas: this.l2GasLeft, daGas: this.daGasLeft } = gasLeftOrL1GasLeft);
+  constructor(l2GasLeft: number, daGasLeft: number);
+  constructor(gasLeftOrL2GasLeft: Gas | number, daGasLeft?: number) {
+    if (typeof gasLeftOrL2GasLeft === 'object') {
+      ({ l2Gas: this.l2GasLeft, daGas: this.daGasLeft } = gasLeftOrL2GasLeft);
     } else {
-      this.l1GasLeft = gasLeftOrL1GasLeft;
-      this.l2GasLeft = l2GasLeft!;
+      this.l2GasLeft = gasLeftOrL2GasLeft!;
       this.daGasLeft = daGasLeft!;
     }
   }
 
   public get gasLeft(): Gas {
-    return { l1Gas: this.l1GasLeft, l2Gas: this.l2GasLeft, daGas: this.daGasLeft };
+    return { l2Gas: this.l2GasLeft, daGas: this.daGasLeft };
   }
 
   public static fromState(state: InitialAvmMachineState): AvmMachineState {
-    return new AvmMachineState(state.l1GasLeft, state.l2GasLeft, state.daGasLeft);
+    return new AvmMachineState(state.l2GasLeft, state.daGasLeft);
   }
 
   /**
@@ -143,7 +140,7 @@ export class AvmMachineState {
       try {
         // Try to interpret the output as a text string.
         revertReason = new Error(
-          'Reverted with output: ' + String.fromCharCode(...this.output.map(fr => fr.toNumber())),
+          'Reverted with output: ' + String.fromCharCode(...this.output.slice(1).map(fr => fr.toNumber())),
         );
       } catch (e) {
         revertReason = new Error('Reverted with non-string output');

package/src/avm/avm_simulator.ts

@@ -61,7 +61,7 @@ export class AvmSimulator {
           'AVM attempted to execute non-existent instruction. This should never happen (invalid bytecode or AVM simulator bug)!',
         );
 
-        const gasLeft = `l1=${machineState.l1GasLeft} l2=${machineState.l2GasLeft} da=${machineState.daGasLeft}`;
+        const gasLeft = `l2=${machineState.l2GasLeft} da=${machineState.daGasLeft}`;
         this.log.debug(`@${machineState.pc} ${instruction.toString()} (${gasLeft})`);
         // Execute the instruction.
         // Normal returns and reverts will return normally here.

package/src/avm/fixtures/index.ts

@@ -1,5 +1,4 @@
-import { SiblingPath } from '@aztec/circuit-types';
-import { GasFees, GasSettings, GlobalVariables, Header, L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/circuits.js';
+import { GasFees, GasSettings, GlobalVariables, Header } from '@aztec/circuits.js';
 import { FunctionSelector } from '@aztec/foundation/abi';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -8,12 +7,7 @@ import { Fr } from '@aztec/foundation/fields';
 import { mock } from 'jest-mock-extended';
 import merge from 'lodash.merge';
 
-import {
-  type CommitmentsDB,
-  MessageLoadOracleInputs,
-  type PublicContractsDB,
-  type PublicStateDB,
-} from '../../index.js';
+import { type CommitmentsDB, type PublicContractsDB, type PublicStateDB } from '../../index.js';
 import { AvmContext } from '../avm_context.js';
 import { AvmContextInputs, AvmExecutionEnvironment } from '../avm_execution_environment.js';
 import { AvmMachineState } from '../avm_machine_state.js';
@@ -61,10 +55,7 @@ export function initExecutionEnvironment(overrides?: Partial<AvmExecutionEnviron
   return new AvmExecutionEnvironment(
     overrides?.address ?? AztecAddress.zero(),
     overrides?.storageAddress ?? AztecAddress.zero(),
-    overrides?.origin ?? AztecAddress.zero(),
     overrides?.sender ?? AztecAddress.zero(),
-    overrides?.portal ?? EthAddress.ZERO,
-    overrides?.feePerL1Gas ?? Fr.zero(),
     overrides?.feePerL2Gas ?? Fr.zero(),
     overrides?.feePerDaGas ?? Fr.zero(),
     overrides?.contractCallDepth ?? Fr.zero(),
@@ -99,7 +90,6 @@ export function initGlobalVariables(overrides?: Partial<GlobalVariables>): Globa
  */
 export function initMachineState(overrides?: Partial<AvmMachineState>): AvmMachineState {
   return AvmMachineState.fromState({
-    l1GasLeft: overrides?.l1GasLeft ?? 100e6,
     l2GasLeft: overrides?.l2GasLeft ?? 100e6,
     daGasLeft: overrides?.daGasLeft ?? 100e6,
   });
@@ -112,18 +102,6 @@ export function allSameExcept(original: any, overrides: any): any {
   return merge({}, original, overrides);
 }
 
-/**
- * Create an empty L1ToL2Message oracle input
- */
-export function initL1ToL2MessageOracleInput(
-  leafIndex?: bigint,
-): MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT> {
-  return new MessageLoadOracleInputs<typeof L1_TO_L2_MSG_TREE_HEIGHT>(
-    leafIndex ?? 0n,
-    new SiblingPath(L1_TO_L2_MSG_TREE_HEIGHT, Array(L1_TO_L2_MSG_TREE_HEIGHT)),
-  );
-}
-
 /**
  * Adjust the user index to account for the AvmContextInputs size.
  * This is a hack for testing, and should go away once AvmContextInputs themselves go away.

package/src/avm/journal/journal.ts

@@ -16,6 +16,7 @@ import {
   type TracedNullifierCheck,
   type TracedPublicStorageRead,
   type TracedPublicStorageWrite,
+  type TracedUnencryptedL2Log,
 } from './trace_types.js';
 
 /**
@@ -33,7 +34,7 @@ export type JournalData = {
 
   newL1Messages: L2ToL1Message[];
   newLogs: UnencryptedL2Log[];
-
+  newLogsHashes: TracedUnencryptedL2Log[];
   /** contract address -\> key -\> value */
   currentStorageValue: Map<bigint, Map<bigint, Fr>>;
 };
@@ -171,24 +172,11 @@ export class AvmPersistableStateManager {
    * @returns exists - whether the message exists in the L1 to L2 Messages tree
    */
   public async checkL1ToL2MessageExists(msgHash: Fr, msgLeafIndex: Fr): Promise<boolean> {
-    let exists = false;
-    try {
-      // The following 2 values are used to compute a message nullifier. Given that here we do not care about getting
-      // non-nullified messages we can just pass in random values and the nullifier check will effectively be ignored
-      // (no nullifier will be found).
-      const ignoredContractAddress = AztecAddress.random();
-      const ignoredSecret = Fr.random();
-      const gotMessage = await this.hostStorage.commitmentsDb.getL1ToL2MembershipWitness(
-        ignoredContractAddress,
-        msgHash,
-        ignoredSecret,
-      );
-      exists = gotMessage !== undefined && gotMessage.index == msgLeafIndex.toBigInt();
-    } catch {
-      // error getting message - doesn't exist!
-      exists = false;
-    }
-    this.log.debug(`l1ToL2Messages(${msgHash})@${msgLeafIndex} ?? exists: ${exists}.`);
+    const valueAtIndex = await this.hostStorage.commitmentsDb.getL1ToL2LeafValue(msgLeafIndex.toBigInt());
+    const exists = valueAtIndex?.equals(msgHash) ?? false;
+    this.log.debug(
+      `l1ToL2Messages(@${msgLeafIndex}) ?? exists: ${exists}, expected: ${msgHash}, found: ${valueAtIndex}.`,
+    );
     this.trace.traceL1ToL2MessageCheck(msgHash, msgLeafIndex, exists);
     return Promise.resolve(exists);
   }
@@ -206,13 +194,13 @@ export class AvmPersistableStateManager {
 
   public writeLog(contractAddress: Fr, event: Fr, log: Fr[]) {
     this.log.debug(`UnencryptedL2Log(${contractAddress}) += event ${event} with ${log.length} fields.`);
-    this.newLogs.push(
-      new UnencryptedL2Log(
-        AztecAddress.fromField(contractAddress),
-        EventSelector.fromField(event),
-        Buffer.concat(log.map(f => f.toBuffer())),
-      ),
+    const L2log = new UnencryptedL2Log(
+      AztecAddress.fromField(contractAddress),
+      EventSelector.fromField(event),
+      Buffer.concat(log.map(f => f.toBuffer())),
     );
+    this.newLogs.push(L2log);
+    this.trace.traceNewLog(Fr.fromBuffer(L2log.hash()));
   }
 
   /**
@@ -252,6 +240,7 @@ export class AvmPersistableStateManager {
       l1ToL2MessageChecks: this.trace.l1ToL2MessageChecks,
       newL1Messages: this.newL1Messages,
       newLogs: this.newLogs,
+      newLogsHashes: this.trace.newLogsHashes,
       currentStorageValue: this.publicStorage.getCache().cachePerContract,
       storageReads: this.trace.publicStorageReads,
       storageWrites: this.trace.publicStorageWrites,

package/src/avm/journal/trace.ts

@@ -8,6 +8,7 @@ import {
   type TracedNullifierCheck,
   type TracedPublicStorageRead,
   type TracedPublicStorageWrite,
+  type TracedUnencryptedL2Log,
 } from './trace_types.js';
 
 export class WorldStateAccessTrace {
@@ -21,6 +22,7 @@ export class WorldStateAccessTrace {
   public nullifierChecks: TracedNullifierCheck[] = [];
   public newNullifiers: TracedNullifier[] = [];
   public l1ToL2MessageChecks: TracedL1toL2MessageCheck[] = [];
+  public newLogsHashes: TracedUnencryptedL2Log[] = [];
 
   //public contractCalls: TracedContractCall[] = [];
   //public archiveChecks: TracedArchiveLeafCheck[] = [];
@@ -133,6 +135,15 @@ export class WorldStateAccessTrace {
     this.incrementAccessCounter();
   }
 
+  public traceNewLog(logHash: Fr) {
+    const traced: TracedUnencryptedL2Log = {
+      logHash,
+      counter: new Fr(this.accessCounter),
+    };
+    this.newLogsHashes.push(traced);
+    this.incrementAccessCounter();
+  }
+
   private incrementAccessCounter() {
     this.accessCounter++;
   }
@@ -155,6 +166,7 @@ export class WorldStateAccessTrace {
     this.nullifierChecks = this.nullifierChecks.concat(incomingTrace.nullifierChecks);
     this.newNullifiers = this.newNullifiers.concat(incomingTrace.newNullifiers);
     this.l1ToL2MessageChecks = this.l1ToL2MessageChecks.concat(incomingTrace.l1ToL2MessageChecks);
+    this.newLogsHashes = this.newLogsHashes.concat(incomingTrace.newLogsHashes);
     // it is assumed that the incoming trace was initialized with this as parent, so accept counter
     this.accessCounter = incomingTrace.accessCounter;
   }

package/src/avm/journal/trace_types.ts

@@ -73,6 +73,13 @@ export type TracedL1toL2MessageCheck = {
   //endLifetime: Fr;
 };
 
+export type TracedUnencryptedL2Log = {
+  //callPointer: Fr;
+  logHash: Fr;
+  counter: Fr;
+  //endLifetime: Fr;
+};
+
 //export type TracedArchiveLeafCheck = {
 //  leafIndex: Fr;
 //  leaf: Fr;

package/src/avm/opcodes/arithmetic.ts

@@ -23,7 +23,7 @@ export abstract class ThreeOperandArithmeticInstruction extends ThreeOperandInst
     context.machineState.incrementPc();
   }
 
-  protected gasCost(memoryOps: Partial<MemoryOperations & { indirect: number }>) {
+  protected override gasCost(memoryOps: Partial<MemoryOperations & { indirect: number }>) {
     const baseGasCost = getGasCostForTypeTag(this.inTag, getBaseGasCost(this.opcode));
     const memoryGasCost = getMemoryGasCost(memoryOps);
     return sumGas(baseGasCost, memoryGasCost);
@@ -102,7 +102,7 @@ export class FieldDiv extends Instruction {
     context.machineState.incrementPc();
   }
 
-  protected gasCost(memoryOps: Partial<MemoryOperations & { indirect: number }>) {
+  protected override gasCost(memoryOps: Partial<MemoryOperations & { indirect: number }>) {
     const baseGasCost = getGasCostForTypeTag(TypeTag.FIELD, getBaseGasCost(this.opcode));
     const memoryGasCost = getMemoryGasCost(memoryOps);
     return sumGas(baseGasCost, memoryGasCost);

package/src/avm/opcodes/context_getters.ts

@@ -13,15 +13,6 @@ export class L2GasLeft extends GetterInstruction {
   }
 }
 
-export class L1GasLeft extends GetterInstruction {
-  static type: string = 'L1GASLEFT';
-  static readonly opcode: Opcode = Opcode.L1GASLEFT;
-
-  protected getValue(context: AvmContext): MemoryValue {
-    return new Field(context.machineState.l1GasLeft);
-  }
-}
-
 export class DAGasLeft extends GetterInstruction {
   static type: string = 'DAGASLEFT';
   static readonly opcode: Opcode = Opcode.DAGASLEFT;

package/src/avm/opcodes/contract.ts

@@ -39,7 +39,6 @@ export class GetContractInstance extends Instruction {
             new Field(0),
             new Field(0),
             new Field(0),
-            new Field(0),
           ]
         : [
             new Fr(1), // found
@@ -47,7 +46,6 @@ export class GetContractInstance extends Instruction {
             instance.deployer.toField(),
             instance.contractClassId,
             instance.initializationHash,
-            instance.portalContractAddress.toField(),
             instance.publicKeysHash,
           ].map(f => new Field(f));
 

package/src/avm/opcodes/environment_getters.ts

@@ -41,24 +41,6 @@ export class Sender extends EnvironmentGetterInstruction {
   }
 }
 
-export class Origin extends EnvironmentGetterInstruction {
-  static type: string = 'ORIGIN';
-  static readonly opcode: Opcode = Opcode.ORIGIN;
-
-  protected getEnvironmentValue(env: AvmExecutionEnvironment) {
-    return env.origin;
-  }
-}
-
-export class FeePerL1Gas extends EnvironmentGetterInstruction {
-  static type: string = 'FEEPERL1GAS';
-  static readonly opcode: Opcode = Opcode.FEEPERL1GAS;
-
-  protected getEnvironmentValue(env: AvmExecutionEnvironment) {
-    return env.feePerL1Gas;
-  }
-}
-
 export class FeePerL2Gas extends EnvironmentGetterInstruction {
   static type: string = 'FEEPERL2GAS';
   static readonly opcode: Opcode = Opcode.FEEPERL2GAS;
@@ -77,15 +59,6 @@ export class FeePerDAGas extends EnvironmentGetterInstruction {
   }
 }
 
-export class Portal extends EnvironmentGetterInstruction {
-  static type: string = 'PORTAL';
-  static readonly opcode: Opcode = Opcode.PORTAL;
-
-  protected getEnvironmentValue(env: AvmExecutionEnvironment) {
-    return env.portal.toField();
-  }
-}
-
 export class ChainId extends EnvironmentGetterInstruction {
   static type: string = 'CHAINID';
   static readonly opcode: Opcode = Opcode.CHAINID;
@@ -139,24 +112,6 @@ export class Timestamp extends EnvironmentGetterInstruction {
 //     }
 // }
 
-// // TODO: are these even needed within the block? (both block gas limit variables - why does the execution env care?)
-// export class BlockL1GasLimit extends EnvironmentGetterInstruction {
-//     static type: string = 'BLOCKL1GASLIMIT';
-//     static numberOfOperands = 1;
-
-//     constructor(private destOffset: number) {
-//         super();
-//     }
-
-//     async execute(machineState: AvmMachineState, _journal: AvmJournal): Promise<void> {
-//         const {blockL1GasLimit} = machineState.executionEnvironment.globals;
-
-//         machineState.memory.set(this.destOffset, blockL1GasLimit);
-
-//         this.incrementPc(machineState);
-//     }
-// }
-
 // export class BlockL2GasLimit extends EnvironmentGetterInstruction {
 //     static type: string = 'BLOCKL2GASLIMIT';
 //     static numberOfOperands = 1;

package/src/avm/opcodes/external_calls.ts

@@ -60,13 +60,12 @@ abstract class ExternalCall extends Instruction {
     const callAddress = memory.getAs<Field>(addrOffset);
     const calldataSize = memory.get(argsSizeOffset).toNumber();
     const calldata = memory.getSlice(argsOffset, calldataSize).map(f => f.toFr());
-    const l1Gas = memory.get(gasOffset).toNumber();
-    const l2Gas = memory.getAs<Field>(gasOffset + 1).toNumber();
-    const daGas = memory.getAs<Field>(gasOffset + 2).toNumber();
+    const l2Gas = memory.get(gasOffset).toNumber();
+    const daGas = memory.getAs<Field>(gasOffset + 1).toNumber();
     const functionSelector = memory.getAs<Field>(this.temporaryFunctionSelectorOffset).toFr();
 
-    const allocatedGas = { l1Gas, l2Gas, daGas };
-    const memoryOperations = { reads: calldataSize + 6, writes: 1 + this.retSize, indirect: this.indirect };
+    const allocatedGas = { l2Gas, daGas };
+    const memoryOperations = { reads: calldataSize + 5, writes: 1 + this.retSize, indirect: this.indirect };
     const totalGas = sumGas(this.gasCost(memoryOperations), allocatedGas);
     context.machineState.consumeGas(totalGas);
 
@@ -122,7 +121,7 @@ abstract class ExternalCall extends Instruction {
     context.machineState.incrementPc();
   }
 
-  public abstract get type(): 'CALL' | 'STATICCALL';
+  public abstract override get type(): 'CALL' | 'STATICCALL';
 }
 
 export class Call extends ExternalCall {

package/src/avm/opcodes/memory.ts

@@ -1,5 +1,5 @@
 import type { AvmContext } from '../avm_context.js';
-import { getBaseGasCost, getMemoryGasCost, mulGas, sumGas } from '../avm_gas.js';
+import { getBaseGasCost, getMemoryGasCost, sumGas } from '../avm_gas.js';
 import { Field, type MemoryOperations, TaggedMemory, TypeTag } from '../avm_memory_types.js';
 import { InstructionExecutionError } from '../errors.js';
 import { BufferCursor } from '../serialization/buffer_cursor.js';
@@ -46,7 +46,7 @@ export class Set extends Instruction {
   }
 
   /** We need to use a custom serialize function because of the variable length of the value. */
-  public serialize(): Buffer {
+  public override serialize(): Buffer {
     const format: OperandType[] = [
       ...Set.wireFormatBeforeConst,
       getOperandTypeFromInTag(this.inTag),
@@ -56,7 +56,7 @@ export class Set extends Instruction {
   }
 
   /** We need to use a custom deserialize function because of the variable length of the value. */
-  public static deserialize(this: typeof Set, buf: BufferCursor | Buffer): Set {
+  public static override deserialize(this: typeof Set, buf: BufferCursor | Buffer): Set {
     if (buf instanceof Buffer) {
       buf = new BufferCursor(buf);
     }
@@ -217,8 +217,8 @@ export class CalldataCopy extends Instruction {
     context.machineState.incrementPc();
   }
 
-  protected gasCost(memoryOps: Partial<MemoryOperations & { indirect: number }> = {}) {
-    const baseGasCost = mulGas(getBaseGasCost(this.opcode), this.copySize);
+  protected override gasCost(memoryOps: Partial<MemoryOperations & { indirect: number }> = {}) {
+    const baseGasCost = getBaseGasCost(this.opcode);
     const memoryGasCost = getMemoryGasCost(memoryOps);
     return sumGas(baseGasCost, memoryGasCost);
   }

package/src/avm/opcodes/storage.ts

@@ -27,7 +27,7 @@ abstract class BaseStorageInstruction extends Instruction {
     super();
   }
 
-  protected gasCost(memoryOps: Partial<MemoryOperations & { indirect: number }>): Gas {
+  protected override gasCost(memoryOps: Partial<MemoryOperations & { indirect: number }>): Gas {
     const baseGasCost = mulGas(getBaseGasCost(this.opcode), this.size);
     const memoryGasCost = getMemoryGasCost(memoryOps);
     return sumGas(baseGasCost, memoryGasCost);

package/src/avm/serialization/bytecode_serialization.ts

@@ -1,5 +1,6 @@
-import { DAGasLeft, L1GasLeft, L2GasLeft } from '../opcodes/context_getters.js';
+import { DAGasLeft, L2GasLeft } from '../opcodes/context_getters.js';
 import { Keccak, Pedersen, Poseidon2, Sha256 } from '../opcodes/hashing.js';
+import type { Instruction } from '../opcodes/index.js';
 import {
   Add,
   Address,
@@ -16,7 +17,6 @@ import {
   EmitUnencryptedLog,
   Eq,
   FeePerDAGas,
-  FeePerL1Gas,
   FeePerL2Gas,
   FieldDiv,
   GetContractInstance,
@@ -33,8 +33,6 @@ import {
   NoteHashExists,
   NullifierExists,
   Or,
-  Origin,
-  Portal,
   Return,
   Revert,
   SLoad,
@@ -51,7 +49,6 @@ import {
   Version,
   Xor,
 } from '../opcodes/index.js';
-import type { Instruction } from '../opcodes/index.js';
 import { BufferCursor } from './buffer_cursor.js';
 import { Opcode } from './instruction_serialization.js';
 
@@ -82,10 +79,7 @@ const INSTRUCTION_SET = () =>
     [Cast.opcode, Cast],
     [Address.opcode, Address],
     [StorageAddress.opcode, StorageAddress],
-    [Origin.opcode, Origin],
     [Sender.opcode, Sender],
-    [Portal.opcode, Portal],
-    [FeePerL1Gas.opcode, FeePerL1Gas],
     [FeePerL2Gas.opcode, FeePerL2Gas],
     [FeePerDAGas.opcode, FeePerDAGas],
     //[Contractcalldepth.opcode, Contractcalldepth],
@@ -95,7 +89,6 @@ const INSTRUCTION_SET = () =>
     [BlockNumber.opcode, BlockNumber],
     [Timestamp.opcode, Timestamp],
     //[Coinbase.opcode, Coinbase],
-    //[Blockl1gaslimit.opcode, Blockl1gaslimit],
     //[Blockl2gaslimit.opcode, Blockl2gaslimit],
     //[Blockdagaslimit.opcode, Blockdagaslimit],
     // Execution Environment - Calldata
@@ -103,7 +96,6 @@ const INSTRUCTION_SET = () =>
 
     // Machine State
     // Machine State - Gas
-    [L1GasLeft.opcode, L1GasLeft],
     [L2GasLeft.opcode, L2GasLeft],
     [DAGasLeft.opcode, DAGasLeft],
     // Machine State - Internal Control Flow

package/src/avm/serialization/instruction_serialization.ts

@@ -3,7 +3,7 @@ import { strict as assert } from 'assert';
 import { BufferCursor } from './buffer_cursor.js';
 
 /**
- * All AVM opcodes. (Keep in sync with cpp counterpart code avm_opcode.hpp).
+ * All AVM opcodes. (Keep in sync with cpp counterpart code avm_opcode.hpp and rs in opcodes.rs).
  * Source: https://yp-aztec.netlify.app/docs/public-vm/instruction-set
  */
 export enum Opcode {
@@ -26,10 +26,7 @@ export enum Opcode {
   // Execution environment
   ADDRESS,
   STORAGEADDRESS,
-  ORIGIN,
   SENDER,
-  PORTAL,
-  FEEPERL1GAS,
   FEEPERL2GAS,
   FEEPERDAGAS,
   CONTRACTCALLDEPTH,
@@ -38,12 +35,10 @@ export enum Opcode {
   BLOCKNUMBER,
   TIMESTAMP,
   COINBASE,
-  BLOCKL1GASLIMIT,
   BLOCKL2GASLIMIT,
   BLOCKDAGASLIMIT,
   CALLDATACOPY,
   // Gas
-  L1GASLEFT,
   L2GASLEFT,
   DAGASLEFT,
   // Control flow