Skip to content

Commit

Permalink
Merge branch 'main' into feat/cli
Browse files Browse the repository at this point in the history
  • Loading branch information
rpalakkal authored Nov 8, 2023
2 parents a238ece + 5f67a3b commit 94779e1
Show file tree
Hide file tree
Showing 37 changed files with 2,501 additions and 791 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/halo2-wasm-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: halo2-wasm Tests

on:
push:
paths:
- "halo2-wasm/**"

defaults:
run:
working-directory: halo2-wasm

jobs:
halo2-wasm-tests:
runs-on: ubuntu-latest-64core-256ram
steps:
- uses: actions/checkout@v3
- name: Build
run: |
rustup toolchain install nightly-2023-08-12-x86_64-unknown-linux-gnu
rustup component add rust-src --toolchain nightly-2023-08-12-x86_64-unknown-linux-gnu
cargo build --target=x86_64-unknown-linux-gnu --verbose
- name: Test
run: cargo test --target=x86_64-unknown-linux-gnu
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
target
Cargo.lock
*.bin
bin
bin
.DS_Store
31 changes: 30 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,32 @@
[workspace]
members = ["halo2-wasm"]
resolver = "2"
resolver = "2"

[profile.dev]
opt-level = 3
debug = 2 # change to 0 or 2 for more or less debug info
overflow-checks = true
incremental = true

# Local "release" mode, more optimized than dev but faster to compile than release
[profile.local]
inherits = "dev"
opt-level = 3
# Set this to 1 or 2 to get more useful backtraces
debug = 1
debug-assertions = false
panic = 'unwind'
# better recompile times
incremental = true
lto = "thin"
codegen-units = 16

[profile.release]
opt-level = 3
debug = false
debug-assertions = false
lto = "fat"
# `codegen-units = 1` can lead to WORSE performance - always bench to find best profile for your machine!
# codegen-units = 1
panic = "unwind"
incremental = false
2 changes: 1 addition & 1 deletion halo2-lib-js/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ public/kzg_bn256_19.bin
public/kzg_bn256_20.bin

my.d.ts
src/shared/halo2lib.d.ts
src/shared/docs/build.d.ts
19 changes: 10 additions & 9 deletions halo2-lib-js/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"name": "@axiom-crypto/halo2-lib-js",
"version": "0.2.1",
"version": "0.2.9",
"description": "Halo2 Javascript library",
"main": "index.js",
"scripts": {
"build": "rm -rf ./dist && node ./scripts/convertDTs.js && tsc && node ./scripts/postTsc.js"
"build": "rm -rf ./dist && pnpm build:docs && tsc && node ./scripts/postTsc.js",
"build:docs": "./node_modules/.bin/dts-bundle-generator src/shared/docs/halo2Docs.d.ts -o src/shared/docs/build.d.ts --external-inlines=@axiom-crypto/halo2-wasm && node ./scripts/convertDTs.js"
},
"keywords": [
"axiom",
Expand All @@ -18,22 +19,22 @@
"author": "Intrinsic Technologies",
"license": "ISC",
"devDependencies": {
"@types/jest": "^29.5.4",
"@types/node": "^20.5.6",
"@types/jest": "^29.5.7",
"@types/node": "^20.8.9",
"@types/prettier": "1.18.2",
"dts-bundle-generator": "^8.0.1",
"jest": "^29.6.4",
"dts-bundle-generator": "^8.1.2",
"jest": "^29.7.0",
"ts-jest": "^29.1.1",
"ts-node": "^10.9.1",
"tslib": "^2.6.2",
"typescript": "^5.2.2"
},
"dependencies": {
"@axiom-crypto/halo2-wasm": "0.2.3",
"ethers": "^6.7.1",
"@axiom-crypto/halo2-wasm": "0.2.7",
"ethers": "^6.8.0",
"prettier": "1.18.2"
},
"publishConfig": {
"directory": "dist"
}
}
}
Loading

0 comments on commit 94779e1

Please sign in to comment.