@aztec/bb.js
Advanced tools
Comparing version 0.3.3 to 0.3.4
{ | ||
"name": "@aztec/bb.js", | ||
"version": "0.3.3", | ||
"version": "0.3.4", | ||
"license": "MIT", | ||
@@ -11,2 +11,3 @@ "type": "module", | ||
}, | ||
"main": "./dest/index.js", | ||
"bin": "./dest/main.js", | ||
@@ -16,10 +17,12 @@ "files": [ | ||
"dest/", | ||
"!dest/browser/*.wasm", | ||
"README.md" | ||
], | ||
"scripts": { | ||
"clean": "rm -rf ./dest .tsbuildinfo", | ||
"build": "yarn clean && yarn build:wasm && yarn build:ts", | ||
"clean": "rm -rf ./dest .tsbuildinfo.browser .tsbuildinfo.node", | ||
"build": "yarn clean && yarn build:wasm && yarn build:ts:browser && yarn build:ts:node", | ||
"build:dev": "tsc -b --watch", | ||
"build:wasm": "cd ../cpp && cmake --preset wasm-threads && cmake --build --preset wasm-threads && cmake --preset wasm && cmake --build --preset wasm", | ||
"build:ts": "tsc -b && webpack && chmod +x ./dest/main.js", | ||
"build:ts:browser": "tsc -b tsconfig.browser.json && BUILD_TARGET=browser webpack && chmod +x ./dest/browser/main.js && BUILD_TARGET=browser node replace_imports.cjs", | ||
"build:ts:node": "tsc -b tsconfig.node.json && chmod +x ./dest/node/main.js && BUILD_TARGET=node node replace_imports.cjs", | ||
"build:bindings": "cd .. && ./scripts/bindgen.sh", | ||
@@ -29,7 +32,6 @@ "serve": "webpack serve", | ||
"formatting:fix": "prettier -w ./src", | ||
"test": "yarn test:jest && yarn test:bin", | ||
"test:jest": "NODE_OPTIONS='--loader ts-node/esm' NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --passWithNoTests", | ||
"test": "yarn build:ts:browser && yarn build:ts:node && yarn test:jest && yarn test:bin", | ||
"test:jest": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --no-cache --passWithNoTests", | ||
"test:bin": "cd ./bin-test && ./bin-test.sh", | ||
"test-debug": "NODE_OPTIONS='--loader ts-node/esm' NODE_NO_WARNINGS=1 node --inspect-brk=0.0.0.0 --experimental-vm-modules $(yarn bin jest) --no-cache --passWithNoTests --runInBand", | ||
"simple_test": "NODE_OPTIONS='--loader ts-node/esm' NODE_NO_WARNINGS=1 node ./src/examples/simple.rawtest.ts", | ||
"test-debug": "NODE_NO_WARNINGS=1 node --inspect-brk=0.0.0.0 --experimental-vm-modules $(yarn bin jest) --no-cache --passWithNoTests --runInBand", | ||
"prepack": "yarn build", | ||
@@ -39,16 +41,4 @@ "deploy": "npm publish --access public" | ||
"jest": { | ||
"preset": "ts-jest/presets/default-esm", | ||
"transform": { | ||
"./src/.*\\.ts": [ | ||
"ts-jest", | ||
{ | ||
"useESM": true | ||
} | ||
] | ||
}, | ||
"moduleNameMapper": { | ||
"^(\\.{1,2}/.*)\\.js$": "$1" | ||
}, | ||
"testRegex": "./src/.*\\.test\\.ts$", | ||
"rootDir": "./src" | ||
"testRegex": "./dest/node/.*\\.test\\.js$", | ||
"rootDir": "./dest" | ||
}, | ||
@@ -59,4 +49,3 @@ "dependencies": { | ||
"debug": "^4.3.4", | ||
"ts-node": "^10.9.1", | ||
"tslib": "^2.4.0" | ||
"idb-keyval": "^6.2.1" | ||
}, | ||
@@ -77,8 +66,9 @@ "devDependencies": { | ||
"html-webpack-plugin": "^5.5.1", | ||
"idb-keyval": "^6.2.1", | ||
"jest": "^29.5.0", | ||
"prettier": "^2.8.4", | ||
"replace-in-file": "^7.0.1", | ||
"resolve-typescript-plugin": "^2.0.1", | ||
"ts-jest": "^29.1.0", | ||
"ts-loader": "^9.4.2", | ||
"tsconfig-paths-webpack-plugin": "^4.0.1", | ||
"typescript": "^5.0.4", | ||
@@ -85,0 +75,0 @@ "webpack": "^5.82.1", |
@@ -40,3 +40,3 @@ import { type Worker } from 'worker_threads'; | ||
beforeAll(async () => { | ||
({ wasm, worker } = await BarretenbergWasm.newWorker(2)); | ||
({ wasm, worker } = (await BarretenbergWasm.newWorker(2)) as any); | ||
}, 20000); | ||
@@ -43,0 +43,0 @@ |
@@ -6,6 +6,10 @@ import { type Worker } from 'worker_threads'; | ||
import { randomBytes } from '../random/index.js'; | ||
// Webpack config swaps this import with ./browser/index.js | ||
// You can toggle between these two imports to sanity check the type-safety. | ||
import { fetchCode, getNumCpu, createWorker, getRemoteBarretenbergWasm, threadLogger, killSelf } from './node/index.js'; | ||
// import { fetchCode, getNumCpu, createWorker, randomBytes } from './browser/index.js'; | ||
import { | ||
fetchCode, | ||
getNumCpu, | ||
createWorker, | ||
getRemoteBarretenbergWasm, | ||
threadLogger, | ||
killSelf, | ||
} from 'dynamic/barretenberg_wasm'; | ||
@@ -72,3 +76,3 @@ const debug = createDebug('bb.js:wasm'); | ||
// able to fallback on "non shared memory" situations. | ||
const code = await fetchCode(threads > 1 ? 'barretenberg-threads.wasm' : 'barretenberg.wasm'); | ||
const code = await fetchCode(threads > 1); | ||
const { instance, module } = await WebAssembly.instantiate(code, this.getImportObj(this.memory)); | ||
@@ -83,4 +87,4 @@ | ||
this.logger('creating worker threads...'); | ||
this.workers = await Promise.all(Array.from({ length: threads - 1 }).map(createWorker)); | ||
this.remoteWasms = await Promise.all(this.workers.map(getRemoteBarretenbergWasm)); | ||
this.workers = (await Promise.all(Array.from({ length: threads - 1 }).map(createWorker))) as any; | ||
this.remoteWasms = await Promise.all(this.workers.map(getRemoteBarretenbergWasm as any)); | ||
await Promise.all(this.remoteWasms.map(w => w.initThread(module, this.memory))); | ||
@@ -87,0 +91,0 @@ this.logger('init complete.'); |
@@ -5,4 +5,7 @@ import { wrap } from 'comlink'; | ||
export async function fetchCode(name: string) { | ||
const res = await fetch('/' + name); | ||
export async function fetchCode(multithreading: boolean) { | ||
const wasmModuleUrl = multithreading | ||
? new URL(`../../barretenberg-threads.wasm`, import.meta.url) | ||
: new URL(`../../barretenberg.wasm`, import.meta.url); | ||
const res = await fetch(wasmModuleUrl.href); | ||
return await res.arrayBuffer(); | ||
@@ -12,3 +15,3 @@ } | ||
export function createWorker() { | ||
const worker = new Worker('barretenberg_wasm.js'); | ||
const worker = new Worker(new URL(`./worker.js`, import.meta.url)); | ||
const debugStr = debug.disable(); | ||
@@ -15,0 +18,0 @@ debug.enable(debugStr); |
@@ -11,5 +11,5 @@ import { Worker } from 'worker_threads'; | ||
export async function fetchCode(name: string) { | ||
export async function fetchCode(multithreading: boolean) { | ||
const __dirname = dirname(fileURLToPath(import.meta.url)); | ||
return await readFile(__dirname + '/../../' + name); | ||
return await readFile(__dirname + `/../../${multithreading ? 'barretenberg-threads.wasm' : 'barretenberg.wasm'}`); | ||
} | ||
@@ -16,0 +16,0 @@ |
@@ -13,3 +13,5 @@ import { NetCrs } from '../net_crs.js'; | ||
static async new(numPoints: number) { | ||
// This is to keep signrature equal with the node version of CRS | ||
// eslint-disable-next-line @typescript-eslint/no-unused-vars | ||
static async new(numPoints: number, _?: string) { | ||
const crs = new CachedNetCrs(numPoints); | ||
@@ -16,0 +18,0 @@ await crs.init(); |
@@ -1,1 +0,1 @@ | ||
export { Crs } from './node/index.js'; | ||
export { Crs } from 'dynamic/crs'; |
@@ -1,1 +0,1 @@ | ||
export * from './node/index.js'; | ||
export * from 'dynamic/random'; |
export * from './ptr.js'; | ||
export * from './fields.js'; | ||
export * from './point.js'; | ||
export * from 'dynamic/types'; | ||
export * from './fixed_size_buffer.js'; | ||
export * from './raw_buffer.js'; |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Mixed license
License(Experimental) Package contains multiple licenses.
Found 1 instance in 1 package
Unidentified License
License(Experimental) Something that seems like a license was found, but its contents could not be matched with a known license.
Found 2 instances in 1 package
21135986
4
357
0
100
17099
24
18
13
+ Addedidb-keyval@^6.2.1
+ Addedidb-keyval@6.2.1(transitive)
- Removedts-node@^10.9.1
- Removedtslib@^2.4.0
- Removed@cspotcode/source-map-support@0.8.1(transitive)
- Removed@jridgewell/resolve-uri@3.1.2(transitive)
- Removed@jridgewell/sourcemap-codec@1.5.0(transitive)
- Removed@jridgewell/trace-mapping@0.3.9(transitive)
- Removed@tsconfig/node10@1.0.11(transitive)
- Removed@tsconfig/node12@1.0.11(transitive)
- Removed@tsconfig/node14@1.0.3(transitive)
- Removed@tsconfig/node16@1.0.4(transitive)
- Removed@types/node@22.7.9(transitive)
- Removedacorn@8.13.0(transitive)
- Removedacorn-walk@8.3.4(transitive)
- Removedarg@4.1.3(transitive)
- Removedcreate-require@1.1.1(transitive)
- Removeddiff@4.0.2(transitive)
- Removedmake-error@1.3.6(transitive)
- Removedts-node@10.9.2(transitive)
- Removedtslib@2.8.0(transitive)
- Removedtypescript@5.6.3(transitive)
- Removedundici-types@6.19.8(transitive)
- Removedv8-compile-cache-lib@3.0.1(transitive)
- Removedyn@3.1.1(transitive)