Merge branch 'dev' into feat/403

Author: ilpepepig

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defi-wonderland/aztec-standards",
-  "version": "4.3.0",
+  "version": "5.0.0-rc.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/defi-wonderland/aztec-standards.git"
@@ -26,15 +26,15 @@
     "*.ts": "prettier --write -u"
   },
   "dependencies": {
-    "@aztec/accounts": "4.3.0",
-    "@aztec/aztec.js": "4.3.0",
-    "@aztec/noir-contracts.js": "4.3.0",
-    "@aztec/protocol-contracts": "4.3.0",
-    "@aztec/pxe": "4.3.0",
-    "@aztec/stdlib": "4.3.0",
-    "@aztec/wallet-sdk": "4.3.0",
-    "@aztec/wallets": "4.3.0",
-    "@defi-wonderland/aztec-benchmark": "4.3.0",
+    "@aztec/accounts": "5.0.0-rc.1",
+    "@aztec/aztec.js": "5.0.0-rc.1",
+    "@aztec/noir-contracts.js": "5.0.0-rc.1",
+    "@aztec/protocol-contracts": "5.0.0-rc.1",
+    "@aztec/pxe": "5.0.0-rc.1",
+    "@aztec/stdlib": "5.0.0-rc.1",
+    "@aztec/wallet-sdk": "5.0.0-rc.1",
+    "@aztec/wallets": "5.0.0-rc.1",
+    "@defi-wonderland/aztec-benchmark": "5.0.0-rc.1",
     "commander": "14.0.1",
     "dotenv": "16.4.7"
   },
