Merge branch 'master' of https://github.com/AleoHQ/leo into refactor/packages

This commit is contained in:
howardwu 2020-08-28 23:55:49 -07:00
commit 9884320dd6
12 changed files with 493 additions and 194 deletions

20
Cargo.lock generated
View File

@ -1207,7 +1207,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "leo-ast"
version = "1.0.1"
version = "1.0.2"
dependencies = [
"criterion",
"from-pest",
@ -1223,7 +1223,7 @@ dependencies = [
[[package]]
name = "leo-compiler"
version = "1.0.1"
version = "1.0.2"
dependencies = [
"bincode",
"hex",
@ -1253,7 +1253,7 @@ dependencies = [
[[package]]
name = "leo-gadgets"
version = "1.0.1"
version = "1.0.2"
dependencies = [
"rand",
"rand_xorshift",
@ -1265,7 +1265,7 @@ dependencies = [
[[package]]
name = "leo-input"
version = "1.0.1"
version = "1.0.2"
dependencies = [
"from-pest",
"pest",
@ -1281,7 +1281,7 @@ dependencies = [
[[package]]
name = "leo-lang"
version = "1.0.1"
version = "1.0.2"
dependencies = [
"clap",
"colored",
@ -1319,12 +1319,12 @@ dependencies = [
]
[[package]]
name = "leo-liner"
version = "1.0.1"
name = "leo-linter"
version = "1.0.2"
[[package]]
name = "leo-package"
version = "1.0.1"
version = "1.0.2"
dependencies = [
"serde",
"serde_json",
@ -1337,7 +1337,7 @@ dependencies = [
[[package]]
name = "leo-state"
version = "1.0.1"
version = "1.0.2"
dependencies = [
"leo-input",
"leo-typed",
@ -1356,7 +1356,7 @@ dependencies = [
[[package]]
name = "leo-typed"
version = "1.0.1"
version = "1.0.2"
dependencies = [
"criterion",
"leo-ast",

View File

@ -1,13 +1,19 @@
[package]
name = "leo-lang"
version = "1.0.1"
authors = ["The Aleo Team <hello@aleo.org>"]
version = "1.0.2"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "The Leo programming language"
homepage = "https://aleo.org"
repository = "https://github.com/AleoHQ/leo"
keywords = ["aleo", "cryptography", "leo", "programming-language", "zero-knowledge"]
categories = ["cryptography::cryptocurrencies", "web-programming"]
include = ["Cargo.toml", "leo", "README.md", "LICENSE.md"]
keywords = [
"aleo",
"cryptography",
"leo",
"programming-language",
"zero-knowledge"
]
categories = [ "cryptography::cryptocurrencies", "web-programming" ]
include = [ "Cargo.toml", "leo", "README.md", "LICENSE.md" ]
license = "GPL-3.0"
edition = "2018"
@ -19,50 +25,133 @@ name = "leo"
path = "leo/main.rs"
[workspace]
members = [ "ast", "compiler", "gadgets", "input", "linter", "package", "typed", "state"]
members = [
"ast",
"compiler",
"gadgets",
"input",
"linter",
"package",
"typed",
"state"
]
[dependencies]
leo-compiler = { path = "./compiler", version = "1.0.1" }
leo-gadgets = { path = "./gadgets", version = "1.0.1" }
leo-input = { path = "./input", version = "1.0.1" }
leo-package = { path = "./package", version = "1.0.1" }
leo-state = { path = "./state", version = "1.0.1" }
[dependencies.leo-compiler]
path = "./compiler"
version = "1.0.2"
snarkos-algorithms = { version = "1.1.3", default-features = false }
snarkos-curves = { version = "1.1.3", default-features = false }
snarkos-errors = { version = "1.1.3", default-features = false }
snarkos-gadgets = { version = "1.1.3", default-features = false }
snarkos-models = { version = "1.1.3", default-features = false }
snarkos-utilities = { version = "1.1.3" }
[dependencies.leo-gadgets]
path = "./gadgets"
version = "1.0.2"
clap = { version = "2.33.3" }
colored = { version = "2.0" }
dirs = { version = "3.0.1" }
console = { version = "0.12.0" }
dotenv = { version = "0.15.0" }
env_logger = { version = "0.7" }
from-pest = { version = "0.3.1" }
lazy_static = { version = "1.4.0" }
notify= { version = "4.0.15" }
num-bigint = { version = "0.3" }
rand = { version = "0.7" }
rand_core = { version = "0.5.1" }
reqwest = { version = "0.10.7", features = ["blocking", "json"] }
self_update = { version = "0.19.0", features = ["archive-zip"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = { version = "1.0" }
thiserror = { version = "1.0" }
toml = { version = "0.5" }
tracing = { version = "0.1" }
tracing-subscriber = { version = "0.2", features = ["fmt"] }
zip = { version = "0.5" }
[dependencies.leo-input]
path = "./input"
version = "1.0.2"
[dev-dependencies]
rusty-hook = { version = "0.11.2" }
[dependencies.leo-package]
path = "./package"
version = "1.0.2"
[dependencies.leo-state]
path = "./state"
version = "1.0.2"
[dependencies.snarkos-algorithms]
version = "1.1.3"
default-features = false
[dependencies.snarkos-curves]
version = "1.1.3"
default-features = false
[dependencies.snarkos-errors]
version = "1.1.3"
default-features = false
[dependencies.snarkos-gadgets]
version = "1.1.3"
default-features = false
[dependencies.snarkos-models]
version = "1.1.3"
default-features = false
[dependencies.snarkos-utilities]
version = "1.1.3"
[dependencies.clap]
version = "2.33.3"
[dependencies.colored]
version = "2.0"
[dependencies.dirs]
version = "3.0.1"
[dependencies.console]
version = "0.12.0"
[dependencies.dotenv]
version = "0.15.0"
[dependencies.env_logger]
version = "0.7"
[dependencies.from-pest]
version = "0.3.1"
[dependencies.lazy_static]
version = "1.4.0"
[dependencies.notify]
version = "4.0.15"
[dependencies.num-bigint]
version = "0.3"
[dependencies.rand]
version = "0.7"
[dependencies.rand_core]
version = "0.5.1"
[dependencies.reqwest]
version = "0.10.7"
features = [ "blocking", "json" ]
[dependencies.self_update]
version = "0.19.0"
features = [ "archive-zip" ]
[dependencies.serde]
version = "1.0"
features = [ "derive" ]
[dependencies.serde_json]
version = "1.0"
[dependencies.thiserror]
version = "1.0"
[dependencies.toml]
version = "0.5"
[dependencies.tracing]
version = "0.1"
[dependencies.tracing-subscriber]
version = "0.2"
features = [ "fmt" ]
[dependencies.zip]
version = "0.5"
[dev-dependencies.rusty-hook]
version = "0.11.2"
[features]
default = []
ci_skip = ["leo-compiler/ci_skip"]
default = [ ]
ci_skip = [ "leo-compiler/ci_skip" ]
[profile.release]
opt-level = 3

View File

@ -1,13 +1,19 @@
[package]
name = "leo-ast"
version = "1.0.1"
authors = ["The Aleo Team <hello@aleo.org>"]
version = "1.0.2"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "AST of the Leo programming language"
homepage = "https://aleo.org"
repository = "https://github.com/AleoHQ/leo"
keywords = ["aleo", "cryptography", "leo", "programming-language", "zero-knowledge"]
categories = ["cryptography::cryptocurrencies", "web-programming"]
include = ["Cargo.toml", "src", "README.md", "LICENSE.md"]
keywords = [
"aleo",
"cryptography",
"leo",
"programming-language",
"zero-knowledge"
]
categories = [ "cryptography::cryptocurrencies", "web-programming" ]
include = [ "Cargo.toml", "src", "README.md", "LICENSE.md" ]
license = "GPL-3.0"
edition = "2018"
@ -20,21 +26,37 @@ name = "ast"
path = "benches/ast.rs"
harness = false
[dependencies]
from-pest = { version = "0.3.1" }
lazy_static = { version = "1.3.0" }
pest = { version = "2.0" }
pest-ast = { version = "0.3.3" }
pest_derive = { version = "2.0" }
serde = { version = "1.0", features = ["derive"] }
serde_json = { version = "1.0" }
thiserror = { version = "1.0" }
tracing = { version = "0.1" }
[dependencies.from-pest]
version = "0.3.1"
[dependencies.lazy_static]
version = "1.3.0"
[dev-dependencies]
criterion = { version = "0.3" }
[dependencies.pest]
version = "2.0"
[dependencies.pest-ast]
version = "0.3.3"
[dependencies.pest_derive]
version = "2.0"
[dependencies.serde]
version = "1.0"
features = [ "derive" ]
[dependencies.serde_json]
version = "1.0"
[dependencies.thiserror]
version = "1.0"
[dependencies.tracing]
version = "0.1"
[dev-dependencies.criterion]
version = "0.3"
[features]
default = []
ci_skip = []
default = [ ]
ci_skip = [ ]

View File

@ -1,46 +1,107 @@
[package]
name = "leo-compiler"
version = "1.0.1"
authors = ["The Aleo Team <hello@aleo.org>"]
version = "1.0.2"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "Compiler of the Leo programming language"
homepage = "https://aleo.org"
repository = "https://github.com/AleoHQ/leo"
keywords = ["aleo", "cryptography", "leo", "programming-language", "zero-knowledge"]
categories = ["cryptography::cryptocurrencies", "web-programming"]
include = ["Cargo.toml", "src", "README.md", "LICENSE.md"]
keywords = [
"aleo",
"cryptography",
"leo",
"programming-language",
"zero-knowledge"
]
categories = [ "cryptography::cryptocurrencies", "web-programming" ]
include = [ "Cargo.toml", "src", "README.md", "LICENSE.md" ]
license = "GPL-3.0"
edition = "2018"
[dependencies]
leo-ast = { path = "../ast", version = "1.0.1" }
leo-gadgets = { path = "../gadgets", version = "1.0.1" }
leo-input = { path = "../input", version = "1.0.1" }
leo-package = { path = "../package", version = "1.0.1"}
leo-typed = { path = "../typed", version = "1.0.1" }
leo-state = { path = "../state", version = "1.0.1" }
[dependencies.leo-ast]
path = "../ast"
version = "1.0.2"
snarkos-curves = { version = "1.1.3", default-features = false }
snarkos-dpc = { version = "1.1.3", default-features = false }
snarkos-errors = { version = "1.1.3", default-features = false }
snarkos-gadgets = { version = "1.1.3", default-features = false }
snarkos-models = { version = "1.1.3", default-features = false }
snarkos-objects = { version = "1.1.3", default-features = false }
snarkos-utilities = { version = "1.1.3" }
[dependencies.leo-gadgets]
path = "../gadgets"
version = "1.0.2"
bincode = { version = "1.0" }
hex = { version = "0.4.2" }
pest = { version = "2.0" }
rand = { version = "0.7" }
rand_xorshift = { version = "0.2", default-features = false }
serde = { version = "1.0" }
sha2 = { version = "0.9" }
thiserror = { version = "1.0" }
tracing = { version = "0.1" }
tracing-subscriber = { version = "0.2" }
[dependencies.leo-input]
path = "../input"
version = "1.0.2"
[dev-dependencies]
num-bigint = { version = "0.3" }
[dependencies.leo-package]
path = "../package"
version = "1.0.2"
[dependencies.leo-typed]
path = "../typed"
version = "1.0.2"
[dependencies.leo-state]
path = "../state"
version = "1.0.2"
[dependencies.snarkos-curves]
version = "1.1.3"
default-features = false
[dependencies.snarkos-dpc]
version = "1.1.3"
default-features = false
[dependencies.snarkos-errors]
version = "1.1.3"
default-features = false
[dependencies.snarkos-gadgets]
version = "1.1.3"
default-features = false
[dependencies.snarkos-models]
version = "1.1.3"
default-features = false
[dependencies.snarkos-objects]
version = "1.1.3"
default-features = false
[dependencies.snarkos-utilities]
version = "1.1.3"
[dependencies.bincode]
version = "1.0"
[dependencies.hex]
version = "0.4.2"
[dependencies.pest]
version = "2.0"
[dependencies.rand]
version = "0.7"
[dependencies.rand_xorshift]
version = "0.2"
default-features = false
[dependencies.serde]
version = "1.0"
[dependencies.sha2]
version = "0.9"
[dependencies.thiserror]
version = "1.0"
[dependencies.tracing]
version = "0.1"
[dependencies.tracing-subscriber]
version = "0.2"
[dev-dependencies.num-bigint]
version = "0.3"
[features]
default = []
ci_skip = ["leo-ast/ci_skip", "leo-typed/ci_skip"]
default = [ ]
ci_skip = [ "leo-ast/ci_skip", "leo-typed/ci_skip" ]

View File

@ -1,24 +1,43 @@
[package]
name = "leo-gadgets"
version = "1.0.1"
authors = ["The Aleo Team <hello@aleo.org>"]
version = "1.0.2"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "Gadgets of the Leo programming language"
homepage = "https://aleo.org"
repository = "https://github.com/AleoHQ/leo"
keywords = ["aleo", "cryptography", "leo", "programming-language", "zero-knowledge"]
categories = ["cryptography::cryptocurrencies", "web-programming"]
include = ["Cargo.toml", "src", "README.md", "LICENSE.md"]
keywords = [
"aleo",
"cryptography",
"leo",
"programming-language",
"zero-knowledge"
]
categories = [ "cryptography::cryptocurrencies", "web-programming" ]
include = [ "Cargo.toml", "src", "README.md", "LICENSE.md" ]
license = "GPL-3.0"
edition = "2018"
[dependencies]
snarkos-errors = { version = "1.1.3", default-features = false }
snarkos-models = { version = "1.1.3", default-features = false }
snarkos-utilities = { version = "1.1.3" }
[dependencies.snarkos-errors]
version = "1.1.3"
default-features = false
rand = { version = "0.7", default-features = false }
rand_xorshift = { version = "0.2", default-features = false }
thiserror = { version = "1.0" }
[dependencies.snarkos-models]
version = "1.1.3"
default-features = false
[dev-dependencies]
snarkos-utilities = { version = "1.1.3" }
[dependencies.snarkos-utilities]
version = "1.1.3"
[dependencies.rand]
version = "0.7"
default-features = false
[dependencies.rand_xorshift]
version = "0.2"
default-features = false
[dependencies.thiserror]
version = "1.0"
[dev-dependencies.snarkos-utilities]
version = "1.1.3"

View File

@ -1,25 +1,53 @@
[package]
name = "leo-input"
version = "1.0.1"
authors = ["The Aleo Team <hello@aleo.org>"]
version = "1.0.2"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "Input parser of the Leo programming language"
homepage = "https://aleo.org"
repository = "https://github.com/AleoHQ/leo"
keywords = ["aleo", "cryptography", "leo", "programming-language", "zero-knowledge"]
categories = ["cryptography::cryptocurrencies", "web-programming"]
include = ["Cargo.toml", "src", "README.md", "LICENSE.md"]
keywords = [
"aleo",
"cryptography",
"leo",
"programming-language",
"zero-knowledge"
]
categories = [ "cryptography::cryptocurrencies", "web-programming" ]
include = [ "Cargo.toml", "src", "README.md", "LICENSE.md" ]
license = "GPL-3.0"
edition = "2018"
[dependencies]
snarkos-algorithms = { version = "1.1.3", default-features = false }
snarkos-curves = { version = "1.1.3", default-features = false }
snarkos-errors = { version = "1.1.3", default-features = false }
snarkos-gadgets = { version = "1.1.3", default-features = false }
snarkos-models = { version = "1.1.3", default-features = false }
[dependencies.snarkos-algorithms]
version = "1.1.3"
default-features = false
from-pest = { version = "0.3.1" }
pest = { version = "2.0" }
pest-ast = { version = "0.3.3" }
pest_derive = { version = "2.0" }
thiserror = { version = "1.0" }
[dependencies.snarkos-curves]
version = "1.1.3"
default-features = false
[dependencies.snarkos-errors]
version = "1.1.3"
default-features = false
[dependencies.snarkos-gadgets]
version = "1.1.3"
default-features = false
[dependencies.snarkos-models]
version = "1.1.3"
default-features = false
[dependencies.from-pest]
version = "0.3.1"
[dependencies.pest]
version = "2.0"
[dependencies.pest-ast]
version = "0.3.3"
[dependencies.pest_derive]
version = "2.0"
[dependencies.thiserror]
version = "1.0"

1
leo/leo-version Normal file
View File

@ -0,0 +1 @@
v1.0.2

View File

@ -21,7 +21,7 @@ use clap::{App, AppSettings, Arg};
#[cfg_attr(tarpaulin, skip)]
fn main() -> Result<(), CLIError> {
let arguments = App::new("leo")
.version("v1.0.1")
.version(include_str!("./leo-version"))
.about("Leo compiler and package manager")
.author("The Aleo Team <hello@aleo.org>")
.settings(&[

View File

@ -1,14 +1,20 @@
dependencies = { }
[package]
name = "leo-liner"
version = "1.0.1"
authors = ["The Aleo Team <hello@aleo.org>"]
name = "leo-linter"
version = "1.0.2"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "Linter of the Leo programming language"
homepage = "https://aleo.org"
repository = "https://github.com/AleoHQ/leo"
keywords = ["aleo", "cryptography", "leo", "programming-language", "zero-knowledge"]
categories = ["cryptography::cryptocurrencies", "web-programming"]
include = ["Cargo.toml", "src", "README.md", "LICENSE.md"]
keywords = [
"aleo",
"cryptography",
"leo",
"programming-language",
"zero-knowledge"
]
categories = [ "cryptography::cryptocurrencies", "web-programming" ]
include = [ "Cargo.toml", "src", "README.md", "LICENSE.md" ]
license = "GPL-3.0"
edition = "2018"
[dependencies]

View File

@ -1,21 +1,40 @@
[package]
name = "leo-package"
version = "1.0.1"
authors = ["The Aleo Team <hello@aleo.org>"]
version = "1.0.2"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "Package parser of the Leo programming language"
homepage = "https://aleo.org"
repository = "https://github.com/AleoHQ/leo"
keywords = ["aleo", "cryptography", "leo", "programming-language", "zero-knowledge"]
categories = ["cryptography::cryptocurrencies", "web-programming"]
include = ["Cargo.toml", "src", "README.md", "LICENSE.md"]
keywords = [
"aleo",
"cryptography",
"leo",
"programming-language",
"zero-knowledge"
]
categories = [ "cryptography::cryptocurrencies", "web-programming" ]
include = [ "Cargo.toml", "src", "README.md", "LICENSE.md" ]
license = "GPL-3.0"
edition = "2018"
[dependencies]
serde = { version = "1.0", features = ["derive"] }
serde_json = { version = "1.0" }
thiserror = { version = "1.0" }
toml = { version = "0.5" }
tracing = { version = "0.1" }
walkdir = { version = "2" }
zip = { version = "0.5" }
[dependencies.serde]
version = "1.0"
features = [ "derive" ]
[dependencies.serde_json]
version = "1.0"
[dependencies.thiserror]
version = "1.0"
[dependencies.toml]
version = "0.5"
[dependencies.tracing]
version = "0.1"
[dependencies.walkdir]
version = "2"
[dependencies.zip]
version = "0.5"

View File

@ -1,31 +1,65 @@
[package]
name = "leo-state"
version = "1.0.1"
authors = ["The Aleo Team <hello@aleo.org>"]
version = "1.0.2"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "State parser of the Leo programming language"
homepage = "https://aleo.org"
repository = "https://github.com/AleoHQ/leo"
keywords = ["aleo", "cryptography", "leo", "programming-language", "zero-knowledge"]
categories = ["cryptography::cryptocurrencies", "web-programming"]
include = ["Cargo.toml", "src", "README.md", "LICENSE.md"]
keywords = [
"aleo",
"cryptography",
"leo",
"programming-language",
"zero-knowledge"
]
categories = [ "cryptography::cryptocurrencies", "web-programming" ]
include = [ "Cargo.toml", "src", "README.md", "LICENSE.md" ]
license = "GPL-3.0"
edition = "2018"
[dependencies]
leo-input = { path = "../input", version = "1.0.1" }
leo-typed = { path = "../typed", version = "1.0.1" }
[dependencies.leo-input]
path = "../input"
version = "1.0.2"
snarkos-algorithms = { version = "1.1.3", default-features = false }
snarkos-curves = { version = "1.1.3", default-features = false }
snarkos-dpc = { version = "1.1.3", default-features = false }
snarkos-errors = { version = "1.1.3", default-features = false }
snarkos-models = { version = "1.1.3", default-features = false }
snarkos-objects = { version = "1.1.3", default-features = false }
snarkos-utilities = { version = "1.1.3" }
[dependencies.leo-typed]
path = "../typed"
version = "1.0.2"
rand = { version = "0.7" }
rand_xorshift = { version = "0.2" }
thiserror = { version = "1.0" }
[dependencies.snarkos-algorithms]
version = "1.1.3"
default-features = false
[dev-dependencies]
snarkos-storage = { version = "1.1.4" }
[dependencies.snarkos-curves]
version = "1.1.3"
default-features = false
[dependencies.snarkos-dpc]
version = "1.1.3"
default-features = false
[dependencies.snarkos-errors]
version = "1.1.3"
default-features = false
[dependencies.snarkos-models]
version = "1.1.3"
default-features = false
[dependencies.snarkos-objects]
version = "1.1.3"
default-features = false
[dependencies.snarkos-utilities]
version = "1.1.3"
[dependencies.rand]
version = "0.7"
[dependencies.rand_xorshift]
version = "0.2"
[dependencies.thiserror]
version = "1.0"
[dev-dependencies.snarkos-storage]
version = "1.1.4"

View File

@ -1,13 +1,19 @@
[package]
name = "leo-typed"
version = "1.0.1"
authors = ["The Aleo Team <hello@aleo.org>"]
version = "1.0.2"
authors = [ "The Aleo Team <hello@aleo.org>" ]
description = "Typed AST of the Leo programming language"
homepage = "https://aleo.org"
repository = "https://github.com/AleoHQ/leo"
keywords = ["aleo", "cryptography", "leo", "programming-language", "zero-knowledge"]
categories = ["cryptography::cryptocurrencies", "web-programming"]
include = ["Cargo.toml", "src", "README.md", "LICENSE.md"]
keywords = [
"aleo",
"cryptography",
"leo",
"programming-language",
"zero-knowledge"
]
categories = [ "cryptography::cryptocurrencies", "web-programming" ]
include = [ "Cargo.toml", "src", "README.md", "LICENSE.md" ]
license = "GPL-3.0"
edition = "2018"
@ -20,20 +26,34 @@ name = "typed_ast"
path = "benches/typed_ast.rs"
harness = false
[dependencies]
leo-ast = { path = "../ast", version = "1.0.1" }
leo-input = { path = "../input", version = "1.0.1" }
[dependencies.leo-ast]
path = "../ast"
version = "1.0.2"
snarkos-errors = { version = "1.1.3", default-features = false }
snarkos-models = { version = "1.1.3", default-features = false }
[dependencies.leo-input]
path = "../input"
version = "1.0.2"
pest = { version = "2.0" }
serde = { version = "1.0" }
serde_json = { version = "1.0" }
[dependencies.snarkos-errors]
version = "1.1.3"
default-features = false
[dev-dependencies]
criterion = { version = "0.3" }
[dependencies.snarkos-models]
version = "1.1.3"
default-features = false
[dependencies.pest]
version = "2.0"
[dependencies.serde]
version = "1.0"
[dependencies.serde_json]
version = "1.0"
[dev-dependencies.criterion]
version = "0.3"
[features]
default = []
ci_skip = ["leo-ast/ci_skip"]
default = [ ]
ci_skip = [ "leo-ast/ci_skip" ]