MAke acking work better and actually redeliver the message (#33)

metaplex-foundation · Dec 7, 2022 · 79e1d49 · 79e1d49
1 parent 3ed06be
commit 79e1d49
Show file tree

Hide file tree

Showing 11 changed files with 167 additions and 1,206 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/docker/runs.sh b/docker/runs.sh
@@ -69,6 +69,7 @@ args=(
   --config config.yaml
   --log
   --reset
+  --limit-ledger-size 10000000000000000
   --rpc-port 8899
   --geyser-plugin-config /plugin-config/accountsdb-plugin-config.json
 )

diff --git a/plerkle/Cargo.toml b/plerkle/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "plerkle"
 description = "Geyser plugin with dynamic config reloading, message bus agnostic abstractions and a whole lot of fun."
-version = "0.6.0"
+version = "0.6.1"
 authors = ["Metaplex Developers <dev@metaplex.com>"]
 repository = "https://github.com/metaplex-foundation/digital-asset-validator-plugin"
 license = "AGPL-3.0"
@@ -33,7 +33,7 @@ cadence-macros = "0.29.0"
 chrono = "0.4.19"
 tracing = "0.1.35"
 hex = "0.4.3"
-plerkle_messenger = { path = "../plerkle_messenger", version = "0.6.0", features = ["redis"] }
+plerkle_messenger = { path = "../plerkle_messenger", version = "1.0.0", features = ["redis"] }
 flatbuffers = "22.10.26"
 plerkle_serialization = { path = "../plerkle_serialization", version = "0.6.0" }
 tokio = { version = "1.17.0", features = ["full"] }

diff --git a/plerkle_messenger/Cargo.toml b/plerkle_messenger/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "plerkle_messenger"
 description = "Metaplex Messenger trait for Geyser plugin producer/consumer patterns."
-version = "0.6.0"
+version = "1.0.0"
 authors = ["Metaplex Developers <dev@metaplex.com>"]
 repository = "https://github.com/metaplex-foundation/digital-asset-validator-plugin"
 license = "AGPL-3.0"
@@ -10,7 +10,6 @@ readme = "Readme.md"
 
 [dependencies]
 redis = { version = "0.22.0", features = ["aio", "tokio-comp", "streams"], optional = true}
-metaplex-pulsar = { version = "4.1.1", optional = true}
 log = "0.4.11"
 thiserror = "1.0.30"
 async-trait = "0.1.53"

diff --git a/plerkle_messenger/Readme.md b/plerkle_messenger/Readme.md
@@ -1,3 +1,8 @@
 # Messenger
 
-A message bus agnostic Messaging Library that sends Transaction, Account, Block and Slot updates in the Plerkle Serialization format.
+A message bus agnostic Messaging Library that sends Transaction, Account, Block and Slot updates in the Plerkle Serialization format.
+
+## Note on 1.0.0
+
+The plerkle serialization API changes at 1.0.0 which is a breaking change. 
+This method removes confusion around the Recv data lifetime being tied back to the messenger interface. Now the data is owned.
diff --git a/plerkle_messenger/src/lib.rs b/plerkle_messenger/src/lib.rs
@@ -1,5 +1,3 @@
-#[cfg(feature = "pulsar")]
-pub mod pulsar_messenger;
 #[cfg(feature = "redis")]
 pub mod redis_messenger;
 

diff --git a/plerkle_messenger/src/plerkle_messenger.rs b/plerkle_messenger/src/plerkle_messenger.rs
@@ -15,14 +15,19 @@ pub const SLOT_STREAM: &str = "SLT";
 pub const TRANSACTION_STREAM: &str = "TXN";
 pub const BLOCK_STREAM: &str = "BLK";
 
-pub struct RecvData<'a> {
+pub struct RecvData {
     pub id: String,
-    pub data: &'a [u8],
+    pub tries: usize,
+    pub data: Vec<u8>,
 }
 
-impl<'a> RecvData<'a> {
-    pub fn new(id: String, data: &'a [u8]) -> Self {
-        RecvData { id, data }
+impl RecvData {
+    pub fn new(id: String, data: Vec<u8>) -> Self {
+        RecvData { id, data, tries: 0 }
+    }
+
+    pub fn new_retry(id: String, data: Vec<u8>, tries: usize) -> Self {
+        RecvData { id, data, tries }
     }
 }
 

diff --git a/plerkle_messenger/src/pulsar_messenger.rs b/plerkle_messenger/src/pulsar_messenger.rs