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 number to jvalue conversion (#94)

Browse Source
This commit is contained in:
vms 2021-04-28 16:05:35 +03:00 committed by GitHub
parent fb787cf565
commit 45985bb993
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 154 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/publish_interpreter.yml vendored
View File

@ -28,7 +28,7 @@ jobs:
~/.cargo/git ~/.cargo/git
~/.cargo/bin ~/.cargo/bin
target target
key: ${{ runner.os }}-cargo-v1-${{ hashFiles('**/Cargo.lock') }} key: ${{ runner.os }}-cargo-v2-${{ hashFiles('**/Cargo.lock') }}
- name: Install Rust toolchain with wasm32-unknown-unknown - name: Install Rust toolchain with wasm32-unknown-unknown
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
with: with:

4
.github/workflows/publish_interpreter_dev.yml vendored
View File

@ -37,7 +37,7 @@ jobs:
~/.cargo/registry ~/.cargo/registry
~/.cargo/git ~/.cargo/git
~/.cargo/bin ~/.cargo/bin
key: ${{ runner.os }}-cargo-1-${{ hashFiles('**/Cargo.lock') }} key: ${{ runner.os }}-cargo-v2-${{ hashFiles('**/Cargo.lock') }}
- name: Install Rust toolchain with wasm32-unknown-unknown - name: Install Rust toolchain with wasm32-unknown-unknown
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
with: with:
@ -197,7 +197,7 @@ jobs:
### === Rust package release === ### === Rust package release ===
- name: Install fcli - name: Install fcli
run: cargo install --force fcli --git https://github.com/fluencelabs/fce run: cargo install fcli || true
- name: Build aquamarine.wasm for node - name: Build aquamarine.wasm for node
run: fce build -p aquamarine --release --features fce run: fce build -p aquamarine --release --features fce

341
Cargo.lock generated
View File

@ -46,20 +46,21 @@ checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b"
[[package]] [[package]]
name = "aqua-interpreter-interface" name = "aqua-interpreter-interface"
version = "0.4.0" version = "0.5.0"
source = "git+https://github.com/fluencelabs/air#7097b255334c518ce52faf733a5fa295c0a5768e"
dependencies = [ dependencies = [
"fluence", "fluence",
"fluence-it-types 0.3.0", "fluence-it-types",
"serde", "serde",
] ]
[[package]] [[package]]
name = "aqua-interpreter-interface" name = "aqua-interpreter-interface"
version = "0.4.0" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ddaec44ed96baa11fbbefcad1a25c9bd3aca704398cb71d5b35eb879c9f2ac52"
dependencies = [ dependencies = [
"fluence", "fluence",
"fluence-it-types 0.3.0", "fluence-it-types",
"serde", "serde",
] ]
@ -81,7 +82,7 @@ dependencies = [
[[package]] [[package]]
name = "aquamarine" name = "aquamarine"
version = "0.8.0" version = "0.9.0"
dependencies = [ dependencies = [
"fluence", "fluence",
"interpreter-lib", "interpreter-lib",
@ -93,11 +94,12 @@ dependencies = [
[[package]] [[package]]
name = "aquamarine-vm" name = "aquamarine-vm"
version = "0.6.0" version = "0.7.0"
source = "git+https://github.com/fluencelabs/fce#a9494fb78042b5e249d66fe012c273eb3ee4a81b" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "847f21c580fbb315673c1601a87101d5a1bcd4755cee6d5a0ed39ad92544cd44"
dependencies = [ dependencies = [
"aqua-interpreter-interface 0.4.0 (git+https://github.com/fluencelabs/air)", "aqua-interpreter-interface 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
"fluence-faas 0.6.0", "fluence-faas",
"log", "log",
"maplit", "maplit",
"parking_lot 0.11.1", "parking_lot 0.11.1",
@ -633,42 +635,17 @@ dependencies = [
[[package]] [[package]]
name = "fce" name = "fce"
version = "0.3.0" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c75a27d84a4a5622cc3a30fcd02418cccce10e6964af80fe99564d3d8731ec19" checksum = "a299c6632701564a91d59b9ac6f2e2db6a7a36be33347de60ba7f97309e2e4cd"
dependencies = [
"anyhow",
"boolinator",
"fce-utils 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
"fce-wit-generator 0.2.0",
"fce-wit-interfaces 0.1.29",
"fce-wit-parser 0.2.0",
"log",
"multi-map",
"multimap",
"parity-wasm",
"pwasm-utils",
"safe-transmute",
"serde",
"thiserror",
"wasmer-interface-types-fl 0.17.24",
"wasmer-runtime-core-fl",
"wasmer-runtime-fl",
"wasmer-wasi-fl",
]
[[package]]
name = "fce"
version = "0.4.0"
source = "git+https://github.com/fluencelabs/fce#a9494fb78042b5e249d66fe012c273eb3ee4a81b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"boolinator", "boolinator",
"fce-module-info-parser", "fce-module-info-parser",
"fce-utils 0.1.29 (git+https://github.com/fluencelabs/fce)", "fce-utils",
"fce-wit-generator 0.3.0", "fce-wit-generator",
"fce-wit-interfaces 0.2.0", "fce-wit-interfaces",
"fce-wit-parser 0.4.0", "fce-wit-parser",
"it-lilo", "it-lilo",
"log", "log",
"multimap", "multimap",
@ -679,7 +656,7 @@ dependencies = [
"semver 0.11.0", "semver 0.11.0",
"serde", "serde",
"thiserror", "thiserror",
"wasmer-interface-types-fl 0.20.0", "wasmer-interface-types-fl",
"wasmer-runtime-core-fl", "wasmer-runtime-core-fl",
"wasmer-runtime-fl", "wasmer-runtime-fl",
"wasmer-wasi-fl", "wasmer-wasi-fl",
@ -688,22 +665,24 @@ dependencies = [
[[package]] [[package]]
name = "fce-module-info-parser" name = "fce-module-info-parser"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/fluencelabs/fce#a9494fb78042b5e249d66fe012c273eb3ee4a81b" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f12b63bf1e17b7eab7afefd6b9f60e61c36ab8030d7310a0b4a7b0f46a0a90d"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"chrono", "chrono",
"fluence-sdk-main 0.6.0", "fluence-sdk-main",
"semver 0.11.0", "semver 0.11.0",
"serde", "serde",
"thiserror", "thiserror",
"walrus 0.18.0", "walrus",
"wasmer-runtime-core-fl", "wasmer-runtime-core-fl",
] ]
[[package]] [[package]]
name = "fce-timestamp-macro" name = "fce-timestamp-macro"
version = "0.6.0" version = "0.6.1"
source = "git+https://github.com/fluencelabs/rust-sdk#e8bc1db0dff8550b97675d4835cf17e0f27848ef" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c59a6302902583b2c84e87de9d72b949da4396a369baf0aaa49e97021600bb0"
dependencies = [ dependencies = [
"chrono", "chrono",
"quote", "quote",
@ -711,93 +690,52 @@ dependencies = [
[[package]] [[package]]
name = "fce-utils" name = "fce-utils"
version = "0.1.29"
source = "git+https://github.com/fluencelabs/fce#a9494fb78042b5e249d66fe012c273eb3ee4a81b"
[[package]]
name = "fce-utils"
version = "0.1.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7a516882dccba04f0034e288c1aa5f06ce9da2711a7ce984ceebac8117e185e"
[[package]]
name = "fce-wit-generator"
version = "0.2.0" version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1eca715cf832f99fd59dae4f639e4437e5ac92a4470e0879624049f6cb1a3910" checksum = "922798711870c4f492d30aa8323d8883b72d874e9b108299391fa5f080527109"
dependencies = [
"fce-wit-parser 0.2.0",
"fluence-sdk-wit 0.2.18",
"once_cell",
"serde",
"serde_json",
"walrus 0.17.0",
"wasmer-interface-types-fl 0.17.24",
]
[[package]] [[package]]
name = "fce-wit-generator" name = "fce-wit-generator"
version = "0.3.0" version = "0.4.0"
source = "git+https://github.com/fluencelabs/fce#a9494fb78042b5e249d66fe012c273eb3ee4a81b" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32ce2865ec46e691b17af91c4ad980771ad59572ff9ef730b5779e33e7df25dc"
dependencies = [ dependencies = [
"cargo_toml", "cargo_toml",
"fce-wit-parser 0.4.0", "fce-wit-parser",
"fluence-sdk-wit 0.6.0", "fluence-sdk-wit",
"it-lilo", "it-lilo",
"once_cell", "once_cell",
"serde", "serde",
"serde_json", "serde_json",
"thiserror", "thiserror",
"walrus 0.18.0", "walrus",
"wasmer-interface-types-fl 0.20.0", "wasmer-interface-types-fl",
] ]
[[package]] [[package]]
name = "fce-wit-interfaces" name = "fce-wit-interfaces"
version = "0.1.29" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0c6afb4d6525ec972f27f6d65324efcb8b2aee4e11fdf6afc4c047e91efcb58" checksum = "bc40ae6a1afddd132c7d31ad003b57457573c9a434e1c1163537b42cf7d879c1"
dependencies = [ dependencies = [
"multimap", "multimap",
"wasmer-interface-types-fl 0.17.24", "wasmer-interface-types-fl",
]
[[package]]
name = "fce-wit-interfaces"
version = "0.2.0"
source = "git+https://github.com/fluencelabs/fce#a9494fb78042b5e249d66fe012c273eb3ee4a81b"
dependencies = [
"multimap",
"wasmer-interface-types-fl 0.20.0",
] ]
[[package]] [[package]]
name = "fce-wit-parser" name = "fce-wit-parser"
version = "0.2.0" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f59267a5533d352406b7203eee4b9fe918f4671f2f66a990cab9632f528c952" checksum = "9e487ac779cbb5f05c0e658dd0f3091d82cb03f25769ae63652e328bf2193072"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"fce-wit-interfaces 0.1.29", "fce-wit-interfaces",
"serde",
"walrus 0.17.0",
"wasmer-interface-types-fl 0.17.24",
"wasmer-runtime-core-fl",
]
[[package]]
name = "fce-wit-parser"
version = "0.4.0"
source = "git+https://github.com/fluencelabs/fce#a9494fb78042b5e249d66fe012c273eb3ee4a81b"
dependencies = [
"anyhow",
"fce-wit-interfaces 0.2.0",
"nom", "nom",
"semver 0.11.0", "semver 0.11.0",
"serde", "serde",
"thiserror", "thiserror",
"walrus 0.18.0", "walrus",
"wasmer-interface-types-fl 0.20.0", "wasmer-interface-types-fl",
"wasmer-runtime-core-fl", "wasmer-runtime-core-fl",
] ]
@ -809,22 +747,23 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
[[package]] [[package]]
name = "fluence" name = "fluence"
version = "0.6.0" version = "0.6.1"
source = "git+https://github.com/fluencelabs/rust-sdk#e8bc1db0dff8550b97675d4835cf17e0f27848ef" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54b2f78a2432dcd10e7113f9f08aac004373dee610a3b4ca692d5b12a3e7c867"
dependencies = [ dependencies = [
"fce-timestamp-macro", "fce-timestamp-macro",
"fluence-sdk-macro 0.6.0", "fluence-sdk-macro",
"fluence-sdk-main 0.6.0", "fluence-sdk-main",
"serde", "serde",
] ]
[[package]] [[package]]
name = "fluence-app-service" name = "fluence-app-service"
version = "0.5.2" version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f64788737ce00700efe6a1e45f7462d3bdba6765891d76b81c806f250f8062f0" checksum = "07f30832e91e2a645ab4f97c96e07035929c8b0ecf465f6a00d3cebaad17aa1f"
dependencies = [ dependencies = [
"fluence-faas 0.5.2", "fluence-faas",
"log", "log",
"maplit", "maplit",
"serde", "serde",
@ -836,38 +775,15 @@ dependencies = [
[[package]] [[package]]
name = "fluence-faas" name = "fluence-faas"
version = "0.5.2" version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00434a1581cfdb781b889f1c11e2b8b6ad160a717021e62054be2e9796c1d13d" checksum = "d84f0a3eeaa93ae52e91fbbca20d7cf4e58e0e8b2126e9da2fce763ecc5270a3"
dependencies = [ dependencies = [
"cmd_lib", "cmd_lib",
"fce 0.3.0", "fce",
"fce-utils 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "fce-utils",
"fluence-sdk-main 0.4.2",
"itertools 0.9.0",
"log",
"safe-transmute",
"serde",
"serde_derive",
"serde_json",
"thiserror",
"toml",
"wasmer-interface-types-fl 0.17.24",
"wasmer-runtime-core-fl",
"wasmer-runtime-fl",
"wasmer-wasi-fl",
]
[[package]]
name = "fluence-faas"
version = "0.6.0"
source = "git+https://github.com/fluencelabs/fce#a9494fb78042b5e249d66fe012c273eb3ee4a81b"
dependencies = [
"cmd_lib",
"fce 0.4.0",
"fce-utils 0.1.29 (git+https://github.com/fluencelabs/fce)",
"fluence", "fluence",
"fluence-sdk-main 0.6.0", "fluence-sdk-main",
"itertools 0.9.0", "itertools 0.9.0",
"log", "log",
"safe-transmute", "safe-transmute",
@ -876,24 +792,12 @@ dependencies = [
"serde_json", "serde_json",
"thiserror", "thiserror",
"toml", "toml",
"wasmer-interface-types-fl 0.20.0", "wasmer-interface-types-fl",
"wasmer-runtime-core-fl", "wasmer-runtime-core-fl",
"wasmer-runtime-fl", "wasmer-runtime-fl",
"wasmer-wasi-fl", "wasmer-wasi-fl",
] ]
[[package]]
name = "fluence-it-types"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b81c770e52b35e2406f8251f6c01b3b882c3eaed3029731d8c19c74dc1b423c"
dependencies = [
"it-to-bytes",
"nom",
"serde",
"wast",
]
[[package]] [[package]]
name = "fluence-it-types" name = "fluence-it-types"
version = "0.3.0" version = "0.3.0"
@ -908,74 +812,29 @@ dependencies = [
[[package]] [[package]]
name = "fluence-sdk-macro" name = "fluence-sdk-macro"
version = "0.4.2" version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76ce80dc2d7c3db828fb31b95e75c372fde7a9a25dfa2b0d9beac07379b890a6" checksum = "cb43d2f51f1becb70e2125ef8ca9759597900f95cc22ce7dca981a7d6ccd7dde"
dependencies = [ dependencies = [
"fluence-sdk-wit 0.4.2", "fluence-sdk-wit",
]
[[package]]
name = "fluence-sdk-macro"
version = "0.6.0"
source = "git+https://github.com/fluencelabs/rust-sdk#e8bc1db0dff8550b97675d4835cf17e0f27848ef"
dependencies = [
"fluence-sdk-wit 0.6.0",
] ]
[[package]] [[package]]
name = "fluence-sdk-main" name = "fluence-sdk-main"
version = "0.4.2" version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29cce53288e08ed86ebe36c64d8eb641a95e1d0f7f75da969b29e16ab0d7d406" checksum = "a78910d85e3cdcb9c2baf56144f20a99925c67ac445d4156220c005bfd2f9604"
dependencies = [ dependencies = [
"fluence-sdk-macro 0.4.2", "fluence-sdk-macro",
"log",
"serde",
]
[[package]]
name = "fluence-sdk-main"
version = "0.6.0"
source = "git+https://github.com/fluencelabs/rust-sdk#e8bc1db0dff8550b97675d4835cf17e0f27848ef"
dependencies = [
"fluence-sdk-macro 0.6.0",
"log", "log",
"serde", "serde",
] ]
[[package]] [[package]]
name = "fluence-sdk-wit" name = "fluence-sdk-wit"
version = "0.2.18" version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b75dbdd0275160f3818db3218563d791e6c612b616cd3c5d6e66283f207f648d" checksum = "eab3ed39703b72e0e52bce9e1760746c73f65a5694c8da4dec751d3bfdec15b8"
dependencies = [
"proc-macro2",
"quote",
"serde",
"serde_json",
"syn",
"uuid",
]
[[package]]
name = "fluence-sdk-wit"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56d835812bab8fb6f261b9e37355b9bf0a28a16123580145ce0fe44ef4363144"
dependencies = [
"proc-macro2",
"quote",
"serde",
"serde_json",
"syn",
"uuid",
]
[[package]]
name = "fluence-sdk-wit"
version = "0.6.0"
source = "git+https://github.com/fluencelabs/rust-sdk#e8bc1db0dff8550b97675d4835cf17e0f27848ef"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -1158,10 +1017,10 @@ dependencies = [
[[package]] [[package]]
name = "interpreter-lib" name = "interpreter-lib"
version = "0.8.0" version = "0.9.0"
dependencies = [ dependencies = [
"air-parser", "air-parser",
"aqua-interpreter-interface 0.4.0", "aqua-interpreter-interface 0.5.0",
"aqua-test-utils", "aqua-test-utils",
"boolinator", "boolinator",
"criterion", "criterion",
@ -1209,7 +1068,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99ccf40e1e08f6f47ffbafe3cfb2e3adb721ddde80b178240f038d07dc9652fb" checksum = "99ccf40e1e08f6f47ffbafe3cfb2e3adb721ddde80b178240f038d07dc9652fb"
dependencies = [ dependencies = [
"fluence-it-types 0.3.0", "fluence-it-types",
"log", "log",
"paste", "paste",
"thiserror", "thiserror",
@ -1388,12 +1247,6 @@ dependencies = [
"autocfg", "autocfg",
] ]
[[package]]
name = "multi-map"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bba551d6d795f74a01767577ea8339560bf0a65354e0417b7e915ed608443d46"
[[package]] [[package]]
name = "multimap" name = "multimap"
version = "0.8.3" version = "0.8.3"
@ -1951,9 +1804,9 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2"
[[package]] [[package]]
name = "syn" name = "syn"
version = "1.0.70" version = "1.0.71"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9505f307c872bab8eb46f77ae357c8eba1fdacead58ee5a850116b1d7f82883" checksum = "ad184cc9470f9117b2ac6817bfe297307418819ba40552f9b3846f05c33d5373"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -2140,20 +1993,6 @@ dependencies = [
"winapi-util", "winapi-util",
] ]
[[package]]
name = "walrus"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f970863270179a4e0ca2bfb470931f883f7535ae8b9dac4271761fa1b77e253d"
dependencies = [
"anyhow",
"id-arena",
"leb128",
"log",
"walrus-macro 0.17.0",
"wasmparser 0.55.0",
]
[[package]] [[package]]
name = "walrus" name = "walrus"
version = "0.18.0" version = "0.18.0"
@ -2164,22 +2003,10 @@ dependencies = [
"id-arena", "id-arena",
"leb128", "leb128",
"log", "log",
"walrus-macro 0.18.0", "walrus-macro",
"wasmparser 0.59.0", "wasmparser 0.59.0",
] ]
[[package]]
name = "walrus-macro"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80927fca8665132b48c7714bcec983d6e761c60b3a9877c6cd7df86417b13573"
dependencies = [
"heck",
"proc-macro2",
"quote",
"syn",
]
[[package]] [[package]]
name = "walrus-macro" name = "walrus-macro"
version = "0.18.0" version = "0.18.0"
@ -2312,27 +2139,11 @@ dependencies = [
[[package]] [[package]]
name = "wasmer-interface-types-fl" name = "wasmer-interface-types-fl"
version = "0.17.24" version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e29cd6c3670db55e8aa3dfe6fb02c8ec9e7a17789e0204cef0a7cb50e0b8c5cb" checksum = "df960871d756f87237e7630daa0e8453dd48f9e44e0f214e795362a6daa04967"
dependencies = [ dependencies = [
"fluence-it-types 0.1.1", "fluence-it-types",
"it-to-bytes",
"log",
"nom",
"safe-transmute",
"serde",
"serde_json",
"wast",
]
[[package]]
name = "wasmer-interface-types-fl"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b47648f6ed55acbd6ddf2a4efed8c2976ce19a55997eb159e511fbd11e366006"
dependencies = [
"fluence-it-types 0.3.0",
"it-lilo", "it-lilo",
"it-to-bytes", "it-to-bytes",
"itertools 0.10.0", "itertools 0.10.0",
@ -2456,12 +2267,6 @@ version = "0.51.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aeb1956b19469d1c5e63e459d29e7b5aa0f558d9f16fcef09736f8a265e6c10a" checksum = "aeb1956b19469d1c5e63e459d29e7b5aa0f558d9f16fcef09736f8a265e6c10a"
[[package]]
name = "wasmparser"
version = "0.55.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af931e2e1960c53f4a28b063fec4cacd036f35acbec8ff3a4739125b17382a87"
[[package]] [[package]]
name = "wasmparser" name = "wasmparser"
version = "0.59.0" version = "0.59.0"

2
crates/air-parser/src/parser/lexer/token.rs
View File

@ -89,7 +89,7 @@ impl From<Number> for Token<'_> {
impl From<Number> for serde_json::Value { impl From<Number> for serde_json::Value {
fn from(number: Number) -> Self { fn from(number: Number) -> Self {
number.into() (&number).into()
} }
} }

4
crates/interpreter-interface/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "aqua-interpreter-interface" name = "aqua-interpreter-interface"
description = "Interface of the Aquamarine interpreter" description = "Interface of the Aquamarine interpreter"
version = "0.4.0" version = "0.5.0"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
edition = "2018" edition = "2018"
license = "Apache-2.0" license = "Apache-2.0"
@ -11,7 +11,7 @@ name = "aqua_interpreter_interface"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
fluence = { git = "https://github.com/fluencelabs/rust-sdk", features = ["logger"] } fluence = "0.6.1"
fluence-it-types = "0.3.0" fluence-it-types = "0.3.0"
serde = "=1.0.118" serde = "=1.0.118"

2
crates/polyplets/Cargo.toml
View File

@ -10,6 +10,6 @@ name = "polyplets"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
fluence = { git = "https://github.com/fluencelabs/rust-sdk", features = ["logger"] } fluence = { version = "0.6.1", features = ["logger"] }
serde = { version = "=1.0.118", features = ["rc", "derive"] } serde = { version = "=1.0.118", features = ["rc", "derive"] }

2
crates/test-module/Cargo.toml
View File

@ -10,4 +10,4 @@ name = "aqua_test_module"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
fluence = { git = "https://github.com/fluencelabs/rust-sdk", features = ["logger"] } fluence = { version = "0.6.1", features = ["logger"] }

4
crates/test-utils/Cargo.toml
View File

@ -10,6 +10,6 @@ name = "aqua_test_utils"
path = "src/lib.rs" path = "src/lib.rs"
[dependencies] [dependencies]
fluence = { git = "https://github.com/fluencelabs/rust-sdk", features = ["logger"] } fluence = "0.6.1"
aquamarine-vm = { git = "https://github.com/fluencelabs/fce", features = ["raw-aquamarine-vm-api"] } aquamarine-vm = { version = "0.7.0", features = ["raw-aquamarine-vm-api"] }
serde_json = "1.0.56" serde_json = "1.0.56"

6
interpreter-lib/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "interpreter-lib" name = "interpreter-lib"
version = "0.8.0" version = "0.9.0"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
edition = "2018" edition = "2018"
@ -10,7 +10,7 @@ path = "src/lib.rs"
[dependencies] [dependencies]
air-parser = { path = "../crates/air-parser" } air-parser = { path = "../crates/air-parser" }
fluence = { git = "https://github.com/fluencelabs/rust-sdk", features = ["logger"] } fluence = { version = "0.6.1", features = ["logger"] }
polyplets = { path = "../crates/polyplets" } polyplets = { path = "../crates/polyplets" }
aqua-interpreter-interface = { path = "../crates/interpreter-interface" } aqua-interpreter-interface = { path = "../crates/interpreter-interface" }
@ -28,7 +28,7 @@ wasm-bindgen = "=0.2.65"
[dev_dependencies] [dev_dependencies]
aqua-test-utils = { path = "../crates/test-utils" } aqua-test-utils = { path = "../crates/test-utils" }
fluence-app-service = "0.5.1" fluence-app-service = "0.7.0"
criterion = "0.3.3" criterion = "0.3.3"
csv = "1.1.5" csv = "1.1.5"

3
interpreter-lib/src/execution/air/compare_matchable/compare_matchable.rs
View File

@ -100,7 +100,7 @@ fn compare_matchable<'ctx>(
Ok(comparator(Cow::Owned(jvalue))) Ok(comparator(Cow::Owned(jvalue)))
} }
Number(number) => { Number(number) => {
let jvalue = number.clone().into(); let jvalue = number.into();
Ok(comparator(Cow::Owned(jvalue))) Ok(comparator(Cow::Owned(jvalue)))
} }
Boolean(bool) => { Boolean(bool) => {
@ -166,6 +166,5 @@ fn make_number_comparator(comparable_number: &ast::Number) -> Comparator<'_> {
use std::ops::Deref; use std::ops::Deref;
let comparable_jvalue: JValue = comparable_number.into(); let comparable_jvalue: JValue = comparable_number.into();
Box::new(move |jvalue: Cow<'_, JValue>| -> bool { jvalue.deref() == &comparable_jvalue }) Box::new(move |jvalue: Cow<'_, JValue>| -> bool { jvalue.deref() == &comparable_jvalue })
} }

17
interpreter-lib/src/execution/air/match_.rs
View File

@ -163,6 +163,23 @@ mod tests {
assert_eq!(actual_trace[1], expected_executed_call_result); assert_eq!(actual_trace[1], expected_executed_call_result);
} }
#[test]
fn match_with_equal_numbers() {
let local_peer_id = "local_peer_id";
let mut vm = create_aqua_vm(echo_string_call_service(), local_peer_id);
let script = "
(xor
(match 1 1
(null)
)
(null)
)";
let res = call_vm!(vm, "asd", script, "", "");
assert_eq!(res.ret_code, 0);
}
#[test] #[test]
fn match_without_xor() { fn match_without_xor() {
let set_variable_peer_id = "set_variable_peer_id"; let set_variable_peer_id = "set_variable_peer_id";

2
interpreter-lib/tests/security_tetraplets.rs
View File

@ -14,7 +14,6 @@
* limitations under the License. * limitations under the License.
*/ */
/*
use aqua_test_utils::call_vm; use aqua_test_utils::call_vm;
use aqua_test_utils::create_aqua_vm; use aqua_test_utils::create_aqua_vm;
use aqua_test_utils::CallServiceClosure; use aqua_test_utils::CallServiceClosure;
@ -312,4 +311,3 @@ fn tetraplet_with_wasm_modules() {
assert_eq!(actual_trace[1], expected_state) assert_eq!(actual_trace[1], expected_state)
} }
*/

37
interpreter-lib/tests/security_tetraplets/auth_module/Cargo.lock generated
View File

@ -29,7 +29,7 @@ dependencies = [
[[package]] [[package]]
name = "aqua-interpreter-interface" name = "aqua-interpreter-interface"
version = "0.4.0" version = "0.5.0"
dependencies = [ dependencies = [
"fluence", "fluence",
"fluence-it-types", "fluence-it-types",
@ -252,8 +252,9 @@ dependencies = [
[[package]] [[package]]
name = "fce-timestamp-macro" name = "fce-timestamp-macro"
version = "0.6.0" version = "0.6.1"
source = "git+https://github.com/fluencelabs/rust-sdk?branch=optimizations#43c3908409b20cd875f2a42ae5563672453129a0" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c59a6302902583b2c84e87de9d72b949da4396a369baf0aaa49e97021600bb0"
dependencies = [ dependencies = [
"chrono", "chrono",
"quote", "quote",
@ -267,8 +268,9 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
[[package]] [[package]]
name = "fluence" name = "fluence"
version = "0.6.0" version = "0.6.1"
source = "git+https://github.com/fluencelabs/rust-sdk?branch=optimizations#43c3908409b20cd875f2a42ae5563672453129a0" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54b2f78a2432dcd10e7113f9f08aac004373dee610a3b4ca692d5b12a3e7c867"
dependencies = [ dependencies = [
"fce-timestamp-macro", "fce-timestamp-macro",
"fluence-sdk-macro", "fluence-sdk-macro",
@ -278,8 +280,9 @@ dependencies = [
[[package]] [[package]]
name = "fluence-it-types" name = "fluence-it-types"
version = "0.2.0" version = "0.3.0"
source = "git+https://github.com/fluencelabs/interface-types?branch=optimizations#27c13e9547ac55ddbc5e7a4e1ab6f1a1368075ed" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5006d09553345421af5dd2334cc945fc34dc2a73d7c1ed842a39a3803699619d"
dependencies = [ dependencies = [
"it-to-bytes", "it-to-bytes",
"serde", "serde",
@ -287,16 +290,18 @@ dependencies = [
[[package]] [[package]]
name = "fluence-sdk-macro" name = "fluence-sdk-macro"
version = "0.6.0" version = "0.6.1"
source = "git+https://github.com/fluencelabs/rust-sdk?branch=optimizations#43c3908409b20cd875f2a42ae5563672453129a0" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb43d2f51f1becb70e2125ef8ca9759597900f95cc22ce7dca981a7d6ccd7dde"
dependencies = [ dependencies = [
"fluence-sdk-wit", "fluence-sdk-wit",
] ]
[[package]] [[package]]
name = "fluence-sdk-main" name = "fluence-sdk-main"
version = "0.6.0" version = "0.6.1"
source = "git+https://github.com/fluencelabs/rust-sdk?branch=optimizations#43c3908409b20cd875f2a42ae5563672453129a0" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a78910d85e3cdcb9c2baf56144f20a99925c67ac445d4156220c005bfd2f9604"
dependencies = [ dependencies = [
"fluence-sdk-macro", "fluence-sdk-macro",
"log", "log",
@ -305,8 +310,9 @@ dependencies = [
[[package]] [[package]]
name = "fluence-sdk-wit" name = "fluence-sdk-wit"
version = "0.6.0" version = "0.6.1"
source = "git+https://github.com/fluencelabs/rust-sdk?branch=optimizations#43c3908409b20cd875f2a42ae5563672453129a0" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eab3ed39703b72e0e52bce9e1760746c73f65a5694c8da4dec751d3bfdec15b8"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -374,7 +380,7 @@ dependencies = [
[[package]] [[package]]
name = "interpreter-lib" name = "interpreter-lib"
version = "0.8.0" version = "0.9.0"
dependencies = [ dependencies = [
"air-parser", "air-parser",
"aqua-interpreter-interface", "aqua-interpreter-interface",
@ -392,7 +398,8 @@ dependencies = [
[[package]] [[package]]
name = "it-to-bytes" name = "it-to-bytes"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/fluencelabs/interface-types?branch=optimizations#27c13e9547ac55ddbc5e7a4e1ab6f1a1368075ed" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "729c74bb4236418898a219c6d96f14cba77456dd7c04a2e99e65e9c643709b56"
[[package]] [[package]]
name = "itertools" name = "itertools"

2
interpreter-lib/tests/security_tetraplets/auth_module/Cargo.toml
View File

@ -10,6 +10,6 @@ path = "src/main.rs"
[dependencies] [dependencies]
interpreter-lib = { path = "../../../../interpreter-lib" } interpreter-lib = { path = "../../../../interpreter-lib" }
fluence = { git = "https://github.com/fluencelabs/rust-sdk", features = ["logger"] } fluence = "0.6.1"
[workspace] [workspace]

4
interpreter-lib/tests/security_tetraplets/auth_module/src/main.rs
View File

@ -22,7 +22,7 @@ fn main() {}
#[fce] #[fce]
struct AuthResult { struct AuthResult {
pub is_authorized: i32, pub is_authorized: bool,
} }
#[fce] #[fce]
@ -31,6 +31,6 @@ fn is_authorized() -> AuthResult {
let is_authorized = call_parameters.init_peer_id == ADMIN_PEER_PK; let is_authorized = call_parameters.init_peer_id == ADMIN_PEER_PK;
AuthResult { AuthResult {
is_authorized: is_authorized.into(), is_authorized
} }
} }

37
interpreter-lib/tests/security_tetraplets/log_storage/Cargo.lock generated
View File

@ -29,7 +29,7 @@ dependencies = [
[[package]] [[package]]
name = "aqua-interpreter-interface" name = "aqua-interpreter-interface"
version = "0.4.0" version = "0.5.0"
dependencies = [ dependencies = [
"fluence", "fluence",
"fluence-it-types", "fluence-it-types",
@ -244,8 +244,9 @@ dependencies = [
[[package]] [[package]]
name = "fce-timestamp-macro" name = "fce-timestamp-macro"
version = "0.6.0" version = "0.6.1"
source = "git+https://github.com/fluencelabs/rust-sdk?branch=optimizations#43c3908409b20cd875f2a42ae5563672453129a0" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c59a6302902583b2c84e87de9d72b949da4396a369baf0aaa49e97021600bb0"
dependencies = [ dependencies = [
"chrono", "chrono",
"quote", "quote",
@ -259,8 +260,9 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
[[package]] [[package]]
name = "fluence" name = "fluence"
version = "0.6.0" version = "0.6.1"
source = "git+https://github.com/fluencelabs/rust-sdk?branch=optimizations#43c3908409b20cd875f2a42ae5563672453129a0" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54b2f78a2432dcd10e7113f9f08aac004373dee610a3b4ca692d5b12a3e7c867"
dependencies = [ dependencies = [
"fce-timestamp-macro", "fce-timestamp-macro",
"fluence-sdk-macro", "fluence-sdk-macro",
@ -270,8 +272,9 @@ dependencies = [
[[package]] [[package]]
name = "fluence-it-types" name = "fluence-it-types"
version = "0.2.0" version = "0.3.0"
source = "git+https://github.com/fluencelabs/interface-types?branch=optimizations#27c13e9547ac55ddbc5e7a4e1ab6f1a1368075ed" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5006d09553345421af5dd2334cc945fc34dc2a73d7c1ed842a39a3803699619d"
dependencies = [ dependencies = [
"it-to-bytes", "it-to-bytes",
"serde", "serde",
@ -279,16 +282,18 @@ dependencies = [
[[package]] [[package]]
name = "fluence-sdk-macro" name = "fluence-sdk-macro"
version = "0.6.0" version = "0.6.1"
source = "git+https://github.com/fluencelabs/rust-sdk?branch=optimizations#43c3908409b20cd875f2a42ae5563672453129a0" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb43d2f51f1becb70e2125ef8ca9759597900f95cc22ce7dca981a7d6ccd7dde"
dependencies = [ dependencies = [
"fluence-sdk-wit", "fluence-sdk-wit",
] ]
[[package]] [[package]]
name = "fluence-sdk-main" name = "fluence-sdk-main"
version = "0.6.0" version = "0.6.1"
source = "git+https://github.com/fluencelabs/rust-sdk?branch=optimizations#43c3908409b20cd875f2a42ae5563672453129a0" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a78910d85e3cdcb9c2baf56144f20a99925c67ac445d4156220c005bfd2f9604"
dependencies = [ dependencies = [
"fluence-sdk-macro", "fluence-sdk-macro",
"log", "log",
@ -297,8 +302,9 @@ dependencies = [
[[package]] [[package]]
name = "fluence-sdk-wit" name = "fluence-sdk-wit"
version = "0.6.0" version = "0.6.1"
source = "git+https://github.com/fluencelabs/rust-sdk?branch=optimizations#43c3908409b20cd875f2a42ae5563672453129a0" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eab3ed39703b72e0e52bce9e1760746c73f65a5694c8da4dec751d3bfdec15b8"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -366,7 +372,7 @@ dependencies = [
[[package]] [[package]]
name = "interpreter-lib" name = "interpreter-lib"
version = "0.8.0" version = "0.9.0"
dependencies = [ dependencies = [
"air-parser", "air-parser",
"aqua-interpreter-interface", "aqua-interpreter-interface",
@ -384,7 +390,8 @@ dependencies = [
[[package]] [[package]]
name = "it-to-bytes" name = "it-to-bytes"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/fluencelabs/interface-types?branch=optimizations#27c13e9547ac55ddbc5e7a4e1ab6f1a1368075ed" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "729c74bb4236418898a219c6d96f14cba77456dd7c04a2e99e65e9c643709b56"
[[package]] [[package]]
name = "itertools" name = "itertools"

2
interpreter-lib/tests/security_tetraplets/log_storage/Cargo.toml
View File

@ -10,6 +10,6 @@ path = "src/main.rs"
[dependencies] [dependencies]
interpreter-lib = { path = "../../../../interpreter-lib" } interpreter-lib = { path = "../../../../interpreter-lib" }
fluence = { git = "https://github.com/fluencelabs/rust-sdk", features = ["logger"] } fluence = "0.6.1"
[workspace] [workspace]

4
interpreter/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "aquamarine" name = "aquamarine"
version = "0.8.0" version = "0.9.0"
authors = ["Fluence Labs"] authors = ["Fluence Labs"]
edition = "2018" edition = "2018"
@ -16,7 +16,7 @@ path = "src/fce.rs"
[dependencies] [dependencies]
interpreter-lib = { path = "../interpreter-lib" } interpreter-lib = { path = "../interpreter-lib" }
fluence = { git = "https://github.com/fluencelabs/rust-sdk", features = ["logger"] } fluence = { version = "0.6.1", features = ["logger"] }
# Keep 0.2.65 until this is resolved https://github.com/rustwasm/wasm-pack/issues/886 # Keep 0.2.65 until this is resolved https://github.com/rustwasm/wasm-pack/issues/886
wasm-bindgen = "=0.2.65" wasm-bindgen = "=0.2.65"