Fix codec issue for dense-pull-ledger-diff

pallets/manta-pay/src/lib.rs

@@ -88,7 +88,7 @@ use manta_util::{
 
 pub use crate::types::{Checkpoint, RawCheckpoint};
 pub use pallet::*;
-pub use types::{DensePullResponse, PullResponse};
+pub use types::{DensePullResponse, PullResponse, RuntimeDensePullResponse};
 pub use weights::WeightInfo;
 
 #[cfg(test)]
@@ -680,20 +680,19 @@ pub mod pallet {
             checkpoint: Checkpoint,
             max_receivers: u64,
             max_senders: u64,
-        ) -> DensePullResponse {
+        ) -> RuntimeDensePullResponse {
             let (more_receivers, receivers) =
                 Self::pull_receivers(*checkpoint.receiver_index, max_receivers);
             let (more_senders, senders) = Self::pull_senders(checkpoint.sender_index, max_senders);
             let senders_receivers_total = (0..=255)
                 .map(|i| ShardTrees::<T>::get(i).current_path.leaf_index as u128)
                 .sum::<u128>()
                 + NullifierSetSize::<T>::get() as u128;
-            DensePullResponse {
+            RuntimeDensePullResponse {
                 should_continue: more_receivers || more_senders,
-                receivers: base64::encode(receivers.encode()),
-                senders: base64::encode(senders.encode()),
+                receivers: receivers.encode(),
+                senders: senders.encode(),
                 senders_receivers_total: asset_value_encode(senders_receivers_total),
-                next_checkpoint: None,
             }
         }
 

pallets/manta-pay/src/rpc.rs

@@ -110,6 +110,7 @@ where
         let api = self.client.runtime_api();
         let at = BlockId::hash(self.client.info().finalized_hash);
         api.dense_pull_ledger_diff(&at, checkpoint.into(), max_receivers, max_senders)
+            .map(Into::into)
             .map_err(|err| {
                 CallError::Custom(ErrorObject::owned(
                     PULL_LEDGER_DIFF_ERROR,

pallets/manta-pay/src/runtime.rs

@@ -16,12 +16,12 @@
 
 //! MantaPay Runtime APIs
 
-use crate::{DensePullResponse, PullResponse, RawCheckpoint};
+use crate::{PullResponse, RawCheckpoint, RuntimeDensePullResponse};
 
 sp_api::decl_runtime_apis! {
     pub trait PullLedgerDiffApi {
         fn pull_ledger_diff(checkpoint: RawCheckpoint, max_receivers: u64, max_senders: u64) -> PullResponse;
 
-        fn dense_pull_ledger_diff(checkpoint: RawCheckpoint, max_receivers: u64, max_senders: u64) -> DensePullResponse;
+        fn dense_pull_ledger_diff(checkpoint: RawCheckpoint, max_receivers: u64, max_senders: u64) -> RuntimeDensePullResponse;
     }
 }

pallets/manta-pay/src/test/payment.rs

@@ -592,25 +592,34 @@ fn pull_ledger_diff_should_work() {
             );
         }
 
+        // retrieving 128 receivers/senders can get all existing Utxos
         let (max_receivers, max_senders) = (128, 128);
         let check_point = crate::Checkpoint::default();
         let pull_response =
             MantaPayPallet::pull_ledger_diff(check_point, max_receivers, max_senders);
-        let dense_pull_response =
+        let runtime_dense_pull_response =
             MantaPayPallet::dense_pull_ledger_diff(check_point, max_receivers, max_senders);
+
+        // ensure all Utxos have been returned.
+        assert!(!pull_response.should_continue);
+        assert!(!runtime_dense_pull_response.should_continue);
         assert_eq!(
-            pull_response.senders_receivers_total,
-            dense_pull_response.senders_receivers_total
+            pull_response.should_continue,
+            runtime_dense_pull_response.should_continue
         );
         assert_eq!(
             pull_response.should_continue,
-            dense_pull_response.should_continue
+            runtime_dense_pull_response.should_continue
         );
+
         assert_eq!(
-            pull_response.should_continue,
-            dense_pull_response.should_continue
+            pull_response.senders_receivers_total,
+            runtime_dense_pull_response.senders_receivers_total
         );
 
+        // convert runtime response into native response
+        let dense_pull_response: crate::DensePullResponse = runtime_dense_pull_response.into();
+
         let dense_receivers = base64::decode(dense_pull_response.receivers).unwrap();
         let mut slice_of = dense_receivers.as_slice();
         let decoded_receivers = <crate::ReceiverChunk as Decode>::decode(&mut slice_of).unwrap();

pallets/manta-pay/src/types.rs

@@ -930,6 +930,40 @@ pub struct DensePullResponse {
     pub next_checkpoint: Option<Checkpoint>,
 }
 
+// Runtime only type,
+// for fixing the issue when receivers/senders(Vec<u8>, runtime) to receivers/senders(String, native client)
+#[derive(Clone, Debug, Encode, Default, Eq, Hash, Decode, PartialEq, TypeInfo)]
+pub struct RuntimeDensePullResponse {
+    /// Pull Continuation Flag
+    ///
+    /// The `should_continue` flag is set to `true` if the client should request more data from the
+    /// ledger to finish the pull.
+    pub should_continue: bool,
+
+    /// Ledger Receiver Chunk
+    // we decode the receivers/senders with our own way
+    pub receivers: Vec<u8>,
+
+    /// Ledger Sender Chunk
+    pub senders: Vec<u8>,
+
+    /// Total Number of Senders/Receivers in Ledger
+    pub senders_receivers_total: [u8; 16],
+}
+
+impl From<RuntimeDensePullResponse> for DensePullResponse {
+    #[inline]
+    fn from(resp: RuntimeDensePullResponse) -> DensePullResponse {
+        Self {
+            should_continue: resp.should_continue,
+            receivers: base64::encode(resp.receivers),
+            senders: base64::encode(resp.senders),
+            senders_receivers_total: resp.senders_receivers_total,
+            next_checkpoint: None,
+        }
+    }
+}
+
 /// Raw Checkpoint for Encoding and Decoding
 #[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd, Decode, Encode)]
 pub struct RawCheckpoint {

runtime/calamari/src/lib.rs

@@ -1054,7 +1054,7 @@ impl_runtime_apis! {
             checkpoint: pallet_manta_pay::RawCheckpoint,
             max_receiver: u64,
             max_sender: u64
-        ) -> pallet_manta_pay::DensePullResponse {
+        ) -> pallet_manta_pay::RuntimeDensePullResponse {
             MantaPay::dense_pull_ledger_diff(checkpoint.into(), max_receiver, max_sender)
         }
     }

runtime/dolphin/src/lib.rs

@@ -965,7 +965,7 @@ impl_runtime_apis! {
             checkpoint: pallet_manta_pay::RawCheckpoint,
             max_receiver: u64,
             max_sender: u64
-        ) -> pallet_manta_pay::DensePullResponse {
+        ) -> pallet_manta_pay::RuntimeDensePullResponse {
             MantaPay::dense_pull_ledger_diff(checkpoint.into(), max_receiver, max_sender)
         }
     }