Fix codec issue for dense-pull-ledger-diff (#982)

* Fix codec issue for dense-pull-ledger-diff Signed-off-by: Dengjianping <djptux@gmail.com> * Fix and update test Signed-off-by: Dengjianping <djptux@gmail.com> * Remove runtime api dense_pull_ledger_diff Signed-off-by: Dengjianping <djptux@gmail.com> * Fix compilation Signed-off-by: Dengjianping <djptux@gmail.com> Signed-off-by: Dengjianping <djptux@gmail.com>
Manta-Network · Jan 14, 2023 · a69c6e2 · a69c6e2
1 parent 56f8cb3
commit a69c6e2
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 67 deletions.
diff --git a/pallets/manta-pay/Cargo.toml b/pallets/manta-pay/Cargo.toml
@@ -26,6 +26,7 @@ default = ["std"]
 # RPC Interface
 rpc = [
   "jsonrpsee",
+  "runtime",
   "serde",
   "sp-api",
   "sp-blockchain",

diff --git a/pallets/manta-pay/src/lib.rs b/pallets/manta-pay/src/lib.rs
@@ -89,7 +89,7 @@ use manta_util::{
 
 pub use crate::types::{Checkpoint, RawCheckpoint};
 pub use pallet::*;
-pub use types::{DensePullResponse, PullResponse};
+pub use types::PullResponse;
 pub use weights::WeightInfo;
 
 #[cfg(test)]
@@ -122,7 +122,6 @@ pub mod pallet {
     use super::*;
     use frame_support::{pallet_prelude::*, traits::StorageVersion};
     use frame_system::pallet_prelude::*;
-    use scale_codec::Encode;
     use sp_runtime::traits::AccountIdConversion;
 
     const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);
@@ -680,30 +679,6 @@ pub mod pallet {
             }
         }
 
-        /// Returns the diff of ledger state since the given `checkpoint`, `max_receivers`, and
-        /// `max_senders`.
-        #[inline]
-        pub fn dense_pull_ledger_diff(
-            checkpoint: Checkpoint,
-            max_receivers: u64,
-            max_senders: u64,
-        ) -> DensePullResponse {
-            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 {
-                should_continue: more_receivers || more_senders,
-                receivers: base64::encode(receivers.encode()),
-                senders: base64::encode(senders.encode()),
-                senders_receivers_total: asset_value_encode(senders_receivers_total),
-                next_checkpoint: None,
-            }
-        }
-
         /// Returns the account ID of this pallet.
         #[inline]
         pub fn account_id() -> T::AccountId {

diff --git a/pallets/manta-pay/src/rpc.rs b/pallets/manta-pay/src/rpc.rs
@@ -16,7 +16,7 @@
 
 //! MantaPay RPC Interfaces
 
-use crate::{runtime::PullLedgerDiffApi, Checkpoint, DensePullResponse, PullResponse};
+use crate::{runtime::PullLedgerDiffApi, types::DensePullResponse, Checkpoint, PullResponse};
 use alloc::sync::Arc;
 use core::marker::PhantomData;
 use jsonrpsee::{
@@ -109,7 +109,8 @@ where
     ) -> RpcResult<DensePullResponse> {
         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)
+        api.pull_ledger_diff(&at, checkpoint.into(), max_receivers, max_senders)
+            .map(Into::into)
             .map_err(|err| {
                 CallError::Custom(ErrorObject::owned(
                     PULL_LEDGER_DIFF_ERROR,

diff --git a/pallets/manta-pay/src/runtime.rs b/pallets/manta-pay/src/runtime.rs
@@ -16,12 +16,10 @@
 
 //! MantaPay Runtime APIs
 
-use crate::{DensePullResponse, PullResponse, RawCheckpoint};
+use crate::{PullResponse, RawCheckpoint};
 
 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;
     }
 }
diff --git a/pallets/manta-pay/src/test/payment.rs b/pallets/manta-pay/src/test/payment.rs
@@ -592,33 +592,27 @@ 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 =
+        let runtime_pull_response =
             MantaPayPallet::pull_ledger_diff(check_point, max_receivers, max_senders);
-        let dense_pull_response =
-            MantaPayPallet::dense_pull_ledger_diff(check_point, max_receivers, max_senders);
-        assert_eq!(
-            pull_response.senders_receivers_total,
-            dense_pull_response.senders_receivers_total
-        );
-        assert_eq!(
-            pull_response.should_continue,
-            dense_pull_response.should_continue
-        );
-        assert_eq!(
-            pull_response.should_continue,
-            dense_pull_response.should_continue
-        );
+
+        // ensure all Utxos have been returned.
+        assert!(!runtime_pull_response.should_continue);
+
+        // convert runtime response into native response
+        let dense_pull_response: crate::types::DensePullResponse =
+            runtime_pull_response.clone().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();
-        assert_eq!(pull_response.receivers, decoded_receivers);
+        assert_eq!(runtime_pull_response.receivers, decoded_receivers);
 
         let dense_senders = base64::decode(dense_pull_response.senders).unwrap();
         let mut slice_of = dense_senders.as_slice();
         let decoded_senders = <crate::SenderChunk as Decode>::decode(&mut slice_of).unwrap();
-        assert_eq!(pull_response.senders, decoded_senders);
+        assert_eq!(runtime_pull_response.senders, decoded_senders);
     });
 }
diff --git a/pallets/manta-pay/src/types.rs b/pallets/manta-pay/src/types.rs
@@ -16,7 +16,7 @@
 
 //! Type Definitions for Manta Pay
 
-use alloc::{boxed::Box, string::String, vec::Vec};
+use alloc::{boxed::Box, vec::Vec};
 use manta_crypto::merkle_tree;
 use manta_pay::{
     config::{
@@ -912,11 +912,11 @@ pub struct DensePullResponse {
     /// Ledger Receiver Chunk
     // we decode the receivers/senders with our own way
     #[codec(skip)]
-    pub receivers: String,
+    pub receivers: alloc::string::String,
 
     /// Ledger Sender Chunk
     #[codec(skip)]
-    pub senders: String,
+    pub senders: alloc::string::String,
 
     /// Total Number of Senders/Receivers in Ledger
     pub senders_receivers_total: [u8; 16],
@@ -930,6 +930,19 @@ pub struct DensePullResponse {
     pub next_checkpoint: Option<Checkpoint>,
 }
 
+impl From<PullResponse> for DensePullResponse {
+    #[inline]
+    fn from(resp: PullResponse) -> DensePullResponse {
+        Self {
+            should_continue: resp.should_continue,
+            receivers: base64::encode(resp.receivers.encode()),
+            senders: base64::encode(resp.senders.encode()),
+            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 {

diff --git a/runtime/calamari/src/lib.rs b/runtime/calamari/src/lib.rs
@@ -1049,14 +1049,6 @@ impl_runtime_apis! {
         ) -> pallet_manta_pay::PullResponse {
             MantaPay::pull_ledger_diff(checkpoint.into(), max_receiver, max_sender)
         }
-
-        fn dense_pull_ledger_diff(
-            checkpoint: pallet_manta_pay::RawCheckpoint,
-            max_receiver: u64,
-            max_sender: u64
-        ) -> pallet_manta_pay::DensePullResponse {
-            MantaPay::dense_pull_ledger_diff(checkpoint.into(), max_receiver, max_sender)
-        }
     }
 
     impl nimbus_primitives::NimbusApi<Block> for Runtime {

diff --git a/runtime/dolphin/src/lib.rs b/runtime/dolphin/src/lib.rs
@@ -960,14 +960,6 @@ impl_runtime_apis! {
         ) -> pallet_manta_pay::PullResponse {
             MantaPay::pull_ledger_diff(checkpoint.into(), max_receiver, max_sender)
         }
-
-        fn dense_pull_ledger_diff(
-            checkpoint: pallet_manta_pay::RawCheckpoint,
-            max_receiver: u64,
-            max_sender: u64
-        ) -> pallet_manta_pay::DensePullResponse {
-            MantaPay::dense_pull_ledger_diff(checkpoint.into(), max_receiver, max_sender)
-        }
     }
 
     impl nimbus_primitives::NimbusApi<Block> for Runtime {