Skip to content
This repository was archived by the owner on Jul 10, 2025. It is now read-only.

Commit 220c028

Browse files
feat!: support particle parameters in CallParameters (__marine_host_api_v2) (#417)
* support call_parameters v2 * fmt * fix warnings; require exact version for sdk v0 and v1 * support json_path * update lockfile * bump sdk versions and fix mrepl * fix call_parameters example * fix marine-js * fmt
1 parent 07e5696 commit 220c028

File tree

51 files changed

+867
-283
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+867
-283
lines changed

Cargo.lock

Lines changed: 171 additions & 55 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ members = [
3232
"marine",
3333
"marine/tests/wasm_tests/arguments_passing",
3434
"marine/tests/wasm_tests/arrays_passing",
35+
"marine/tests/wasm_tests/call_parameters_v0",
36+
"marine/tests/wasm_tests/call_parameters_v1",
37+
"marine/tests/wasm_tests/call_parameters_v2",
3538
"marine/tests/wasm_tests/memory_limiting",
3639
"marine/tests/wasm_tests/records_passing",
3740
"marine/tests/wasm_tests/wasi",

core/src/config.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ pub struct HostImportDescriptor<WB: WasmBackend> {
5757
pub enum HostAPIVersion {
5858
V0,
5959
V1,
60+
V2,
6061
}
6162

6263
impl HostAPIVersion {
@@ -65,6 +66,7 @@ impl HostAPIVersion {
6566
match self {
6667
Self::V0 => "host",
6768
Self::V1 => "__marine_host_api_v1",
69+
Self::V2 => "__marine_host_api_v2",
6870
}
6971
}
7072
}

core/tests/wasm_tests/lilo_after_2gb/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ name = "lilo_after_2gb"
1010
path = "src/pure.rs"
1111

1212
[dependencies]
13-
marine-rs-sdk = "0.12.0"
13+
marine-rs-sdk = "0.13.0"
1414
safe-transmute = "0.11.0"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,5 @@ pub use marine_min_it_version::min_sdk_version;
7070
pub use marine_min_it_version::min_it_version;
7171

7272
pub use marine::CallParameters;
73+
pub use marine::ParticleParameters;
7374
pub use marine::SecurityTetraplet;

crates/it-generator/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ path = "src/lib.rs"
1313

1414
[dependencies]
1515
marine-it-parser = { path = "../it-parser", version = "0.15.1" }
16-
marine-macro-impl = "0.12.0"
16+
marine-macro-impl = "0.13.0"
1717

1818
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.27.0" }
1919
it-lilo = "0.6.0"

crates/module-info-parser/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ name = "marine_module_info_parser"
1212
path = "src/lib.rs"
1313

1414
[dependencies]
15-
marine-rs-sdk-main = { version = "0.12.0", default-features = false }
15+
marine-rs-sdk-main = { version = "0.13.0", default-features = false }
1616

1717
marine-wasm-backend-traits = { path = "../wasm-backend-traits", version = "0.5.1" }
1818

examples/call_parameters/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ name = "call_parameters"
1010
path = "src/main.rs"
1111

1212
[dependencies]
13-
marine-rs-sdk = { version = "0.12.0", features = ["logger"] }
13+
marine-rs-sdk = { version = "0.13.0", features = ["logger"] }
14+
serde_json = "1.0.111"
-10.2 KB
Binary file not shown.

examples/call_parameters/src/main.rs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17+
use marine_rs_sdk::CallParameters;
1718
#[cfg(target_arch = "wasm32")]
1819
use marine_rs_sdk::marine;
1920
#[cfg(target_arch = "wasm32")]
@@ -26,16 +27,6 @@ pub fn main() {}
2627

2728
#[marine]
2829
#[cfg(target_arch = "wasm32")]
29-
pub fn call_parameters() -> String {
30-
let cp = marine_rs_sdk::get_call_parameters();
31-
format!(
32-
"{}\n{}\n{}\n{}\n{}\n{}\n{:?}",
33-
cp.init_peer_id,
34-
cp.service_id,
35-
cp.service_creator_peer_id,
36-
cp.host_id,
37-
cp.worker_id,
38-
cp.particle_id,
39-
cp.tetraplets
40-
)
30+
pub fn call_parameters() -> CallParameters {
31+
marine_rs_sdk::get_call_parameters()
4132
}

0 commit comments

Comments
 (0)