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.

Sign up for GitHub

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

Jump to bottom

Merge main to develop #249

Merged
merged 91 commits into from
Feb 21, 2024
Merged

Merge main to develop #249

merged 91 commits into from
Feb 21, 2024

Conversation

mitschabaude
Copy link
Collaborator

@mitschabaude mitschabaude commented Feb 21, 2024 •
edited
Loading

nholland94 and others added 30 commits August 15, 2023 13:14
@nholland94
Update README references
12bea48
@Trivo25
add generated transaction definitions
2b863fa
@Trivo25
expose txnversion
56fb62e
@Trivo25
build bindings
0d36b88
@Trivo25
add custom js deriver
3809752
@Trivo25
add custom deriver to readme
5f9f3a3
@mitschabaude
Merge pull request #113 from o1-labs/fix/markdown-references
73082b9 
Update README references
@Trivo25
Merge pull request #195 from o1-labs/feature/vk-txnversion
bbcd056 
add txnVersion to bindings
@mitschabaude
fast bytes <-> bigint conversion
a18927b
@mitschabaude
rename & speed up parse hex
393d5b2
@mitschabaude
unit test
5f65014
@mitschabaude
allow to resuse bytes array in parse hex string
616371c
@mitschabaude
avoid creating throwaway bytes arrays
b46f1eb
@mitschabaude
revert complexity
7fcd4cd
@mitschabaude
Merge pull request #228 from o1-labs/perf/field-conv
a884dc5 
Faster fields to bytes conversion
@MartinMinkov
Add O1JS bindings and remove SnarkyJS bindings
c1bd8ee
@MartinMinkov
Add build scripts for o1js node and web artifacts
e88b4b4
@MartinMinkov
Update import paths in crypto and js files
71dd0cf
@MartinMinkov
Update .prettierrc.cjs to sync with o1js
4a730a0
@MartinMinkov
Update import path for o1jsWebSrc
cc82f2e
@MartinMinkov
Update getSnarky function to getO1js
ba9b302
@MartinMinkov
Add provable-o1js module
b1715c9
@MartinMinkov
recompile bindings
9a097f1
@MartinMinkov
Revert "Add provable-o1js module"
6a6efbb 
This reverts commit b1715c9.
@MartinMinkov
refactor: rename o1js.js to snarky.js across multiple files for bette…
6e3476e 
…r code clarity and understanding
@MartinMinkov
fix(dump-test-vectors.sh): change 'b10' to 'hex' in cargo run command…
383f4ae 
…s to correctly export test vectors in hexadecimal format
@MartinMinkov
fix(lint.yaml): remove redundant prettier check
7363340
@MartinMinkov
fix(CODEOWNERS): remove kimchi directory from CODEOWNERS file as it n…
1e208ca 
…o longer exists in the project
@MartinMinkov
docs(README.md): remove '/kimchi' directory description as it is no l…
31990e0 
…onger part of the project structure
@mitschabaude @MartinMinkov
refactor: add script to help with dune build
870d7ed
mitschabaude and others added 25 commits February 13, 2024 14:42
@mitschabaude
test_vectors
b783d79
@mitschabaude
more test_vectors
20d537f
@mitschabaude
build scripts
d5208ae
@mitschabaude
circuit_value
7c9feff
@mitschabaude
Merge pull request #242 from o1-labs/refactor/file-names
c1bd65d 
Rename files to follow convention
@shimkiv
Missed part of the Mainnet support (without recompile).
a31ecd5
@shimkiv
Missed part of the Mainnet support (recompiled artifacts).
1022de3
@shimkiv
Missed web part.
48a1299
@shimkiv
Merge pull request #243 from o1-labs/mainnet-support2
575d972 
Missed part of the Mainnet support.
@shimkiv
Introduce the NetworkID parameter for Test.hashFromJson.accountUpdate().
363a00e
@mitschabaude
fix assert in finite-field.ts
7e34834
@mitschabaude
add missing constant
6775a96
@mitschabaude
Merge pull request #246 from o1-labs/fix/create-field
55a806a 
Fix createField with non-prime modulus
@shimkiv
Merge remote-tracking branch 'origin/main' into test-acc-upd-with-net…
b70f4c7 
…workid
@shimkiv
Recompliled based on 'main' updates.
4478587
@Trivo25
allow custom network id
9e68971
@Trivo25
add custom network id
b1ceb41
@Trivo25
make things less comprehensible because its ocaml
696fa7e
@Trivo25
bindings
a6b6800
@shimkiv
Merge pull request #244 from o1-labs/test-acc-upd-with-networkid
b94bd2a 
Introduce the NetworkID parameter for some of the Test.hashFromJson methods.
@Trivo25
cleanup
dc1c0ae
@Trivo25
Merge branch 'main' into custom-network
b58a76d
@Trivo25
bindings
1beb2fe
@Trivo25
Merge pull request #247 from o1-labs/custom-network
49309b4 
Enable custom network signing
@mitschabaude
Merge branch 'main' into merge/main-develop-feb-24
38d41cb
@mitschabaude mitschabaude mentioned this pull request Feb 21, 2024
Merged
@mitschabaude mitschabaude merged commit 5063782 into develop Feb 21, 2024
1 check passed
@mitschabaude mitschabaude deleted the merge/main-develop-feb-24 branch February 21, 2024 12:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@volhovm volhovm volhovm approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@mitschabaude @volhovm @nholland94 @Trivo25 @MartinMinkov @shimkiv