fix the serialization issue for next_key

Author: betterclever

packages/persistence-std/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "persistence-std"
-version = "0.1.5"
+version = "0.1.6"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "Standard library for Persistence chain modules with CosmWasm support included"

packages/persistence-std/src/serde/mod.rs

@@ -35,6 +35,15 @@ pub mod as_map {
 
         match value {
             Value::Bytes(b) => Ok(T::from(b)),
+            Value::Option(o) => match o {
+                Some(b) => {
+                    // convert this to json string
+                    let s = serde_json_wasm::to_string(&b).unwrap();
+                    Ok(T::from(s.as_bytes().to_vec()))
+                },
+                None => Ok(T::from(vec![])),
+            },
+            Value::Unit => Ok(T::from(vec![])),
             _ => {
                 // convert this to jsons string
                 let s = serde_json_wasm::to_string(&value).unwrap();

packages/persistence-std/src/types/cosmos/base/query/v1beta1.rs

@@ -61,6 +61,9 @@ pub struct PageResponse {
     /// query the next page most efficiently. It will be empty if
     /// there are no more results.
     #[prost(bytes = "vec", tag = "1")]
+    #[serde(
+        deserialize_with = "crate::serde::as_map::deserialize"
+    )]
     pub next_key: ::prost::alloc::vec::Vec<u8>,
     /// total is total number of results available if PageRequest.count_total
     /// was set, its value is undefined otherwise

packages/persistence-std/tests/test.rs

@@ -1,4 +1,5 @@
 use persistence_std::{types::{cosmwasm::wasm::v1::MsgExecuteContract, cosmos::gov::v1::{QueryProposalsResponse, QueryProposalRequest, QueryProposalsRequest, ProposalStatus}}, shim::Any};
+use serde::de::Error;
 
 
 #[test]
@@ -33,4 +34,10 @@ pub fn enum_serde_test() {
 
     assert_eq!(query, query2);
 
+
+    let test_json = r#"{"proposals":[{"id":"3","messages":[{"@type":"/cosmwasm.wasm.v1.MsgExecuteContract","sender":"persistence10d07y265gmmuvt4z0w9aw880jnsr700j5w4kch","contract":"persistence1xxx3ps3gm3wceg4g300hvggdv7ga0hmsk64srccffmfy4wvcrugq3skeny","msg":{"resume_create_pool":{"pool_creation_request_id":2}},"funds":[]}],"status":"PROPOSAL_STATUS_DEPOSIT_PERIOD","final_tally_result":{"yes_count":"0","abstain_count":"0","no_count":"0","no_with_veto_count":"0"},"submit_time":"2023-09-06T16:32:52.516964Z","deposit_end_time":"2023-09-08T16:32:52.516964Z","total_deposit":[],"voting_start_time":null,"voting_end_time":null,"metadata":"test","title":"Test Proposal","summary":"test","proposer":"persistence1xxx3ps3gm3wceg4g300hvggdv7ga0hmsk64srccffmfy4wvcrugq3skeny"}],"pagination":{"next_key":null,"total":"1"}}"#;
+    let val: Result<QueryProposalsResponse, serde_json_wasm::de::Error> = serde_json_wasm::from_str(test_json);
+
+    println!("{:?}", val);
+
 }