Support deletes

Cargo.toml

@@ -47,6 +47,7 @@ threadpool = "1.8.1"
 rand = "0.8.5"
 humantime-serde = "1.1.1"
 humantime = "2.1.0"
+itertools = "0.13.0"
 
 [build-dependencies]
 tonic-build = "0.9.2"

src/consensus/consensus.rs

@@ -14,7 +14,7 @@ use malachite_consensus::{Effect, ProposedValue, Resume, SignedConsensusMsg};
 use malachite_metrics::Metrics;
 
 use crate::consensus::timers::{TimeoutElapsed, TimerScheduler};
-use crate::consensus::validator::{self, ShardValidator};
+use crate::consensus::validator::ShardValidator;
 use crate::core::types::{
     Height, ShardId, SnapchainContext, SnapchainShard, SnapchainValidator,
     SnapchainValidatorContext,

src/consensus/proposer.rs

@@ -294,7 +294,7 @@ impl BlockProposer {
     async fn publish_new_block(&self, block: Block) {
         match self.block_tx.send(block.clone()).await {
             Err(err) => {
-                error!("Erorr publishing new block {:#?}", err)
+                error!("Error publishing new block {:?}", err.to_string());
             }
             Ok(_) => {}
         }

src/core/message.rs

@@ -1,4 +1,5 @@
 use crate::proto::msg as message;
+use crate::proto::snapchain;
 
 impl message::Message {
     pub fn is_type(&self, message_type: message::MessageType) -> bool {
@@ -20,4 +21,20 @@ impl message::Message {
             0
         }
     }
+
+    pub fn hex_hash(&self) -> String {
+        hex::encode(&self.hash)
+    }
+}
+
+impl snapchain::ValidatorMessage {
+    pub fn fid(&self) -> u32 {
+        if let Some(fname) = &self.fname_transfer {
+            return fname.fid as u32;
+        }
+        if let Some(event) = &self.on_chain_event {
+            return event.fid as u32;
+        }
+        0
+    }
 }

src/network/server.rs

@@ -4,7 +4,7 @@ use crate::core::error::HubError;
 use crate::proto::msg as message;
 use crate::proto::rpc::snapchain_service_server::SnapchainService;
 use crate::proto::rpc::{BlocksRequest, BlocksResponse, ShardChunksRequest, ShardChunksResponse};
-use crate::storage::store::engine::Message;
+use crate::storage::store::engine::MempoolMessage;
 use crate::storage::store::shard::ShardStore;
 use crate::storage::store::BlockStore;
 use hex::ToHex;
@@ -13,7 +13,7 @@ use tonic::{Request, Response, Status};
 use tracing::info;
 
 pub struct MySnapchainService {
-    message_tx: mpsc::Sender<Message>,
+    message_tx: mpsc::Sender<MempoolMessage>,
     block_store: BlockStore,
     shard_stores: HashMap<u32, ShardStore>,
 }
@@ -22,7 +22,7 @@ impl MySnapchainService {
     pub fn new(
         block_store: BlockStore,
         shard_stores: HashMap<u32, ShardStore>,
-        message_tx: mpsc::Sender<Message>,
+        message_tx: mpsc::Sender<MempoolMessage>,
     ) -> Self {
         Self {
             block_store,
@@ -43,7 +43,7 @@ impl SnapchainService for MySnapchainService {
 
         let message = request.into_inner();
         self.message_tx
-            .send(Message::UserMessage(message.clone()))
+            .send(MempoolMessage::UserMessage(message.clone()))
             .await
             .unwrap(); // Do we need clone here? I think yes?
 

src/node/snapchain_node.rs

@@ -6,10 +6,9 @@ use crate::core::types::{
     SnapchainValidatorSet,
 };
 use crate::network::gossip::GossipEvent;
-use crate::proto::msg as message;
 use crate::proto::snapchain::{Block, ShardChunk};
 use crate::storage::db::RocksDB;
-use crate::storage::store::engine::{BlockEngine, Message, ShardEngine};
+use crate::storage::store::engine::{BlockEngine, MempoolMessage, ShardEngine};
 use crate::storage::store::shard::ShardStore;
 use crate::storage::store::BlockStore;
 use libp2p::identity::ed25519::Keypair;
@@ -24,7 +23,7 @@ const MAX_SHARDS: u32 = 3;
 
 pub struct SnapchainNode {
     pub consensus_actors: BTreeMap<u32, ActorRef<ConsensusMsg<SnapchainValidatorContext>>>,
-    pub messages_tx_by_shard: HashMap<u32, mpsc::Sender<Message>>,
+    pub messages_tx_by_shard: HashMap<u32, mpsc::Sender<MempoolMessage>>,
     pub shard_stores: HashMap<u32, ShardStore>,
     pub address: Address,
 }
@@ -45,7 +44,7 @@ impl SnapchainNode {
 
         let (shard_decision_tx, shard_decision_rx) = mpsc::channel::<ShardChunk>(100);
 
-        let mut shard_messages: HashMap<u32, mpsc::Sender<Message>> = HashMap::new();
+        let mut shard_messages: HashMap<u32, mpsc::Sender<MempoolMessage>> = HashMap::new();
 
         let mut shard_stores: HashMap<u32, ShardStore> = HashMap::new();
 

src/proto/blocks.proto

@@ -122,7 +122,7 @@ message Transaction {
 
 // Fname transfers
 message FnameTransfer {
-
+  uint64 fid = 1;
 }
 
 // Validator initiated prunes/revokes etc

src/storage/store/account/store.rs

@@ -12,7 +12,6 @@ use crate::{
     proto::msg::{link_body::Target, message_data::Body, Message, MessageType},
     storage::db::{RocksDB, RocksDbTransactionBatch},
 };
-use prost::Message as _;
 use std::clone::Clone;
 use std::string::ToString;
 use std::sync::{Arc, Mutex};