feat: TXE 2: Electric boogaloo

noir-projects/Dockerfile.test

@@ -28,7 +28,7 @@ RUN cd /usr/src/yarn-project/txe && yarn start & echo $! > /tmp/txe.pid && \
     # Wait for TXE to initialize
     sleep 5 && \ 
     cd ./noir-contracts && \
-    ./bootstrap.sh && nargo test --silence-warnings --oracle-resolver http://localhost:8080 ; \
+    ./bootstrap.sh && NARGO_FOREIGN_CALL_TIMEOUT=300000 nargo test --silence-warnings --oracle-resolver http://localhost:8080 ; \
     kill $(cat /tmp/txe.pid)
 
 RUN cd /usr/src/yarn-project/txe && yarn start & echo $! > /tmp/txe.pid && \ 

noir-projects/Earthfile

@@ -58,7 +58,8 @@ test:
   RUN cd /usr/src/yarn-project/txe && yarn start & echo $! > /tmp/txe.pid && \
       # Wait for TXE to initialize
       sleep 5 && \
-      cd /usr/src/noir-projects/noir-contracts && nargo test --silence-warnings --oracle-resolver http://localhost:8080 ; \
+      cd /usr/src/noir-projects/noir-contracts && \
+      NARGO_FOREIGN_CALL_TIMEOUT=300000 nargo test --silence-warnings --oracle-resolver http://localhost:8080 ; \
       kill $(cat /tmp/txe.pid)
 
 format:

noir-projects/aztec-nr/authwit/src/cheatcodes.nr

@@ -0,0 +1,44 @@
+use dep::aztec::{
+    protocol_types::address::AztecAddress,
+    context::{public_context::PublicContext, call_interfaces::CallInterface}, test::helpers::cheatcodes,
+    hash::hash_args
+};
+
+use crate::auth::{compute_inner_authwit_hash, compute_outer_authwit_hash, set_authorized};
+
+pub fn add_private_authwit_from_call_interface<C, M, T, P, Env>(
+    on_behalf_of: AztecAddress,
+    caller: AztecAddress,
+    call_interface: C
+) where C: CallInterface<M, T, P, Env> {
+    let target = call_interface.get_contract_address();
+    let inputs = cheatcodes::get_private_context_inputs(cheatcodes::get_block_number());
+    let chain_id = inputs.tx_context.chain_id;
+    let version = inputs.tx_context.version;
+    let args_hash = hash_args(call_interface.get_args());
+    let selector = call_interface.get_selector();
+    let inner_hash = compute_inner_authwit_hash([caller.to_field(), selector.to_field(), args_hash]);
+    let message_hash = compute_outer_authwit_hash(target, chain_id, version, inner_hash);
+    cheatcodes::add_authwit(on_behalf_of, message_hash);
+}
+
+pub fn add_public_authwit_from_call_interface<C, M, T, P, Env>(
+    on_behalf_of: AztecAddress,
+    caller: AztecAddress,
+    call_interface: C
+) where C: CallInterface<M, T, P, Env> {
+    let current_contract = cheatcodes::get_contract_address();
+    cheatcodes::set_contract_address(on_behalf_of);
+    let target = call_interface.get_contract_address();
+    let inputs = cheatcodes::get_private_context_inputs(cheatcodes::get_block_number());
+    let chain_id = inputs.tx_context.chain_id;
+    let version = inputs.tx_context.version;
+    let args_hash = hash_args(call_interface.get_args());
+    let selector = call_interface.get_selector();
+    let inner_hash = compute_inner_authwit_hash([caller.to_field(), selector.to_field(), args_hash]);
+    let message_hash = compute_outer_authwit_hash(target, chain_id, version, inner_hash);
+    let mut inputs = cheatcodes::get_public_context_inputs();
+    let mut context = PublicContext::new(inputs);
+    set_authorized(&mut context, message_hash, true);
+    cheatcodes::set_contract_address(current_contract);
+}

noir-projects/aztec-nr/authwit/src/lib.nr

@@ -2,3 +2,4 @@ mod account;
 mod auth_witness;
 mod auth;
 mod entrypoint;
+mod cheatcodes;

noir-projects/aztec-nr/aztec/src/context/call_interfaces.nr

