feat: Lazy wasm pt4

barretenberg/ts/src/barretenberg/blake2s.test.ts

@@ -41,7 +41,7 @@ describe('blake2s sync', () => {
   let api: BarretenbergSync;
 
   beforeAll(async () => {
-    api = await BarretenbergSync.new();
+    api = await BarretenbergSync.initSingleton();
   });
 
   it('blake2s', () => {

barretenberg/ts/src/barretenberg/index.ts

@@ -89,26 +89,28 @@ export class Barretenberg extends BarretenbergApi {
   }
 }
 
+let barrentenbergSyncSingletonPromise: Promise<BarretenbergSync>;
 let barretenbergSyncSingleton: BarretenbergSync;
-let barretenbergSyncSingletonPromise: Promise<BarretenbergSync>;
 
 export class BarretenbergSync extends BarretenbergApiSync {
   private constructor(wasm: BarretenbergWasmMain) {
     super(wasm);
   }
 
-  static async new() {
+  private static async new() {
     const wasm = new BarretenbergWasmMain();
     const { module, threads } = await fetchModuleAndThreads(1);
     await wasm.init(module, threads);
     return new BarretenbergSync(wasm);
   }
 
-  static initSingleton() {
-    if (!barretenbergSyncSingletonPromise) {
-      barretenbergSyncSingletonPromise = BarretenbergSync.new().then(s => (barretenbergSyncSingleton = s));
+  static async initSingleton() {
+    if (!barrentenbergSyncSingletonPromise) {
+      barrentenbergSyncSingletonPromise = BarretenbergSync.new();
     }
-    return barretenbergSyncSingletonPromise;
+
+    barretenbergSyncSingleton = await barrentenbergSyncSingletonPromise;
+    return barretenbergSyncSingleton;
   }
 
   static getSingleton() {
@@ -122,35 +124,3 @@ export class BarretenbergSync extends BarretenbergApiSync {
     return this.wasm;
   }
 }
-
-let barrentenbergLazySingleton: BarretenbergLazy;
-
-export class BarretenbergLazy extends BarretenbergApi {
-  private constructor(wasm: BarretenbergWasmMain) {
-    super(wasm);
-  }
-
-  private static async new() {
-    const wasm = new BarretenbergWasmMain();
-    const { module, threads } = await fetchModuleAndThreads(1);
-    await wasm.init(module, threads);
-    return new BarretenbergLazy(wasm);
-  }
-
-  static async getSingleton() {
-    if (!barrentenbergLazySingleton) {
-      barrentenbergLazySingleton = await BarretenbergLazy.new();
-    }
-    return barrentenbergLazySingleton;
-  }
-
-  getWasm() {
-    return this.wasm;
-  }
-}
-
-// If we're in ESM environment, use top level await. CJS users need to call it manually.
-// Need to ignore for cjs build.
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-await BarretenbergSync.initSingleton(); // POSTPROCESS ESM ONLY

barretenberg/ts/src/barretenberg/pedersen.test.ts

@@ -6,7 +6,7 @@ describe('pedersen sync', () => {
   let api: BarretenbergSync;
 
   beforeAll(async () => {
-    api = await BarretenbergSync.new();
+    api = await BarretenbergSync.initSingleton();
   });
 
   it('pedersenHash', () => {

barretenberg/ts/src/barretenberg/poseidon.test.ts

@@ -6,7 +6,7 @@ describe('poseidon sync', () => {
   let api: BarretenbergSync;
 
   beforeAll(async () => {
-    api = await BarretenbergSync.new();
+    api = await BarretenbergSync.initSingleton();
   });
 
   it('poseidonHash', () => {

barretenberg/ts/src/barretenberg_api/index.ts

@@ -76,6 +76,18 @@ export class BarretenbergApi {
     return out[0];
   }
 
+  async poseidon2HashAccumulate(inputsBuffer: Fr[]): Promise<Fr> {
+    const inArgs = [inputsBuffer].map(serializeBufferable);
+    const outTypes: OutputType[] = [Fr];
+    const result = await this.wasm.callWasmExport(
+      'poseidon2_hash_accumulate',
+      inArgs,
+      outTypes.map(t => t.SIZE_IN_BYTES),
+    );
+    const out = result.map((r, i) => outTypes[i].fromBuffer(r));
+    return out[0];
+  }
+
   async poseidon2Hashes(inputsBuffer: Fr[]): Promise<Fr> {
     const inArgs = [inputsBuffer].map(serializeBufferable);
     const outTypes: OutputType[] = [Fr];

barretenberg/ts/src/barretenberg_wasm/fetch_code/browser/index.ts

@@ -1,12 +1,9 @@
 import barretenbergModule from '../../barretenberg.wasm.gz';
 import barretenbergThreadsModule from '../../barretenberg-threads.wasm.gz';
-import pako from 'pako';
 
 // Annoyingly the wasm declares if it's memory is shared or not. So now we need two wasms if we want to be
 // able to fallback on "non shared memory" situations.
 export async function fetchCode(multithreaded: boolean) {
   const res = await fetch(multithreaded ? barretenbergThreadsModule : barretenbergModule);
-  const compressedData = await res.arrayBuffer();
-  const decompressedData = pako.ungzip(new Uint8Array(compressedData));
-  return decompressedData.buffer;
+  return res.arrayBuffer();
 }

barretenberg/ts/src/index.ts

@@ -3,11 +3,11 @@ export {
   BackendOptions,
   Barretenberg,
   BarretenbergSync,
-  BarretenbergLazy,
   BarretenbergVerifier,
   UltraPlonkBackend,
   UltraHonkBackend,
   AztecClientBackend,
 } from './barretenberg/index.js';
+
 export { RawBuffer, Fr } from './types/index.js';
 export { splitHonkProof, reconstructHonkProof, ProofData } from './proof/index.js';

barretenberg/ts/tsconfig.browser.json

@@ -4,5 +4,5 @@
     "outDir": "dest/browser",
     "tsBuildInfoFile": ".tsbuildinfo.browser"
   },
-  "include": ["src", "src/barretenberg_wasm/barretenberg_wasm_thread/factory/browser/thread.worker.ts"]
+  "include": ["!src/main.ts", "src", "src/barretenberg_wasm/barretenberg_wasm_thread/factory/browser/thread.worker.ts"]
 }

barretenberg/ts/webpack.config.js

@@ -17,7 +17,7 @@ export default {
     rules: [
       {
         test: /\.wasm\.gz$/,
-        type: 'asset/inline',
+        type: 'asset/resource'
       },
       {
         test: /\.worker\.ts$/,

gaztec/package.json

@@ -43,6 +43,7 @@
     "typescript": "~5.7.3",
     "typescript-eslint": "^8.11.0",
     "vite": "^6.0.7",
-    "vite-plugin-node-polyfills": "^0.22.0"
+    "vite-plugin-node-polyfills": "^0.22.0",
+    "vite-plugin-static-copy": "^2.2.0"
   }
 }

gaztec/src/App.tsx

@@ -1,13 +1,18 @@
-import { Home } from "./components/home/home";
 import { Global } from "@emotion/react";
 import { ThemeProvider } from "@mui/material/styles";
 import { globalStyle, theme } from "./common.styles";
+import { Suspense, lazy } from "react";
+import { LinearProgress } from "@mui/material";
+
+const Home = lazy(() => import("./components/home/home"));
 
 function App() {
   return (
     <ThemeProvider theme={theme}>
       <Global styles={globalStyle}></Global>
-      <Home />
+      <Suspense fallback={<LinearProgress />}>
+        <Home />
+      </Suspense>
     </ThemeProvider>
   );
 }

gaztec/src/config.ts → gaztec/src/aztecEnv.ts

@@ -3,6 +3,9 @@ import {
   createAztecNodeClient,
   type PXE,
   AztecNode,
+  AccountWalletWithSecretKey,
+  AztecAddress,
+  Contract,
 } from "@aztec/aztec.js";
 import { PXEService } from "@aztec/pxe/service";
 import { PXEServiceConfig, getPXEServiceConfig } from "@aztec/pxe/config";
@@ -13,6 +16,9 @@ import { createStore } from "@aztec/kv-store/indexeddb";
 import { BBWASMLazyPrivateKernelProver } from "@aztec/bb-prover/wasm/lazy";
 import { WASMSimulator } from "@aztec/simulator/client";
 import { debug } from "debug";
+import { createContext } from "react";
+import { WalletDB } from "./utils/storage";
+import { ContractFunctionInteractionTx } from "./utils/txs";
 
 process.env = Object.keys(import.meta.env).reduce((acc, key) => {
   acc[key.replace("VITE_", "")] = import.meta.env[key];
@@ -21,6 +27,46 @@ process.env = Object.keys(import.meta.env).reduce((acc, key) => {
 
 debug.enable("*");
 
+export const AztecContext = createContext<{
+  pxe: PXE | null;
+  nodeURL: string;
+  node: AztecNode;
+  wallet: AccountWalletWithSecretKey | null;
+  isPXEInitialized: boolean;
+  walletDB: WalletDB | null;
+  currentContractAddress: AztecAddress;
+  currentContract: Contract;
+  currentTx: ContractFunctionInteractionTx;
+  setWalletDB: (walletDB: WalletDB) => void;
+  setPXEInitialized: (isPXEInitialized: boolean) => void;
+  setWallet: (wallet: AccountWalletWithSecretKey) => void;
+  setAztecNode: (node: AztecNode) => void;
+  setPXE: (pxe: PXE) => void;
+  setNodeURL: (nodeURL: string) => void;
+  setCurrentTx: (currentTx: ContractFunctionInteractionTx) => void;
+  setCurrentContract: (currentContract: Contract) => void;
+  setCurrentContractAddress: (currentContractAddress: AztecAddress) => void;
+}>({
+  pxe: null,
+  nodeURL: "",
+  node: null,
+  wallet: null,
+  isPXEInitialized: false,
+  walletDB: null,
+  currentContract: null,
+  currentContractAddress: null,
+  currentTx: null,
+  setWalletDB: (walletDB: WalletDB) => {},
+  setPXEInitialized: (isPXEInitialized: boolean) => {},
+  setWallet: (wallet: AccountWalletWithSecretKey) => {},
+  setNodeURL: (nodeURL: string) => {},
+  setPXE: (pxe: PXE) => {},
+  setAztecNode: (node: AztecNode) => {},
+  setCurrentTx: (currentTx: ContractFunctionInteractionTx) => {},
+  setCurrentContract: (currentContract: Contract) => {},
+  setCurrentContractAddress: (currentContractAddress: AztecAddress) => {},
+});
+
 export class AztecEnv {
   static async connectToNode(nodeURL: string): Promise<AztecNode> {
     const aztecNode = await createAztecNodeClient(nodeURL);

gaztec/src/components/common/fnParameter.tsx

@@ -16,9 +16,9 @@ import {
   formatFrAsString,
   parseAliasedBuffersAsString,
 } from "../../utils/conversion";
-import { Fragment, useContext, useState } from "react";
+import { useContext, useState } from "react";
 import EditIcon from "@mui/icons-material/Edit";
-import { AztecContext } from "../home/home";
+import { AztecContext } from "../../aztecEnv";
 
 const container = css({
   display: "flex",

gaztec/src/components/contract/components/createAuthwitDialog.tsx

@@ -11,7 +11,7 @@ import {
   css,
 } from "@mui/material";
 import { useContext, useState } from "react";
-import { AztecContext } from "../../home/home";
+import { AztecContext } from "../../../aztecEnv";
 import { FunctionParameter } from "../../common/fnParameter";
 
 const creationForm = css({
@@ -61,13 +61,11 @@ export function CreateAuthwitDialog({
         action,
       });
     } else {
-      await wallet
-        .setPublicAuthWit(
-          { caller: AztecAddress.fromString(caller), action },
-          true
-        )
-        .send()
-        .wait();
+      const validateActionInteraction = await wallet.setPublicAuthWit(
+        { caller: AztecAddress.fromString(caller), action },
+        true
+      );
+      await validateActionInteraction.send().wait();
     }
     setAlias("");
     setCreating(false);

gaztec/src/components/contract/components/deployContractDialog.tsx

@@ -25,7 +25,7 @@ import {
   getDefaultInitializer,
   getInitializer,
 } from "@aztec/foundation/abi";
-import { AztecContext } from "../../home/home";
+import { AztecContext } from "../../../aztecEnv";
 import { parseAliasedBuffersAsString } from "../../../utils/conversion";
 import { FunctionParameter } from "../../common/fnParameter";
 import { GITHUB_TAG_PREFIX } from "../../../utils/constants";

gaztec/src/components/contract/components/registerContractDialog.tsx

@@ -16,7 +16,7 @@ import {
   css,
 } from "@mui/material";
 import { useContext, useState } from "react";
-import { AztecContext } from "../../home/home";
+import { AztecContext } from "../../../aztecEnv";
 import { GITHUB_TAG_PREFIX } from "../../../utils/constants";
 
 const creationForm = css({

gaztec/src/components/contract/contract.tsx

@@ -9,7 +9,7 @@ import {
   ContractInstanceWithAddress,
   loadContractArtifact,
 } from "@aztec/aztec.js";
-import { AztecContext } from "../home/home";
+import { AztecContext } from "../../aztecEnv";
 import {
   Button,
   Card,
@@ -241,7 +241,7 @@ export function ContractComponent() {
       const call = currentContract.methods[fnName](...parameters[fnName]);
 
       const provenCall = await call.prove();
-      txHash = provenCall.getTxHash();
+      txHash = await provenCall.getTxHash();
       setCurrentTx({
         ...currentTx,
         ...{ txHash, status: "sending" },