Skip to content

Commit a05ee65

Browse files
committed
Merge branch 'main' into 2025-04-promote-indexed-merkle-map
2 parents 7c7084a + 3016be0 commit a05ee65

File tree

17 files changed

+893
-360
lines changed

17 files changed

+893
-360
lines changed

CHANGELOG.md

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,21 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
1717

1818
## [Unreleased](https://github.com/o1-labs/o1js/compare/3eef10d...HEAD)
1919

20+
### Added
21+
22+
- Lazy mode for prover index computation. https://github.com/o1-labs/o1js/pull/2143
23+
- Added reverse functionality to `DynamicArray` and indexed `forEach` and `forEachReverse` variants.
24+
- Added `ZkProgram.analyzeSingleMethod(methodName: string)` to analyze a single method of a ZkProgram. https://github.com/o1-labs/o1js/pull/2217
25+
- This is an addition to `ZkProgram.analyzeMethods()` which analyzes all methods of a ZkProgram by executing them.
26+
- Now only a single method is analyzed at a time.
27+
2028
## [2.6.0](https://github.com/o1-labs/o1js/compare/4e23a60...3eef10d) - 2025-05-30
2129

2230
### Added
2331

24-
- [PR! 1905](https://github.com/o1-labs/o1js/pull/1905) API support for circuit chunking
25-
- still requires memory optimizations to be fully functional, and
26-
- proof-systems version still needs to be updated to include [this commit](https://github.com/o1-labs/proof-systems/pull/3222/commits/8c37c293f8159eed3676964ba47fc5dc0ae6ea1e)
27-
- [PR !1848](https://github.com/o1-labs/o1js/pull/1848) Dynamic array provable type
32+
- API support for circuit chunking. https://github.com/o1-labs/o1js/pull/1905
33+
- work in progress, still requires memory optimizations to be fully functional
34+
- Dynamic array provable type. https://github.com/o1-labs/o1js/pull/1848
2835

2936
## [2.5.0](https://github.com/o1-labs/o1js/compare/6ff7f8470a...4e23a60)
3037

@@ -34,7 +41,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
3441

3542
### Added
3643

37-
- [PR !2076](https://github.com/o1-labs/o1js/pull/2076)
44+
- Improved developer experience and build process. https://github.com/o1-labs/o1js/pull/2076
3845
- o1js-bindings is no longer a submodule (same directory structure)
3946
- compiled artifacts are now gitignored
4047
- `npm run build:bindings-download` downloads compiled artifacts from github
@@ -43,14 +50,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
4350

4451
### Changed
4552

46-
- [PR !2126](https://github.com/o1-labs/o1js/pull/2126) Bump up Mina to the
47-
commit
48-
[5a9145feaba3138cd1a1090d8421a8e67a5485e1](https://github.com/MinaProtocol/mina/blob/5a9145feaba3138cd1a1090d8421a8e67a5485e1)
49-
- [PR !2128](https://github.com/o1-labs/o1js/pull/2128) Bump up Mina to the
50-
commit
51-
[eaca9201](https://github.com/MinaProtocol/mina/tree/eaca9201e0df37f244e341155f253dc9551fb451),
53+
- Bump up Mina to the commit
54+
[5a9145feaba3138cd1a1090d8421a8e67a5485e1](https://github.com/MinaProtocol/mina/blob/5a9145feaba3138cd1a1090d8421a8e67a5485e1) https://github.com/o1-labs/o1js/pull/2126
55+
- Bump up Mina to the commit [eaca9201](https://github.com/MinaProtocol/mina/tree/eaca9201e0df37f244e341155f253dc9551fb451),
5256
to include the latest changes reg. the move of the Rust codebase to the
53-
repository proof-systems.
57+
repository proof-systems. https://github.com/o1-labs/o1js/pull/2128
5458
- Added verification key validity checks to `LocalBlockchain`. https://github.com/o1-labs/o1js/pull/2171
5559

5660
### Added

flake.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
nixConfig = {
1717
auto-optimize-store = true;
1818
max-jobs = "auto";
19-
#coppied from flake.nix in mina
19+
# taken from flake.nix in mina
2020
allow-import-from-derivation = "true";
21-
substituters =
21+
extra-substituters =
2222
[ "https://storage.googleapis.com/mina-nix-cache"
2323
];
24-
trusted-public-keys =
24+
extra-trusted-public-keys =
2525
[ "mina-nix-cache-1:djtioLfv2oxuK2lqPUgmZbf8bY8sK/BnYZCU2iU5Q10="
2626
"nix-cache.minaprotocol.org:fdcuDzmnM0Kbf7yU4yywBuUEJWClySc1WIF6t6Mm8h4="
2727
"nix-cache.minaprotocol.org:D3B1W+V7ND1Fmfii8EhbAbF1JXoe2Ct4N34OKChwk2c="

npmDepsHash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sha256-BbQaG1unSH42VqtTjETCpm7lU29C1DskfXAJbYBvO5A=
1+
sha256-/cd6BzDP0GjgJ66kAG9rITMZsvBBmee+OuTs1Usu01A=

0 commit comments

Comments
 (0)