@@ -50,7 +50,7 @@
     "vitest": "4.0.17"
   },
   "config": {
-    "aztecVersion": "4.3.0"
+    "aztecVersion": "5.0.0-rc.1"
   },
   "engines": {
     "node": ">=22"

scripts/deploy.ts

@@ -410,7 +410,7 @@ export async function deployContracts(options: CLIOptions, config: DeploymentCon
   const node = createAztecNodeClient(nodeUrl);
   const isLocalNetwork = config.network.name === 'local-network';
   const wallet = await EmbeddedWallet.create(nodeUrl, {
-    pxeConfig: {
+    pxe: {
       proverEnabled: !isLocalNetwork,
       dataDirectory: config.deployer.dataDirectory,
       dataStoreMapSizeKb: 1e6,

src/dripper/Nargo.toml

@@ -5,5 +5,5 @@ compiler_version = ">=1.0.0"
 type = "contract"
 
 [dependencies]
-aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v4.3.0", directory = "noir-projects/aztec-nr/aztec" }
+aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v5.0.0-rc.1", directory = "noir-projects/aztec-nr/aztec" }
 token = { path = "../token_contract" }

src/escrow_contract/Nargo.toml

@@ -5,8 +5,8 @@ compiler_version = ">=1.0.0"
 type = "contract"
 
 [dependencies]
-aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v4.3.0", directory = "noir-projects/aztec-nr/aztec" }
-serde = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v4.3.0", directory = "noir-projects/noir-protocol-circuits/crates/serde" }
+aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v5.0.0-rc.1", directory = "noir-projects/aztec-nr/aztec" }
+serde = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v5.0.0-rc.1", directory = "noir-projects/noir-protocol-circuits/crates/serde" }
 token = { path = "../token_contract" }
 nft = { path = "../nft_contract" }
 sha512 = { git = "https://github.com/noir-lang/sha512", tag = "mv/use-bool-over-u1" }

src/escrow_contract/src/key_derivation.nr

@@ -2,9 +2,12 @@ use bignum::bignum::BigNum;
 use bignum::U512;
 use sha512::sha512;
 
-use aztec::protocol::constants::{DOM_SEP__IVSK_M, DOM_SEP__NHK_M, DOM_SEP__OVSK_M, DOM_SEP__TSK_M};
-use aztec::protocol::point::Point;
-use aztec::protocol::public_keys::{IvpkM, NpkM, OvpkM, PublicKeys, TpkM};
+use aztec::protocol::constants::{
+    DEFAULT_FBPK_M_HASH, DEFAULT_MSPK_M_HASH, DOM_SEP__IVSK_M, DOM_SEP__NHK_M, DOM_SEP__OVSK_M,
+    DOM_SEP__TSK_M,
+};
+use aztec::protocol::point::EmbeddedCurvePoint;
+use aztec::protocol::public_keys::{hash_public_key, IvpkM, PublicKeys};
 use std::embedded_curve_ops::{EmbeddedCurveScalar, fixed_base_scalar_mul};
 
 pub use crate::types::master_secret_keys::MasterSecretKeys;
@@ -141,16 +144,18 @@ pub fn derive_keys(secret_key: Field) -> MasterSecretKeys {
 /// @param master_secret_keys The master secret keys
 /// @return PublicKeys containing the derived public keys.
 pub fn master_secret_keys_to_public_keys(master_secret_keys: MasterSecretKeys) -> PublicKeys {
-    let npk_m: Point = fixed_base_scalar_mul(master_secret_keys.nhk_m).into();
-    let ivpk_m: Point = fixed_base_scalar_mul(master_secret_keys.ivsk_m).into();
-    let ovpk_m: Point = fixed_base_scalar_mul(master_secret_keys.ovsk_m).into();
-    let tpk_m: Point = fixed_base_scalar_mul(master_secret_keys.tsk_m).into();
+    let npk_m: EmbeddedCurvePoint = fixed_base_scalar_mul(master_secret_keys.nhk_m);
+    let ivpk_m: EmbeddedCurvePoint = fixed_base_scalar_mul(master_secret_keys.ivsk_m);
+    let ovpk_m: EmbeddedCurvePoint = fixed_base_scalar_mul(master_secret_keys.ovsk_m);
+    let tpk_m: EmbeddedCurvePoint = fixed_base_scalar_mul(master_secret_keys.tsk_m);
 
     PublicKeys {
-        npk_m: NpkM { inner: npk_m },
+        npk_m_hash: hash_public_key(npk_m),
         ivpk_m: IvpkM { inner: ivpk_m },
-        ovpk_m: OvpkM { inner: ovpk_m },
-        tpk_m: TpkM { inner: tpk_m },
+        ovpk_m_hash: hash_public_key(ovpk_m),
+        tpk_m_hash: hash_public_key(tpk_m),
+        mspk_m_hash: DEFAULT_MSPK_M_HASH,
+        fbpk_m_hash: DEFAULT_FBPK_M_HASH,
     }
 }
 

src/escrow_contract/src/library/logic.nr

@@ -2,7 +2,7 @@
 use aztec::{
     context::PrivateContext,
     event::event_emission::emit_event_in_private,
-    messages::message_delivery::MessageDelivery,
+    messages::delivery::MessageDelivery,
     protocol::{
         address::AztecAddress,
         contract_class_id::ContractClassId,
@@ -41,6 +41,7 @@ pub fn _get_escrow(
         deployer: AztecAddress::from_field(0),
         contract_class_id: ContractClassId::from_field(escrow_class_id),
         initialization_hash: 0,
+        immutables_hash: 0,
         public_keys: computed_public_keys,
     };
 
@@ -64,7 +65,7 @@ pub fn _share_escrow(
 
     emit_event_in_private(context, event_struct).deliver_to(
         account,
-        MessageDelivery.ONCHAIN_CONSTRAINED,
+        MessageDelivery::onchain_constrained(),
     );
 }
 

src/escrow_contract/src/test/test_logic_contract/Nargo.toml

@@ -5,7 +5,7 @@ compiler_version = ">=1.0.0"
 type = "contract"
 
 [dependencies]
-aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v4.3.0", directory = "noir-projects/aztec-nr/aztec" }
+aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v5.0.0-rc.1", directory = "noir-projects/aztec-nr/aztec" }
 escrow_contract = { path = "../../../" }
 token = { path = "../../../../token_contract" }
 nft = { path = "../../../../nft_contract" }

src/escrow_contract/src/test/test_logic_contract/src/test/secret_key_to_public_keys.nr

@@ -18,29 +18,27 @@ unconstrained fn secret_key_to_public_keys_success() {
         TestLogic::at(logic_contract_address).secret_key_to_public_keys(secret_key_1),
     );
 
-    assert_eq(vector_public_keys_1.npk_m.inner.x, public_keys_1.npk_m.inner.x);
-    assert_eq(vector_public_keys_1.npk_m.inner.y, public_keys_1.npk_m.inner.y);
+    assert_eq(vector_public_keys_1.npk_m_hash, public_keys_1.npk_m_hash);
     assert_eq(vector_public_keys_1.ivpk_m.inner.x, public_keys_1.ivpk_m.inner.x);
     assert_eq(vector_public_keys_1.ivpk_m.inner.y, public_keys_1.ivpk_m.inner.y);
-    assert_eq(vector_public_keys_1.ovpk_m.inner.x, public_keys_1.ovpk_m.inner.x);
-    assert_eq(vector_public_keys_1.ovpk_m.inner.y, public_keys_1.ovpk_m.inner.y);
-    assert_eq(vector_public_keys_1.tpk_m.inner.x, public_keys_1.tpk_m.inner.x);
-    assert_eq(vector_public_keys_1.tpk_m.inner.y, public_keys_1.tpk_m.inner.y);
+    assert_eq(vector_public_keys_1.ovpk_m_hash, public_keys_1.ovpk_m_hash);
+    assert_eq(vector_public_keys_1.tpk_m_hash, public_keys_1.tpk_m_hash);
+    assert_eq(vector_public_keys_1.mspk_m_hash, public_keys_1.mspk_m_hash);
+    assert_eq(vector_public_keys_1.fbpk_m_hash, public_keys_1.fbpk_m_hash);
     assert_eq(vector_public_keys_1, public_keys_1);
 
     let public_keys_2 = env.call_private(
         caller,
         TestLogic::at(logic_contract_address).secret_key_to_public_keys(secret_key_2),
     );
 
-    assert_eq(vector_public_keys_2.npk_m.inner.x, public_keys_2.npk_m.inner.x);
-    assert_eq(vector_public_keys_2.npk_m.inner.y, public_keys_2.npk_m.inner.y);
+    assert_eq(vector_public_keys_2.npk_m_hash, public_keys_2.npk_m_hash);
     assert_eq(vector_public_keys_2.ivpk_m.inner.x, public_keys_2.ivpk_m.inner.x);
     assert_eq(vector_public_keys_2.ivpk_m.inner.y, public_keys_2.ivpk_m.inner.y);
-    assert_eq(vector_public_keys_2.ovpk_m.inner.x, public_keys_2.ovpk_m.inner.x);
-    assert_eq(vector_public_keys_2.ovpk_m.inner.y, public_keys_2.ovpk_m.inner.y);
-    assert_eq(vector_public_keys_2.tpk_m.inner.x, public_keys_2.tpk_m.inner.x);
-    assert_eq(vector_public_keys_2.tpk_m.inner.y, public_keys_2.tpk_m.inner.y);
+    assert_eq(vector_public_keys_2.ovpk_m_hash, public_keys_2.ovpk_m_hash);
+    assert_eq(vector_public_keys_2.tpk_m_hash, public_keys_2.tpk_m_hash);
+    assert_eq(vector_public_keys_2.mspk_m_hash, public_keys_2.mspk_m_hash);
+    assert_eq(vector_public_keys_2.fbpk_m_hash, public_keys_2.fbpk_m_hash);
     assert_eq(vector_public_keys_2, public_keys_2);
 }
 

src/escrow_contract/src/test/test_logic_contract/src/test/utils.nr

@@ -3,8 +3,9 @@ use aztec::{
     event::{event_interface::EventInterface, EventSelector},
     protocol::{
         address::AztecAddress,
-        point::Point,
-        public_keys::{IvpkM, NpkM, OvpkM, PublicKeys, TpkM},
+        constants::{DEFAULT_FBPK_M_HASH, DEFAULT_MSPK_M_HASH},
+        point::EmbeddedCurvePoint,
+        public_keys::{IvpkM, PublicKeys},
         traits::Serialize,
     },
     test::helpers::test_environment::TestEnvironment,
@@ -56,10 +57,18 @@ pub unconstrained fn get_test_vector() -> (PublicKeys, Field, PublicKeys, Field)
     let tpk_y_1: Field = 0x1ef6fce001c800647bb2b7137517181306c713f671c0e65339dd11d57c863ee8;
 
     let public_keys_1 = PublicKeys {
-        npk_m: NpkM { inner: Point { x: npk_x_1, y: npk_y_1, is_infinite: false } },
-        ivpk_m: IvpkM { inner: Point { x: ivpk_x_1, y: ivpk_y_1, is_infinite: false } },
-        ovpk_m: OvpkM { inner: Point { x: ovpk_x_1, y: ovpk_y_1, is_infinite: false } },
-        tpk_m: TpkM { inner: Point { x: tpk_x_1, y: tpk_y_1, is_infinite: false } },
+        npk_m_hash: aztec::protocol::public_keys::hash_public_key(
+            EmbeddedCurvePoint { x: npk_x_1, y: npk_y_1 },
+        ),
+        ivpk_m: IvpkM { inner: EmbeddedCurvePoint { x: ivpk_x_1, y: ivpk_y_1 } },
+        ovpk_m_hash: aztec::protocol::public_keys::hash_public_key(
+            EmbeddedCurvePoint { x: ovpk_x_1, y: ovpk_y_1 },
+        ),
+        tpk_m_hash: aztec::protocol::public_keys::hash_public_key(
+            EmbeddedCurvePoint { x: tpk_x_1, y: tpk_y_1 },
+        ),
+        mspk_m_hash: DEFAULT_MSPK_M_HASH,
+        fbpk_m_hash: DEFAULT_FBPK_M_HASH,
     };
 
     // Secret key 2: string "RANDOM_SECRET_KEY" left-padded to 32 bytes with spaces
@@ -76,10 +85,18 @@ pub unconstrained fn get_test_vector() -> (PublicKeys, Field, PublicKeys, Field)
     let tpk_y_2: Field = 0x0cc1c1631501a99ed1797f4d701df03c9663989fee1fb311266459b47f523e07;
 
     let public_keys_2 = PublicKeys {
-        npk_m: NpkM { inner: Point { x: npk_x_2, y: npk_y_2, is_infinite: false } },
-        ivpk_m: IvpkM { inner: Point { x: ivpk_x_2, y: ivpk_y_2, is_infinite: false } },
-        ovpk_m: OvpkM { inner: Point { x: ovpk_x_2, y: ovpk_y_2, is_infinite: false } },
-        tpk_m: TpkM { inner: Point { x: tpk_x_2, y: tpk_y_2, is_infinite: false } },
+        npk_m_hash: aztec::protocol::public_keys::hash_public_key(
+            EmbeddedCurvePoint { x: npk_x_2, y: npk_y_2 },
+        ),
+        ivpk_m: IvpkM { inner: EmbeddedCurvePoint { x: ivpk_x_2, y: ivpk_y_2 } },
+        ovpk_m_hash: aztec::protocol::public_keys::hash_public_key(
+            EmbeddedCurvePoint { x: ovpk_x_2, y: ovpk_y_2 },
+        ),
+        tpk_m_hash: aztec::protocol::public_keys::hash_public_key(
+            EmbeddedCurvePoint { x: tpk_x_2, y: tpk_y_2 },
+        ),
+        mspk_m_hash: DEFAULT_MSPK_M_HASH,
+        fbpk_m_hash: DEFAULT_FBPK_M_HASH,
     };
 
     (public_keys_1, secret_key_1, public_keys_2, secret_key_2)

src/generic_proxy/Nargo.toml

@@ -5,4 +5,4 @@ compiler_version = ">=0.25.0"
 type = "contract"
 
 [dependencies]
-aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v4.3.0", directory = "noir-projects/aztec-nr/aztec" }
+aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v5.0.0-rc.1", directory = "noir-projects/aztec-nr/aztec" }