Fix massa-client read only call

massa-client/src/cmds.rs

@@ -1127,7 +1127,7 @@ impl Command {
                 }
             }
             Command::read_only_execute_smart_contract => {
-                if parameters.len() < 2 || parameters.len() > 4 {
+                if parameters.len() < 2 || parameters.len() > 5 {
                     bail!("wrong number of parameters");
                 }
 
@@ -1165,7 +1165,7 @@ impl Command {
                 }
             }
             Command::read_only_call => {
-                if parameters.len() < 4 || parameters.len() > 6 {
+                if parameters.len() < 4 || parameters.len() > 8 {
                     bail!("wrong number of parameters");
                 }
 

massa-ledger-exports/Cargo.toml

@@ -11,6 +11,7 @@ test-exports = ["tempfile", "massa_models/test-exports"]
 displaydoc = {workspace = true}
 serde = {workspace = true, "features" = ["derive"]}
 serde_json = {workspace = true}   # BOM UPGRADE     Revert to "1.0" if problem
+serde_with = { workspace = true }
 tempfile = {workspace = true, "optional" = true}   # BOM UPGRADE     Revert to {"version": "3.3", "optional": true} if problem
 thiserror = {workspace = true}
 nom = {workspace = true}
@@ -21,4 +22,4 @@ massa_serialization = {workspace = true}
 massa_db_exports = {workspace = true}
 
 [dev-dependencies]
-massa_hash = {workspace = true}
+massa_hash = {workspace = true}

massa-ledger-exports/src/ledger_changes.rs

@@ -20,38 +20,24 @@ use nom::error::{context, ContextError, ParseError};
 use nom::multi::length_count;
 use nom::sequence::tuple;
 use nom::{IResult, Parser};
-use serde::{ser::SerializeSeq, Deserialize, Serialize};
+use serde::{Deserialize, Serialize};
+use serde_with::serde_as;
 use std::collections::{hash_map, BTreeMap};
 use std::ops::Bound::Included;
 
 /// represents an update to one or more fields of a `LedgerEntry`
+#[serde_as]
 #[derive(Default, Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
 pub struct LedgerEntryUpdate {
     /// change the balance
     pub balance: SetOrKeep<Amount>,
     /// change the executable bytecode
     pub bytecode: SetOrKeep<Bytecode>,
     /// change datastore entries
-    #[serde(serialize_with = "as_array")]
+    #[serde_as(as = "Vec<(_, _)>")]
     pub datastore: BTreeMap<Vec<u8>, SetOrDelete<Vec<u8>>>,
 }
 
-// Serializer for `datastore` field of `LedgerEntryUpdate`
-fn as_array<S>(
-    datastore: &BTreeMap<Vec<u8>, SetOrDelete<Vec<u8>>>,
-    serializer: S,
-) -> Result<S::Ok, S::Error>
-where
-    S: serde::Serializer,
-{
-    let mut seq = serializer.serialize_seq(Some(datastore.len()))?;
-    for (key, value) in datastore {
-        seq.serialize_element(&(&key, &value))?;
-    }
-
-    seq.end()
-}
-
 /// Serializer for `datastore` field of `LedgerEntryUpdate`
 pub struct DatastoreUpdateSerializer {
     u64_serializer: U64VarIntSerializer,