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 develop back to main #1178

Merged
merged 142 commits into from
Oct 16, 2023
Merged
Show file tree
Hide file tree
Changes from 141 commits
Commits
Show all changes
142 commits
Select commit Hold shift + click to select a range
406f3ff
Merge pull request #953 from o1-labs/fix/wasm-build-develop
mitschabaude Jun 5, 2023
a6e8e95
Fixup deserialization of proof-systems JSON format
mrmr1993 Jun 7, 2023
ea2b1f9
Rebuild the wasm bindings
mrmr1993 Jun 7, 2023
fe33005
Make CI run pull requests against `develop`
mrmr1993 Jun 7, 2023
796c55f
Merge pull request #975 from o1-labs/feature/update-proof-systems
mitschabaude Jun 8, 2023
f4921f2
Merge branch 'main' into merge-main-develop
mitschabaude Jun 14, 2023
6702458
bindings
mitschabaude Jun 14, 2023
a2b8762
Merge branch 'main' into merge-main-develop
mitschabaude Jun 14, 2023
82ac8ec
Merge pull request #987 from o1-labs/merge-main-develop
mitschabaude Jun 14, 2023
5444bc6
type import changes for no ts build
mitschabaude Jun 16, 2023
fc747ca
run examples without requiring ts build
mitschabaude Jun 16, 2023
07743b8
port inductive proofs example
mitschabaude Jun 16, 2023
f854fe5
add script to run minimal snarkyjs tests
mitschabaude Jun 20, 2023
3455bb4
minor
mitschabaude Jun 20, 2023
95aa588
use smaller example in test
mitschabaude Jun 20, 2023
34af4ca
add a script to copy files
mitschabaude Jun 20, 2023
7062619
simplify
mitschabaude Jun 20, 2023
b9cd382
delete pointless file
mitschabaude Jun 22, 2023
5177ecd
clean up some build logic
mitschabaude Jun 22, 2023
6ce3f97
Merge pull request #997 from o1-labs/feature/revive-snarkyjs-ci-develop
mitschabaude Jun 22, 2023
d96078e
Merge branch 'main' into dannywillems/main-into-develop
dannywillems Jun 28, 2023
ff0a256
Merge pull request #1008 from o1-labs/dannywillems/main-into-develop
dannywillems Jun 29, 2023
ca92dd5
Merge branch 'main' into merge-main-develop
mitschabaude Jul 12, 2023
c3575df
bindings
mitschabaude Jul 12, 2023
30e5c55
Merge pull request #1030 from o1-labs/merge-main-develop
mitschabaude Jul 12, 2023
ade9b8d
Update snarkyjs-bindings with runtime table cfgs to create prover index
dannywillems Jul 10, 2023
8dbd205
Add info on how to test with github actions locally
dannywillems Jul 20, 2023
781fd9c
Merge branch 'develop' into feature/evaluate-selectors_develop
mrmr1993 Jul 20, 2023
547b500
Merge pull request #1042 from o1-labs/feature/evaluate-selectors_develop
dannywillems Jul 21, 2023
a30b1c0
Merge branch 'feature/evaluate-selectors_develop' into feature/evalua…
mrmr1993 Jul 23, 2023
cff4414
Merge branch 'feature/evaluate-optional-gate-selectors_develop' into …
mrmr1993 Jul 23, 2023
b15de69
Merge branch 'feature/stop-linearizing-optional-gate-selectors_develo…
mrmr1993 Jul 23, 2023
febca54
Update bindings
mrmr1993 Jul 23, 2023
be767c2
Update bindings
mrmr1993 Jul 24, 2023
104e2e6
Merge branch 'feature/remove-special-casing-of-lookups_develop' into …
mrmr1993 Jul 24, 2023
7b210a9
dump vks
mitschabaude Jul 26, 2023
8eea99a
Merge pull request #1041 from o1-labs/dannywillems/add-instruction-gh…
mitschabaude Jul 27, 2023
da3675e
Merge pull request #1044 from o1-labs/feature/evaluate-optional-gate-…
mitschabaude Jul 27, 2023
51e843f
better default for overrideWrapDomain, harden type
mitschabaude Jul 26, 2023
2690ac8
dump vks
mitschabaude Jul 27, 2023
50a1eeb
Merge branch 'develop' into feature/stop-linearizing-optional-gate-se…
mitschabaude Jul 27, 2023
28af219
Merge pull request #1046 from o1-labs/feature/stop-linearizing-option…
mitschabaude Jul 27, 2023
1e71a77
Merge remote-tracking branch 'origin/develop' into feature/evaluate-l…
dannywillems Jul 27, 2023
3f73d4d
Update bindings to 0866575c53ee8aaf8afd76590dc76fcee7991ab4
dannywillems Jul 27, 2023
802dcb9
CI: run for PR targeting any branch, not only berkeley/main/develop
dannywillems Jul 27, 2023
f80d0d0
Regenerate vk
dannywillems Jul 27, 2023
f9d21fc
Merge pull request #1049 from o1-labs/feature/evaluate-lookup-selecto…
mitschabaude Jul 27, 2023
2ac935a
Merge pull request #1052 from o1-labs/dannywillems/ci-run-for-any-pr-…
mitschabaude Jul 27, 2023
1cb7cba
Merge remote-tracking branch 'origin/develop' into dannywillems/updat…
dannywillems Jul 27, 2023
94dea2a
Bump up bindings
dannywillems Jul 27, 2023
684758b
Bump up bindings
dannywillems Jul 27, 2023
92e4fa0
Merge remote-tracking branch 'origin/develop' into dannywillems/updat…
dannywillems Jul 27, 2023
4b655cb
bindings and tweak example
mitschabaude Jul 27, 2023
50249d4
Bump up bindings
dannywillems Aug 1, 2023
0c76524
Merge bindings berkeley into develop
dannywillems Aug 2, 2023
4cb7a88
Merge branch 'berkeley' into dannywillems/merge-berkeley-into-develop…
dannywillems Aug 2, 2023
75ca922
Bump up bindings to 1d750291c11e3375d357a7c0a1ad0709d5476167
dannywillems Aug 2, 2023
c50a093
Bump up bindings again
dannywillems Aug 2, 2023
f558434
Merge pull request #1020 from o1-labs/dannywillems/update-bindings-wi…
dannywillems Aug 3, 2023
8e97584
Merge branch 'develop' into dannywillems/merge-berkeley-into-develop-…
dannywillems Aug 3, 2023
caea2ba
Bump up bindings
dannywillems Aug 3, 2023
75f9ed5
Bump up bindings after generating artefacts
dannywillems Aug 3, 2023
94ad98f
Bump up snarkyjs after artefacts generation
dannywillems Aug 3, 2023
6f6e181
Merge pull request #1060 from o1-labs/dannywillems/merge-berkeley-int…
dannywillems Aug 3, 2023
e0556a4
Merge branch 'develop' into dannywillems/add-lookup-table-to-prover-i…
dannywillems Aug 3, 2023
10e46c8
Bump up bindings with new artefacts
dannywillems Aug 14, 2023
631e578
Merge pull request #1027 from o1-labs/dannywillems/add-lookup-table-t…
dannywillems Aug 14, 2023
97c9f50
Merge pull request #1031 from o1-labs/dannywillems/runtime-table-to-p…
dannywillems Aug 14, 2023
1fdf728
Bump up snarkyjs-bindings
dannywillems Aug 15, 2023
f73ddb2
Merge pull request #1059 from o1-labs/dannywillems/snarkyjs-joo-globa…
dannywillems Aug 17, 2023
55f9ec5
Merge branch 'berkeley' into perf/loading-time-berkeley
mitschabaude Aug 21, 2023
047f735
fixup mina-signer web tsconfig
mitschabaude Aug 21, 2023
1ad67f8
Update bindings before regenerated artefacts
dannywillems Aug 21, 2023
91b09d0
Update bindings submodule after artefacts generation
dannywillems Aug 21, 2023
fce4f46
Merge pull request #1076 from o1-labs/dannywillems/lookup-verifier-index
dannywillems Aug 21, 2023
7e53c71
Update bindings after artefacts generation
dannywillems Aug 21, 2023
df33066
Merge pull request #1070 from o1-labs/dannywillems/expose-lookup-comm…
dannywillems Aug 21, 2023
e4f330c
bindings
mitschabaude Aug 22, 2023
82808cd
Merge branch 'perf/loading-time-berkeley' into perf/loading-time-develop
mitschabaude Aug 22, 2023
d81ca8c
Update local ledger implementation to match ledger intf (in bindings)
nholland94 Aug 21, 2023
9e97861
Bump up bindings to develop
dannywillems Aug 24, 2023
5884f06
Bump up bindings before artefacts generation
dannywillems Aug 24, 2023
bb38261
Bump up bindings after artefacts generation
dannywillems Aug 24, 2023
0754d1c
Bump up bindings after removing extra runtime_tables param
dannywillems Aug 24, 2023
535c9c7
Merge branch 'berkeley' into perf/loading-time-develop
mitschabaude Aug 25, 2023
5460a51
bindings
mitschabaude Aug 25, 2023
52747fb
Merge pull request #1087 from o1-labs/perf/loading-time-develop
mitschabaude Aug 28, 2023
ee2ae99
Merge branch 'develop' into dannywillems/lookup-gate-runtime
dannywillems Aug 29, 2023
fa9fce1
Update bindings to include bcfc60c3722da2b95e525901916bcf3115167c83
dannywillems Aug 29, 2023
208b42f
Merge pull request #1097 from o1-labs/feature/custom-gates-develop
dannywillems Aug 30, 2023
44523e5
Merge branch 'develop' into dannywillems/lookup-gate-runtime
dannywillems Aug 30, 2023
0863d64
Update bindings for public input evaluation
mrmr1993 Sep 1, 2023
f4dd0ec
Bump bindings again
mrmr1993 Sep 1, 2023
ae2cffa
Merge commit 'fa9fce188aafe7befa1124813e0d2d94fed5046d' into merge-ba…
mrmr1993 Sep 5, 2023
b783932
Update bindings to fixup
dannywillems Sep 5, 2023
ddb7c13
Regenerate verification key
dannywillems Sep 5, 2023
28d428c
Merge pull request #1105 from o1-labs/dannywillems/fixup-merge-back-t…
rbonichon Sep 6, 2023
768f068
Merge pull request #1102 from o1-labs/merge-back-to-develop-2023-09-05
dannywillems Sep 6, 2023
ad6ac2b
Bump up bindings after git merge develop
dannywillems Sep 6, 2023
65f0a19
Merge branch 'develop' into dannywillems/lookup-gate-runtime
dannywillems Sep 6, 2023
5471fc3
Merge pull request #1091 from o1-labs/dannywillems/lookup-gate-runtime
dannywillems Sep 6, 2023
3170b62
Merge branch 'develop' into feature/fix-chunked-commitments
mrmr1993 Sep 11, 2023
dc214ac
Update snarkyjs-bindings
rbonichon Aug 24, 2023
9d317d4
bindings
mitschabaude Sep 12, 2023
7641ed2
Merge pull request #1098 from o1-labs/rb/feature/custom-gates
rbonichon Sep 12, 2023
9042677
Update bindings
nholland94 Sep 12, 2023
d6b94a4
Update bindings for public input evals
mrmr1993 Sep 13, 2023
ae7d046
Merge branch 'develop' into feature/fix-chunked-commitments
mrmr1993 Sep 13, 2023
d3acc89
Update bindings for chunked zero-knowledge
mrmr1993 Sep 13, 2023
4be0810
Merge pull request #1099 from o1-labs/feature/fix-chunked-commitments
mitschabaude Sep 15, 2023
992c431
Merge pull request #1122 from o1-labs/feature/chunked-zero-knowledge
mitschabaude Sep 15, 2023
8314d7b
Merge commit 'd3acc89014a542fc40d51720fedfdff2ff9abc20' into merge-ba…
mrmr1993 Sep 19, 2023
a24d325
Bump up bindings to develop
dannywillems Sep 21, 2023
21bea44
Bump up bindings after artefacts generation
dannywillems Sep 21, 2023
fb58d4d
Bump up bindings to land a prettier fix
dannywillems Sep 21, 2023
4b6157b
Update rust version to nightly release close 1.72
rbonichon Sep 27, 2023
ea0630b
Bump up bindings before regenerate artefacts
dannywillems Oct 3, 2023
675e113
Update bindings after artefacts generation
dannywillems Oct 3, 2023
d5b4a4b
Updating bindings after updating to wasm-pack 0.12.1
dannywillems Oct 3, 2023
2185825
Bump up bindings after artefacts generation
dannywillems Oct 3, 2023
409959d
Bump up bindings after squashing
dannywillems Oct 3, 2023
b72a4ac
Update bindings to use wasm-bindgen 0.2.85
dannywillems Oct 4, 2023
db66ead
Bump up bindings before running npm run bindings
dannywillems Oct 4, 2023
1f5e108
Bump up bindings after stopping using ptr attr
dannywillems Oct 4, 2023
8a5df31
Merge commit '8314d7b3540e004ec51dc6ba77e1e6b1d0c76dc6' into dannywil…
mrmr1993 Oct 4, 2023
4bb0342
Merge pull request #1128 from o1-labs/dannywillems/bump-up-bindings-2…
dannywillems Oct 5, 2023
a7e2cc7
Merge branch 'develop' into rb/update-rust-version
dannywillems Oct 5, 2023
2333866
fix(buildWeb.js): replace 'init' with '__wbg_init'
MartinMinkov Oct 5, 2023
d04bde0
chore(bindings): update subproject commit hash to 9cef4aa20bb9f8ab324…
MartinMinkov Oct 5, 2023
7d175af
Merge pull request #1132 from o1-labs/rb/update-rust-version
dannywillems Oct 6, 2023
d343b5b
bindings
mitschabaude Oct 9, 2023
f5865a1
bindings
mitschabaude Oct 9, 2023
b7aa6c7
Merge pull request #1164 from o1-labs/feat/fix-wasm-bindgen-init
mitschabaude Oct 9, 2023
c6d0831
Merge branch 'develop' into dannywillems/attempt-to-bump-up-wasm-bind…
mitschabaude Oct 9, 2023
6396ace
bindings
mitschabaude Oct 9, 2023
78bf69c
Merge pull request #1160 from o1-labs/dannywillems/attempt-to-bump-up…
mitschabaude Oct 9, 2023
c59f353
Merge branch 'main' into merge-main-develop
mitschabaude Oct 9, 2023
d4e4cfb
bindings
mitschabaude Oct 9, 2023
51c8a75
Merge pull request #1168 from o1-labs/merge-main-develop
mitschabaude Oct 11, 2023
c282ecf
bindings
mitschabaude Oct 11, 2023
2308b74
Merge branch 'main' into merge-develop-back
mitschabaude Oct 11, 2023
f34dcff
update bindings, vks, changelog
mitschabaude Oct 11, 2023
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
9 changes: 9 additions & 0 deletions README-dev.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,12 @@ The following branches are compatible:
| branches | rampup -> main -> main |
| | berkeley -> berkeley -> berkeley |
| | develop -> develop -> develop |

