fix: Remove tx.origin

Fixes #5756
AztecProtocol · Apr 16, 2024 · a175961 · a175961
1 parent 95eadd6
commit a175961
Show file tree

Hide file tree

Showing 18 changed files with 7 additions and 70 deletions.
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_opcode.cpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_opcode.cpp
@@ -31,7 +31,6 @@ const std::unordered_map<OpCode, size_t> Bytecode::OPERANDS_NUM = {
     //// Execution Environment
     //{OpCode::ADDRESS, },
     //{OpCode::STORAGEADDRESS, },
-    //{OpCode::ORIGIN, },
     //{OpCode::SENDER, },
     //{OpCode::PORTAL, },
     //{OpCode::FEEPERL1GAS, },
@@ -116,7 +115,6 @@ bool Bytecode::has_in_tag(OpCode const op_code)
     switch (op_code) {
     case OpCode::ADDRESS:
     case OpCode::STORAGEADDRESS:
-    case OpCode::ORIGIN:
     case OpCode::SENDER:
     case OpCode::PORTAL:
     case OpCode::FEEPERL1GAS:

diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_opcode.hpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_opcode.hpp
@@ -40,7 +40,6 @@ enum class OpCode : uint8_t {
     // Execution Environment
     ADDRESS,
     STORAGEADDRESS,
-    ORIGIN,
     SENDER,
     PORTAL,
     FEEPERL1GAS,

diff --git a/docs/docs/protocol-specs/circuits/private-kernel-initial.mdx b/docs/docs/protocol-specs/circuits/private-kernel-initial.mdx
@@ -714,13 +714,13 @@ TransientAccumulatedData --* PublicInputs: transient_accumulated_data
 
 Data that represents the caller's intent.
 
-| Field           | Type                                        | Description                                  |
-| --------------- | ------------------------------------------- | -------------------------------------------- |
-| `origin`        | `AztecAddress`                              | The Aztec address of the transaction sender. |
-| `function_data` | [`FunctionData`](#functiondata)             | Data of the function being called.           |
-| `args_hash`     | `field`                                     | Hash of the function arguments.              |
-| `tx_context`    | [`TransactionContext`](#transactioncontext) | Information about the transaction.           |
-| `gas_settings`  | [`GasSettings`](#gassettings)               | User-defined gas limits and max fees.        |
+| Field           | Type                                        | Description                           |
+| --------------- | ------------------------------------------- | ------------------------------------- |
+| `origin`        | `AztecAddress`                              | Address of the entrypoint contract.   |
+| `function_data` | [`FunctionData`](#functiondata)             | Data of the function being called.    |
+| `args_hash`     | `field`                                     | Hash of the function arguments.       |
+| `tx_context`    | [`TransactionContext`](#transactioncontext) | Information about the transaction.    |
+| `gas_settings`  | [`GasSettings`](#gassettings)               | User-defined gas limits and max fees. |
 
 ### `PrivateCall`
 

diff --git a/docs/docs/protocol-specs/public-vm/_nested-context.md b/docs/docs/protocol-specs/public-vm/_nested-context.md
@@ -14,7 +14,6 @@ nestedContext = deriveContext(context, instr.args, isStaticCall, isDelegateCall)
 Nested context derivation is defined as follows:
 ```jsx
 nestedExecutionEnvironment = ExecutionEnvironment {
-    origin: context.origin,
     sender: isDelegateCall ? context.sender : context.address,
     address: M[addrOffset],
     storageAddress: isDelegateCall ? context.storageAddress : M[addrOffset],

diff --git a/docs/docs/protocol-specs/public-vm/avm-circuit.md b/docs/docs/protocol-specs/public-vm/avm-circuit.md
@@ -178,7 +178,6 @@ The VM circuit's I/O (`AvmPublicInputs`) is defined below:
 ```
 AvmSessionInputs {
     // Initializes Execution Environment
-    origin: AztecAddress,
     feePerL1Gas: field,
     feePerL2Gas: field,
     feePerDaGas: field,

diff --git a/docs/docs/protocol-specs/public-vm/context.mdx b/docs/docs/protocol-specs/public-vm/context.mdx
@@ -25,7 +25,6 @@ A context's **execution environment** remains constant throughout a contract cal
 | ---                   | ---                          | ---         |
 | address               | `AztecAddress`               |  |
 | storageAddress        | `AztecAddress`               |  |
-| origin                | `AztecAddress`               |  |
 | sender                | `AztecAddress`               |  |
 | portal                | `EthAddress`                 |  |
 | feePerL1Gas           | `field`                      |  |
@@ -73,7 +72,6 @@ Given a [`PublicCallRequest`](../transactions/tx-object#public-call-request) and
 INITIAL_EXECUTION_ENVIRONMENT = ExecutionEnvironment {
     address: PublicCallRequest.contractAddress,
     storageAddress: PublicCallRequest.CallContext.storageContractAddress,
-    origin: TxRequest.origin,
     sender: PublicCallRequest.CallContext.msgSender,
     portal: PublicCallRequest.CallContext.portalContractAddress,
     feePerL1Gas: TxRequest.feePerL1Gas,

diff --git a/docs/src/preprocess/InstructionSet/InstructionSet.js b/docs/src/preprocess/InstructionSet/InstructionSet.js
@@ -529,24 +529,6 @@ const INSTRUCTION_SET_RAW = [
     "Tag checks": "",
     "Tag updates": "`T[dstOffset] = u32`",
   },
-  {
-    id: "origin",
-    Name: "`ORIGIN`",
-    Category: "Execution Environment",
-    Flags: [{ name: "indirect", description: INDIRECT_FLAG_DESCRIPTION }],
-    Args: [
-      {
-        name: "dstOffset",
-        description:
-          "memory offset specifying where to store operation's result",
-      },
-    ],
-    Expression: "`M[dstOffset] = context.environment.origin`",
-    Summary: "Get the transaction's origination address",
-    Details: "",
-    "Tag checks": "",
-    "Tag updates": "`T[dstOffset] = u32`",
-  },
   {
     id: "sender",
     Name: "`SENDER`",

diff --git a/noir-projects/aztec-nr/aztec/src/context/avm_context.nr b/noir-projects/aztec-nr/aztec/src/context/avm_context.nr
@@ -20,9 +20,6 @@ impl AvmContext {
         AvmContext { inputs }
     }
 
-    pub fn origin(self) -> AztecAddress {
-        origin()
-    }
     pub fn storage_address(self) -> AztecAddress {
         storage_address()
     }
@@ -235,9 +232,6 @@ fn address() -> AztecAddress {}
 #[oracle(avmOpcodeStorageAddress)]
 fn storage_address() -> AztecAddress {}
 
-#[oracle(avmOpcodeOrigin)]
-fn origin() -> AztecAddress {}
-
 #[oracle(avmOpcodeSender)]
 fn sender() -> AztecAddress {}
 

diff --git a/noir-projects/noir-contracts/contracts/avm_test_contract/src/main.nr b/noir-projects/noir-contracts/contracts/avm_test_contract/src/main.nr
@@ -206,11 +206,6 @@ contract AvmTest {
         context.msg_sender()
     }
 
-    #[aztec(public-vm)]
-    fn get_origin() -> pub AztecAddress {
-        context.origin()
-    }
-
     #[aztec(public-vm)]
     fn get_portal() -> pub EthAddress {
         context.this_portal_address()

diff --git a/yarn-project/simulator/src/avm/avm_execution_environment.ts b/yarn-project/simulator/src/avm/avm_execution_environment.ts
@@ -23,7 +23,6 @@ export class AvmExecutionEnvironment {
   constructor(
     public readonly address: AztecAddress,
     public readonly storageAddress: AztecAddress,
-    public readonly origin: AztecAddress,
     public readonly sender: AztecAddress,
     public readonly portal: EthAddress,
     public readonly feePerL1Gas: Fr,
@@ -57,7 +56,6 @@ export class AvmExecutionEnvironment {
     return new AvmExecutionEnvironment(
       targetAddress,
       /*storageAddress=*/ targetAddress,
-      this.origin,
       this.address,
       this.portal,
       this.feePerL1Gas,
@@ -83,7 +81,6 @@ export class AvmExecutionEnvironment {
     return new AvmExecutionEnvironment(
       address,
       /*storageAddress=*/ address,
-      this.origin,
       this.sender,
       this.portal,
       this.feePerL1Gas,
@@ -109,7 +106,6 @@ export class AvmExecutionEnvironment {
     return new AvmExecutionEnvironment(
       address,
       this.storageAddress,
-      this.origin,
       this.sender,
       this.portal,
       this.feePerL1Gas,

diff --git a/yarn-project/simulator/src/avm/avm_gas.ts b/yarn-project/simulator/src/avm/avm_gas.ts
@@ -78,7 +78,6 @@ export const GasCosts: Record<Opcode, Gas | typeof DynamicGasCost> = {
   // Execution environment
   [Opcode.ADDRESS]: TemporaryDefaultGasCost,
   [Opcode.STORAGEADDRESS]: TemporaryDefaultGasCost,
-  [Opcode.ORIGIN]: TemporaryDefaultGasCost,
   [Opcode.SENDER]: TemporaryDefaultGasCost,
   [Opcode.PORTAL]: TemporaryDefaultGasCost,
   [Opcode.FEEPERL1GAS]: TemporaryDefaultGasCost,

diff --git a/yarn-project/simulator/src/avm/avm_simulator.test.ts b/yarn-project/simulator/src/avm/avm_simulator.test.ts
@@ -201,11 +201,6 @@ describe('AVM simulator: transpiled Noir contracts', () => {
       await testEnvGetter('sender', sender, 'get_sender');
     });
 
-    it('origin', async () => {
-      const origin = AztecAddress.fromField(new Fr(1));
-      await testEnvGetter('origin', origin, 'get_origin');
-    });
-
     it('portal', async () => {
       const portal = EthAddress.fromField(new Fr(1));
       await testEnvGetter('portal', portal, 'get_portal');

diff --git a/yarn-project/simulator/src/avm/fixtures/index.ts b/yarn-project/simulator/src/avm/fixtures/index.ts
@@ -61,7 +61,6 @@ 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(),

diff --git a/yarn-project/simulator/src/avm/opcodes/environment_getters.test.ts b/yarn-project/simulator/src/avm/opcodes/environment_getters.test.ts
@@ -8,7 +8,6 @@ import {
   FeePerDAGas,
   FeePerL1Gas,
   FeePerL2Gas,
-  Origin,
   Portal,
   Sender,
   StorageAddress,
@@ -21,7 +20,6 @@ type EnvInstruction =
   | typeof FeePerL1Gas
   | typeof FeePerL2Gas
   | typeof FeePerDAGas
-  | typeof Origin
   | typeof Sender
   | typeof StorageAddress
   | typeof Address;
@@ -30,7 +28,6 @@ describe.each([
   [FeePerL1Gas, 'feePerL1Gas'],
   [FeePerL2Gas, 'feePerL2Gas'],
   [FeePerDAGas, 'feePerDaGas'],
-  [Origin, 'origin'],
   [Sender, 'sender'],
   [StorageAddress, 'storageAddress'],
   [Address, 'address'],

diff --git a/yarn-project/simulator/src/avm/opcodes/environment_getters.ts b/yarn-project/simulator/src/avm/opcodes/environment_getters.ts
@@ -41,15 +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;

diff --git a/yarn-project/simulator/src/avm/serialization/bytecode_serialization.ts b/yarn-project/simulator/src/avm/serialization/bytecode_serialization.ts
@@ -33,7 +33,6 @@ import {
   NoteHashExists,
   NullifierExists,
   Or,
-  Origin,
   Portal,
   Return,
   Revert,
@@ -82,7 +81,6 @@ const INSTRUCTION_SET = () =>
     [Cast.opcode, Cast],
     [Address.opcode, Address],
     [StorageAddress.opcode, StorageAddress],
-    [Origin.opcode, Origin],
     [Sender.opcode, Sender],
     [Portal.opcode, Portal],
     [FeePerL1Gas.opcode, FeePerL1Gas],

diff --git a/yarn-project/simulator/src/avm/serialization/instruction_serialization.ts b/yarn-project/simulator/src/avm/serialization/instruction_serialization.ts
@@ -26,7 +26,6 @@ export enum Opcode {
   // Execution environment
   ADDRESS,
   STORAGEADDRESS,
-  ORIGIN,
   SENDER,
   PORTAL,
   FEEPERL1GAS,

diff --git a/yarn-project/simulator/src/public/transitional_adaptors.ts b/yarn-project/simulator/src/public/transitional_adaptors.ts
@@ -41,7 +41,6 @@ export function createAvmExecutionEnvironment(
   return new AvmExecutionEnvironment(
     current.contractAddress,
     current.callContext.storageContractAddress,
-    current.callContext.msgSender, // TODO: origin is not available
     current.callContext.msgSender,
     current.callContext.portalContractAddress,
     globalVariables.gasFees.feePerL1Gas,