Skip to content
This repository was archived by the owner on Jul 10, 2026. It is now read-only.

Commit 95e9167

Browse files
authored
release: 4.2.0 (#334)
# 🤖 Linear Closes AZT-XXX ## Description
2 parents 6b8288e + a33bb47 commit 95e9167

36 files changed

Lines changed: 1072 additions & 657 deletions

.github/workflows/pr-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
secrets: inherit
1414

1515
benchmark:
16-
uses: defi-wonderland/aztec-benchmark/.github/workflows/pr-benchmark.yml@4.2.0-aztecnr-rc.2
16+
uses: defi-wonderland/aztec-benchmark/.github/workflows/pr-benchmark.yml@4.2.0
1717
permissions:
1818
contents: read
1919
pull-requests: write

.github/workflows/update-baseline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ concurrency:
1515

1616
jobs:
1717
baseline:
18-
uses: defi-wonderland/aztec-benchmark/.github/workflows/update-baseline.yml@4.2.0-aztecnr-rc.2
18+
uses: defi-wonderland/aztec-benchmark/.github/workflows/update-baseline.yml@4.2.0
1919
permissions:
2020
contents: read
2121
actions: write

Nargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
members = [
33
"src/token_contract",
44
"src/vault_contract",
5+
"src/vault_deployer",
56
"src/dripper",
67
"src/nft_contract",
78
"src/escrow_contract",

benchmarks/vault_contract.benchmark.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { Benchmark, BenchmarkContext } from '@defi-wonderland/aztec-benchmark';
1111
import { TokenContract } from '../src/artifacts/Token.js';
1212
import { VaultContract } from '../src/artifacts/Vault.js';
1313
import {
14+
ensureVaultContractClassPublished,
1415
deployVaultAndAssetWithMinter,
1516
setPrivateAuthWit,
1617
setPublicAuthWit,
@@ -47,6 +48,7 @@ export default class TokenContractBenchmark extends Benchmark {
4748
const { cleanup, wallet, accounts } = await setupTestSuite(true);
4849
const [deployer] = accounts;
4950
const bob = accounts[1];
51+
await ensureVaultContractClassPublished(wallet, deployer);
5052
const [vaultContract, assetContract, sharesContract] = await deployVaultAndAssetWithMinter(wallet, deployer);
5153
const assetMethods = assetContract.withWallet(wallet).methods;
5254
const sharesMethods = sharesContract.withWallet(wallet).methods;

package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@defi-wonderland/aztec-standards",
3-
"version": "4.2.0-aztecnr-rc.2",
3+
"version": "4.2.0",
44
"repository": {
55
"type": "git",
66
"url": "git+https://github.com/defi-wonderland/aztec-standards.git"
@@ -26,15 +26,15 @@
2626
"*.ts": "prettier --write -u"
2727
},
2828
"dependencies": {
29-
"@aztec/accounts": "4.2.0-aztecnr-rc.2",
30-
"@aztec/aztec.js": "4.2.0-aztecnr-rc.2",
31-
"@aztec/noir-contracts.js": "4.2.0-aztecnr-rc.2",
32-
"@aztec/protocol-contracts": "4.2.0-aztecnr-rc.2",
33-
"@aztec/pxe": "4.2.0-aztecnr-rc.2",
34-
"@aztec/stdlib": "4.2.0-aztecnr-rc.2",
35-
"@aztec/wallet-sdk": "4.2.0-aztecnr-rc.2",
36-
"@aztec/wallets": "4.2.0-aztecnr-rc.2",
37-
"@defi-wonderland/aztec-benchmark": "4.2.0-aztecnr-rc.2",
29+
"@aztec/accounts": "4.2.0",
30+
"@aztec/aztec.js": "4.2.0",
31+
"@aztec/noir-contracts.js": "4.2.0",
32+
"@aztec/protocol-contracts": "4.2.0",
33+
"@aztec/pxe": "4.2.0",
34+
"@aztec/stdlib": "4.2.0",
35+
"@aztec/wallet-sdk": "4.2.0",
36+
"@aztec/wallets": "4.2.0",
37+
"@defi-wonderland/aztec-benchmark": "4.2.0",
3838
"commander": "14.0.1",
3939
"dotenv": "16.4.7"
4040
},
@@ -50,7 +50,7 @@
5050
"vitest": "4.0.17"
5151
},
5252
"config": {
53-
"aztecVersion": "4.2.0-aztecnr-rc.2"
53+
"aztecVersion": "4.2.0"
5454
},
5555
"engines": {
5656
"node": ">=22"

scripts/deploy.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,12 @@ async function deployContract(
279279
wait: { waitForStatus: TxStatus.PROPOSED },
280280
});
281281
} catch (error: unknown) {
282-
const msg = error instanceof Error ? error.message : (error instanceof Object && 'cause' in error && error.cause instanceof Error ? error.cause.message : String(error));
282+
const msg =
283+
error instanceof Error
284+
? error.message
285+
: error instanceof Object && 'cause' in error && error.cause instanceof Error
286+
? error.cause.message
287+
: String(error);
283288
if (msg.includes('Existing nullifier')) {
284289
logger.info(`${label} already deployed (existing nullifier) at: ${instance.address.toString()}`);
285290
return { address: instance.address, status: 'existing' };
@@ -520,7 +525,9 @@ program
520525
.option('--dry-run', 'Show configuration without deploying')
521526
.option('--output <file>', 'Write deployment JSON to file')
522527
.addOption(
523-
new Option('-n, --network <network>', 'Target network').choices(['devnet', 'testnet', 'local-network']).default('devnet'),
528+
new Option('-n, --network <network>', 'Target network')
529+
.choices(['devnet', 'testnet', 'local-network'])
530+
.default('devnet'),
524531
)
525532
.action(async (options: CLIOptions) => {
526533
try {

src/dripper/Nargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ compiler_version = ">=1.0.0"
55
type = "contract"
66

77
[dependencies]
8-
aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v4.2.0-aztecnr-rc.2", directory = "noir-projects/aztec-nr/aztec" }
8+
aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v4.2.0", directory = "noir-projects/aztec-nr/aztec" }
99
token = { path = "../token_contract" }

src/escrow_contract/Nargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ compiler_version = ">=1.0.0"
55
type = "contract"
66

77
[dependencies]
8-
aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v4.2.0-aztecnr-rc.2", directory = "noir-projects/aztec-nr/aztec" }
9-
serde = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v4.2.0-aztecnr-rc.2", directory = "noir-projects/noir-protocol-circuits/crates/serde" }
8+
aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v4.2.0", directory = "noir-projects/aztec-nr/aztec" }
9+
serde = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v4.2.0", directory = "noir-projects/noir-protocol-circuits/crates/serde" }
1010
token = { path = "../token_contract" }
1111
nft = { path = "../nft_contract" }
12-
sha512 = { git = "https://github.com/noir-lang/sha512", tag = "master" } # TODO: pin to release tag/stable branch when available
13-
bignum = { git = "https://github.com/noir-lang/noir-bignum", tag = "v0.9.2" }
12+
sha512 = { git = "https://github.com/noir-lang/sha512", tag = "mv/use-bool-over-u1" }
13+
bignum = { git = "https://github.com/noir-lang/noir-bignum", tag = "v0.10.0" }

src/escrow_contract/src/key_derivation.nr

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ use bignum::U512;
33
use sha512::sha512;
44

55
use aztec::protocol::constants::{DOM_SEP__IVSK_M, DOM_SEP__NHK_M, DOM_SEP__OVSK_M, DOM_SEP__TSK_M};
6+
use aztec::protocol::point::Point;
67
use aztec::protocol::public_keys::{IvpkM, NpkM, OvpkM, PublicKeys, TpkM};
7-
use std::embedded_curve_ops::{EmbeddedCurvePoint, EmbeddedCurveScalar, fixed_base_scalar_mul};
8+
use std::embedded_curve_ops::{EmbeddedCurveScalar, fixed_base_scalar_mul};
89

910
pub use crate::types::master_secret_keys::MasterSecretKeys;
1011

@@ -140,10 +141,10 @@ pub fn derive_keys(secret_key: Field) -> MasterSecretKeys {
140141
/// @param master_secret_keys The master secret keys
141142
/// @return PublicKeys containing the derived public keys.
142143
pub fn master_secret_keys_to_public_keys(master_secret_keys: MasterSecretKeys) -> PublicKeys {
143-
let npk_m: EmbeddedCurvePoint = fixed_base_scalar_mul(master_secret_keys.nhk_m);
144-
let ivpk_m: EmbeddedCurvePoint = fixed_base_scalar_mul(master_secret_keys.ivsk_m);
145-
let ovpk_m: EmbeddedCurvePoint = fixed_base_scalar_mul(master_secret_keys.ovsk_m);
146-
let tpk_m: EmbeddedCurvePoint = fixed_base_scalar_mul(master_secret_keys.tsk_m);
144+
let npk_m: Point = fixed_base_scalar_mul(master_secret_keys.nhk_m).into();
145+
let ivpk_m: Point = fixed_base_scalar_mul(master_secret_keys.ivsk_m).into();
146+
let ovpk_m: Point = fixed_base_scalar_mul(master_secret_keys.ovsk_m).into();
147+
let tpk_m: Point = fixed_base_scalar_mul(master_secret_keys.tsk_m).into();
147148

148149
PublicKeys {
149150
npk_m: NpkM { inner: npk_m },

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ compiler_version = ">=1.0.0"
55
type = "contract"
66

77
[dependencies]
8-
aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v4.2.0-aztecnr-rc.2", directory = "noir-projects/aztec-nr/aztec" }
8+
aztec = { git = "https://github.com/AztecProtocol/aztec-packages/", tag = "v4.2.0", directory = "noir-projects/aztec-nr/aztec" }
99
escrow_contract = { path = "../../../" }
1010
token = { path = "../../../../token_contract" }
1111
nft = { path = "../../../../nft_contract" }

0 commit comments

Comments
 (0)