WIP

noir/aztec_macros/src/lib.rs

@@ -1049,7 +1049,7 @@ fn generate_selector_impl(structure: &NoirStruct) -> TypeImpl {
 fn create_inputs(ty: &str) -> Param {
     let context_ident = ident("inputs");
     let context_pattern = Pattern::Identifier(context_ident);
-    let type_path = chained_path!("aztec", "abi", ty);
+    let type_path = chained_path!("aztec", "context", "inputs", "private_context_inputs", ty);
     let context_type = make_type(UnresolvedTypeData::Named(type_path, vec![]));
     let visibility = Visibility::Private;
 

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

@@ -1,9 +1,12 @@
-mod private;
-mod public;
+mod globals;
+mod inputs;
+
+mod private_context;
+mod public_context;
 mod avm;
 
-use public::PublicContext;
-use private::PrivateContext;
+use private_context::PrivateContext;
+use public_context::PublicContext;
 use avm::AVMContext;
 
 struct Context {

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

@@ -0,0 +1,2 @@
+mod private_global_variables;
+mod public_global_variables;

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

@@ -0,0 +1,14 @@
+use dep::protocol_types::traits::Serialize;
+
+// docs:start:private-global-variables
+struct PrivateGlobalVariables {
+    chain_id: Field,
+    version: Field,
+}
+// docs:end:private-global-variables
+
+impl Serialize<2> for PrivateGlobalVariables {
+    fn serialize(self) -> [Field; 2] {
+        [self.chain_id, self.version]
+    }
+}

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

@@ -0,0 +1,31 @@
+use dep::protocol_types::{
+    address::{
+        AztecAddress,
+        EthAddress,
+    },
+    traits::Serialize,
+};
+
+// docs:start:public-global-variables
+struct PublicGlobalVariables {
+    chain_id: Field,
+    version: Field,
+    block_number: Field,
+    timestamp: Field,
+    coinbase: EthAddress,
+    fee_recipient: AztecAddress,
+}
+// docs:end:public-global-variables
+
+impl Serialize<6> for PublicGlobalVariables {
+    fn serialize(self) -> [Field; 6] {
+        [
+            self.chain_id,
+            self.version,
+            self.block_number,
+            self.timestamp,
+            self.coinbase.to_field(),
+            self.fee_recipient.to_field(),
+        ]
+    }
+}

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

@@ -0,0 +1,2 @@
+mod private_context_inputs;
+mod public_context_inputs;

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

@@ -0,0 +1,16 @@
+use dep::protocol_types::{
+    abis::call_context::CallContext,
+    contrakt::deployment_data::ContractDeploymentData,
+    header::Header,
+};
+use crate::context::globals::private_global_variables::PrivateGlobalVariables;
+
+// PrivateContextInputs are expected to be provided to each private function
+// docs:start:private-context-inputs
+struct PrivateContextInputs {
+    call_context : CallContext,
+    historical_header: Header,
+    contract_deployment_data: ContractDeploymentData,
+    private_global_variables: PrivateGlobalVariables,
+}
+// docs:end:private-context-inputs

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

@@ -0,0 +1,16 @@
+use crate::context::globals::public_global_variables::PublicGlobalVariables;
+
+use dep::protocol_types::{
+    abis::call_context::CallContext,
+    header::Header,
+};
+
+// PublicContextInputs are expected to be provided to each public function
+// docs:start:public-context-inputs
+struct PublicContextInputs {
+    call_context: CallContext,
+    historical_header: Header,
+
+    public_global_variables: PublicGlobalVariables,
+}
+// docs:end:public-context-inputs

yarn-project/aztec-nr/aztec/src/context/private.nr → yarn-project/aztec-nr/aztec/src/context/private_context.nr

@@ -1,5 +1,5 @@
 use crate::{
-    abi::PrivateContextInputs,
+    context::inputs::private_context_inputs::PrivateContextInputs,
     key::nullifier_key::validate_nullifier_key_against_address,
     messaging::process_l1_to_l2_message,
     oracle::{

yarn-project/aztec-nr/aztec/src/context/public.nr → yarn-project/aztec-nr/aztec/src/context/public_context.nr

@@ -1,5 +1,5 @@
 use crate::{
-    abi::PublicContextInputs,
+    context::inputs::public_context_inputs::PublicContextInputs,
     messaging::process_l1_to_l2_message,
     oracle::{
         arguments,

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

@@ -1,4 +1,3 @@
-mod abi;
 mod avm;
 mod context;
 mod hash;