Commit Graph

2297 Commits

Author SHA1 Message Date
gluax
ad6f3fcf84 allow -field values in input values, clean up repeated code 2021-02-18 14:36:38 -05:00
bors[bot]
c62af038c5
Merge #672 #673
672: Feature/515 eliminate const vars r=collinc97 a=gluax

Resolves #515. Removes const keyword from statements. Also resolves #514. Still allows const y in function declaration of args.

673: feature/671-primefield-refactor r=collinc97 a=gluax

Resolves #671. Refactor "Field + PrimeField" -> "PrimeField" and all tests still pass.

Co-authored-by: gluaxspeed <jonathan.t.pavlik@gmail.com>
Co-authored-by: gluax <jonathan.t.pavlik@gmail.com>
Co-authored-by: Collin Chin <collin.chin@berkeley.edu>
2021-02-18 18:46:46 +00:00
bors[bot]
13af6166ec
Merge #677
677: Bump tracing from 0.1.23 to 0.1.24 r=collinc97 a=dependabot-preview[bot]

Bumps [tracing](https://github.com/tokio-rs/tracing) from 0.1.23 to 0.1.24.
<details>
<summary>Commits</summary>
<ul>
<li><a href="d173c2de9a"><code>d173c2d</code></a> tracing: prepare to release v0.1.24 (<a href="https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1244">#1244</a>)</li>
<li><a href="7f3d94f485"><code>7f3d94f</code></a> attributes: prepare to release v0.1.13 (<a href="https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1243">#1243</a>)</li>
<li><a href="66b1ced54b"><code>66b1ced</code></a> tracing: fix broken match arms in event macros (<a href="https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1239">#1239</a>) (<a href="https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1242">#1242</a>)</li>
<li><a href="9d4b7e7a3a"><code>9d4b7e7</code></a> tracing: fix a typo and adds a note about the supported field syntax (<a href="https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1232">#1232</a>)</li>
<li><a href="f8b7d69997"><code>f8b7d69</code></a> futures: prepare to release 0.2.5 (<a href="https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1241">#1241</a>)</li>
<li><a href="e1e3431bc4"><code>e1e3431</code></a> attributes: fix <code>#[instrument(err)]</code> with <code>impl Trait</code> return types (<a href="https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1236">#1236</a>)</li>
<li><a href="4609f22aff"><code>4609f22</code></a> tracing: fix some links in changelog (<a href="https://github-redirect.dependabot.com/tokio-rs/tracing/issues/1224">#1224</a>)</li>
<li>See full diff in <a href="https://github.com/tokio-rs/tracing/compare/tracing-0.1.23...tracing-0.1.24">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=tracing&package-manager=cargo&previous-version=0.1.23&new-version=0.1.24)](https://dependabot.com/compatibility-score/?dependency-name=tracing&package-manager=cargo&previous-version=0.1.23&new-version=0.1.24)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)



</details>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-02-18 18:26:26 +00:00
gluax
34b8e766ac merge master and resolve bors failing test 2021-02-18 11:50:13 -05:00
gluax
a7b28fbf0a resolve all the merge conflicts 2021-02-18 11:39:35 -05:00
dependabot-preview[bot]
2904a082e5
Bump tracing from 0.1.23 to 0.1.24
Bumps [tracing](https://github.com/tokio-rs/tracing) from 0.1.23 to 0.1.24.
- [Release notes](https://github.com/tokio-rs/tracing/releases)
- [Commits](https://github.com/tokio-rs/tracing/compare/tracing-0.1.23...tracing-0.1.24)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-18 10:48:48 +00:00
bors[bot]
b73c146193
Merge #668
668: Bump rand_core from 0.6.1 to 0.6.2 r=collinc97 a=dependabot-preview[bot]

Bumps [rand_core](https://github.com/rust-random/rand) from 0.6.1 to 0.6.2.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/rust-random/rand/blob/master/CHANGELOG.md">rand_core's changelog</a>.</em></p>
<blockquote>
<h2>[0.6.2] - 2019-01-04</h2>
<h3>Additions</h3>
<ul>
<li>Add <code>Default</code> for <code>ThreadRng</code> (<a href="https://github-redirect.dependabot.com/rust-random/rand/issues/657">#657</a>)</li>
<li>Move <code>rngs::OsRng</code> to <code>rand_os</code> sub-crate; clean up code; use as dependency (<a href="https://github-redirect.dependabot.com/rust-random/rand/issues/643">#643</a>) ##BLOCKER##</li>
<li>Add <code>rand_xoshiro</code> sub-crate, plus benchmarks (<a href="https://github-redirect.dependabot.com/rust-random/rand/issues/642">#642</a>, <a href="https://github-redirect.dependabot.com/rust-random/rand/issues/668">#668</a>)</li>
</ul>
<h3>Fixes</h3>
<ul>
<li>Fix bias in <code>UniformInt::sample_single</code> (<a href="https://github-redirect.dependabot.com/rust-random/rand/issues/662">#662</a>)</li>
<li>Use <code>autocfg</code> instead of <code>rustc_version</code> for rustc version detection (<a href="https://github-redirect.dependabot.com/rust-random/rand/issues/664">#664</a>)</li>
<li>Disable <code>i128</code> and <code>u128</code> if the <code>target_os</code> is <code>emscripten</code> (<a href="https://github-redirect.dependabot.com/rust-random/rand/issues/671">#671</a>: work-around Emscripten limitation)</li>
<li>CI fixes (<a href="https://github-redirect.dependabot.com/rust-random/rand/issues/660">#660</a>, <a href="https://github-redirect.dependabot.com/rust-random/rand/issues/671">#671</a>)</li>
</ul>
<h3>Optimisations</h3>
<ul>
<li>Optimise memory usage of <code>UnitCircle</code> and <code>UnitSphereSurface</code> distributions (no PR)</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="3a03c9eb53"><code>3a03c9e</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/rust-random/rand/issues/1096">#1096</a> from tmandry/patch-1</li>
<li><a href="2cf5120dd5"><code>2cf5120</code></a> Bump to 0.6.2</li>
<li><a href="390a7b1049"><code>390a7b1</code></a> Fix assertions inside read_{u32,u64}_into</li>
<li><a href="6ecbe2626b"><code>6ecbe26</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/rust-random/rand/issues/1089">#1089</a> from dhardy/work</li>
<li><a href="8821743325"><code>8821743</code></a> Prepare 0.8.3</li>
<li><a href="fa615efd91"><code>fa615ef</code></a> Feature gate choose_multiple_weighted on std</li>
<li><a href="22dec87aac"><code>22dec87</code></a> CI: more accurate no-default-feature and nightly test targets</li>
<li><a href="6a6b9fd06d"><code>6a6b9fd</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/rust-random/rand/issues/1087">#1087</a> from GautierMinster/fix_uniform_int_panic_on_full_in...</li>
<li><a href="2c9085a2de"><code>2c9085a</code></a> Bump to 0.8.2 and update changelog</li>
<li><a href="4e8c7a4ca2"><code>4e8c7a4</code></a> distributions/uniform: fix panic in gen_range(0..=MAX)</li>
<li>See full diff in <a href="https://github.com/rust-random/rand/compare/rand_core-0.6.1...rand_core-0.6.2">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=rand_core&package-manager=cargo&previous-version=0.6.1&new-version=0.6.2)](https://dependabot.com/compatibility-score/?dependency-name=rand_core&package-manager=cargo&previous-version=0.6.1&new-version=0.6.2)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)



</details>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-02-18 06:32:28 +00:00
bors[bot]
077d0f76f1
Merge #676
676: [CLI, PM] Inputs are now published with source code r=collinc97 a=damirka

Fixes #637 

- now inputs are published to Aleo PM
- error json message is printed to user

## Motivation

We're unable to publish packages to PM, this PR fixes that.

## Test Plan

TBD: CI for publishing

Co-authored-by: damirka <damirka.ru@gmail.com>
2021-02-18 06:07:11 +00:00
Collin Chin
9baa9388a0
Merge branch 'master' into feature/515-eliminate-const-vars 2021-02-17 22:06:12 -08:00
bors[bot]
6715f91690
Merge #670
670: feature_626/negative-group-contstraints r=collinc97 a=gluax

Resolves #626. Allows a negative group outside of a pair as well as negative numbers inside a pair group. Waiting to see if the later was necessary in the feature discussion, but I assume it would be.

Co-authored-by: gluax <jonathan.t.pavlik@gmail.com>
2021-02-17 20:50:30 +00:00
bors[bot]
454664b6c1
Merge #669
669: [CLI] Ignore non-input/state files in inputs folder when running tests r=collinc97 a=damirka

Closes #660 

## Motivation

Any non-state or non-input file in program inputs folder causes test command to fail with error. This case is described in #660. Another case is also covered - files starting with dot (i.e. `.smth`) caused different error - now skipped.

Proposed behavior is skipping other files (with no warning/error) instead of erroring out. 

## Test Plan

Tested locally, changes are small enough to see through


Co-authored-by: damirka <damirka.ru@gmail.com>
2021-02-17 20:31:24 +00:00
bors[bot]
54a9691b73
Merge #652 #663
652: ASG refactor r=collinc97 a=Protryon

## Motivation

This PR makes the ASG more user friendly by using arenas instead of RefCell/Arc:
1. Impossible to leak the ASG by creating a circular strong reference chain
2. We don't need RefCell's everywhere to implement passes

663: Bug 625/fix negative fields not allowed r=collinc97 a=gluax

Resolves #625. Logic used to do so is in check if first character of string to convert is a negative sign. If so remove first character convert from string to field, and then negate it on the leo side. If first character wasn't a negative sign, do the same as before.

Co-authored-by: Protryon <max.bruce12@gmail.com>
Co-authored-by: gluax <jonathan.t.pavlik@gmail.com>
Co-authored-by: gluax <16431709+gluax@users.noreply.github.com>
2021-02-17 20:10:30 +00:00
bors[bot]
59d5a3e6c5
Merge #667
667: Bump zip from 0.5.9 to 0.5.10 r=collinc97 a=dependabot-preview[bot]

Bumps [zip](https://github.com/zip/zip-rs) from 0.5.9 to 0.5.10.
<details>
<summary>Commits</summary>
<ul>
<li>See full diff in <a href="https://github.com/zip/zip-rs/commits">compare view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility score](https://api.dependabot.com/badges/compatibility_score?dependency-name=zip&package-manager=cargo&previous-version=0.5.9&new-version=0.5.10)](https://dependabot.com/compatibility-score/?dependency-name=zip&package-manager=cargo&previous-version=0.5.9&new-version=0.5.10)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
- `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language
- `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language
- `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language
- `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language
- `@dependabot badge me` will comment on this PR with code to add a "Dependabot enabled" badge to your readme

Additionally, you can set the following in your Dependabot [dashboard](https://app.dependabot.com):
- Update frequency (including time of day and day of week)
- Pull request limits (per update run and/or open at any time)
- Out-of-range updates (receive only lockfile updates, if desired)
- Security updates (receive only security updates, if desired)



</details>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
2021-02-17 19:47:15 +00:00
damirka
2b56dd6892 remove commented line 2021-02-17 22:02:52 +03:00
damirka
6caf915701 Fixes #637
- now inputs are published to Aleo PM
- error json message is printed to user
2021-02-17 21:49:20 +03:00
Protryon
cc82fc7722 fix conflict 2021-02-17 08:38:14 -08:00
gluax
e0fdb73435 forgot to push fmted code 2021-02-17 11:33:54 -05:00
gluax
317fc08fc5 implicit value at start of array failing fix 2021-02-17 11:27:33 -05:00
gluax
b96dc782f9 add a test to check const statements fail 2021-02-17 09:06:30 -05:00
collin
a3525212a6 add contributing.md 2021-02-16 15:22:02 -08:00
Protryon
29711ff041 clippy 2021-02-16 13:33:22 -08:00
Protryon
91795af973 format 2021-02-16 13:33:21 -08:00
Protryon
8b8937c5be clippy 2021-02-16 13:33:05 -08:00
Protryon
bf61820115 asg refactor 2021-02-16 13:32:34 -08:00
gluax
f952da330c re-add syntax in, then add deprecation warning for it 2021-02-16 15:33:31 -05:00
gluax
7e7db4d93b
remove comment
Co-authored-by: Collin Chin <collin.chin@berkeley.edu>
2021-02-16 15:12:20 -05:00
gluax
6cdefa7128
remove comment
Co-authored-by: Collin Chin <collin.chin@berkeley.edu>
2021-02-16 15:12:07 -05:00
gluax
ba3ca6069a refactor Field + PrimeField -> PrimeField, all tests still pass 2021-02-16 14:41:59 -05:00
gluax
d549fda7b5 rebase and replace const keyword in tests 2021-02-16 14:19:20 -05:00
gluax
42bea9e93a Merge branch 'master' of github.com:AleoHQ/leo into feature/515-eliminate-const-vars 2021-02-16 14:02:49 -05:00
gluax
8150869c6c negative groups, and negative group coords allowed 2021-02-16 12:00:08 -05:00
gluax
5bbaf9d999 add non negated field to test, merge master 2021-02-16 09:22:10 -05:00
damirka
d67ee529bb Fixes #660
- ignores files starting with . dot in inputs/ folder
- skips non-input or state files instead of exiting with error
2021-02-15 22:58:34 +03:00
dependabot-preview[bot]
0702b32840
Bump rand_core from 0.6.1 to 0.6.2
Bumps [rand_core](https://github.com/rust-random/rand) from 0.6.1 to 0.6.2.
- [Release notes](https://github.com/rust-random/rand/releases)
- [Changelog](https://github.com/rust-random/rand/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rust-random/rand/compare/rand_core-0.6.1...rand_core-0.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-15 10:25:03 +00:00
dependabot-preview[bot]
ad1fbf4681
Bump zip from 0.5.9 to 0.5.10
Bumps [zip](https://github.com/zip/zip-rs) from 0.5.9 to 0.5.10.
- [Release notes](https://github.com/zip/zip-rs/releases)
- [Commits](https://github.com/zip/zip-rs/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-02-15 10:24:31 +00:00
bors[bot]
a7c9caf4b3
Merge #653
653: Fix return type error for input-dependent branches r=collinc97 a=Protryon

This PR fixes failure to handle input-dependent branches. No tests added here since base case is covered, and this only occurs with production constraints. Should fix #535.

There is an additional issue not solved by this PR on branching on booleans from input.

Co-authored-by: Protryon <max.bruce12@gmail.com>
2021-02-12 23:36:59 +00:00
Collin Chin
c57332baa9
Merge pull request #658 from AleoHQ/fix/flaky-cli-test
[Bug] remove unused json deserialize logic
2021-02-12 12:40:05 -08:00
gluax
eda78dd968 clippy fix 2021-02-12 15:22:59 -05:00
gluax
500a3e76d2 fix negative fields, add test for them 2021-02-12 15:20:58 -05:00
bors[bot]
217ecca4d6
Merge #655
655: Fix circuit resolution r=collinc97 a=Protryon

Fixes #642. Issues was that we didn't properly recursively resolve circuits when converting AST types -> ASG types

Co-authored-by: Protryon <max.bruce12@gmail.com>
2021-02-12 04:54:15 +00:00
Collin Chin
6ac356819c
Merge pull request #656 from AleoHQ/dependency/snarkvm-0.0.4
[Dependencies] bump snarkvm module versions to 0.0.4
2021-02-11 19:50:48 -08:00
collin
d6860d2b54 remove unused json deserialize logic 2021-02-11 19:46:32 -08:00
Collin Chin
29fa7cf19e
Merge pull request #654 from AleoHQ/field-group-fix
Fix field/group addition
2021-02-11 17:43:32 -08:00
collin
537ea39513 bump snarkvm module versions to 0.0.4 2021-02-11 17:33:53 -08:00
bors[bot]
fa53e75f51
Merge #641
641: Bug/564 input array len not enforced r=collinc97 a=gluax

Resolves #564, depends on #563. The changes for this branch have pulled from PR #638, which is the PR that fixes #563.

Co-authored-by: gluaxspeed <jonathan.t.pavlik@gmail.com>
2021-02-11 21:41:53 +00:00
bors[bot]
d418b5330c
Merge #638
638: bug/563-array-input-wrong-dimensions r=collinc97 a=gluax

Closes #563. Fixes the array dimension builder when coming from the input file. Adds a test for it as well.

Co-authored-by: gluaxspeed <jonathan.t.pavlik@gmail.com>
2021-02-11 21:22:50 +00:00
Collin Chin
b8fc28e840
Set bors approval minimum to 1
In the future having 2 code owners review will be standard on large changes. Setting the bors minimum to 1 will give flexibility for small changes.
2021-02-11 13:21:40 -08:00
Protryon
b0de29e275 fix circuit resolution 2021-02-11 11:59:14 -08:00
Protryon
198230d604 fix field/group addition 2021-02-11 09:05:43 -08:00
Protryon
0bd324bcb4 fix return type error for input-dependent branches 2021-02-11 08:52:22 -08:00