add seet att to all types

metaplex-foundation · Sep 30, 2022 · 35b5328 · 35b5328
1 parent 902de15
commit 35b5328
Show file tree

Hide file tree

Showing 16 changed files with 1,170 additions and 1,426 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/docker/runs.sh b/docker/runs.sh
@@ -21,7 +21,7 @@ cat << EOL > /plugin-config/accountsdb-plugin-config.json
     {
         "libpath": "/plugin/plugin.so",
         "accounts_selector" : {
-            "accounts" : [
+            "owners" : [
                 "metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s",
                 "GRoLLMza82AiYN7W9S9KCCtCyyPRAQP2ifBy4v4D5RMD",
                 "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb",

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.4.5"
+version = "0.4.6"
 authors = ["Metaplex Developers <[email protected]>"]
 repository = "https://github.com/metaplex-foundation/digital-asset-validator-plugin"
 license = "AGPL-3.0"
@@ -33,9 +33,9 @@ cadence-macros = "0.29.0"
 chrono = "0.4.19"
 tracing = "0.1.35"
 hex = "0.4.3"
-plerkle_messenger = { path = "../plerkle_messenger", version = "0.4.5", features = ["redis"] }
+plerkle_messenger = { path = "../plerkle_messenger", version = "0.4.6", features = ["redis"] }
 flatbuffers = "2.1.2"
-plerkle_serialization = { path = "../plerkle_serialization", version = "0.4.5" }
+plerkle_serialization = { path = "../plerkle_serialization", version = "0.4.6" }
 tokio = { version = "1.17.0", features = ["full"] }
 figment = { version = "0.10.6", features = ["env", "test"] }
 

diff --git a/plerkle/src/geyser_plugin_nft.rs b/plerkle/src/geyser_plugin_nft.rs
@@ -252,31 +252,14 @@ impl GeyserPlugin for Plerkle<'static> {
         slot: u64,
         is_startup: bool,
     ) -> solana_geyser_plugin_interface::geyser_plugin_interface::Result<()> {
-        let acct: ReplicaAccountInfo;
-        let account = match account {
-            // ReplicaAccountInfoVersions::V0_0_2(a) => a, removed because dependency hell
-            ReplicaAccountInfoVersions::V0_0_1(a) => {
-                acct = ReplicaAccountInfo {
-                    pubkey: a.pubkey,
-                    lamports: a.lamports,
-                    owner: a.owner,
-                    executable: a.executable,
-                    rent_epoch: a.rent_epoch,
-                    data: a.data,
-                    write_version: a.write_version,
-                };
-                &acct
-            }
-        };
-
+        let ReplicaAccountInfoVersions::V0_0_1(account) = account;
         if let Some(accounts_selector) = &self.accounts_selector {
             if !accounts_selector.is_account_selected(account.pubkey, account.owner) {
                 return Ok(());
             }
         } else {
             return Ok(());
         }
-
         // Get runtime and sender channel.
         let runtime = self.get_runtime()?;
         let sender = self.get_sender_clone()?;

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.4.5"
+version = "0.4.6"
 authors = ["Metaplex Developers <[email protected]>"]
 repository = "https://github.com/metaplex-foundation/digital-asset-validator-plugin"
 license = "AGPL-3.0"

diff --git a/plerkle_serialization/Cargo.toml b/plerkle_serialization/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "plerkle_serialization"
 description = "Metaplex Flatbuffers Plerkle Serialization for Geyser plugin producer/consumer patterns."
-version = "0.4.5"
+version = "0.4.6"
 authors = ["Metaplex Developers <[email protected]>"]
 repository = "https://github.com/metaplex-foundation/digital-asset-validator-plugin"
 license = "AGPL-3.0"

diff --git a/plerkle_serialization/account_info.fbs b/plerkle_serialization/account_info.fbs
@@ -11,6 +11,7 @@ table AccountInfo {
   write_version:uint64;
   slot:uint64;
   is_startup:bool;
+  seen_at: int64;
 }
 
 root_type AccountInfo;
diff --git a/plerkle_serialization/block_info.fbs b/plerkle_serialization/block_info.fbs
@@ -25,6 +25,7 @@ table BlockInfo {
   rewards:[Reward];
   block_time:int64 = null;
   block_height:uint64 = null;
+  seen_at: int64;
 }
 
 root_type BlockInfo;
diff --git a/plerkle_serialization/slot_status_info.fbs b/plerkle_serialization/slot_status_info.fbs
@@ -8,6 +8,7 @@ table SlotStatusInfo {
   slot:uint64;
   parent:uint64 = null;
   status:Status;
+  seen_at: int64;
 }
 
 root_type SlotStatusInfo;