Skip to content

Commit

Permalink
Merge branch 'develop' into brian/permisions-precondition
Browse files Browse the repository at this point in the history
  • Loading branch information
Geometer1729 committed Oct 10, 2024
2 parents 6af5e70 + 74121af commit 714f656
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 13 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/build-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ jobs:
'DEX integration tests',
'DEX integration test with proofs',
'Voting integration tests',
'Verification Key Regression Check',
'Verification Key Regression Check 1',
'Verification Key Regression Check 2',
'CommonJS test',
]
steps:
Expand Down Expand Up @@ -161,9 +162,11 @@ jobs:
shopt -s globstar
test_files=(./dist/node/**/*.unit-test.js)
set -o pipefail
for ((i=start_index; i<end_index && i<${#test_files[@]}; i++)); do
echo "Running test: ${test_files[$i]}"
node --enable-source-maps "${test_files[$i]}" | tee -a profiling.md
echo "Running test: ${test_files[$i]}"
node --enable-source-maps "${test_files[$i]}" | tee -a profiling.md
done
continue-on-error: false

Expand Down
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,20 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
_Security_ in case of vulnerabilities.
-->

## [Unreleased](https://github.com/o1-labs/o1js/compare/5006e4f...HEAD)
## [Unreleased](https://github.com/o1-labs/o1js/compare/450943...HEAD)

## [1.8.0](https://github.com/o1-labs/o1js/compare/5006e4f...450943) - 2024-09-18

### Added

- Added `verifyEthers` method to verify Ethereum signatures using the EIP-191 message hashing standard https://github.com/o1-labs/o1js/pull/1815
- Added `fromEthers` method for parsing and converting Ethereum public keys into `ForeignCurve` points, supporting both compressed and uncompressed formats.
- Added `fromHex` method for converting hexadecimal strings into `ForeignCurve` points.

### Fixes

- Fix incorrect behavior of optional proving for zkPrograms where `myProgram.setProofsEnabled(false)` wouldn't work when called before `myProgram.compile()` https://github.com/o1-labs/o1js/pull/1827

## [1.7.0](https://github.com/o1-labs/o1js/compare/d6abf1d97...5006e4f) - 2024-09-04

### Added
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# o1js &nbsp; [![npm version](https://img.shields.io/npm/v/o1js.svg?style=flat)](https://www.npmjs.com/package/o1js) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/o1-labs/o1js/blob/main/CONTRIBUTING.md)
# o1js &nbsp; [![npm version](https://img.shields.io/npm/v/o1js.svg?style=flat)](https://www.npmjs.com/package/o1js) [![npm](https://img.shields.io/npm/dm/o1js)](https://www.npmjs.com/package/o1js) [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/o1-labs/o1js/blob/main/CONTRIBUTING.md)

ℹ️ **o1js** is an evolution of [SnarkyJS](https://www.npmjs.com/package/snarkyjs) which saw
49 updated versions over two years of development with 43,141 downloads.
Expand Down
Binary file added audits/VAR_o1js_240318_o1js_V3.pdf
Binary file not shown.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "o1js",
"description": "TypeScript framework for zk-SNARKs and zkApps",
"version": "1.7.0",
"version": "1.8.0",
"license": "Apache-2.0",
"homepage": "https://github.com/o1-labs/o1js/",
"repository": {
Expand Down
10 changes: 7 additions & 3 deletions run-ci-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,16 @@ case $TEST_TYPE in
./run src/examples/zkapps/dex/happy-path-with-proofs.ts --bundle
;;

"Verification Key Regression Check")
echo "Running Regression checks"
"Verification Key Regression Check 1")
echo "Running Regression checks part 1"
VK_TEST=1 ./run ./tests/vk-regression/vk-regression.ts --bundle
VK_TEST=2 ./run ./tests/vk-regression/vk-regression.ts --bundle
;;

"Verification Key Regression Check 2")
echo "Running Regression checks part 2"
VK_TEST=2 ./run ./tests/vk-regression/vk-regression.ts --bundle
;;

"CommonJS test")
echo "Testing CommonJS version"
node src/examples/commonjs.cjs
Expand Down
4 changes: 2 additions & 2 deletions src/lib/proof-system/zkprogram.ts
Original file line number Diff line number Diff line change
Expand Up @@ -666,9 +666,9 @@ function ZkProgram<
async function compile({
cache = Cache.FileSystemDefault,
forceRecompile = false,
proofsEnabled = true,
proofsEnabled = undefined,
} = {}) {
doProving = proofsEnabled;
doProving = proofsEnabled ?? doProving;

if (doProving) {
let methodsMeta = await analyzeMethods();
Expand Down

0 comments on commit 714f656

Please sign in to comment.