fluencelabs/aquavm
1
0
Fork 0
mirror of https://github.com/fluencelabs/aquavm synced 2024-12-04 07:10:18 +00:00
Code Issues Projects Releases Wiki Activity

chore(build): remove risc-0 from workspace (#791)

Browse Source 
It seems that release-please doesn't handle these crates, not updating
dependency versions in the release pull request.

---------

Co-authored-by: Anatoly Laskaris <github_me@nahsi.dev>
This commit is contained in:
Ivan Boldyrev 2024-01-09 18:14:34 +04:00 committed by GitHub
parent 325eea7e91
commit 17482f078c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 413 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/release-please/config.json vendored
View File

@ -16,15 +16,6 @@
"air-interpreter",
"avm-client"
]
},
{
"type": "linked-versions",
"groupName": "risc0",
"components": [
"zk-aquavm-interface",
"zk-aquavm-methods",
"zk-aquavm"
]
}
],
"packages": {
@ -64,15 +55,6 @@
},
"tools/wasm/air-beautify-wasm": {
"component": "air-beautify-wasm"
},
"crates/risc-0/core": {
"component": "zk-aquavm-interface"
},
"crates/risc-0/methods": {
"component": "zk-aquavm-methods"
},
"crates/risc-0/methods/guest": {
"component": "zk-aquavm"
}
}
}

419
Cargo.lock generated
View File

