Merge pull request #8 from aztec-labs-eng/gj/fix_typecheck

Thunkar · web-flow · commit 45af90cc1d60 · 2026-05-20T15:38:32.000+01:00
test
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -158,6 +158,14 @@ jobs:
       # PRs → development. `vercel build` has no "development" target, so for
       # PR pulls we rename the dropped .env.development.local to .env.preview.local
       # so the subsequent preview build picks it up.
+      #
+      # We ALSO override Vercel's git ref detection for PR deploys. Without
+      # this, Vercel reads CI env vars on `pull_request_target` and decides
+      # the deployment's branch from the PR base (`next`), then routes the
+      # build through its `next`-branch preview alias and pulls Preview-scope
+      # env vars server-side — the very thing we're trying to avoid. Pinning
+      # `VERCEL_GIT_COMMIT_REF` to a per-PR string detaches the deployment
+      # from any branch alias and gives each PR its own unique preview URL.
       - name: Resolve Vercel environment slot
         run: |
           if [ "${{ github.event_name }}" == "push" ] && [ "${{ github.ref }}" == "refs/heads/main" ]; then
@@ -169,6 +177,10 @@ jobs:
           else
             echo "VERCEL_ENV_SLOT=development" >> "$GITHUB_ENV"
           fi
+          if [ "${{ github.event_name }}" == "pull_request_target" ]; then
+            echo "VERCEL_GIT_COMMIT_REF=pr-${{ github.event.pull_request.number }}" >> "$GITHUB_ENV"
+            echo "VERCEL_GIT_COMMIT_SHA=${{ github.event.pull_request.head.sha }}" >> "$GITHUB_ENV"
+          fi
 
       # ── Bridge deployment ──────────────────────────────────────────────
       - name: Pull Vercel Environment (Bridge)
diff --git a/apps/bridge/src/config/networks/nextnet.json b/apps/bridge/src/config/networks/nextnet.json
@@ -1,7 +1,7 @@
 {
   "id": "nextnet",
   "name": "Aztec Nextnet (Sepolia)",
-  "aztecNodeUrl": "https://aztec-nextnet.alexghr.me",
+  "aztecNodeUrl": "https://nextnet.aztec-labs.com",
   "l1RpcUrl": "https://sepolia.drpc.org",
   "l1ChainId": 11155111
 }
diff --git a/apps/bridge/vite.config.ts b/apps/bridge/vite.config.ts
@@ -28,6 +28,13 @@ export default defineConfig(({ mode }) => {
         ),
       },
     },
