feat: removing redundant values from PrivateCircuitPublicInputs

l1-contracts/src/core/libraries/ConstantsGen.sol

@@ -80,7 +80,7 @@ library Constants {
   uint256 internal constant GET_NOTES_ORACLE_RETURN_LENGTH = 674;
   uint256 internal constant CALL_PRIVATE_FUNCTION_RETURN_SIZE = 210;
   uint256 internal constant PUBLIC_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH = 98;
-  uint256 internal constant PRIVATE_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH = 188;
+  uint256 internal constant PRIVATE_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH = 186;
   uint256 internal constant COMMITMENTS_NUM_BYTES_PER_BASE_ROLLUP = 2048;
   uint256 internal constant NULLIFIERS_NUM_BYTES_PER_BASE_ROLLUP = 2048;
   uint256 internal constant PUBLIC_DATA_WRITES_NUM_BYTES_PER_BASE_ROLLUP = 1024;

yarn-project/acir-simulator/src/acvm/deserialize.ts

@@ -111,9 +111,6 @@ export function extractPrivateCircuitPublicInputs(
     EthAddress.fromField(witnessReader.readField()),
   );
 
-  const chainId = witnessReader.readField();
-  const version = witnessReader.readField();
-
   return new PrivateCircuitPublicInputs(
     callContext,
     argsHash,
@@ -132,8 +129,6 @@ export function extractPrivateCircuitPublicInputs(
     unencryptedLogPreimagesLength,
     header,
     contractDeploymentData,
-    chainId,
-    version,
   );
 }
 

yarn-project/acir-simulator/src/acvm/serialize.ts

@@ -152,9 +152,6 @@ export function toACVMPublicInputs(publicInputs: PrivateCircuitPublicInputs): AC
     ...toACVMHeader(publicInputs.header),
 
     ...toACVMContractDeploymentData(publicInputs.contractDeploymentData),
-
-    toACVMField(publicInputs.chainId),
-    toACVMField(publicInputs.version),
   ];
 }
 

yarn-project/aztec-nr/aztec/src/context.nr

@@ -159,7 +159,7 @@ impl PrivateContext {
         let encrypted_log_preimages_length = 0;
         let unencrypted_log_preimages_length = 0;
 
-        let priv_circuit_pub_inputs = PrivateCircuitPublicInputs {
+        PrivateCircuitPublicInputs {
             call_context: self.inputs.call_context,
             args_hash: self.args_hash,
             return_values: self.return_values.storage,
@@ -177,10 +177,7 @@ impl PrivateContext {
             unencrypted_log_preimages_length: unencrypted_log_preimages_length,
             header: self.header,
             contract_deployment_data: self.inputs.contract_deployment_data,
-            chain_id: self.inputs.private_global_variables.chain_id,
-            version: self.inputs.private_global_variables.version,
-        };
-        priv_circuit_pub_inputs
+        }
     }
 
     pub fn push_read_request(&mut self, read_request: Field) {
@@ -350,8 +347,6 @@ impl PrivateContext {
                     contract_address_salt : reader.read(),
                     portal_contract_address : EthAddress::from_field(reader.read()),
                 },
-                chain_id: reader.read(),
-                version: reader.read(),
             },
             is_execution_request: reader.read() as bool,
         };

yarn-project/circuits.js/src/abis/__snapshots__/abis.test.ts.snap

