proto: add mod convert_to, convert_from (#190)

rpcpool · Oct 3, 2023 · f559fa8 · f559fa8
1 parent a6cb542
commit f559fa8
Show file tree

Hide file tree

Showing 12 changed files with 602 additions and 288 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,8 @@ The minor version will be incremented upon a breaking change and the patch versi
 
 ### Features
 
+- proto: add mod `convert_to`, `convert_from` ([#190](https://github.com/rpcpool/yellowstone-grpc/pull/190)).
+
 ### Fixes
 
 ### Breaking

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,10 +1,10 @@
 [workspace]
 members = [
-    "examples/rust", # 1.9.0+solana.1.16.14
-    "yellowstone-grpc-client", # 1.10.0+solana.1.16.14
-    "yellowstone-grpc-geyser", # 1.8.0+solana.1.16.14
+    "examples/rust", # 1.10.0+solana.1.16.14
+    "yellowstone-grpc-client", # 1.11.0+solana.1.16.14
+    "yellowstone-grpc-geyser", # 1.9.0+solana.1.16.14
     "yellowstone-grpc-kafka", # 1.0.0+solana.1.16.14
-    "yellowstone-grpc-proto", # 1.9.0+solana.1.16.14
+    "yellowstone-grpc-proto", # 1.10.0+solana.1.16.14
 ]
 
 [profile.release]

diff --git a/examples/rust/Cargo.toml b/examples/rust/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yellowstone-grpc-client-simple"
-version = "1.9.0+solana.1.16.14"
+version = "1.10.0+solana.1.16.14"
 authors = ["Triton One"]
 edition = "2021"
 publish = false

diff --git a/yellowstone-grpc-client/Cargo.toml b/yellowstone-grpc-client/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yellowstone-grpc-client"
-version = "1.10.0+solana.1.16.14"
+version = "1.11.0+solana.1.16.14"
 authors = ["Triton One"]
 edition = "2021"
 description = "Yellowstone gRPC Geyser Simple Client"
@@ -16,7 +16,7 @@ http = "0.2.8"
 thiserror = "1.0"
 tonic = { version = "0.9.2", features = ["gzip", "tls", "tls-roots"] }
 tonic-health = "0.9.2"
-yellowstone-grpc-proto = { path = "../yellowstone-grpc-proto", version = "1.9.0+solana.1.16.14" }
+yellowstone-grpc-proto = { path = "../yellowstone-grpc-proto", version = "1.10.0+solana.1.16.14" }
 
 [dev-dependencies]
 tokio = { version = "1.21.2", features = ["macros"] }
diff --git a/yellowstone-grpc-geyser/Cargo.toml b/yellowstone-grpc-geyser/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "yellowstone-grpc-geyser"
-version = "1.8.0+solana.1.16.14"
+version = "1.9.0+solana.1.16.14"
 authors = ["Triton One"]
 edition = "2021"
 description = "Yellowstone gRPC Geyser Plugin"

diff --git a/yellowstone-grpc-geyser/src/filters.rs b/yellowstone-grpc-geyser/src/filters.rs
@@ -9,15 +9,6 @@ use {
             Message, MessageAccount, MessageBlock, MessageBlockMeta, MessageEntry, MessageRef,
             MessageSlot, MessageTransaction,
         },
-        proto::{
-            subscribe_request_filter_accounts_filter::Filter as AccountsFilterDataOneof,
-            subscribe_request_filter_accounts_filter_memcmp::Data as AccountsFilterMemcmpOneof,
-            CommitmentLevel, SubscribeRequest, SubscribeRequestAccountsDataSlice,
-            SubscribeRequestFilterAccounts, SubscribeRequestFilterAccountsFilter,
-            SubscribeRequestFilterBlocks, SubscribeRequestFilterBlocksMeta,
-            SubscribeRequestFilterEntry, SubscribeRequestFilterSlots,
-            SubscribeRequestFilterTransactions, SubscribeUpdate,
-        },
     },
     base64::{engine::general_purpose::STANDARD as base64_engine, Engine},
     solana_sdk::{pubkey::Pubkey, signature::Signature},
@@ -27,6 +18,15 @@ use {
         iter::FromIterator,
         str::FromStr,
     },
+    yellowstone_grpc_proto::prelude::{
+        subscribe_request_filter_accounts_filter::Filter as AccountsFilterDataOneof,
+        subscribe_request_filter_accounts_filter_memcmp::Data as AccountsFilterMemcmpOneof,
+        CommitmentLevel, SubscribeRequest, SubscribeRequestAccountsDataSlice,
+        SubscribeRequestFilterAccounts, SubscribeRequestFilterAccountsFilter,
+        SubscribeRequestFilterBlocks, SubscribeRequestFilterBlocksMeta,
+        SubscribeRequestFilterEntry, SubscribeRequestFilterSlots,
+        SubscribeRequestFilterTransactions, SubscribeUpdate,
+    },
 };
 
 #[derive(Debug, Clone)]

diff --git a/yellowstone-grpc-geyser/src/grpc.rs b/yellowstone-grpc-geyser/src/grpc.rs
@@ -3,18 +3,6 @@ use {
         config::{ConfigBlockFailAction, ConfigGrpc},
         filters::{Filter, FilterAccountsDataSlice},
         prom::{self, CONNECTIONS_TOTAL, MESSAGE_QUEUE_SIZE},
-        proto::{
-            self,
-            geyser_server::{Geyser, GeyserServer},
-            subscribe_update::UpdateOneof,
-            CommitmentLevel, GetBlockHeightRequest, GetBlockHeightResponse,
-            GetLatestBlockhashRequest, GetLatestBlockhashResponse, GetSlotRequest, GetSlotResponse,
-            GetVersionRequest, GetVersionResponse, IsBlockhashValidRequest,
-            IsBlockhashValidResponse, PingRequest, PongResponse, SubscribeRequest, SubscribeUpdate,
-            SubscribeUpdateAccount, SubscribeUpdateAccountInfo, SubscribeUpdateBlock,
-            SubscribeUpdateBlockMeta, SubscribeUpdateEntry, SubscribeUpdatePing,
-            SubscribeUpdateSlot, SubscribeUpdateTransaction, SubscribeUpdateTransactionInfo,
-        },
         version::VERSION,
     },
     log::{error, info},
@@ -51,6 +39,20 @@ use {
         Request, Response, Result as TonicResult, Status, Streaming,
     },
     tonic_health::server::health_reporter,
+    yellowstone_grpc_proto::{
+        convert_to,
+        prelude::{
+            geyser_server::{Geyser, GeyserServer},
+            subscribe_update::UpdateOneof,
+            CommitmentLevel, GetBlockHeightRequest, GetBlockHeightResponse,
+            GetLatestBlockhashRequest, GetLatestBlockhashResponse, GetSlotRequest, GetSlotResponse,
+            GetVersionRequest, GetVersionResponse, IsBlockhashValidRequest,
+            IsBlockhashValidResponse, PingRequest, PongResponse, SubscribeRequest, SubscribeUpdate,
+            SubscribeUpdateAccount, SubscribeUpdateAccountInfo, SubscribeUpdateBlock,
+            SubscribeUpdateBlockMeta, SubscribeUpdateEntry, SubscribeUpdatePing,
+            SubscribeUpdateSlot, SubscribeUpdateTransaction, SubscribeUpdateTransactionInfo,
+        },
+    },
 };
 
 #[derive(Debug, Clone)]
