feat!: update marine-rs-sdk to 0.14.0, remove all of json_path remains (

#820)

* support call_parameters v2

* remove old comment

* use released marine

* fix test wasm

* update sdk marine use lens

* fix test module

* WIP fixing the tests to use lens

* WIP tetraplet field renaming test fixes

* rename more lambda to lens

* fix build

* Fix gen-bench-data compilation

* Update gen-bench-data Cargo.lock

* Fix signature tests

---------

Co-authored-by: drrtuy <roman@fluence.one>
Co-authored-by: Ivan Boldyrev <ivan@fluence.one>

air-interpreter/Cargo.toml

@@ -22,7 +22,7 @@ aquavm-air = { version = "0.60.0", path = "../air" }
 air-interpreter-interface = { version = "0.18.0", path = "../crates/air-lib/interpreter-interface" }
 air-log-targets = { version = "0.1.0", path = "../crates/air-lib/log-targets" }
 
-marine-rs-sdk = {version = "0.10.3", features = ["logger"] }
+marine-rs-sdk = {version = "0.14.0", features = ["logger"] }
 
 wasm-bindgen = "=0.2.83"
 

air/Cargo.toml

@@ -53,8 +53,8 @@ rkyv = { version = "0.7.43", features = ["strict", "validation", "size_32", "arc
 [dev_dependencies]
 air-test-utils = { path = "../crates/air-lib/test-utils" }
 air-testing-framework = { path = "../crates/testing-framework" }
-fluence-app-service = "0.31.0"
-marine-rs-sdk = { version = "0.10.0", features = ["logger"] }
+fluence-app-service = "0.34.0"
+marine-rs-sdk = { version = "0.14.0", features = ["logger"] }
 
 borsh = "0.10.3"
 bs58 = "0.5.0"

air/src/execution_step/instructions/ap/apply_to_arguments.rs

@@ -149,7 +149,7 @@ fn apply_canon_stream(
     let value = JValuable::as_jvalue(&&canon_stream.canon_stream);
     let tetraplet = canon_stream.tetraplet().clone();
     let position = trace_ctx.trace_pos().map_err(UncatchableError::from)?;
-    let value = CanonResultAggregate::new(value, tetraplet.peer_pk.as_str().into(), &tetraplet.json_path, position);
+    let value = CanonResultAggregate::new(value, tetraplet.peer_pk.as_str().into(), &tetraplet.lens, position);
     let result = ValueAggregate::from_canon_result(value, canon_stream.cid.clone());
     Ok(result)
 }
@@ -187,7 +187,7 @@ fn apply_canon_stream_map(
     let value = JValuable::as_jvalue(&&canon_stream_map.canon_stream_map);
     let tetraplet = canon_stream_map.tetraplet();
     let position = trace_ctx.trace_pos().map_err(UncatchableError::from)?;
-    let value = CanonResultAggregate::new(value, tetraplet.peer_pk.as_str().into(), &tetraplet.json_path, position);
+    let value = CanonResultAggregate::new(value, tetraplet.peer_pk.as_str().into(), &tetraplet.lens, position);
     let result = ValueAggregate::from_canon_result(value, canon_stream_map.cid.clone());
     Ok(result)
 }

air/src/execution_step/instructions/canon_stream_map_scalar.rs

@@ -87,7 +87,7 @@ fn epilog_closure<'closure, 'name: 'closure>(scalar_name: &'name str) -> Box<Can
 
             let position = trace_ctx.trace_pos().map_err(UncatchableError::from)?;
 
-            let value = CanonResultAggregate::new(value, peer_pk, &tetraplet.json_path, position);
+            let value = CanonResultAggregate::new(value, peer_pk, &tetraplet.lens, position);
             let result = ValueAggregate::from_canon_result(value, canon_result_cid.clone());
 
             exec_ctx.scalars.set_scalar_value(scalar_name, result)?;

air/src/execution_step/lambda_applier/applier.rs

@@ -117,9 +117,9 @@ fn select_by_path_from_canon_map_stream<'value>(
         let result = select_by_path_from_scalar(&value, body.iter(), exec_ctx)?;
 
         let joined = body.iter().map(ToString::to_string).collect::<Vec<_>>().join(".");
-        let json_path_suffix = format!(".{}", joined);
+        let lambda_suffix = format!(".{}", joined);
         let prefix_with_path = true;
-        let updated_tetraplet = update_tetraplet_with_path(&tetraplet, &json_path_suffix, prefix_with_path);
+        let updated_tetraplet = update_tetraplet_with_path(&tetraplet, &lambda_suffix, prefix_with_path);
 
         MapLensResult::new(result, updated_tetraplet)
     };
@@ -206,14 +206,14 @@ fn update_tetraplet_with_path(
     original_path: &impl ToString,
     prefix_with_path: bool,
 ) -> RcSecurityTetraplet {
-    let json_path_updated = if prefix_with_path {
-        original_tetraplet.json_path.to_string() + &original_path.to_string()
+    let lens_updated = if prefix_with_path {
+        original_tetraplet.lens.to_string() + &original_path.to_string()
     } else {
         original_path.to_string()
     };
 
     SecurityTetraplet {
-        json_path: json_path_updated,
+        lens: lens_updated,
         ..original_tetraplet.clone()
     }
     .into()

air/src/execution_step/value_types/iterable/lambda_result.rs

@@ -61,7 +61,7 @@ impl<'ctx> Iterable<'ctx> for IterableLambdaResult {
 
         let jvalue = &self.jvalues[self.cursor];
         let mut tetraplet = (*self.tetraplet).clone();
-        tetraplet.add_lambda(&format!(".$.[{}]", self.cursor));
+        tetraplet.add_lens(&format!(".$.[{}]", self.cursor));
         let result = IterableItem::RefValue((jvalue, tetraplet.into(), 0.into(), self.provenance.clone()));
 
         Some(result)

air/src/execution_step/value_types/iterable/resolved_call.rs

@@ -64,7 +64,7 @@ impl<'ctx> Iterable<'ctx> for IterableResolvedCall {
         };
 
         let mut tetraplet = (*tetraplet).clone();
-        tetraplet.add_lambda(&format!(".$.[{}]", self.cursor));
+        tetraplet.add_lens(&format!(".$.[{}]", self.cursor));
 
         let result = IterableItem::RefValue((jvalue, tetraplet.into(), trace_pos, provenance));
         Some(result)