Skip to content

feat(avm): add Header to AvmExecutionEnvironment #5592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fcarreiro wants to merge 1 commit into from
Closed

feat(avm): add Header to AvmExecutionEnvironment #5592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 5 additions & 13 deletions yarn-project/simulator/src/avm/avm_execution_environment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { FunctionSelector, type GlobalVariables } from '@aztec/circuits.js';
import { FunctionSelector, type GlobalVariables, type Header } from '@aztec/circuits.js';
import { computeVarArgsHash } from '@aztec/circuits.js/hash';
import { type AztecAddress } from '@aztec/foundation/aztec-address';
import { type EthAddress } from '@aztec/foundation/eth-address';
Expand All @@ -22,29 +22,18 @@ export class AvmContextInputs {
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,

public readonly feePerL2Gas: Fr,

public readonly feePerDaGas: Fr,

public readonly contractCallDepth: Fr,

public readonly header: Header,

@fcarreiro fcarreiro Apr 5, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could put it in hostStorage if you prefer.

public readonly globals: GlobalVariables,

public readonly isStaticCall: boolean,

public readonly isDelegateCall: boolean,

public readonly calldata: Fr[],

// Function selector is temporary since eventually public contract bytecode will be one blob
Expand Down Expand Up @@ -73,6 +62,7 @@ export class AvmExecutionEnvironment {
this.feePerL2Gas,
this.feePerDaGas,
this.contractCallDepth,
this.header,
this.globals,
this.isStaticCall,
this.isDelegateCall,
Expand All @@ -96,6 +86,7 @@ export class AvmExecutionEnvironment {
this.feePerL2Gas,
this.feePerDaGas,
this.contractCallDepth,
this.header,
this.globals,
/*isStaticCall=*/ true,
this.isDelegateCall,
Expand All @@ -119,6 +110,7 @@ export class AvmExecutionEnvironment {
this.feePerL2Gas,
this.feePerDaGas,
this.contractCallDepth,
this.header,
this.globals,
this.isStaticCall,
/*isDelegateCall=*/ true,
Expand Down
3 changes: 2 additions & 1 deletion yarn-project/simulator/src/avm/fixtures/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { SiblingPath } from '@aztec/circuit-types';
import { GlobalVariables, L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/circuits.js';
import { GlobalVariables, Header, L1_TO_L2_MSG_TREE_HEIGHT } from '@aztec/circuits.js';
import { FunctionSelector } from '@aztec/foundation/abi';
import { AztecAddress } from '@aztec/foundation/aztec-address';
import { EthAddress } from '@aztec/foundation/eth-address';
Expand Down Expand Up @@ -67,6 +67,7 @@ export function initExecutionEnvironment(overrides?: Partial<AvmExecutionEnviron
overrides?.feePerL2Gas ?? Fr.zero(),
overrides?.feePerDaGas ?? Fr.zero(),
overrides?.contractCallDepth ?? Fr.zero(),
overrides?.header ?? Header.empty(),
overrides?.globals ?? GlobalVariables.empty(),
overrides?.isStaticCall ?? false,
overrides?.isDelegateCall ?? false,
Expand Down
3 changes: 3 additions & 0 deletions yarn-project/simulator/src/avm/temporary_executor_migration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
ContractStorageRead,
ContractStorageUpdateRequest,
type GlobalVariables,
type Header,
L2ToL1Message,
type ReadRequest,
SideEffect,
Expand All @@ -28,6 +29,7 @@ import { Mov } from './opcodes/memory.js';
*/
export function temporaryCreateAvmExecutionEnvironment(
current: PublicExecution,
header: Header,
globalVariables: GlobalVariables,
): AvmExecutionEnvironment {
// Function selector is included temporarily until noir codegens public contract bytecode in a single blob
Expand All @@ -41,6 +43,7 @@ export function temporaryCreateAvmExecutionEnvironment(
/*feePerL2Gas=*/ Fr.zero(),
/*feePerDaGas=*/ Fr.zero(),
/*contractCallDepth=*/ Fr.zero(),
header,
globalVariables,
current.callContext.isStaticCall,
current.callContext.isDelegateCall,
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/simulator/src/public/executor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ export class PublicExecutor {
// These data structures will permeate across the simulator when the public executor is phased out
const hostStorage = new HostStorage(this.stateDb, this.contractsDb, this.commitmentsDb);
const worldStateJournal = new AvmPersistableStateManager(hostStorage);
const executionEnv = temporaryCreateAvmExecutionEnvironment(execution, globalVariables);
const executionEnv = temporaryCreateAvmExecutionEnvironment(execution, this.header, globalVariables);
// TODO(@spalladino) Load initial gas from the public execution request
const machineState = new AvmMachineState(1e10, 1e10, 1e10);

Expand Down