Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main to develop #249

Merged
merged 91 commits into from
Feb 21, 2024
Merged
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
12bea48
Update README references
nholland94 Aug 15, 2023
2b863fa
add generated transaction definitions
Trivo25 Oct 26, 2023
56fb62e
expose txnversion
Trivo25 Oct 26, 2023
0d36b88
build bindings
Trivo25 Oct 30, 2023
3809752
add custom js deriver
Trivo25 Oct 30, 2023
5f9f3a3
add custom deriver to readme
Trivo25 Oct 31, 2023
73082b9
Merge pull request #113 from o1-labs/fix/markdown-references
mitschabaude Nov 14, 2023
bbcd056
Merge pull request #195 from o1-labs/feature/vk-txnversion
Trivo25 Nov 27, 2023
a18927b
fast bytes <-> bigint conversion
mitschabaude Dec 21, 2023
393d5b2
rename & speed up parse hex
mitschabaude Dec 21, 2023
5f65014
unit test
mitschabaude Dec 21, 2023
616371c
allow to resuse bytes array in parse hex string
mitschabaude Dec 21, 2023
b46f1eb
avoid creating throwaway bytes arrays
mitschabaude Dec 21, 2023
7fcd4cd
revert complexity
mitschabaude Dec 21, 2023
a884dc5
Merge pull request #228 from o1-labs/perf/field-conv
mitschabaude Dec 21, 2023
c1bd8ee
Add O1JS bindings and remove SnarkyJS bindings
MartinMinkov Jan 2, 2024
e88b4b4
Add build scripts for o1js node and web artifacts
MartinMinkov Jan 2, 2024
71dd0cf
Update import paths in crypto and js files
MartinMinkov Jan 2, 2024
4a730a0
Update .prettierrc.cjs to sync with o1js
MartinMinkov Jan 2, 2024
cc82f2e
Update import path for o1jsWebSrc
MartinMinkov Jan 2, 2024
ba9b302
Update getSnarky function to getO1js
MartinMinkov Jan 2, 2024
b1715c9
Add provable-o1js module
MartinMinkov Jan 3, 2024
9a097f1
recompile bindings
MartinMinkov Jan 3, 2024
6a6efbb
Revert "Add provable-o1js module"
MartinMinkov Jan 4, 2024
6e3476e
refactor: rename o1js.js to snarky.js across multiple files for bette…
MartinMinkov Jan 4, 2024
383f4ae
fix(dump-test-vectors.sh): change 'b10' to 'hex' in cargo run command…
MartinMinkov Oct 27, 2023
7363340
fix(lint.yaml): remove redundant prettier check
MartinMinkov Nov 14, 2023
1e208ca
fix(CODEOWNERS): remove kimchi directory from CODEOWNERS file as it n…
MartinMinkov Nov 15, 2023
31990e0
docs(README.md): remove '/kimchi' directory description as it is no l…
MartinMinkov Dec 13, 2023
870d7ed
refactor: add script to help with dune build
mitschabaude Dec 19, 2023
5f3e3e1
refactor: remove kimchi and support compiling from mina repo
MartinMinkov Oct 27, 2023
41ccd04
benchmark existing field inverse
mitschabaude Jan 16, 2024
efb842c
add fast inverse which isn't fast
mitschabaude Jan 16, 2024
5bed3fe
now it's somewhat fast, but still too slow
mitschabaude Jan 16, 2024
50e66b2
tweaks
mitschabaude Jan 16, 2024
76d879c
further slight improvements
mitschabaude Jan 16, 2024
5b79657
minor
mitschabaude Jan 16, 2024
bc136df
move fast inverse to main finite field code
mitschabaude Jan 16, 2024
4a53d10
rename
mitschabaude Jan 16, 2024
163af62
add robustness
mitschabaude Jan 16, 2024
309cac0
slight speed improvement
mitschabaude Jan 17, 2024
df4ca0e
fixup bench script
mitschabaude Jan 17, 2024
ba1607a
refactor(local_ledger.ml): suppress warning -32 in remove_accounts_ex…
MartinMinkov Jan 17, 2024
ecc3519
fix(dump-test-vectors.sh): change hex to b10 in cargo run commands to…
MartinMinkov Jan 17, 2024
5ed3f47
remove(crypto/bindings.ts): delete bindings.ts file as it is no longe…
MartinMinkov Jan 18, 2024
0ca30b3
Merge pull request #233 from o1-labs/feat/berkeley-build
MartinMinkov Jan 19, 2024
c8bdac9
refactor(wrapper): revert 'o1js' obj to 'snarky'
MartinMinkov Jan 22, 2024
e8fec4c
chore(bindings): update bindings
MartinMinkov Jan 22, 2024
5a3191b
Merge pull request #231 from o1-labs/feat/rename-snarkyjs-o1js
MartinMinkov Jan 22, 2024
339a03c
allow to pass custom empty to provable from class
mitschabaude Jan 23, 2024
29167d5
chore(compiled): update compiled bindings
MartinMinkov Jan 19, 2024
6df837c
Merge branch 'main' into perf/poseidon-hash-bottleneck
MartinMinkov Jan 24, 2024
da4c18f
Merge pull request #237 from o1-labs/perf/poseidon-hash-bottleneck
MartinMinkov Jan 24, 2024
14bddb6
Merge branch 'main' into perf/field-inverse
mitschabaude Jan 26, 2024
a935419
Merge pull request #235 from o1-labs/perf/field-inverse
mitschabaude Jan 26, 2024
c7d681e
Merge branch 'main' into feature/token-contract
mitschabaude Feb 1, 2024
772ce4b
fixup
mitschabaude Feb 1, 2024
55e313b
Merge pull request #238 from o1-labs/feature/token-contract
mitschabaude Feb 1, 2024
44c6ae4
Merge branch 'berkeley' into merge/berkeley-develop-main
mitschabaude Feb 2, 2024
89a967e
update artifacts
mitschabaude Feb 2, 2024
83f8520
fixup: adapt transaction version empty
mitschabaude Feb 2, 2024
3503101
Merge pull request #239 from o1-labs/merge/berkeley-develop-main
mitschabaude Feb 2, 2024
44bbc3f
elliptic_curve
mitschabaude Feb 13, 2024
4730f80
unit test
mitschabaude Feb 13, 2024
9485b2c
finite_field
mitschabaude Feb 13, 2024
b783d79
test_vectors
mitschabaude Feb 13, 2024
20d537f
more test_vectors
mitschabaude Feb 13, 2024
d5208ae
build scripts
mitschabaude Feb 13, 2024
7c9feff
circuit_value
mitschabaude Feb 13, 2024
c1bd65d
Merge pull request #242 from o1-labs/refactor/file-names
mitschabaude Feb 13, 2024
a31ecd5
Missed part of the Mainnet support (without recompile).
shimkiv Feb 15, 2024
1022de3
Missed part of the Mainnet support (recompiled artifacts).
shimkiv Feb 15, 2024
48a1299
Missed web part.
shimkiv Feb 15, 2024
575d972
Merge pull request #243 from o1-labs/mainnet-support2
shimkiv Feb 15, 2024
363a00e
Introduce the NetworkID parameter for Test.hashFromJson.accountUpdate().
shimkiv Feb 15, 2024
7e34834
fix assert in finite-field.ts
mitschabaude Feb 16, 2024
6775a96
add missing constant
mitschabaude Feb 16, 2024
55a806a
Merge pull request #246 from o1-labs/fix/create-field
mitschabaude Feb 16, 2024
b70f4c7
Merge remote-tracking branch 'origin/main' into test-acc-upd-with-net…
shimkiv Feb 16, 2024
4478587
Recompliled based on 'main' updates.
shimkiv Feb 16, 2024
9e68971
allow custom network id
Trivo25 Feb 16, 2024
b1ceb41
add custom network id
Trivo25 Feb 16, 2024
696fa7e
make things less comprehensible because its ocaml
Trivo25 Feb 16, 2024
a6b6800
bindings
Trivo25 Feb 16, 2024
b94bd2a
Merge pull request #244 from o1-labs/test-acc-upd-with-networkid
shimkiv Feb 16, 2024
dc1c0ae
cleanup
Trivo25 Feb 18, 2024
b58a76d
Merge branch 'main' into custom-network
Trivo25 Feb 18, 2024
1beb2fe
bindings
Trivo25 Feb 18, 2024
49309b4
Merge pull request #247 from o1-labs/custom-network
Trivo25 Feb 20, 2024
38d41cb
Merge branch 'main' into merge/main-develop-feb-24
mitschabaude Feb 21, 2024
3e9a80f
fixup: delete some files that are deleted in main
mitschabaude Feb 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .prettierrc.cjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Please keep it in sync with snarkyjs.
// Please keep it in sync with o1js.
module.exports = {
// Important for js_of_ocaml to avoid adding comma in parameters
trailingComma: 'es5',
2 changes: 1 addition & 1 deletion MINA_COMMIT
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
The mina commit used to generate the backends for node and web is
3f85bbe5520ae313252d0cfef5f0de63c383f0d1
66dde3a752dd70248abc20ed73a071484fb452ad
Loading
Loading