Skip to content

Commit fc95e59

Browse files
ThunkarThunkar
authored
Merge pull request #10 from aztec-labs-eng/gj/update_nightly
update
2 parents 45af90c + 7c41ee2 commit fc95e59

27 files changed

Lines changed: 880 additions & 812 deletions

File tree

‎apps/bridge/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
"@aztec-kit/common": "workspace:*",
1616
"@aztec-kit/contracts-ethereum": "workspace:*",
1717
"@aztec-kit/embedded-wallet": "workspace:*",
18-
"@aztec/aztec.js": "v5.0.0-nightly.20260518",
19-
"@aztec/entrypoints": "v5.0.0-nightly.20260518",
20-
"@aztec/foundation": "v5.0.0-nightly.20260518",
21-
"@aztec/stdlib": "v5.0.0-nightly.20260518",
22-
"@aztec/wallet-sdk": "v5.0.0-nightly.20260518",
18+
"@aztec/aztec.js": "v5.0.0-nightly.20260521",
19+
"@aztec/entrypoints": "v5.0.0-nightly.20260521",
20+
"@aztec/foundation": "v5.0.0-nightly.20260521",
21+
"@aztec/stdlib": "v5.0.0-nightly.20260521",
22+
"@aztec/wallet-sdk": "v5.0.0-nightly.20260521",
2323
"@emotion/react": "^11.14.0",
2424
"@emotion/styled": "^11.14.0",
2525
"@mui/icons-material": "^6.3.1",
@@ -29,7 +29,7 @@
2929
"viem": "^2.23.0"
3030
},
3131
"devDependencies": {
32-
"@aztec/wallets": "v5.0.0-nightly.20260518",
32+
"@aztec/wallets": "v5.0.0-nightly.20260521",
3333
"@types/react": "^19.0.6",
3434
"@types/react-dom": "^19.0.3",
3535
"@vitejs/plugin-react": "^6.0.1",

‎apps/fpc-operator/package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
"@aztec-kit/common": "workspace:*",
2222
"@aztec-kit/contracts-aztec": "workspace:*",
2323
"@aztec-kit/embedded-wallet": "workspace:*",
24-
"@aztec/aztec.js": "v5.0.0-nightly.20260518",
25-
"@aztec/entrypoints": "v5.0.0-nightly.20260518",
26-
"@aztec/foundation": "v5.0.0-nightly.20260518",
27-
"@aztec/l1-artifacts": "v5.0.0-nightly.20260518",
28-
"@aztec/stdlib": "v5.0.0-nightly.20260518",
29-
"@aztec/wallet-sdk": "v5.0.0-nightly.20260518",
24+
"@aztec/aztec.js": "v5.0.0-nightly.20260521",
25+
"@aztec/entrypoints": "v5.0.0-nightly.20260521",
26+
"@aztec/foundation": "v5.0.0-nightly.20260521",
27+
"@aztec/l1-artifacts": "v5.0.0-nightly.20260521",
28+
"@aztec/stdlib": "v5.0.0-nightly.20260521",
29+
"@aztec/wallet-sdk": "v5.0.0-nightly.20260521",
3030
"@emotion/react": "^11.14.0",
3131
"@emotion/styled": "^11.14.0",
3232
"@mui/icons-material": "^6.3.1",
@@ -37,12 +37,12 @@
3737
"viem": "^2.23.0"
3838
},
3939
"devDependencies": {
40-
"@aztec/accounts": "v5.0.0-nightly.20260518",
41-
"@aztec/aztec-node": "v5.0.0-nightly.20260518",
42-
"@aztec/constants": "v5.0.0-nightly.20260518",
43-
"@aztec/noir-contracts.js": "v5.0.0-nightly.20260518",
44-
"@aztec/pxe": "v5.0.0-nightly.20260518",
45-
"@aztec/wallets": "v5.0.0-nightly.20260518",
40+
"@aztec/accounts": "v5.0.0-nightly.20260521",
41+
"@aztec/aztec-node": "v5.0.0-nightly.20260521",
42+
"@aztec/constants": "v5.0.0-nightly.20260521",
43+
"@aztec/noir-contracts.js": "v5.0.0-nightly.20260521",
44+
"@aztec/pxe": "v5.0.0-nightly.20260521",
45+
"@aztec/wallets": "v5.0.0-nightly.20260521",
4646
"@types/react": "^19.0.6",
4747
"@types/react-dom": "^19.0.3",
4848
"@vitejs/plugin-react": "^6.0.1",

‎apps/fpc-operator/scripts/deploy-fpc.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import {
3636
resolveFpcAdminBackupPath,
3737
} from "@aztec-kit/common/testing";
3838
import { deriveKeys } from "@aztec/stdlib/keys";
39+
import { TxStatus } from "@aztec/stdlib/tx";
3940

4041
const FUND_AMOUNT: bigint = BigInt("1000000000000000000000"); // 1000 FJ
4142

@@ -85,7 +86,10 @@ async function main() {
8586
await deployMethod.send({
8687
from: admin,
8788
fee: { paymentMethod },
88-
wait: { timeout: 120 },
89+
// Pin PROPOSED — upstream's EmbeddedWallet default-to-PROPOSED is dead
90+
// code (mutates a local that's never forwarded), so `waitForTx` falls
91+
// back to CHECKPOINTED unless we set it explicitly.
92+
wait: { waitForStatus: TxStatus.PROPOSED, timeout: 120 },
8993
});
9094
console.error(`FPC deployed at ${fpcAddress.toString()}`);
9195

‎apps/swap/package.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@
2727
"@aztec-kit/common": "workspace:*",
2828
"@aztec-kit/contracts-aztec": "workspace:*",
2929
"@aztec-kit/embedded-wallet": "workspace:*",
30-
"@aztec/accounts": "v5.0.0-nightly.20260518",
31-
"@aztec/aztec.js": "v5.0.0-nightly.20260518",
32-
"@aztec/constants": "v5.0.0-nightly.20260518",
33-
"@aztec/entrypoints": "v5.0.0-nightly.20260518",
34-
"@aztec/ethereum": "v5.0.0-nightly.20260518",
35-
"@aztec/foundation": "v5.0.0-nightly.20260518",
36-
"@aztec/noir-contracts.js": "v5.0.0-nightly.20260518",
37-
"@aztec/protocol-contracts": "v5.0.0-nightly.20260518",
38-
"@aztec/pxe": "v5.0.0-nightly.20260518",
39-
"@aztec/stdlib": "v5.0.0-nightly.20260518",
40-
"@aztec/wallet-sdk": "v5.0.0-nightly.20260518",
41-
"@aztec/wallets": "v5.0.0-nightly.20260518",
30+
"@aztec/accounts": "v5.0.0-nightly.20260521",
31+
"@aztec/aztec.js": "v5.0.0-nightly.20260521",
32+
"@aztec/constants": "v5.0.0-nightly.20260521",
33+
"@aztec/entrypoints": "v5.0.0-nightly.20260521",
34+
"@aztec/ethereum": "v5.0.0-nightly.20260521",
35+
"@aztec/foundation": "v5.0.0-nightly.20260521",
36+
"@aztec/noir-contracts.js": "v5.0.0-nightly.20260521",
37+
"@aztec/protocol-contracts": "v5.0.0-nightly.20260521",
38+
"@aztec/pxe": "v5.0.0-nightly.20260521",
39+
"@aztec/stdlib": "v5.0.0-nightly.20260521",
40+
"@aztec/wallet-sdk": "v5.0.0-nightly.20260521",
41+
"@aztec/wallets": "v5.0.0-nightly.20260521",
4242
"@emotion/react": "^11.14.0",
4343
"@emotion/styled": "^11.14.0",
4444
"@mui/icons-material": "^6.3.1",
@@ -53,7 +53,7 @@
5353
"zone.js": "^0.16.1"
5454
},
5555
"devDependencies": {
56-
"@aztec/aztec": "v5.0.0-nightly.20260518",
56+
"@aztec/aztec": "v5.0.0-nightly.20260521",
5757
"@types/buffer-json": "^2",
5858
"@types/node": "^22.15.17",
5959
"@types/react": "^19.0.6",

‎apps/swap/scripts/mint.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import path from "path";
1313
import { AztecAddress } from "@aztec/stdlib/aztec-address";
1414
import { TokenContract, TokenContractArtifact } from "@aztec-kit/contracts-aztec/artifacts/Token";
1515
import { BatchCall } from "@aztec/aztec.js/contracts";
16+
import { TxStatus } from "@aztec/stdlib/tx";
1617
import {
1718
parseNetwork,
1819
parseAddressList,
@@ -103,7 +104,10 @@ async function main() {
103104
await new BatchCall(wallet, mintCalls).send({
104105
from: deployer,
105106
fee: { paymentMethod },
106-
wait: { timeout: 120 },
107+
// Pin PROPOSED — upstream's EmbeddedWallet default-to-PROPOSED is dead
108+
// code (mutates a local that's never forwarded), so `waitForTx` falls
109+
// back to CHECKPOINTED unless we set it explicitly.
110+
wait: { waitForStatus: TxStatus.PROPOSED, timeout: 120 },
107111
});
108112

109113
console.log("Done! Tokens minted successfully.");

‎apps/swap/scripts/register-fpc-signups.ts‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import { Contract } from "@aztec/aztec.js/contracts";
2929
import { AztecAddress } from "@aztec/stdlib/aztec-address";
3030
import { FunctionSelector } from "@aztec/stdlib/abi";
3131
import { Fr } from "@aztec/foundation/curves/bn254";
32+
import { TxStatus } from "@aztec/stdlib/tx";
3233
import {
3334
SubscriptionFPCContract,
3435
SubscriptionFPCContractArtifact,
@@ -217,7 +218,14 @@ async function main() {
217218
maxFee,
218219
signup.maxUsers,
219220
)
220-
.send({ from: admin, fee: { paymentMethod } });
221+
.send({
222+
from: admin,
223+
fee: { paymentMethod },
224+
// Upstream `EmbeddedWallet.sendTx`'s "default to PROPOSED" is a dead
225+
// mutation; `waitForTx` falls back to CHECKPOINTED otherwise. Pin
226+
// explicitly so scripts don't block on L1 publication.
227+
wait: { waitForStatus: TxStatus.PROPOSED, timeout: 120 },
228+
});
221229

222230
console.error(
223231
` sign_up ok — maxFee=${maxFee} gasLimits=${gasLimits.daGas}/${gasLimits.l2Gas} hasPublicCall=${hasPublicCall}`,

‎apps/swap/src/config/networks/nextnet.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22
"id": "nextnet",
33
"nodeUrl": "https://nextnet.aztec-labs.com",
44
"chainId": "11155111",
5-
"rollupVersion": "960120478",
5+
"rollupVersion": "1586469113",
66
"contracts": {
7-
"goCoin": "0x2176092c60b28822d821aae00b6a9c452d12684bc8585c9d12255260e33a2d93",
8-
"goCoinPremium": "0x0f9a9271ec8a5a9f9d2adfc443d09701f2de9066c92c4935347ea5db973d79e2",
9-
"amm": "0x204d93123d73aa464511f81392f708614a7ccdb6fdf602d0a0f4006bc163c2dd",
10-
"liquidityToken": "0x2db813553ef42d961a7cffd011f9b7976cbcf597d576e4260d7d8cc6a0627de4",
11-
"pop": "0x1878d43be1109f18345a648763eda61669938a8be2965f693258efa9aae148a2",
12-
"sponsoredFPC": "0x1114a201e7b0680b2b75bc47be3abebbc54caf83f471e12b66c8a1abfa4478dd",
13-
"salt": "0x000000000000000000000000000000000000000000000000000000000000007b"
7+
"goCoin": "0x2274eb5f8280d559f4bd1086029110bb77cd0d9365173ef026431adacd86c609",
8+
"goCoinPremium": "0x0daa2684935ab22b9214c1e1050d612963f0d228960ee925f975eb6a6bcd7b16",
9+
"amm": "0x1753d856aa7e517d7c9286269660638fd3039cfd00125e0a90bb8266d731218d",
10+
"liquidityToken": "0x0e802ce4e0a028c7e437f863e42aabebe540f2b281105677219a35c56c774219",
11+
"pop": "0x299b83f58b9ac540ef4afd363581096d5b1398ca6ca2dfdc243527ff5a00f1ca",
12+
"sponsoredFPC": "0x2d56ea2d46f98df04122c6b924a0d47e17bc4af98fa4617c617875c1364b3a9e",
13+
"salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
1414
},
1515
"deployer": {
16-
"address": "0x255d5ebb7dc80fa97a9849935852de9d9984bca5e53a69ba9439b5ebe925f875"
16+
"address": "0x0e062b1527e0e85c703655cf2208d372cfee1966b1187cdfe1568dab86565030"
1717
},
18-
"deployedAt": "2026-05-20T13:27:46.845Z",
18+
"deployedAt": "2026-05-21T10:45:10.326Z",
1919
"subscriptionFPC": {
20-
"address": "0x041f6084335f0e0c0849d6e32ab0b051c0599a9c5e4752a9b622ac500e396df8",
20+
"address": "0x0d00974052dd4b6f1d71628b3059331254f7b94765264896cd625f7100adac25",
2121
"secretKey": "0x000000000000000000000000000000000000000000000000000000000000002c",
2222
"functions": {
23-
"0x1878d43be1109f18345a648763eda61669938a8be2965f693258efa9aae148a2": {
23+
"0x299b83f58b9ac540ef4afd363581096d5b1398ca6ca2dfdc243527ff5a00f1ca": {
2424
"0xa539bd29": {
2525
"configIndex": 0,
2626
"gasLimits": {
@@ -30,7 +30,7 @@
3030
"hasPublicCall": true
3131
}
3232
},
33-
"0x204d93123d73aa464511f81392f708614a7ccdb6fdf602d0a0f4006bc163c2dd": {
33+
"0x1753d856aa7e517d7c9286269660638fd3039cfd00125e0a90bb8266d731218d": {
3434
"0xfd228669": {
3535
"configIndex": 0,
3636
"gasLimits": {
@@ -40,7 +40,7 @@
4040
"hasPublicCall": true
4141
}
4242
},
43-
"0x2176092c60b28822d821aae00b6a9c452d12684bc8585c9d12255260e33a2d93": {
43+
"0x2274eb5f8280d559f4bd1086029110bb77cd0d9365173ef026431adacd86c609": {
4444
"0x859e4f61": {
4545
"configIndex": 0,
4646
"gasLimits": {
@@ -50,7 +50,7 @@
5050
"hasPublicCall": false
5151
}
5252
},
53-
"0x0f9a9271ec8a5a9f9d2adfc443d09701f2de9066c92c4935347ea5db973d79e2": {
53+
"0x0daa2684935ab22b9214c1e1050d612963f0d228960ee925f975eb6a6bcd7b16": {
5454
"0x859e4f61": {
5555
"configIndex": 0,
5656
"gasLimits": {

‎e2e/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@aztec-kit/common": "workspace:*",
1818
"@aztec-kit/contracts-aztec": "workspace:*",
1919
"@aztec-kit/contracts-ethereum": "workspace:*",
20-
"@aztec/aztec.js": "v5.0.0-nightly.20260518"
20+
"@aztec/aztec.js": "v5.0.0-nightly.20260521"
2121
},
2222
"devDependencies": {
2323
"@playwright/test": "^1.49.0",

‎packages/common/package.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,21 @@
2828
}
2929
},
3030
"dependencies": {
31-
"@aztec/accounts": "v5.0.0-nightly.20260518",
32-
"@aztec/aztec": "v5.0.0-nightly.20260518",
33-
"@aztec/aztec-node": "v5.0.0-nightly.20260518",
34-
"@aztec/aztec.js": "v5.0.0-nightly.20260518",
35-
"@aztec/constants": "v5.0.0-nightly.20260518",
36-
"@aztec/ethereum": "v5.0.0-nightly.20260518",
37-
"@aztec/foundation": "v5.0.0-nightly.20260518",
38-
"@aztec/noir-contracts.js": "v5.0.0-nightly.20260518",
39-
"@aztec/noir-protocol-circuits-types": "v5.0.0-nightly.20260518",
40-
"@aztec/protocol-contracts": "v5.0.0-nightly.20260518",
41-
"@aztec/pxe": "v5.0.0-nightly.20260518",
42-
"@aztec/stdlib": "v5.0.0-nightly.20260518",
43-
"@aztec/telemetry-client": "v5.0.0-nightly.20260518",
44-
"@aztec/wallets": "v5.0.0-nightly.20260518",
45-
"@aztec/world-state": "v5.0.0-nightly.20260518",
31+
"@aztec/accounts": "v5.0.0-nightly.20260521",
32+
"@aztec/aztec": "v5.0.0-nightly.20260521",
33+
"@aztec/aztec-node": "v5.0.0-nightly.20260521",
34+
"@aztec/aztec.js": "v5.0.0-nightly.20260521",
35+
"@aztec/constants": "v5.0.0-nightly.20260521",
36+
"@aztec/ethereum": "v5.0.0-nightly.20260521",
37+
"@aztec/foundation": "v5.0.0-nightly.20260521",
38+
"@aztec/noir-contracts.js": "v5.0.0-nightly.20260521",
39+
"@aztec/noir-protocol-circuits-types": "v5.0.0-nightly.20260521",
40+
"@aztec/protocol-contracts": "v5.0.0-nightly.20260521",
41+
"@aztec/pxe": "v5.0.0-nightly.20260521",
42+
"@aztec/stdlib": "v5.0.0-nightly.20260521",
43+
"@aztec/telemetry-client": "v5.0.0-nightly.20260521",
44+
"@aztec/wallets": "v5.0.0-nightly.20260521",
45+
"@aztec/world-state": "v5.0.0-nightly.20260521",
4646
"viem": "^2.21.0"
4747
},
4848
"devDependencies": {

‎packages/common/src/bridging/index.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import type { AztecAddress } from "@aztec/aztec.js/addresses";
77
import type { EmbeddedWallet } from "@aztec/wallets/embedded";
88
import { FeeJuiceContract } from "@aztec/aztec.js/protocol";
99
import { Fr } from "@aztec/foundation/curves/bn254";
10+
import { TxStatus } from "@aztec/stdlib/tx";
1011
import type { Hex } from "viem";
1112

1213
import { bridgeFeeJuice, waitForL1ToL2Message } from "./utils.ts";
@@ -106,6 +107,10 @@ export async function bridgeAndClaim(params: BridgeAndClaimParams): Promise<Brid
106107
.send({
107108
from: params.claimFrom,
108109
...(params.claimFeeOpts ? { fee: params.claimFeeOpts } : {}),
110+
// Pin PROPOSED — upstream's EmbeddedWallet default-to-PROPOSED is dead
111+
// code (mutates a local that's never forwarded), so `waitForTx` falls
112+
// back to CHECKPOINTED unless we set it explicitly.
113+
wait: { waitForStatus: TxStatus.PROPOSED, timeout: 120 },
109114
} as Parameters<ReturnType<typeof feeJuice.methods.claim>["send"]>[0]);
110115

111116
return { amount: BigInt(claim.claimAmount), l1Address, minted };

0 commit comments

Comments
 (0)