fix: Remove tx.origin (#5765)

Fixes #5756
AztecProtocol · Apr 16, 2024 · c8784d7 · c8784d7
1 parent 6a0713e
commit c8784d7
Show file tree

Hide file tree

Showing 21 changed files with 91 additions and 181 deletions.
diff --git a/avm-transpiler/src/opcodes.rs b/avm-transpiler/src/opcodes.rs
@@ -1,5 +1,5 @@
 /// All AVM opcodes
-/// Keep updated with TS and docs protocol specs!
+/// Keep updated with TS, cpp, and docs protocol specs!
 #[derive(PartialEq, Copy, Clone, Debug)]
 pub enum AvmOpcode {
     // Compute
@@ -21,7 +21,6 @@ pub enum AvmOpcode {
     // Execution environment
     ADDRESS,
     STORAGEADDRESS,
-    ORIGIN,
     SENDER,
     PORTAL,
     FEEPERL1GAS,
@@ -102,7 +101,6 @@ impl AvmOpcode {
             // Execution Environment
             AvmOpcode::ADDRESS => "ADDRESS",
             AvmOpcode::STORAGEADDRESS => "STORAGEADDRESS",
-            AvmOpcode::ORIGIN => "ORIGIN",
             AvmOpcode::SENDER => "SENDER",
             AvmOpcode::PORTAL => "PORTAL",
             AvmOpcode::FEEPERL1GAS => "FEEPERL1GAS",

diff --git a/avm-transpiler/src/transpile.rs b/avm-transpiler/src/transpile.rs
@@ -744,7 +744,6 @@ fn handle_getter_instruction(
     let opcode = match function {
         "avmOpcodeAddress" => AvmOpcode::ADDRESS,
         "avmOpcodeStorageAddress" => AvmOpcode::STORAGEADDRESS,
-        "avmOpcodeOrigin" => AvmOpcode::ORIGIN,
         "avmOpcodeSender" => AvmOpcode::SENDER,
         "avmOpcodePortal" => AvmOpcode::PORTAL,
         "avmOpcodeFeePerL1Gas" => AvmOpcode::FEEPERL1GAS,

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,