Skip to content

Commit f7ce56f

Browse files
authored
Merge branch 'main' into brian/nix-cache
2 parents 79d74e5 + 026e20e commit f7ce56f

File tree

11 files changed

+47
-64
lines changed

11 files changed

+47
-64
lines changed

.github/workflows/checks.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
nar_secret: ${{ secrets.NIX_CACHE_NAR_SECRET }}
3232
gcp_secret: ${{ secrets.NIX_CACHE_GCP_SECRET }}
3333

34-
Lint-and-format:
34+
Lint-Format-and-TypoCheck:
3535
strategy:
3636
matrix:
3737
node: [20]
@@ -72,6 +72,16 @@ jobs:
7272
- name: Run Oxlint
7373
if: steps.get_changed_files.outputs.files_changed == 'true'
7474
run: xargs npm run lint:strict < changed_files.txt
75+
76+
- name: Run codespell
77+
if: steps.get_changed_files.outputs.files_changed == 'true' && github.event.pull_request.labels.*.name != 'no-typo-check'
78+
uses: codespell-project/actions-codespell@master
79+
with:
80+
check_filenames: true
81+
path: ${{ steps.get_changed_files.outputs.files }}
82+
skip: "*.json,./node_modules,./dist,./.husky,./.git,./src/mina/**/*,./src/bindings/compiled/**/*"
83+
check_hidden: false
84+
ignore_words_list: "tHi,modul,optin,deriver,PRing,toWords,iSelf"
7585

7686
Upload-bindings:
7787
name: upload bindings artifact

.github/workflows/push_main.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
name: Jobs for new commits on main (and similar branches)
22
on:
3-
push:
3+
workflow_run:
4+
workflows: ["checks"]
5+
types:
6+
- completed
47
branches:
58
- main
69
- v1
@@ -109,7 +112,6 @@ jobs:
109112
Gc-root-bindings:
110113
name: add a gc root for the latest bindings build
111114
if: github.ref == 'refs/heads/main'
112-
needs: [Prepare]
113115
runs-on: [sdk-self-hosted-linux-amd64-build-system]
114116
steps:
115117
- uses: actions/checkout@v4
@@ -131,7 +133,6 @@ jobs:
131133
if: github.ref == 'refs/heads/main'
132134
timeout-minutes: 180
133135
runs-on: ubuntu-latest
134-
needs: [Build-And-Test-Server, Run-Unit-Tests, Build-And-Test-Web]
135136
steps:
136137
- name: Restore repository
137138
uses: actions/cache@v4

CHANGELOG.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
1515
_Security_ in case of vulnerabilities.
1616
-->
1717

18-
## [Unreleased](https://github.com/o1-labs/o1js/compare/6ff7f8470a...HEAD)
18+
## [Unreleased](https://github.com/o1-labs/o1js/compare/4e23a60...HEAD)
19+
20+
## [2.5.0](https://github.com/o1-labs/o1js/compare/6ff7f8470a...4e23a60)
1921

2022
### Fixed
2123

@@ -28,6 +30,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
2830
- compiled artifacts are now gitignored
2931
- `npm run build:bindings-download` downloads compiled artifacts from github
3032
- `npm run build:bindings-remote` triggers a github workflow to build the compiled artifacts then downloads them
33+
- Added bitwise operation methods (xor, not, and, or) to `UInt8` class. https://github.com/o1-labs/o1js/pull/2144
3134

3235
### Changed
3336

@@ -39,13 +42,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
3942
[eaca9201](https://github.com/MinaProtocol/mina/tree/eaca9201e0df37f244e341155f253dc9551fb451),
4043
to include the latest changes reg. the move of the Rust codebase to the
4144
repository proof-systems.
42-
43-
### Added
44-
45-
- Added bitwise operation methods (xor, not, and, or) to `UInt8` class. https://github.com/o1-labs/o1js/pull/2144
46-
47-
### Changed
48-
4945
- Added verification key validity checks to `LocalBlockchain`. https://github.com/o1-labs/o1js/pull/2171
5046

5147
## [2.4.0](https://github.com/o1-labs/o1js/compare/fb625f...6ff7f8470a) - 2025-04-01

README-dev.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ These files only have to be regenerated if there are changes to the OCaml or Rus
4141

4242
### External contributors
4343

44-
Unfortunatel you generally won't be able to run `npm run build:bindings-download` on your own commits
44+
Unfortunately you generally won't be able to run `npm run build:bindings-download` on your own commits
4545
because the artifacts won't have been built for them, so make sure to run it on main before you start making changes.
4646
In a fresh git repo `npm run build` also works.
4747

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@
327327
buildCommand = ''
328328
cp -R $src/* .
329329
rm env-vars
330-
#restore write permisions removed by nix store
330+
#restore write permissions removed by nix store
331331
chmod +w -R .
332332
tar czf $out .
333333
'';

npmDepsHash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sha256-8OkUFEHHtruMEZlQMKrETOw/HhMuQmAzDgEOBTZvrb8=
1+
sha256-m3NmZHhCuQxDpYHmB3sRLvitqu2bzbnNaAKY2KOCSIM=

package-lock.json

Lines changed: 16 additions & 41 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "o1js",
33
"description": "TypeScript framework for zk-SNARKs and zkApps",
4-
"version": "2.4.0",
4+
"version": "2.5.0",
55
"license": "Apache-2.0",
66
"homepage": "https://github.com/o1-labs/o1js/",
77
"repository": {

src/bindings/crypto/bindings/bigint256.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ function caml_bytes_unsafe_set(s: MlBytes, i: number, c: number) {
102102
if (s.t != 4 /* ARRAY */) {
103103
if (i == s.c.length) {
104104
s.c += String.fromCharCode(c);
105-
if (i + 1 == s.l) s.t = 0; /*BYTES | UNKOWN*/
105+
if (i + 1 == s.l) s.t = 0; /*BYTES | UNKNOWN*/
106106
return 0;
107107
}
108108
caml_convert_bytes_to_array(s);

src/bindings/crypto/elliptic-curve-endomorphism.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,11 @@ function endomorphismProjective(
140140
}
141141

142142
/**
143-
* Faster scalar muliplication leveraging the GLV decomposition (see {@link decompose}).
143+
* Faster scalar multiplication leveraging the GLV decomposition (see {@link decompose}).
144144
*
145145
* This method to speed up plain, non-provable scalar multiplication was the original application of GLV
146146
*
147-
* Instead of scaling a single point, we apply the decomposition to scale two points, with two scalars of half the orginal length:
147+
* Instead of scaling a single point, we apply the decomposition to scale two points, with two scalars of half the original length:
148148
*
149149
* `s*G = s0*G + s1*lambda*G = s0*G + s1*endo(G)`, where endo(G) is cheap to compute
150150
*
@@ -251,7 +251,7 @@ function computeGlvData(q: bigint, lambda: bigint) {
251251
type GlvData = ReturnType<typeof computeGlvData>;
252252

253253
/**
254-
* Extended Euclidian algorithm which stops when r1 < sqrt(p)
254+
* Extended Euclidean algorithm which stops when r1 < sqrt(p)
255255
*
256256
* Input: positive integers l, p
257257
*

0 commit comments

Comments
 (0)