diff --git a/Cargo.lock b/Cargo.lock index 2e6e54c2..0e0b3615 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -54,7 +54,7 @@ dependencies = [ name = "arguments-passing-test" version = "0.1.0" dependencies = [ - "fluence 0.2.12 (git+https://github.com/fluencelabs/rust-sdk)", + "fluence 0.2.13 (git+https://github.com/fluencelabs/rust-sdk)", "safe-transmute", ] @@ -68,7 +68,7 @@ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" name = "arrays-passing-test" version = "0.1.0" dependencies = [ - "fluence 0.2.12 (git+https://github.com/fluencelabs/rust-sdk)", + "fluence 0.2.13 (git+https://github.com/fluencelabs/rust-sdk)", "safe-transmute", ] @@ -185,7 +185,7 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" name = "call_parameters" version = "0.1.0" dependencies = [ - "fluence 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "fluence 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -407,7 +407,7 @@ dependencies = [ name = "curl_adapter" version = "0.1.0" dependencies = [ - "fluence 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "fluence 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "log", ] @@ -612,7 +612,7 @@ name = "facade" version = "0.1.0" dependencies = [ "anyhow", - "fluence 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "fluence 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "log", ] @@ -669,7 +669,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8165090ee52453a5c14bd42212bfc6516860c4aaa2315fd568c0198b46b52901" dependencies = [ - "fluence 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "fluence 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -681,7 +681,7 @@ name = "fce-wit-generator" version = "0.1.12" dependencies = [ "fce-wit-parser", - "fluence-sdk-wit 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "fluence-sdk-wit 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "once_cell", "serde", "serde_json", @@ -724,21 +724,21 @@ dependencies = [ [[package]] name = "fluence" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3506e38cf0ff078c51ba86f778a5a6238bed0bed4457180171e15a5a6c3f1c" +checksum = "083f40a5d000b28b74f10d824925eccf1fbdf6dbb8881e6d052c6183b2bc615e" dependencies = [ - "fluence-sdk-macro 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", - "fluence-sdk-main 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "fluence-sdk-macro 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", + "fluence-sdk-main 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "fluence" -version = "0.2.12" -source = "git+https://github.com/fluencelabs/rust-sdk#a555291c1ceca0b9c959240e1d311d0e3309eda3" +version = "0.2.13" +source = "git+https://github.com/fluencelabs/rust-sdk#71591f412cb65879d74e8c38838e827ab74d8802" dependencies = [ - "fluence-sdk-macro 0.2.12 (git+https://github.com/fluencelabs/rust-sdk)", - "fluence-sdk-main 0.2.12 (git+https://github.com/fluencelabs/rust-sdk)", + "fluence-sdk-macro 0.2.13 (git+https://github.com/fluencelabs/rust-sdk)", + "fluence-sdk-main 0.2.13 (git+https://github.com/fluencelabs/rust-sdk)", ] [[package]] @@ -763,7 +763,7 @@ dependencies = [ "env_logger 0.7.1", "fce", "fce-utils", - "fluence-sdk-main 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "fluence-sdk-main 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "itertools", "log", "once_cell", @@ -781,47 +781,47 @@ dependencies = [ [[package]] name = "fluence-sdk-macro" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f44e1668ecf3d45026bae6dd7a8e4045a9b1742a4f30db205954802e74cbcc4c" +checksum = "2f79abced6cdfdd7089b0accad0d9c760bf9d2e82ae1bec851383e061cb40790" dependencies = [ - "fluence-sdk-wit 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "fluence-sdk-wit 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "fluence-sdk-macro" -version = "0.2.12" -source = "git+https://github.com/fluencelabs/rust-sdk#a555291c1ceca0b9c959240e1d311d0e3309eda3" +version = "0.2.13" +source = "git+https://github.com/fluencelabs/rust-sdk#71591f412cb65879d74e8c38838e827ab74d8802" dependencies = [ - "fluence-sdk-wit 0.2.12 (git+https://github.com/fluencelabs/rust-sdk)", + "fluence-sdk-wit 0.2.13 (git+https://github.com/fluencelabs/rust-sdk)", ] [[package]] name = "fluence-sdk-main" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71397005d09f96b188f33d1189d0fd2163fe54882b57979ddbdcdc28167e1107" +checksum = "2348d5b5000012f9da835e52f7473e08dff6345e9beba2e80a91b801e48ac0b6" dependencies = [ - "fluence-sdk-macro 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "fluence-sdk-macro 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "log", "serde", ] [[package]] name = "fluence-sdk-main" -version = "0.2.12" -source = "git+https://github.com/fluencelabs/rust-sdk#a555291c1ceca0b9c959240e1d311d0e3309eda3" +version = "0.2.13" +source = "git+https://github.com/fluencelabs/rust-sdk#71591f412cb65879d74e8c38838e827ab74d8802" dependencies = [ - "fluence-sdk-macro 0.2.12 (git+https://github.com/fluencelabs/rust-sdk)", + "fluence-sdk-macro 0.2.13 (git+https://github.com/fluencelabs/rust-sdk)", "log", "serde", ] [[package]] name = "fluence-sdk-wit" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa333b56081139078aa62d9d5e6ac8ed5fb49578139788740742c1c7e1b4c112" +checksum = "8da5f51cddeae52ff5b91d1a5d8be90e54629f4887f89f8d7501b829b374fe6a" dependencies = [ "proc-macro2", "quote", @@ -833,8 +833,8 @@ dependencies = [ [[package]] name = "fluence-sdk-wit" -version = "0.2.12" -source = "git+https://github.com/fluencelabs/rust-sdk#a555291c1ceca0b9c959240e1d311d0e3309eda3" +version = "0.2.13" +source = "git+https://github.com/fluencelabs/rust-sdk#71591f412cb65879d74e8c38838e827ab74d8802" dependencies = [ "proc-macro2", "quote", @@ -883,7 +883,7 @@ dependencies = [ "clap", "env_logger 0.7.1", "fluence-app-service", - "fluence-sdk-main 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "fluence-sdk-main 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "itertools", "log", "rustop", @@ -1198,7 +1198,7 @@ dependencies = [ name = "inner-records-test" version = "0.1.0" dependencies = [ - "fluence 0.2.12 (git+https://github.com/fluencelabs/rust-sdk)", + "fluence 0.2.13 (git+https://github.com/fluencelabs/rust-sdk)", "safe-transmute", ] @@ -1237,7 +1237,7 @@ dependencies = [ name = "ipfs-effector" version = "0.1.0" dependencies = [ - "fluence 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "fluence 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "log", ] @@ -1245,7 +1245,7 @@ dependencies = [ name = "ipfs-pure" version = "0.1.0" dependencies = [ - "fluence 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "fluence 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "log", ] @@ -1324,7 +1324,7 @@ checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb" name = "local_storage" version = "0.1.0" dependencies = [ - "fluence 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "fluence 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "log", ] @@ -1860,7 +1860,7 @@ dependencies = [ name = "record-effector" version = "0.1.0" dependencies = [ - "fluence 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "fluence 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "test-record", ] @@ -1868,7 +1868,7 @@ dependencies = [ name = "record-pure" version = "0.1.0" dependencies = [ - "fluence 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "fluence 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "test-record", ] @@ -2207,7 +2207,7 @@ name = "stepper-interface" version = "0.1.0" source = "git+https://github.com/fluencelabs/aquamarine#b967a63abca9742d6764e9b27926025d5e2b2efb" dependencies = [ - "fluence 0.2.12 (git+https://github.com/fluencelabs/rust-sdk)", + "fluence 0.2.13 (git+https://github.com/fluencelabs/rust-sdk)", "serde", "wasmer-interface-types-fl", ] @@ -2297,7 +2297,7 @@ dependencies = [ name = "test-record" version = "0.1.0" dependencies = [ - "fluence 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "fluence 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2753,7 +2753,7 @@ checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158" name = "wasm-greeting" version = "0.1.0" dependencies = [ - "fluence 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "fluence 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2761,7 +2761,7 @@ name = "wasm-sqlite-test" version = "0.1.0" dependencies = [ "fce-sqlite-connector", - "fluence 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "fluence 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] diff --git a/crates/wit-generator/Cargo.toml b/crates/wit-generator/Cargo.toml index edb1a2ca..50d11f12 100644 --- a/crates/wit-generator/Cargo.toml +++ b/crates/wit-generator/Cargo.toml @@ -12,7 +12,7 @@ path = "src/lib.rs" [dependencies] fce-wit-parser = { path = "../wit-parser", version = "0.1.11"} -fluence-sdk-wit = "=0.2.12" +fluence-sdk-wit = "=0.2.13" walrus = "0.17.0" wasmer-wit = { package = "wasmer-interface-types-fl", version = "=0.17.20" } diff --git a/examples/call_parameters/Cargo.toml b/examples/call_parameters/Cargo.toml index 3c9b9c47..ad6dde4e 100644 --- a/examples/call_parameters/Cargo.toml +++ b/examples/call_parameters/Cargo.toml @@ -9,4 +9,4 @@ name = "call_parameters" path = "src/main.rs" [dependencies] -fluence = "=0.2.12" +fluence = "=0.2.13" diff --git a/examples/call_parameters/artifacts/call_parameters.wasm b/examples/call_parameters/artifacts/call_parameters.wasm index 48774ed5..2a0452eb 100755 Binary files a/examples/call_parameters/artifacts/call_parameters.wasm and b/examples/call_parameters/artifacts/call_parameters.wasm differ diff --git a/examples/call_parameters/src/main.rs b/examples/call_parameters/src/main.rs index e194281c..6e22e081 100644 --- a/examples/call_parameters/src/main.rs +++ b/examples/call_parameters/src/main.rs @@ -22,5 +22,13 @@ pub fn main() {} #[cfg(target_arch = "wasm32")] pub fn call_parameters() -> String { let cp = fluence::get_call_parameters(); - format!("{}\n{}\n{}", cp.call_id, cp.user_name, cp.application_id) + format!( + "{}\n{}\n{}\n{}\n{}\n{:?}", + cp.init_peer_id, + cp.service_id, + cp.service_creator_peer_id, + cp.host_id, + cp.particle_id, + cp.tetraplets + ) } diff --git a/examples/greeting/Cargo.toml b/examples/greeting/Cargo.toml index 4844f8c3..9e10e717 100644 --- a/examples/greeting/Cargo.toml +++ b/examples/greeting/Cargo.toml @@ -9,4 +9,4 @@ name = "greeting" path = "src/main.rs" [dependencies] -fluence = "=0.2.12" +fluence = "=0.2.13" diff --git a/examples/greeting/artifacts/greeting.wasm b/examples/greeting/artifacts/greeting.wasm index ef0f28ec..ebdbc773 100755 Binary files a/examples/greeting/artifacts/greeting.wasm and b/examples/greeting/artifacts/greeting.wasm differ diff --git a/examples/ipfs-node/artifacts/ipfs_effector.wasm b/examples/ipfs-node/artifacts/ipfs_effector.wasm index 8b2161a0..202dbb1f 100755 Binary files a/examples/ipfs-node/artifacts/ipfs_effector.wasm and b/examples/ipfs-node/artifacts/ipfs_effector.wasm differ diff --git a/examples/ipfs-node/artifacts/ipfs_pure.wasm b/examples/ipfs-node/artifacts/ipfs_pure.wasm index 73f54215..167d62f1 100755 Binary files a/examples/ipfs-node/artifacts/ipfs_pure.wasm and b/examples/ipfs-node/artifacts/ipfs_pure.wasm differ diff --git a/examples/ipfs-node/effector/Cargo.toml b/examples/ipfs-node/effector/Cargo.toml index 11e7a8de..9fc2ca61 100644 --- a/examples/ipfs-node/effector/Cargo.toml +++ b/examples/ipfs-node/effector/Cargo.toml @@ -9,5 +9,5 @@ name = "ipfs_effector" path = "src/main.rs" [dependencies] -fluence = { version = "=0.2.12", features = ["logger"]} +fluence = { version = "=0.2.13", features = ["logger"]} log = "0.4.11" diff --git a/examples/ipfs-node/pure/Cargo.toml b/examples/ipfs-node/pure/Cargo.toml index dc018320..6661c3d6 100644 --- a/examples/ipfs-node/pure/Cargo.toml +++ b/examples/ipfs-node/pure/Cargo.toml @@ -9,5 +9,5 @@ name = "ipfs_pure" path = "src/main.rs" [dependencies] -fluence = { version = "=0.2.12", features = ["logger"]} +fluence = { version = "=0.2.13", features = ["logger"]} log = "0.4.11" diff --git a/examples/records/artifacts/records_effector.wasm b/examples/records/artifacts/records_effector.wasm index 5aac0f3b..7a5d68b1 100755 Binary files a/examples/records/artifacts/records_effector.wasm and b/examples/records/artifacts/records_effector.wasm differ diff --git a/examples/records/artifacts/records_pure.wasm b/examples/records/artifacts/records_pure.wasm index 32e6e79b..f5e611ab 100755 Binary files a/examples/records/artifacts/records_pure.wasm and b/examples/records/artifacts/records_pure.wasm differ diff --git a/examples/records/effector/Cargo.toml b/examples/records/effector/Cargo.toml index bec2ac82..cec05f61 100644 --- a/examples/records/effector/Cargo.toml +++ b/examples/records/effector/Cargo.toml @@ -9,5 +9,5 @@ name = "records_effector" path = "src/main.rs" [dependencies] -fluence = { version = "=0.2.12", features = ["logger"]} -test-record = { path = "../test-record" } \ No newline at end of file +fluence = { version = "=0.2.13", features = ["logger"]} +test-record = { path = "../test-record" } diff --git a/examples/records/pure/Cargo.toml b/examples/records/pure/Cargo.toml index c99801c4..e2884c8c 100644 --- a/examples/records/pure/Cargo.toml +++ b/examples/records/pure/Cargo.toml @@ -9,5 +9,5 @@ name = "records_pure" path = "src/main.rs" [dependencies] -fluence = { version = "=0.2.12", features = ["logger"]} +fluence = { version = "=0.2.13", features = ["logger"]} test-record = { path = "../test-record" } diff --git a/examples/records/test-record/Cargo.toml b/examples/records/test-record/Cargo.toml index 04745cd3..aff0d07d 100644 --- a/examples/records/test-record/Cargo.toml +++ b/examples/records/test-record/Cargo.toml @@ -9,4 +9,4 @@ name = "test_record" path = "src/test_record.rs" [dependencies] -fluence = "=0.2.12" +fluence = "=0.2.13" diff --git a/examples/sqlite/Cargo.toml b/examples/sqlite/Cargo.toml index 61e7d243..d6515cde 100644 --- a/examples/sqlite/Cargo.toml +++ b/examples/sqlite/Cargo.toml @@ -9,5 +9,5 @@ name = "sqlite_test" path = "src/main.rs" [dependencies] -fluence = "=0.2.12" +fluence = "=0.2.13" fce-sqlite-connector = "=0.1.3" diff --git a/examples/sqlite/artifacts/sqlite_test.wasm b/examples/sqlite/artifacts/sqlite_test.wasm index 380abe4e..1960f1aa 100755 Binary files a/examples/sqlite/artifacts/sqlite_test.wasm and b/examples/sqlite/artifacts/sqlite_test.wasm differ diff --git a/examples/url-downloader/artifacts/curl_adapter.wasm b/examples/url-downloader/artifacts/curl_adapter.wasm index 74b88ccb..a78993c1 100755 Binary files a/examples/url-downloader/artifacts/curl_adapter.wasm and b/examples/url-downloader/artifacts/curl_adapter.wasm differ diff --git a/examples/url-downloader/artifacts/facade.wasm b/examples/url-downloader/artifacts/facade.wasm index 0bd774e0..96b5ed99 100755 Binary files a/examples/url-downloader/artifacts/facade.wasm and b/examples/url-downloader/artifacts/facade.wasm differ diff --git a/examples/url-downloader/artifacts/local_storage.wasm b/examples/url-downloader/artifacts/local_storage.wasm index ee6d754f..25dba77e 100755 Binary files a/examples/url-downloader/artifacts/local_storage.wasm and b/examples/url-downloader/artifacts/local_storage.wasm differ diff --git a/examples/url-downloader/curl_adapter/Cargo.toml b/examples/url-downloader/curl_adapter/Cargo.toml index bae0d53a..dd6dca0a 100644 --- a/examples/url-downloader/curl_adapter/Cargo.toml +++ b/examples/url-downloader/curl_adapter/Cargo.toml @@ -9,5 +9,5 @@ path = "src/main.rs" name = "curl_adapter" [dependencies] -fluence = { version = "=0.2.12", features = ["logger"]} +fluence = { version = "=0.2.13", features = ["logger"]} log = "0.4.8" diff --git a/examples/url-downloader/facade/Cargo.toml b/examples/url-downloader/facade/Cargo.toml index 425ac375..65454be9 100644 --- a/examples/url-downloader/facade/Cargo.toml +++ b/examples/url-downloader/facade/Cargo.toml @@ -9,6 +9,6 @@ name = "facade" path = "src/main.rs" [dependencies] -fluence = { version = "=0.2.12", features = ["logger"]} +fluence = { version = "=0.2.13", features = ["logger"]} anyhow = "1.0.31" log = "0.4.8" diff --git a/examples/url-downloader/local_storage/Cargo.toml b/examples/url-downloader/local_storage/Cargo.toml index 210c2126..4839099d 100644 --- a/examples/url-downloader/local_storage/Cargo.toml +++ b/examples/url-downloader/local_storage/Cargo.toml @@ -9,5 +9,5 @@ name = "local_storage" path = "src/main.rs" [dependencies] -fluence = { version = "=0.2.12", features = ["logger"]} +fluence = { version = "=0.2.13", features = ["logger"]} log = "0.4.8" diff --git a/fluence-faas/Cargo.toml b/fluence-faas/Cargo.toml index 01c51c13..7185a83e 100644 --- a/fluence-faas/Cargo.toml +++ b/fluence-faas/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" [dependencies] fce = { path = "../engine", version = "0.1.14" } fce-utils = { path = "../crates/utils", version = "0.1.0" } -fluence-sdk-main = { version = "=0.2.12", features = ["logger"] } +fluence-sdk-main = { version = "=0.2.13", features = ["logger"] } wasmer-runtime = { package = "wasmer-runtime-fl", version = "0.17.0" } # dynamicfunc-fat-closures allows using state inside DynamicFunc diff --git a/fluence-faas/tests/call_parameters.rs b/fluence-faas/tests/call_parameters.rs index ab529eae..e3fe9bd8 100644 --- a/fluence-faas/tests/call_parameters.rs +++ b/fluence-faas/tests/call_parameters.rs @@ -35,17 +35,22 @@ pub fn call_parameters() { let mut faas = FluenceFaaS::with_raw_config(call_parameters_config) .unwrap_or_else(|e| panic!("can't create Fluence FaaS instance: {:?}", e)); - let call_id = "0x1337"; - let user_name = "root"; - let application_id = "0x31337"; + let init_peer_id = "init_peer_id"; + let service_id = "service_id"; + let service_creator_peer_id = "service_creator_peer_id"; + let host_id = "host_id"; + let particle_id = "particle_id"; let tetraplet = fluence_sdk_main::SecurityTetraplet::default(); + let tetraplets = vec![vec![tetraplet]]; let call_parameters = fluence_sdk_main::CallParameters { - call_id: call_id.to_string(), - user_name: user_name.to_string(), - application_id: application_id.to_string(), - tetraplets: vec![vec![tetraplet]], + init_peer_id: init_peer_id.to_string(), + service_id: service_id.to_string(), + service_creator_peer_id: service_creator_peer_id.to_string(), + host_id: host_id.to_string(), + particle_id: particle_id.to_string(), + tetraplets: tetraplets.clone(), }; let result = faas @@ -55,8 +60,8 @@ pub fn call_parameters() { assert_eq!( result, vec![IValue::String(format!( - "{}\n{}\n{}", - call_id, user_name, application_id + "{}\n{}\n{}\n{}\n{}\n{:?}", + init_peer_id, service_id, service_creator_peer_id, host_id, particle_id, tetraplets ))] ); } diff --git a/tools/repl/Cargo.toml b/tools/repl/Cargo.toml index 5b2a33e6..6022e44e 100644 --- a/tools/repl/Cargo.toml +++ b/tools/repl/Cargo.toml @@ -13,7 +13,7 @@ path = "src/main.rs" [dependencies] fluence-app-service = { path = "../../fluence-app-service", version = "0.1.16", features = ["raw-module-api"] } -fluence-sdk-main = { version = "=0.2.12", features = ["logger"] } +fluence-sdk-main = { version = "=0.2.13", features = ["logger"] } anyhow = "1.0.31" clap = "2.33.1"