Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
cd0b8de
first aproach
Thunkar May 19, 2025
19b0e62
playground working
Thunkar May 20, 2025
0ebd105
fix box build
Thunkar May 20, 2025
4966a08
attempt to get rid of debug
Thunkar May 20, 2025
4b89c83
removed workaround
Thunkar May 20, 2025
0ffef8c
lock
Thunkar May 20, 2025
a97cf1a
fixes
Thunkar May 20, 2025
2387c86
as buffer
Thunkar May 20, 2025
522e052
simplification
Thunkar May 20, 2025
7ca8777
whoops
Thunkar May 20, 2025
5067fcf
Merge branch 'master' of github.com:AztecProtocol/aztec-packages into…
Thunkar May 21, 2025
ec44c2c
comments from PR
Thunkar May 21, 2025
b971bc0
got rid of debug completely
Thunkar May 21, 2025
99f58b5
package.json and locks
Thunkar May 21, 2025
aee1d89
typo
Thunkar May 21, 2025
92b6911
attempted cleanup
Thunkar May 21, 2025
62b4271
pino
Thunkar May 21, 2025
f908b92
customlevels
Thunkar May 21, 2025
12dbd12
default level
Thunkar May 21, 2025
3aed431
renaming
Thunkar May 21, 2025
f1f6a91
completely remove process from unbundled bb
Thunkar May 21, 2025
4ff9670
murder of webpack
Thunkar May 21, 2025
2246e5e
lock
Thunkar May 21, 2025
4fd3f39
keep the provider
Thunkar May 21, 2025
183a652
Merge branch 'master' of github.com:AztecProtocol/aztec-packages into…
Thunkar May 21, 2025
218fc04
wtf
Thunkar May 21, 2025
912d1ab
attempt at getting more info
Thunkar May 21, 2025
1274c67
proper logger
Thunkar May 22, 2025
e614b64
Merge branch 'master' of github.com:AztecProtocol/aztec-packages into…
Thunkar May 22, 2025
4531fb5
make node logger inherit log level from process.env
Thunkar May 22, 2025
bcbfc44
fix
Thunkar May 22, 2025
09aeb49
Merge branch 'master' into gj/unbundled_bb.js
Thunkar May 22, 2025
d19a446
fixed logging
Thunkar May 22, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions barretenberg/acir_tests/bbjs-test/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import createDebug from "debug";
import fs from "fs/promises";
import path from "path";
import { Command } from "commander";
import assert from "assert";
import { pino } from "pino";

createDebug.enable("*");
const debug = createDebug("bbjs-test");
const logger = pino({
name: "bbjs-test",
});

