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

fix(deps): update rust crate marine-rs-sdk to 0.10.0 (#640)

Browse Source 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Valery Antopol <valery.antopol@gmail.com>
Co-authored-by: Ivan Boldyrev <ivan@fluence.one>
This commit is contained in:
renovate[bot] 2023-09-19 17:04:40 +07:00 committed by GitHub
parent bd80a127ea
commit b713e447fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 390 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
Cargo.lock generated
View File

@ -113,7 +113,7 @@ dependencies = [
"newtype_derive", "newtype_derive",
"num-traits", "num-traits",
"once_cell", "once_cell",
"polyplets 0.5.0", "polyplets",
"semver 1.0.18", "semver 1.0.18",
"serde", "serde",
"serde_json", "serde_json",
@ -216,7 +216,7 @@ dependencies = [
"bimap", "bimap",
"log", "log",
"num-traits", "num-traits",
"polyplets 0.5.0", "polyplets",
"serde_json", "serde_json",
"thiserror", "thiserror",
"tracing", "tracing",
@ -345,7 +345,7 @@ dependencies = [
"marine-rs-sdk", "marine-rs-sdk",
"non-empty-vec", "non-empty-vec",
"once_cell", "once_cell",
"polyplets 0.5.0", "polyplets",
"pretty_assertions 0.6.1", "pretty_assertions 0.6.1",
"semver 1.0.18", "semver 1.0.18",
"serde", "serde",
@ -573,7 +573,7 @@ dependencies = [
"air-utils", "air-utils",
"log", "log",
"maplit", "maplit",
"polyplets 0.5.0", "polyplets",
"serde", "serde",
"serde_json", "serde_json",
"thiserror", "thiserror",
@ -594,7 +594,7 @@ dependencies = [
"maplit", "maplit",
"marine-runtime", "marine-runtime",
"parking_lot 0.12.1", "parking_lot 0.12.1",
"polyplets 0.5.0", "polyplets",
"serde", "serde",
"serde_json", "serde_json",
"thiserror", "thiserror",
@ -1664,6 +1664,17 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "derivative"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
dependencies = [
"proc-macro2",
"quote",
"syn 1.0.109",
]
[[package]] [[package]]
name = "derive_more" name = "derive_more"
version = "0.99.17" version = "0.99.17"
@ -2009,9 +2020,9 @@ dependencies = [
[[package]] [[package]]
name = "fluence-app-service" name = "fluence-app-service"
version = "0.28.0" version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c587beb44ec3452670aeabff1eaac017aba2c78766ce1b5fd26c633e0af02b5" checksum = "0b0916285affb8d7c59c80a38f97563ea6fe1082f14778d22e5c8bec7f8537ec"
dependencies = [ dependencies = [
"log", "log",
"maplit", "maplit",
@ -2878,10 +2889,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
[[package]] [[package]]
name = "marine-core" name = "marine-call-parameters"
version = "0.23.0" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87032a611ce1124dde90a9230a49be4efa39d192722604c7464704a16de790e6" checksum = "f9ca0439e5b2a812d8bc5c3b7d71e3691fb260a1f0384a7e842eec1b59f13069"
dependencies = [
"marine-macro",
"marine-rs-sdk-main",
"serde",
]
[[package]]
name = "marine-core"
version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4f2db990567b2677d4b03d3f5b019c9f03e4365eaa8303cef083e388d960e47"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bytesize", "bytesize",
@ -2954,11 +2976,11 @@ dependencies = [
[[package]] [[package]]
name = "marine-macro" name = "marine-macro"
version = "0.8.1" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c99fa7013660d8e129b2bcd51138015136b91903f88529f1da0510f850c28ea" checksum = "0088fc9cb6a970dc17a510c3cb28fe459c368d566e8cb7f8354e06ef3395c883"
dependencies = [ dependencies = [
"marine-macro-impl 0.8.1", "marine-macro-impl 0.10.0",
"marine-rs-sdk-main", "marine-rs-sdk-main",
] ]
@ -2977,9 +2999,9 @@ dependencies = [
[[package]] [[package]]
name = "marine-macro-impl" name = "marine-macro-impl"
version = "0.8.1" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43b4761eec59a2914413d1ea14659305e6374bfed69998f33763daa586c44196" checksum = "e457b58c826679139896f04e6cfa38c5d23870a88e957e8e0a6f646e7c3f0ac4"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -3000,12 +3022,13 @@ dependencies = [
[[package]] [[package]]
name = "marine-module-info-parser" name = "marine-module-info-parser"
version = "0.8.0" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e519714ac32b1ffe432f743e011c3695d0cb7a89a906775d81f84546b57b6f29" checksum = "ab5aa7160fa89a493ce5367aa4b09f7001e054dd4c6373aa5dd0d1ff22b2466e"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"chrono", "chrono",
"derivative",
"marine-rs-sdk-main", "marine-rs-sdk-main",
"marine-wasm-backend-traits", "marine-wasm-backend-traits",
"semver 1.0.18", "semver 1.0.18",
@ -3033,22 +3056,22 @@ dependencies = [
[[package]] [[package]]
name = "marine-rs-sdk" name = "marine-rs-sdk"
version = "0.8.1" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11991d31bf4d53651e1c151637f260c759eb9f28ecf8c894eb260b50f46459cc" checksum = "c6ecd45528096514b4db8d23523eadaf9e5d5a7d3fce637e4bb684afccc0e9a3"
dependencies = [ dependencies = [
"marine-call-parameters",
"marine-macro", "marine-macro",
"marine-rs-sdk-main", "marine-rs-sdk-main",
"marine-timestamp-macro", "marine-timestamp-macro",
"polyplets 0.4.0",
"serde", "serde",
] ]
[[package]] [[package]]
name = "marine-rs-sdk-main" name = "marine-rs-sdk-main"
version = "0.8.1" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b01678ba2a94fcfeb8232e87281937b07927ab2a54205747b6ab45e3f5ad65fd" checksum = "11eabbc74c69ad11874fb6cf686604833d084633293324524a40ec581663f978"
dependencies = [ dependencies = [
"log", "log",
"serde", "serde",
@ -3056,9 +3079,9 @@ dependencies = [
[[package]] [[package]]
name = "marine-runtime" name = "marine-runtime"
version = "0.29.0" version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81c1a551a89aefb96a9f4443c4d4f56b998c20008faf5fa26fc4cc5c723a0c13" checksum = "fe2f5584266fe595f06fa83fd4cc0de4c2cff513906869a4e37f112354ca08b8"
dependencies = [ dependencies = [
"bytesize", "bytesize",
"it-json-serde", "it-json-serde",
@ -3085,9 +3108,9 @@ dependencies = [
[[package]] [[package]]
name = "marine-timestamp-macro" name = "marine-timestamp-macro"
version = "0.8.1" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80d254ea11e35cdeccc62ffccf78775c066750c9e5bae4934eb0758187442282" checksum = "acf956d174fdbf940b474089d5388aa35b4fc73fedbfade2a92dc198084b9afa"
dependencies = [ dependencies = [
"chrono", "chrono",
"quote", "quote",
@ -4099,22 +4122,11 @@ dependencies = [
"windows-sys 0.48.0", "windows-sys 0.48.0",
] ]
[[package]]
name = "polyplets"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b579a79a461ca50abb202eac61c76d8782fdf091a91775c9e181352e7cd30a8b"
dependencies = [
"marine-macro",
"marine-rs-sdk-main",
"serde",
]
[[package]] [[package]]
name = "polyplets" name = "polyplets"
version = "0.5.0" version = "0.5.0"
dependencies = [ dependencies = [
"marine-rs-sdk", "marine-call-parameters",
"serde", "serde",
] ]

2
air-interpreter/Cargo.toml
View File

@ -22,7 +22,7 @@ aquavm-air = { version = "0.47.0", path = "../air" }
air-interpreter-interface = { version = "0.15.0", path = "../crates/air-lib/interpreter-interface" } air-interpreter-interface = { version = "0.15.0", path = "../crates/air-lib/interpreter-interface" }
air-log-targets = { version = "0.1.0", path = "../crates/air-lib/log-targets" } air-log-targets = { version = "0.1.0", path = "../crates/air-lib/log-targets" }
marine-rs-sdk = { version = "0.8.1", features = ["logger"] } marine-rs-sdk = {version = "0.10.0", features = ["logger"] }
wasm-bindgen = "=0.2.83" wasm-bindgen = "=0.2.83"

4
air/Cargo.toml
View File

@ -48,8 +48,8 @@ tracing = "0.1.37"
[dev_dependencies] [dev_dependencies]
air-test-utils = { path = "../crates/air-lib/test-utils" } air-test-utils = { path = "../crates/air-lib/test-utils" }
air-testing-framework = { path = "../crates/testing-framework" } air-testing-framework = { path = "../crates/testing-framework" }
fluence-app-service = "0.28.0" fluence-app-service = "0.29.0"
marine-rs-sdk = { version = "0.8.1", features = ["logger"] } marine-rs-sdk = { version = "0.10.0", features = ["logger"] }
# the feature just silence a warning in the criterion 0.3.x. # the feature just silence a warning in the criterion 0.3.x.
criterion = { version = "0.3.3", features = ["html_reports"] } criterion = { version = "0.3.3", features = ["html_reports"] }

40
air/tests/test_module/features/tetraplets/security_tetraplets.rs
View File

@ -14,8 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
use air::SecurityTetraplet;
use air_test_utils::prelude::*; use air_test_utils::prelude::*;
use polyplets::SecurityTetraplet;
use pretty_assertions::assert_eq; use pretty_assertions::assert_eq;
use std::cell::RefCell; use std::cell::RefCell;
@ -360,7 +360,11 @@ fn tetraplet_with_wasm_modules() {
let service = service.get_mut(params.service_id.as_str()).unwrap(); let service = service.get_mut(params.service_id.as_str()).unwrap();
let result = service let result = service
.call(params.function_name, JValue::Array(params.arguments), call_parameters) .call(
params.function_name,
JValue::Array(params.arguments),
to_app_service_call_parameters(call_parameters),
)
.unwrap(); .unwrap();
CallServiceResult::ok(result) CallServiceResult::ok(result)
@ -385,3 +389,35 @@ fn tetraplet_with_wasm_modules() {
assert_eq!(actual_trace[1.into()], expected_state) assert_eq!(actual_trace[1.into()], expected_state)
} }
fn to_app_service_call_parameters(
call_parameters: marine_rs_sdk::CallParameters,
) -> fluence_app_service::CallParameters {
fluence_app_service::CallParameters {
init_peer_id: call_parameters.init_peer_id,
service_id: call_parameters.service_id,
service_creator_peer_id: call_parameters.service_creator_peer_id,
host_id: call_parameters.host_id,
particle_id: call_parameters.particle_id,
tetraplets: call_parameters
.tetraplets
.into_iter()
.map(to_app_service_tetraplets)
.collect(),
}
}
fn to_app_service_tetraplets(
tetraplets: Vec<marine_rs_sdk::SecurityTetraplet>,
) -> Vec<fluence_app_service::SecurityTetraplet> {
tetraplets.into_iter().map(to_app_service_tetraplet).collect()
}
fn to_app_service_tetraplet(tetraplet: marine_rs_sdk::SecurityTetraplet) -> fluence_app_service::SecurityTetraplet {
fluence_app_service::SecurityTetraplet {
peer_pk: tetraplet.peer_pk,
service_id: tetraplet.service_id,
function_name: tetraplet.function_name,
json_path: tetraplet.json_path,
}
}

132
air/tests/test_module/features/tetraplets/security_tetraplets/auth_module/Cargo.lock generated
View File

@ -4,9 +4,9 @@ version = 3
[[package]] [[package]]
name = "aho-corasick" name = "aho-corasick"
version = "1.0.5" version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a"
dependencies = [ dependencies = [
"memchr", "memchr",
] ]
@ -39,7 +39,7 @@ dependencies = [
"newtype_derive", "newtype_derive",
"num-traits", "num-traits",
"once_cell", "once_cell",
"polyplets 0.5.0", "polyplets",
"semver 1.0.17", "semver 1.0.17",
"serde", "serde",
"serde_json", "serde_json",
@ -102,7 +102,7 @@ dependencies = [
"bimap", "bimap",
"log", "log",
"num-traits", "num-traits",
"polyplets 0.5.0", "polyplets",
"serde_json", "serde_json",
"thiserror", "thiserror",
"tracing", "tracing",
@ -148,7 +148,7 @@ dependencies = [
"maplit", "maplit",
"non-empty-vec", "non-empty-vec",
"once_cell", "once_cell",
"polyplets 0.5.0", "polyplets",
"semver 1.0.17", "semver 1.0.17",
"serde", "serde",
"serde_json", "serde_json",
@ -285,24 +285,24 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]] [[package]]
name = "blake2b_simd" name = "blake2b_simd"
version = "1.0.2" version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc"
dependencies = [ dependencies = [
"arrayref", "arrayref",
"arrayvec", "arrayvec",
"constant_time_eq", "constant_time_eq 0.2.6",
] ]
[[package]] [[package]]
name = "blake2s_simd" name = "blake2s_simd"
version = "1.0.2" version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae" checksum = "6637f448b9e61dfadbdcbae9a885fadee1f3eaffb1f8d3c1965d3ade8bdfd44f"
dependencies = [ dependencies = [
"arrayref", "arrayref",
"arrayvec", "arrayvec",
"constant_time_eq", "constant_time_eq 0.2.6",
] ]
[[package]] [[package]]
@ -315,7 +315,7 @@ dependencies = [
"arrayvec", "arrayvec",
"cc", "cc",
"cfg-if", "cfg-if",
"constant_time_eq", "constant_time_eq 0.3.0",
] ]
[[package]] [[package]]
@ -371,16 +371,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]] [[package]]
name = "chrono" name = "chrono"
version = "0.4.30" version = "0.4.26"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
dependencies = [ dependencies = [
"android-tzdata", "android-tzdata",
"iana-time-zone", "iana-time-zone",
"js-sys", "js-sys",
"num-traits", "num-traits",
"time",
"wasm-bindgen", "wasm-bindgen",
"windows-targets 0.48.0", "winapi",
] ]
[[package]] [[package]]
@ -431,6 +432,12 @@ version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
[[package]]
name = "constant_time_eq"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6"
[[package]] [[package]]
name = "constant_time_eq" name = "constant_time_eq"
version = "0.3.0" version = "0.3.0"
@ -502,9 +509,9 @@ dependencies = [
[[package]] [[package]]
name = "curve25519-dalek" name = "curve25519-dalek"
version = "4.1.0" version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "622178105f911d937a42cdb140730ba4a3ed2becd8ae6ce39c7d28b5d75d4588" checksum = "f711ade317dd348950a9910f81c5947e3d8907ebd2b83f76203ff1807e6a2bc2"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"cpufeatures", "cpufeatures",
@ -651,7 +658,7 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980"
dependencies = [ dependencies = [
"curve25519-dalek 4.1.0", "curve25519-dalek 4.0.0",
"ed25519 2.2.2", "ed25519 2.2.2",
"rand_core 0.6.4", "rand_core 0.6.4",
"serde", "serde",
@ -707,9 +714,9 @@ dependencies = [
[[package]] [[package]]
name = "fiat-crypto" name = "fiat-crypto"
version = "0.2.1" version = "0.1.20"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d" checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77"
[[package]] [[package]]
name = "fixedbitset" name = "fixedbitset"
@ -961,7 +968,7 @@ dependencies = [
"ed25519-dalek 2.0.0", "ed25519-dalek 2.0.0",
"libsecp256k1", "libsecp256k1",
"log", "log",
"multihash 0.19.1", "multihash 0.19.0",
"quick-protobuf", "quick-protobuf",
"rand 0.8.5", "rand 0.8.5",
"ring", "ring",
@ -1040,10 +1047,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
[[package]] [[package]]
name = "marine-macro" name = "marine-call-parameters"
version = "0.8.1" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c99fa7013660d8e129b2bcd51138015136b91903f88529f1da0510f850c28ea" checksum = "f9ca0439e5b2a812d8bc5c3b7d71e3691fb260a1f0384a7e842eec1b59f13069"
dependencies = [
"marine-macro",
"marine-rs-sdk-main",
"serde",
]
[[package]]
name = "marine-macro"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0088fc9cb6a970dc17a510c3cb28fe459c368d566e8cb7f8354e06ef3395c883"
dependencies = [ dependencies = [
"marine-macro-impl", "marine-macro-impl",
"marine-rs-sdk-main", "marine-rs-sdk-main",
@ -1051,9 +1069,9 @@ dependencies = [
[[package]] [[package]]
name = "marine-macro-impl" name = "marine-macro-impl"
version = "0.8.1" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43b4761eec59a2914413d1ea14659305e6374bfed69998f33763daa586c44196" checksum = "e457b58c826679139896f04e6cfa38c5d23870a88e957e8e0a6f646e7c3f0ac4"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -1064,22 +1082,22 @@ dependencies = [
[[package]] [[package]]
name = "marine-rs-sdk" name = "marine-rs-sdk"
version = "0.8.1" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11991d31bf4d53651e1c151637f260c759eb9f28ecf8c894eb260b50f46459cc" checksum = "c6ecd45528096514b4db8d23523eadaf9e5d5a7d3fce637e4bb684afccc0e9a3"
dependencies = [ dependencies = [
"marine-call-parameters",
"marine-macro", "marine-macro",
"marine-rs-sdk-main", "marine-rs-sdk-main",
"marine-timestamp-macro", "marine-timestamp-macro",
"polyplets 0.4.0",
"serde", "serde",
] ]
[[package]] [[package]]
name = "marine-rs-sdk-main" name = "marine-rs-sdk-main"
version = "0.8.1" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b01678ba2a94fcfeb8232e87281937b07927ab2a54205747b6ab45e3f5ad65fd" checksum = "11eabbc74c69ad11874fb6cf686604833d084633293324524a40ec581663f978"
dependencies = [ dependencies = [
"log", "log",
"serde", "serde",
@ -1087,9 +1105,9 @@ dependencies = [
[[package]] [[package]]
name = "marine-timestamp-macro" name = "marine-timestamp-macro"
version = "0.8.1" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80d254ea11e35cdeccc62ffccf78775c066750c9e5bae4934eb0758187442282" checksum = "acf956d174fdbf940b474089d5388aa35b4fc73fedbfade2a92dc198084b9afa"
dependencies = [ dependencies = [
"chrono", "chrono",
"quote", "quote",
@ -1097,9 +1115,9 @@ dependencies = [
[[package]] [[package]]
name = "memchr" name = "memchr"
version = "2.6.3" version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]] [[package]]
name = "multibase" name = "multibase"
@ -1131,9 +1149,9 @@ dependencies = [
[[package]] [[package]]
name = "multihash" name = "multihash"
version = "0.19.1" version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "076d548d76a0e2a0d4ab471d0b1c36c577786dfc4471242035d97a12a735c492" checksum = "2fd59dcc2bbe70baabeac52cd22ae52c55eefe6c38ff11a9439f16a350a939f2"
dependencies = [ dependencies = [
"core2", "core2",
"unsigned-varint", "unsigned-varint",
@ -1250,26 +1268,15 @@ dependencies = [
[[package]] [[package]]
name = "platforms" name = "platforms"
version = "3.1.2" version = "3.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630"
[[package]]
name = "polyplets"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b579a79a461ca50abb202eac61c76d8782fdf091a91775c9e181352e7cd30a8b"
dependencies = [
"marine-macro",
"marine-rs-sdk-main",
"serde",
]
[[package]] [[package]]
name = "polyplets" name = "polyplets"
version = "0.5.0" version = "0.5.0"
dependencies = [ dependencies = [
"marine-rs-sdk", "marine-call-parameters",
"serde", "serde",
] ]
@ -1438,9 +1445,9 @@ dependencies = [
[[package]] [[package]]
name = "regex" name = "regex"
version = "1.9.5" version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
dependencies = [ dependencies = [
"aho-corasick", "aho-corasick",
"memchr", "memchr",
@ -1450,9 +1457,9 @@ dependencies = [
[[package]] [[package]]
name = "regex-automata" name = "regex-automata"
version = "0.3.8" version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
dependencies = [ dependencies = [
"aho-corasick", "aho-corasick",
"memchr", "memchr",
@ -1461,9 +1468,9 @@ dependencies = [
[[package]] [[package]]
name = "regex-syntax" name = "regex-syntax"
version = "0.7.5" version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
[[package]] [[package]]
name = "ring" name = "ring"
@ -1758,6 +1765,17 @@ dependencies = [
"syn 2.0.16", "syn 2.0.16",
] ]
[[package]]
name = "time"
version = "0.1.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
dependencies = [
"libc",
"wasi 0.10.0+wasi-snapshot-preview1",
"winapi",
]
[[package]] [[package]]
name = "tiny-keccak" name = "tiny-keccak"
version = "2.0.2" version = "2.0.2"

2
air/tests/test_module/features/tetraplets/security_tetraplets/auth_module/Cargo.toml
View File

@ -10,6 +10,6 @@ path = "src/main.rs"
[dependencies] [dependencies]
aquavm-air = { path = "../../../../../../../air" } aquavm-air = { path = "../../../../../../../air" }
marine-rs-sdk = "0.8.1" marine-rs-sdk = "0.10.0"
[workspace] [workspace]

132
air/tests/test_module/features/tetraplets/security_tetraplets/log_storage/Cargo.lock generated
View File

@ -4,9 +4,9 @@ version = 3
[[package]] [[package]]
name = "aho-corasick" name = "aho-corasick"
version = "1.0.5" version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a"
dependencies = [ dependencies = [
"memchr", "memchr",
] ]
@ -39,7 +39,7 @@ dependencies = [
"newtype_derive", "newtype_derive",
"num-traits", "num-traits",
"once_cell", "once_cell",
"polyplets 0.5.0", "polyplets",
"semver 1.0.17", "semver 1.0.17",
"serde", "serde",
"serde_json", "serde_json",
@ -102,7 +102,7 @@ dependencies = [
"bimap", "bimap",
"log", "log",
"num-traits", "num-traits",
"polyplets 0.5.0", "polyplets",
"serde_json", "serde_json",
"thiserror", "thiserror",
"tracing", "tracing",
@ -148,7 +148,7 @@ dependencies = [
"maplit", "maplit",
"non-empty-vec", "non-empty-vec",
"once_cell", "once_cell",
"polyplets 0.5.0", "polyplets",
"semver 1.0.17", "semver 1.0.17",
"serde", "serde",
"serde_json", "serde_json",
@ -277,24 +277,24 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]] [[package]]
name = "blake2b_simd" name = "blake2b_simd"
version = "1.0.2" version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc"
dependencies = [ dependencies = [
"arrayref", "arrayref",
"arrayvec", "arrayvec",
"constant_time_eq", "constant_time_eq 0.2.6",
] ]
[[package]] [[package]]
name = "blake2s_simd" name = "blake2s_simd"
version = "1.0.2" version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae" checksum = "6637f448b9e61dfadbdcbae9a885fadee1f3eaffb1f8d3c1965d3ade8bdfd44f"
dependencies = [ dependencies = [
"arrayref", "arrayref",
"arrayvec", "arrayvec",
"constant_time_eq", "constant_time_eq 0.2.6",
] ]
[[package]] [[package]]
@ -307,7 +307,7 @@ dependencies = [
"arrayvec", "arrayvec",
"cc", "cc",
"cfg-if", "cfg-if",
"constant_time_eq", "constant_time_eq 0.3.0",
] ]
[[package]] [[package]]
@ -363,16 +363,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]] [[package]]
name = "chrono" name = "chrono"
version = "0.4.30" version = "0.4.26"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
dependencies = [ dependencies = [
"android-tzdata", "android-tzdata",
"iana-time-zone", "iana-time-zone",
"js-sys", "js-sys",
"num-traits", "num-traits",
"time",
"wasm-bindgen", "wasm-bindgen",
"windows-targets 0.48.0", "winapi",
] ]
[[package]] [[package]]
@ -423,6 +424,12 @@ version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
[[package]]
name = "constant_time_eq"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6"
[[package]] [[package]]
name = "constant_time_eq" name = "constant_time_eq"
version = "0.3.0" version = "0.3.0"
@ -494,9 +501,9 @@ dependencies = [
[[package]] [[package]]
name = "curve25519-dalek" name = "curve25519-dalek"
version = "4.1.0" version = "4.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "622178105f911d937a42cdb140730ba4a3ed2becd8ae6ce39c7d28b5d75d4588" checksum = "f711ade317dd348950a9910f81c5947e3d8907ebd2b83f76203ff1807e6a2bc2"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"cpufeatures", "cpufeatures",
@ -643,7 +650,7 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980"
dependencies = [ dependencies = [
"curve25519-dalek 4.1.0", "curve25519-dalek 4.0.0",
"ed25519 2.2.2", "ed25519 2.2.2",
"rand_core 0.6.4", "rand_core 0.6.4",
"serde", "serde",
@ -699,9 +706,9 @@ dependencies = [
[[package]] [[package]]
name = "fiat-crypto" name = "fiat-crypto"
version = "0.2.1" version = "0.1.20"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d" checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77"
[[package]] [[package]]
name = "fixedbitset" name = "fixedbitset"
@ -953,7 +960,7 @@ dependencies = [
"ed25519-dalek 2.0.0", "ed25519-dalek 2.0.0",
"libsecp256k1", "libsecp256k1",
"log", "log",
"multihash 0.19.1", "multihash 0.19.0",
"quick-protobuf", "quick-protobuf",
"rand 0.8.5", "rand 0.8.5",
"ring", "ring",
@ -1040,10 +1047,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
[[package]] [[package]]
name = "marine-macro" name = "marine-call-parameters"
version = "0.8.1" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c99fa7013660d8e129b2bcd51138015136b91903f88529f1da0510f850c28ea" checksum = "f9ca0439e5b2a812d8bc5c3b7d71e3691fb260a1f0384a7e842eec1b59f13069"
dependencies = [
"marine-macro",
"marine-rs-sdk-main",
"serde",
]
[[package]]
name = "marine-macro"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0088fc9cb6a970dc17a510c3cb28fe459c368d566e8cb7f8354e06ef3395c883"
dependencies = [ dependencies = [
"marine-macro-impl", "marine-macro-impl",
"marine-rs-sdk-main", "marine-rs-sdk-main",
@ -1051,9 +1069,9 @@ dependencies = [
[[package]] [[package]]
name = "marine-macro-impl" name = "marine-macro-impl"
version = "0.8.1" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43b4761eec59a2914413d1ea14659305e6374bfed69998f33763daa586c44196" checksum = "e457b58c826679139896f04e6cfa38c5d23870a88e957e8e0a6f646e7c3f0ac4"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -1064,22 +1082,22 @@ dependencies = [
[[package]] [[package]]
name = "marine-rs-sdk" name = "marine-rs-sdk"
version = "0.8.1" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11991d31bf4d53651e1c151637f260c759eb9f28ecf8c894eb260b50f46459cc" checksum = "c6ecd45528096514b4db8d23523eadaf9e5d5a7d3fce637e4bb684afccc0e9a3"
dependencies = [ dependencies = [
"marine-call-parameters",
"marine-macro", "marine-macro",
"marine-rs-sdk-main", "marine-rs-sdk-main",
"marine-timestamp-macro", "marine-timestamp-macro",
"polyplets 0.4.0",
"serde", "serde",
] ]
[[package]] [[package]]
name = "marine-rs-sdk-main" name = "marine-rs-sdk-main"
version = "0.8.1" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b01678ba2a94fcfeb8232e87281937b07927ab2a54205747b6ab45e3f5ad65fd" checksum = "11eabbc74c69ad11874fb6cf686604833d084633293324524a40ec581663f978"
dependencies = [ dependencies = [
"log", "log",
"serde", "serde",
@ -1087,9 +1105,9 @@ dependencies = [
[[package]] [[package]]
name = "marine-timestamp-macro" name = "marine-timestamp-macro"
version = "0.8.1" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80d254ea11e35cdeccc62ffccf78775c066750c9e5bae4934eb0758187442282" checksum = "acf956d174fdbf940b474089d5388aa35b4fc73fedbfade2a92dc198084b9afa"
dependencies = [ dependencies = [
"chrono", "chrono",
"quote", "quote",
@ -1097,9 +1115,9 @@ dependencies = [
[[package]] [[package]]
name = "memchr" name = "memchr"
version = "2.6.3" version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
[[package]] [[package]]
name = "multibase" name = "multibase"
@ -1131,9 +1149,9 @@ dependencies = [
[[package]] [[package]]
name = "multihash" name = "multihash"
version = "0.19.1" version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "076d548d76a0e2a0d4ab471d0b1c36c577786dfc4471242035d97a12a735c492" checksum = "2fd59dcc2bbe70baabeac52cd22ae52c55eefe6c38ff11a9439f16a350a939f2"
dependencies = [ dependencies = [
"core2", "core2",
"unsigned-varint", "unsigned-varint",
@ -1250,26 +1268,15 @@ dependencies = [
[[package]] [[package]]
name = "platforms" name = "platforms"
version = "3.1.2" version = "3.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630"
[[package]]
name = "polyplets"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b579a79a461ca50abb202eac61c76d8782fdf091a91775c9e181352e7cd30a8b"
dependencies = [
"marine-macro",
"marine-rs-sdk-main",
"serde",
]
[[package]] [[package]]
name = "polyplets" name = "polyplets"
version = "0.5.0" version = "0.5.0"
dependencies = [ dependencies = [
"marine-rs-sdk", "marine-call-parameters",
"serde", "serde",
] ]
@ -1438,9 +1445,9 @@ dependencies = [
[[package]] [[package]]
name = "regex" name = "regex"
version = "1.9.5" version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
dependencies = [ dependencies = [
"aho-corasick", "aho-corasick",
"memchr", "memchr",
@ -1450,9 +1457,9 @@ dependencies = [
[[package]] [[package]]
name = "regex-automata" name = "regex-automata"
version = "0.3.8" version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
dependencies = [ dependencies = [
"aho-corasick", "aho-corasick",
"memchr", "memchr",
@ -1461,9 +1468,9 @@ dependencies = [
[[package]] [[package]]
name = "regex-syntax" name = "regex-syntax"
version = "0.7.5" version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
[[package]] [[package]]
name = "ring" name = "ring"
@ -1758,6 +1765,17 @@ dependencies = [
"syn 2.0.16", "syn 2.0.16",
] ]
[[package]]
name = "time"
version = "0.1.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
dependencies = [
"libc",
"wasi 0.10.0+wasi-snapshot-preview1",
"winapi",
]
[[package]] [[package]]
name = "tiny-keccak" name = "tiny-keccak"
version = "2.0.2" version = "2.0.2"

2
air/tests/test_module/features/tetraplets/security_tetraplets/log_storage/Cargo.toml
View File

@ -10,6 +10,6 @@ path = "src/main.rs"
[dependencies] [dependencies]
aquavm-air = { path = "../../../../../../../air" } aquavm-air = { path = "../../../../../../../air" }
marine-rs-sdk = "0.8.1" marine-rs-sdk = "0.10.0"
[workspace] [workspace]

2
avm/server/Cargo.toml
View File

@ -18,7 +18,7 @@ path = "src/lib.rs"
air-interpreter-interface = { version = "0.15.0", path = "../../crates/air-lib/interpreter-interface" } air-interpreter-interface = { version = "0.15.0", path = "../../crates/air-lib/interpreter-interface" }
air-utils = { version = "0.1.1", path = "../../crates/air-lib/utils" } air-utils = { version = "0.1.1", path = "../../crates/air-lib/utils" }
avm-data-store = { version = "0.7.0", path = "../../crates/data-store" } avm-data-store = { version = "0.7.0", path = "../../crates/data-store" }
marine-runtime = "0.29.0" marine-runtime = "0.30.0"
polyplets = { version = "0.5.0", path = "../../crates/air-lib/polyplets" } polyplets = { version = "0.5.0", path = "../../crates/air-lib/polyplets" }
avm-interface = { version = "0.29.0", path = "../../avm/interface" } avm-interface = { version = "0.29.0", path = "../../avm/interface" }

2
crates/air-lib/interpreter-interface/Cargo.toml
View File

@ -15,7 +15,7 @@ name = "air_interpreter_interface"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
marine-rs-sdk = { version = "0.8.1", optional = true } marine-rs-sdk = {version = "0.10.0", optional = true }
fluence-it-types = { version = "0.4.1", optional = true } fluence-it-types = { version = "0.4.1", optional = true }
serde = "1.0.164" serde = "1.0.164"

2
crates/air-lib/polyplets/Cargo.toml
View File

@ -15,6 +15,6 @@ name = "polyplets"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
marine-rs-sdk = "0.8.1" marine-call-parameters = { version = "0.10.0", default-features = false }
serde = { version = "1.0.164", features = ["rc", "derive"] } serde = { version = "1.0.164", features = ["rc", "derive"] }

2
crates/air-lib/polyplets/src/lib.rs
View File

@ -28,5 +28,5 @@
mod triplet; mod triplet;
pub use marine_rs_sdk::SecurityTetraplet; pub use marine_call_parameters::SecurityTetraplet;
pub use triplet::ResolvedTriplet; pub use triplet::ResolvedTriplet;

2
crates/air-lib/polyplets/src/triplet.rs
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
use marine_rs_sdk::SecurityTetraplet; use marine_call_parameters::SecurityTetraplet;
use serde::Deserialize; use serde::Deserialize;
use serde::Serialize; use serde::Serialize;

2
crates/air-lib/test-utils/Cargo.toml
View File

@ -21,7 +21,7 @@ air-interpreter-data = { version = "0.11.2", path = "../interpreter-data" }
air-interpreter-interface = { version = "0.15.0", path = "../interpreter-interface" } air-interpreter-interface = { version = "0.15.0", path = "../interpreter-interface" }
avm-interface = { version = "0.29.0", path = "../../../avm/interface" } avm-interface = { version = "0.29.0", path = "../../../avm/interface" }
avm-server = { version = "0.33.0", path = "../../../avm/server" } avm-server = { version = "0.33.0", path = "../../../avm/server" }
marine-rs-sdk = "0.8.1" marine-rs-sdk = "0.10.0"
object-pool = "0.5.4" object-pool = "0.5.4"
once_cell = "1.17.1" once_cell = "1.17.1"

176
tools/wasm/air-near-contract/Cargo.lock generated
View File

@ -56,7 +56,7 @@ dependencies = [
"newtype_derive", "newtype_derive",
"num-traits", "num-traits",
"once_cell", "once_cell",
"polyplets 0.5.0", "polyplets",
"semver 1.0.18", "semver 1.0.18",
"serde", "serde",
"serde_json", "serde_json",
@ -133,7 +133,7 @@ dependencies = [
"bimap", "bimap",
"log", "log",
"num-traits", "num-traits",
"polyplets 0.5.0", "polyplets",
"serde_json", "serde_json",
"thiserror", "thiserror",
"tracing", "tracing",
@ -179,7 +179,7 @@ dependencies = [
"maplit", "maplit",
"non-empty-vec", "non-empty-vec",
"once_cell", "once_cell",
"polyplets 0.5.0", "polyplets",
"semver 1.0.18", "semver 1.0.18",
"serde", "serde",
"serde_json", "serde_json",
@ -260,6 +260,12 @@ version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
[[package]]
name = "base64ct"
version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
[[package]] [[package]]
name = "bimap" name = "bimap"
version = "0.6.3" version = "0.6.3"
@ -551,6 +557,12 @@ dependencies = [
"syn 2.0.28", "syn 2.0.28",
] ]
[[package]]
name = "const-oid"
version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
[[package]] [[package]]
name = "constant_time_eq" name = "constant_time_eq"
version = "0.2.6" version = "0.2.6"
@ -632,6 +644,34 @@ dependencies = [
"zeroize", "zeroize",
] ]
[[package]]
name = "curve25519-dalek"
version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "622178105f911d937a42cdb140730ba4a3ed2becd8ae6ce39c7d28b5d75d4588"
dependencies = [
"cfg-if 1.0.0",
"cpufeatures",
"curve25519-dalek-derive",
"digest 0.10.7",
"fiat-crypto",
"platforms",
"rustc_version 0.4.0",
"subtle",
"zeroize",
]
[[package]]
name = "curve25519-dalek-derive"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.28",
]
[[package]] [[package]]
name = "data-encoding" name = "data-encoding"
version = "2.4.0" version = "2.4.0"
@ -658,6 +698,16 @@ dependencies = [
"syn 1.0.109", "syn 1.0.109",
] ]
[[package]]
name = "der"
version = "0.7.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
dependencies = [
"const-oid",
"zeroize",
]
[[package]] [[package]]
name = "derive_more" name = "derive_more"
version = "0.99.17" version = "0.99.17"
@ -736,7 +786,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
dependencies = [ dependencies = [
"serde", "serde",
"signature", "signature 1.6.4",
]
[[package]]
name = "ed25519"
version = "2.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d"
dependencies = [
"pkcs8",
"signature 2.1.0",
] ]
[[package]] [[package]]
@ -745,8 +805,8 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
dependencies = [ dependencies = [
"curve25519-dalek", "curve25519-dalek 3.2.0",
"ed25519", "ed25519 1.5.3",
"rand 0.7.3", "rand 0.7.3",
"serde", "serde",
"serde_bytes", "serde_bytes",
@ -754,6 +814,20 @@ dependencies = [
"zeroize", "zeroize",
] ]
[[package]]
name = "ed25519-dalek"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980"
dependencies = [
"curve25519-dalek 4.1.0",
"ed25519 2.2.2",
"rand_core 0.6.4",
"serde",
"sha2 0.10.7",
"zeroize",
]
[[package]] [[package]]
name = "either" name = "either"
version = "1.9.0" version = "1.9.0"
@ -800,6 +874,12 @@ dependencies = [
"once_cell", "once_cell",
] ]
[[package]]
name = "fiat-crypto"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d"
[[package]] [[package]]
name = "fixed-hash" name = "fixed-hash"
version = "0.7.0" version = "0.7.0"
@ -835,7 +915,7 @@ version = "0.10.3"
source = "git+https://github.com/fluencelabs/trust-graph.git?branch=lean-keypair#ee63de8c7155a69065e998616389a3faf784638d" source = "git+https://github.com/fluencelabs/trust-graph.git?branch=lean-keypair#ee63de8c7155a69065e998616389a3faf784638d"
dependencies = [ dependencies = [
"bs58 0.5.0", "bs58 0.5.0",
"ed25519-dalek", "ed25519-dalek 1.0.1",
"eyre", "eyre",
"lazy_static", "lazy_static",
"libp2p-identity", "libp2p-identity",
@ -1082,11 +1162,11 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
[[package]] [[package]]
name = "libp2p-identity" name = "libp2p-identity"
version = "0.2.2" version = "0.2.3"
source = "git+https://github.com/fluencelabs/rust-libp2p.git?branch=rand-feature#ca5f61448ba5461c371783830b6f665ce5fd3ead" source = "git+https://github.com/fluencelabs/rust-libp2p.git?branch=rand-feature#79b3bdd79f393a8be06b682190780d2bdd41a05e"
dependencies = [ dependencies = [
"bs58 0.5.0", "bs58 0.5.0",
"ed25519-dalek", "ed25519-dalek 2.0.0",
"log", "log",
"multihash 0.19.0", "multihash 0.19.0",
"quick-protobuf", "quick-protobuf",
@ -1123,11 +1203,20 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
[[package]]
name = "marine-call-parameters"
version = "0.9.0"
source = "git+https://github.com/fluencelabs/marine-rs-sdk?branch=feat/decouple-call-params#de7d55e422fc8a0594d9c32debdd4613e2d478bf"
dependencies = [
"marine-macro",
"marine-rs-sdk-main",
"serde",
]
[[package]] [[package]]
name = "marine-macro" name = "marine-macro"
version = "0.8.1" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/fluencelabs/marine-rs-sdk?branch=feat/decouple-call-params#de7d55e422fc8a0594d9c32debdd4613e2d478bf"
checksum = "9c99fa7013660d8e129b2bcd51138015136b91903f88529f1da0510f850c28ea"
dependencies = [ dependencies = [
"marine-macro-impl", "marine-macro-impl",
"marine-rs-sdk-main", "marine-rs-sdk-main",
@ -1135,9 +1224,8 @@ dependencies = [
[[package]] [[package]]
name = "marine-macro-impl" name = "marine-macro-impl"
version = "0.8.1" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/fluencelabs/marine-rs-sdk?branch=feat/decouple-call-params#de7d55e422fc8a0594d9c32debdd4613e2d478bf"
checksum = "43b4761eec59a2914413d1ea14659305e6374bfed69998f33763daa586c44196"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -1148,22 +1236,20 @@ dependencies = [
[[package]] [[package]]
name = "marine-rs-sdk" name = "marine-rs-sdk"
version = "0.8.1" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/fluencelabs/marine-rs-sdk?branch=feat/decouple-call-params#de7d55e422fc8a0594d9c32debdd4613e2d478bf"
checksum = "11991d31bf4d53651e1c151637f260c759eb9f28ecf8c894eb260b50f46459cc"
dependencies = [ dependencies = [
"marine-call-parameters",
"marine-macro", "marine-macro",
"marine-rs-sdk-main", "marine-rs-sdk-main",
"marine-timestamp-macro", "marine-timestamp-macro",
"polyplets 0.4.0",
"serde", "serde",
] ]
[[package]] [[package]]
name = "marine-rs-sdk-main" name = "marine-rs-sdk-main"
version = "0.8.1" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/fluencelabs/marine-rs-sdk?branch=feat/decouple-call-params#de7d55e422fc8a0594d9c32debdd4613e2d478bf"
checksum = "b01678ba2a94fcfeb8232e87281937b07927ab2a54205747b6ab45e3f5ad65fd"
dependencies = [ dependencies = [
"log", "log",
"serde", "serde",
@ -1171,9 +1257,8 @@ dependencies = [
[[package]] [[package]]
name = "marine-timestamp-macro" name = "marine-timestamp-macro"
version = "0.8.1" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/fluencelabs/marine-rs-sdk?branch=feat/decouple-call-params#de7d55e422fc8a0594d9c32debdd4613e2d478bf"
checksum = "80d254ea11e35cdeccc62ffccf78775c066750c9e5bae4934eb0758187442282"
dependencies = [ dependencies = [
"chrono", "chrono",
"quote", "quote",
@ -1285,9 +1370,9 @@ dependencies = [
"borsh", "borsh",
"bs58 0.4.0", "bs58 0.4.0",
"c2-chacha", "c2-chacha",
"curve25519-dalek", "curve25519-dalek 3.2.0",
"derive_more", "derive_more",
"ed25519-dalek", "ed25519-dalek 1.0.1",
"near-account-id", "near-account-id",
"once_cell", "once_cell",
"parity-secp256k1", "parity-secp256k1",
@ -1615,21 +1700,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05"
[[package]] [[package]]
name = "polyplets" name = "pkcs8"
version = "0.4.0" version = "0.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b579a79a461ca50abb202eac61c76d8782fdf091a91775c9e181352e7cd30a8b" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
dependencies = [ dependencies = [
"marine-macro", "der",
"marine-rs-sdk-main", "spki",
"serde",
] ]
[[package]]
name = "platforms"
version = "3.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8"
[[package]] [[package]]
name = "polyplets" name = "polyplets"
version = "0.5.0" version = "0.5.0"
dependencies = [ dependencies = [
"marine-rs-sdk", "marine-call-parameters",
"serde", "serde",
] ]
@ -2064,6 +2154,12 @@ version = "1.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
[[package]]
name = "signature"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
[[package]] [[package]]
name = "siphasher" name = "siphasher"
version = "0.3.10" version = "0.3.10"
@ -2093,6 +2189,16 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
[[package]]
name = "spki"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
dependencies = [
"base64ct",
"der",
]
[[package]] [[package]]
name = "static_assertions" name = "static_assertions"
version = "1.1.0" version = "1.1.0"