.github/release-please/manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.12.0"
+  ".": "0.13.0"
 }

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [0.13.0](https://github.com/fluencelabs/marine-rs-sdk/compare/marine-rs-sdk-v0.12.0...marine-rs-sdk-v0.13.0) (2024-02-20)
+
+
+### ⚠ BREAKING CHANGES
+
+* **host api:** rename `json_path` field in SecurityTetraplet to `lambda` to follow AquaVM naming ([#158](https://github.com/fluencelabs/marine-rs-sdk/issues/158))
+* **host api:** add particle parameters into CallParameters ([#156](https://github.com/fluencelabs/marine-rs-sdk/issues/156))
+
+### Features
+
+* **host api:** add particle parameters into CallParameters ([#156](https://github.com/fluencelabs/marine-rs-sdk/issues/156)) ([8c7352e](https://github.com/fluencelabs/marine-rs-sdk/commit/8c7352e599b7fdda7c29643b1d8138061f1b455d))
+* **host api:** rename `json_path` field in SecurityTetraplet to `lambda` to follow AquaVM naming ([#158](https://github.com/fluencelabs/marine-rs-sdk/issues/158)) ([4a9e72e](https://github.com/fluencelabs/marine-rs-sdk/commit/4a9e72e64c5d18b14ae12311845bcf716f5532d5))
+
 ## [0.12.0](https://github.com/fluencelabs/marine-rs-sdk/compare/marine-rs-sdk-v0.11.0...marine-rs-sdk-v0.12.0) (2024-02-08)
 
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "marine-rs-sdk"
-version = "0.12.0"
+version = "0.13.0"
 description = "Fluence backend SDK for developing backend applications for the Fluence network"
 documentation = "https://docs.rs/fluence"
 repository = "https://github.com/fluencelabs/marine-rs-sdk"
@@ -18,10 +18,10 @@ path = "src/lib.rs"
 doctest = false
 
 [dependencies]
-marine-call-parameters = { path = "crates/call-parameters", version = "=0.12.0" }
-marine-macro = { path = "crates/marine-macro", version = "=0.12.0" }
-marine-rs-sdk-main = { path = "crates/main", version = "=0.12.0" } # warning: silent compilation break on minor verison bump. See docs/update-guide.md for details
-marine-timestamp-macro = { path = "crates/timestamp-macro", version = "=0.12.0" }
+marine-call-parameters = { path = "crates/call-parameters", version = "=0.13.0" }
+marine-macro = { path = "crates/marine-macro", version = "=0.13.0" }
+marine-rs-sdk-main = { path = "crates/main", version = "=0.13.0" } # warning: silent compilation break on minor verison bump. See docs/update-guide.md for details
+marine-timestamp-macro = { path = "crates/timestamp-macro", version = "=0.13.0" }
 
 serde = { version = "1.0.189", features = ["derive"]}
 

crates/call-parameters/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "marine-call-parameters"
-version = "0.12.0"
+version = "0.13.0"
 edition = "2021"
 description = "Contains CallParameters and SecurityTetralets structures for marine-rs-sdk"
 documentation = "https://docs.rs/fluence"
@@ -15,8 +15,8 @@ rkyv = { version = "0.7.43", features = ["validation", "strict"], optional = tru
 serde = "1.0.189"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-marine-macro = { path = "../marine-macro", version = "=0.12.0" }
-marine-rs-sdk-main = { path = "../main", version = "=0.12.0" }
+marine-macro = { path = "../marine-macro", version = "=0.13.0" }
+marine-rs-sdk-main = { path = "../main", version = "=0.13.0" }
 
 [features]
 default = ["marine-abi"]

crates/call-parameters/src/lib.rs

@@ -38,23 +38,22 @@ pub struct SecurityTetraplet {
     /// Name of a function that returned corresponding value.
     pub function_name: String,
 
-    /// Value was produced by applying this `json_path` to the output from `call_service`.
-    // TODO: since it's not a json path anymore, it's needed to rename it to lambda
-    pub json_path: String,
+    /// Value was produced by applying this `lambda` to the output from `call_service`.
+    pub lambda: String,
 }
 
 impl SecurityTetraplet {
     pub fn new(
         peer_pk: impl Into<String>,
         service_id: impl Into<String>,
         function_name: impl Into<String>,
-        json_path: impl Into<String>,
+        lambda: impl Into<String>,
     ) -> Self {
         Self {
             peer_pk: peer_pk.into(),
             service_id: service_id.into(),
             function_name: function_name.into(),
-            json_path: json_path.into(),
+            lambda: lambda.into(),
         }
     }
 
@@ -66,13 +65,13 @@ impl SecurityTetraplet {
             peer_pk: init_peer_id.into(),
             service_id: String::new(),
             function_name: String::new(),
-            // json path can't be applied to the string literals
-            json_path: String::new(),
+            // lambda can't be applied to the string literals
+            lambda: String::new(),
         }
     }
 
-    pub fn add_lambda(&mut self, json_path: &str) {
-        self.json_path.push_str(json_path)
+    pub fn add_lambda(&mut self, lambda: &str) {
+        self.lambda.push_str(lambda)
     }
 }
 
@@ -85,8 +84,8 @@ impl SecurityTetraplet {
 )]
 #[cfg_attr(feature = "rkyv", archive(check_bytes))]
 pub struct CallParameters {
-    /// Peer id of the AIR script initiator.
-    pub init_peer_id: String,
+    /// Parameters of the particle that caused this call.
+    pub particle: ParticleParameters,
 
     /// Id of the current service.
     pub service_id: String,
@@ -100,20 +99,47 @@ pub struct CallParameters {
     /// PeerId of the worker who hosts this service.
     pub worker_id: String,
 
-    /// Id of the particle which execution resulted a call this service.
-    pub particle_id: String,
-
     /// Security tetraplets which described origin of the arguments.
     pub tetraplets: Vec<Vec<SecurityTetraplet>>,
 }
 
+#[cfg_attr(all(target_arch = "wasm32", feature = "marine-abi"), marine)]
+#[derive(Clone, PartialEq, Default, Eq, Debug, Serialize, Deserialize)]
+#[cfg_attr(
+    feature = "rkyv",
+    derive(::rkyv::Archive, ::rkyv::Serialize, ::rkyv::Deserialize)
+)]
+#[cfg_attr(feature = "rkyv", archive(check_bytes))]
+pub struct ParticleParameters {
+    /// Id of the particle which execution resulted a call this service.
+    pub id: String,
+
+    /// Peer id of the AIR script initiator.
+    pub init_peer_id: String,
+
+    /// Unix timestamp of the particle start time.
+    pub timestamp: u64,
+
+    /// Time to live for this particle in milliseconds.
+    pub ttl: u32,
+
+    /// AIR script in this particle.
+    pub script: String,
+
+    /// Signature made by particle initiator -- init_peer_id.
+    pub signature: Vec<u8>,
+
+    /// particle.signature signed by host_id -- used for FS access.
+    pub token: String,
+}
+
 use std::fmt;
 impl fmt::Display for SecurityTetraplet {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(
             f,
-            "peer_pk: {}, service_id: {}, function_name: {}, json_path: {}",
-            self.peer_pk, self.service_id, self.function_name, self.json_path
+            "peer_pk: {}, service_id: {}, function_name: {}, lambda: {}",
+            self.peer_pk, self.service_id, self.function_name, self.lambda
         )
     }
 }
@@ -136,7 +162,7 @@ pub fn get_call_parameters() -> CallParameters {
 }
 
 #[cfg(all(feature = "marine-abi", target_arch = "wasm32"))]
-#[link(wasm_import_module = "__marine_host_api_v1")]
+#[link(wasm_import_module = "__marine_host_api_v2")]
 #[allow(improper_ctypes)]
 extern "C" {
     // returns serialized current call parameters

crates/macro-testing-utils/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "marine-macro-testing-utils"
-version = "0.12.0"
+version = "0.13.0"
 edition = "2018"
 description = "Some functions for testing procedural macros"
 documentation = "https://docs.rs/fluence/marine-macro-testing-utils"

crates/main/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "marine-rs-sdk-main"
-version = "0.12.0"
+version = "0.13.0"
 edition = "2018"
 description = "Contains logger, allocators and several other modules for marine-rs-sdk"
 documentation = "https://docs.rs/marine-rs-sdk-main"

crates/main/src/lib.rs

@@ -19,7 +19,7 @@
 
 #![allow(clippy::missing_safety_doc)]
 #![allow(clippy::needless_doctest_main)]
-#![doc(html_root_url = "https://docs.rs/marine-rs-sdk-main/0.12.0")] // x-release-please-version
+#![doc(html_root_url = "https://docs.rs/marine-rs-sdk-main/0.13.0")] // x-release-please-version
 #![deny(
     dead_code,
     nonstandard_style,

crates/main/src/logger.rs

@@ -242,7 +242,7 @@ pub fn log_utf8_string(level: i32, target: i32, msg_ptr: i32, msg_size: i32) {
 /// TODO: mark `log_utf8_string_impl` as #[wasm_bindgen], so it is polyfilled by bindgen
 /// log_utf8_string should be provided directly by a host.
 #[cfg(all(feature = "marine-abi", target_arch = "wasm32"))]
-#[link(wasm_import_module = "__marine_host_api_v1")]
+#[link(wasm_import_module = "__marine_host_api_v2")]
 extern "C" {
     // Writes a byte string of size bytes that starts from ptr to a logger
     #[link_name = "log_utf8_string"]

crates/marine-macro-impl/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "marine-macro-impl"
-version = "0.12.0"
+version = "0.13.0"
 edition = "2018"
 description = "Implementation of the `#[marine]` macro"
 documentation = "https://docs.rs/fluence/marine-macro-impl"

crates/marine-macro-impl/src/lib.rs

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#![doc(html_root_url = "https://docs.rs/marine-macro-impl/0.12.0")] // x-release-please-version
+#![doc(html_root_url = "https://docs.rs/marine-macro-impl/0.13.0")] // x-release-please-version
 #![deny(
     dead_code,
     nonstandard_style,

crates/marine-macro-impl/src/parse_macro_input/item_foreign_mod.rs

@@ -25,7 +25,7 @@ use syn::spanned::Spanned;
 const LINK_NAME_DIRECTIVE_NAME: &str = "link_name";
 const HOST_IMPORT_DIRECTIVE_NAME: &str = "host_import";
 const MODULE_IMPORT_DIRECTIVE_NAME: &str = "module_import";
-const HOST_IMPORT_NAMESPACE: &str = "__marine_host_api_v1";
+const HOST_IMPORT_NAMESPACE: &str = "__marine_host_api_v2";
 
 impl ParseMacroInput for syn::ItemForeignMod {
     fn parse_macro_input(self) -> Result<MarineAst> {

crates/marine-macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "marine-macro"
-version = "0.12.0"
+version = "0.13.0"
 edition = "2018"
 description = "Definition of the `#[marine]` macro"
 documentation = "https://docs.rs/fluence/marine-macro"
@@ -18,5 +18,5 @@ proc-macro = true
 doctest = false
 
 [dependencies]
-marine-macro-impl = { path = "../marine-macro-impl", version = "=0.12.0" }
-marine-rs-sdk-main = { path = "../main", version = "=0.12.0" }
+marine-macro-impl = { path = "../marine-macro-impl", version = "=0.13.0" }
+marine-rs-sdk-main = { path = "../main", version = "=0.13.0" }

crates/timestamp-macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "marine-timestamp-macro"
-version = "0.12.0"
+version = "0.13.0"
 edition = "2018"
 description = "Definition of the `#[build_timestamp]` macro"
 documentation = "https://docs.rs/fluence/marine-timestamp-macro"

src/lib.rs

@@ -55,7 +55,7 @@
 //!     pub fn curl_get(url: String) -> String;
 //! }
 //! ```
-#![doc(html_root_url = "https://docs.rs/sdk/0.12.0")] // x-release-please-version
+#![doc(html_root_url = "https://docs.rs/sdk/0.13.0")] // x-release-please-version
 #![deny(
     dead_code,
     nonstandard_style,
@@ -77,6 +77,7 @@ pub use marine_macro::marine;
 pub use marine_macro::fce;
 
 pub use marine_call_parameters::CallParameters;
+pub use marine_call_parameters::ParticleParameters;
 pub use marine_call_parameters::SecurityTetraplet;
 pub use marine_call_parameters::get_call_parameters;