@@ -55,41 +55,41 @@ Fr {
 
 exports[`abis compute private call stack item hash 1`] = `
 Fr {
-  "asBigInt": 12187345511405217717040217531423286257305914329376428594135414078733109256018n,
+  "asBigInt": 3614117677866200196295775647283645866034430866159465163124756284278864628372n,
   "asBuffer": {
     "data": [
-      26,
-      241,
-      203,
-      9,
-      80,
-      135,
-      163,
-      233,
-      54,
-      161,
-      69,
-      247,
-      77,
-      223,
-      148,
-      99,
-      177,
       7,
-      65,
+      253,
       132,
-      142,
-      175,
-      255,
-      49,
-      18,
-      190,
-      219,
+      163,
+      51,
       83,
-      245,
-      1,
-      95,
-      82,
+      155,
+      154,
+      228,
+      18,
+      207,
+      110,
+      93,
+      174,
+      199,
+      175,
+      193,
+      169,
+      85,
+      175,
+      9,
+      250,
+      126,
+      101,
+      186,
+      177,
+      176,
+      91,
+      76,
+      64,
+      74,
+      148,
     ],
     "type": "Buffer",
   },

yarn-project/circuits.js/src/abis/abis.ts

@@ -555,8 +555,6 @@ function computePrivateInputsHash(input: PrivateCircuitPublicInputs) {
     input.unencryptedLogPreimagesLength.toBuffer(),
     ...(input.header.toFieldArray().map(fr => fr.toBuffer()) as Buffer[]),
     computeContractDeploymentDataHash(input.contractDeploymentData).toBuffer(),
-    input.chainId.toBuffer(),
-    input.version.toBuffer(),
   ];
   if (toHash.length != PRIVATE_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH) {
     throw new Error(

yarn-project/circuits.js/src/constants.gen.ts

@@ -66,7 +66,7 @@ export const PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH = 190;
 export const GET_NOTES_ORACLE_RETURN_LENGTH = 674;
 export const CALL_PRIVATE_FUNCTION_RETURN_SIZE = 210;
 export const PUBLIC_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH = 98;
-export const PRIVATE_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH = 188;
+export const PRIVATE_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH = 186;
 export const COMMITMENTS_NUM_BYTES_PER_BASE_ROLLUP = 2048;
 export const NULLIFIERS_NUM_BYTES_PER_BASE_ROLLUP = 2048;
 export const PUBLIC_DATA_WRITES_NUM_BYTES_PER_BASE_ROLLUP = 1024;

yarn-project/circuits.js/src/structs/global_variables.ts

@@ -77,4 +77,13 @@ export class GlobalVariables {
   isEmpty(): boolean {
     return this.chainId.isZero() && this.version.isZero() && this.blockNumber.isZero() && this.timestamp.isZero();
   }
+
+  equals(other: GlobalVariables): boolean {
+    return (
+      this.chainId.equals(other.chainId) &&
+      this.version.equals(other.version) &&
+      this.blockNumber.equals(other.blockNumber) &&
+      this.timestamp.equals(other.timestamp)
+    );
+  }
 }

yarn-project/circuits.js/src/structs/private_circuit_public_inputs.ts

@@ -101,15 +101,6 @@ export class PrivateCircuitPublicInputs {
      * Deployment data of contracts being deployed in this kernel iteration.
      */
     public contractDeploymentData: ContractDeploymentData,
-    // TODO(benesjan): Nuke the following 2 values --> they are in header now.
-    /**
-     * Chain Id of the instance.
-     */
-    public chainId: Fr,
-    /**
-     * Version of the instance.
-     */
-    public version: Fr,
   ) {}
 
   /**
@@ -146,8 +137,6 @@ export class PrivateCircuitPublicInputs {
       reader.readObject(Fr),
       reader.readObject(Header),
       reader.readObject(ContractDeploymentData),
-      reader.readObject(Fr),
-      reader.readObject(Fr),
     );
   }
 
@@ -174,8 +163,6 @@ export class PrivateCircuitPublicInputs {
       Fr.ZERO,
       Header.empty(),
       ContractDeploymentData.empty(),
-      Fr.ZERO,
-      Fr.ZERO,
     );
   }
 
@@ -200,9 +187,7 @@ export class PrivateCircuitPublicInputs {
       this.encryptedLogPreimagesLength.isZero() &&
       this.unencryptedLogPreimagesLength.isZero() &&
       this.header.isEmpty() &&
-      this.contractDeploymentData.isEmpty() &&
-      this.chainId.isZero() &&
-      this.version.isZero()
+      this.contractDeploymentData.isEmpty()
     );
   }
 
@@ -230,8 +215,6 @@ export class PrivateCircuitPublicInputs {
       fields.unencryptedLogPreimagesLength,
       fields.header,
       fields.contractDeploymentData,
-      fields.chainId,
-      fields.version,
     ] as const;
   }
   /**

yarn-project/circuits.js/src/tests/factories.ts

@@ -728,8 +728,6 @@ export function makePrivateCircuitPublicInputs(seed = 0): PrivateCircuitPublicIn
     unencryptedLogPreimagesLength: fr(seed + 0xc00),
     header: makeHeader(seed + 0xd00, undefined),
     contractDeploymentData: makeContractDeploymentData(seed + 0xe00),
-    chainId: fr(seed + 0x1400),
-    version: fr(seed + 0x1500),
   });
 }
 

yarn-project/end-to-end/src/integration_l1_publisher.test.ts

@@ -153,9 +153,8 @@ describe('L1Publisher integration', () => {
     prevHeader = await buildInitialHeader(builderDb);
   }, 100_000);
 
-  const makeEmptyProcessedTx = async () => {
-    const tx = await makeEmptyProcessedTxFromHistoricalTreeRoots(prevHeader, new Fr(chainId), new Fr(config.version));
-    return tx;
+  const makeEmptyProcessedTx = () => {
+    return makeEmptyProcessedTxFromHistoricalTreeRoots(prevHeader);
   };
 
   const makeBloatedProcessedTx = async (seed = 0x1) => {

yarn-project/noir-protocol-circuits/src/crates/private-kernel-lib/src/common.nr

@@ -270,9 +270,9 @@ pub fn update_end_values(private_call: PrivateCallData, public_inputs: &mut Kern
         if msg_is_zero == false {
             let new_l2_to_l1_msgs = compute_l2_to_l1_hash(
                 storage_contract_address,
-                private_call_public_inputs.version,
+                private_call_public_inputs.header.global_variables.version,
                 portal_contract_address,
-                private_call_public_inputs.chain_id,
+                private_call_public_inputs.header.global_variables.chain_id,
                 new_l2_to_l1_msgs[i]
             );
             new_l2_to_l1_msgs_to_insert.push(new_l2_to_l1_msgs)

yarn-project/noir-protocol-circuits/src/crates/types/src/abis/private_circuit_public_inputs.nr

@@ -54,10 +54,6 @@ struct PrivateCircuitPublicInputs {
     header: Header,
 
     contract_deployment_data: ContractDeploymentData,
-
-    // TODO(benesjan): This is now in header. Nuke this.
-    chain_id: Field,
-    version: Field,
 }
 
 impl Hash for PrivateCircuitPublicInputs {
@@ -87,8 +83,6 @@ impl Hash for PrivateCircuitPublicInputs {
         fields.push(self.unencrypted_log_preimages_length);
         fields.push_array(self.header.serialize());
         fields.push(self.contract_deployment_data.hash());
-        fields.push(self.chain_id);
-        fields.push(self.version);
 
         assert_eq(fields.len(), PRIVATE_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH, "Incorrect number of input fields when hashing PrivateCircuitPublicInputs");
 
@@ -122,8 +116,6 @@ impl PrivateCircuitPublicInputs {
         fields.push(self.unencrypted_log_preimages_length);
         fields.push_array(self.header.serialize());
         fields.push_array(self.contract_deployment_data.serialize());
-        fields.push(self.chain_id);
-        fields.push(self.version);
 
         assert_eq(fields.len(), PRIVATE_CIRCUIT_PUBLIC_INPUTS_LENGTH);
 

yarn-project/noir-protocol-circuits/src/crates/types/src/constants.nr

@@ -113,7 +113,7 @@ global PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH: Field = 190;
 global GET_NOTES_ORACLE_RETURN_LENGTH: Field = 674;
 global CALL_PRIVATE_FUNCTION_RETURN_SIZE: Field = 210;
 global PUBLIC_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH: Field = 98;
-global PRIVATE_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH: Field = 188;
+global PRIVATE_CIRCUIT_PUBLIC_INPUTS_HASH_INPUT_LENGTH: Field = 186;
 global COMMITMENTS_NUM_BYTES_PER_BASE_ROLLUP: Field = 2048;
 global NULLIFIERS_NUM_BYTES_PER_BASE_ROLLUP: Field = 2048;
 global PUBLIC_DATA_WRITES_NUM_BYTES_PER_BASE_ROLLUP: Field = 1024;

yarn-project/noir-protocol-circuits/src/crates/types/src/tests/private_circuit_public_inputs_builder.nr

@@ -52,9 +52,6 @@ struct PrivateCircuitPublicInputsBuilder {
     header: Header,
 
     contract_deployment_data: ContractDeploymentData,
-
-    chain_id: Field,
-    version: Field,
 }
 
 impl PrivateCircuitPublicInputsBuilder {
@@ -102,8 +99,6 @@ impl PrivateCircuitPublicInputsBuilder {
         public_inputs.args_hash = args_hash;
         public_inputs.contract_deployment_data = contract_deployment_data;
         public_inputs.header = fixtures::BLOCK_HEADER;
-        public_inputs.chain_id = 0;
-        public_inputs.version = 1;
 
         public_inputs
     }
@@ -134,9 +129,6 @@ impl PrivateCircuitPublicInputsBuilder {
             header: self.header,
 
             contract_deployment_data: self.contract_deployment_data,
-
-            chain_id: self.chain_id,
-            version: self.version,
         }
     }
 }

yarn-project/noir-protocol-circuits/src/type_conversion.ts

@@ -624,8 +624,6 @@ export function mapPrivateCircuitPublicInputsToNoir(
     unencrypted_log_preimages_length: mapFieldToNoir(privateCircuitPublicInputs.unencryptedLogPreimagesLength),
     header: mapHeaderToNoir(privateCircuitPublicInputs.header),
     contract_deployment_data: mapContractDeploymentDataToNoir(privateCircuitPublicInputs.contractDeploymentData),
-    chain_id: mapFieldToNoir(privateCircuitPublicInputs.chainId),
-    version: mapFieldToNoir(privateCircuitPublicInputs.version),
   };
 }
 

yarn-project/sequencer-client/src/block_builder/solo_block_builder.test.ts

@@ -123,7 +123,7 @@ describe('sequencer/solo_block_builder', () => {
 
   const makeEmptyProcessedTx = async () => {
     const header = await buildInitialHeader(builderDb);
-    return makeEmptyProcessedTxFromHistoricalTreeRoots(header, chainId, version);
+    return makeEmptyProcessedTxFromHistoricalTreeRoots(header);
   };
 
   // Updates the expectedDb trees based on the new commitments, contracts, and nullifiers from these txs

yarn-project/sequencer-client/src/sequencer/processed_tx.ts

@@ -87,12 +87,9 @@ export async function makeProcessedTx(
  * Makes an empty tx from an empty kernel circuit public inputs.
  * @returns A processed empty tx.
  */
-export function makeEmptyProcessedTx(header: Header, chainId: Fr, version: Fr): Promise<ProcessedTx> {
+export function makeEmptyProcessedTx(header: Header): Promise<ProcessedTx> {
   const emptyKernelOutput = PublicKernelPublicInputs.empty();
   emptyKernelOutput.constants.header = header;
-  // TODO(benesjan): These values are now redundant. Should we remove them from TxContext?
-  emptyKernelOutput.constants.txContext.chainId = chainId;
-  emptyKernelOutput.constants.txContext.version = version;
   const emptyProof = makeEmptyProof();
 
   const hash = new TxHash(Fr.ZERO.toBuffer());

yarn-project/sequencer-client/src/sequencer/public_processor.test.ts

@@ -83,7 +83,6 @@ describe('public_processor', () => {
         publicExecutor,
         publicKernel,
         publicProver,
-        GlobalVariables.empty(),
         Header.empty(),
         publicContractsDB,
         publicWorldStateDB,
@@ -138,7 +137,6 @@ describe('public_processor', () => {
         publicExecutor,
         publicKernel,
         publicProver,
-        GlobalVariables.empty(),
         Header.empty(),
         publicContractsDB,
         publicWorldStateDB,