feat!: support particle parameters in CallParameters (__marine_host_api_v2)

Cargo.toml

@@ -32,6 +32,9 @@ members = [
     "marine",
     "marine/tests/wasm_tests/arguments_passing",
     "marine/tests/wasm_tests/arrays_passing",
+    "marine/tests/wasm_tests/call_parameters_v0",
+    "marine/tests/wasm_tests/call_parameters_v1",
+    "marine/tests/wasm_tests/call_parameters_v2",
     "marine/tests/wasm_tests/memory_limiting",
     "marine/tests/wasm_tests/records_passing",
     "marine/tests/wasm_tests/wasi",

core/src/config.rs

@@ -57,6 +57,7 @@ pub struct HostImportDescriptor<WB: WasmBackend> {
 pub enum HostAPIVersion {
     V0,
     V1,
+    V2,
 }
 
 impl HostAPIVersion {
@@ -65,6 +66,7 @@ impl HostAPIVersion {
         match self {
             Self::V0 => "host",
             Self::V1 => "__marine_host_api_v1",
+            Self::V2 => "__marine_host_api_v2",
         }
     }
 }

core/tests/wasm_tests/lilo_after_2gb/Cargo.toml

@@ -10,5 +10,5 @@ name = "lilo_after_2gb"
 path = "src/pure.rs"
 
 [dependencies]
-marine-rs-sdk = "0.12.0"
+marine-rs-sdk = "0.13.0"
 safe-transmute = "0.11.0"

crates/fluence-app-service/src/lib.rs

@@ -70,4 +70,5 @@ pub use marine_min_it_version::min_sdk_version;
 pub use marine_min_it_version::min_it_version;
 
 pub use marine::CallParameters;
+pub use marine::ParticleParameters;
 pub use marine::SecurityTetraplet;

crates/it-generator/Cargo.toml

@@ -13,7 +13,7 @@ path = "src/lib.rs"
 
 [dependencies]
 marine-it-parser = { path = "../it-parser", version = "0.15.1" }
-marine-macro-impl = "0.12.0"
+marine-macro-impl = "0.13.0"
 
 wasmer-it = { package = "wasmer-interface-types-fl", version = "0.27.0" }
 it-lilo = "0.6.0"

crates/module-info-parser/Cargo.toml

@@ -12,7 +12,7 @@ name = "marine_module_info_parser"
 path = "src/lib.rs"
 
 [dependencies]
-marine-rs-sdk-main = { version = "0.12.0", default-features = false }
+marine-rs-sdk-main = { version = "0.13.0", default-features = false }
 
 marine-wasm-backend-traits = { path = "../wasm-backend-traits", version = "0.5.1" }
 

examples/call_parameters/Cargo.toml

@@ -10,4 +10,5 @@ name = "call_parameters"
 path = "src/main.rs"
 
 [dependencies]
-marine-rs-sdk = { version = "0.12.0", features = ["logger"] }
+marine-rs-sdk = { version = "0.13.0", features = ["logger"] }
+serde_json = "1.0.111"

examples/call_parameters/src/main.rs

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+use marine_rs_sdk::CallParameters;
 #[cfg(target_arch = "wasm32")]
 use marine_rs_sdk::marine;
 #[cfg(target_arch = "wasm32")]
@@ -26,16 +27,6 @@ pub fn main() {}
 
 #[marine]
 #[cfg(target_arch = "wasm32")]
-pub fn call_parameters() -> String {
-    let cp = marine_rs_sdk::get_call_parameters();
-    format!(
-        "{}\n{}\n{}\n{}\n{}\n{}\n{:?}",
-        cp.init_peer_id,
-        cp.service_id,
-        cp.service_creator_peer_id,
-        cp.host_id,
-        cp.worker_id,
-        cp.particle_id,
-        cp.tetraplets
-    )
+pub fn call_parameters() -> CallParameters {
+    marine_rs_sdk::get_call_parameters()
 }

examples/failing/Cargo.toml

@@ -11,4 +11,4 @@ name = "failing"
 path = "src/main.rs"
 
 [dependencies]
-marine-rs-sdk = "0.12.0"
+marine-rs-sdk = "0.13.0"

examples/greeting/Cargo.toml

@@ -11,4 +11,4 @@ name = "greeting"
 path = "src/main.rs"
 
 [dependencies]
-marine-rs-sdk = "0.12.0"
+marine-rs-sdk = "0.13.0"

examples/greeting_record/Cargo.toml

@@ -11,6 +11,6 @@ name = "greeting-record"
 path = "src/main.rs"
 
 [dependencies]
-marine-rs-sdk = { version = "0.12.0", features = ["logger"] }
+marine-rs-sdk = { version = "0.13.0", features = ["logger"] }
 log = "0.4.8"
 

examples/ipfs-node/effector/Cargo.toml

@@ -10,5 +10,5 @@ name = "ipfs_effector"
 path = "src/main.rs"
 
 [dependencies]
-marine-rs-sdk = { version = "0.12.0", features = ["logger"] }
+marine-rs-sdk = { version = "0.13.0", features = ["logger"] }
 log = "0.4.14"

examples/ipfs-node/pure/Cargo.toml

@@ -10,5 +10,5 @@ name = "ipfs_pure"
 path = "src/main.rs"
 
 [dependencies]
-marine-rs-sdk = { version = "0.12.0", features = ["logger"] }
+marine-rs-sdk = { version = "0.13.0", features = ["logger"] }
 log = "0.4.14"

examples/motivational-example/donkey/Cargo.toml

@@ -10,4 +10,4 @@ name = "donkey"
 path = "src/main.rs"
 
 [dependencies]
-marine-rs-sdk = { version = "0.12.0", features = ["logger"] }
+marine-rs-sdk = { version = "0.13.0", features = ["logger"] }

examples/motivational-example/shrek/Cargo.toml

@@ -10,4 +10,4 @@ path = "src/main.rs"
 name = "shrek"
 
 [dependencies]
-marine-rs-sdk = { version = "0.12.0", features = ["logger"] }
+marine-rs-sdk = { version = "0.13.0", features = ["logger"] }

examples/records/effector/Cargo.toml

@@ -10,5 +10,5 @@ name = "records_effector"
 path = "src/main.rs"
 
 [dependencies]
-marine-rs-sdk = "0.12.0"
+marine-rs-sdk = "0.13.0"
 test-record = { path = "../test-record" }

examples/records/pure/Cargo.toml

@@ -10,5 +10,5 @@ name = "records_pure"
 path = "src/main.rs"
 
 [dependencies]
-marine-rs-sdk = "0.12.0"
+marine-rs-sdk = "0.13.0"
 test-record = { path = "../test-record" }

examples/records/test-record/Cargo.toml

@@ -10,4 +10,4 @@ name = "test_record"
 path = "src/test_record.rs"
 
 [dependencies]
-marine-rs-sdk = "0.12.0"
+marine-rs-sdk = "0.13.0"

examples/sqlite/Cargo.toml

@@ -10,5 +10,5 @@ name = "sqlite_test"
 path = "src/main.rs"
 
 [dependencies]
-marine-rs-sdk = "0.12.0"
+marine-rs-sdk = "0.13.0"
 marine-sqlite-connector = "0.9.0"

examples/url-downloader/curl_adapter/Cargo.toml

@@ -10,5 +10,5 @@ path = "src/main.rs"
 name = "curl_adapter"
 
 [dependencies]
-marine-rs-sdk = { version = "0.12.0", features = ["logger"] }
+marine-rs-sdk = { version = "0.13.0", features = ["logger"] }
 log = "0.4.8"

examples/url-downloader/facade/Cargo.toml

@@ -10,6 +10,6 @@ name = "facade"
 path = "src/main.rs"
 
 [dependencies]
-marine-rs-sdk = { version = "0.12.0", features = ["logger"] }
+marine-rs-sdk = { version = "0.13.0", features = ["logger"] }
 anyhow = "1.0.31"
 log = "0.4.8"

examples/url-downloader/local_storage/Cargo.toml

@@ -10,7 +10,7 @@ name = "local_storage"
 path = "src/main.rs"
 
 [dependencies]
-marine-rs-sdk = { version = "0.12.0", features = ["logger"] }
+marine-rs-sdk = { version = "0.13.0", features = ["logger"] }
 wasm-tracing-allocator = "0.1.0"
 
 log = "0.4.8"

marine-js/npm-package/src/__test__/test.spec.ts

@@ -7,7 +7,14 @@ import * as url from 'url';
 import downloadRaw from 'download';
 import { MarineService } from '../MarineService.js';
 import { callAvm } from '@fluencelabs/avm';
-import {JSONArray, JSONObject, CallParameters, SecurityTetraplet, defaultCallParameters} from '../types.js';
+import {
+    JSONArray,
+    JSONObject,
+    CallParameters,
+    SecurityTetraplet,
+    defaultCallParameters,
+    ParticleParameters
+} from '../types.js';
 import {MarineServiceConfig, Env, Args, ModuleDescriptor} from '../config.js';
 import exp = require("constants");
 
@@ -405,36 +412,36 @@ describe('Fluence app service tests', () => {
         const worker_id = "worker_id";
         const particle_id = "particle_id";
 
+        const particleParameters: ParticleParameters = {
+            id: particle_id,
+            init_peer_id: init_peer_id_2,
+            timestamp: 42,
+            ttl: 84,
+            script: "(null)",
+            signature: [43,44,45,46],
+            token: "token",
+        }
+
         const tetraplet: SecurityTetraplet = {
                 function_name: "some_func_name",
-                json_path: "some_json_path",
+                lambda: "some_lambda",
                 peer_pk: "peer_pk",
                 service_id: "service_id"
         }
 
         const tetraplets = [[tetraplet]]
 
         const call_parameters: CallParameters = {
-            init_peer_id: init_peer_id_2,
+            particle: particleParameters,
             service_id: service_id,
             service_creator_peer_id: service_creator_peer_id,
             host_id: host_id,
             worker_id: worker_id,
-            particle_id: particle_id,
             tetraplets: tetraplets,
         };
 
-        const expected_result =
-            "init_peer_id\n" +
-            "service_id\n" +
-            "service_creator_peer_id\n" +
-            "host_id\n" +
-            "worker_id\n" +
-            "particle_id\n" +
-            "[[SecurityTetraplet { peer_pk: \"peer_pk\", service_id: \"service_id\", function_name: \"some_func_name\", json_path: \"some_json_path\" }]]";
-
         const result1 = marineService.call("call_parameters", [], call_parameters);
-        expect(result1).toStrictEqual(expected_result)
+        expect(result1).toStrictEqual(call_parameters)
 
     });
 });