nuked toACVMGlobalVariables

AztecProtocol · Jan 31, 2024 · 9e96729 · 9e96729
1 parent 27f7811
commit 9e96729
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 22 deletions.
diff --git a/yarn-project/acir-simulator/src/acvm/serialize.ts b/yarn-project/acir-simulator/src/acvm/serialize.ts
@@ -1,8 +1,7 @@
 import {
-  GlobalVariables,
   PrivateCallStackItem,
   PrivateCircuitPublicInputs,
-  PublicCallRequest,
+  PublicCallRequest
 } from '@aztec/circuits.js';
 import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { EthAddress } from '@aztec/foundation/eth-address';
@@ -49,20 +48,6 @@ export function toACVMField(
 // Utilities to write TS classes to ACVM Field arrays
 // In the order that the ACVM expects them
 
-/**
- * Converts global variables into ACVM fields
- * @param globalVariables - The global variables object to convert.
- * @returns The ACVM fields
- */
-export function toACVMGlobalVariables(globalVariables: GlobalVariables): ACVMField[] {
-  return [
-    toACVMField(globalVariables.chainId),
-    toACVMField(globalVariables.version),
-    toACVMField(globalVariables.blockNumber),
-    toACVMField(globalVariables.timestamp),
-  ];
-}
-
 /**
  * Converts the public inputs structure to ACVM fields.
  * @param publicInputs - The public inputs to convert.

diff --git a/yarn-project/acir-simulator/src/public/public_execution_context.ts b/yarn-project/acir-simulator/src/public/public_execution_context.ts
@@ -5,7 +5,7 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { createDebugLogger } from '@aztec/foundation/log';
 
-import { TypedOracle, toACVMField, toACVMGlobalVariables, toACVMWitness } from '../acvm/index.js';
+import { TypedOracle, toACVMWitness } from '../acvm/index.js';
 import { PackedArgsCache, SideEffectCounter } from '../common/index.js';
 import { CommitmentsDB, PublicContractsDB, PublicStateDB } from './db.js';
 import { PublicExecution, PublicExecutionResult } from './execution.js';
@@ -50,9 +50,9 @@ export class PublicExecutionContext extends TypedOracle {
   public getInitialWitness(witnessStartIndex = 0) {
     const { callContext, args } = this.execution;
     const fields = [
-      ...callContext.toFields().map(toACVMField),
-      ...this.header.toFields().map(toACVMField),
-      ...toACVMGlobalVariables(this.globalVariables),
+      ...callContext.toFields(),
+      ...this.header.toFields(),
+      ...this.globalVariables.toFields(),
 
       ...args,
     ];

diff --git a/yarn-project/circuits.js/src/structs/global_variables.ts b/yarn-project/circuits.js/src/structs/global_variables.ts
@@ -61,7 +61,7 @@ export class GlobalVariables {
     return serializeToBuffer(...GlobalVariables.getFields(this));
   }
 
-  toFieldArray() {
+  toFields() {
     return GlobalVariables.getFields(this);
   }
 

diff --git a/yarn-project/circuits.js/src/structs/header.ts b/yarn-project/circuits.js/src/structs/header.ts
@@ -38,7 +38,7 @@ export class Header {
       ...this.lastArchive.toFieldArray(),
       ...to2Fields(this.bodyHash),
       ...this.state.toFieldArray(),
-      ...this.globalVariables.toFieldArray(),
+      ...this.globalVariables.toFields(),
     ];
     if (serialized.length !== HEADER_LENGTH) {
       throw new Error(`Expected header to have ${HEADER_LENGTH} fields, but it has ${serialized.length} fields`);