+    // Pin the port + fail rather than auto-bump. OPFS storage is keyed by
+    // origin (scheme+host+port); a drifting port means the wallet writes a
+    // sqlite OPFS file under :5173 one session and tries to read it under
+    // :5174 the next, ending up with stale or unreadable stores. `strictPort`
+    // makes Vite refuse to start on a taken port instead of silently picking
+    // another one.
+    server: { port: 5173, strictPort: true },
     plugins: [aztecVitePlugin(), react({ jsxImportSource: "@emotion/react" })],
     define: {
       "process.env": JSON.stringify({
diff --git a/apps/fpc-operator/src/components/SetupWizard.tsx b/apps/fpc-operator/src/components/SetupWizard.tsx
@@ -25,7 +25,7 @@ interface SetupWizardProps {
 }
 
 export function SetupWizard({ onComplete, onFpcAddressComputed }: SetupWizardProps) {
-  const { status, wallet, address, node } = useWallet();
+  const { status, wallet, address, node, error: walletError } = useWallet();
   const { activeNetwork } = useNetwork();
   const [activeStep, setActiveStep] = useState(0);
   const [fpcAddress, setFpcAddress] = useState<string | null>(null);
@@ -122,7 +122,26 @@ export function SetupWizard({ onComplete, onFpcAddressComputed }: SetupWizardPro
                 {status === "loading" ? "Creating embedded wallet..." : "Computing FPC address..."}
               </Typography>
             </Box>
-            {status === "error" && <Alert severity="error">Failed to initialize wallet</Alert>}
+            {status === "error" && (
+              <Alert severity="error">
+                Failed to initialize wallet
+                {walletError && (
+                  <Box
+                    component="pre"
+                    sx={{
+                      mt: 1,
+                      mb: 0,
+                      whiteSpace: "pre-wrap",
+                      wordBreak: "break-word",
+                      fontSize: "0.75rem",
+                      fontFamily: "monospace",
+                    }}
+                  >
+                    {walletError}
+                  </Box>
+                )}
+              </Alert>
+            )}
           </StepContent>
         </Step>
 
diff --git a/apps/fpc-operator/src/config/networks/nextnet.json b/apps/fpc-operator/src/config/networks/nextnet.json
@@ -1,7 +1,7 @@
 {
   "id": "nextnet",
   "name": "Aztec Nextnet (Sepolia)",
-  "aztecNodeUrl": "https://aztec-nextnet.alexghr.me",
+  "aztecNodeUrl": "https://nextnet.aztec-labs.com",
   "l1RpcUrl": "https://sepolia.drpc.org",
   "l1ChainId": 11155111
 }
diff --git a/apps/fpc-operator/vite.config.ts b/apps/fpc-operator/vite.config.ts
@@ -8,7 +8,13 @@ export default defineConfig(({ mode }) => {
   return {
     base: "./",
     logLevel: process.env.CI ? "error" : undefined,
-    server: { port: 5174 },
+    // Pin the port + fail rather than auto-bump. OPFS storage is keyed by
+    // origin (scheme+host+port); a drifting port means the wallet writes a
+    // sqlite OPFS file under :5174 one session and tries to read it under
+    // :5175 the next, ending up with stale or unreadable stores. `strictPort`
+    // makes Vite refuse to start on a taken port instead of silently picking
+    // another one.
+    server: { port: 5174, strictPort: true },
     resolve: {
       alias: {
         "@aztec-kit/embedded-wallet/ui": resolve(
diff --git a/apps/swap/scripts/register-fpc-signups.ts b/apps/swap/scripts/register-fpc-signups.ts
@@ -42,6 +42,7 @@ import {
   fetchFeeStats,
   computeMaxFeeFromP75,
   computeMaxFeeFromCurrent,
+  fetchMaxBlockGasFees,
 } from "@aztec-kit/common/fees";
 
 import {
@@ -62,12 +63,14 @@ import type { EmbeddedWallet } from "@aztec/wallets/embedded";
 const P75_BLOCK_RANGE = 2000;
 const P75_MULTIPLIER = 2;
 /**
- * Multiplier applied when we fall back to the node's current min fees (clustec
- * indexer unavailable). The P75 already accounts for historical spread so 2×
- * is enough; current min fees are the floor right now with no headroom, so we
- * need a much wider buffer. Matches the 10× used by the e2e local flow.
+ * Range and multiplier for the node-walked historical fallback used when no
+ * clustec indexer is available (e.g. nextnet). We take the `max` of
+ * `header.globalVariables.gasFees` across the last N blocks as a proxy for
+ * the worst-case `maxFeesPerGas` the wallet will commit. `× 2` matches the
+ * testnet P75 multiplier — start small, bump if the assertion still fires.
  */
-const CURRENT_FEE_FALLBACK_MULTIPLIER = 10;
+const HISTORICAL_BLOCK_RANGE = 1000;
+const HISTORICAL_FEE_MULTIPLIER = 2;
 
 /** Default sponsorship policy; individual specs can override any field. */
 const SIGNUP_POLICY = {
@@ -411,15 +414,18 @@ async function pickSignupParams(params: {
     } catch (err) {
       const reason = err instanceof Error ? err.message : String(err);
       console.error(
-        `  clustec P75 fetch failed (${reason}); falling back to node min fees × ${CURRENT_FEE_FALLBACK_MULTIPLIER}`,
+        `  clustec fetch failed (${reason}); falling back to node-walked max block gasFees over last ${HISTORICAL_BLOCK_RANGE} blocks × ${HISTORICAL_FEE_MULTIPLIER}`,
+      );
+      const peak = await fetchMaxBlockGasFees(node, HISTORICAL_BLOCK_RANGE);
+      console.error(
+        `  peak gasFees over blocks ${peak.fromBlock}..${peak.toBlock} (n=${peak.sampleSize}): feePerDaGas=${peak.feePerDaGas} feePerL2Gas=${peak.feePerL2Gas}`,
       );
-      const minFees = await node.getCurrentMinFees();
       maxFee = computeMaxFeeFromCurrent(
         subscribeGas,
         zeroTeardown,
-        BigInt(minFees.feePerDaGas),
-        BigInt(minFees.feePerL2Gas),
-        CURRENT_FEE_FALLBACK_MULTIPLIER,
+        peak.feePerDaGas,
+        peak.feePerL2Gas,
+        HISTORICAL_FEE_MULTIPLIER,
       );
     }
   }
diff --git a/apps/swap/src/config/networks/nextnet.json b/apps/swap/src/config/networks/nextnet.json
@@ -1,26 +1,26 @@
 {
   "id": "nextnet",
-  "nodeUrl": "https://aztec-nextnet.alexghr.me",
+  "nodeUrl": "https://nextnet.aztec-labs.com",
   "chainId": "11155111",
   "rollupVersion": "960120478",
   "contracts": {
-    "goCoin": "0x14845fb4ebed07e994f2e245ed945dcdf72dd1cf29188f047b1d65dbb02ac5c5",
-    "goCoinPremium": "0x24f7125f34ea6ec014a87ccdf40317fe0df0983d7499f91a024f6f655b232cce",
-    "amm": "0x018d8e0f8ff1e173b754a4e987b5ba31f99302157197fb196110f032ae20189a",
-    "liquidityToken": "0x2c0f747dca1b89aaa37ac38ff506f8f56832f405cce941372d639a7f569bd3e5",
-    "pop": "0x09c264ef8a38484646049258f1010ef25cc00856d347d08445432600ffc15cd0",
+    "goCoin": "0x2176092c60b28822d821aae00b6a9c452d12684bc8585c9d12255260e33a2d93",
+    "goCoinPremium": "0x0f9a9271ec8a5a9f9d2adfc443d09701f2de9066c92c4935347ea5db973d79e2",
+    "amm": "0x204d93123d73aa464511f81392f708614a7ccdb6fdf602d0a0f4006bc163c2dd",
+    "liquidityToken": "0x2db813553ef42d961a7cffd011f9b7976cbcf597d576e4260d7d8cc6a0627de4",
+    "pop": "0x1878d43be1109f18345a648763eda61669938a8be2965f693258efa9aae148a2",
     "sponsoredFPC": "0x1114a201e7b0680b2b75bc47be3abebbc54caf83f471e12b66c8a1abfa4478dd",
-    "salt": "0x0000000000000000000000000000000000000000000000000000000000000000"
+    "salt": "0x000000000000000000000000000000000000000000000000000000000000007b"
   },
   "deployer": {
-    "address": "0x092c879b37132316e01570ee32911e17c543d48c2e3d9eca5e7a1fea4846a7da"
+    "address": "0x255d5ebb7dc80fa97a9849935852de9d9984bca5e53a69ba9439b5ebe925f875"
   },
-  "deployedAt": "2026-05-19T09:06:49.754Z",
+  "deployedAt": "2026-05-20T13:27:46.845Z",
   "subscriptionFPC": {
-    "address": "0x0b70cef299b052b950147adeafbabd3d9e30835bdec28428812eed6f3cc2aa25",
+    "address": "0x041f6084335f0e0c0849d6e32ab0b051c0599a9c5e4752a9b622ac500e396df8",
     "secretKey": "0x000000000000000000000000000000000000000000000000000000000000002c",
     "functions": {
-      "0x09c264ef8a38484646049258f1010ef25cc00856d347d08445432600ffc15cd0": {
+      "0x1878d43be1109f18345a648763eda61669938a8be2965f693258efa9aae148a2": {
         "0xa539bd29": {
           "configIndex": 0,
           "gasLimits": {
@@ -30,7 +30,7 @@
           "hasPublicCall": true
         }
       },
-      "0x018d8e0f8ff1e173b754a4e987b5ba31f99302157197fb196110f032ae20189a": {
+      "0x204d93123d73aa464511f81392f708614a7ccdb6fdf602d0a0f4006bc163c2dd": {
         "0xfd228669": {
           "configIndex": 0,
           "gasLimits": {
@@ -40,7 +40,7 @@
           "hasPublicCall": true
         }
       },
-      "0x14845fb4ebed07e994f2e245ed945dcdf72dd1cf29188f047b1d65dbb02ac5c5": {
+      "0x2176092c60b28822d821aae00b6a9c452d12684bc8585c9d12255260e33a2d93": {
         "0x859e4f61": {
           "configIndex": 0,
           "gasLimits": {
@@ -50,7 +50,7 @@
           "hasPublicCall": false
         }
       },
-      "0x24f7125f34ea6ec014a87ccdf40317fe0df0983d7499f91a024f6f655b232cce": {
+      "0x0f9a9271ec8a5a9f9d2adfc443d09701f2de9066c92c4935347ea5db973d79e2": {
         "0x859e4f61": {
           "configIndex": 0,
           "gasLimits": {
diff --git a/apps/swap/vite.config.ts b/apps/swap/vite.config.ts
@@ -69,6 +69,13 @@ export default defineConfig(({ command, mode }) => {
         ),
       },
     },
+    // Pin the port + fail rather than auto-bump. OPFS storage is keyed by
+    // origin (scheme+host+port); a drifting port means the wallet writes a
+    // sqlite OPFS file under :5175 one session and tries to read it under
+    // :5176 the next, ending up with stale or unreadable stores. `strictPort`
+    // makes Vite refuse to start on a taken port instead of silently picking
+    // another one.
+    server: { port: 5175, strictPort: true },
     plugins: [
       aztecVitePlugin({ es2016: isDev }),
       react({ jsxImportSource: "@emotion/react" }),
diff --git a/packages/common/src/fees/fetchMaxBlockGasFees.ts b/packages/common/src/fees/fetchMaxBlockGasFees.ts
@@ -0,0 +1,55 @@
+/**
+ * Historical block-base-fee aggregator for networks without a clustec
+ * indexer (e.g. nextnet). Walks the last `blocks` block headers from the
+ * node and returns the highest per-gas fees observed across the window.
+ *
+ * Why max instead of a percentile: the wallet at runtime commits
+ * `predicted(Limit) × 1.5` as its `maxFeesPerGas`. The protocol's predicted
+ * value tracks current activity, so a long-running app's worst-case
+ * commit is bounded by the historical peak base fee × (predicted/base
+ * ratio ≈ 1.15) × 1.5. Using the observed `max` here gives the FPC's
+ * `max_fee` calibration a stable upper bound that survives quiet
+ * periods, when a snapshot-based calibration would otherwise lock in a
+ * floor value and reject any subsequent busy-slot tx.
+ *
+ * Cheap: the node caps `getBlocks` at 50 per call, so 1000 blocks = 20
+ * RPC round-trips. Headers only, no tx bodies.
+ */
+
+import type { AztecNode } from "@aztec/aztec.js/node";
+import { BlockNumber } from "@aztec/foundation/branded-types";
+
+export interface PeakGasFees {
+  feePerDaGas: bigint;
+  feePerL2Gas: bigint;
+  /** Block range actually walked (clamped to chain tip). */
+  fromBlock: number;
+  toBlock: number;
+  /** Number of blocks read. */
+  sampleSize: number;
+}
+
+const NODE_GET_BLOCKS_LIMIT = 50;
+
+export async function fetchMaxBlockGasFees(node: AztecNode, blocks: number): Promise<PeakGasFees> {
+  const tip = await node.getBlockNumber();
+  const fromBlock = Math.max(1, tip - blocks + 1);
+  const toBlock = tip;
+
+  let maxDa = 0n;
+  let maxL2 = 0n;
+  let sampleSize = 0;
+
+  for (let start = fromBlock; start <= toBlock; start += NODE_GET_BLOCKS_LIMIT) {
+    const limit = Math.min(NODE_GET_BLOCKS_LIMIT, toBlock - start + 1);
+    const batch = await node.getBlocks(BlockNumber(start), limit);
+    for (const block of batch) {
+      const fees = block.header.globalVariables.gasFees;
+      if (fees.feePerDaGas > maxDa) maxDa = fees.feePerDaGas;
+      if (fees.feePerL2Gas > maxL2) maxL2 = fees.feePerL2Gas;
+      sampleSize += 1;
+    }
+  }
+
+  return { feePerDaGas: maxDa, feePerL2Gas: maxL2, fromBlock, toBlock, sampleSize };
+}
diff --git a/packages/common/src/fees/index.ts b/packages/common/src/fees/index.ts
@@ -1,3 +1,4 @@
 export { fetchFeeStats, type FeeStats } from "./fetchFeeStats.ts";
 export { computeMaxFeeFromP75, type GasLimits } from "./computeMaxFeeFromP75.ts";
 export { computeMaxFeeFromCurrent } from "./computeMaxFeeFromCurrent.ts";
+export { fetchMaxBlockGasFees, type PeakGasFees } from "./fetchMaxBlockGasFees.ts";
diff --git a/packages/common/src/testing/network-config.ts b/packages/common/src/testing/network-config.ts
@@ -9,7 +9,7 @@ export type NetworkName = (typeof VALID_NETWORKS)[number];
 export const NETWORK_URLS: Record<NetworkName, string> = {
   local: "http://localhost:8080",
   testnet: "https://rpc.testnet.aztec-labs.com",
-  nextnet: "https://aztec-nextnet.alexghr.me",
+  nextnet: "https://nextnet.aztec-labs.com",
 };
 
 /** L1 parameters the bridging scripts need. Keep in sync with the rollup. */
diff --git a/packages/common/src/vite/aztecVitePlugin.ts b/packages/common/src/vite/aztecVitePlugin.ts
@@ -124,7 +124,10 @@ export function aztecVitePlugin(options: AztecVitePluginOptions = {}): Plugin[]
     },
   };
 
-  const plugins: Plugin[] = [configPlugin, nodePolyfillsFix({ include: ["buffer", "path"] })];
+  const plugins: Plugin[] = [
+    configPlugin,
+    nodePolyfillsFix({ include: ["buffer", "path", "tty"] }),
+  ];
 
   if (isLegacyVite) {
     plugins.push(wasmContentTypePlugin());
diff --git a/packages/contracts/aztec/package.json b/packages/contracts/aztec/package.json
@@ -22,7 +22,7 @@
     "dist"
   ],
   "scripts": {
-    "clean": "rm -rf ./dist ./noir/artifacts ./noir/target",
+    "clean": "rm -rf ./dist ./noir/artifacts ./noir/target ./noir/codegenCache.json",
     "compile": "cd noir && aztec compile",
     "codegen": "cd noir && aztec codegen ./target -o artifacts",
     "build": "yarn compile && yarn codegen && tsc -p tsconfig.build.json && mkdir -p dist/noir/target && cp noir/target/*.json dist/noir/target/",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"id": "nextnet",`
`3`	`3`	`"name": "Aztec Nextnet (Sepolia)",`
`4`		`- "aztecNodeUrl": "https://aztec-nextnet.alexghr.me",`
	`4`	`+ "aztecNodeUrl": "https://nextnet.aztec-labs.com",`
`5`	`5`	`"l1RpcUrl": "https://sepolia.drpc.org",`
`6`	`6`	`"l1ChainId": 11155111`
`7`	`7`	`}`