Merge pull request #32 from subspace/relayer-generic-metadata

Relayer generic metadata
autonomys · Sep 26, 2021 · 8e09d6b · 8e09d6b
2 parents 25b0aba + ec6e8f9
commit 8e09d6b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 32 deletions.
diff --git a/crates/pallet-feeds/src/lib.rs b/crates/pallet-feeds/src/lib.rs
@@ -2,8 +2,6 @@
 use frame_support::{dispatch::DispatchResult, pallet_prelude::*};
 use frame_system::pallet_prelude::*;
 pub use pallet::*;
-use scale_info::TypeInfo;
-use sp_core::H256;
 use sp_std::vec::Vec;
 
 #[frame_support::pallet]
@@ -20,20 +18,11 @@ pub mod pallet {
 
     pub type PutDataObject = Vec<u8>;
     pub type FeedId = u64;
+    pub type ObjectMetadata = Vec<u8>;
 
-    // TODO: make it more generic
-    #[derive(Encode, Decode, Debug, Clone, Eq, PartialEq, TypeInfo)]
-    pub struct ObjectMetadata {
-        pub feed_id: FeedId,
-        // last block hash
-        pub hash: H256,
-        // last block number
-        pub number: u32,
-    }
-
-    // TODO: probably change (H256, u32) to Vec<u8>
     #[pallet::storage]
-    pub type Feeds<T: Config> = StorageMap<_, Blake2_128Concat, FeedId, (H256, u32), OptionQuery>;
+    pub type Feeds<T: Config> =
+        StorageMap<_, Blake2_128Concat, FeedId, ObjectMetadata, OptionQuery>;
 
     #[pallet::storage]
     #[pallet::getter(fn current_feed_id)]
@@ -58,25 +47,21 @@ pub mod pallet {
         #[pallet::weight(10_000)]
         pub fn put(
             origin: OriginFor<T>,
+            feed_id: FeedId,
             data: PutDataObject,
             metadata: ObjectMetadata,
         ) -> DispatchResult {
             let who = ensure_signed(origin)?;
 
-            log::info!("metadata: {:?}", metadata);
-
-            let ObjectMetadata {
-                feed_id,
-                hash,
-                number,
-            } = metadata;
+            // TODO: add data handling
+            log::debug!("metadata: {:?}", metadata);
+            log::debug!("data.len: {:?}", data.len());
 
-            ensure!(Feeds::<T>::contains_key(feed_id), Error::<T>::UknownFeedId);
+            let current_feed_id = Self::current_feed_id();
 
-            Feeds::<T>::mutate_exists(feed_id, |values| *values = Some((hash, number)));
+            ensure!(current_feed_id >= feed_id, Error::<T>::UknownFeedId);
 
-            // TODO: add data handling
-            log::info!("data.len: {:?}", data.len());
+            Feeds::<T>::insert(feed_id, metadata.clone());
 
             Self::deposit_event(Event::DataSubmitted(metadata, who));
 
@@ -90,8 +75,6 @@ pub mod pallet {
 
             let feed_id = Self::current_feed_id();
 
-            Feeds::<T>::insert(feed_id, (H256::default(), u32::default()));
-
             CurrentFeedId::<T>::mutate(|feed_id| *feed_id = feed_id.saturating_add(1));
 
             Self::deposit_event(Event::FeedCreated(feed_id, who));

diff --git a/relayer/src/source.ts b/relayer/src/source.ts
@@ -41,13 +41,12 @@ class Source {
     console.log(`Chain ${this.chain}: Finalized block size: ${size / 1024} Kb`);
 
     const metadata = {
-      feedId: this.feedId,
       hash,
       // TODO: probably there is a better way - investigate
       number: this.api.createType("U32", number.toNumber()),
     };
 
-    return { block: hex, metadata };
+    return { feedId: this.feedId, block: hex, metadata };
   };
 
   subscribeBlocks = (): Observable<TxData> =>

diff --git a/relayer/src/target.ts b/relayer/src/target.ts
@@ -39,10 +39,13 @@ class Target {
   }
 
   // TODO: signer should be proxy account per feed
-  private async sendBlockTx({ block, metadata }: TxData) {
+  private async sendBlockTx({ feedId, block, metadata }: TxData) {
+    // metadata is stored as Vec<u8>
+    // to decode: new TextDecoder().decode(new Uint8Array([...]))
+    const metadataPayload = JSON.stringify(metadata);
     return (
       this.api.rx.tx.feeds
-        .put(block, metadata)
+        .put(feedId, block, metadataPayload)
         // it is required to specify nonce, otherwise transaction within same block will be rejected
         // if nonce is -1 API will do the lookup for the right value
         // https://polkadot.js.org/docs/api/cookbook/tx/#how-do-i-take-the-pending-tx-pool-into-account-in-my-nonce

diff --git a/relayer/src/types.ts b/relayer/src/types.ts
@@ -2,12 +2,12 @@ import { U64, U32 } from "@polkadot/types/primitive";
 import { Hash } from "@polkadot/types/interfaces";
 
 export type TxData = {
+  feedId: U64;
   block: string;
   metadata: Metadata;
 };
 
 type Metadata = {
-  feedId: U64;
   hash: Hash;
   number: U32;
 };