Fix bridge issues (#63)

* Fix bridge issues

* Remove bridge channel rpc from Cargo.toml

Author: vovac12

Cargo.lock

@@ -6,7 +6,6 @@ members = [
     "pallets/*",
     "pallets/leaf-provider/runtime-api",
     "pallets/leaf-provider/rpc",
-    "pallets/substrate-channel/rpc",
     "pallets/beefy-light-client/runtime-api",
     "pallets/beefy-light-client/rpc",
 ]

Cargo.toml

@@ -47,6 +47,7 @@ pub mod pallet {
     use bridge_types::types::{AuxiliaryDigest, AuxiliaryDigestItem, LeafExtraData};
     use frame_support::pallet_prelude::*;
     use frame_support::traits::Randomness;
+    use frame_system::pallet_prelude::*;
     use sp_beefy::mmr::BeefyDataProvider;
     use sp_runtime::traits;
     use sp_runtime::traits::Hash;
@@ -101,10 +102,19 @@ pub mod pallet {
         }
     }
 
+    #[pallet::hooks]
+    impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
+        /// Clear the latest digest. This pallet should be placed before any other pallets which is use AuxiliaryDigestHandler.
+        fn on_initialize(_now: T::BlockNumber) -> Weight {
+            LatestDigest::<T>::kill();
+            <T as frame_system::Config>::DbWeight::get().writes(1)
+        }
+    }
+
     impl<T: Config> BeefyDataProvider<LeafExtraData<HashOf<T>, RandomnessOutputOf<T>>> for Pallet<T> {
         fn extra_data() -> LeafExtraData<HashOf<T>, RandomnessOutputOf<T>> {
             let digest = AuxiliaryDigest {
-                logs: LatestDigest::<T>::take().unwrap_or_default(),
+                logs: LatestDigest::<T>::get().unwrap_or_default(),
             };
             let digest_encoded = digest.encode();
             let (random_seed, _) = T::Randomness::random(RANDOMNESS_SUBJECT);

pallets/leaf-provider/src/lib.rs

@@ -31,12 +31,10 @@
 //! Channel for passing messages from substrate to ethereum.
 
 use bridge_types::substrate::BridgeMessage;
-use codec::Encode;
 use frame_support::ensure;
 use frame_support::traits::Get;
 use frame_support::weights::Weight;
 use sp_core::H256;
-use sp_io::offchain_index;
 
 use bridge_types::types::MessageNonce;
 use bridge_types::SubNetworkId;
@@ -60,6 +58,7 @@ pub mod pallet {
     use bridge_types::traits::OutboundChannel;
     use bridge_types::traits::TimepointProvider;
     use bridge_types::types::AuxiliaryDigestItem;
+    use bridge_types::types::GenericCommitmentWithBlock;
     use bridge_types::types::MessageId;
     use bridge_types::types::MessageStatus;
     use bridge_types::GenericNetworkId;
@@ -130,6 +129,19 @@ pub mod pallet {
     #[pallet::storage]
     pub type ChannelNonces<T: Config> = StorageMap<_, Identity, SubNetworkId, u64, ValueQuery>;
 
+    #[pallet::storage]
+    pub type LatestCommitment<T: Config> = StorageMap<
+        _,
+        Identity,
+        SubNetworkId,
+        GenericCommitmentWithBlock<
+            BlockNumberFor<T>,
+            T::MaxMessagesPerCommit,
+            T::MaxMessagePayloadSize,
+        >,
+        OptionQuery,
+    >;
+
     /// The current storage version.
     const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);
 
@@ -225,12 +237,11 @@ pub mod pallet {
                 AuxiliaryDigestItem::Commitment(GenericNetworkId::Sub(network_id), commitment_hash);
             T::AuxiliaryDigestHandler::add_item(digest_item);
 
-            let key = bridge_types::utils::make_offchain_key(network_id.into(), batch_nonce);
-            let offchain_data = bridge_types::types::BridgeOffchainData {
+            let commitment = bridge_types::types::GenericCommitmentWithBlock {
                 commitment,
                 block_number: <frame_system::Pallet<T>>::block_number(),
             };
-            offchain_index::set(&key, &offchain_data.encode());
+            LatestCommitment::<T>::insert(network_id, commitment);
 
             <T as Config>::WeightInfo::on_initialize(
                 messages_count as u32,

pallets/substrate-channel/rpc/Cargo.toml

@@ -30,7 +30,7 @@
 
 use super::*;
 use bridge_types::GenericNetworkId;
-use codec::{Decode, MaxEncodedLen};
+use codec::{Decode, Encode, MaxEncodedLen};
 use currencies::BasicCurrencyAdapter;
 
 use bridge_types::traits::{OutboundChannel, TimepointProvider};

pallets/substrate-channel/rpc/src/lib.rs

@@ -337,7 +337,7 @@ pub struct RawAssetInfo {
         deserialize = "BlockNumber: Deserialize<'de>"
     ))
 )]
-pub struct BridgeOffchainData<BlockNumber, MaxMessages: Get<u32>, MaxPayload: Get<u32>> {
+pub struct GenericCommitmentWithBlock<BlockNumber, MaxMessages: Get<u32>, MaxPayload: Get<u32>> {
     pub block_number: BlockNumber,
     pub commitment: crate::GenericCommitment<MaxMessages, MaxPayload>,
 }