const UH_PROOF_FIELDS_LENGTH = 456;
const BYTES_PER_FIELD = 32;
Expand All @@ -32,7 +33,7 @@ async function generateProof({
}) {
const { UltraHonkBackend, deflattenFields } = await import("@aztec/bb.js");

debug(`Generating proof for ${bytecodePath}...`);
logger.debug(`Generating proof for ${bytecodePath}...`);
const circuitArtifact = await fs.readFile(bytecodePath);
const bytecode = JSON.parse(circuitArtifact.toString()).bytecode;
const backend = new UltraHonkBackend(bytecode, {
Expand All @@ -50,13 +51,13 @@ async function generateProof({
);

await fs.writeFile(proofPath(outputDirectory), Buffer.from(proof.proof));
debug("Proof written to " + proofPath(outputDirectory));
logger.debug("Proof written to " + proofPath(outputDirectory));

await fs.writeFile(
publicInputsAsFieldsPath(outputDirectory),
JSON.stringify(proof.publicInputs)
);
debug(
logger.debug(
"Public inputs written to " + publicInputsAsFieldsPath(outputDirectory)
);

Expand All @@ -70,7 +71,7 @@ async function generateProof({
starknet: oracleHash === "starknet",
});
await fs.writeFile(vkeyPath(outputDirectory), Buffer.from(verificationKey));
debug("Verification key written to " + vkeyPath(outputDirectory));
logger.debug("Verification key written to " + vkeyPath(outputDirectory));

await backend.destroy();
}
Expand All @@ -89,7 +90,7 @@ async function verifyProof({ directory }: { directory: string }) {
const publicInputs = JSON.parse(
await fs.readFile(publicInputsAsFieldsPath(directory), "utf8")
);
debug(`publicInputs: ${JSON.stringify(publicInputs)}`);
logger.debug(`publicInputs: ${JSON.stringify(publicInputs)}`);
const vkey = await fs.readFile(vkeyPath(directory));

const verified = await verifier.verifyUltraHonkProof(
Expand All @@ -98,7 +99,7 @@ async function verifyProof({ directory }: { directory: string }) {
);

await verifier.destroy();
debug(`Proof verified: ${verified}`);
logger.debug(`Proof verified: ${verified}`);
return verified;
}

Expand Down
4 changes: 2 additions & 2 deletions barretenberg/acir_tests/browser-test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
},
"devDependencies": {
"@aztec/bb.js": "portal:../../ts",
"@types/debug": "^4.1.12",
"@types/pako": "^2.0.3",
"debug": "^4.3.4",
"buffer": "^6.0.3",
"html-webpack-plugin": "^5.6.0",
"pako": "^2.1.0",
"pino": "^9.5.0",
"serve": "^14.2.1",
"ts-loader": "^9.5.1",
"typescript": "^5.4.2",
Expand Down
19 changes: 10 additions & 9 deletions barretenberg/acir_tests/browser-test-app/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import type { ProofData } from "@aztec/bb.js";
import createDebug from "debug";
import { pino } from "pino";

createDebug.enable("*");
const debug = createDebug("browser-test-app");
const logger = pino({
name: "browser-test-app",
});

async function prove(
bytecode: string,
Expand All @@ -11,31 +12,31 @@ async function prove(
): Promise<{ proofData: ProofData; verificationKey: Uint8Array }> {
const { UltraHonkBackend } = await import("@aztec/bb.js");

debug("starting test...");
logger.debug("starting test...");
const backend = new UltraHonkBackend(bytecode, { threads });
const proofData = await backend.generateProof(witness);

debug(`getting the verification key...`);
logger.debug(`getting the verification key...`);
const verificationKey = await backend.getVerificationKey();
debug(`destroying the backend...`);
logger.debug(`destroying the backend...`);
await backend.destroy();
return { proofData, verificationKey };
}

async function verify(proofData: ProofData, verificationKey: Uint8Array) {
const { BarretenbergVerifier } = await import("@aztec/bb.js");

debug(`verifying...`);
logger.debug(`verifying...`);
const verifier = new BarretenbergVerifier();
const verified = await verifier.verifyUltraHonkProof(
proofData,
verificationKey
);
debug(`verified: ${verified}`);
logger.debug(`verified: ${verified}`);

await verifier.destroy();

debug("test complete.");
logger.debug("test complete.");
return verified;
}

Expand Down
19 changes: 7 additions & 12 deletions barretenberg/acir_tests/browser-test-app/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
import { resolve, dirname } from "path";
import { createRequire } from 'module';
import { fileURLToPath } from "url";
import HtmlWebpackPlugin from "html-webpack-plugin";
import webpack from "webpack";

const require = createRequire(import.meta.url);

export default {
target: "web",
mode: "production",
Expand All @@ -19,25 +22,17 @@ export default {
},
output: {
path: resolve(dirname(fileURLToPath(import.meta.url)), "./dest"),
filename: "[name].js",
chunkFormat: 'module',
},
experiments: {
outputModule: true,
},
optimization: {
splitChunks: {
// Cannot use async due to https://github.com/webpack/webpack/issues/17014
// messing with module workers loaded asynchronously.
chunks: /barretenberg.*.js/,
},
},
plugins: [
new HtmlWebpackPlugin({ inject: false, template: "./src/index.html" }),
new webpack.DefinePlugin({ "process.env.NODE_DEBUG": false }),
new webpack.ProvidePlugin({ Buffer: ['buffer', 'Buffer'] }),
],
resolve: {
extensions: ['.tsx', '.ts', '.js'],
fallback: {
buffer: require.resolve('buffer/'),
}
},
devServer: {
hot: false,
Expand Down
5 changes: 4 additions & 1 deletion barretenberg/acir_tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,8 @@
"headless-test",
"sol-test",
"bbjs-test"
]
],
"dependencies": {
"pino": "^9.5.0"
}
}
Loading