@@ -16,6 +16,7 @@ trait CallInterface<N, T, P, Env> {
     fn get_selector(self) -> FunctionSelector;
     fn get_name(self) -> str<N>;
     fn get_contract_address(self) -> AztecAddress;
+    fn get_is_static(self) -> bool;
 }
 
 impl<N, T, P, Env> CallInterface<N, PrivateContextInputs, PrivateCircuitPublicInputs, Env> for PrivateCallInterface<N, T, Env> {
@@ -38,6 +39,10 @@ impl<N, T, P, Env> CallInterface<N, PrivateContextInputs, PrivateCircuitPublicIn
     fn get_contract_address(self) -> AztecAddress {
         self.target_contract
     }
+
+    fn get_is_static(self) -> bool {
+        self.is_static
+    }
 }
 
 struct PrivateCallInterface<N, T, Env> {
@@ -46,7 +51,8 @@ struct PrivateCallInterface<N, T, Env> {
     name: str<N>,
     args_hash: Field,
     args: [Field],
-    original: fn[Env](PrivateContextInputs) -> PrivateCircuitPublicInputs
+    original: fn[Env](PrivateContextInputs) -> PrivateCircuitPublicInputs,
+    is_static: bool
 }
 
 impl<N, T, Env> PrivateCallInterface<N, T, Env> {
@@ -93,6 +99,10 @@ impl<N, T, P, Env> CallInterface<N, PrivateContextInputs, PrivateCircuitPublicIn
     fn get_contract_address(self) -> AztecAddress {
         self.target_contract
     }
+
+    fn get_is_static(self) -> bool {
+        self.is_static
+    }
 }
 
 struct PrivateVoidCallInterface<N, Env> {
@@ -101,7 +111,8 @@ struct PrivateVoidCallInterface<N, Env> {
     name: str<N>,
     args_hash: Field,
     args: [Field],
-    original: fn[Env](PrivateContextInputs) -> PrivateCircuitPublicInputs
+    original: fn[Env](PrivateContextInputs) -> PrivateCircuitPublicInputs,
+    is_static: bool
 }
 
 impl<N, Env> PrivateVoidCallInterface<N, Env> {
@@ -144,6 +155,10 @@ impl<N, T, P, Env> CallInterface<N, PrivateContextInputs, PrivateCircuitPublicIn
     fn get_contract_address(self) -> AztecAddress {
         self.target_contract
     }
+
+    fn get_is_static(self) -> bool {
+        self.is_static
+    }
 }
 
 struct PrivateStaticCallInterface<N, T, Env> {
@@ -152,7 +167,8 @@ struct PrivateStaticCallInterface<N, T, Env> {
     name: str<N>,
     args_hash: Field,
     args: [Field],
-    original: fn[Env](PrivateContextInputs) -> PrivateCircuitPublicInputs
+    original: fn[Env](PrivateContextInputs) -> PrivateCircuitPublicInputs,
+    is_static: bool
 }
 
 impl<N, T, Env> PrivateStaticCallInterface<N, T, Env> {
@@ -182,6 +198,10 @@ impl<N, T, P, Env> CallInterface<N, PrivateContextInputs, PrivateCircuitPublicIn
     fn get_contract_address(self) -> AztecAddress {
         self.target_contract
     }
+
+    fn get_is_static(self) -> bool {
+        self.is_static
+    }
 }
 
 struct PrivateStaticVoidCallInterface<N, Env> {
@@ -190,7 +210,8 @@ struct PrivateStaticVoidCallInterface<N, Env> {
     name: str<N>,
     args_hash: Field,
     args: [Field],
-    original: fn[Env](PrivateContextInputs) -> PrivateCircuitPublicInputs
+    original: fn[Env](PrivateContextInputs) -> PrivateCircuitPublicInputs,
+    is_static: bool
 }
 
 impl<N, Env> PrivateStaticVoidCallInterface<N, Env> {
@@ -219,6 +240,10 @@ impl<N, T, P, Env> CallInterface<N, PublicContextInputs, T, Env> for PublicCallI
     fn get_contract_address(self) -> AztecAddress {
         self.target_contract
     }
+
+    fn get_is_static(self) -> bool {
+        self.is_static
+    }
 }
 
 struct PublicCallInterface<N, T, Env> {
@@ -227,7 +252,8 @@ struct PublicCallInterface<N, T, Env> {
     name: str<N>,
     args: [Field],
     gas_opts: GasOpts,
-    original: fn[Env](PublicContextInputs) -> T
+    original: fn[Env](PublicContextInputs) -> T,
+    is_static: bool
 }
 
 impl<N, T, Env> PublicCallInterface<N, T, Env> {
@@ -308,6 +334,10 @@ impl<N, T, P, Env> CallInterface<N, PublicContextInputs, (), Env> for PublicVoid
     fn get_contract_address(self) -> AztecAddress {
         self.target_contract
     }
+
+    fn get_is_static(self) -> bool {
+        self.is_static
+    }
 }
 
 struct PublicVoidCallInterface<N, Env> {
@@ -316,7 +346,8 @@ struct PublicVoidCallInterface<N, Env> {
     name: str<N>,
     args: [Field],
     gas_opts: GasOpts,
-    original: fn[Env](PublicContextInputs) -> ()
+    original: fn[Env](PublicContextInputs) -> (),
+    is_static: bool
 }
 
 impl<N, Env> PublicVoidCallInterface<N, Env> {
@@ -378,7 +409,7 @@ impl<N, Env> PublicVoidCallInterface<N, Env> {
 }
 
 impl<N, T, P, Env> CallInterface<N, PublicContextInputs, T, Env> for PublicStaticCallInterface<N, T, Env> {
-  fn get_args(self) -> [Field] {
+    fn get_args(self) -> [Field] {
         self.args
     }
 
@@ -397,6 +428,10 @@ impl<N, T, P, Env> CallInterface<N, PublicContextInputs, T, Env> for PublicStati
     fn get_contract_address(self) -> AztecAddress {
         self.target_contract
     }
+
+    fn get_is_static(self) -> bool {
+        self.is_static
+    }
 }
 
 struct PublicStaticCallInterface<N, T, Env> {
@@ -405,7 +440,8 @@ struct PublicStaticCallInterface<N, T, Env> {
     name: str<N>,
     args: [Field],
     gas_opts: GasOpts,
-    original: fn[Env](PublicContextInputs) -> T
+    original: fn[Env](PublicContextInputs) -> T,
+    is_static: bool
 }
 
 impl<N, T, Env> PublicStaticCallInterface<N, T, Env> {
@@ -453,6 +489,10 @@ impl<N, T, P, Env> CallInterface<N, PublicContextInputs, (), Env> for PublicStat
     fn get_contract_address(self) -> AztecAddress {
         self.target_contract
     }
+
+    fn get_is_static(self) -> bool {
+        self.is_static
+    }
 }
 
 struct PublicStaticVoidCallInterface<N, Env> {
@@ -461,7 +501,8 @@ struct PublicStaticVoidCallInterface<N, Env> {
     name: str<N>,
     args: [Field],
     gas_opts: GasOpts,
-    original: fn[Env](PublicContextInputs) -> ()
+    original: fn[Env](PublicContextInputs) -> (),
+    is_static: bool
 }
 
 impl<N, Env> PublicStaticVoidCallInterface<N, Env> {

noir-projects/aztec-nr/aztec/src/oracle/notes.nr

@@ -145,8 +145,7 @@ unconstrained pub fn get_notes<Note, N, NB, M, S, NS>(
             let header = NoteHeader { contract_address, nonce, storage_slot, note_hash_counter };
             let serialized_note = arr_copy_slice(fields, [0; N], read_offset + 2);
             let mut note = Note::deserialize_content(serialized_note);
-            // TODO: change this to note.set_header(header) once https://github.com/noir-lang/noir/issues/4095 is fixed
-            Note::set_header(&mut note, header);
+            note.set_header(header);
             placeholder_opt_notes[i] = Option::some(note);
         };
     }

noir-projects/aztec-nr/aztec/src/test/helpers.nr

@@ -1,4 +1,4 @@
 mod test_environment;
 mod cheatcodes;
-mod types;
+mod utils;
 mod keys;

noir-projects/aztec-nr/aztec/src/test/helpers/cheatcodes.nr

@@ -1,6 +1,9 @@
-use dep::protocol_types::{abis::function_selector::FunctionSelector, address::{AztecAddress, PartialAddress}};
+use dep::protocol_types::{
+    abis::function_selector::FunctionSelector, address::{AztecAddress, PartialAddress},
+    constants::CONTRACT_INSTANCE_LENGTH, contract_instance::ContractInstance
+};
 use crate::context::inputs::{PublicContextInputs, PrivateContextInputs};
-use crate::test::helpers::types::{Deployer, TestAccount};
+use crate::test::helpers::utils::{Deployer, TestAccount};
 use crate::keys::public_keys::PublicKeys;
 
 unconstrained pub fn reset() {
@@ -31,20 +34,12 @@ unconstrained pub fn get_public_context_inputs() -> PublicContextInputs {
     oracle_get_public_context_inputs()
 }
 
-unconstrained pub fn deploy<N, M>(
-    path: str<N>,
-    initializer: str<M>,
-    args: [Field],
-    public_keys_hash: Field
-) -> AztecAddress {
-    oracle_deploy(path, initializer, args, public_keys_hash)
+unconstrained pub fn deploy<N, M>(path: str<N>, initializer: str<M>, args: [Field], public_keys_hash: Field) -> ContractInstance {
+    let instance_fields = oracle_deploy(path, initializer, args, public_keys_hash);
+    ContractInstance::deserialize(instance_fields)
 }
 
-unconstrained pub fn direct_storage_write<N>(
-    contract_address: AztecAddress,
-    storage_slot: Field,
-    fields: [Field; N]
-) {
+unconstrained pub fn direct_storage_write<N>(contract_address: AztecAddress, storage_slot: Field, fields: [Field; N]) {
     let _hash = direct_storage_write_oracle(contract_address, storage_slot, fields);
 }
 
@@ -72,6 +67,40 @@ unconstrained pub fn get_side_effects_counter() -> u32 {
     oracle_get_side_effects_counter()
 }
 
+unconstrained pub fn add_authwit(address: AztecAddress, message_hash: Field) {
+    orable_add_authwit(address, message_hash)
+}
+
+unconstrained pub fn assert_public_call_fails(target_address: AztecAddress, function_selector: FunctionSelector, args: [Field]) {
+    oracle_assert_public_call_fails(target_address, function_selector, args)
+}
+
+unconstrained pub fn assert_private_call_fails(
+    target_address: AztecAddress,
+    function_selector: FunctionSelector,
+    argsHash: Field,
+    sideEffectsCounter: Field,
+    isStaticCall: bool,
+    isDelegateCall: bool
+) {
+    oracle_assert_private_call_fails(
+        target_address,
+        function_selector,
+        argsHash,
+        sideEffectsCounter,
+        isStaticCall,
+        isDelegateCall
+    )
+}
+
+unconstrained pub fn add_nullifiers(contractAddress: AztecAddress, nullifiers: [Field]) {
+    oracle_add_nullifiers(contractAddress, nullifiers)
+}
+
+unconstrained pub fn add_note_hashes(contractAddress: AztecAddress, inner_note_hashes: [Field]) {
+    oracle_add_note_hashes(contractAddress, inner_note_hashes)
+}
+
 #[oracle(reset)]
 fn oracle_reset() {}
 
@@ -99,7 +128,7 @@ fn oracle_deploy<N, M>(
     initializer: str<M>,
     args: [Field],
     public_keys_hash: Field
-) -> AztecAddress {}
+) -> [Field; CONTRACT_INSTANCE_LENGTH] {}
 
 #[oracle(directStorageWrite)]
 fn direct_storage_write_oracle<N>(
@@ -125,3 +154,30 @@ fn oracle_set_msg_sender(msg_sender: AztecAddress) {}
 
 #[oracle(getSideEffectsCounter)]
 fn oracle_get_side_effects_counter() -> u32 {}
+
+#[oracle(addAuthWitness)]
+fn orable_add_authwit(address: AztecAddress, message_hash: Field) {}
+
+#[oracle(assertPublicCallFails)]
+fn oracle_assert_public_call_fails(
+    target_address: AztecAddress,
+    function_selector: FunctionSelector,
+    args: [Field]
+) {}
+
+#[oracle(assertPrivateCallFails)]
+fn oracle_assert_private_call_fails(
+    target_address: AztecAddress,
+    function_selector: FunctionSelector,
+    argsHash: Field,
+    sideEffectsCounter: Field,
+    isStaticCall: bool,
+    isDelegateCall: bool
+) {}
+
+#[oracle(addNullifiers)]
+fn oracle_add_nullifiers(contractAddress: AztecAddress, nullifiers: [Field]) {}
+
+#[oracle(addNoteHashes)]
+fn oracle_add_note_hashes(contractAddress: AztecAddress, inner_note_hashes: [Field]) {}
+