From 8639612aa18a76d36587ffac07c2d2574aa90a65 Mon Sep 17 00:00:00 2001 From: HackMD Date: Sun, 14 Jun 2020 00:50:52 +0000 Subject: [PATCH 01/26] test --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 50806f0b87..3d1a5bead1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,15 @@ # The Leo Programming Language + +```mermaid +gantt + title Test Diagram + + section Section + A task :a1, 2014-01-01, 30d + Another task :after a1 , 20d + +``` + * Programs should be formatted: 1. Import definitions 2. Circuit definitions From 5afe541b3e672ea457063ccfb065dd207cd3a16f Mon Sep 17 00:00:00 2001 From: howardwu Date: Sat, 13 Jun 2020 17:59:35 -0700 Subject: [PATCH 02/26] Adds .github --- .github/workflows/markdown.yml | 2 + Cargo.lock | 98 +++++++++++++++++++++++++++------- 2 files changed, 80 insertions(+), 20 deletions(-) create mode 100644 .github/workflows/markdown.yml diff --git a/.github/workflows/markdown.yml b/.github/workflows/markdown.yml new file mode 100644 index 0000000000..8297fe6c62 --- /dev/null +++ b/.github/workflows/markdown.yml @@ -0,0 +1,2 @@ +- name: Compile Mermaid Markdown + uses: neenjaw/compile-mermaid-markdown-action@0.2.0 diff --git a/Cargo.lock b/Cargo.lock index fc008fd0df..94b6082dfd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -105,7 +105,7 @@ checksum = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330" dependencies = [ "byte-tools", "crypto-mac", - "digest", + "digest 0.8.1", "opaque-debug", ] @@ -118,7 +118,19 @@ dependencies = [ "block-padding", "byte-tools", "byteorder", - "generic-array", + "generic-array 0.12.3", +] + +[[package]] +name = "block-buffer" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbcf92448676f82bb7a334c58bbce8b0d43580fb5362a9d608b18879d12a3d31" +dependencies = [ + "block-padding", + "byte-tools", + "byteorder", + "generic-array 0.14.2", ] [[package]] @@ -265,7 +277,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" dependencies = [ - "generic-array", + "generic-array 0.12.3", "subtle", ] @@ -316,7 +328,16 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" dependencies = [ - "generic-array", + "generic-array 0.12.3", +] + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array 0.14.2", ] [[package]] @@ -407,6 +428,16 @@ dependencies = [ "typenum", ] +[[package]] +name = "generic-array" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac746a5f3bbfdadd6106868134545e684693d54d9d44f6e9588a7d54af0bf980" +dependencies = [ + "typenum", + "version_check", +] + [[package]] name = "getopts" version = "0.2.21" @@ -555,7 +586,7 @@ dependencies = [ "leo-types", "log", "rand", - "sha2", + "sha2 0.8.1", "snarkos-curves", "snarkos-errors", "snarkos-gadgets", @@ -990,18 +1021,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.104" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" +checksum = "c9124df5b40cbd380080b2cc6ab894c040a3070d995f5c9dc77e18c34a8ae37d" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.104" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" +checksum = "3f2c3ac8e6ca1e9c80b8be1023940162bf81ae3cffbb1809474152f2ce1eb250" dependencies = [ "proc-macro2 1.0.9", "quote 1.0.3", @@ -1025,8 +1056,8 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" dependencies = [ - "block-buffer", - "digest", + "block-buffer 0.7.3", + "digest 0.8.1", "fake-simd", "opaque-debug", ] @@ -1037,8 +1068,20 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27044adfd2e1f077f649f59deb9490d3941d674002f7d062870a60ebe9bd47a0" dependencies = [ - "block-buffer", - "digest", + "block-buffer 0.7.3", + "digest 0.8.1", + "fake-simd", + "opaque-debug", +] + +[[package]] +name = "sha2" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72377440080fd008550fe9b441e854e43318db116f90181eef92e9ae9aedab48" +dependencies = [ + "block-buffer 0.8.0", + "digest 0.9.0", "fake-simd", "opaque-debug", ] @@ -1070,11 +1113,11 @@ version = "0.8.0" dependencies = [ "blake2", "derivative", - "digest", + "digest 0.8.1", "rand", "rand_chacha", "rayon", - "sha2", + "sha2 0.9.0", "smallvec", "snarkos-errors", "snarkos-models", @@ -1088,11 +1131,22 @@ version = "0.8.0" dependencies = [ "derivative", "rand", + "rand_xorshift", + "serde", "snarkos-errors", "snarkos-models", "snarkos-utilities", ] +[[package]] +name = "snarkos-derives" +version = "0.1.0" +dependencies = [ + "proc-macro2 1.0.9", + "quote 1.0.3", + "syn 1.0.16", +] + [[package]] name = "snarkos-errors" version = "0.8.0" @@ -1110,7 +1164,7 @@ name = "snarkos-gadgets" version = "0.8.0" dependencies = [ "derivative", - "digest", + "digest 0.8.1", "snarkos-algorithms", "snarkos-curves", "snarkos-errors", @@ -1122,9 +1176,11 @@ dependencies = [ name = "snarkos-models" version = "0.8.0" dependencies = [ + "bincode", "derivative", "rand", "rand_xorshift", + "serde", "smallvec", "snarkos-errors", "snarkos-utilities", @@ -1139,6 +1195,8 @@ name = "snarkos-utilities" version = "0.8.0" dependencies = [ "rand", + "snarkos-derives", + "thiserror", ] [[package]] @@ -1219,18 +1277,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.16" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d12a1dae4add0f0d568eebc7bf142f145ba1aa2544cafb195c76f0f409091b60" +checksum = "b13f926965ad00595dd129fa12823b04bbf866e9085ab0a5f2b05b850fbfc344" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.16" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f34e0c1caaa462fd840ec6b768946ea1e7842620d94fe29d5b847138f521269" +checksum = "893582086c2f98cde18f906265a65b5030a074b1046c674ae898be6519a7f479" dependencies = [ "proc-macro2 1.0.9", "quote 1.0.3", From 95643f882724c9f03068379c1fcddd777a5afb2e Mon Sep 17 00:00:00 2001 From: howardwu Date: Sat, 13 Jun 2020 18:00:43 -0700 Subject: [PATCH 03/26] Update markdown.yml --- .github/workflows/markdown.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/markdown.yml b/.github/workflows/markdown.yml index 8297fe6c62..cecd46c495 100644 --- a/.github/workflows/markdown.yml +++ b/.github/workflows/markdown.yml @@ -1,2 +1,2 @@ -- name: Compile Mermaid Markdown - uses: neenjaw/compile-mermaid-markdown-action@0.2.0 +name: Compile Mermaid Markdown +uses: neenjaw/compile-mermaid-markdown-action@0.2.0 From 03f562ccfb43f2098f555f0f046fca203aeb8d2c Mon Sep 17 00:00:00 2001 From: howardwu Date: Sat, 13 Jun 2020 18:05:40 -0700 Subject: [PATCH 04/26] Update markdown.yml --- .github/workflows/markdown.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/markdown.yml b/.github/workflows/markdown.yml index cecd46c495..34dbf5259b 100644 --- a/.github/workflows/markdown.yml +++ b/.github/workflows/markdown.yml @@ -1,2 +1,12 @@ -name: Compile Mermaid Markdown -uses: neenjaw/compile-mermaid-markdown-action@0.2.0 +name: Markdown Compiler + +on: [push] + +jobs: + compile: + name: Compile Markdown + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Compile mermaid + uses: neenjaw/compile-mermaid-markdown-action@0.2.0 From 192f15e678b582f167e822ac9a3add854dfc640f Mon Sep 17 00:00:00 2001 From: howardwu Date: Sat, 13 Jun 2020 18:10:42 -0700 Subject: [PATCH 05/26] Update markdown.yml --- .github/workflows/markdown.yml | 38 ++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/.github/workflows/markdown.yml b/.github/workflows/markdown.yml index 34dbf5259b..0e2b44a815 100644 --- a/.github/workflows/markdown.yml +++ b/.github/workflows/markdown.yml @@ -1,12 +1,42 @@ name: Markdown Compiler -on: [push] +on: + push: + paths: + - '**/*.md' jobs: - compile: - name: Compile Markdown + build: + name: Run runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + + - name: Get changed files + id: getfile + run: echo "::set-output name=files::$(git diff-tree --no-commit-id --name-only -r ${{ github.sha }} | grep -e '.*\.md$' | xargs)" + + - name: MD files changed + run: echo ${{ steps.getfile.outputs.files }} + - name: Compile mermaid - uses: neenjaw/compile-mermaid-markdown-action@0.2.0 + uses: neenjaw/compile-mermaid-markdown-action@master + with: + files: ${{ steps.getfile.outputs.files }} + output: '.resources' + env: + HIDE_CODEBLOCKS: 1 + + - name: Show changes + run: git status + + - name: Commit files + run: | + git config --local user.email "action@github.com" + git config --local user.name "GitHub Action" + git commit -m "Add changes" -a + + - name: Push changes + uses: ad-m/github-push-action@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} From f1aed8f2c10ea172aadd83d708a360e5891b7fdd Mon Sep 17 00:00:00 2001 From: howardwu Date: Sat, 13 Jun 2020 18:11:49 -0700 Subject: [PATCH 06/26] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3d1a5bead1..9d04b18257 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ gantt section Section A task :a1, 2014-01-01, 30d - Another task :after a1 , 20d + Another task :after a1 , 20d ``` From d127ed50f34469ee02841eddf791266d61e86664 Mon Sep 17 00:00:00 2001 From: howardwu Date: Sat, 13 Jun 2020 18:18:44 -0700 Subject: [PATCH 07/26] Adds empty issue templates and resources folder --- .github/ISSUE_TEMPLATE/01_feature_request.md | 0 .github/ISSUE_TEMPLATE/02_bug_report.md | 0 .github/workflows/markdown.yml | 2 +- .resources/init | 0 4 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 .github/ISSUE_TEMPLATE/01_feature_request.md create mode 100644 .github/ISSUE_TEMPLATE/02_bug_report.md create mode 100644 .resources/init diff --git a/.github/ISSUE_TEMPLATE/01_feature_request.md b/.github/ISSUE_TEMPLATE/01_feature_request.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.github/ISSUE_TEMPLATE/02_bug_report.md b/.github/ISSUE_TEMPLATE/02_bug_report.md new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.github/workflows/markdown.yml b/.github/workflows/markdown.yml index 0e2b44a815..4848b47b2b 100644 --- a/.github/workflows/markdown.yml +++ b/.github/workflows/markdown.yml @@ -34,7 +34,7 @@ jobs: run: | git config --local user.email "action@github.com" git config --local user.name "GitHub Action" - git commit -m "Add changes" -a + git commit -m "Add markdown changes" -a - name: Push changes uses: ad-m/github-push-action@master diff --git a/.resources/init b/.resources/init new file mode 100644 index 0000000000..e69de29bb2 From f278720ed286fd23c62280d6ae50834b44c951ef Mon Sep 17 00:00:00 2001 From: howardwu Date: Sat, 13 Jun 2020 18:22:29 -0700 Subject: [PATCH 08/26] Update README --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 9d04b18257..1619744457 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,16 @@ gantt ``` +```mermaid +gantt + title Test Diagram + + section Section + A task :a1, 2014-01-01, 30d + Another task :after a1 , 20d + +``` + * Programs should be formatted: 1. Import definitions 2. Circuit definitions From f758242a8ed94d8638144567dc6dcbb1ab865f43 Mon Sep 17 00:00:00 2001 From: howardwu Date: Sat, 13 Jun 2020 18:26:26 -0700 Subject: [PATCH 09/26] Update README --- .github/workflows/markdown.yml | 2 ++ README.md | 11 ----------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/markdown.yml b/.github/workflows/markdown.yml index 4848b47b2b..bb907aab06 100644 --- a/.github/workflows/markdown.yml +++ b/.github/workflows/markdown.yml @@ -11,6 +11,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + with: + fetch-depth: 2 - name: Get changed files id: getfile diff --git a/README.md b/README.md index 1619744457..d16cb2bf28 100644 --- a/README.md +++ b/README.md @@ -7,17 +7,6 @@ gantt section Section A task :a1, 2014-01-01, 30d Another task :after a1 , 20d - -``` - -```mermaid -gantt - title Test Diagram - - section Section - A task :a1, 2014-01-01, 30d - Another task :after a1 , 20d - ``` * Programs should be formatted: From cb1a789fccb46183119fc50911930862fbc55c6a Mon Sep 17 00:00:00 2001 From: howardwu Date: Mon, 15 Jun 2020 15:24:36 -0700 Subject: [PATCH 10/26] Update README --- .github/workflows/markdown.yml | 1 + README.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/markdown.yml b/.github/workflows/markdown.yml index bb907aab06..c0dbc0b486 100644 --- a/.github/workflows/markdown.yml +++ b/.github/workflows/markdown.yml @@ -28,6 +28,7 @@ jobs: output: '.resources' env: HIDE_CODEBLOCKS: 1 + ABSOLUTE_IMAGE_LINKS: 1 - name: Show changes run: git status diff --git a/README.md b/README.md index d16cb2bf28..7944142db8 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ gantt section Section A task :a1, 2014-01-01, 30d - Another task :after a1 , 20d + Another task :after a1, 20d ``` * Programs should be formatted: From 33b2938d2b4d75720c7f42504b3b1cff9ffb19a4 Mon Sep 17 00:00:00 2001 From: howardwu Date: Mon, 15 Jun 2020 15:32:11 -0700 Subject: [PATCH 11/26] Update README --- .github/workflows/markdown.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/markdown.yml b/.github/workflows/markdown.yml index c0dbc0b486..eff20e38a4 100644 --- a/.github/workflows/markdown.yml +++ b/.github/workflows/markdown.yml @@ -10,7 +10,7 @@ jobs: name: Run runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@master with: fetch-depth: 2 diff --git a/README.md b/README.md index 7944142db8..bdc279cb97 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ gantt section Section A task :a1, 2014-01-01, 30d - Another task :after a1, 20d + Another task :after a1, 20d ``` * Programs should be formatted: From 0747b6f5d9104081a928c209108f44c6eaf5674a Mon Sep 17 00:00:00 2001 From: howardwu Date: Mon, 15 Jun 2020 16:26:43 -0700 Subject: [PATCH 12/26] Update README --- .github/workflows/markdown.yml | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/markdown.yml b/.github/workflows/markdown.yml index eff20e38a4..e7b15967f2 100644 --- a/.github/workflows/markdown.yml +++ b/.github/workflows/markdown.yml @@ -10,7 +10,7 @@ jobs: name: Run runs-on: ubuntu-latest steps: - - uses: actions/checkout@master + - uses: actions/checkout@v2 with: fetch-depth: 2 @@ -40,6 +40,6 @@ jobs: git commit -m "Add markdown changes" -a - name: Push changes - uses: ad-m/github-push-action@master + uses: ad-m/github-push-action with: github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index bdc279cb97..7944142db8 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ gantt section Section A task :a1, 2014-01-01, 30d - Another task :after a1, 20d + Another task :after a1, 20d ``` * Programs should be formatted: From c9ba4797b6a039aa5278e68ac2aedcd3b37cef88 Mon Sep 17 00:00:00 2001 From: howardwu Date: Mon, 15 Jun 2020 17:02:14 -0700 Subject: [PATCH 13/26] Update README --- .github/workflows/markdown.yml | 3 ++- README.md | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/markdown.yml b/.github/workflows/markdown.yml index e7b15967f2..468befc479 100644 --- a/.github/workflows/markdown.yml +++ b/.github/workflows/markdown.yml @@ -40,6 +40,7 @@ jobs: git commit -m "Add markdown changes" -a - name: Push changes - uses: ad-m/github-push-action + uses: ad-m/github-push-action@master with: github_token: ${{ secrets.GITHUB_TOKEN }} + branch: ${{ github.head_ref }} diff --git a/README.md b/README.md index 7944142db8..4af899ced7 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ gantt title Test Diagram section Section - A task :a1, 2014-01-01, 30d + A task :a1, 2014-01-01, 30d Another task :after a1, 20d ``` From 7ce86f854e3c434bbdef9376b814a89b86481619 Mon Sep 17 00:00:00 2001 From: howardwu Date: Mon, 15 Jun 2020 17:06:06 -0700 Subject: [PATCH 14/26] Update README --- .github/workflows/markdown.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/markdown.yml b/.github/workflows/markdown.yml index 468befc479..2e85bbe556 100644 --- a/.github/workflows/markdown.yml +++ b/.github/workflows/markdown.yml @@ -43,4 +43,4 @@ jobs: uses: ad-m/github-push-action@master with: github_token: ${{ secrets.GITHUB_TOKEN }} - branch: ${{ github.head_ref }} + branch: ${{ github.ref }} diff --git a/README.md b/README.md index 4af899ced7..7944142db8 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ gantt title Test Diagram section Section - A task :a1, 2014-01-01, 30d + A task :a1, 2014-01-01, 30d Another task :after a1, 20d ``` From 883dd8014d255e5c258c5dfbed0d21abf378958e Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 16 Jun 2020 00:07:57 +0000 Subject: [PATCH 15/26] Add markdown changes --- README.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7944142db8..14cfc50bed 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,10 @@ # The Leo Programming Language + +![~mermaid diagram 1~](/.resources/README-md-1.png) +
+ Mermaid markup + ```mermaid gantt title Test Diagram @@ -9,6 +14,9 @@ gantt Another task :after a1, 20d ``` +
+ + * Programs should be formatted: 1. Import definitions 2. Circuit definitions @@ -567,4 +575,4 @@ cargo install --path . - Change `target` directory to some other directory to avoid collision. - Figure out how `leo prove` should take in assignments. -- Come up with a serialization format for `.leo.pk`, `.leo.vk`, and `.leo.proof`. \ No newline at end of file +- Come up with a serialization format for `.leo.pk`, `.leo.vk`, and `.leo.proof`. From 08acdf2be8802f5943c3c720f68d04cf539150b3 Mon Sep 17 00:00:00 2001 From: howardwu Date: Mon, 15 Jun 2020 17:12:29 -0700 Subject: [PATCH 16/26] Update README --- .github/workflows/markdown.yml | 3 ++- README.md | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/markdown.yml b/.github/workflows/markdown.yml index 2e85bbe556..3cf97240ae 100644 --- a/.github/workflows/markdown.yml +++ b/.github/workflows/markdown.yml @@ -37,7 +37,8 @@ jobs: run: | git config --local user.email "action@github.com" git config --local user.name "GitHub Action" - git commit -m "Add markdown changes" -a + git add . + git commit -m "Add markdown changes" - name: Push changes uses: ad-m/github-push-action@master diff --git a/README.md b/README.md index 7944142db8..0877720276 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ gantt title Test Diagram section Section - A task :a1, 2014-01-01, 30d - Another task :after a1, 20d + A task :a1, 2014-01-01, 30d + Another task :after a1, 20d ``` * Programs should be formatted: From a725a2d9995e0b2dab0b1e61b2321ab425a20dda Mon Sep 17 00:00:00 2001 From: howardwu Date: Mon, 15 Jun 2020 17:38:14 -0700 Subject: [PATCH 17/26] Update markdown script --- .github/workflows/markdown.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/markdown.yml b/.github/workflows/markdown.yml index 3cf97240ae..5499693f2f 100644 --- a/.github/workflows/markdown.yml +++ b/.github/workflows/markdown.yml @@ -38,7 +38,7 @@ jobs: git config --local user.email "action@github.com" git config --local user.name "GitHub Action" git add . - git commit -m "Add markdown changes" + git diff-index --quiet HEAD || git commit -m "Add markdown changes" - name: Push changes uses: ad-m/github-push-action@master From 386a85b594d82d8a8631065b30567f24afd8e63d Mon Sep 17 00:00:00 2001 From: howardwu Date: Mon, 15 Jun 2020 17:39:12 -0700 Subject: [PATCH 18/26] Update README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 16449999fa..14cfc50bed 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ gantt title Test Diagram section Section - A task :a1, 2014-01-01, 30d - Another task :after a1, 20d + A task :a1, 2014-01-01, 30d + Another task :after a1, 20d ``` From 19c908c7df5a8eb554e03a55e4d7c59c4adcc6a3 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 16 Jun 2020 00:40:51 +0000 Subject: [PATCH 19/26] Add markdown changes --- .resources/README-md-1.png | Bin 0 -> 7653 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .resources/README-md-1.png diff --git a/.resources/README-md-1.png b/.resources/README-md-1.png new file mode 100644 index 0000000000000000000000000000000000000000..0fc574aedd73b7b37e8c8db5542f81f3761bae1d GIT binary patch literal 7653 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 l%nTU+Ni?#*{r_* Date: Tue, 16 Jun 2020 01:13:59 +0000 Subject: [PATCH 20/26] Update README From 4720cc2607f4e5944897e9889385565356b05575 Mon Sep 17 00:00:00 2001 From: HackMD Date: Tue, 16 Jun 2020 01:13:59 +0000 Subject: [PATCH 21/26] Update README From 25fdc766cc1ca631e437f16e5da86d96545a3b1e Mon Sep 17 00:00:00 2001 From: HackMD Date: Tue, 16 Jun 2020 01:13:48 +0000 Subject: [PATCH 22/26] before pull from update/markdown --- README.md | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 14cfc50bed..1ec5940a60 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,20 @@ # The Leo Programming Language - -![~mermaid diagram 1~](/.resources/README-md-1.png) -
- Mermaid markup +## Compiler Architecture ```mermaid -gantt - title Test Diagram - - section Section - A task :a1, 2014-01-01, 30d - Another task :after a1, 20d +graph LR + Pass1(Syntax Parser) -- ast --> Pass2(Type Resolver) + + Pass2 -- imports --> Pass3(Import Resolver) + Pass3 -- statements --> Pass4 + + Pass2 -- statements --> Pass4(Synthesizer) + + Pass4 -- constraints --> Pass5(Circuit) ``` -
- +## Language Specification * Programs should be formatted: 1. Import definitions @@ -575,4 +574,4 @@ cargo install --path . - Change `target` directory to some other directory to avoid collision. - Figure out how `leo prove` should take in assignments. -- Come up with a serialization format for `.leo.pk`, `.leo.vk`, and `.leo.proof`. +- Come up with a serialization format for `.leo.pk`, `.leo.vk`, and `.leo.proof`. \ No newline at end of file From 09cc76c09a7c5bc3e574c3a9f9163ca0595c6299 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Tue, 16 Jun 2020 01:18:30 +0000 Subject: [PATCH 23/26] Add markdown changes --- .resources/README-md-1.png | Bin 7653 -> 14454 bytes README.md | 10 +++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.resources/README-md-1.png b/.resources/README-md-1.png index 0fc574aedd73b7b37e8c8db5542f81f3761bae1d..e8b295e7929202d00de1292bc67ede719bf15bc7 100644 GIT binary patch literal 14454 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 XLV1pgB@*x=A(9}U7;h%``!D|w2NeKJ literal 7653 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 l%nTU+Ni?#*{r_* +![~mermaid diagram 1~](/.resources/README-md-1.png) +
+ Mermaid markup + ```mermaid graph LR Pass1(Syntax Parser) -- ast --> Pass2(Type Resolver) @@ -14,6 +19,9 @@ graph LR Pass4 -- constraints --> Pass5(Circuit) ``` +
+ + ## Language Specification * Programs should be formatted: @@ -574,4 +582,4 @@ cargo install --path . - Change `target` directory to some other directory to avoid collision. - Figure out how `leo prove` should take in assignments. -- Come up with a serialization format for `.leo.pk`, `.leo.vk`, and `.leo.proof`. \ No newline at end of file +- Come up with a serialization format for `.leo.pk`, `.leo.vk`, and `.leo.proof`. From 17e241ae414de08b570d2dec58af46e0d94d4ce1 Mon Sep 17 00:00:00 2001 From: collin Date: Mon, 15 Jun 2020 18:27:53 -0700 Subject: [PATCH 24/26] remove tmp folder --- tmp/.gitignore | 2 -- tmp/Leo.toml | 3 --- tmp/inputs/inputs.leo | 1 - tmp/src/main.leo | 9 --------- 4 files changed, 15 deletions(-) delete mode 100644 tmp/.gitignore delete mode 100644 tmp/Leo.toml delete mode 100644 tmp/inputs/inputs.leo delete mode 100644 tmp/src/main.leo diff --git a/tmp/.gitignore b/tmp/.gitignore deleted file mode 100644 index ee3b8ff567..0000000000 --- a/tmp/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/output -/.leo diff --git a/tmp/Leo.toml b/tmp/Leo.toml deleted file mode 100644 index 36afb9b7ec..0000000000 --- a/tmp/Leo.toml +++ /dev/null @@ -1,3 +0,0 @@ -[package] -name = "tmp" -version = "0.1.0" diff --git a/tmp/inputs/inputs.leo b/tmp/inputs/inputs.leo deleted file mode 100644 index 15685c3c69..0000000000 --- a/tmp/inputs/inputs.leo +++ /dev/null @@ -1 +0,0 @@ -[main] diff --git a/tmp/src/main.leo b/tmp/src/main.leo deleted file mode 100644 index f694486c52..0000000000 --- a/tmp/src/main.leo +++ /dev/null @@ -1,9 +0,0 @@ -function test(p: public bool) { - -} - -// The 'pedersen_hash' main function. -function main() { - let a = true; - test(a); -} From 0168902a7d1fa0a8576a0240a00a690ff292738b Mon Sep 17 00:00:00 2001 From: collin Date: Mon, 15 Jun 2020 19:32:37 -0700 Subject: [PATCH 25/26] update snarkos master --- compiler/tests/field/mod.rs | 2 +- compiler/tests/group/mod.rs | 2 +- types/src/inputs/input_fields.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/compiler/tests/field/mod.rs b/compiler/tests/field/mod.rs index 1c2c9f889b..db3bf89491 100644 --- a/compiler/tests/field/mod.rs +++ b/compiler/tests/field/mod.rs @@ -16,7 +16,7 @@ use leo_types::InputValue; use snarkos_curves::edwards_bls12::Fq; use snarkos_gadgets::curves::edwards_bls12::FqGadget; use snarkos_models::{ - curves::{Field, PrimeField}, + curves::{One, PrimeField, Zero}, gadgets::{ curves::field::FieldGadget, r1cs::{ConstraintSystem, TestConstraintSystem}, diff --git a/compiler/tests/group/mod.rs b/compiler/tests/group/mod.rs index 46aeea7a51..f0c32488b1 100644 --- a/compiler/tests/group/mod.rs +++ b/compiler/tests/group/mod.rs @@ -12,7 +12,7 @@ use leo_types::InputValue; use snarkos_curves::edwards_bls12::{EdwardsAffine, Fq}; use snarkos_gadgets::curves::edwards_bls12::EdwardsBlsGadget; use snarkos_models::{ - curves::Group, + curves::Zero, gadgets::{r1cs::TestConstraintSystem, utilities::alloc::AllocGadget}, }; use std::str::FromStr; diff --git a/types/src/inputs/input_fields.rs b/types/src/inputs/input_fields.rs index 30f3324b55..2f1157ddd3 100644 --- a/types/src/inputs/input_fields.rs +++ b/types/src/inputs/input_fields.rs @@ -1,7 +1,7 @@ use crate::InputValue; use leo_inputs::{types::IntegerType, InputParserError}; -use snarkos_models::curves::{Field, PairingEngine}; +use snarkos_models::curves::{One, PairingEngine, Zero}; use std::str::FromStr; pub struct InputFields(pub Vec); From 7a8aaf8166e2a0308fa7ac135abb18b68bd420ca Mon Sep 17 00:00:00 2001 From: howardwu Date: Mon, 15 Jun 2020 21:27:25 -0700 Subject: [PATCH 26/26] Improves compilation time by turning off unused features in snarkOS --- Cargo.lock | 231 ------------------------------------------ Cargo.toml | 10 +- compiler/Cargo.toml | 8 +- leo-inputs/Cargo.toml | 10 +- types/Cargo.toml | 4 +- 5 files changed, 16 insertions(+), 247 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b76a5f043f..99ca8aa6b6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -67,30 +67,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bindgen" -version = "0.53.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c72a978d268b1d70b0e963217e60fdabd9523a941457a6c42a7315d15c7e89e5" -dependencies = [ - "bitflags", - "cexpr", - "cfg-if", - "clang-sys", - "clap", - "env_logger", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "proc-macro2 1.0.9", - "quote 1.0.3", - "regex", - "rustc-hash", - "shlex", - "which", -] - [[package]] name = "bitflags" version = "1.2.1" @@ -159,18 +135,6 @@ name = "cc" version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8dae9c4b8fedcae85592ba623c4fd08cfdab3e3b72d6df780c6ead964a69bfff" -dependencies = [ - "rayon", -] - -[[package]] -name = "cexpr" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" -dependencies = [ - "nom", -] [[package]] name = "cfg-if" @@ -187,17 +151,6 @@ dependencies = [ "envmnt", ] -[[package]] -name = "clang-sys" -version = "0.29.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe6837df1d5cba2397b835c8530f51723267e16abbf83892e9e5af4f0e5dd10a" -dependencies = [ - "glob", - "libc", - "libloading", -] - [[package]] name = "clap" version = "2.33.0" @@ -281,36 +234,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "curl" -version = "0.4.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "762e34611d2d5233a506a79072be944fddd057db2f18e04c0d6fa79e3fd466fd" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2", - "winapi", -] - -[[package]] -name = "curl-sys" -version = "0.4.31+curl-7.70.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcd62757cc4f5ab9404bc6ca9f0ae447e729a1403948ce5106bd588ceac6a3b0" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "winapi", -] - [[package]] name = "derivative" version = "2.1.1" @@ -458,12 +381,6 @@ dependencies = [ "wasi", ] -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - [[package]] name = "hermit-abi" version = "0.1.8" @@ -531,12 +448,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[package]] -name = "lazycell" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" - [[package]] name = "leo" version = "0.1.0" @@ -628,40 +539,6 @@ version = "0.2.67" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb147597cdf94ed43ab7a9038716637d2d1bf2bc571da995d0028dec06bd3018" -[[package]] -name = "libloading" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" -dependencies = [ - "cc", - "winapi", -] - -[[package]] -name = "librocksdb-sys" -version = "6.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "883213ae3d09bfc3d104aefe94b25ebb183b6f4d3a515b23b14817e1f4854005" -dependencies = [ - "bindgen", - "cc", - "glob", - "libc", -] - -[[package]] -name = "libz-sys" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "log" version = "0.4.8" @@ -704,16 +581,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab250442c86f1850815b5d268639dff018c0627022bc1940eb2d642ca1ce12f0" -[[package]] -name = "nom" -version = "5.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b471253da97532da4b61552249c521e01e736071f71c1a4f7ebbfbf0a06aad6" -dependencies = [ - "memchr", - "version_check", -] - [[package]] name = "num_cpus" version = "1.13.0" @@ -730,31 +597,6 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" -[[package]] -name = "openssl-probe" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" - -[[package]] -name = "openssl-sys" -version = "0.9.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7410fef80af8ac071d4f63755c0ab89ac3df0fd1ea91f1d1f37cf5cec4395990" -dependencies = [ - "autocfg", - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "pest" version = "2.1.3" @@ -811,12 +653,6 @@ dependencies = [ "sha-1", ] -[[package]] -name = "pkg-config" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" - [[package]] name = "ppv-lite86" version = "0.2.6" @@ -939,12 +775,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "redox_syscall" -version = "0.1.56" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" - [[package]] name = "regex" version = "1.3.4" @@ -963,28 +793,12 @@ version = "0.6.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1132f845907680735a84409c3bebc64d1364a5683ffbce899550cd09d5eaefc1" -[[package]] -name = "rocksdb" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12069b106981c6103d3eab7dd1c86751482d0779a520b7c14954c8b586c1e643" -dependencies = [ - "libc", - "librocksdb-sys", -] - [[package]] name = "rustc-demangle" version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rusty-hook" version = "0.11.1" @@ -1003,16 +817,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8" -[[package]] -name = "schannel" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" -dependencies = [ - "lazy_static", - "winapi", -] - [[package]] name = "scopeguard" version = "1.1.0" @@ -1086,12 +890,6 @@ dependencies = [ "opaque-debug", ] -[[package]] -name = "shlex" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" - [[package]] name = "single" version = "1.0.0" @@ -1152,10 +950,8 @@ name = "snarkos-errors" version = "0.8.0" dependencies = [ "bincode", - "curl", "hex", "jsonrpc-core", - "rocksdb", "thiserror", ] @@ -1199,18 +995,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "socket2" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "winapi", -] - [[package]] name = "strsim" version = "0.8.0" @@ -1343,12 +1127,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" -[[package]] -name = "vcpkg" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55d1e41d56121e07f1e223db0a4def204e45c85425f6a16d462fd07c8d10d74c" - [[package]] name = "vec_map" version = "0.8.1" @@ -1373,15 +1151,6 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -[[package]] -name = "which" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" -dependencies = [ - "libc", -] - [[package]] name = "winapi" version = "0.3.8" diff --git a/Cargo.toml b/Cargo.toml index 3982a1f22c..076c80b80b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,11 +19,11 @@ members = [ "ast", "compiler", "leo-inputs", "types" ] leo-compiler = { path = "compiler", version = "0.1.0" } leo-inputs = { path = "leo-inputs", version = "0.1.0"} -snarkos-algorithms = { path = "../snarkOS/algorithms", version = "0.8.0" } -snarkos-curves = { path = "../snarkOS/curves", version = "0.8.0" } -snarkos-errors = { path = "../snarkOS/errors", version = "0.8.0" } -snarkos-gadgets = { path = "../snarkOS/gadgets", version = "0.8.0" } -snarkos-models = { path = "../snarkOS/models", version = "0.8.0" } +snarkos-algorithms = { path = "../snarkOS/algorithms", version = "0.8.0", default-features = false } +snarkos-curves = { path = "../snarkOS/curves", version = "0.8.0", default-features = false } +snarkos-errors = { path = "../snarkOS/errors", version = "0.8.0", default-features = false } +snarkos-gadgets = { path = "../snarkOS/gadgets", version = "0.8.0", default-features = false } +snarkos-models = { path = "../snarkOS/models", version = "0.8.0", default-features = false } snarkos-utilities = { path = "../snarkOS/utilities", version = "0.8.0" } clap = { version = "2.33.0" } diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml index 4a7c2e1ce3..aa235aee32 100644 --- a/compiler/Cargo.toml +++ b/compiler/Cargo.toml @@ -9,10 +9,10 @@ leo-ast = { path = "../ast", version = "0.1.0" } leo-types = { path = "../types", version = "0.1.0" } leo-inputs = { path = "../leo-inputs", version = "0.1.0" } -snarkos-curves = { path = "../../snarkOS/curves", version = "0.8.0" } -snarkos-errors = { path = "../../snarkOS/errors", version = "0.8.0" } -snarkos-gadgets = { path = "../../snarkOS/gadgets", version = "0.8.0" } -snarkos-models = { path = "../../snarkOS/models", version = "0.8.0" } +snarkos-curves = { path = "../../snarkOS/curves", version = "0.8.0", default-features = false } +snarkos-errors = { path = "../../snarkOS/errors", version = "0.8.0", default-features = false } +snarkos-gadgets = { path = "../../snarkOS/gadgets", version = "0.8.0", default-features = false } +snarkos-models = { path = "../../snarkOS/models", version = "0.8.0", default-features = false } hex = { version = "0.4.2" } log = { version = "0.4" } diff --git a/leo-inputs/Cargo.toml b/leo-inputs/Cargo.toml index 05285399f8..9b41c18964 100644 --- a/leo-inputs/Cargo.toml +++ b/leo-inputs/Cargo.toml @@ -5,11 +5,11 @@ authors = ["The Aleo Team "] edition = "2018" [dependencies] -snarkos-algorithms = { path = "../../snarkOS/algorithms", version = "0.8.0" } -snarkos-curves = { path = "../../snarkOS/curves", version = "0.8.0" } -snarkos-errors = { path = "../../snarkOS/errors", version = "0.8.0" } -snarkos-gadgets = { path = "../../snarkOS/gadgets", version = "0.8.0" } -snarkos-models = { path = "../../snarkOS/models", version = "0.8.0" } +snarkos-algorithms = { path = "../../snarkOS/algorithms", version = "0.8.0", default-features = false } +snarkos-curves = { path = "../../snarkOS/curves", version = "0.8.0", default-features = false } +snarkos-errors = { path = "../../snarkOS/errors", version = "0.8.0", default-features = false } +snarkos-gadgets = { path = "../../snarkOS/gadgets", version = "0.8.0", default-features = false } +snarkos-models = { path = "../../snarkOS/models", version = "0.8.0", default-features = false } from-pest = { version = "0.3.1" } pest = { version = "2.0" } diff --git a/types/Cargo.toml b/types/Cargo.toml index ed673f1d3d..2b5728d709 100644 --- a/types/Cargo.toml +++ b/types/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" leo-ast = { path = "../ast", version = "0.1.0" } leo-inputs = { path = "../leo-inputs", version = "0.1.0" } -snarkos-errors = { path = "../../snarkOS/errors", version = "0.8.0" } -snarkos-models = { path = "../../snarkOS/models", version = "0.8.0" } +snarkos-errors = { path = "../../snarkOS/errors", version = "0.8.0", default-features = false } +snarkos-models = { path = "../../snarkOS/models", version = "0.8.0", default-features = false } thiserror = { version = "1.0" }