@ -125,7 +125,7 @@ name = "air-beautifier"
version = "0.4.1"
dependencies = [
"aquavm-air-parser",
"itertools 0.10.5",
"itertools",
"thiserror",
]
@ -239,7 +239,7 @@ dependencies = [
name = "air-lambda-ast"
version = "0.1.0"
dependencies = [
"itertools 0.10.5",
"itertools",
"non-empty-vec",
"serde",
]
@ -249,7 +249,7 @@ name = "air-lambda-parser"
version = "0.1.0"
dependencies = [
"air-lambda-ast",
"itertools 0.10.5",
"itertools",
"lalrpop",
"lalrpop-util",
"regex",
@ -294,7 +294,7 @@ dependencies = [
"air-test-utils",
"aquavm-air-parser",
"fluence-keypair",
"itertools 0.10.5",
"itertools",
"maplit",
"nom",
"nom_locate",
@ -475,9 +475,8 @@ dependencies = [
"bs58 0.5.0",
"clap 4.4.11",
"fluence-keypair",
"itertools 0.10.5",
"itertools",
"near-sdk",
"risc0-zkvm",
"serde",
"serde_json",
"termcolor",
@ -486,8 +485,6 @@ dependencies = [
"tracing-subscriber",
"workspaces",
"zeroize",
"zk-aquavm-interface",
"zk-aquavm-methods",
]
[[package]]
@ -499,7 +496,7 @@ dependencies = [
"codespan",
"codespan-reporting",
"criterion 0.5.1",
"itertools 0.10.5",
"itertools",
"lalrpop",
"lalrpop-util",
"multimap 0.9.1",
@ -741,15 +738,6 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "autotools"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aef8da1805e028a172334c3b680f93e71126f2327622faef2ec3d893c0a4ad77"
dependencies = [
"cc",
]
[[package]]
name = "avm-data-store"
version = "0.7.4"
@ -907,15 +895,6 @@ dependencies = [
"opaque-debug",
]
[[package]]
name = "blake2"
version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
dependencies = [
"digest 0.10.7",
]
[[package]]
name = "blake2b_simd"
version = "0.5.11"
@ -997,17 +976,6 @@ dependencies = [
"tracing",
]
[[package]]
name = "bonsai-sdk"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "441d1092e11977985946b6564251df91d80ae36982128e53be52a32548ad8762"
dependencies = [
"reqwest",
"serde",
"thiserror",
]
[[package]]
name = "borsh"
version = "0.9.3"
@ -1149,26 +1117,6 @@ version = "0.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205"
[[package]]
name = "bytemuck"
version = "1.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
dependencies = [
"bytemuck_derive",
]
[[package]]
name = "bytemuck_derive"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.41",
]
[[package]]
name = "byteorder"
version = "1.5.0"
@ -1180,9 +1128,6 @@ name = "bytes"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
dependencies = [
"serde",
]
[[package]]
name = "bytesize"
@ -1224,15 +1169,6 @@ dependencies = [
"ppv-lite86",
]
[[package]]
name = "camino"
version = "1.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c"
dependencies = [
"serde",
]
[[package]]
name = "cap-fs-ext"
version = "1.0.15"
@ -1296,29 +1232,6 @@ dependencies = [
"winx 0.35.1",
]
[[package]]
name = "cargo-platform"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff"
dependencies = [
"serde",
]
[[package]]
name = "cargo_metadata"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7daec1a2a2129eeba1644b220b4647ec537b0b5d4bfd6876fcc5a540056b592"
dependencies = [
"camino",
"cargo-platform",
"semver 1.0.20",
"serde",
"serde_json",
"thiserror",
]
[[package]]
name = "cast"
version = "0.3.0"
@ -1670,7 +1583,7 @@ dependencies = [
"cranelift-codegen",
"cranelift-entity",
"cranelift-frontend",
"itertools 0.10.5",
"itertools",
"log",
"smallvec",
"wasmparser 0.100.0",
@ -1697,7 +1610,7 @@ dependencies = [
"clap 2.34.0",
"criterion-plot 0.4.5",
"csv",
"itertools 0.10.5",
"itertools",
"lazy_static",
"num-traits",
"oorandom",
@ -1724,7 +1637,7 @@ dependencies = [
"clap 4.4.11",
"criterion-plot 0.5.0",
"is-terminal",
"itertools 0.10.5",
"itertools",
"num-traits",
"once_cell",
"oorandom",
@ -1745,7 +1658,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876"
dependencies = [
"cast",
"itertools 0.10.5",
"itertools",
]
[[package]]
@ -1755,7 +1668,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
dependencies = [
"cast",
"itertools 0.10.5",
"itertools",
]
[[package]]
@ -2072,7 +1985,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
dependencies = [
"block-buffer 0.10.4",
"const-oid",
"crypto-common",
"subtle",
]
@ -2148,18 +2060,6 @@ dependencies = [
"winapi",
]
[[package]]
name = "docker-generate"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ccf673e0848ef09fa4aeeba78e681cf651c0c7d35f76ee38cec8e55bc32fa111"
[[package]]
name = "downcast-rs"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
[[package]]
name = "dyn-clone"
version = "1.0.16"
@ -2227,12 +2127,6 @@ version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
[[package]]
name = "elf"
version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4445909572dbd556c457c849c4ca58623d84b27c8fff1e74b0b4227d8b90d17b"
[[package]]
name = "ena"
version = "0.14.2"
@ -3177,15 +3071,6 @@ dependencies = [
"either",
]
[[package]]
name = "itertools"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
dependencies = [
"either",
]
[[package]]
name = "itoa"
version = "1.0.10"
@ -3256,7 +3141,7 @@ dependencies = [
"diff",
"ena",
"is-terminal",
"itertools 0.10.5",
"itertools",
"lalrpop-util",
"petgraph",
"pico-args",
@ -3298,12 +3183,6 @@ version = "0.2.151"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
[[package]]
name = "libm"
version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
[[package]]
name = "libp2p-identity"
version = "0.2.8"
@ -3519,7 +3398,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52907d7e7b9487a029dd3d99e647307c8808d7fba327e27113b0807d4868b315"
dependencies = [
"anyhow",
"itertools 0.10.5",
"itertools",
"marine-it-interfaces",
"marine-module-interface",
"marine-wasm-backend-traits",
@ -3601,7 +3480,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49d8f21255b94f1c8b2731a2b49c2ed34f955ed2e11dae3fb6c580a346d10bdd"
dependencies = [
"anyhow",
"itertools 0.10.5",
"itertools",
"marine-it-interfaces",
"nom",
"semver 1.0.20",
@ -3643,7 +3522,7 @@ dependencies = [
"bytesize",
"it-json-serde",
"it-memory-traits",
"itertools 0.10.5",
"itertools",
"log",
"marine-core",
"marine-module-interface",
@ -4010,7 +3889,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7754612b47737d277fb818e9fdbb1406e90f9e57151c55c3584d714421976cb6"
dependencies = [
"arrayref",
"blake2 0.9.2",
"blake2",
"borsh 0.9.3",
"bs58 0.4.0",
"c2-chacha",
@ -4034,7 +3913,7 @@ version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff6b382b626e7e0cd372d027c6672ac97b4b6ee6114288c9e58d8180b935d315"
dependencies = [
"blake2 0.9.2",
"blake2",
"borsh 0.10.3",
"bs58 0.4.0",
"c2-chacha",
@ -4485,17 +4364,6 @@ dependencies = [
"num-traits",
]
[[package]]
name = "num-derive"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.41",
]
[[package]]
name = "num-integer"
version = "0.1.45"
@ -4662,7 +4530,7 @@ dependencies = [
"futures-util",
"http",
"opentelemetry",
"prost 0.9.0",
"prost",
"thiserror",
"tokio",
"tonic",
@ -4964,16 +4832,6 @@ dependencies = [
"yansi",
]
[[package]]
name = "prettyplease"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
dependencies = [
"proc-macro2",
"syn 2.0.41",
]
[[package]]
name = "primitive-types"
version = "0.10.1"
@ -5068,17 +4926,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001"
dependencies = [
"bytes",
"prost-derive 0.9.0",
]
[[package]]
name = "prost"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a"
dependencies = [
"bytes",
"prost-derive 0.12.3",
"prost-derive",
]
[[package]]
@ -5089,40 +4937,18 @@ checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5"
dependencies = [
"bytes",
"heck 0.3.3",
"itertools 0.10.5",
"itertools",
"lazy_static",
"log",
"multimap 0.8.3",
"petgraph",
"prost 0.9.0",
"prost-types 0.9.0",
"prost",
"prost-types",
"regex",
"tempfile",
"which",
]
[[package]]
name = "prost-build"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2"
dependencies = [
"bytes",
"heck 0.4.1",
"itertools 0.11.0",
"log",
"multimap 0.8.3",
"once_cell",
"petgraph",
"prettyplease",
"prost 0.12.3",
"prost-types 0.12.3",
"regex",
"syn 2.0.41",
"tempfile",
"which",
]
[[package]]
name = "prost-derive"
version = "0.9.0"
@ -5130,25 +4956,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe"
dependencies = [
"anyhow",
"itertools 0.10.5",
"itertools",
"proc-macro2",
"quote",
"syn 1.0.109",
]
[[package]]
name = "prost-derive"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e"
dependencies = [
"anyhow",
"itertools 0.11.0",
"proc-macro2",
"quote",
"syn 2.0.41",
]
[[package]]
name = "prost-types"
version = "0.9.0"
@ -5156,16 +4969,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a"
dependencies = [
"bytes",
"prost 0.9.0",
]
[[package]]
name = "prost-types"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e"
dependencies = [
"prost 0.12.3",
"prost",
]
[[package]]
@ -5174,15 +4978,6 @@ version = "2.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
[[package]]
name = "protobuf-src"
version = "1.1.0+21.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7ac8852baeb3cc6fb83b93646fb93c0ffe5d14bf138c945ceb4b9948ee0e3c1"
dependencies = [
"autotools",
]
[[package]]
name = "psm"
version = "0.1.21"
@ -5500,139 +5295,6 @@ dependencies = [
"digest 0.10.7",
]
[[package]]
name = "risc0-binfmt"
version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "923c85a23cb9a9475b8cd4479ad3a06252604a361626e9ae7dc0dc635af22c22"
dependencies = [
"anyhow",
"elf",
"log",
"risc0-zkp",
"risc0-zkvm-platform",
"serde",
]
[[package]]
name = "risc0-build"
version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e58d4cc25e243e52d1ccd75d357b0aa55081736bf3052c65a823fdf169586843"
dependencies = [
"anyhow",
"cargo_metadata",
"docker-generate",
"risc0-binfmt",
"risc0-zkp",
"risc0-zkvm-platform",
"serde",
"serde_json",
"tempfile",
]
[[package]]
name = "risc0-circuit-recursion"
version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97547e10e9fdaaab8b64ffb45dc158b31f023b1a68015c6ce9f12fe3e403012a"
dependencies = [
"anyhow",
"bytemuck",
"log",
"risc0-core",
"risc0-zkp",
"tracing",
]
[[package]]
name = "risc0-circuit-rv32im"
version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a269d01b18cba24ee1a08f68726fc3623e8705ed79d158377d12e9129dcde2e"
dependencies = [
"anyhow",
"log",
"risc0-core",
"risc0-zkp",
"risc0-zkvm-platform",
"tracing",
]
[[package]]
name = "risc0-core"
version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "477e0bb8d2ec0b7955088b521eb596901e652d0faa2ea73bda0b77e05af5c07d"
dependencies = [
"bytemuck",
"rand_core 0.6.4",
]
[[package]]
name = "risc0-zkp"
version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5abb1a0cf847d3f9aed1e563b76c358107e7ba66dbfab28f7144252c990bd82"
dependencies = [
"anyhow",
"blake2 0.10.6",
"bytemuck",
"digest 0.10.7",
"hex 0.4.3",
"log",
"paste",
"rand_core 0.6.4",
"risc0-core",
"risc0-zkvm-platform",
"serde",
"sha2 0.10.8",
"tracing",
]
[[package]]
name = "risc0-zkvm"
version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3cf80df202c038efc2199be34fda8114b38bfc5b2b51c60cbbdf1f425b07b384"
dependencies = [
"anyhow",
"bincode",
"bonsai-sdk",
"bytemuck",
"bytes",
"cfg-if 1.0.0",
"getrandom 0.2.11",
"hex 0.4.3",
"log",
"num-derive",
"num-traits",
"prost 0.12.3",
"prost-build 0.12.3",
"protobuf-src",
"risc0-binfmt",
"risc0-circuit-recursion",
"risc0-circuit-rv32im",
"risc0-core",
"risc0-zkp",
"risc0-zkvm-platform",
"rrs-lib",
"semver 1.0.20",
"serde",
"tracing",
]
[[package]]
name = "risc0-zkvm-platform"
version = "0.19.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2dcd6b66f7a4972001db0acf3f06d99b7851c8d9f0de1f7e0fb4496c66c5cd02"
dependencies = [
"bytemuck",
"getrandom 0.2.11",
"libm",
]
[[package]]
name = "rmp"
version = "0.8.12"
@ -5655,16 +5317,6 @@ dependencies = [
"serde",
]
[[package]]
name = "rrs-lib"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4382d3af3a4ebdae7f64ba6edd9114fff92c89808004c4943b393377a25d001"
dependencies = [
"downcast-rs",
"paste",
]
[[package]]
name = "rust-argon2"
version = "0.8.3"
@ -6693,8 +6345,8 @@ dependencies = [
"hyper-timeout",
"percent-encoding",
"pin-project",
"prost 0.9.0",
"prost-derive 0.9.0",
"prost",
"prost-derive",
"tokio",
"tokio-stream",
"tokio-util 0.6.10",
@ -6712,7 +6364,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757"
dependencies = [
"proc-macro2",
"prost-build 0.9.0",
"prost-build",
"quote",
"syn 1.0.109",
]
@ -7250,7 +6902,7 @@ dependencies = [
"it-lilo",
"it-memory-traits",
"it-to-bytes",
"itertools 0.10.5",
"itertools",
"log",
"nom",
"safe-transmute",
@ -8025,21 +7677,6 @@ dependencies = [
"time 0.1.45",
]
[[package]]
name = "zk-aquavm-interface"
version = "0.1.0"
dependencies = [
"aquavm-air",
"serde",
]
[[package]]
name = "zk-aquavm-methods"
version = "0.1.0"
dependencies = [
"risc0-build",
]
[[package]]
name = "zstd"
version = "0.11.2+zstd.1.5.2"

8
tools/cli/air/Cargo.toml
View File

@ -39,9 +39,9 @@ tokio = { version = "1", features = ["rt"], optional = true }
workspaces = { version = "0.7.0", optional = true }
# risc-0
risc0-zkvm = { version = "0.19.1", optional = true }
zk-aquavm-methods = { path = "../../../crates/risc-0/methods", version = "0.1.0", features = ["enable_risc_0_compilation"], optional = true }
zk-aquavm-interface = { path = "../../../crates/risc-0/core", version = "0.1.0", optional = true }
# risc0-zkvm = { version = "0.19.1", optional = true }
# zk-aquavm-methods = { path = "../../../crates/risc-0/methods", version = "0.1.0", features = ["enable_risc_0_compilation"], optional = true }
# zk-aquavm-interface = { path = "../../../crates/risc-0/core", version = "0.1.0", optional = true }
[features]
default = ["wasm"]
@ -49,7 +49,7 @@ wasm = ["air-test-utils"]
gen_signatures = ["aquavm-air/gen_signatures"]
check_signatures = ["aquavm-air/check_signatures"]
near = [ "dep:near-sdk", "dep:tokio", "dep:workspaces" ]
risc0 = [ "dep:risc0-zkvm", "dep:zk-aquavm-methods", "dep:zk-aquavm-interface" ]
# risc0 = [ "dep:risc0-zkvm", "dep:zk-aquavm-methods", "dep:zk-aquavm-interface" ]
[[bin]]
name = "air"