@@ -155,8 +157,8 @@ impl MessageTransactionInfo {
         SubscribeUpdateTransactionInfo {
             signature: self.signature.as_ref().into(),
             is_vote: self.is_vote,
-            transaction: Some(proto::convert::create_transaction(&self.transaction)),
-            meta: Some(proto::convert::create_transaction_meta(&self.meta)),
+            transaction: Some(convert_to::create_transaction(&self.transaction)),
+            meta: Some(convert_to::create_transaction_meta(&self.meta)),
             index: self.index as u64,
         }
     }
@@ -412,11 +414,9 @@ impl<'a> MessageRef<'a> {
             Self::Block(message) => UpdateOneof::Block(SubscribeUpdateBlock {
                 slot: message.slot,
                 blockhash: message.blockhash.clone(),
-                rewards: Some(proto::convert::create_rewards(message.rewards.as_slice())),
-                block_time: message.block_time.map(proto::convert::create_timestamp),
-                block_height: message
-                    .block_height
-                    .map(proto::convert::create_block_height),
+                rewards: Some(convert_to::create_rewards(message.rewards.as_slice())),
+                block_time: message.block_time.map(convert_to::create_timestamp),
+                block_height: message.block_height.map(convert_to::create_block_height),
                 parent_slot: message.parent_slot,
                 parent_blockhash: message.parent_blockhash.clone(),
                 executed_transaction_count: message.executed_transaction_count,
@@ -441,11 +441,9 @@ impl<'a> MessageRef<'a> {
             Self::BlockMeta(message) => UpdateOneof::BlockMeta(SubscribeUpdateBlockMeta {
                 slot: message.slot,
                 blockhash: message.blockhash.clone(),
-                rewards: Some(proto::convert::create_rewards(message.rewards.as_slice())),
-                block_time: message.block_time.map(proto::convert::create_timestamp),
-                block_height: message
-                    .block_height
-                    .map(proto::convert::create_block_height),
+                rewards: Some(convert_to::create_rewards(message.rewards.as_slice())),
+                block_time: message.block_time.map(convert_to::create_timestamp),
+                block_height: message.block_height.map(convert_to::create_block_height),
                 parent_slot: message.parent_slot,
                 parent_blockhash: message.parent_blockhash.clone(),
                 executed_transaction_count: message.executed_transaction_count,

diff --git a/yellowstone-grpc-geyser/src/lib.rs b/yellowstone-grpc-geyser/src/lib.rs
@@ -7,5 +7,4 @@ pub mod filters;
 pub mod grpc;
 pub mod plugin;
 pub mod prom;
-pub mod proto;
 pub mod version;