Fixes post rebase

AztecProtocol · Jan 26, 2024 · e2e6501 · e2e6501
1 parent 3bb588c
commit e2e6501
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/yarn-project/aztec-nr/aztec/src/oracle/get_public_key.nr b/yarn-project/aztec-nr/aztec/src/oracle/get_public_key.nr
@@ -2,6 +2,7 @@ use dep::protocol_types::{
     address::{
         AztecAddress,
         PartialAddress,
+        PublicKeysHash,
     },
     grumpkin_point::GrumpkinPoint,
 };
@@ -18,7 +19,7 @@ pub fn get_public_key(address: AztecAddress) -> GrumpkinPoint {
     let pub_key = GrumpkinPoint::new(result[0], result[1]);
     let partial_address = PartialAddress::from_field(result[2]);
 
-    let calculated_address = AztecAddress::compute(pub_key, partial_address);
+    let calculated_address = AztecAddress::compute(PublicKeysHash::compute(pub_key), partial_address);
     assert(calculated_address.eq(address));
 
     pub_key

diff --git a/yarn-project/noir-contracts/contracts/schnorr_single_key_account_contract/src/util.nr b/yarn-project/noir-contracts/contracts/schnorr_single_key_account_contract/src/util.nr
@@ -1,4 +1,4 @@
-use dep::aztec::protocol_types::address::AztecAddress;
+use dep::aztec::protocol_types::address::{AztecAddress, PublicKeysHash};
 use dep::std::{schnorr::verify_signature};
 use crate::auth_oracle::{AuthWitness};
 
@@ -12,5 +12,5 @@ pub fn recover_address(message_hash: Field, witness: AuthWitness) -> AztecAddres
     );
     assert(verification == true);
 
-    AztecAddress::compute(witness.owner, witness.partial_address)
+    AztecAddress::compute(PublicKeysHash::compute(witness.owner), witness.partial_address)
 }
diff --git a/yarn-project/noir-protocol-circuits/src/index.test.ts b/yarn-project/noir-protocol-circuits/src/index.test.ts
@@ -15,7 +15,7 @@ import {
   TxContext,
   TxRequest,
   computeContractAddressFromInstance,
-  computePublicKeysHash
+  computePublicKeysHash,
 } from '@aztec/circuits.js';
 import { computeFunctionLeaf, computeTxHash } from '@aztec/circuits.js/abis';
 import { Fr } from '@aztec/foundation/fields';