## Run the GitHub actions locally

<!-- The test example should stay in sync with a real value set in .github/workflows/build-actions.yml -->
You can execute the CI locally by using [act](https://github.com/nektos/act). First generate a GitHub token and use:
```
act -j Build-And-Test-Server --matrix test_type:"Simple integration tests" -s $GITHUB_TOKEN
```
to execute the job "Build-And-Test-Server for the test type `Simple integration tests`.
2 changes: 1 addition & 1 deletion src/bindings
2 changes: 1 addition & 1 deletion src/build/buildWeb.js
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ function rewriteBundledWasmBindings(src) {
let exportSlice = src.slice(i);
let defaultExport = exportSlice.match(/\w* as default/)[0];
exportSlice = exportSlice
.replace(defaultExport, `default: init`)
.replace(defaultExport, `default: __wbg_init`)
.replace('export', 'return');
src = src.slice(0, i) + exportSlice;

Expand Down
20 changes: 10 additions & 10 deletions src/examples/regression_test.json

Large diffs are not rendered by default.

10 changes: 3 additions & 7 deletions src/lib/provable-context.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Context } from './global-context.js';
import { Gate, JsonGate, Snarky } from '../snarky.js';
import { bytesToBigInt } from '../bindings/crypto/bigint-helpers.js';
import { parseHexString } from '../bindings/crypto/bigint-helpers.js';
import { prettifyStacktrace } from './errors.js';

// internal API
Expand Down Expand Up @@ -105,12 +105,8 @@ function constraintSystem<T>(f: () => T) {
// helpers

function gatesFromJson(cs: { gates: JsonGate[]; public_input_size: number }) {
let gates: Gate[] = cs.gates.map(({ typ, wires, coeffs: byteCoeffs }) => {
let coeffs = [];
for (let coefficient of byteCoeffs) {
let arr = new Uint8Array(coefficient);
coeffs.push(bytesToBigInt(arr).toString());
}
let gates: Gate[] = cs.gates.map(({ typ, wires, coeffs: hexCoeffs }) => {
let coeffs = hexCoeffs.map(hex => parseHexString(hex).toString());
return { type: typ, wires, coeffs };
});
return { publicInputSize: cs.public_input_size, gates };
Expand Down
2 changes: 1 addition & 1 deletion src/snarky.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ declare const Snarky: {
type JsonGate = {
typ: string;
wires: { row: number; col: number }[];
coeffs: number[][];
coeffs: string[];
};
type JsonConstraintSystem = { gates: JsonGate[]; public_input_size: number };

Expand Down
Loading