diff --git a/ether-price-getter/build.sh b/ether-price-getter/build.sh index d53a163..727af85 100755 --- a/ether-price-getter/build.sh +++ b/ether-price-getter/build.sh @@ -10,6 +10,6 @@ cd ether_price_getter fce build --release cd .. -rm -f artifacts/* +rm -f artifacts/*.wasm cp curl_adapter/target/wasm32-wasi/release/curl_adapter.wasm artifacts/ cp ether_price_getter/target/wasm32-wasi/release/ether_price_getter.wasm artifacts/ diff --git a/ether-price-getter/curl_adapter/Cargo.toml b/ether-price-getter/curl_adapter/Cargo.toml index b183740..ae2a394 100644 --- a/ether-price-getter/curl_adapter/Cargo.toml +++ b/ether-price-getter/curl_adapter/Cargo.toml @@ -10,5 +10,5 @@ path = "src/main.rs" name = "curl_adapter" [dependencies] -fluence = { version = "=0.2.18", features = ["logger"]} +fluence = { version = "=0.6.2", features = ["logger"]} log = "0.4.8" diff --git a/ether-price-getter/curl_adapter/src/main.rs b/ether-price-getter/curl_adapter/src/main.rs index fbfbe40..8e8da41 100644 --- a/ether-price-getter/curl_adapter/src/main.rs +++ b/ether-price-getter/curl_adapter/src/main.rs @@ -13,25 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#![allow(improper_ctypes)] use fluence::fce; +use fluence::module_manifest; +use fluence::MountedBinaryResult; use fluence::WasmLoggerBuilder; -/// Log level can be changed by `RUST_LOG` env as well. -pub fn main() { +module_manifest!(); + +fn main() { WasmLoggerBuilder::new().build().unwrap(); } #[fce] -pub fn curl_request(url: String) -> String { - // log::info!("get called with url {}", url); - - unsafe { curl(url) } +pub fn curl_request(curl_cmd: Vec) -> MountedBinaryResult { + let response = curl(curl_cmd); + response } -/// Permissions in `Config.toml` should exist to use host functions. +// mounted_binaries are available to import like this: #[fce] #[link(wasm_import_module = "host")] extern "C" { - fn curl(cmd: String) -> String; + pub fn curl(cmd: Vec) -> MountedBinaryResult; } diff --git a/ether-price-getter/ether_price_getter/Cargo.toml b/ether-price-getter/ether_price_getter/Cargo.toml index 39b575b..7e2e966 100644 --- a/ether-price-getter/ether_price_getter/Cargo.toml +++ b/ether-price-getter/ether_price_getter/Cargo.toml @@ -10,6 +10,6 @@ name = "ether_price_getter" path = "src/main.rs" [dependencies] -fluence = { version = "0.2.18", features = ["logger"]} +fluence = { version = "=0.6.2", features = ["logger"]} log = "0.4.8" fstrings = { version="0.2.3" } diff --git a/ether-price-getter/ether_price_getter/src/eth_price_getter.rs b/ether-price-getter/ether_price_getter/src/eth_price_getter.rs index e300558..3557d25 100644 --- a/ether-price-getter/ether_price_getter/src/eth_price_getter.rs +++ b/ether-price-getter/ether_price_getter/src/eth_price_getter.rs @@ -14,16 +14,17 @@ * limitations under the License. */ -use fluence::fce; use crate::curl_request; +use fluence::fce; -static URL_LATEST: &'static str = "https://pro-api.coinmarketcap.com/v1/cryptocurrency/quotes/latest"; - +static URL_LATEST: &'static str = + "https://pro-api.coinmarketcap.com/v1/cryptocurrency/quotes/latest"; #[fce] pub fn ether_price_getter(api_key: String, currency_symbol: String) -> String { - let curl_args = f!(r#"-H "X-CMC_PRO_API_KEY: {api_key}" -H "Accept: application/json" -d "symbol=ETH&convert={currency_symbol}" -G {URL_LATEST}"#); - let response: String = unsafe { curl_request(curl_args) }; - response + let curl_args = f!( + r#"-H "X-CMC_PRO_API_KEY: {api_key}" -H "Accept: application/json" -d "symbol=ETH&convert={currency_symbol}" -G {URL_LATEST}"# + ); + let response = curl_request(vec![curl_args]); + String::from_utf8(response.stdout).unwrap() } - \ No newline at end of file diff --git a/ether-price-getter/ether_price_getter/src/main.rs b/ether-price-getter/ether_price_getter/src/main.rs index 59f7442..8c95f68 100644 --- a/ether-price-getter/ether_price_getter/src/main.rs +++ b/ether-price-getter/ether_price_getter/src/main.rs @@ -13,16 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#![allow(non_snake_case, unused_variables, unused_imports, unused_parens, unused_mut)] +#![allow( + non_snake_case, + unused_variables, + unused_imports, + unused_parens, + unused_mut +)] #[macro_use] extern crate fstrings; use fluence::fce; +use fluence::module_manifest; +use fluence::MountedBinaryResult; use fluence::WasmLoggerBuilder; mod eth_price_getter; +module_manifest!(); + +#[allow(dead_code)] pub(crate) type Result = std::result::Result; pub fn main() { @@ -32,5 +43,5 @@ pub fn main() { #[fce] #[link(wasm_import_module = "curl_adapter")] extern "C" { - pub fn curl_request(url: String) -> String; + pub fn curl_request(url: Vec) -> MountedBinaryResult; } diff --git a/fluence-cuckoo/fce-cuckoo/Cargo.lock b/fluence-cuckoo/fce-cuckoo/Cargo.lock index 2a55ef4..069ff87 100644 --- a/fluence-cuckoo/fce-cuckoo/Cargo.lock +++ b/fluence-cuckoo/fce-cuckoo/Cargo.lock @@ -24,6 +24,19 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "chrono" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +dependencies = [ + "libc", + "num-integer", + "num-traits", + "time", + "winapi", +] + [[package]] name = "crc32fast" version = "1.2.1" @@ -59,6 +72,16 @@ dependencies = [ "serde_json", ] +[[package]] +name = "fce-timestamp-macro" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c59a6302902583b2c84e87de9d72b949da4396a369baf0aaa49e97021600bb0" +dependencies = [ + "chrono", + "quote", +] + [[package]] name = "flate2" version = "1.0.20" @@ -73,28 +96,30 @@ dependencies = [ [[package]] name = "fluence" -version = "0.2.18" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27d9a5e4292d7bbd809a0e968e3c3aacac91cbc5acab3e26ee1e1d726f0aab24" +checksum = "5b731bd4a69a3945186f2ff96ff753908939c8a2debd60e1f0e8edb6a28757f8" dependencies = [ + "fce-timestamp-macro", "fluence-sdk-macro", "fluence-sdk-main", + "serde", ] [[package]] name = "fluence-sdk-macro" -version = "0.2.18" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea1a7c75a617f827d1ba9a17b4d84e1565ab239915c63f5a85c41f89a9f1d4ba" +checksum = "cb43d2f51f1becb70e2125ef8ca9759597900f95cc22ce7dca981a7d6ccd7dde" dependencies = [ "fluence-sdk-wit", ] [[package]] name = "fluence-sdk-main" -version = "0.2.18" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6edcc983f9517c1b6bf9f851ef27f2894a3159aaa4a2fb6c9deb2ae8ecb603fa" +checksum = "a78910d85e3cdcb9c2baf56144f20a99925c67ac445d4156220c005bfd2f9604" dependencies = [ "fluence-sdk-macro", "log", @@ -103,9 +128,9 @@ dependencies = [ [[package]] name = "fluence-sdk-wit" -version = "0.2.18" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b75dbdd0275160f3818db3218563d791e6c612b616cd3c5d6e66283f207f648d" +checksum = "eab3ed39703b72e0e52bce9e1760746c73f65a5694c8da4dec751d3bfdec15b8" dependencies = [ "proc-macro2", "quote", @@ -140,7 +165,7 @@ checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" dependencies = [ "cfg-if", "libc", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi 0.10.0+wasi-snapshot-preview1", ] [[package]] @@ -174,6 +199,25 @@ dependencies = [ "autocfg", ] +[[package]] +name = "num-integer" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +dependencies = [ + "autocfg", +] + [[package]] name = "ppv-lite86" version = "0.2.10" @@ -191,9 +235,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" dependencies = [ "proc-macro2", ] @@ -287,15 +331,26 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.60" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081" +checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702" dependencies = [ "proc-macro2", "quote", "unicode-xid", ] +[[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]] name = "unicode-xid" version = "0.2.1" @@ -319,6 +374,28 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" +version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/fluence-cuckoo/fce-cuckoo/Cargo.toml b/fluence-cuckoo/fce-cuckoo/Cargo.toml index 3fe7cea..160768a 100644 --- a/fluence-cuckoo/fce-cuckoo/Cargo.toml +++ b/fluence-cuckoo/fce-cuckoo/Cargo.toml @@ -11,5 +11,5 @@ serde = {version = "1.0.0" } serde_json = {version = "1.0.62"} cuckoofilter ={version="0.5.0", features=["serde_support"] } log = "0.4" -fluence = { version = "0.2.18", features = ["logger"] } +fluence = { version = "0.6.2", features = ["logger"] } flate2 = "1.0.20" \ No newline at end of file diff --git a/fluence-cuckoo/fce-cuckoo/src/main.rs b/fluence-cuckoo/fce-cuckoo/src/main.rs index 8fecdd7..244d322 100644 --- a/fluence-cuckoo/fce-cuckoo/src/main.rs +++ b/fluence-cuckoo/fce-cuckoo/src/main.rs @@ -1,11 +1,11 @@ use cuckoofilter::{CuckooFilter, ExportedCuckooFilter}; +use flate2::read::ZlibDecoder; +use flate2::write::ZlibEncoder; +use flate2::Compression; use fluence::fce; use serde::Serialize; use serde_json; use std::collections::hash_map::DefaultHasher; -use flate2::Compression; -use flate2::read::ZlibDecoder; -use flate2::write::ZlibEncoder; use std::io::prelude::*; type CF = CuckooFilter; @@ -39,7 +39,7 @@ fn de_cf(cf: Vec) -> Result { #[fce] pub fn create_cf(with_capacity: String) -> Vec { let capacity = with_capacity.parse::().unwrap(); - let cf = match capacity{ + let cf = match capacity { 0 => CuckooFilter::::new(), _ => CuckooFilter::::with_capacity(capacity as usize), }; @@ -62,7 +62,7 @@ pub fn create_and_add_cf(data: Vec>) -> Vec { #[fce] pub fn add(cf: Vec, data: Vec>) -> Vec { let mut cf: CF = de_cf(cf).unwrap(); - let mut result = Vec::::new(); + let result = Vec::::new(); for v in data.iter() { cf.add(v).unwrap(); // TODO check for error